lp:~mar-kolya/ubuntu/raring/acpid/fix-for-1184831
- Get this branch:
- bzr branch lp:~mar-kolya/ubuntu/raring/acpid/fix-for-1184831
Branch merges
- Marc Deslauriers: Approve
- David Tagatac (community): Approve
-
Diff: 25 lines (+7/-0)2 files modifieddebian/changelog (+6/-0)
debian/powerbtn.sh (+1/-0)
Related source package recipes
Related bugs
| Bug #1184831: mate settings daemon is not supported by debian/powerbtn.sh | Undecided | Fix Released |
|
Related blueprints
Branch information
- Owner:
- kolya
- Status:
- Development
Recent revisions
- 45. By Matthias Klose
-
* Merge with Debian; 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/acpid.install, debian/ acpid.preinst, 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.
- 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.
- debian/acpid.install, debian/acpid.links:
Don't install socket and service files needed by systemd
* Fix build failure with GCC 4.8. - 44. By Steve Langasek
-
Bump to debhelper compat level 9 and use the
DEB_CFLAGS_MAINT_{ APPEND_ PREPEND} options to change flags, trusting
dh_auto_configure to do the right thing, so that we get support for
cross-compilation and other niceties. - 43. By Tyler Hicks
-
* Merge from Debian unstable (LP: #1076536), 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/acpid.install, debian/ acpid.preinst, 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.
- 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.
- debian/acpid.install, debian/acpid.links:
Don't install socket and service files needed by systemd - 42. By Tyler Hicks
-
* Merge from Debian testing (LP: #1006679), 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/acpid.install, debian/ acpid.preinst:
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.
- 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.
- debian/acpid.install, debian/acpid.links:
Don't install socket and service files needed by systemd
* Dropped changes:
- Fix build error with GCC-4.5, build with -Wno-error=sign-compare; no
longer needed.
* debian/acpid.install, debian/rules: Migrate the Ubuntu changes for
powerbtn.sh to debhelper 7 - 41. By Tyler Hicks
-
* 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 - 40. By Martin Pitt
-
./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) - 38. By Michael Meskes
-
* Imported Upstream version 2.0.10
* Bumped Standards-Version to 3.9.2, no changes needed.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/saucy/acpid
