Hello community, here is the log from the commit of package apcupsd checked in at Wed Jan 23 10:42:11 CET 2008. -------- --- apcupsd/apcupsd.changes 2008-01-14 15:55:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/apcupsd/apcupsd.changes 2008-01-21 15:25:26.000000000 +0100 @@ -1,0 +2,19 @@ +Mon Jan 21 15:17:31 CET 2008 - sbrabec@suse.cz + +- Updated to version 3.14.3: + * HAL policy file is automatically installed on Linux systems to + disable the hald-addon-hid-ups module which conflicts with + apcupsd's control of USB UPSes. The file is automatically + removed when apcupsd is uninstalled. + * Add support for Nominal Power (aka Configured Active Power) + reading. + * Add units to NOMINV, NOMOUTV, and NOMBATTV stats. + * Eliminate some gcc warnings. + * Fix killpower and eeprom settings bug on USB modules introduced + when INPUT reports were prioritized over FEATURE reports. + * Fix bugs that could cause NIS-net driver to get stuck waiting + for comms to be restored instead of shutting down. +- Fixed possible buffer overflow. +- Removed support for SuSE Linux <= 10.0. + +------------------------------------------------------------------- Old: ---- apcupsd-3.14.2.tar.bz2 New: ---- apcupsd-3.14.3.tar.bz2 apcupsd-largebuf-overflow.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apcupsd.spec ++++++ --- /var/tmp/diff_new_pack.Z17500/_old 2008-01-23 10:41:07.000000000 +0100 +++ /var/tmp/diff_new_pack.Z17500/_new 2008-01-23 10:41:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package apcupsd (Version 3.14.2) +# spec file for package apcupsd (Version 3.14.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,7 +20,7 @@ Group: Hardware/UPS License: GPL v2 or later Summary: APC UPS Daemon (Powerful Daemon for APC UPSs) -Version: 3.14.2 +Version: 3.14.3 Release: 1 Url: http://www.apcupsd.com/ Source: apcupsd-%{version}.tar.bz2 @@ -31,6 +31,7 @@ Patch1: apcupsd-gpp.patch Patch3: apcupsd-powersave.patch Patch4: apcupsd-configure.patch +Patch5: apcupsd-largebuf-overflow.patch PreReq: %fillup_prereq %insserv_prereq /usr/bin/sed /usr/bin/grep Requires: /usr/bin/mail BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -82,12 +83,11 @@ chmod +x apcupsd-early-powerdown %patch -p1 %patch1 -%if %suse_version > 1000 %patch3 -%endif chmod -x kernstodo # Estonian in Estonia -> Estonian %patch4 +%patch5 mv src/po/et_EE.po src/po/et.po %build @@ -127,10 +127,6 @@ mkdir -p $RPM_BUILD_ROOT/sbin install src/apcupsd-lite $RPM_BUILD_ROOT/sbin ln -sf ../../etc/init.d/apcupsd $RPM_BUILD_ROOT/usr/sbin/rcapcupsd -%if %suse_version <= 1000 -install -d -m 755 $RPM_BUILD_ROOT/usr/lib/apcupsd -install -m 744 platforms/suse/halt-setup.sh $RPM_BUILD_ROOT/usr/lib/apcupsd -%endif rm doc/Makefile.in doc/Makefile doc/apcupsd.man %find_lang apcupsd %suse_update_desktop_file gapcmon @@ -141,7 +137,6 @@ %post %{fillup_and_insserv apcupsd} -%if %suse_version > 1000 # 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/apcupsd/apccontrol killpower|/etc/init.d/apcupsd try-powerdown|)"' etc/sysconfig/shutdown ; then @@ -162,19 +157,11 @@ 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 -%else -usr/lib/apcupsd/halt-setup.sh install -%endif %preun -%if %suse_version <= 1000 -[ $1 = 0 ] || exit 0 -usr/lib/apcupsd/halt-setup.sh uninstall -%endif %{stop_on_removal apcupsd} %postun -%if %suse_version > 1000 # Remove HALT_POWERDOWN_INSERT if test $1 -eq 0 -a ! -f /etc/init.d/apcupsd ; then if usr/bin/grep -q '^HALT_POWERDOWN_INSERT="(/etc/init.d/apcupsd try-powerdown)"' etc/sysconfig/shutdown ; then @@ -188,7 +175,6 @@ echo >&2 "apcupsd: WARNING: You may want to remove your /etc/init.d/apcupsd-early-powerdown." fi fi -%endif %{restart_on_update apcupsd} %{insserv_cleanup} @@ -199,6 +185,7 @@ %defattr(-,root,root) %doc apcupsd-early-powerdown COPYING ChangeLog* DISCLAIMER Developers INSTALL README.SUSE ReleaseNotes kernstodo doc/ examples/ /sbin/apcupsd-lite +%{_datadir}/hal/fdi/policy/20thirdparty/*.fdi %{_sbindir}/apcupsd %{_sbindir}/apcaccess %{_sbindir}/apctest @@ -222,9 +209,6 @@ %{apache_serverroot}/cgi-bin/upsstats.cgi %{apache_serverroot}/cgi-bin/upsimage.cgi %doc %{_mandir}/man8/apcupsd.8* -%if %suse_version <= 1000 -/usr/lib/apcupsd -%endif %files gui %defattr(-,root,root) @@ -233,7 +217,23 @@ %{_datadir}/pixmaps/*.png %changelog -* Mon Jan 14 2008 - sbrabec@suse.cz +* Mon Jan 21 2008 sbrabec@suse.cz +- Updated to version 3.14.3: + * HAL policy file is automatically installed on Linux systems to + disable the hald-addon-hid-ups module which conflicts with + apcupsd's control of USB UPSes. The file is automatically + removed when apcupsd is uninstalled. + * Add support for Nominal Power (aka Configured Active Power) + reading. + * Add units to NOMINV, NOMOUTV, and NOMBATTV stats. + * Eliminate some gcc warnings. + * Fix killpower and eeprom settings bug on USB modules introduced + when INPUT reports were prioritized over FEATURE reports. + * Fix bugs that could cause NIS-net driver to get stuck waiting + for comms to be restored instead of shutting down. +- Fixed possible buffer overflow. +- Removed support for SuSE Linux <= 10.0. +* Mon Jan 14 2008 sbrabec@suse.cz - Updated to version 3.14.2: * USB fix for BackUPS LCD series. This fix carries a risk of breaking other models, but test results are positive so far. @@ -251,11 +251,11 @@ * Correct multimon.conf humidity monitoring. (Novell#199834) * Fix race between attach_ups() and detach_ups(). * Remove dependency on libc++ (again). -* Thu Aug 23 2007 - sbrabec@suse.cz +* Thu Aug 23 2007 sbrabec@suse.cz - Fixed multimon.conf comments for humidity measurement (#199834). -* Tue Jul 24 2007 - ro@suse.de +* Tue Jul 24 2007 ro@suse.de - fix build -* Wed Jul 04 2007 - sbrabec@suse.cz +* Wed Jul 04 2007 sbrabec@suse.cz - Updated to version 3.14.1: * PCNET driver supports remote shutdown request from UPS web interface @@ -265,18 +265,18 @@ RS 800. * Rewrite device opening logic to be more reliable. * Do not attempt to cancel shutdowns. -* Thu May 24 2007 - ro@suse.de +* Thu May 24 2007 ro@suse.de - fix some rpmlint errors -* Wed Apr 11 2007 - sbrabec@suse.cz +* Wed Apr 11 2007 sbrabec@suse.cz - Updated to version 3.14.0: * New stable release. * Bug fixes. -* Thu Nov 16 2006 - mrueckert@suse.de +* Thu Nov 16 2006 mrueckert@suse.de - added apcupsd-3.13.9_missing_netsnmp_include.patch: include for net-snmp-config.h was missing. -* Tue Nov 07 2006 - ro@suse.de +* Tue Nov 07 2006 ro@suse.de - fix permissions for icon files -* Fri Oct 20 2006 - sbrabec@suse.cz +* Fri Oct 20 2006 sbrabec@suse.cz - Updated to version 3.13.9: * Runtime configurable paths for apccontrol. * Ambient temperature is reported for USB UPSes with a AP9612 @@ -284,23 +284,23 @@ * pcnet driver detects COMMLOST and SelfTest events. * pcnet driver supports killpower (turning off UPS output power). * Bug fixes. -* Wed Sep 20 2006 - sbrabec@suse.cz +* Wed Sep 20 2006 sbrabec@suse.cz - Build correctly in older products. -* Wed Sep 20 2006 - sbrabec@suse.cz +* Wed Sep 20 2006 sbrabec@suse.cz - Create /sbin/apcupsd-lite, working with unmounted /usr (#186606). - Call killpower only if power is failing (#186606#6) (#187454). - Minor fixes of previous update. -* Mon Sep 18 2006 - sbrabec@suse.cz +* Mon Sep 18 2006 sbrabec@suse.cz - Updated to version 3.13.8: * GUI monitoring application, gapcmon. * Bug fixes. -* Tue Sep 12 2006 - aj@suse.de +* Tue Sep 12 2006 aj@suse.de - Adjust BuildRequires. -* Mon Apr 03 2006 - sbrabec@suse.cz +* Mon Apr 03 2006 sbrabec@suse.cz - Do not remove /etc/nologin, if changes are disabled (#161709). -* Sat Mar 25 2006 - ro@suse.de +* Sat Mar 25 2006 ro@suse.de - remove second preun script -* Fri Mar 24 2006 - sbrabec@suse.cz +* Fri Mar 24 2006 sbrabec@suse.cz - Removed fast incorrect shutdown script (#132478). - Added README.SUSE. - Integrated with powersave. @@ -308,73 +308,73 @@ - Simplified neededforbuild. - Removed obsolete halt-setup.sh and clean halt.local. - Scriptlet fixes. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Tue Jan 24 2006 - ro@suse.de +* Tue Jan 24 2006 ro@suse.de - disable parallel build, seems to cause trouble -* Thu Jan 12 2006 - sbrabec@suse.cz +* Thu Jan 12 2006 sbrabec@suse.cz - Updated to version 3.12.1. -* Fri Sep 30 2005 - sbrabec@suse.cz +* Fri Sep 30 2005 sbrabec@suse.cz - Updated to version 3.10.18 (#116685). -* Tue Jul 12 2005 - sbrabec@suse.cz +* Tue Jul 12 2005 sbrabec@suse.cz - Updated to version 3.10.17a. - Moved binaries (linked against libraries in /usr) to /usr/sbin. -* Wed May 04 2005 - sbrabec@suse.cz +* Wed May 04 2005 sbrabec@suse.cz - Removed START_APCUPSD from halt.local (#81281). -* Thu Jan 06 2005 - sbrabec@suse.cz +* Thu Jan 06 2005 sbrabec@suse.cz - Updated to version 3.10.16. -* Tue Nov 30 2004 - sbrabec@suse.cz +* Tue Nov 30 2004 sbrabec@suse.cz - Fixed OS misdetection (missing USB support, #48607). Patch from Andrea Arcangeli. -* Mon Aug 23 2004 - sbrabec@suse.cz +* Mon Aug 23 2004 sbrabec@suse.cz - Updated to version 3.10.15. -* Mon Apr 19 2004 - ro@suse.de +* Mon Apr 19 2004 ro@suse.de - Force-define HID_MAX_USAGES - build using apache2 -* Fri Mar 19 2004 - sbrabec@suse.cz +* Fri Mar 19 2004 sbrabec@suse.cz - Removed *.orig files from documentation. -* Thu Feb 05 2004 - sbrabec@suse.cz +* Thu Feb 05 2004 sbrabec@suse.cz - Updated to version 3.10.11. -* Mon Nov 10 2003 - ro@suse.de +* Mon Nov 10 2003 ro@suse.de - use net-snmp instead of ucdsnmp -* Tue Sep 16 2003 - kukuk@suse.de +* Tue Sep 16 2003 kukuk@suse.de - Remove setuid bit from apcupsd (else SuSEconfig will do it) -* Mon Sep 01 2003 - sbrabec@suse.cz +* Mon Sep 01 2003 sbrabec@suse.cz - Removed tcpd.h (use systemwide instead). -* Mon Sep 01 2003 - sbrabec@suse.cz +* Mon Sep 01 2003 sbrabec@suse.cz - Added "Should-Start: hotplug_usb" to init script. - Fix and update hack of orphan fi in halt.local. - Fixed pre and postinstall scripts. - Really turned on and fixed SNMP support. -* Fri Aug 29 2003 - kukuk@suse.de +* Fri Aug 29 2003 kukuk@suse.de - Add "Should-Start: serial" to init script [Bug #28353] -* Fri Aug 15 2003 - sbrabec@suse.cz +* Fri Aug 15 2003 sbrabec@suse.cz - Updated to development version 3.10.6-05Aug03. - Turned on all optional features. -* Mon Mar 10 2003 - sbrabec@suse.cz +* Mon Mar 10 2003 sbrabec@suse.cz - Buffer overflow fixes. - Name clash and error handling fixes. -* Wed Feb 12 2003 - sbrabec@suse.cz +* Wed Feb 12 2003 sbrabec@suse.cz - Updated to version 3.8.6. -* Thu Aug 15 2002 - mcihar@suse.cz +* Thu Aug 15 2002 mcihar@suse.cz - added $remote_fs to Required-Start (should fix #17294) -* Fri Aug 02 2002 - ro@suse.de +* Fri Aug 02 2002 ro@suse.de - adapted to /srv/www - added prereqs -* Sat Jul 27 2002 - adrian@suse.de +* Sat Jul 27 2002 adrian@suse.de - fix build -* Mon Jan 07 2002 - cihlar@suse.cz +* Mon Jan 07 2002 cihlar@suse.cz - updated to version 3.8.5: * Battery Runtime Calibration in the apctest program * Resolved a crash caused by a lost TCP/IP connection -* Mon Dec 17 2001 - cihlar@suse.cz +* Mon Dec 17 2001 cihlar@suse.cz - updated to version 3.8.4-2: * bug fix release -* Mon Dec 10 2001 - cihlar@suse.cz +* Mon Dec 10 2001 cihlar@suse.cz - removed START_APCUPSD -* Thu Nov 29 2001 - cihlar@suse.cz +* Thu Nov 29 2001 cihlar@suse.cz - update to version 3.8.3: * updated manual * several bug fixes @@ -382,19 +382,19 @@ - fixed permissions of halt-setup.sh - fixed halt-setup.sh - moved halt-setup.sh from %%postun to %%preun -* Tue Nov 27 2001 - cihlar@suse.cz +* Tue Nov 27 2001 cihlar@suse.cz - fixed variable names in init script [#12451] -* Thu Jul 26 2001 - cihlar@suse.cz +* Thu Jul 26 2001 cihlar@suse.cz - fixed call of suse_update_config -* Wed Jul 25 2001 - cihlar@suse.cz +* Wed Jul 25 2001 cihlar@suse.cz - update to 3.8.2 - added part with autoconf - compile with --with-libwrap and --enable-pthreads -* Thu Apr 12 2001 - cihlar@suse.cz +* Thu Apr 12 2001 cihlar@suse.cz - fixed init script by new skeleton -* Mon Jan 15 2001 - cihlar@suse.cz +* Mon Jan 15 2001 cihlar@suse.cz - added apctest -* Wed Jan 10 2001 - cihlar@suse.cz +* Wed Jan 10 2001 cihlar@suse.cz - update to 3.8.1 - change to new init script mechanism - fixed initialization of halt.local @@ -402,9 +402,9 @@ - clean up spec file - bzipped sources - added fillup of rc.config -* Mon Jun 19 2000 - kasal@suse.de +* Mon Jun 19 2000 kasal@suse.de - Updated to 3.7.2. The package is still BETA, see "Todo" below. -* Sun Oct 10 1999 - bk@suse.de +* Sun Oct 10 1999 bk@suse.de - new package, requested e.g by Andre Hedrick <andre@suse.com> Todo: - polish /sbin/init.d/apcupsd and add links to the rcX.d directories ++++++ apcupsd-3.14.2.tar.bz2 -> apcupsd-3.14.3.tar.bz2 ++++++ ++++ 3337 lines of diff (skipped) ++++++ apcupsd-largebuf-overflow.patch ++++++ --- src/reports.c +++ src/reports.c @@ -107,8 +107,7 @@ avsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); - strncat(largebuf, buf, sizeof(largebuf)); - largebuf[sizeof(largebuf) - 1] = 0; + strncat(largebuf, buf, sizeof(largebuf)-strlen(largebuf)-1); stat_recs++; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org