Hello community, here is the log from the commit of package apcupsd for openSUSE:Factory checked in at 2014-02-19 18:56:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apcupsd (Old) and /work/SRC/openSUSE:Factory/.apcupsd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apcupsd" Changes: -------- --- /work/SRC/openSUSE:Factory/apcupsd/apcupsd.changes 2014-01-29 07:12:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2014-02-19 18:56:04.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Feb 12 21:05:58 CET 2014 - [email protected] + +- Updated to version 3.14.11: + * APC MODBUS protocol support over RS232 + For more see ReleaseNotes. +- Verify GPG signature. +- Remove obsolete apcupsd-early-powerdown script. +- Remove upgrade scripts for SuSE Linux 8 and SLES 8. +- Do not call powersave-notify (regression bnc#856907). + +------------------------------------------------------------------- Old: ---- apcupsd-3.14.10.tar.bz2 apcupsd-early-powerdown.init New: ---- apcupsd-3.14.11.tar.gz apcupsd-3.14.11.tar.gz.sig apcupsd.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apcupsd.spec ++++++ --- /var/tmp/diff_new_pack.W9Wjvy/_old 2014-02-19 18:56:04.000000000 +0100 +++ /var/tmp/diff_new_pack.W9Wjvy/_new 2014-02-19 18:56:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package apcupsd # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: apcupsd BuildRequires: apache2-devel BuildRequires: automake @@ -33,29 +34,33 @@ BuildRequires: tcpd-devel BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel -%if 0%{?suse_version} <= 1140 -BuildRequires: sysvinit -%else -%if 0%{?suse_version} >= 1220 +%if 0%{?suse_version} > 1220 +BuildRequires: gpg-offline +%endif +%if 0%{?suse_version} > 1220 BuildRequires: systemd-sysvinit %else +%if 0%{?suse_version} < 1210 +BuildRequires: sysvinit +%else BuildRequires: sysvinit-init %endif %endif Summary: APC UPS Daemon (Powerful Daemon for APC UPSs) License: GPL-2.0 Group: Hardware/UPS -Version: 3.14.10 +Version: 3.14.11 Release: 0 Url: http://www.apcupsd.com/ -Source: apcupsd-%{version}.tar.bz2 +Source: http://downloads.sourceforge.net/project/apcupsd/apcupsd%20-%20Stable/%{version}/apcupsd-%{version}.tar.gz Source1: apcupsd.init Source2: README.SUSE -Source3: apcupsd-early-powerdown.init -Source4: apcupsd.hibernate -Source5: apcupsd.sysconfig -Source6: apcupsd.logrotate +Source4: %{name}.hibernate +Source5: %{name}.sysconfig +Source6: %{name}.logrotate Source7: apcupsd-httpd.conf +Source8: http://downloads.sourceforge.net/project/apcupsd/apcupsd%20-%20Stable/%{version}/apcupsd-%{version}.tar.gz.sig +Source9: %{name}.keyring # PATCH-FIX-OPENSUSE apcupsd-suse.patch [email protected] -- Do not perform halt script alternation on install. Patch: apcupsd-suse.patch # PATCH-FIX-OPENSUSE apcupsd-gpp.patch [email protected] -- Build against C++ unfriendly system tcpd.h. See below. @@ -66,22 +71,24 @@ Patch3: apcupsd-powersave.patch # PATCH-FIX-OPENSUSE apcupsd-3.14.6-undef-MIB-for-new-net-snmp.diff [email protected] -- Fix build with newer net-snmp by undefining MIB. Patch9: apcupsd-3.14.6-undef-MIB-for-new-net-snmp.diff +# PATCH-FIX-OPENSUSE apcupsd-3.14.1-cloexec.patch [email protected] -- Close the socket on exec - avoid leaked file descriptors, patch from Fedora. Patch10: apcupsd-3.14.1-cloexec.patch -# systemd support +# PATCH-FIX-OPENSUSE apcupsd-3.14.8-systemd.patch [email protected] -- systemd support Patch11: apcupsd-3.14.8-systemd.patch -#fix FTBFS, c++ linking needs -lstdc++ explicitly +# PATCH-FIX-OPENSUSE apcupsd-3.14.8-cxxld.patch [email protected] -- fix FTBFS, c++ linking needs -lstdc++ explicitly Patch12: apcupsd-3.14.8-cxxld.patch -# fix crash in gui, rhbz#578276 +# PATCH-FIX-OPENSUSE apcupsd-3.14.9-fixgui.patch rhbz#578276 [email protected] -- fix crash in gui Patch13: apcupsd-3.14.9-fixgui.patch -# FSF adress is incorrect +# PATCH-FIX-OPENSUSE fix-fsf-adress.patch [email protected] -- FSF adress is incorrect Patch14: fix-fsf-adress.patch -%if 0%{?suse_version} < 1220 -PreReq: %fillup_prereq %insserv_prereq /usr/bin/sed /usr/bin/grep -%endif Requires: /usr/bin/mail -%if 0%{?suse_version} >= 1220 +Requires(post): %fillup_prereq +# sed and grep are still prerequred to finish upgrade from sysvinit scripts: +PreReq: /usr/bin/sed /usr/bin/grep +%if 0%{?suse_version} > 1220 %{?systemd_requires} -Requires(pre): %fillup_prereq +%else +PreReq: %insserv_prereq %endif Suggests: logrotate BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -120,25 +127,28 @@ http://www.apc.com/tools/download/. %prep +%if 0%{?gpg_verify:1} +%gpg_verify %{S:8} +%endif %setup -q #This is needed as apcupsd doesn't recognize ppc64 correctly cp /usr/share/automake*/config.{guess,sub} autoconf/ cp -a %{S:1} platforms/suse/apcupsd.in cp -a %{S:2} %{S:4} %{S:5} . -cp -a %{S:3} apcupsd-early-powerdown -chmod +x apcupsd-early-powerdown %patch # To be surely in sync with tcpd API, build against system header. It requires a patch. rm include/tcpd.h %patch1 %patch2 +%if %suse_version < 1110 %patch3 +%endif chmod -x kernstodo %patch9 %patch10 -p1 -%patch11 -p1 -b .systemd -%patch12 -p1 -b .cxxld -%patch13 -p1 -b .fixgui +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 %patch14 -p1 sed -i '/^#!/d' %{SOURCE1} @@ -156,7 +166,7 @@ %makeinstall install -m744 platforms/apccontrol \ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/apccontrol -%if 0%{?suse_version} < 1220 +%if 0%{?suse_version} <= 1220 mkdir -p $RPM_BUILD_ROOT%{_initrddir} ln -sf ../../etc/init.d/%{name} $RPM_BUILD_ROOT/%{_sbindir}/rc%{name} %endif @@ -180,7 +190,7 @@ cp %{name}.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.%{name} # systemd support and remove initd support for opensuse 12.2 and higher -%if 0%{?suse_version} >= 1220 +%if 0%{?suse_version} > 1220 install -p -D -m644 %{name}.service $RPM_BUILD_ROOT%{_unitdir}/%{name}.service install -p -D -m755 %{name}_shutdown $RPM_BUILD_ROOT/usr/lib/systemd/system-shutdown/%{name}_shutdown rm $RPM_BUILD_ROOT/etc/init.d/%{name} @@ -192,54 +202,54 @@ install -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/apache2/conf.d/%{name}.conf %post -%if 0%{?suse_version} >= 1220 -%service_add_post %{name}.service +%if 0%{?suse_version} > 1220 %{fillup_only} +%service_add_post %{name}.service +# Remove HALT_POWERDOWN_INSERT, it is not needed with systemd +if usr/bin/grep -q '^HALT_POWERDOWN_INSERT="\(/etc/init\.d/apcupsd try-powerdown\)"' etc/sysconfig/shutdown ; then + usr/bin/sed -i 's:^\(HALT_POWERDOWN_INSERT="\)\(/etc/init\.d/apcupsd try-powerdown\)":\1":' etc/sysconfig/shutdown +else + echo >&2 "apcupsd: WARNING: Unknown value of HALT_POWERDOWN_INSERT in /etc/sysconfig/shutdown." + echo >&2 " Keeping unchanged. Should be:" + echo >&2 "HALT_POWERDOWN_INSERT=\"\"" +fi +# User installed file, by default in docdir. Not needed any more, and will never be. +rm -f etc/init.d/apcupsd-early-powerdown %else +%{fillup_and_insserv %{name}} # HALT_POWERDOWN_INSERT is supported since SuSE Linux 10.1, SLES 10. # Install HALT_POWERDOWN_INSERT -if usr/bin/grep -q '^HALT_POWERDOWN_INSERT="\(/etc/%{name}/apccontrol killpower\|/etc/init\.d/%{name} try-powerdown\|\)"' etc/sysconfig/shutdown ; then - usr/bin/sed -i 's:^\(HALT_POWERDOWN_INSERT="\).*"[[:space:]]*:\1/etc/init.d/%{name} try-powerdown":' etc/sysconfig/shutdown +if usr/bin/grep -q '^HALT_POWERDOWN_INSERT="\(/etc/apcupsd/apccontrol killpower\|/etc/init\.d/apcupsd try-powerdown\|\)"' etc/sysconfig/shutdown ; then + usr/bin/sed -i 's:^\(HALT_POWERDOWN_INSERT="\).*"[[:space:]]*:\1/etc/init.d/apcupsd try-powerdown":' etc/sysconfig/shutdown else - echo >&2 "apcupsd: WARNING: Unknown value of HALT_POWERDOWN_INSERT in /etc/sysconfig/shutdown." + echo >&2 "%{name}: WARNING: Unknown value of HALT_POWERDOWN_INSERT in /etc/sysconfig/shutdown." echo >&2 " Keeping unchanged. Should be:" echo >&2 "HALT_POWERDOWN_INSERT=\"/etc/init.d/apcupsd try-powerdown\"" fi -# NOTE: Up to SuSE Linux 10.0, SLES 9 installation modified /etc/init.d/halt.local. -# Now it is obsolete and should be removed. -if [ -f etc/init.d/halt.local ] -then - if usr/bin/grep -q "XXX APCUPSD - DO NOT EDIT XXX" etc/init.d/halt.local ; then -# NOTE: SuSE Linux 8.2, SLES 8 and older have had a bug: Last "fi" -# command was not commented by $MAGICWORD and was not replaced during -# update. This script tries to detect such orphan "fi". - usr/bin/sed -i ':1;/XXX APCUPSD - DO NOT EDIT XXX/,+1s/^fi$/& # XXX APCUPSD - DO NOT EDIT XXX/;t1;/XXX APCUPSD - DO NOT EDIT XXX/d' etc/init.d/halt.local - fi -fi %endif %preun -%if 0%{?suse_version} >= 1220 +%if 0%{?suse_version} > 1220 %service_del_preun %{name}.service %else %{stop_on_removal apcupsd} %endif %postun -%if 0%{?suse_version} >= 1220 +%if 0%{?suse_version} > 1220 %service_del_postun %{name}.service %else # Remove HALT_POWERDOWN_INSERT if test $1 -eq 0 -a ! -f /etc/init.d/%{name} ; then - if usr/bin/grep -q '^HALT_POWERDOWN_INSERT="\(/etc/init\.d/%{name} try-powerdown\)"' etc/sysconfig/shutdown ; then - usr/bin/sed -i 's:^\(HALT_POWERDOWN_INSERT="\)\(/etc/init\.d/%{name} try-powerdown\)":\1":' etc/sysconfig/shutdown + if usr/bin/grep -q '^HALT_POWERDOWN_INSERT="\(/etc/init\.d/apcupsd try-powerdown\)"' etc/sysconfig/shutdown ; then + usr/bin/sed -i 's:^\(HALT_POWERDOWN_INSERT="\)\(/etc/init\.d/apcupsd try-powerdown\)":\1":' etc/sysconfig/shutdown else - echo >&2 "%{name}: WARNING: Unknown value of HALT_POWERDOWN_INSERT in /etc/sysconfig/shutdown." + echo >&2 "apcupsd: WARNING: Unknown value of HALT_POWERDOWN_INSERT in /etc/sysconfig/shutdown." echo >&2 " Keeping unchanged. Should be:" echo >&2 "HALT_POWERDOWN_INSERT=\"\"" fi - if test -f etc/init.d/%{name}-early-powerdown ; then - echo >&2 "%{name}: WARNING: You may want to remove your /etc/init.d/%{name}-early-powerdown." + if test -f etc/init.d/apcupsd-early-powerdown ; then + echo >&2 "%{name}: WARNING: You may want to remove your /etc/init.d/apcupsd-early-powerdown." fi fi %{restart_on_update apcupsd} @@ -253,7 +263,7 @@ %{_sbindir}/apcaccess %{_sbindir}/apctest %{_sbindir}/smtp -%if 0%{?suse_version} < 1220 +%if 0%{?suse_version} <= 1220 %{_initrddir}/%{name} %{_sbindir}/rc%{name} %else ++++++ apcupsd-3.14.1-cloexec.patch ++++++ --- /var/tmp/diff_new_pack.W9Wjvy/_old 2014-02-19 18:56:04.000000000 +0100 +++ /var/tmp/diff_new_pack.W9Wjvy/_new 2014-02-19 18:56:04.000000000 +0100 @@ -1,6 +1,6 @@ ---- apcupsd-3.14.1/src/apcnis.c.cloexec 2006-08-13 11:00:15.000000000 -0600 -+++ apcupsd-3.14.1/src/apcnis.c 2007-08-01 16:26:35.000000000 -0600 -@@ -155,6 +155,9 @@ +--- apcupsd-3.14.11.orig/src/apcnis.c ++++ apcupsd-3.14.11/src/apcnis.c +@@ -155,6 +155,9 @@ void do_server(UPSINFO *ups) sleep(5 * 60); } @@ -10,9 +10,9 @@ /* Reuse old sockets */ #ifndef HAVE_MINGW if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (void*)&turnon, sizeof(turnon)) < 0) { ---- apcupsd-3.14.1/src/apcupsd.c.cloexec 2006-09-23 11:42:47.000000000 -0600 -+++ apcupsd-3.14.1/src/apcupsd.c 2007-08-01 16:27:14.000000000 -0600 -@@ -280,6 +280,9 @@ +--- apcupsd-3.14.11.orig/src/apcupsd.c ++++ apcupsd-3.14.11/src/apcupsd.c +@@ -272,6 +272,9 @@ int main(int argc, char *argv[]) if (ups->event_fd < 0) { log_event(ups, LOG_WARNING, "Could not open events file %s: %s\n", ups->eventfile, strerror(errno)); @@ -22,27 +22,27 @@ } } ---- apcupsd-3.14.1/src/drivers/usb/linux/linux-usb.c.cloexec 2007-08-01 16:30:28.000000000 -0600 -+++ apcupsd-3.14.1/src/drivers/usb/linux/linux-usb.c 2007-08-01 16:42:55.000000000 -0600 -@@ -182,8 +182,11 @@ +--- apcupsd-3.14.11.orig/src/drivers/usb/linux/linux-usb.c ++++ apcupsd-3.14.11/src/drivers/usb/linux/linux-usb.c +@@ -164,8 +164,11 @@ int LinuxUsbUpsDriver::open_usb_device() /* Retry 10 times */ for (i = 0; i < 10; i++) { - my_data->fd = open_device(ups->device, ups); -- if (my_data->fd != -1) -+ if (my_data->fd != -1) { + _fd = open_device(_ups->device); +- if (_fd != -1) ++ if (_fd != -1) { + /* Close the device on exec - avoid leaked file descriptors */ -+ fcntl(my_data->fd, F_SETFD, FD_CLOEXEC); ++ fcntl(_fd, F_SETFD, FD_CLOEXEC); return 1; + } sleep(1); } -@@ -206,6 +209,8 @@ +@@ -188,6 +191,8 @@ auto_detect: asnprintf(devname, sizeof(devname), "%s%d", hiddev[j], k); - my_data->fd = open_device(devname, ups); - if (my_data->fd != -1) { + _fd = open_device(devname); + if (_fd != -1) { + /* Close the device on exec - avoid leaked file descriptors */ -+ fcntl(my_data->fd, F_SETFD, FD_CLOEXEC); ++ fcntl(_fd, F_SETFD, FD_CLOEXEC); /* Successful open, save device name and return */ - astrncpy(ups->device, devname, sizeof(ups->device)); + astrncpy(_ups->device, devname, sizeof(_ups->device)); return 1; ++++++ apcupsd.keyring ++++++ pub 1024D/A57B2D90 2003-06-08 uid Apcupsd Distribution Verification Key (www.apcupsd.com) sub 2048g/65590592 2003-06-08 -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2.0.22 (GNU/Linux) mQGiBD7jZ4QRBACFdB1TsjQzVfEs56Uno9bS1gOkeb9okKVghhx47Jb5kVzdYDVP c/jPV2KJIp24iqLlgFkxHHeAosZbYasjdjEIxFUXePob+cSxyafk9Jeeyu9eAasG I8wB6E0joXyUcesrzOdhk/HLLBK+mgdxkd9Xhv41uasOJa8zyZoit0KtNwCg2PiC aPC4eu4QT8e2hGbLRrNkHUsD/jvZYbPqSuV/G1svvuQgCEsI2Xl9x0dX82eJXm/i EQx2MIi2RmwkbtCyGya7rMi+sBFIEqYcuBX9GfWD7KWpEKSJ0KHBGfm931QRClJN 2tROXHXIyIjiq8wiQFdOTb1L6ohlUbowTmQVfx4iXMGXhS65uNM9Fzb6rAZSg8zd M4+QA/9Kp/BNMiaeRSgI2ejkiDsgaykZvbZoIJbRqaXAHBekSYSGKC++m50KLLem Udm/aX8QJ/cnSa3a2G6pPYEfxKsqvPwfw+ckTbfh+YiIalXceDEdN6SHcWwl6EBE i6CHAo0g5KAUaOvECIaFjaAsbj8wjLcKYSiJvvbxB0lXVVmP27Q3QXBjdXBzZCBE aXN0cmlidXRpb24gVmVyaWZpY2F0aW9uIEtleSAod3d3LmFwY3Vwc2QuY29tKYha BBMRAgAaBQI+42eEBQsHAwIBAxUCAwMWAgECHgECF4AACgkQJOhIBKV7LZCHlgCg skw51T2B7Qsu1zrRnZlSiXqt3IIAn1vyr6nc0fb9vwGMMXRWz1UdpNTruQINBD7j Z48QCADo6scr2jvJEPAG2m1ULZQn/F3RcjbUmT7vM+kcxfIGteO8v+cRHVe4bMjA VRcXTw0YDYB9BVvz1t6FnZNFpt3Y9YXKgXz3FwRn3sE+rpfR6g+fl2NCmCg/M4eU mhuU6kbt5bsBdsGEMBU2WZgNsHJaeSLXmw1VBB3nMmbzDoGvWs/6Xb1wXaeEpRhR yRP+hGIiZ8EPdixjwXvU210w5EjQBHVWOmShqzHlc5hRiMAoyPVWL3nd+RKu8bH8 hTCYy4LVBbLJl1tIFHVA63DdTDknrsGP2UdAZejwSMfDxO6mEUM8gSM38suXAqNs NgHPYRck2WoIIizXjeIreUAhgzirAAMGB/9aKc0m9N3WCqsqaZe24i59D/zUoPvr ghEuBO1vogQjtn7OVoGld3CVJYwkc7rBmpCw4tDP3icyM9mB1ziQwn4Vh1FqQ5fU 9d+IdaQWS91XOgfvxrK9v36dxROvZrjxmoZBCfqlbaY/I1NvBdrTLp4idhAU/xHF hDKGn7Yth+n97BmYk+WUBI1LNm6/03L1BC8OM2oWpU4B39mOUwsZKw/HFlxi0AIO 5t7mYbrW9zVkX9eagFcb1lvQWPLXNGVdg5+Nh42bv/a5/qWVAtLQAjmE9bRlbpBS /EAVKhHCaacbjgiH20tNJu3p8EedYh33/Cc8eUoHbao4kPv8+145OgHeiEYEGBEC AAYFAj7jZ48ACgkQJOhIBKV7LZDuQgCeLOETS2V7tOCcNyCgzjkf87ErtbMAnAlA 3PtVwnTwKq1KDZOKA5+1Gz80 =YE1Q -----END PGP PUBLIC KEY BLOCK----- -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
