Mailinglist Archive: opensuse-commit (1029 mails)

< Previous

Next >

Hello community,

here is the log from the commit of package apcupsd for openSUSE:Factory
checked in at Tue Jul 5 11:02:52 CEST 2011.

--------
--- apcupsd/apcupsd.changes 2011-03-24 16:36:06.000000000 +0100
+++ /mounts/work_src_done/STABLE/apcupsd/apcupsd.changes 2011-07-04
21:06:29.000000000 +0200
@@ -1,0 +2,15 @@
+Mon Jul 4 20:36:19 CEST 2011 - sbrabec@xxxxxxx
+
+- Updated to version 3.14.8:
+ * Implement battery calibration and self-test interval in apctest
+ for USB models.
+ * Add support for turning the UPS off completely.
+ * Updates of SNMP code.
+ * Add support for reading battery voltage from the PowerSummary.
+ * Switch time/date output format to simplified ISO.
+ * Compilation warning fixes.
+ * Other bug fixes and improvements.
+ * Documentation improvements.
+- Removed HAL support.
+
+-------------------------------------------------------------------
@@ -4,0 +20 @@
+ (reported later as bnc#703592)

calling whatdependson for head-i586

Old:
----
apcupsd-3.14.5-const.patch
apcupsd-3.14.6.tar.bz2

New:
----
apcupsd-3.14.8.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ apcupsd.spec ++++++
--- /var/tmp/diff_new_pack.R5zxtA/_old 2011-07-05 10:50:44.000000000 +0200
+++ /var/tmp/diff_new_pack.R5zxtA/_new 2011-07-05 10:50:44.000000000 +0200
@@ -19,23 +19,26 @@

Name: apcupsd
-BuildRequires: apache2-devel distribution-release dos2unix gcc-c++
gconf2-devel gd-devel gnome-vfs2-devel gtk2-devel mailx ncurses-devel
net-snmp-devel tcpd-devel update-desktop-files
-BuildRequires: sysvinit
+BuildRequires: apache2-devel distribution-release dos2unix gcc-c++
gconf2-devel gd-devel gnome-vfs2-devel gtk2-devel mailx ncurses-devel
net-snmp-devel sysvinit tcpd-devel update-desktop-files
Group: Hardware/UPS
License: GPLv2+
Summary: APC UPS Daemon (Powerful Daemon for APC UPSs)
-Version: 3.14.6
-Release: 15
+Version: 3.14.8
+Release: 1
Url: http://www.apcupsd.com/
Source: apcupsd-%{version}.tar.bz2
Source1: apcupsd.init
Source2: README.SUSE
Source3: apcupsd-early-powerdown.init
+# PATCH-FIX-OPENSUSE apcupsd-suse.patch sbrabec@xxxxxxx -- Do not perform halt
script alternation on install.
Patch: apcupsd-suse.patch
+# PATCH-FIX-OPENSUSE apcupsd-gpp.patch sbrabec@xxxxxxx -- Build against C++
unfriendly system tcpd.h. See below.
Patch1: apcupsd-gpp.patch
+# PATCH-FEATURE-OPENSUSE apcupsd-powersave.patch sbrabec@xxxxxxx -- Call
powersave-notify in distros where it is available.
Patch3: apcupsd-powersave.patch
+# PATCH-FIX-OPENSUSE apcupsd-largebuf-overflow.patch sbrabec@xxxxxxx -- Fix
static buffer overflow.
Patch5: apcupsd-largebuf-overflow.patch
-Patch8: apcupsd-3.14.5-const.patch
+# PATCH-FIX-OPENSUSE apcupsd-3.14.6-undef-MIB-for-new-net-snmp.diff
seife@xxxxxxxxxxxx -- Fix build with newer net-snmp by undefining MIB.
Patch9: apcupsd-3.14.6-undef-MIB-for-new-net-snmp.diff
Patch10: apcupsd-3.14.1-cloexec.patch
PreReq: %fillup_prereq %insserv_prereq /usr/bin/sed /usr/bin/grep
@@ -69,17 +72,19 @@

%prep
%setup -q
-rm include/tcpd.h
cp -a %{S:1} platforms/suse/apcupsd.in
cp -a %{S:2} .
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
+%if %suse_version <= 1110
%patch3
+%endif
chmod -x kernstodo
%patch5
-%patch8
%patch9
%patch10 -p1

@@ -124,6 +129,9 @@
# fix end-of-line encoding
dos2unix -o examples/status/SmartUPS-vs-650.status examples/snoopdecode.c
examples/rpt/Smart-UPS-1500.rpt \
examples/rpt/Back-UPS-ES-550.rpt examples/rpt/Back-UPS-CS-650.rpt
examples/rpt/Back-UPS-BR-800.rpt
+%if %suse_version > 1130
+rm -r $RPM_BUILD_ROOT/usr/share/hal
+%endif

%post
%{fillup_and_insserv apcupsd}
@@ -173,13 +181,15 @@

%files
%defattr(-,root,root)
-%doc apcupsd-early-powerdown COPYING ChangeLog* DISCLAIMER Developers INSTALL
README.SUSE ReleaseNotes kernstodo examples/
+%doc apcupsd-early-powerdown COPYING ChangeLog* DISCLAIMER Developers INSTALL
README.SUSE ReleaseNotes examples/
/sbin/apcupsd-lite
+%if %suse_version <= 1130
%dir %{_datadir}/hal
%dir %{_datadir}/hal/fdi
%dir %{_datadir}/hal/fdi/policy
%dir %{_datadir}/hal/fdi/policy/20thirdparty
%{_datadir}/hal/fdi/policy/20thirdparty/*.fdi
+%endif
%{_sbindir}/apcupsd
%{_sbindir}/apcaccess
%{_sbindir}/apctest

++++++ apcupsd-3.14.6.tar.bz2 -> apcupsd-3.14.8.tar.bz2 ++++++
++++ 522762 lines of diff (skipped)

++++++ apcupsd-gpp.patch ++++++
--- /var/tmp/diff_new_pack.R5zxtA/_old 2011-07-05 10:50:45.000000000 +0200
+++ /var/tmp/diff_new_pack.R5zxtA/_new 2011-07-05 10:50:45.000000000 +0200
@@ -1,9 +1,11 @@
This patch is required to work correctly with system tcpd.h, i. e. with
"rm include/tcpd.h".

================================================================================
---- include/apc.h
+Index: include/apc.h
+===================================================================
+--- include/apc.h.orig
+++ include/apc.h
-@@ -143,7 +143,9 @@
+@@ -154,7 +154,9 @@

/* Pull in our local copy because the library does not have correct protos */
#ifdef HAVE_LIBWRAP
@@ -12,4 +14,4 @@
+}
#endif

