diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-02-03 13:40:18 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-02-03 13:40:18 +0000 |
| commit | 568987f80fd53933bec506fa936bde0aecd36ce7 (patch) | |
| tree | 9e5188096ebe67c34090d163f54531f7e9a7e205 /main | |
| parent | c9a0373ce633758e260fe02e1173c9b7c3bc2802 (diff) | |
| download | aports-568987f80fd53933bec506fa936bde0aecd36ce7.tar.bz2 aports-568987f80fd53933bec506fa936bde0aecd36ce7.tar.xz | |
main/busybox: fix the acpid fix
the previous fix broke clean exit on SIGTERM.
Diffstat (limited to 'main')
| -rw-r--r-- | main/busybox/0001-acpid-fix-for-clean-exit-on-SIGTERM.patch | 30 | ||||
| -rw-r--r-- | main/busybox/APKBUILD | 4 |
2 files changed, 33 insertions, 1 deletions
diff --git a/main/busybox/0001-acpid-fix-for-clean-exit-on-SIGTERM.patch b/main/busybox/0001-acpid-fix-for-clean-exit-on-SIGTERM.patch new file mode 100644 index 0000000000..4218971889 --- /dev/null +++ b/main/busybox/0001-acpid-fix-for-clean-exit-on-SIGTERM.patch @@ -0,0 +1,30 @@ +From 4d5e59384109ab83309f07b67a1e2eef1f392daf Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 3 Feb 2012 14:32:51 +0100 +Subject: [PATCH] acpid: fix for clean exit on SIGTERM + +f4b2f335506e570a06d5eab09068da3f61 introduced safe_poll() and no +longer exits on SIGTERM. We solve this by explicit checking for +bb_got_signal. + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> +--- + util-linux/acpid.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/util-linux/acpid.c b/util-linux/acpid.c +index 361a2b2..63c7a6d 100644 +--- a/util-linux/acpid.c ++++ b/util-linux/acpid.c +@@ -293,7 +293,7 @@ int acpid_main(int argc UNUSED_PARAM, char **argv) + + write_pidfile(opt_pidfile); + +- while (safe_poll(pfd, nfd, -1) > 0) { ++ while (safe_poll(pfd, nfd, -1) > 0 && !bb_got_signal) { + int i; + for (i = 0; i < nfd; i++) { + const char *event; +-- +1.7.9 + diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index b0bf4b7070..d655e3b9fe 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.19.3 -pkgrel=5 +pkgrel=6 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net arch="all" @@ -19,6 +19,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 bb-app-location.patch 0001-loginutils-use-sha512.patch acpid.patch + 0001-acpid-fix-for-clean-exit-on-SIGTERM.patch http://busybox.net/downloads/fixes-1.19.3/busybox-1.19.3-getty.patch http://busybox.net/downloads/fixes-1.19.3/busybox-1.19.3-modinfo.patch @@ -93,6 +94,7 @@ b5375210f13fd6e1ca61a565e8fabd35 busybox-uname-is-not-gnu.patch 754916e52fa11d3fe7c29c93248b6707 bb-app-location.patch 784383013b8f015fb0d214618c46b4b8 0001-loginutils-use-sha512.patch 361a26d690e6f1585c6710b3afeb10a6 acpid.patch +058da9d0a595430e840e5793b5a5d059 0001-acpid-fix-for-clean-exit-on-SIGTERM.patch 5ed72ca85b8fba4598d64a550210b31f busybox-1.19.3-getty.patch 41636628e481f22b8774b6bee1eebfb1 busybox-1.19.3-modinfo.patch cb48bffc0e1e3be527cd4ff67324a2a2 busybox-1.19.3-wget.patch |