Hello community,
here is the log from the commit of package apcupsd for openSUSE:Factory checked
in at 2016-06-19 10:48:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2015-07-14
17:46:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.apcupsd.new/apcupsd.changes 2016-06-19
10:48:37.000000000 +0200
@@ -1,0 +2,31 @@
+Tue May 31 23:09:00 CEST 2016 - manfre...@gmx.ch
+
+- Update to apcupsd version 3.14.14
+ * win32: Fix missing DLLs when installing only apctray
+ * Fixes for socket error handling. Resolves apcaccess crash when connection
+ fails as well as several other theoretical issues.
+ * MODBUS/USB error handling (COMMLOST) improvements for faulty USB links
+ * Fix hiddev binding when usbfs is mounted on /dev/bus/usb instead of
+ /proc/bus/usb. This is necessary for switching between MODBUS/USB and
+ USB/HID on Linux.
+ * Update GPLv2 text and FSF address to match current versions from FSF.
+ * Various fixes for potential issues suggested by Coverity Scan
+ * MacOS X port support for El Capitan System Integrity Protection (SIP)
+ aka "rootless"
+ * Fix shutdown failure on Windows when UPSNAME includes spaces
+ * Fix building bsd-usb driver
+ (This was broken when modbus-usb support was added.)
+ * Add status display for output current as well as apparent power
+- fix firewall rule installation in spec file
+- drop BuildRequires: net-snmp-devel, net-snmp was dropped in favour of
snmplite
+- drop installation of own automake files for ppc64, not needed any more
+- Removed patches, fixed in upstream:
+ * apcupsd-3.14.6-undef-MIB-for-new-net-snmp.diff
+ * fix-fsf-adress.patch
+ * apcupsd-3.14.1-cloexec.patch
+ * apcupsd-gpp.patch
+- Removed patch, not needed as it builds on all supported arches,
+ and not linking against libstdc++ is done on purpose:
+ * apcupsd-3.14.8-cxxld.patch
+
+-------------------------------------------------------------------
@@ -14 +45 @@
-- Version bumpt o 3.13.13:
+- Version bump to 3.14.13:
Old:
----
apcupsd-3.14.1-cloexec.patch
apcupsd-3.14.13.tar.gz
apcupsd-3.14.13.tar.gz.sig
apcupsd-3.14.6-undef-MIB-for-new-net-snmp.diff
apcupsd-3.14.8-cxxld.patch
apcupsd-gpp.patch
fix-fsf-adress.patch
New:
----
apcupsd-3.14.14.tar.gz
apcupsd-3.14.14.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apcupsd.spec ++++++
--- /var/tmp/diff_new_pack.1NlWV4/_old 2016-06-19 10:48:38.000000000 +0200
+++ /var/tmp/diff_new_pack.1NlWV4/_new 2016-06-19 10:48:38.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package apcupsd
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -18,44 +18,33 @@
%define apache_serverroot %(%{_sbindir}/apxs2 -q datadir 2>/dev/null ||
%{_sbindir}/apxs -q PREFIX)
Name: apcupsd
-Version: 3.14.13
+Version: 3.14.14
Release: 0
Summary: APC UPS Daemon (Powerful Daemon for APC UPSs)
License: GPL-2.0
Group: Hardware/UPS
Url: http://www.apcupsd.com/
-Source:
http://downloads.sourceforge.net/project/apcupsd/apcupsd%%20-%%20Stable/%{version}/apcupsd-%{version}.tar.gz
+Source:
https://sourceforge.net/projects/apcupsd/files/apcupsd%20-%20Stable/%{version}/apcupsd-%{version}.tar.gz
Source1: apcupsd.init
Source2: README.SUSE
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
+Source8:
https://sourceforge.net/projects/apcupsd/files/apcupsd%20-%20Stable/%{version}/apcupsd-%{version}.tar.gz.sig
Source9: %{name}.keyring
Source10: %{name}.firewall
# PATCH-FIX-OPENSUSE apcupsd-suse.patch sbra...@suse.cz -- Do not perform halt
script alternation on install.
Patch0: apcupsd-suse.patch
-# PATCH-FIX-OPENSUSE apcupsd-gpp.patch sbra...@suse.cz -- Build against C++
unfriendly system tcpd.h. See below.
-Patch1: apcupsd-gpp.patch
# PATCH-FEATURE-OPENSUSE apcupsd-hibernate.patch sbra...@suse.cz -- Support
for hibernation on powerfail.
Patch2: apcupsd-hibernate.patch
-# PATCH-FIX-OPENSUSE apcupsd-3.14.6-undef-MIB-for-new-net-snmp.diff
se...@opensuse.org -- 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
cristian.rodrig...@opensuse.org -- Close the socket on exec - avoid leaked file
descriptors, patch from Fedora.
-Patch10: apcupsd-3.14.1-cloexec.patch
# PATCH-FIX-OPENSUSE apcupsd-3.14.8-systemd.patch p.drou...@gmail.com --
systemd support
Patch11: apcupsd-3.14.8-systemd.patch
-# PATCH-FIX-OPENSUSE apcupsd-3.14.8-cxxld.patch p.drou...@gmail.com -- fix
FTBFS, c++ linking needs -lstdc++ explicitly
-Patch12: apcupsd-3.14.8-cxxld.patch
# PATCH-FIX-OPENSUSE apcupsd-3.14.9-fixgui.patch rhbz#578276
p.drou...@gmail.com -- fix crash in gui
Patch13: apcupsd-3.14.9-fixgui.patch
-# PATCH-FIX-OPENSUSE fix-fsf-adress.patch p.drou...@gmail.com -- FSF adress is
incorrect
-Patch14: fix-fsf-adress.patch
# PATCH-FEATURE-OPENSUSE apcupsd-pm-utils.patch sbra...@suse.cz -- Use
pm-utils in openSUSE < 13.1 and SLE < 12
Patch15: apcupsd-pm-utils.patch
BuildRequires: apache2-devel
-BuildRequires: automake
BuildRequires: distribution-release
BuildRequires: dos2unix
BuildRequires: fdupes
@@ -67,7 +56,6 @@
BuildRequires: libusb-devel
BuildRequires: mailx
BuildRequires: ncurses-devel
-BuildRequires: net-snmp-devel
BuildRequires: tcpd-devel
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel
@@ -127,21 +115,12 @@
%prep
%setup -q
-#This is needed as apcupsd doesn't recognize ppc64 correctly
-cp %{_datadir}/automake*/config.{guess,sub} autoconf/
cp -a %{SOURCE1} platforms/suse/apcupsd.in
-cp -a %{SOURCE2} %{SOURCE4} %{SOURCE5} .
+cp -a %{SOURCE2} %{SOURCE4} .
%patch0
-# To be surely in sync with tcpd API, build against system header. It requires
a patch.
-rm include/tcpd.h
-%patch1
%patch2
-%patch9
-%patch10 -p1
%patch11 -p1
-%patch12 -p1
%patch13 -p1
-%patch14 -p1
sed -i '/^#!/d' %{SOURCE1}
%if 0%{?suse_version} < 1310
%patch15
@@ -189,8 +168,9 @@
sed "s:@PWRFAILDIR@:%{_sysconfdir}/%{name}:g" <%{name}.hibernate
>%{buildroot}%{_sysconfdir}/pm/sleep.d/99apcupsd
chmod +x %{buildroot}%{_sysconfdir}/pm/sleep.d/99%{name}
%endif
+
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
-cp %{name}.sysconfig
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+cp %{SOURCE5}
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
# systemd support and remove initd support for opensuse 12.2 and higher
%if 0%{?suse_version} > 1210
@@ -205,7 +185,7 @@
install -m0644 %{SOURCE7}
%{buildroot}%{_sysconfdir}/apache2/conf.d/%{name}.conf
# firewall config
-install -m 644 -D %{SOURCE5}
%{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
+install -m 644 -D %{SOURCE10}
%{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
%pre
%if 0%{?suse_version} > 1220
@@ -237,7 +217,7 @@
%{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="\(%{_sysconfdir}/apcupsd/apccontrol
killpower\|%{_sysconfdir}/init\.d/apcupsd try-powerdown\|\)"'
etc/sysconfig/shutdown ; then
+if usr/bin/grep -q
'^HALT_POWERDOWN_INSERT="\(%{_sysconfdir}/%{name}/apccontrol
killpower\|%{_sysconfdir}/init\.d/apcupsd try-powerdown\|\)"'
etc/sysconfig/shutdown ; then
usr/bin/sed -i
's:^\(HALT_POWERDOWN_INSERT="\).*"[[:space:]]*:\1%{_initddir}/apcupsd
try-powerdown":' etc/sysconfig/shutdown
else
echo >&2 "%{name}: WARNING: Unknown value of HALT_POWERDOWN_INSERT in
%{_sysconfdir}/sysconfig/shutdown."
@@ -302,9 +282,9 @@
%config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%config(noreplace) %attr(0644,root,root)
%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
-%attr(0755,root,root) %{_sysconfdir}/apcupsd/apccontrol
+%attr(0755,root,root) %{_sysconfdir}/%{name}/apccontrol
%{_mandir}/man?/*.*
-%{_localstatedir}/adm/fillup-templates/sysconfig.*
+%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
%files gui
%defattr(-,root,root)
++++++ apcupsd-3.14.13.tar.gz -> apcupsd-3.14.14.tar.gz ++++++
++++ 34661 lines of diff (skipped)
