diff -pruN 1:2.0.10-1/debian/acpid.install 1:2.0.10-1ubuntu3/debian/acpid.install --- 1:2.0.10-1/debian/acpid.install 2011-12-09 00:23:35.000000000 +0000 +++ 1:2.0.10-1ubuntu3/debian/acpid.install 2011-12-09 00:23:36.000000000 +0000 @@ -1,5 +1,4 @@ -debian/powerbtn usr/share/doc/acpid/examples/ -debian/powerbtn.sh usr/share/doc/acpid/examples/ +debian/powerbtn etc/acpi/events/ debian/examples/default usr/share/doc/acpid/examples/ debian/examples/default.sh usr/share/doc/acpid/examples/ debian/examples/ac usr/share/doc/acpid/examples/ diff -pruN 1:2.0.10-1/debian/acpid.preinst 1:2.0.10-1ubuntu3/debian/acpid.preinst --- 1:2.0.10-1/debian/acpid.preinst 2011-12-09 00:23:35.000000000 +0000 +++ 1:2.0.10-1ubuntu3/debian/acpid.preinst 2011-12-09 00:23:36.000000000 +0000 @@ -16,26 +16,14 @@ rm_conffile() { echo "Saving as $CONFFILE.dpkg-bak ..." mv -f "$CONFFILE" "$CONFFILE".dpkg-bak else - if [ "$CONFFILE" = "/etc/acpi/events/powerbtn" -a -e /etc/acpi/powerbtn.sh.dpkg-bak ]; then - # we need some special logic for /etc/acpi/events/powerbtn because it might - # be kept because it was changed itself or because /etc/acpi/powerbtn.sh was changed - echo "Obsolete conffile $CONFFILE saved as $CONFFILE.dpkg-bak ..." - sed -e 's#/etc/acpi/powerbtn.sh#/etc/acpi/powerbtn.sh.dpkg-bak#' < "$CONFFILE" > "$CONFFILE".dpkg-bak - else - echo "Removing obsolete conffile $CONFFILE ..." - fi - rm -f "$CONFFILE" + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" fi fi } case "$1" in install|upgrade) - if dpkg --compare-versions "$2" lt 1.0.8-7; then - rm_conffile acpid /etc/logrotate.d/acpid - rm_conffile acpid /etc/acpi/powerbtn.sh - rm_conffile acpid /etc/acpi/events/powerbtn - fi + rm_conffile acpid /etc/logrotate.d/acpid ;; esac - diff -pruN 1:2.0.10-1/debian/acpid.upstart 1:2.0.10-1ubuntu3/debian/acpid.upstart --- 1:2.0.10-1/debian/acpid.upstart 1970-01-01 00:00:00.000000000 +0000 +++ 1:2.0.10-1ubuntu3/debian/acpid.upstart 2011-12-09 00:23:36.000000000 +0000 @@ -0,0 +1,14 @@ +# acpid - ACPI daemon +# +# The ACPI daemon provides a socket for other daemons to multiplex kernel +# ACPI events from, and a framework for reacting to those events. + +description "ACPI daemon" + +start on runlevel [2345] +stop on runlevel [!2345] + +expect fork +respawn + +exec acpid -c /etc/acpi/events -s /var/run/acpid.socket diff -pruN 1:2.0.10-1/debian/changelog 1:2.0.10-1ubuntu3/debian/changelog --- 1:2.0.10-1/debian/changelog 2011-12-09 00:23:35.000000000 +0000 +++ 1:2.0.10-1ubuntu3/debian/changelog 2011-12-09 00:23:36.000000000 +0000 @@ -1,3 +1,34 @@ +acpid (1:2.0.10-1ubuntu3) precise; urgency=low + + * SECURITY UPDATE: Arbitrary code execution in the power button handling + script (LP: #893821) + - debian/powerbtn.sh: Ensure that the DBUS_SESSION_BUS_ADDRESS environment + variable is only read from a process owned by the user that will be + evaluating the variable. + - CVE-2011-2777 + * SECURITY UPDATE: Unprivileged users may be able to write to directories + and read files created by event handler scripts + - event.c: Set a restrictive umask of 0077 before running an event handler + script. Based on upstream patch. + - CVE-2011-4578 + + -- Tyler Hicks Wed, 07 Dec 2011 16:33:35 -0600 + +acpid (1:2.0.10-1ubuntu2) oneiric; urgency=low + + * ./debian/powerbtn.sh: gnome-power-manager is no more, check for + gnome-settings-daemon now. This fixes immediate shutdown when the power + button is pressed. (LP: #837266) + + -- Martin Pitt Tue, 30 Aug 2011 12:07:43 +0200 + +acpid (1:2.0.10-1ubuntu1) oneiric; urgency=low + + * Merge with Debian; remaining changes: + - see 1:2.0.9-1ubuntu1 changelog. + + -- Matthias Klose Fri, 20 May 2011 15:03:02 +0200 + acpid (1:2.0.10-1) unstable; urgency=low * Imported Upstream version 2.0.10 @@ -5,6 +36,29 @@ acpid (1:2.0.10-1) unstable; urgency=low -- Michael Meskes Thu, 19 May 2011 15:51:12 +0200 +acpid (1:2.0.9-1ubuntu1) oneiric; urgency=low + + * Merge from debian unstable (LP: #776687), remaining changes: + - Replace init script with Upstart job + + This does not load modules, unlike the init script, since these are + all loaded by ACPI:* modaliases now (and thus by udev) + - debian/control: Bump build-dependency on debhelper for Upstart-aware + dh_installinit + - debian/preinst, debian/acpid.install, debian/control, debian/rules: + continue installing /etc/acpi/events/powerbtn and /etc/acpi/powerbtn.sh, + deferring the migration to acpi-support-base; and drop the Recommends: + on acpi-support-base for the same reason. + - Source /usr/share/acpi-support/power-funcs in powerbtn.sh + - debian/powerbtn.sh: ensure that /usr/share/acpi-support/power-funcs + exists before sourcing it; note that acpid does not depend on + acpi-support (which is fine, as it brings in lots of X dependencies + not appropriate for servers); this fix will allow Ubuntu servers + (especially those in VMs) to run acpid and catch and handle power + button events again. + - Fix build error with GCC-4.5, build with -Wno-error=sign-compare. + + -- Lorenzo De Liso Tue, 03 May 2011 22:20:47 +0200 + acpid (1:2.0.9-1) unstable; urgency=low * Imported Upstream version 2.0.9 @@ -41,6 +95,40 @@ acpid (1:2.0.8-1) unstable; urgency=low -- Michael Meskes Wed, 16 Feb 2011 09:25:51 +0100 +acpid (1:2.0.7-1ubuntu2) natty; urgency=low + + * Fix build error with GCC-4.5, build with -Wno-error=sign-compare. + + -- Matthias Klose Fri, 07 Jan 2011 14:00:59 +0100 + +acpid (1:2.0.7-1ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #507778), remaining changes: + - Replace init script with Upstart job + + This does not load modules, unlike the init script, since these are + all loaded by ACPI:* modaliases now (and thus by udev) + - debian/control: Bump build-dependency on debhelper for Upstart-aware + dh_installinit + - debian/preinst, debian/acpid.install, debian/control, debian/rules: + continue installing /etc/acpi/events/powerbtn and /etc/acpi/powerbtn.sh, + deferring the migration to acpi-support-base; and drop the Recommends: + on acpi-support-base for the same reason. + - Source /usr/share/acpi-support/power-funcs in powerbtn.sh (LP: #508073) + - debian/powerbtn.sh: ensure that /usr/share/acpi-support/power-funcs + exists before sourcing it; note that acpid does not depend on + acpi-support (which is fine, as it brings in lots of X dependencies + not appropriate for servers); this fix will allow Ubuntu servers + (especially those in VMs) to run acpid and catch and handle power + button events again; LP: #570450 + * Dropped changes: + - New patch, missing-includes, to fix missing includes of sys/types.h and + sys/stat.h for umask() and stat() in acpid.c; fixes FTBFS: no longer + needed + - Update patch missing-includes to also fix the same missing includes in + sock.c; this is all fixed in 2.0.x versions of acpid: no longer needed + + -- Lorenzo De Liso Tue, 23 Nov 2010 20:26:47 +0100 + acpid (1:2.0.7-1) unstable; urgency=low * Imported Upstream version 2.0.7 @@ -129,6 +217,52 @@ acpid (1:2.0.0-1) unstable; urgency=low -- Michael Meskes Mon, 21 Dec 2009 13:03:48 +0100 +acpid (1.0.10-5ubuntu4) maverick; urgency=low + + * Update patch missing-includes to also fix the same missing includes in + sock.c; this is all fixed in 2.0.x versions of acpid. + + -- Loïc Minier Sun, 27 Jun 2010 14:34:03 +0200 + +acpid (1.0.10-5ubuntu3) maverick; urgency=low + + * New patch, missing-includes, to fix missing includes of sys/types.h and + sys/stat.h for umask() and stat() in acpid.c; fixes FTBFS. + + -- Loïc Minier Sun, 27 Jun 2010 14:26:12 +0200 + +acpid (1.0.10-5ubuntu2.1) lucid-proposed; urgency=low + + * debian/powerbtn.sh: ensure that /usr/share/acpi-support/power-funcs + exists before sourcing it; note that acpid does not depend on + acpi-support (which is fine, as it brings in lots of X dependencies + not appropriate for servers); this fix will allow Ubuntu servers + (especially those in VMs) to run acpid and catch and handle power + button events again; LP: #570450 + + -- Dustin Kirkland Mon, 26 Apr 2010 17:25:02 -0500 + +acpid (1.0.10-5ubuntu2) lucid; urgency=low + + * Source /usr/share/acpi-support/power-funcs in powerbtn.sh (LP: #508073) + + -- Jonathan Thomas Fri, 15 Jan 2010 19:59:47 -0500 + +acpid (1.0.10-5ubuntu1) lucid; urgency=low + + * Merge from Debian testing. Remaining changes: + - Replace init script with Upstart job. + - This does not load modules, unlike the init script, since these are + all loaded by ACPI:* modaliases now (and thus by udev) + - debian/control: + - Bump build-dependency on debhelper for Upstart-aware dh_installinit + - debian/preinst, debian/acpid.install, debian/control, debian/rules: + continue installing /etc/acpi/events/powerbtn and /etc/acpi/powerbtn.sh, + deferring the migration to acpi-support-base; and drop the Recommends: + on acpi-support-base for the same reason. + + -- Steve Langasek Wed, 23 Dec 2009 00:32:09 +0000 + acpid (1.0.10-5) unstable; urgency=high * Correct permissions that were incorrectly set by very old acpid versions. @@ -136,6 +270,38 @@ acpid (1.0.10-5) unstable; urgency=high -- Michael Meskes Tue, 15 Dec 2009 13:11:29 +0100 +acpid (1.0.10-4ubuntu1) lucid; urgency=low + + * Merge from Debian testing. Remaining changes: + - Replace init script with Upstart job. + - This does not load modules, unlike the init script, since these are + all loaded by ACPI:* modaliases now (and thus by udev) + - debian/control: + - Bump build-dependency on debhelper for Upstart-aware dh_installinit + * Dropped changes, integrated upstream: + - build with -D_GNU_SOURCE to make "struct ucred" available + - acpid.*, event.c, ud_socket.*: limit the number of non-root clients, + correctly close dead connections. + - Remove the logrotate file on upgrade + - Bump Standards-Version to 3.8.0 + - debian/powerbtn.sh: + - Update for KDE 4 + - Add dalston-power-applet to list of handlers for power + button events + - add xfce4-power-manager to the list of handlers as well. + * Dropped changes, superseded by upstart conversion: + - debian/acpid.init.d: add the 'status' action + - Replace "multiuser" deprecated init mode in debian/rules with manual + arguments. Adapt the corresponding change in LSB init script header + and runtime dependency in debian/control + - depend on sysv-rc + * debian/preinst, debian/acpid.install, debian/control, debian/rules: + continue installing /etc/acpi/events/powerbtn and /etc/acpi/powerbtn.sh, + deferring the migration to acpi-support-base; and drop the Recommends: + on acpi-support-base for the same reason. + + -- Steve Langasek Fri, 18 Dec 2009 07:44:04 +0000 + acpid (1.0.10-4) unstable; urgency=low * Updated netlink patch to version 6. @@ -382,6 +548,100 @@ acpid (1.0.6-10) unstable; urgency=low -- Michael Meskes Fri, 20 Jun 2008 14:21:14 +0200 +acpid (1.0.6-9ubuntu8) karmic; urgency=low + + * debian/powerbtn.sh: add xfce4-power-manager to the list of handlers as + well. LP: #425155 + + -- Lionel Le Folgoc Wed, 23 Sep 2009 14:53:01 +0200 + +acpid (1.0.6-9ubuntu7) karmic; urgency=low + + * debian/powerbtn.sh: + - Add dalston-power-applet to list of handlers for power + button events (part of fix for LP: #432578). + + -- Gary Lasker Fri, 18 Sep 2009 12:25:33 -0400 + +acpid (1.0.6-9ubuntu6) karmic; urgency=low + + FFE LP: #427356. + + * Replace init script with Upstart job. + - This does not load modules, unlike the init script, since these are + all loaded by ACPI:* modaliases now (and thus by udev) + * debian/control: + - Bump build-dependency on debhelper for Upstart-aware dh_installinit + + -- Scott James Remnant Tue, 15 Sep 2009 03:34:49 +0100 + +acpid (1.0.6-9ubuntu5) karmic; urgency=low + + * Upload jaunty changes to karmic + + -- Jonathan Riddell Tue, 28 Apr 2009 11:07:28 +0100 + +acpid (1.0.6-9ubuntu4.9.04.3) jaunty-proposed; urgency=low + + * Update /etc/acpi/powerbtn.sh for KDE 4 + Closes LP: #368497 + + -- Jonathan Riddell Tue, 28 Apr 2009 11:01:13 +0100 + +acpid (1.0.6-9ubuntu4.9.04.2) jaunty-security; urgency=low + + * SECURITY UPDATE: denial of service via too many open files + - acpid.*, event.c, ud_socket.*: limit the number of non-root clients, + correctly close dead connections. + - CVE-2009-0798 + + -- Marc Deslauriers Wed, 22 Apr 2009 15:09:59 -0400 + +acpid (1.0.6-9ubuntu4) intrepid; urgency=low + + * Remove the logrotate file on upgrade, as the previous one that was + installed did a "kill -USR1" on the acpid process to cause it to reload + its logfiles. As the new acpid doesn't use a log file it doesn't catch + this signal, which means that once a week acpid is killed. As it doesn't + have a logfile the logrotate file is not needed, and so is no longer + installed, but as it was a conffile it is not removed on upgrades. + Thanks to Loic Minier for his help with the fix. (LP: #263888) + - ad81211857dabeb88538e0f90c922b7c787b34c5 in Debian's pkg-acpi git repo. + + -- James Westby Wed, 24 Sep 2008 15:19:14 +0100 + +acpid (1.0.6-9ubuntu3) intrepid; urgency=low + + * Replace "multiuser" deprecated init mode in debian/rules with manual + arguments. Adapt the corresponding change in LSB init script header and + runtime dependency in debian/control (LP: #254249) + + -- Didier Roche Wed, 13 Aug 2008 19:50:50 +0200 + +acpid (1.0.6-9ubuntu2) intrepid; urgency=low + + * debian/control + - Depend on lsb-base >= 3.2-14, providing status_of_proc() + - Bump Standards-Version to 3.8.0 + * debian/acpid.init.d + - Add the 'status' action (LP: #251681) + + -- Nathan Handler Thu, 24 Jul 2008 21:03:02 -0500 + +acpid (1.0.6-9ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - init script starts earlier + - depend on sysv-rc + * removed ubuntu specific -G (lockfilegroup) options, it does + no longer apply because acpid now uses syslog by default + * disable debian update-rc.d call to make acpid run earlier on + upgrade, out packages already run early + * build with -D_GNU_SOURCE to make "struct ucred" available + (see also http://sourceware.org/bugzilla/show_bug.cgi?id=6545) + + -- Michael Vogt Mon, 02 Jun 2008 09:58:14 +0200 + acpid (1.0.6-9) unstable; urgency=low * Don't depend on sysv-rc; closes: #481912 diff -pruN 1:2.0.10-1/debian/control 1:2.0.10-1ubuntu3/debian/control --- 1:2.0.10-1/debian/control 2011-12-09 00:23:35.000000000 +0000 +++ 1:2.0.10-1ubuntu3/debian/control 2011-12-09 00:23:36.000000000 +0000 @@ -1,11 +1,12 @@ Source: acpid Section: admin Priority: optional -Maintainer: Debian Acpi Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Acpi Team Uploaders: Michael Meskes , Loic Minier Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.15.7) +Build-Depends: debhelper (>= 7.3.15ubuntu2), dpkg-dev (>= 1.15.7) Vcs-Git: git://git.debian.org/git/pkg-acpi/acpid.git Vcs-Browser: http://git.debian.org/?p=pkg-acpi/acpid.git Homepage: http://www.tedfelix.com/linux/acpid-netlink.html @@ -16,7 +17,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-14), module-init-tools (>> 3.1-rel-2) -Recommends: acpi-support-base (>= 0.114-1) Description: Advanced Configuration and Power Interface event daemon Modern computers support the Advanced Configuration and Power Interface (ACPI) to allow intelligent power management on your system and to query battery and diff -pruN 1:2.0.10-1/debian/powerbtn.sh 1:2.0.10-1ubuntu3/debian/powerbtn.sh --- 1:2.0.10-1/debian/powerbtn.sh 2011-12-09 00:23:35.000000000 +0000 +++ 1:2.0.10-1ubuntu3/debian/powerbtn.sh 2011-12-09 00:23:36.000000000 +0000 @@ -3,6 +3,8 @@ # Initiates a shutdown when the power putton has been # pressed. +[ -r /usr/share/acpi-support/power-funcs ] && . /usr/share/acpi-support/power-funcs + # getXuser gets the X user belonging to the display in $displaynum. # If you want the foreground X user, use getXconsole! getXuser() { @@ -29,14 +31,22 @@ test -f /var/lock/acpisleep && exit 0 # handles suspend/resume requests, let them handle policy This is effectively # the same as 'acpi-support's '/usr/share/acpi-support/policy-funcs' file. -getXconsole -PMS="gnome-power-manager kpowersave xfce4-power-manager" +[ -r /usr/share/acpi-support/power-funcs ] && getXconsole +PMS="gnome-settings-daemon kpowersave xfce4-power-manager" PMS="$PMS guidance-power-manager.py dalston-power-applet" -if pidof x $PMS > /dev/null || - ( test "$XUSER" != "" && pidof dcopserver > /dev/null && test -x /usr/bin/dcop && /usr/bin/dcop --user $XUSER kded kded loadedModules | grep -q klaptopdaemon) || - ( test "$XUSER" != "" && test -x /usr/bin/qdbus && test -r /proc/$(pidof kded4)/environ && su - $XUSER -c "eval $(echo -n 'export '; cat /proc/$(pidof kded4)/environ |tr '\0' '\n'|grep DBUS_SESSION_BUS_ADDRESS); qdbus org.kde.kded" | grep -q powerdevil) ; then - exit +if pidof x $PMS > /dev/null; then + exit +elif test "$XUSER" != "" && pidof dcopserver > /dev/null && test -x /usr/bin/dcop && /usr/bin/dcop --user $XUSER kded kded loadedModules | grep -q klaptopdaemon; then + exit +elif test "$XUSER" != "" && test -x /usr/bin/qdbus; then + kded4pid=$(pgrep -n -u $XUSER kded4) + if test "$kded4pid" != ""; then + dbusaddr=$(su - $XUSER -c "grep -z DBUS_SESSION_BUS_ADDRESS /proc/$kded4pid/environ") + if test "$dbusaddr" != "" && su - $XUSER -c "export $dbusaddr; qdbus org.kde.kded" | grep -q powerdevil; then + exit + fi + fi fi # If all else failed, just initiate a plain shutdown. diff -pruN 1:2.0.10-1/debian/rules 1:2.0.10-1ubuntu3/debian/rules --- 1:2.0.10-1/debian/rules 2011-12-09 00:23:35.000000000 +0000 +++ 1:2.0.10-1ubuntu3/debian/rules 2011-12-09 00:23:36.000000000 +0000 @@ -22,6 +22,8 @@ install: build dh_testroot dh_clean dh_installdirs + # Install powerbtn.sh script and make it executable + install -m 755 -D debian/powerbtn.sh debian/acpid/etc/acpi/powerbtn.sh binary: binary-arch binary-indep diff -pruN 1:2.0.10-1/event.c 1:2.0.10-1ubuntu3/event.c --- 1:2.0.10-1/event.c 2011-03-12 16:18:09.000000000 +0000 +++ 1:2.0.10-1ubuntu3/event.c 2011-12-09 00:23:36.000000000 +0000 @@ -641,6 +641,7 @@ do_cmd_rule(struct rule *rule, const cha if (acpid_debug && logevents) { fprintf(stdout, "BEGIN HANDLER MESSAGES\n"); } + umask(0077); execl("/bin/sh", "/bin/sh", "-c", action, NULL); /* should not get here */ acpid_log(LOG_ERR, "execl(): %s", strerror(errno)); diff -pruN 1:2.0.10-1/kacpimon/makefile 1:2.0.10-1ubuntu3/kacpimon/makefile --- 1:2.0.10-1/kacpimon/makefile 2009-11-23 02:58:00.000000000 +0000 +++ 1:2.0.10-1ubuntu3/kacpimon/makefile 2011-12-09 00:23:36.000000000 +0000 @@ -8,7 +8,7 @@ target = kacpimon # release build #CFLAGS = -O2 -Wall -Wextra -Wundef -Wshadow -Werror # hybrid build, optimized, but with debugging symbols (Debian-style) -CFLAGS = -g -O2 -Wall -Wextra -Wundef -Wshadow -Werror +CFLAGS = -g -O2 -Wall -Wextra -Wundef -Wshadow -Werror -Wno-error=sign-compare objects := $(sources:.c=.o) diff -pruN 1:2.0.10-1/Makefile 1:2.0.10-1ubuntu3/Makefile --- 1:2.0.10-1/Makefile 2011-04-26 23:56:59.000000000 +0000 +++ 1:2.0.10-1ubuntu3/Makefile 2011-12-09 00:23:36.000000000 +0000 @@ -31,7 +31,7 @@ MAN8GZ = $(MAN8:.8=.8.gz) DOCS = COPYING Changelog README TESTPLAN TODO -CFLAGS = -W -Wall -Werror -Wundef -Wshadow -D_GNU_SOURCE $(OPT) \ +CFLAGS = -W -Wall -Werror -Wno-error=sign-compare -Wundef -Wshadow -D_GNU_SOURCE $(OPT) \ -fno-strict-aliasing -g $(DEFS) DEFS = -DVERSION="\"$(VERSION)\""