Hello community, here is the log from the commit of package apcupsd for openSUSE:Factory checked in at Tue Oct 18 13:57:08 CEST 2011.
-------- --- openSUSE:Factory/apcupsd/apcupsd.changes 2011-09-23 01:51:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/apcupsd/apcupsd.changes 2011-10-17 10:52:31.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Oct 17 08:51:57 UTC 2011 - [email protected] + +- apcupsd-3.14.8-exit-race.patch: + When terminating apcupsd, cancel other threads before cleanup to + avoid race condition and possible segfault (bnc#724487). +- Change build requirement from sysvinit to sysvinit-init for 12.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- apcupsd-3.14.8-exit-race.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apcupsd.spec ++++++ --- /var/tmp/diff_new_pack.yL54ng/_old 2011-10-18 13:57:02.000000000 +0200 +++ /var/tmp/diff_new_pack.yL54ng/_new 2011-10-18 13:57:02.000000000 +0200 @@ -18,7 +18,12 @@ 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 pm-utils sysvinit tcpd-devel update-desktop-files +BuildRequires: apache2-devel distribution-release dos2unix gcc-c++ gconf2-devel gd-devel gnome-vfs2-devel gtk2-devel mailx ncurses-devel net-snmp-devel pm-utils tcpd-devel update-desktop-files +%if 0%{?suse_version} < 1210 +BuildRequires: sysvinit +%else +BuildRequires: sysvinit-init +%endif Group: Hardware/UPS License: GPLv2+ Summary: APC UPS Daemon (Powerful Daemon for APC UPSs) @@ -44,6 +49,8 @@ # 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 Patch10: apcupsd-3.14.1-cloexec.patch +# PATCH-FIX-UPSTREAM apcupsd-3.14.8-exit-race.patch [email protected] -- avoid race condition when apcupsd is terminated +Patch11: apcupsd-3.14.8-exit-race.patch PreReq: %fillup_prereq %insserv_prereq /usr/bin/sed /usr/bin/grep Requires: /usr/bin/mail BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -91,6 +98,7 @@ %patch5 %patch9 %patch10 -p1 +%patch11 %build %{suse_update_config autoconf} ++++++ apcupsd-3.14.8-exit-race.patch ++++++ diff -up src/apcupsd.c.orig-race src/apcupsd.c --- src/apcupsd.c.orig-race 2009-05-26 00:18:09.000000000 +0200 +++ src/apcupsd.c 2011-10-16 22:05:00.532772618 +0200 @@ -91,13 +91,14 @@ void apcupsd_terminate(int sig) if (sig != 0) log_event(ups, LOG_WARNING, _("apcupsd exiting, signal %u\n"), sig); + clean_threads(); + clear_files(); device_close(ups); delete_lockfile(ups); - clean_threads(); log_event(ups, LOG_WARNING, _("apcupsd shutdown succeeded")); destroy_ups(ups); closelog(); continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