- #endif
+ /* Solaris doesn't define this */

++++++ apcupsd-powersave.patch ++++++
--- /var/tmp/diff_new_pack.R5zxtA/_old 2011-07-05 10:50:45.000000000 +0200
+++ /var/tmp/diff_new_pack.R5zxtA/_new 2011-07-05 10:50:45.000000000 +0200
@@ -1,6 +1,8 @@
---- examples/safe.apccontrol.in
+Index: examples/safe.apccontrol.in
+===================================================================
+--- examples/safe.apccontrol.in.orig
+++ examples/safe.apccontrol.in
-@@ -15,96 +15,128 @@
+@@ -15,96 +15,128 @@ SCRIPTDIR=@sysconfdir@
#
case "$1" in
killpower)
@@ -129,7 +131,7 @@
wall <<EOF
apccontrol: Emergency! UPS batteries have failed.

-@@ -112,18 +144,24 @@
+@@ -112,18 +144,24 @@ Change them NOW !
EOF
;;
remotedown)
@@ -154,9 +156,11 @@
wall <<EOF
apccontrol: end self test would have been called.

---- platforms/apccontrol.in
+Index: platforms/apccontrol.in
+===================================================================
+--- platforms/apccontrol.in.orig
+++ platforms/apccontrol.in
-@@ -24,6 +24,7 @@
+@@ -24,6 +24,7 @@ SHUTDOWN=@SHUTDOWN@
SCRIPTSHELL=@SCRIPTSHELL@
SCRIPTDIR=@sysconfdir@
WALL=wall
@@ -164,7 +168,7 @@

#
# Concatenate all output from this script to the events file
-@@ -56,18 +57,23 @@
+@@ -56,18 +57,23 @@ then
fi
fi

@@ -175,7 +179,8 @@
+
case "$1" in
killpower)
- echo "Apccontrol doing: ${APCUPSD} --killpower on UPS ${2}"
+- echo "Apccontrol doing: ${APCUPSD} --killpower on UPS ${2}" | ${WALL}
++ notify "Apccontrol doing: ${APCUPSD} --killpower on UPS ${2}"
sleep 10
${APCUPSD} --killpower
- echo "Apccontrol has done: ${APCUPSD} --killpower on UPS ${2}" | ${WALL}
@@ -191,7 +196,7 @@
;;
#
# powerout, onbattery, offbattery, mainsback events occur
-@@ -76,10 +82,10 @@
+@@ -76,47 +82,47 @@ case "$1" in
powerout)
;;
onbattery)
@@ -204,7 +209,8 @@
;;
mainsback)
if [ -f @PWRFAILDIR@/powerfail ] ; then
-@@ -87,36 +93,36 @@
+- printf "Continuing with shutdown." | ${WALL}
++ notify "Continuing with shutdown."
fi
;;
failing)

++++++ apcupsd.init ++++++
--- /var/tmp/diff_new_pack.R5zxtA/_old 2011-07-05 10:50:45.000000000 +0200
+++ /var/tmp/diff_new_pack.R5zxtA/_new 2011-07-05 10:50:45.000000000 +0200
@@ -27,7 +27,7 @@

APCUPSD=@sbindir@/apcupsd
APCUPSD_LITE=/sbin/apcupsd-lite
-test -x $APCUPSD -o -x $APCUPSD_LITE || exit 5
+test -x $APCUPSD -a -x $APCUPSD_LITE || exit 5

# Shell functions sourced from /etc/rc.status:
# rc_check check and set local and overall rc status

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous

Next >

Mailinglist Archive: opensuse-commit (1029 mails)

commit apcupsd for openSUSE:Factory

Search this list

List Navigation

This Thread