Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2015-06-01 09:53:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nut" Changes: -------- --- /work/SRC/openSUSE:Factory/nut/nut.changes 2014-11-12 00:22:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2015-06-01 09:53:38.000000000 +0200 @@ -1,0 +2,17 @@ +Mon May 18 10:11:40 UTC 2015 - [email protected] + +- fix https://github.com/networkupstools/nut/issues/200 + * 0001-Restore-systemd-relationship-with-nut-driver-service.patch + +------------------------------------------------------------------- +Fri May 15 15:10:48 UTC 2015 - [email protected] + +- update to 2.7.3 (bugfixes and new devices support) + see NEWS and UPGRADING in /usr/share/doc/packages/nut +- refreshed patches: + * nut-notifyflag.patch: rename of upsmon.conf.sample.in + * nut-preconfig.patch: rename of upsmon.conf.sample.in + * nut-systemd-dirs.patch: refresh to 2.7.3 +- changed keyring to new key 55CA5976 (Arnaud Quette <[email protected]>) + +------------------------------------------------------------------- Old: ---- nut-2.7.2.tar.gz nut-2.7.2.tar.gz.sig New: ---- 0001-Restore-systemd-relationship-with-nut-driver-service.patch nut-2.7.3.tar.gz nut-2.7.3.tar.gz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut.spec ++++++ --- /var/tmp/diff_new_pack.vfktHd/_old 2015-06-01 09:53:39.000000000 +0200 +++ /var/tmp/diff_new_pack.vfktHd/_new 2015-06-01 09:53:39.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package nut # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -59,7 +59,7 @@ Summary: Network UPS Tools Core (Uninterruptible Power Supply Monitoring) License: GPL-2.0+ Group: Hardware/UPS -Version: 2.7.2 +Version: 2.7.3 Release: 0 Url: http://www.networkupstools.org/ Source: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz @@ -80,6 +80,9 @@ Patch6: nut-udev.patch # PATCH-FIX-UPSTREAM nut-systemd-dirs.patch [email protected] -- Fix systemd targets. Patch7: nut-systemd-dirs.patch +# PATCH-FIX-UPSTREAM: nut-server vs nut-drivers relation +# https://github.com/networkupstools/nut/commit/c98fab9f5dec993aa9f5e0a3e79de53ae9ecd32b +Patch8: 0001-Restore-systemd-relationship-with-nut-driver-service.patch Provides: smartups = %version Obsoletes: smartups < %version Conflicts: apcupsd @@ -212,14 +215,13 @@ %if %suse_version < 1030 %patch6 -R %endif -sed -i "s/@UPSD_USER@/%{USER}/g" upsd.init conf/upsmon.conf.sample +sed -i "s/@UPSD_USER@/%{USER}/g" upsd.init %if %suse_version < 1030 sed -i 's:/usr/lib/pm-utils/functions:/etc/pm/functions:' nut.sleep %endif %patch7 -p1 +%patch8 -p1 sed -i s:/usr/local/ups/bin:/bin: conf/upssched.conf.sample.in -[ -f docs/nut-qa.txt ] -dos2unix docs/nut-qa.txt %build autoreconf -f -i ++++++ 0001-Restore-systemd-relationship-with-nut-driver-service.patch ++++++ >From c98fab9f5dec993aa9f5e0a3e79de53ae9ecd32b Mon Sep 17 00:00:00 2001 From: Arnaud Quette <[email protected]> Date: Thu, 7 May 2015 15:43:17 +0200 Subject: [PATCH 1/2] Restore systemd relationship with nut-driver service The Requires directive from nut-server to nut-driver was previously removed, since it was preventing upsd from starting whenever one or more drivers, among several, was failing to start. Use the Wants directive, a weaker version of Requires, which will start upsd even if the nut-driver unit fails to start. closes https://github.com/networkupstools/nut/issues/200 --- scripts/systemd/nut-server.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/systemd/nut-server.service.in b/scripts/systemd/nut-server.service.in index dada977..fe20145 100644 --- a/scripts/systemd/nut-server.service.in +++ b/scripts/systemd/nut-server.service.in @@ -4,7 +4,7 @@ After=local-fs.target network.target nut-driver.service # We don't Require drivers to be successfully started! This would be # a change of behavior compared to init SysV, and could prevent from # accessing successfully started, at least to audit a system. -#Requires=nut-driver.service +Wants=nut-driver.service Before=nut-monitor.service [Service] -- 2.1.4 ++++++ nut-2.7.2.tar.gz -> nut-2.7.3.tar.gz ++++++ ++++ 35398 lines of diff (skipped) ++++++ nut-notifyflag.patch ++++++ --- /var/tmp/diff_new_pack.vfktHd/_old 2015-06-01 09:53:40.000000000 +0200 +++ /var/tmp/diff_new_pack.vfktHd/_new 2015-06-01 09:53:40.000000000 +0200 @@ -1,5 +1,5 @@ ---- conf/upsmon.conf.sample -+++ conf/upsmon.conf.sample +--- conf/upsmon.conf.sample.in ++++ conf/upsmon.conf.sample.in @@ -243,6 +243,15 @@ # IGNORE - Don't do anything # ++++++ nut-preconfig.patch ++++++ --- /var/tmp/diff_new_pack.vfktHd/_old 2015-06-01 09:53:40.000000000 +0200 +++ /var/tmp/diff_new_pack.vfktHd/_new 2015-06-01 09:53:40.000000000 +0200 @@ -33,8 +33,8 @@ + password = @UPSD_INITIAL_SLAVE_PASSWORD@ + allowfrom = localhost + upsmon slave ---- conf/upsmon.conf.sample -+++ conf/upsmon.conf.sample +--- conf/upsmon.conf.sample.in ++++ conf/upsmon.conf.sample.in @@ -84,6 +84,8 @@ # MONITOR [email protected] 1 upsmon secretpass slave # MONITOR myups@localhost 1 upsmon pass master (or slave) ++++++ nut-systemd-dirs.patch ++++++ --- /var/tmp/diff_new_pack.vfktHd/_old 2015-06-01 09:53:40.000000000 +0200 +++ /var/tmp/diff_new_pack.vfktHd/_new 2015-06-01 09:53:40.000000000 +0200 @@ -1,8 +1,8 @@ -Index: nut-2.6.5/configure.ac +Index: nut-2.7.3/configure.ac =================================================================== ---- nut-2.6.5.orig/configure.ac -+++ nut-2.6.5/configure.ac -@@ -986,9 +986,13 @@ dnl Override installation directory, wit +--- nut-2.7.3.orig/configure.ac ++++ nut-2.7.3/configure.ac +@@ -1065,7 +1065,12 @@ dnl Override installation directory, wit dnl prefix. This is needed for 'distcheck*' targets, otherwise dnl files will try to get intalled to the actual system directories if test -n "${systemdsystemunitdir}"; then @@ -14,7 +14,5 @@ + systemdsystemshutdowndir="${systemdsystemunitdir}/system-shutdown" + fi AC_MSG_RESULT(using ${systemdsystemunitdir}) -- systemdsystemunitdir="`echo ${systemdsystemunitdir} | sed 's/\/lib/\${libdir}/'`" else AC_MSG_RESULT(no) - fi ++++++ nut.keyring ++++++ --- /var/tmp/diff_new_pack.vfktHd/_old 2015-06-01 09:53:40.000000000 +0200 +++ /var/tmp/diff_new_pack.vfktHd/_new 2015-06-01 09:53:40.000000000 +0200 @@ -1,14 +1,20 @@ pub 1024D/204DDF1B 2002-07-15 -uid Arnaud Quette <[email protected]> -uid Arnaud Quette <[email protected]> -uid Arnaud Quette <[email protected]> -uid Arnaud Quette <[email protected]> -uid Arnaud Quette <[email protected]> -uid Arnaud Quette <[email protected]> +uid [ unknown] Arnaud Quette <[email protected]> +uid [ unknown] Arnaud Quette <[email protected]> +uid [ unknown] Arnaud Quette <[email protected]> +uid [ unknown] Arnaud Quette <[email protected]> +uid [ unknown] Arnaud Quette <[email protected]> +uid [ unknown] Arnaud Quette <[email protected]> sub 1024g/D8B1B6B4 2002-07-15 +pub 4096R/55CA5976 2014-04-22 +uid [ unknown] Arnaud Quette <[email protected]> +uid [ unknown] Arnaud Quette <[email protected]> +sub 4096R/F3AA7FEA 2014-04-22 +sub 4096R/0E515A22 2014-04-22 + -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2 mQGiBD0y56QRBACYMNr6RbAfj3T7ZoAyUWjofb/n5HalrHo7utL8V5qpbF0U95dJ 5KNXMzkSe79qviz5O8Np4UJdyzjbb1JSKdSiH56a08E/siJkwJ3c9b4eWCHB7Rq3 @@ -43,6 +49,87 @@ cfnLsfokDAxflfrtU8sasJy7ych9Iv0MFbYubs0pzywYr9sKOxJKTO9JVWrFvGCG Cjo/ek73zKISZUHKgv7jungAv0er2pTsMdE66+eEFRhK9IhOBBgRAgAGBQI9MufC ABIJENtkFMogTd8bB2VHUEcAAQG6NQCcDXQDPuv6+LysxTssJmCylZRLyaoAoMaI -YhUziTcacpO24e94Nt71AxEB -=4Dhx +YhUziTcacpO24e94Nt71AxEBmQINBFNWJFIBEADFe5wOD2TJCNsUzApk1QA4dWKD +BQAdaGimvDNEwGDKA4Bmn7n0jbKt25J5dpI+0gmUIanudNStoYF0O3hZU9lAQoS/ +PVXjrHl5rkY5CYuOJW8V2FmLyLQWJNksnuMa5DjAnuHepsh2XhzWeDLwcmCxJBHm +0PypvW7KT3N/+AmoZDrglGwVodSmifJDsVzfUATm3upbnIahFySHhqeLAOHJrLzc +V6jLkffBRfGizNfMYTiOM/QS5qAPwJyMIppTg/nD7zxCZCOlvlhNccrxinLQxrQ8 +xKQ2jNXVnZE+Ne18llWX2sNzEL1EDwP+C2kSOTnbLg8hF2X6FB/TWl2BscrkiWjK +o4Kli1Tf7hf7mDFTXMvnOQvgVGmL0zMJlisvSTeNWZw+9dOdFU5DgEGVC6n0ro1m +n1GfNmFWnXk7IjmF7W7d1UQlYOvaAOggOxb6K6MOdZOdAWC3pdl07cSTvKAO0/97 +D1+bghQinQ2soJU7rIt7xm7kvCGdboNqGtnh3POZoPOlnYNUCFaBtHAPzdx39n82 +4efcwlQXVe73V3V0kayklqo4M9YFgQdwsS0vGK7iZT5db57btVc3G09UOzr8lG8s +KBJqb+IwlhDxzkySewGT1JEtI6u5JwOdWPpBGyAVFl4YurXQagCUI7KUav3RanAe +9Trqe64IVmixTlb7EwARAQABtCJBcm5hdWQgUXVldHRlIDxhcXVldHRlQGRlYmlh +bi5vcmc+iQI3BBMBCAAhBQJTVibAAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheA +AAoJEKzA5BBVyll2IOgP/2O945cKTJNSxfMXEoOI0xbN28k0q9cXspIFUW0pbziO +kVhU8BansKNfKk6joqwXPzK2xSp/S8z/1f3h5F5WFoecRUZ3Al88yH63laukSLQ3 +3U1WYseaAGoZ37cGj+9AodjQNVlvitJcPHl8rKlk+c9vKRNKlPVCIIzqogfKa91/ +BM8+28tOSuDPn5g+TWir95/4d3chLQhxtyOJ3pluKkujbaeYni4pvCSRus4Z3FJE +i1L+88GvQ+c507NltqYu1Q1KE3GWXlWONH6NHPmsq/klSRTCJJbEGWSbHANAUJ+i +/4DbKPn8Iez3jwBPeaZriQxIKGQE+G/fC4sTRZjn4PQ0wkDkU2BNtqSD/4I7TTGP +w5+DU4r2d+nMPQHigXHV9SWgIBCYUbXrlPa+et56aO1xKmgeYvnZcav+p+zUW2O9 +d2JNL+6lZArFBeHBVoSTvccsoiyF+oLuZL49a37MawX8SNI81/9om+dtrxWyQmQX +V16eLJi0dn85fAQQPTWBh3+InM07PZ4D1Lxx60XbbrYeNjtCEfPXx5IVocBZuPsV +BgOd4VnDX79TKYm7WcytlNdl1kf6k0tf2ELKg52FH2HhJuAyOnbo2FYOoIcrxYwb +6bvmBypjNq4gYEei/cCrUNGn2iS2PEYF99NFL0+4Sph8+2FWjMnBQs1BA/frLWM7 +tCVBcm5hdWQgUXVldHRlIDxhcm5hdWQucXVldHRlQGZyZWUuZnI+iQI6BBMBCAAk +AhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheABQJTVicHAhkBAAoJEKzA5BBVyll2 +HWYP/jNikSm0tBUwmgN2OA+qD4PRVrEFixz2S28L/BIGwDNz01pQ2jCGk5Og6o0F +fgYNq90UIh4jHPsDXrfaX1O3T9dhZk2ldvm2/fJGETpODEHP/o9qpM54CED9KTED +gzC8LX4pZjpW0ilnzllyPy1Df8s2Z4ylMhWY+D+WSJK2EzMjvSW1cke5TTR5wGxj +0+tDJJRztkA6+2mrOx8zIw8j4Y9jiXrAG0x3czYId2GLoGduYWNChZx3IzaJRBlE +jFAL2QKeN0xwQCN4zMSVcESMcJUGcjdHp6Uzm6Ar3ZQKC1bQnc4LrK22SD2FUuQl +cONPdX+zFShJWAebAWG/9uGFW8CHDlFEPPWnbhxKWGGsO3GOFMpr1GVqdVQAC2p6 +6Ufr5z+5FN4sHjMWpDpNhJr6aDKGwQ8+Nwqu+WIWPpd+DJULiN/8OhgsDGtrkfTI +vGLiGCHq5GokisDb6+RxFQD5uSyfVRrsm74JwwS5wrfqVVUrfy0ffYPFa5AX37dZ +NBXqxKVLAr3b6zwVv2Y5pck41YKG1dqQ9Ol2/fLFd7GW1C9efzuOHtBoWbtqPJCU +US4IVxIXq+2P7pYEjpAscApz3zOJNKbLbW88X3MuAS1rN+HJQS3jgUCW8namsDfe +4n+wkWrkvEH2BQLrnOhxjpkSUtYVGrv4J42G0vcVCTojVjxLuQINBFNWJFIBEADC +ipna/LFz6G28lDhIRnFKU849zIQ23qbw2btCDtUFlE8rfXzdQbNbpy0nHiX0SgN1 +oNAppuA1FCZ7165C0XWGOtybm2d0V2CCqqIxL3W5kFfE40hZ+VoFWgEizb9am/TU +zz93QkQD/YgS3r/zzgF05CoInwLEx9UCtYwuFsiPZeUjlrIMyipTVNUMrDE2994C +Qj7DjRl10Ay/h0mZsygI9wKphHc7FSJimM4DUlf9YFr3If57UgZGQU9Nn5ewBu1S +KpjIGG9CCVf6R5opFI7y0vFe61OnpwG96FxNXF1owbxSrRLQGtwPT6tZ88ttZ/LN +5ej3ZEYhs5vzq4GbVUz98PpPswM1Yw1jHtKQpEQtDzrMP8Nw4EnFEfg90hWIHZpX +krh/TsqxjWRX0+rDAKJmH4+nhzijp3aEa1/rBYDZeaQ2SUuwh0msqjSKRs5qhy50 +3jS8oBSaR5vZfCLZv21J97x0REQE98VL3BPBL3UMgpjCQaCbwp+p6joj/esr38Wb +eGIjury6JtpVblv0uONNzKmvO/ShMlInwDASvPmNS3OUPSc3DyAJWmC5kOp7onPB +ORvOFfwOJI5D/2hO+ODXl0RjpEvpPX5S1f5ZIhNnp6TCtxyKhnmF3JWV3ZjrkrEP +VGiA9xnCCl0cGEwuU5o/AlBAx7BVwTRRyr0DW4h5BQARAQABiQIfBBgBCAAJBQJT +ViRSAhsMAAoJEKzA5BBVyll2VEkP/ROcMRGycWFDU0sXSRJ2QmXbrIKgiwS6MpGu +34UgucQ+8T7pY+zv7fre5uW4IEFz2theU1P1R/AOea6pgSUNSdvzLZKz5WBP6RTj +pM7vaX536zkgT6Cx+IPxWoLxwm3kmzKannM6kVpXXj7+WfQCqW8xFmkbyjxcAQ3R +CRIJQ9kyY+7APRmBly4t2STS4XtGoaejaBgSXvJr14gPHfSMX1P513P69O/PgD4n +pfxTT7xYOIkbFgl3Yw1jMAJmt204viT3Mty+tDMfQ19IxDWB3GJhD0YL6cC0iIOS +11aN/Nm1wRyN51gXvxhU4h+7sB6jLgaI77s5+F+8P2fO/YyqtlbS7Xike96XKnoO +SEYqo72p/9I6/AG+pJQs9FjgtjDhhwgoeOqgaU1rQFlgfgcgB8CCAjRM8w92Ow5L +5YFQq+BEVmTYDvSXa9WWh5aq4c6WOJ6ea/ggwZPEdjMlbLWuZLH+AHlo2fQG7whh +Tfp7btaNlHUqkHFvnEJmiO9uCxozVgZg7KlVMZLUxO444Rrm/xiBGkQD+GQmOvgu +DlbftVIcD48tA/nGe3WYcjE+122SdoiU60aIdZSBmppTBYGtUMg7Rm0cUis+hXpM ++FNMPD+Wm4mQcnbyvoapl18nJfv6A2Twj9hbz9NugSXzXtT1gpzgE8N0qqFAuAmH +hcCIxZZPuQINBFNWJyoBEADe5vPY2wlo5Eb3y/RyQ1O7m30vW3S9CZgSYuHPXYM3 +0G+ocGOcjVhyi8OEqbC62w39Q0foCHLxzN+l3R6cZdAdlE/hUT2dAj3RE6ebXAbX +zSg9yU6H8XuSl4m7A/fJ6NtII3fNj/6ydSYhcMPeSz3UQ3BOROL9BLfSWacEPcdk +h7929ibOieeGsSaA/vWLXspv9DL6Nczcfz9C2Fd56wRh+YMEn5xwMoRuZWmxxXIq +/B/5Mf4zkxlCGNHTnelZ4WkXoarH+CRPXiPVdt3wX91tVKmucob3WdCY4qQzr45K +qobaNPCzExPLCz/bC8aOINjSW5K4pHF8wpQCK94SafKCcWaHmptwVAWVu1/9FgSr +MSWdiTGKXtH/7SOWTwgmb0LoUZ2p3RYIv4Tt7JnxSlXbgwrRA322GcCEhpRqH29C +D2oSmLrrL4/s683kFx+h6LR3fraRB1T79apDJK/lHXWdUpZwAEY2hqdcx1UwCHTB +/AJQWDmbtWqSlZatIRu2yTN9THKbdzzCWQSr0XklRRItapuyDhclVE6kj4zSZllG +GBqEeUlTrBFJuqyHWtzW8iBI9wCXjaTAhwuTFpXY/wqpCiyWNr7UHqeXKdsOmtnm +2vDZMJ5qt6KyRUKwq5dwIz+T0CZH3AekUY3IUcr10L1hAc8AcLWUQytu+Hq1Ci/W +YQARAQABiQIfBBgBCAAJBQJTVicqAhsMAAoJEKzA5BBVyll2mNQP/23pGNF08XGu +9/arCOp0+nV/cdKtQR4od2V/qgaxmWRMieFy6f5fJnlH5QXSH5bkcjW5GGXdPpC6 +9LjXRe1WLGTUCE/KtKHGQ+KVmF3xZ1nTYmFh7cO8PJLZ2vSrqNAQt4D+8kFHzNFm +qBqZRy/2t7bCxyi55N58srqQnSHRBREDSdVmWQVt+HuiklQt7fzRbbeAtsD25x0/ +Tc93BIFEu0evOa0QGAe9eqXQVeiFV+Q0foPAwMiR0i5OLRoySGxuSOD2w5vok8rR +pDwooGWlmDO/kYWeD0qZPJaQQFW7Q/iSaGwC7guQ3YMvzfLt9oGxJKoL2PNX/HtP +fEyLhA4AVBWfpsrHq7wuszujNeUPDBHbgGzRfGbHAf9DWjT7hzh5d+R6s5Q1avrp +lhUxvX4kBkjkk56cSqWb7CbBYM6iX+acnLwAmsbNhAHkB1rzQQq+KsRRwBGE0qDy +TLTnQaDcKCVmzNQIYPD0JnHhtrHRtVpbuXQCUzv42OA4ztME1TYs+xGhzK25AA9b +uWgVOonVp6LCCeeBkrsUSxuTZOZ6RNWz/cYDOMQAVfEx/tNWLBUT2uzDIyRfSzzZ +8HUycO9Cj6vY+JQf+TAi0KSDKXUK4p6C3NloeEt4cDpSkPgzNGHFqXBgWLTpv+GA +1Fl1SNx/VNIXb2ScB4cMtnHgIs9z4d7t +=H4gS -----END PGP PUBLIC KEY BLOCK-----
