* [gentoo-commits] dev/blueness:master commit in: sys-apps/busybox/, sys-apps/busybox/files/
@ 2012-12-01 2:41 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2012-12-01 2:41 UTC (permalink / raw
To: gentoo-commits
commit: 57c4724315a67cae7b87f6a3b7aa1a5f83ca1a41
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 1 02:41:02 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 1 02:41:02 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=57c47243
sys-apps/busybox: remove uneeded patches
Package-Manager: portage-2.1.11.31
Manifest-Sign-Key: 0xF52D4BBA
---
sys-apps/busybox/Manifest | 30 +++---
sys-apps/busybox/busybox-9999.ebuild | 1 -
.../files/busybox-1.20.2-glibc-sys-resource.patch | 109 --------------------
.../files/busybox-1.20.2-selinux-pkg-config.patch | 67 ------------
4 files changed, 14 insertions(+), 193 deletions(-)
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index a3b867b..2210bc1 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -2,8 +2,6 @@
Hash: SHA256
AUX busybox-1.19.0-bb.patch 908 SHA256 98f92c2edbcf61d1bacef783ea8b08cce07051b0a4489ed3f4579296846f89f1 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c WHIRLPOOL b0d6d9b08ad0930e5243c7addc8a6db61505e95ed8e72c64fbfd734cb6ff9e303b3eb8ea6ec4790b2be567783664230cf278eb3e673fa0844c3881cf993f7cb8
-AUX busybox-1.20.2-glibc-sys-resource.patch 3054 SHA256 03d64c3b864fc5caa9ec56e3d2bf3bcd43801ee82e27332dbfe412138c9502d7 SHA512 c895d7ad0bf379b3ff1c4114af7f8fe0d53b1e60371ac1faaaf3434c293e125be4d79a6ee17d1aa2a923629b09416b833dd3408b9b4dabf56dd74d630c24e9ff WHIRLPOOL ff3e347035a4eb500762d59e35ff8cd2a91130de1c73b0666331f62fc19c586646fd713814e6712d53449d484fc2479ec0e5c29dfe3a19feb2163350a9171fac
-AUX busybox-1.20.2-selinux-pkg-config.patch 2009 SHA256 09d34cafa860cfabfb6911b087fa5887dd7f8b0026955654904fdb79d5281e76 SHA512 7b9b5cfc890d6c751727c6873df66ada967973786a2056a33e76663358aefe2d5828b366f6ce85b573bc01737426a1019dd2f0177caceef9dfac32904ee01d84 WHIRLPOOL fef2b477065ed309298788e35b82fd77d3297eb52eb59f065ebb9c631ec4a3f849ef99a014bdf682469ee1e8683debc312993faf1ad094e2f9afd8ce99c955aa
AUX busybox-ntpd.confd 186 SHA256 4bff7f5c66f4eece52e4381fd2706e591f10eb50f3c3a4132344d34150dc54de SHA512 b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8 WHIRLPOOL a1b228ae22c61de6ecc7fa58edcd4c3941b3762a45fcc38d05bd1c9428bc553b1a158c101d65a99ba63d4bc19b269e834b3f0eba40a5a1c81e0ae876a2ecb42c
AUX busybox-ntpd.initd 602 SHA256 95383156f6f417719bd4d5655e9291e2e7a3e9fa815329eb60c2b911e79f859b SHA512 6aff8dc4e7740f58f1d43aafd1aca22fecb9f138ec155e4a1bae43a214007e06d92bc648bf965f08fc151b00cc97c32f24bf0691847a79e684f3972ee7356d82 WHIRLPOOL 0b09ae03d45d9af92bda0f0f716c3c112c1be353e229fbe8d84614d87b844bc130d5d5cdb819d496382d943e584cca347465cc4139a9ed2d57212de85805d0bc
AUX busybox-sysklogd.confd 319 SHA256 41a7dcb89156a80387a56579757e3a9f0f87ae4e0e955997e31092ab015a3152 SHA512 c9ddc5bec07c76b1ac4b3ceeb9dcdbaa96ef0791bc3a699b7cf1645d2765d74f5bb105e4d7912d67d8af0bf02e8447b6771edd789a05c7e4d9afeaf3a45896d2 WHIRLPOOL 6f2b18cea47118bfae04ecf932e62464a8574db1a2f45c5d4cb6d7a2352a117865bfffff9e367b51701c15103ef5a68f4b27a83b1e179ddfecb8529f68eb4038
@@ -18,22 +16,22 @@ AUX mdev/dvbdev 356 SHA256 ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e20141
AUX mdev/ide_links 440 SHA256 3fccc9ee437e3dcc8ac73bfe3713334a7156a112fe442e052fff4f26ff0f6a88 SHA512 0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec WHIRLPOOL ce02358a65ad2beeab12485379e322736c7b6b58ff44a20b880d9bab8806e04890a385b94228f2db685150dfe0a3c716f842ce5c1c7f579c8208ab4e9a6ae852
AUX mdev/usbdev 1624 SHA256 113ecaa722fa1f4e1c76489e2a7b24099778615a5bccd443aa9cbab28c6d05d0 SHA512 f2d98050eeeb2fbb299298e221f47182a74ed901d2c8c848aa297ebd461c62c30d2fb968bb3eb723a6d9c268fac4a3c40a18aa59ed934043d42c38a1f6b9f5a2 WHIRLPOOL 9b773cb41827bf5777061ec7ed432315bc5bf070768a44ceec7c893af2266d8c06ea4c061711b2696a8228d72c7222fbf52d26fb92b4112158716727b3bc1e38
AUX mdev/usbdisk_link 984 SHA256 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858 SHA512 392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 WHIRLPOOL 439e0c86e312e685bce1f7a4a67f709c4556de69b40112d97d6a376bc7da9d73e794663d06097f721173d97bf4f671ddbb4d0c4838db604e7cd13d2c531ede19
-EBUILD busybox-9999.ebuild 9415 SHA256 57b91eeb0b135ce4f2e518e1beb5fbd1939e2b9240937efef86154da5b472612 SHA512 0335dee69882fb84a779aca4f32fe3d9d2511490b7ad35e245c7d7460ad68af67b6638dddc747e46ba30b3287d346a634a46ae827459ddd3c7a2b2e41492f49e WHIRLPOOL 29116f0016ec7c2e1244d6c655337cced07fd4b909afdedd911afd73d8cb7fc92e6e4873d30a78f5080e7cf1b7409d5d2b00567bc52f017935e33c2d0dd141e2
+EBUILD busybox-9999.ebuild 9380 SHA256 5eb471a98e5a2bc00d135004f7a2f92d9f8ce45f138d2461c8a622b30b608f5a SHA512 5559b25e7353e3a9d9bf4a0fc439cdff629182f763ef24342cdb076a4c2f2013c6ea2aac17475a84bb870287ad0007475cd0a1d35b39818cdeefa4021ba556d0 WHIRLPOOL 1c46244d253d7f0f47dda8ed59b477b6e8596178d6d7ebfc2737b67260f06ded67ba520e1d7ee3ab5d42c9c9a5aa485d211b763a5a437d2fd6684023d6f61533
MISC metadata.xml 856 SHA256 96bd35614f2246ff9fbbcc5a3e78f524160279cb92c073b7bac2d9802e42de1a SHA512 974fa556e606efc3bd65d1486eefb2eefdef001fc882ba2ab436468313d948fe3d0a2701bd302f5107401604f6cdf4bf78f66f9b8f0ddf4be81e55c3958fffc2 WHIRLPOOL 5ccbbb9c8ee41a97074155eec2f602fc126597bf2030f9ae1c5ad8289e6765586ac83e6e1b58e9e411b20debb3fda959f58da8141948d60b5438a47ff24dcc06
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJQuWwaAAoJEJOE+m71LUu6RXEP/2exxbdryvRbkhdUZfm9+Ea0
-vtOeuh0e6rJxv+i1ng9hxy0s7DRVrBRMRS8Vby3pnOGOQ/Fl3jWP88U5ptT8P2lv
-azPF77DpYf83bcRh/oI5YnW50aXyMVh21ro5jAMfCoto8Cdp0WLPKW0B3r8bQNQ6
-/DCMrdmiriI614PgkflErrEC6JqehyqSP9zvH8ZagMIpp8ZWhBLCriskJMJTFK73
-wtqZRhvYiHZL2QzaIMxsJh9ZOv3yfOmK+ogFeO5ZOppNN7ITzj3/U15i68w81aND
-6ANEdJH4Opi6viC7GsFtsKPxvCYzRQbh9KGr+Blsgs2zu/b/XUHWhSlpzFCMVQm8
-caaWZq3mEdoXHA9aQXREMi5OcxF+vszcphnMnVNSUrzYjnUtOR5RZJLtGba3V5SK
-8h9IkP5ZkuTJH4zJ3tEhU8i2T+vblhpaj+9JkHcMLjF9rmM57eESSRzniMOs1mG7
-A2QfrpK+G7oKuIVp7o5/NfRH4DUHUr3HUn1G0gElZ9X4RXhcf5JHZ7whBDS3+twi
-XKnBqyXmYf6EXFUjlADD6nb3W8t12msngl0IAXC8jscfyeFgKKogqAYGsQUy3HE9
-gzOG12DgIV2u4sID4pshmYDkUUq/OQp2F5m1sM/u74H+nGxNGtYfQ5WKkO3m1s5v
-V+SSF+KJnr2Ab74xLhK4
-=iqxt
+iQIcBAEBCAAGBQJQuW4+AAoJEJOE+m71LUu69eMP/jroN2ES50KDCEFhpJY5RRkM
+ezhOEwFzDfpRDZD+LYGEwdqeH76d/It7qVArE7utj9lQROJC07eIz0Nz/ogbA1th
+Hlt1YMwiBzC/rTq2JFgpVeOTzzceFGf6xXYGiCx1kw0wRhuvsqLdTJuRL9JAf/Kr
+igR+aIjudp8MI8qqxptMxP5GoL9ADwg5gzZ6il28Xc3hMynLJHDtBzdVzrphczFq
+Icug7TpAqErLZYSLTFvcGM2Im5XN67LPb8FE0W2uoOljwBnfrjO7UZeyNtxjYXnv
+rFbE/Wk7m9auYYEH5mvjYR/7UDPFV8cIglS5pD1/vckcaPAd1nFlDFguQn1QyXnz
+YQv8J3bJ6osj4x2pSwBTnSVS6khSiAjjrVkLE4Ip8Jr3solwKpADJ9I85oMlR1XQ
+LwlZETwmaiRD11mcWGObl/m9AH64P284CYIbpifcfTsHo5VHz7YrUs/QZfKSkpjY
+dk38YpGiorg116TOGpBF4wgr6gaBJ1iEWbb/Trnnxfk+IHUqWNhW9s/H6CkXBd7r
+H3hzE8Y7GrCEoGZuYP8MOM9vIIkn91R5c1R2BapCst77uIreEyo1C/0Q0tA7P2+D
+jGHQIGbV7lhM1BzdPnqw1KZ/tJgaKLD+ORpUDiUpc318DWT0ksOsgqPByrECo8ds
+y33WNPWLWfsrz9tihKOs
+=BghK
-----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index d19d5cf..922d526 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -88,7 +88,6 @@ src_prepare() {
# patches go here!
epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
- epatch "${FILESDIR}"/${P}-*.patch
cp "${FILESDIR}"/ginit.c init/ || die
# flag cleanup
diff --git a/sys-apps/busybox/files/busybox-1.20.2-glibc-sys-resource.patch b/sys-apps/busybox/files/busybox-1.20.2-glibc-sys-resource.patch
deleted file mode 100644
index f682d00..0000000
--- a/sys-apps/busybox/files/busybox-1.20.2-glibc-sys-resource.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-https://bugs.gentoo.org/424954
-
-From c5fe9f7b723f949457263ef8e22ab807d5b549ce Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 5 Jul 2012 23:19:09 -0400
-Subject: [PATCH] include sys/resource.h where needed
-
-We use functions from sys/resource.h in misc applets, but don't include
-the header. This breaks building with newer glibc versions, so add the
-include where needed.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- loginutils/passwd.c | 1 +
- miscutils/time.c | 1 +
- networking/inetd.c | 1 +
- networking/ntpd.c | 1 +
- networking/ntpd_simple.c | 1 +
- runit/chpst.c | 1 +
- shell/shell_common.c | 1 +
- 7 files changed, 7 insertions(+)
-
-diff --git a/loginutils/passwd.c b/loginutils/passwd.c
-index b83db00..a7006f0 100644
---- a/loginutils/passwd.c
-+++ b/loginutils/passwd.c
-@@ -15,6 +15,7 @@
-
- #include "libbb.h"
- #include <syslog.h>
-+#include <sys/resource.h> /* setrlimit */
-
- static void nuke_str(char *str)
- {
-diff --git a/miscutils/time.c b/miscutils/time.c
-index 945f15f..ffed386 100644
---- a/miscutils/time.c
-+++ b/miscutils/time.c
-@@ -16,6 +16,7 @@
- //usage: "\n -v Verbose"
-
- #include "libbb.h"
-+#include <sys/resource.h> /* getrusage */
-
- /* Information on the resources used by a child process. */
- typedef struct {
-diff --git a/networking/inetd.c b/networking/inetd.c
-index 1308d74..00baf69 100644
---- a/networking/inetd.c
-+++ b/networking/inetd.c
-@@ -165,6 +165,7 @@
- //usage: "\n (default: 0 - disabled)"
-
- #include <syslog.h>
-+#include <sys/resource.h> /* setrlimit */
- #include <sys/un.h>
-
- #include "libbb.h"
-diff --git a/networking/ntpd.c b/networking/ntpd.c
-index 72e9d0b..5b92db6 100644
---- a/networking/ntpd.c
-+++ b/networking/ntpd.c
-@@ -46,6 +46,7 @@
- #include "libbb.h"
- #include <math.h>
- #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
-+#include <sys/resource.h> /* setpriority */
- #include <sys/timex.h>
- #ifndef IPTOS_LOWDELAY
- # define IPTOS_LOWDELAY 0x10
-diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c
-index 4ad44e4..1b7c66b 100644
---- a/networking/ntpd_simple.c
-+++ b/networking/ntpd_simple.c
-@@ -7,6 +7,7 @@
- */
- #include "libbb.h"
- #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
-+#include <sys/resource.h> /* setpriority */
- #ifndef IPTOS_LOWDELAY
- # define IPTOS_LOWDELAY 0x10
- #endif
-diff --git a/runit/chpst.c b/runit/chpst.c
-index ac296ba..ed72c8b 100644
---- a/runit/chpst.c
-+++ b/runit/chpst.c
-@@ -91,6 +91,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- //usage: "\n a SIGXCPU after N seconds"
-
- #include "libbb.h"
-+#include <sys/resource.h> /* getrlimit */
-
- /*
- Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.
-diff --git a/shell/shell_common.c b/shell/shell_common.c
-index 51c92d6..780e27e 100644
---- a/shell/shell_common.c
-+++ b/shell/shell_common.c
-@@ -18,6 +18,7 @@
- */
- #include "libbb.h"
- #include "shell_common.h"
-+#include <sys/resource.h> /* getrlimit */
-
- const char defifsvar[] ALIGN1 = "IFS= \t\n";
-
---
-1.7.9.7
-
diff --git a/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch b/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch
deleted file mode 100644
index 5e9ef26..0000000
--- a/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 5694afd72a0a424fcdd2ac85838229a1a86b7e84 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 20 Oct 2012 15:01:26 -0400
-Subject: [PATCH] build system: use pkg-config to look up selinux libs
-
-Newer versions of libselinux has started linking against more libs.
-Rather than continuing hardcoding things, switch to using pkg-config
-to query for its dependencies.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile | 1 +
- Makefile.flags | 12 +++++++++++-
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index b2e9477..8995ff5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -297,6 +297,7 @@ NM = $(CROSS_COMPILE)nm
- STRIP = $(CROSS_COMPILE)strip
- OBJCOPY = $(CROSS_COMPILE)objcopy
- OBJDUMP = $(CROSS_COMPILE)objdump
-+PKG_CONFIG ?= $(CROSS_COMPILE)pkg-config
- AWK = awk
- GENKSYMS = scripts/genksyms/genksyms
- DEPMOD = /sbin/depmod
-diff --git a/Makefile.flags b/Makefile.flags
-index e77c0e5..307afa7 100644
---- a/Makefile.flags
-+++ b/Makefile.flags
-@@ -78,6 +78,12 @@ ARCH_FPIC ?= -fpic
- ARCH_FPIE ?= -fpie
- ARCH_PIE ?= -pie
-
-+# Usage: $(eval $(call pkg_check_modules,VARIABLE-PREFIX,MODULES))
-+define pkg_check_modules
-+$(1)_CFLAGS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags $(2))
-+$(1)_LIBS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs $(2))
-+endef
-+
- ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y)
- # on i386: 14% smaller libbusybox.so
- # (code itself is 9% bigger, we save on relocs/PLT/GOT)
-@@ -89,6 +95,7 @@ endif
-
- ifeq ($(CONFIG_STATIC),y)
- CFLAGS_busybox += -static
-+PKG_CONFIG_FLAGS += --static
- endif
-
- ifeq ($(CONFIG_PIE),y)
-@@ -131,7 +138,10 @@ LDLIBS += pam pam_misc pthread
- endif
-
- ifeq ($(CONFIG_SELINUX),y)
--LDLIBS += selinux sepol
-+SELINUX_PC_MODULES = libselinux libsepol
-+$(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))
-+CPPFLAGS += $(SELINUX_CFLAGS)
-+LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%))
- endif
-
- ifeq ($(CONFIG_EFENCE),y)
---
-1.7.12
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: sys-apps/busybox/, sys-apps/busybox/files/
@ 2012-12-01 3:17 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2012-12-01 3:17 UTC (permalink / raw
To: gentoo-commits
commit: 67457a9dccf5e83d62fd10e4ea7b61d742ec7a1c
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 1 03:17:14 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 1 03:17:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=67457a9d
sys-apps/busybox: use --name in start-stop-daemon
Package-Manager: portage-2.1.11.31
Manifest-Sign-Key: 0xF52D4BBA
---
sys-apps/busybox/Manifest | 34 ++++++++++++------------
sys-apps/busybox/busybox-9999.ebuild | 14 +++++-----
sys-apps/busybox/files/busybox-ntpd.initd | 4 +-
sys-apps/busybox/files/busybox-sysklogd.initd | 18 ++++++------
sys-apps/busybox/files/busybox-watchdog.initd | 4 +-
5 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 2210bc1..a835396 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -3,11 +3,11 @@ Hash: SHA256
AUX busybox-1.19.0-bb.patch 908 SHA256 98f92c2edbcf61d1bacef783ea8b08cce07051b0a4489ed3f4579296846f89f1 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c WHIRLPOOL b0d6d9b08ad0930e5243c7addc8a6db61505e95ed8e72c64fbfd734cb6ff9e303b3eb8ea6ec4790b2be567783664230cf278eb3e673fa0844c3881cf993f7cb8
AUX busybox-ntpd.confd 186 SHA256 4bff7f5c66f4eece52e4381fd2706e591f10eb50f3c3a4132344d34150dc54de SHA512 b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8 WHIRLPOOL a1b228ae22c61de6ecc7fa58edcd4c3941b3762a45fcc38d05bd1c9428bc553b1a158c101d65a99ba63d4bc19b269e834b3f0eba40a5a1c81e0ae876a2ecb42c
-AUX busybox-ntpd.initd 602 SHA256 95383156f6f417719bd4d5655e9291e2e7a3e9fa815329eb60c2b911e79f859b SHA512 6aff8dc4e7740f58f1d43aafd1aca22fecb9f138ec155e4a1bae43a214007e06d92bc648bf965f08fc151b00cc97c32f24bf0691847a79e684f3972ee7356d82 WHIRLPOOL 0b09ae03d45d9af92bda0f0f716c3c112c1be353e229fbe8d84614d87b844bc130d5d5cdb819d496382d943e584cca347465cc4139a9ed2d57212de85805d0bc
+AUX busybox-ntpd.initd 616 SHA256 011b46dcdbd030c7f365e5ff4c3c9eafcaa2f4a670d33000793e2db1fd965530 SHA512 a00313d1da4f1986977c73556a9a2c7242b350b3276217cf20dde4c4b7106e218b61c96a243db0ccc955c28d767cee1a6b569cd3eebeaa04d192751aadc7edbc WHIRLPOOL f67122c7fbc0de5db7973e5e141a901997bdf094cdb89c3a9f66c0fad188b6e826b81c995e1608c6cc236f1737f36ee8b90e0d764ff1d802c7ce0af2e30ac9b3
AUX busybox-sysklogd.confd 319 SHA256 41a7dcb89156a80387a56579757e3a9f0f87ae4e0e955997e31092ab015a3152 SHA512 c9ddc5bec07c76b1ac4b3ceeb9dcdbaa96ef0791bc3a699b7cf1645d2765d74f5bb105e4d7912d67d8af0bf02e8447b6771edd789a05c7e4d9afeaf3a45896d2 WHIRLPOOL 6f2b18cea47118bfae04ecf932e62464a8574db1a2f45c5d4cb6d7a2352a117865bfffff9e367b51701c15103ef5a68f4b27a83b1e179ddfecb8529f68eb4038
-AUX busybox-sysklogd.initd 1256 SHA256 9302f0b7b4ee35c25195dc8c57bd3c2c55d85b3661aef7e551e39b3a5e26d604 SHA512 cdf95d8e39331f8887fc8955352587b39026f7aee00371499fca8e110f36f793ff58809de300da38b8fe58fbc0c953fbad70277eb13289087170fe93de86e4b5 WHIRLPOOL 05c5c4a9cf5e0524def3ef0210af9f39d669459c792f5fced46c92bec82337e621958d060ac86d3eb3d435a429401bcbd7310bd3e04e5bb0e431ff9f4cb46e8d
+AUX busybox-sysklogd.initd 1291 SHA256 f1c20e299409af7bf882089f2cbcb099e2e2da148c885b3e22e1ecce6d99f359 SHA512 ebe5852b13112e57ab3d5a68ab21e21ac1b7d3fa89ce0e2d14964db08f3eb3f2cfa787ade2f9f7929ec2c2663fd1430dc6ec05c7e38563ebb4e3665cd0847a03 WHIRLPOOL 33f6c504a835873574d27082b822f48679e236081e2aea988dd2af204aa9a48e9d945a9be4c2e65c5575b50cee155df3f882fc848a4f7084f86754320c2d6f4a
AUX busybox-watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 WHIRLPOOL 8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767
-AUX busybox-watchdog.initd 640 SHA256 0cbfbf8fb77e678e609fc7bf7dc62700d3cf44acf40f3c53e2e522bc91de5c99 SHA512 85f9a13bedc6e55c7082c391c26dd85af9ca986810c0773adcb477b2c15240a1b1abf834fad8782d1595f651002d749ce80a139b00e524b75dcbcd209ed7df0e WHIRLPOOL ad085b343a299004e0f69b8c45e0003e5090b93d256ea16f74dbb39ef20cc71846ff61609455c2d638f7921419f68e8236ceb98f856149208d07ece2e1553ac0
+AUX busybox-watchdog.initd 663 SHA256 0dfd0cad7909713b563fd36a5751fe9a81f9e2888e2bf2d78e6f3b1daf9adccd SHA512 9ab24fbe4976cc3f05a609f7888f095b9003bc99296646848aa26eacd2a0f8e484470e2ea4706c5f3bef7e73feda34d420ae1307ec68184606d42229269afa2a WHIRLPOOL c93e1d8fb38d5b5a4399f28e5c7f0dc6079fb98569a1edda23fabd8899d78ee9340eef70b2c2a54c8ff01255e401c26bd0bcaa50ad6873aaec62e7433b13ead9
AUX ginit.c 3091 SHA256 c5a4d5dedf402742611fea7607f0d870a918da06ed5ee98796371e158956ca80 SHA512 70afaa9e7eea9f72b30ad43cbb5e70c2105c735eca888836791c2f289274fcec16545134aca4d7ab3d750bdefe445d0586fc115a6060b509a2e77ed8d37f0f3f WHIRLPOOL 43e925d52d2f05b474834288f82777c481d84fe8904e0390e2f3298cbea55f671706fa79dbc7b570c6d700f53b23667dcec058e397a06b1b1979e350c19b3e9b
AUX mdev-start.sh 2758 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7 SHA512 532ececdf40769e8059172b95f600c92ddda9490dcf04dc76b11cd669b2b35740aeb02ef7c152a42c13d5adfefb391de01239ebbb4efd06faadc0d096fcde6f5 WHIRLPOOL aace77a07eedfea3ffab029ce25334ff58f512bf5c67512c1f4a40fd51278c2b8b764e55dbf975f74bb4423cfc3f35482a5d3ee8397032fcbf22ad1f91c7c4ea
AUX mdev.rc 282 SHA256 e52abbc3399fc85ce1f097e8f12b25a5ca7fe2e3d648bee60c061b547ba39dc5 SHA512 b3e5f0810a5e33047ea73c6a4d846087100fb8c566cfa001e07fc0c1448d2024913ac06355122076ec6c79146867af77a02bbc6509b009afa97b5207588da1b9 WHIRLPOOL 2bd20507d115c82076653c6c78899751f8e3b8cde14c81c8f10ef7747ccba867360b463c90b9b3053cd6cb8599f297362153ebbff0dfad90c2fac8f445668320
@@ -16,22 +16,22 @@ AUX mdev/dvbdev 356 SHA256 ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e20141
AUX mdev/ide_links 440 SHA256 3fccc9ee437e3dcc8ac73bfe3713334a7156a112fe442e052fff4f26ff0f6a88 SHA512 0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec WHIRLPOOL ce02358a65ad2beeab12485379e322736c7b6b58ff44a20b880d9bab8806e04890a385b94228f2db685150dfe0a3c716f842ce5c1c7f579c8208ab4e9a6ae852
AUX mdev/usbdev 1624 SHA256 113ecaa722fa1f4e1c76489e2a7b24099778615a5bccd443aa9cbab28c6d05d0 SHA512 f2d98050eeeb2fbb299298e221f47182a74ed901d2c8c848aa297ebd461c62c30d2fb968bb3eb723a6d9c268fac4a3c40a18aa59ed934043d42c38a1f6b9f5a2 WHIRLPOOL 9b773cb41827bf5777061ec7ed432315bc5bf070768a44ceec7c893af2266d8c06ea4c061711b2696a8228d72c7222fbf52d26fb92b4112158716727b3bc1e38
AUX mdev/usbdisk_link 984 SHA256 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858 SHA512 392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 WHIRLPOOL 439e0c86e312e685bce1f7a4a67f709c4556de69b40112d97d6a376bc7da9d73e794663d06097f721173d97bf4f671ddbb4d0c4838db604e7cd13d2c531ede19
-EBUILD busybox-9999.ebuild 9380 SHA256 5eb471a98e5a2bc00d135004f7a2f92d9f8ce45f138d2461c8a622b30b608f5a SHA512 5559b25e7353e3a9d9bf4a0fc439cdff629182f763ef24342cdb076a4c2f2013c6ea2aac17475a84bb870287ad0007475cd0a1d35b39818cdeefa4021ba556d0 WHIRLPOOL 1c46244d253d7f0f47dda8ed59b477b6e8596178d6d7ebfc2737b67260f06ded67ba520e1d7ee3ab5d42c9c9a5aa485d211b763a5a437d2fd6684023d6f61533
+EBUILD busybox-9999.ebuild 9382 SHA256 9b36e9bad2bb6912a7fdc42533be54d313f32255749e0a964781640ad37f5844 SHA512 ac0c0c9a32571efc27bd0919a21118de937eab97871f512de2c62a3c70adc4849774be0834e5c592de4eb8adee3f70c063503f3a376aabc7444e65ea022b68ae WHIRLPOOL 714d4cc08720e28586f18580e1df5e714d6a13063eb6e537d090d1f328f5a2e4d9cd12c385f87156f3298ad9f3e7022bfac4949e0e42588f864df97edff97ee1
MISC metadata.xml 856 SHA256 96bd35614f2246ff9fbbcc5a3e78f524160279cb92c073b7bac2d9802e42de1a SHA512 974fa556e606efc3bd65d1486eefb2eefdef001fc882ba2ab436468313d948fe3d0a2701bd302f5107401604f6cdf4bf78f66f9b8f0ddf4be81e55c3958fffc2 WHIRLPOOL 5ccbbb9c8ee41a97074155eec2f602fc126597bf2030f9ae1c5ad8289e6765586ac83e6e1b58e9e411b20debb3fda959f58da8141948d60b5438a47ff24dcc06
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJQuW4+AAoJEJOE+m71LUu69eMP/jroN2ES50KDCEFhpJY5RRkM
-ezhOEwFzDfpRDZD+LYGEwdqeH76d/It7qVArE7utj9lQROJC07eIz0Nz/ogbA1th
-Hlt1YMwiBzC/rTq2JFgpVeOTzzceFGf6xXYGiCx1kw0wRhuvsqLdTJuRL9JAf/Kr
-igR+aIjudp8MI8qqxptMxP5GoL9ADwg5gzZ6il28Xc3hMynLJHDtBzdVzrphczFq
-Icug7TpAqErLZYSLTFvcGM2Im5XN67LPb8FE0W2uoOljwBnfrjO7UZeyNtxjYXnv
-rFbE/Wk7m9auYYEH5mvjYR/7UDPFV8cIglS5pD1/vckcaPAd1nFlDFguQn1QyXnz
-YQv8J3bJ6osj4x2pSwBTnSVS6khSiAjjrVkLE4Ip8Jr3solwKpADJ9I85oMlR1XQ
-LwlZETwmaiRD11mcWGObl/m9AH64P284CYIbpifcfTsHo5VHz7YrUs/QZfKSkpjY
-dk38YpGiorg116TOGpBF4wgr6gaBJ1iEWbb/Trnnxfk+IHUqWNhW9s/H6CkXBd7r
-H3hzE8Y7GrCEoGZuYP8MOM9vIIkn91R5c1R2BapCst77uIreEyo1C/0Q0tA7P2+D
-jGHQIGbV7lhM1BzdPnqw1KZ/tJgaKLD+ORpUDiUpc318DWT0ksOsgqPByrECo8ds
-y33WNPWLWfsrz9tihKOs
-=BghK
+iQIcBAEBCAAGBQJQuXa6AAoJEJOE+m71LUu6VE0QAI5UjWrFg0uIMr8na9Ns3Z5/
+xA0BXUfkAOCMU3T70L+iBckHcWkJes0kg/79eIKJZjwuEOiMJvMNKEhesC2odsyk
+dOIwLX7lUY82sqoq6rSwhx2Oo685X8wKI4orC2KGvQk+1A7T4FqCSjaSpOyhSlqm
+8rOW4TXrQlwh0rYPz4nKkoEmqmLoJVA90GHN7hxKrgfwDiv2+1zZtg88+jsw//39
+dySSVtCTOJDJ7GXzfM7OCuT+arOFbLcJdqRtYEgyAnA4shtF+uhmxaqeoEtvC+D/
+N181Q+waWakaHzUtBqdC1QEqyJoZpibWRLuy0IJ5JAFOya1Aoi9gSv/IwJeQAM92
+pW15QT9uMmhcaGy4wG2LXpT5+5uswyE3e93RqHTn+WBktI5NRv7vxruY0LKPAipx
+1aOV0vTE1TVUZY37Iu1GFGvt2pzloZv9EosZOiUQMdy8id5X4Fwq5IoieCl98LBi
+m6gWN5vW440hVN5lsiCDFjlaDRa4TVCpnR22xPh5zM1O4nDJNt4D75095M/CdFmJ
+iQntsuPeoihgbIWm9BUtelFQKFOXo/TCepaceNSPmsIPg6fts9LAlXdA7AP8c/az
+emcQcR6MqqtVCIU4GX63Sl4kSeRgOKAIlBBXlWcCsaJ9f2KppFFFSANQYrX1Yc1o
+8RfzEYB8mx3zIF6HBxQ2
+=tW6f
-----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index 922d526..df3989f 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -175,8 +175,8 @@ src_configure() {
busybox_config_option y FEATURE_NTPD_SERVER
fi
if use sysklogd; then
+ busybox_config_option y SYSLOGD
busybox_config_option y KLOGD
- busybox_config_option y FEATURE_KLOGD_KLOGCTL
fi
use watchdog && busybox_config_option y WATCHDOG
@@ -245,16 +245,16 @@ src_install() {
# add busybox daemon's, bug #444718
if use ntpd; then
- newconfd "${FILESDIR}/ntpd.confd" "ntpd-busybox"
- newinitd "${FILESDIR}/ntpd.initd" "ntpd-busybox"
+ newconfd "${FILESDIR}/busybox-ntpd.confd" "busybox-ntpd"
+ newinitd "${FILESDIR}/busybox-ntpd.initd" "busybox-ntpd"
fi
if use sysklogd; then
- newconfd "${FILESDIR}/sysklogd.confd" "sysklogd-busybox"
- newinitd "${FILESDIR}/sysklogd.initd" "sysklogd-busybox"
+ newconfd "${FILESDIR}/sysklogd.confd" "busybox-sysklogd"
+ newinitd "${FILESDIR}/sysklogd.initd" "busybox-sysklogd"
fi
if use watchdog; then
- newconfd "${FILESDIR}/watchdog.confd" "watchdog-busybox"
- newinitd "${FILESDIR}/watchdog.initd" "watchdog-busybox"
+ newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
+ newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
fi
# bundle up the symlink files for use later
diff --git a/sys-apps/busybox/files/busybox-ntpd.initd b/sys-apps/busybox/files/busybox-ntpd.initd
index 495bc53..e212ffc 100644
--- a/sys-apps/busybox/files/busybox-ntpd.initd
+++ b/sys-apps/busybox/files/busybox-ntpd.initd
@@ -10,12 +10,12 @@ depend() {
start() {
ebegin "Starting busybox-ntpd"
- start-stop-daemon --start --quiet --exec /bin/busybox ntpd -- ${NTPD_OPTS}
+ start-stop-daemon --start --quiet --name ntpd --exec /bin/busybox -- ${NTPD_OPTS}
eend ${?} "Failed to start ntpd"
}
stop() {
ebegin "Stopping busybox-ntpd"
- start-stop-daemon --stop --retry 15 --quiet --exec /bin/busybox nptd
+ start-stop-daemon --stop --retry 15 --quiet --name ntpd --exec /bin/busybox
eend ${?} "Failed to stop ntpd"
}
diff --git a/sys-apps/busybox/files/busybox-sysklogd.initd b/sys-apps/busybox/files/busybox-sysklogd.initd
index 85e87d1..4121a1c 100644
--- a/sys-apps/busybox/files/busybox-sysklogd.initd
+++ b/sys-apps/busybox/files/busybox-sysklogd.initd
@@ -9,29 +9,29 @@ depend() {
}
start() {
- local retval=0 daemon="busybox syslogd"
+ local retval=0 daemon="busybox-syslogd"
ebegin "Starting busybox-sysklogd"
- start-stop-daemon --start --quiet --exec /bin/busybox syslogd --pidfile /var/run/syslogd.pid -- ${SYSLOGD_OPTS}
+ start-stop-daemon --start --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid -- ${SYSLOGD_OPTS}
retval=${?}
if [ ${retval} -eq 0 ]; then
- daemon="busybox klogd"
- start-stop-daemon --start --quiet --exec /bin/busybox klogd -- ${KLOGD_OPTS}
+ daemon="busybox-klogd"
+ start-stop-daemon --start --quiet --name klogd --exec /bin/busybox -- ${KLOGD_OPTS}
retval=${?}
if [ ${retval} -ne 0 ]; then
- start-stop-daemon --stop --retry 15 --quiet --exec /bin/busybox syslogd --pidfile /var/run/syslogd.pid
+ start-stop-daemon --stop --retry 15 --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid
fi
fi
eend ${retval} "Failed to start ${daemon}"
}
stop() {
- local retval=0 daemon="busybox klogd"
+ local retval=0 daemon="busybox-klogd"
ebegin "Stopping busybox-sysklogd"
- start-stop-daemon --stop --retry 15 --quiet --exec /bin/busybox klogd
+ start-stop-daemon --stop --retry 15 --quiet --name klogd --exec /bin/busybox
retval=${?}
if [ ${retval} -eq 0 ]; then
- daemon="busybox syslogd"
- start-stop-daemon --stop --retry 15 --quiet --exec /bin/busybox syslogd --pidfile /var/run/syslogd.pid
+ daemon="busybox-syslogd"
+ start-stop-daemon --stop --retry 15 --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid
retval=${?}
fi
eend ${retval} "Failed to stop ${daemon}"
diff --git a/sys-apps/busybox/files/busybox-watchdog.initd b/sys-apps/busybox/files/busybox-watchdog.initd
index a9a681d..febea06 100644
--- a/sys-apps/busybox/files/busybox-watchdog.initd
+++ b/sys-apps/busybox/files/busybox-watchdog.initd
@@ -10,12 +10,12 @@ depend() {
start() {
export SSD_NICELEVEL
ebegin "Starting busybox-watchdog"
- start-stop-daemon --start --quiet --exec /bin/busybox watchdog -- ${WATCHDOG_OPTS}
+ start-stop-daemon --start --quiet --name watchdog --exec /bin/busybox -- ${WATCHDOG_OPTS}
eend ${?} "Failed to start watchdog"
}
stop() {
ebegin "Stopping busybox-watchdog"
- start-stop-daemon --stop --retry 15 --quiet --exec /bin/busybox watchdog
+ start-stop-daemon --stop --retry 15 --quiet --name watchdog --exec /bin/busybox watchdog
eend ${?} "Failed to stop watchdog"
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: sys-apps/busybox/, sys-apps/busybox/files/
@ 2012-12-01 3:40 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2012-12-01 3:40 UTC (permalink / raw
To: gentoo-commits
commit: 168d9a95ba093071ff04116401aae5f8bfe82a54
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 1 03:39:20 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Dec 1 03:39:57 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=168d9a95
sys-apps/busybox: fix some typos
---
sys-apps/busybox/Manifest | 24 ++----------------------
sys-apps/busybox/busybox-9999.ebuild | 8 ++++----
sys-apps/busybox/files/busybox-watchdog.initd | 2 +-
3 files changed, 7 insertions(+), 27 deletions(-)
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index a835396..0427f20 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,13 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX busybox-1.19.0-bb.patch 908 SHA256 98f92c2edbcf61d1bacef783ea8b08cce07051b0a4489ed3f4579296846f89f1 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c WHIRLPOOL b0d6d9b08ad0930e5243c7addc8a6db61505e95ed8e72c64fbfd734cb6ff9e303b3eb8ea6ec4790b2be567783664230cf278eb3e673fa0844c3881cf993f7cb8
AUX busybox-ntpd.confd 186 SHA256 4bff7f5c66f4eece52e4381fd2706e591f10eb50f3c3a4132344d34150dc54de SHA512 b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8 WHIRLPOOL a1b228ae22c61de6ecc7fa58edcd4c3941b3762a45fcc38d05bd1c9428bc553b1a158c101d65a99ba63d4bc19b269e834b3f0eba40a5a1c81e0ae876a2ecb42c
AUX busybox-ntpd.initd 616 SHA256 011b46dcdbd030c7f365e5ff4c3c9eafcaa2f4a670d33000793e2db1fd965530 SHA512 a00313d1da4f1986977c73556a9a2c7242b350b3276217cf20dde4c4b7106e218b61c96a243db0ccc955c28d767cee1a6b569cd3eebeaa04d192751aadc7edbc WHIRLPOOL f67122c7fbc0de5db7973e5e141a901997bdf094cdb89c3a9f66c0fad188b6e826b81c995e1608c6cc236f1737f36ee8b90e0d764ff1d802c7ce0af2e30ac9b3
AUX busybox-sysklogd.confd 319 SHA256 41a7dcb89156a80387a56579757e3a9f0f87ae4e0e955997e31092ab015a3152 SHA512 c9ddc5bec07c76b1ac4b3ceeb9dcdbaa96ef0791bc3a699b7cf1645d2765d74f5bb105e4d7912d67d8af0bf02e8447b6771edd789a05c7e4d9afeaf3a45896d2 WHIRLPOOL 6f2b18cea47118bfae04ecf932e62464a8574db1a2f45c5d4cb6d7a2352a117865bfffff9e367b51701c15103ef5a68f4b27a83b1e179ddfecb8529f68eb4038
AUX busybox-sysklogd.initd 1291 SHA256 f1c20e299409af7bf882089f2cbcb099e2e2da148c885b3e22e1ecce6d99f359 SHA512 ebe5852b13112e57ab3d5a68ab21e21ac1b7d3fa89ce0e2d14964db08f3eb3f2cfa787ade2f9f7929ec2c2663fd1430dc6ec05c7e38563ebb4e3665cd0847a03 WHIRLPOOL 33f6c504a835873574d27082b822f48679e236081e2aea988dd2af204aa9a48e9d945a9be4c2e65c5575b50cee155df3f882fc848a4f7084f86754320c2d6f4a
AUX busybox-watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 WHIRLPOOL 8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767
-AUX busybox-watchdog.initd 663 SHA256 0dfd0cad7909713b563fd36a5751fe9a81f9e2888e2bf2d78e6f3b1daf9adccd SHA512 9ab24fbe4976cc3f05a609f7888f095b9003bc99296646848aa26eacd2a0f8e484470e2ea4706c5f3bef7e73feda34d420ae1307ec68184606d42229269afa2a WHIRLPOOL c93e1d8fb38d5b5a4399f28e5c7f0dc6079fb98569a1edda23fabd8899d78ee9340eef70b2c2a54c8ff01255e401c26bd0bcaa50ad6873aaec62e7433b13ead9
+AUX busybox-watchdog.initd 654 SHA256 698d9de2945f29a2f38f81501d5634946fa02648cc4a3be965c08310b38110f4 SHA512 889e860500df5890285361c07ece2a66189626707fc61549e7780027f6c6f802a847a9e331ada872aa60a01ddffde356d3484bdb8bc2abcb761c73a782c5529b WHIRLPOOL a5129bbcee9eae374b50628cc1dc76e7ede0c24d4ff01fbe4579a1a89dea3f486626c48c2b915131203829f0bc806981a8b35bc4663da398216e254edbd04c9b
AUX ginit.c 3091 SHA256 c5a4d5dedf402742611fea7607f0d870a918da06ed5ee98796371e158956ca80 SHA512 70afaa9e7eea9f72b30ad43cbb5e70c2105c735eca888836791c2f289274fcec16545134aca4d7ab3d750bdefe445d0586fc115a6060b509a2e77ed8d37f0f3f WHIRLPOOL 43e925d52d2f05b474834288f82777c481d84fe8904e0390e2f3298cbea55f671706fa79dbc7b570c6d700f53b23667dcec058e397a06b1b1979e350c19b3e9b
AUX mdev-start.sh 2758 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7 SHA512 532ececdf40769e8059172b95f600c92ddda9490dcf04dc76b11cd669b2b35740aeb02ef7c152a42c13d5adfefb391de01239ebbb4efd06faadc0d096fcde6f5 WHIRLPOOL aace77a07eedfea3ffab029ce25334ff58f512bf5c67512c1f4a40fd51278c2b8b764e55dbf975f74bb4423cfc3f35482a5d3ee8397032fcbf22ad1f91c7c4ea
AUX mdev.rc 282 SHA256 e52abbc3399fc85ce1f097e8f12b25a5ca7fe2e3d648bee60c061b547ba39dc5 SHA512 b3e5f0810a5e33047ea73c6a4d846087100fb8c566cfa001e07fc0c1448d2024913ac06355122076ec6c79146867af77a02bbc6509b009afa97b5207588da1b9 WHIRLPOOL 2bd20507d115c82076653c6c78899751f8e3b8cde14c81c8f10ef7747ccba867360b463c90b9b3053cd6cb8599f297362153ebbff0dfad90c2fac8f445668320
@@ -16,22 +13,5 @@ AUX mdev/dvbdev 356 SHA256 ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e20141
AUX mdev/ide_links 440 SHA256 3fccc9ee437e3dcc8ac73bfe3713334a7156a112fe442e052fff4f26ff0f6a88 SHA512 0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec WHIRLPOOL ce02358a65ad2beeab12485379e322736c7b6b58ff44a20b880d9bab8806e04890a385b94228f2db685150dfe0a3c716f842ce5c1c7f579c8208ab4e9a6ae852
AUX mdev/usbdev 1624 SHA256 113ecaa722fa1f4e1c76489e2a7b24099778615a5bccd443aa9cbab28c6d05d0 SHA512 f2d98050eeeb2fbb299298e221f47182a74ed901d2c8c848aa297ebd461c62c30d2fb968bb3eb723a6d9c268fac4a3c40a18aa59ed934043d42c38a1f6b9f5a2 WHIRLPOOL 9b773cb41827bf5777061ec7ed432315bc5bf070768a44ceec7c893af2266d8c06ea4c061711b2696a8228d72c7222fbf52d26fb92b4112158716727b3bc1e38
AUX mdev/usbdisk_link 984 SHA256 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858 SHA512 392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 WHIRLPOOL 439e0c86e312e685bce1f7a4a67f709c4556de69b40112d97d6a376bc7da9d73e794663d06097f721173d97bf4f671ddbb4d0c4838db604e7cd13d2c531ede19
-EBUILD busybox-9999.ebuild 9382 SHA256 9b36e9bad2bb6912a7fdc42533be54d313f32255749e0a964781640ad37f5844 SHA512 ac0c0c9a32571efc27bd0919a21118de937eab97871f512de2c62a3c70adc4849774be0834e5c592de4eb8adee3f70c063503f3a376aabc7444e65ea022b68ae WHIRLPOOL 714d4cc08720e28586f18580e1df5e714d6a13063eb6e537d090d1f328f5a2e4d9cd12c385f87156f3298ad9f3e7022bfac4949e0e42588f864df97edff97ee1
+EBUILD busybox-9999.ebuild 9414 SHA256 2a2734acf43b8574326b5aa18e376fbcbb58a2db1a70c9acd46c78d534d40a7e SHA512 5b3ce0dd551e85c2c889ad719c3484d19e253e568be4e0a0f9fa8ea53d6fa7eaa30bb611025ea435f794eab8bca124d30127a9c92d39859a1a1676384c950d60 WHIRLPOOL 79222b5bf719ba52baccc4a55477604a2f5f7b39f0f849feae971b550b68f8ea5bd28235766df2a803cfde6c3f5c5c652049a4ddf28d60aab1fe601fbb2ff8fd
MISC metadata.xml 856 SHA256 96bd35614f2246ff9fbbcc5a3e78f524160279cb92c073b7bac2d9802e42de1a SHA512 974fa556e606efc3bd65d1486eefb2eefdef001fc882ba2ab436468313d948fe3d0a2701bd302f5107401604f6cdf4bf78f66f9b8f0ddf4be81e55c3958fffc2 WHIRLPOOL 5ccbbb9c8ee41a97074155eec2f602fc126597bf2030f9ae1c5ad8289e6765586ac83e6e1b58e9e411b20debb3fda959f58da8141948d60b5438a47ff24dcc06
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQuXa6AAoJEJOE+m71LUu6VE0QAI5UjWrFg0uIMr8na9Ns3Z5/
-xA0BXUfkAOCMU3T70L+iBckHcWkJes0kg/79eIKJZjwuEOiMJvMNKEhesC2odsyk
-dOIwLX7lUY82sqoq6rSwhx2Oo685X8wKI4orC2KGvQk+1A7T4FqCSjaSpOyhSlqm
-8rOW4TXrQlwh0rYPz4nKkoEmqmLoJVA90GHN7hxKrgfwDiv2+1zZtg88+jsw//39
-dySSVtCTOJDJ7GXzfM7OCuT+arOFbLcJdqRtYEgyAnA4shtF+uhmxaqeoEtvC+D/
-N181Q+waWakaHzUtBqdC1QEqyJoZpibWRLuy0IJ5JAFOya1Aoi9gSv/IwJeQAM92
-pW15QT9uMmhcaGy4wG2LXpT5+5uswyE3e93RqHTn+WBktI5NRv7vxruY0LKPAipx
-1aOV0vTE1TVUZY37Iu1GFGvt2pzloZv9EosZOiUQMdy8id5X4Fwq5IoieCl98LBi
-m6gWN5vW440hVN5lsiCDFjlaDRa4TVCpnR22xPh5zM1O4nDJNt4D75095M/CdFmJ
-iQntsuPeoihgbIWm9BUtelFQKFOXo/TCepaceNSPmsIPg6fts9LAlXdA7AP8c/az
-emcQcR6MqqtVCIU4GX63Sl4kSeRgOKAIlBBXlWcCsaJ9f2KppFFFSANQYrX1Yc1o
-8RfzEYB8mx3zIF6HBxQ2
-=tW6f
------END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index df3989f..d891ca1 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -249,12 +249,12 @@ src_install() {
newinitd "${FILESDIR}/busybox-ntpd.initd" "busybox-ntpd"
fi
if use sysklogd; then
- newconfd "${FILESDIR}/sysklogd.confd" "busybox-sysklogd"
- newinitd "${FILESDIR}/sysklogd.initd" "busybox-sysklogd"
+ newconfd "${FILESDIR}/busybox-sysklogd.confd" "busybox-sysklogd"
+ newinitd "${FILESDIR}/busybox-sysklogd.initd" "busybox-sysklogd"
fi
if use watchdog; then
- newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
- newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
+ newconfd "${FILESDIR}/busybox-watchdog.confd" "busybox-watchdog"
+ newinitd "${FILESDIR}/busybox-watchdog.initd" "busybox-watchdog"
fi
# bundle up the symlink files for use later
diff --git a/sys-apps/busybox/files/busybox-watchdog.initd b/sys-apps/busybox/files/busybox-watchdog.initd
index febea06..8d50e53 100644
--- a/sys-apps/busybox/files/busybox-watchdog.initd
+++ b/sys-apps/busybox/files/busybox-watchdog.initd
@@ -16,6 +16,6 @@ start() {
stop() {
ebegin "Stopping busybox-watchdog"
- start-stop-daemon --stop --retry 15 --quiet --name watchdog --exec /bin/busybox watchdog
+ start-stop-daemon --stop --retry 15 --quiet --name watchdog --exec /bin/busybox
eend ${?} "Failed to stop watchdog"
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: sys-apps/busybox/, sys-apps/busybox/files/
@ 2012-12-02 14:49 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2012-12-02 14:49 UTC (permalink / raw
To: gentoo-commits
commit: 789cbd72edc6d3ca839d7a784ca1ad37b9142ad7
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 2 14:48:48 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Dec 2 14:48:48 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=789cbd72
sys-apps/busybox: address points in bug #444718, comment #6
---
sys-apps/busybox/Manifest | 16 +++++----
sys-apps/busybox/busybox-9999.ebuild | 30 ++++++++--------
sys-apps/busybox/files/busybox-sysklogd.initd | 38 --------------------
.../files/{busybox-sysklogd.confd => klogd.confd} | 5 +--
sys-apps/busybox/files/klogd.initd | 20 ++++++++++
.../files/{busybox-ntpd.confd => ntpd.confd} | 0
.../files/{busybox-ntpd.initd => ntpd.initd} | 4 +-
.../{busybox-sysklogd.confd => syslogd.confd} | 5 +--
sys-apps/busybox/files/syslogd.initd | 21 +++++++++++
.../{busybox-watchdog.confd => watchdog.confd} | 0
.../{busybox-watchdog.initd => watchdog.initd} | 0
11 files changed, 69 insertions(+), 70 deletions(-)
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 580051f..ed6a0d2 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,11 +1,7 @@
AUX busybox-1.19.0-bb.patch 908 SHA256 98f92c2edbcf61d1bacef783ea8b08cce07051b0a4489ed3f4579296846f89f1 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c WHIRLPOOL b0d6d9b08ad0930e5243c7addc8a6db61505e95ed8e72c64fbfd734cb6ff9e303b3eb8ea6ec4790b2be567783664230cf278eb3e673fa0844c3881cf993f7cb8
-AUX busybox-ntpd.confd 186 SHA256 4bff7f5c66f4eece52e4381fd2706e591f10eb50f3c3a4132344d34150dc54de SHA512 b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8 WHIRLPOOL a1b228ae22c61de6ecc7fa58edcd4c3941b3762a45fcc38d05bd1c9428bc553b1a158c101d65a99ba63d4bc19b269e834b3f0eba40a5a1c81e0ae876a2ecb42c
-AUX busybox-ntpd.initd 616 SHA256 011b46dcdbd030c7f365e5ff4c3c9eafcaa2f4a670d33000793e2db1fd965530 SHA512 a00313d1da4f1986977c73556a9a2c7242b350b3276217cf20dde4c4b7106e218b61c96a243db0ccc955c28d767cee1a6b569cd3eebeaa04d192751aadc7edbc WHIRLPOOL f67122c7fbc0de5db7973e5e141a901997bdf094cdb89c3a9f66c0fad188b6e826b81c995e1608c6cc236f1737f36ee8b90e0d764ff1d802c7ce0af2e30ac9b3
-AUX busybox-sysklogd.confd 319 SHA256 41a7dcb89156a80387a56579757e3a9f0f87ae4e0e955997e31092ab015a3152 SHA512 c9ddc5bec07c76b1ac4b3ceeb9dcdbaa96ef0791bc3a699b7cf1645d2765d74f5bb105e4d7912d67d8af0bf02e8447b6771edd789a05c7e4d9afeaf3a45896d2 WHIRLPOOL 6f2b18cea47118bfae04ecf932e62464a8574db1a2f45c5d4cb6d7a2352a117865bfffff9e367b51701c15103ef5a68f4b27a83b1e179ddfecb8529f68eb4038
-AUX busybox-sysklogd.initd 1291 SHA256 f1c20e299409af7bf882089f2cbcb099e2e2da148c885b3e22e1ecce6d99f359 SHA512 ebe5852b13112e57ab3d5a68ab21e21ac1b7d3fa89ce0e2d14964db08f3eb3f2cfa787ade2f9f7929ec2c2663fd1430dc6ec05c7e38563ebb4e3665cd0847a03 WHIRLPOOL 33f6c504a835873574d27082b822f48679e236081e2aea988dd2af204aa9a48e9d945a9be4c2e65c5575b50cee155df3f882fc848a4f7084f86754320c2d6f4a
-AUX busybox-watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 WHIRLPOOL 8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767
-AUX busybox-watchdog.initd 654 SHA256 698d9de2945f29a2f38f81501d5634946fa02648cc4a3be965c08310b38110f4 SHA512 889e860500df5890285361c07ece2a66189626707fc61549e7780027f6c6f802a847a9e331ada872aa60a01ddffde356d3484bdb8bc2abcb761c73a782c5529b WHIRLPOOL a5129bbcee9eae374b50628cc1dc76e7ede0c24d4ff01fbe4579a1a89dea3f486626c48c2b915131203829f0bc806981a8b35bc4663da398216e254edbd04c9b
AUX ginit.c 3091 SHA256 c5a4d5dedf402742611fea7607f0d870a918da06ed5ee98796371e158956ca80 SHA512 70afaa9e7eea9f72b30ad43cbb5e70c2105c735eca888836791c2f289274fcec16545134aca4d7ab3d750bdefe445d0586fc115a6060b509a2e77ed8d37f0f3f WHIRLPOOL 43e925d52d2f05b474834288f82777c481d84fe8904e0390e2f3298cbea55f671706fa79dbc7b570c6d700f53b23667dcec058e397a06b1b1979e350c19b3e9b
+AUX klogd.confd 218 SHA256 737b78745964e110da2fd3357c6d5fb80ccacf979039b8d40c03cf1cb969e5f3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f WHIRLPOOL ea28c1d926e36fba0ab69de8ddfd2503889b7cfa3a4ada347a9d22d9894fe30be068c0ed55f899b952e62b8de3cb69e1a4209f7864787988ded28ede10c7445a
+AUX klogd.initd 611 SHA256 473743b82f34bfcab010ce93263d45e77d23bcbfd1dc400004809103a93b0314 SHA512 9abbadd168bb33a7a649f6a8d560c8990848ab8173c4d7ce570916a0a85e8bd48176e5ac99bc1ce4afa8027f628873538f98731e60156f23e26a588eca5272aa WHIRLPOOL 689038070ecabe920c83061bb442b4d195c70653b82b997a519f02ce314c783d766c98dd31b6c1199499e81fcdb0e98195b7effa01acab034ac8bee57195c776
AUX mdev-start.sh 2758 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7 SHA512 532ececdf40769e8059172b95f600c92ddda9490dcf04dc76b11cd669b2b35740aeb02ef7c152a42c13d5adfefb391de01239ebbb4efd06faadc0d096fcde6f5 WHIRLPOOL aace77a07eedfea3ffab029ce25334ff58f512bf5c67512c1f4a40fd51278c2b8b764e55dbf975f74bb4423cfc3f35482a5d3ee8397032fcbf22ad1f91c7c4ea
AUX mdev.rc 282 SHA256 e52abbc3399fc85ce1f097e8f12b25a5ca7fe2e3d648bee60c061b547ba39dc5 SHA512 b3e5f0810a5e33047ea73c6a4d846087100fb8c566cfa001e07fc0c1448d2024913ac06355122076ec6c79146867af77a02bbc6509b009afa97b5207588da1b9 WHIRLPOOL 2bd20507d115c82076653c6c78899751f8e3b8cde14c81c8f10ef7747ccba867360b463c90b9b3053cd6cb8599f297362153ebbff0dfad90c2fac8f445668320
AUX mdev.rc.1 2202 SHA256 5235a2cd5e4ce92032a5e3e314c6e2980d98df8a6a387d2cf3e0d30d29f62cd5 SHA512 27435ac949ee351aa957f23a31b08f8689f284449928fba495f9432c893e30cd8ab8f883ee131626310f09e9edc615908484c7402009df3cba3a6eaf137f8afc WHIRLPOOL 54c23164ed320efe654d36656bd4be2be383199c003a57806a850692b38556d4f961b9608c1561f16fa108bac64643ab2270a8a1a5edf8e5d1e24a967f549b76
@@ -13,5 +9,11 @@ AUX mdev/dvbdev 356 SHA256 ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e20141
AUX mdev/ide_links 440 SHA256 3fccc9ee437e3dcc8ac73bfe3713334a7156a112fe442e052fff4f26ff0f6a88 SHA512 0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec WHIRLPOOL ce02358a65ad2beeab12485379e322736c7b6b58ff44a20b880d9bab8806e04890a385b94228f2db685150dfe0a3c716f842ce5c1c7f579c8208ab4e9a6ae852
AUX mdev/usbdev 1624 SHA256 113ecaa722fa1f4e1c76489e2a7b24099778615a5bccd443aa9cbab28c6d05d0 SHA512 f2d98050eeeb2fbb299298e221f47182a74ed901d2c8c848aa297ebd461c62c30d2fb968bb3eb723a6d9c268fac4a3c40a18aa59ed934043d42c38a1f6b9f5a2 WHIRLPOOL 9b773cb41827bf5777061ec7ed432315bc5bf070768a44ceec7c893af2266d8c06ea4c061711b2696a8228d72c7222fbf52d26fb92b4112158716727b3bc1e38
AUX mdev/usbdisk_link 984 SHA256 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858 SHA512 392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 WHIRLPOOL 439e0c86e312e685bce1f7a4a67f709c4556de69b40112d97d6a376bc7da9d73e794663d06097f721173d97bf4f671ddbb4d0c4838db604e7cd13d2c531ede19
-EBUILD busybox-9999.ebuild 9292 SHA256 2fce0ccf747047d6fd3935e17aa3681309ea014832279f04f680d24664ad54a5 SHA512 6989f63a237be62f0ad602c88093a1fb022bdd14c327d3b8102f74b9a49070fd122d26f293ed581bbd27f7d87b31e045540eee11e0444386eb3ff39249b7c49c WHIRLPOOL 241a40c458eaa4e22776731861e798c05da54888928312e3e4c1f5e693f47aa783540260b5e59f7af346f1f9bbf5db74cf907f1d74cc9c1490c00955ab750dd3
+AUX ntpd.confd 186 SHA256 4bff7f5c66f4eece52e4381fd2706e591f10eb50f3c3a4132344d34150dc54de SHA512 b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8 WHIRLPOOL a1b228ae22c61de6ecc7fa58edcd4c3941b3762a45fcc38d05bd1c9428bc553b1a158c101d65a99ba63d4bc19b269e834b3f0eba40a5a1c81e0ae876a2ecb42c
+AUX ntpd.initd 612 SHA256 40e97febc42ccd4e557c58ab024ef3f6955db8404d0c061ea81c0acfddbe721a SHA512 7e5813417a86948451043fb8b7a8c2cd9b9f98e11defca4b9ea06e2d3a3c4f4341e8df56d2286ad3b36027ae5ef4ae65cd7c0193fdac1dbc83e72a8e0b7e8d17 WHIRLPOOL 96dd02f150d70df1a4a370c7af5ed28ff305eb53ea9539157d35e6fe335444cee2a15a0ce6d4c5dfb1d4edf58b51487160ea537dd9a9c6e4bd889b56450d3b4d
+AUX syslogd.confd 234 SHA256 65166088cb173582200b8c0d3bc6ea339b5929dbafa816780bfaf50e3514bc25 SHA512 01a2ecf89c49e3e06dd1b6f6673fca16d0f2dd01ff27c0d609c803bc2c81b5ced8245b6388e48ffa2f05ff4e8c1824af73df6364bbebebc722166447bd412f52 WHIRLPOOL b0a9e82225968d44446025242ac6c9429dc2e01a3720d94349756f71ec3a11c3ff2217bce7c4f1a1ea8a2a8baecd3265c3cce01675138674c05a9f2a96ade2ae
+AUX syslogd.initd 703 SHA256 1770b34dbcdec83440b5daad76234c3ff30c54816ad85e00fca8909d9f0923c8 SHA512 42dafcccbc5d6a423ff6b11d0bd359e2f7c830ba84d6ed58d3f83df4b54b5a4ebe041a88fd0cb6ca0138376f6c277644fe099f63e73cc61358a324b70250ec27 WHIRLPOOL a3f2af95372552629cb5e3878abb312dd9662a3cfef7c35ab88f28aa8154970641d71b8d4154b9833d1622c20b0ee20c184ffd3c4c10fe72f4cf0edb494cec0f
+AUX watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 WHIRLPOOL 8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767
+AUX watchdog.initd 654 SHA256 698d9de2945f29a2f38f81501d5634946fa02648cc4a3be965c08310b38110f4 SHA512 889e860500df5890285361c07ece2a66189626707fc61549e7780027f6c6f802a847a9e331ada872aa60a01ddffde356d3484bdb8bc2abcb761c73a782c5529b WHIRLPOOL a5129bbcee9eae374b50628cc1dc76e7ede0c24d4ff01fbe4579a1a89dea3f486626c48c2b915131203829f0bc806981a8b35bc4663da398216e254edbd04c9b
+EBUILD busybox-9999.ebuild 9340 SHA256 b404de527efa708bbca40711c052e175f0d41ad887d14088a59e58ec590250d3 SHA512 a6827ef5afbc1a9fc79ac98fd32ca25ddb4ee3f0ba803196567cdba6e158adb88ae9e955fd40e8b1593eb931bcb7d5b3f016f19cef69ef28118b26734c20cbe7 WHIRLPOOL 194d4c9596cd3fa9e49023a0729363a9c2ca7b5e9e2f00840fdcdceec660c39f92d0aaa6d4a38c31d23f2159a5587e58bfa1cb79b4ae4ee8e4ae61aaa9944516
MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index b360865..19fa0d2 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -81,12 +81,8 @@ busybox_config_option() {
einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...)
}
-busybox_has() {
- if grep "^CONFIG_$1=y" -q .config >/dev/null; then
- return 0
- else
- return 1
- fi
+busybox_config_enabled() {
+ grep "^CONFIG_$1=y" -q .config
}
src_prepare() {
@@ -241,17 +237,21 @@ src_install() {
fi
# add busybox daemon's, bug #444718
- if busybox_has NTPD && busybox_has FEATURE_NTPD_SERVER; then
- newconfd "${FILESDIR}/busybox-ntpd.confd" "busybox-ntpd"
- newinitd "${FILESDIR}/busybox-ntpd.initd" "busybox-ntpd"
+ if busybox_config_enabled FEATURE_NTPD_SERVER; then
+ newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
+ newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
+ fi
+ if busybox_config_enabled SYSLOGD; then
+ newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
+ newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
fi
- if busybox_has SYSLOGD && busybox_has KLOGD; then
- newconfd "${FILESDIR}/busybox-sysklogd.confd" "busybox-sysklogd"
- newinitd "${FILESDIR}/busybox-sysklogd.initd" "busybox-sysklogd"
+ if busybox_config_enabled KLOGD; then
+ newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
+ newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
fi
- if busybox_has WATCHDOG; then
- newconfd "${FILESDIR}/busybox-watchdog.confd" "busybox-watchdog"
- newinitd "${FILESDIR}/busybox-watchdog.initd" "busybox-watchdog"
+ if busybox_config_enabled WATCHDOG; then
+ newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
+ newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
fi
# bundle up the symlink files for use later
diff --git a/sys-apps/busybox/files/busybox-sysklogd.initd b/sys-apps/busybox/files/busybox-sysklogd.initd
deleted file mode 100644
index 4121a1c..0000000
--- a/sys-apps/busybox/files/busybox-sysklogd.initd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/busybox-sysklogd/files/busybox-sysklogd.initd,v 1.1 2012/08/21 12:44:33 sbriesen Exp $
-
-depend() {
- need clock hostname
- provide logger
-}
-
-start() {
- local retval=0 daemon="busybox-syslogd"
- ebegin "Starting busybox-sysklogd"
- start-stop-daemon --start --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid -- ${SYSLOGD_OPTS}
- retval=${?}
- if [ ${retval} -eq 0 ]; then
- daemon="busybox-klogd"
- start-stop-daemon --start --quiet --name klogd --exec /bin/busybox -- ${KLOGD_OPTS}
- retval=${?}
- if [ ${retval} -ne 0 ]; then
- start-stop-daemon --stop --retry 15 --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid
- fi
- fi
- eend ${retval} "Failed to start ${daemon}"
-}
-
-stop() {
- local retval=0 daemon="busybox-klogd"
- ebegin "Stopping busybox-sysklogd"
- start-stop-daemon --stop --retry 15 --quiet --name klogd --exec /bin/busybox
- retval=${?}
- if [ ${retval} -eq 0 ]; then
- daemon="busybox-syslogd"
- start-stop-daemon --stop --retry 15 --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid
- retval=${?}
- fi
- eend ${retval} "Failed to stop ${daemon}"
-}
diff --git a/sys-apps/busybox/files/busybox-sysklogd.confd b/sys-apps/busybox/files/klogd.confd
similarity index 50%
copy from sys-apps/busybox/files/busybox-sysklogd.confd
copy to sys-apps/busybox/files/klogd.confd
index 793f475..4c16096 100644
--- a/sys-apps/busybox/files/busybox-sysklogd.confd
+++ b/sys-apps/busybox/files/klogd.confd
@@ -1,12 +1,9 @@
# Config file for /etc/init.d/busybox-sysklogd
-# run "/sbin/syslogd --help" and "/sbin/klogd --help" to see all possible options.
+# run "/sbin/klogd --help" to see all possible options.
# activate if you need remote logging
#rc_need="net"
-# Log to shared mem buffer (use logread to read it)
-SYSLOGD_OPTS="-C128"
-
# send warnings and above to the console
KLOGD_OPTS="-c 3"
diff --git a/sys-apps/busybox/files/klogd.initd b/sys-apps/busybox/files/klogd.initd
new file mode 100644
index 0000000..0a6b0d8
--- /dev/null
+++ b/sys-apps/busybox/files/klogd.initd
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/busybox-sysklogd/files/busybox-sysklogd.initd,v 1.1 2012/08/21 12:44:33 sbriesen Exp $
+
+depend() {
+ need clock hostname
+}
+
+start() {
+ ebegin "Starting busybox-klogd"
+ start-stop-daemon --start --quiet --name klogd --exec /bin/busybox -- ${KLOGD_OPTS}
+ eend $? "Failed to start klogd"
+}
+
+stop() {
+ ebegin "Stopping busybox-klogd"
+ start-stop-daemon --stop --retry 15 --quiet --name klogd --exec /bin/busybox
+ eend $? "Failed to stop klogd"
+}
diff --git a/sys-apps/busybox/files/busybox-ntpd.confd b/sys-apps/busybox/files/ntpd.confd
similarity index 100%
rename from sys-apps/busybox/files/busybox-ntpd.confd
rename to sys-apps/busybox/files/ntpd.confd
diff --git a/sys-apps/busybox/files/busybox-ntpd.initd b/sys-apps/busybox/files/ntpd.initd
similarity index 89%
rename from sys-apps/busybox/files/busybox-ntpd.initd
rename to sys-apps/busybox/files/ntpd.initd
index e212ffc..f51946f 100644
--- a/sys-apps/busybox/files/busybox-ntpd.initd
+++ b/sys-apps/busybox/files/ntpd.initd
@@ -11,11 +11,11 @@ depend() {
start() {
ebegin "Starting busybox-ntpd"
start-stop-daemon --start --quiet --name ntpd --exec /bin/busybox -- ${NTPD_OPTS}
- eend ${?} "Failed to start ntpd"
+ eend $? "Failed to start ntpd"
}
stop() {
ebegin "Stopping busybox-ntpd"
start-stop-daemon --stop --retry 15 --quiet --name ntpd --exec /bin/busybox
- eend ${?} "Failed to stop ntpd"
+ eend $? "Failed to stop ntpd"
}
diff --git a/sys-apps/busybox/files/busybox-sysklogd.confd b/sys-apps/busybox/files/syslogd.confd
similarity index 55%
rename from sys-apps/busybox/files/busybox-sysklogd.confd
rename to sys-apps/busybox/files/syslogd.confd
index 793f475..7df6885 100644
--- a/sys-apps/busybox/files/busybox-sysklogd.confd
+++ b/sys-apps/busybox/files/syslogd.confd
@@ -1,12 +1,9 @@
# Config file for /etc/init.d/busybox-sysklogd
-# run "/sbin/syslogd --help" and "/sbin/klogd --help" to see all possible options.
+# run "/sbin/syslogd --help" to see all possible options.
# activate if you need remote logging
#rc_need="net"
# Log to shared mem buffer (use logread to read it)
SYSLOGD_OPTS="-C128"
-
-# send warnings and above to the console
-KLOGD_OPTS="-c 3"
diff --git a/sys-apps/busybox/files/syslogd.initd b/sys-apps/busybox/files/syslogd.initd
new file mode 100644
index 0000000..d9ba2c2
--- /dev/null
+++ b/sys-apps/busybox/files/syslogd.initd
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/busybox-sysklogd/files/busybox-sysklogd.initd,v 1.1 2012/08/21 12:44:33 sbriesen Exp $
+
+depend() {
+ need clock hostname
+ provide logger
+}
+
+start() {
+ ebegin "Starting busybox-syslogd"
+ start-stop-daemon --start --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid -- ${SYSLOGD_OPTS}
+ eend $? "Failed to start syslogd"
+}
+
+stop() {
+ ebegin "Stopping busybox-syslogd"
+ start-stop-daemon --stop --retry 15 --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid
+ eend $? "Failed to stop syslogd"
+}
diff --git a/sys-apps/busybox/files/busybox-watchdog.confd b/sys-apps/busybox/files/watchdog.confd
similarity index 100%
rename from sys-apps/busybox/files/busybox-watchdog.confd
rename to sys-apps/busybox/files/watchdog.confd
diff --git a/sys-apps/busybox/files/busybox-watchdog.initd b/sys-apps/busybox/files/watchdog.initd
similarity index 100%
rename from sys-apps/busybox/files/busybox-watchdog.initd
rename to sys-apps/busybox/files/watchdog.initd
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] dev/blueness:master commit in: sys-apps/busybox/, sys-apps/busybox/files/
@ 2012-12-04 11:47 Anthony G. Basile
0 siblings, 0 replies; 5+ messages in thread
From: Anthony G. Basile @ 2012-12-04 11:47 UTC (permalink / raw
To: gentoo-commits
commit: 6ca2ba5d1e24f66477632b5db2f182926ccd7c8b
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 4 11:47:41 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Dec 4 11:47:41 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=6ca2ba5d
sys-apps/busybox: busybox-{klogd,ntpd} doesnt make pidfiles
---
sys-apps/busybox/Manifest | 8 ++++----
sys-apps/busybox/files/klogd.initd | 4 +---
sys-apps/busybox/files/ntpd.initd | 4 +---
sys-apps/busybox/files/syslogd.initd | 5 ++---
sys-apps/busybox/files/watchdog.initd | 4 +---
5 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 89a61c4..ee4b2b2 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,7 +1,7 @@
AUX busybox-1.19.0-bb.patch 908 SHA256 98f92c2edbcf61d1bacef783ea8b08cce07051b0a4489ed3f4579296846f89f1 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c WHIRLPOOL b0d6d9b08ad0930e5243c7addc8a6db61505e95ed8e72c64fbfd734cb6ff9e303b3eb8ea6ec4790b2be567783664230cf278eb3e673fa0844c3881cf993f7cb8
AUX ginit.c 3091 SHA256 c5a4d5dedf402742611fea7607f0d870a918da06ed5ee98796371e158956ca80 SHA512 70afaa9e7eea9f72b30ad43cbb5e70c2105c735eca888836791c2f289274fcec16545134aca4d7ab3d750bdefe445d0586fc115a6060b509a2e77ed8d37f0f3f WHIRLPOOL 43e925d52d2f05b474834288f82777c481d84fe8904e0390e2f3298cbea55f671706fa79dbc7b570c6d700f53b23667dcec058e397a06b1b1979e350c19b3e9b
AUX klogd.confd 218 SHA256 737b78745964e110da2fd3357c6d5fb80ccacf979039b8d40c03cf1cb969e5f3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f WHIRLPOOL ea28c1d926e36fba0ab69de8ddfd2503889b7cfa3a4ada347a9d22d9894fe30be068c0ed55f899b952e62b8de3cb69e1a4209f7864787988ded28ede10c7445a
-AUX klogd.initd 426 SHA256 9d4b43d5961a9581f1283bf6a1ca1e8e345a686192115bcc86bdf4fb3803cdf3 SHA512 fb0ebd944a2fbe326db0aab8425be5e848ad0fcb165f10ddc3c1295286842cad409c1a56a06957671ebe8f96dd21c69e253e78b1ec5e5789e10b81cc5da18acf WHIRLPOOL f63f13c61b3e206a7840b43863cdabe4440eefa59fd96b7eb6c04f1ecf41e7d5efc69a8b172e287f0841aa417e483884ad2f8fd3cc00f92296cb875d16528e11
+AUX klogd.initd 351 SHA256 3b1c49ce6f7e672db1521ba279058ab5bc8a011246069de20cb0ee0dec9c050b SHA512 54f4255e48063f745613ab3291c06bcc96ba824567dd8dfceafbe98479ba0863aed2ce4b69dca86f303311047cae38307b68c7183e1c0afda1df34db7531207e WHIRLPOOL 33bc5d63144ca605efbeb2ed9eab9425b4ac546a0340623f1f9a71188ab78f60b315d4d57f6f707a3e7c01f152a903971c50a5f1071780baa88277af23de6f0c
AUX mdev-start.sh 2758 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7 SHA512 532ececdf40769e8059172b95f600c92ddda9490dcf04dc76b11cd669b2b35740aeb02ef7c152a42c13d5adfefb391de01239ebbb4efd06faadc0d096fcde6f5 WHIRLPOOL aace77a07eedfea3ffab029ce25334ff58f512bf5c67512c1f4a40fd51278c2b8b764e55dbf975f74bb4423cfc3f35482a5d3ee8397032fcbf22ad1f91c7c4ea
AUX mdev.rc 282 SHA256 e52abbc3399fc85ce1f097e8f12b25a5ca7fe2e3d648bee60c061b547ba39dc5 SHA512 b3e5f0810a5e33047ea73c6a4d846087100fb8c566cfa001e07fc0c1448d2024913ac06355122076ec6c79146867af77a02bbc6509b009afa97b5207588da1b9 WHIRLPOOL 2bd20507d115c82076653c6c78899751f8e3b8cde14c81c8f10ef7747ccba867360b463c90b9b3053cd6cb8599f297362153ebbff0dfad90c2fac8f445668320
AUX mdev.rc.1 2202 SHA256 5235a2cd5e4ce92032a5e3e314c6e2980d98df8a6a387d2cf3e0d30d29f62cd5 SHA512 27435ac949ee351aa957f23a31b08f8689f284449928fba495f9432c893e30cd8ab8f883ee131626310f09e9edc615908484c7402009df3cba3a6eaf137f8afc WHIRLPOOL 54c23164ed320efe654d36656bd4be2be383199c003a57806a850692b38556d4f961b9608c1561f16fa108bac64643ab2270a8a1a5edf8e5d1e24a967f549b76
@@ -10,10 +10,10 @@ AUX mdev/ide_links 440 SHA256 3fccc9ee437e3dcc8ac73bfe3713334a7156a112fe442e052f
AUX mdev/usbdev 1624 SHA256 113ecaa722fa1f4e1c76489e2a7b24099778615a5bccd443aa9cbab28c6d05d0 SHA512 f2d98050eeeb2fbb299298e221f47182a74ed901d2c8c848aa297ebd461c62c30d2fb968bb3eb723a6d9c268fac4a3c40a18aa59ed934043d42c38a1f6b9f5a2 WHIRLPOOL 9b773cb41827bf5777061ec7ed432315bc5bf070768a44ceec7c893af2266d8c06ea4c061711b2696a8228d72c7222fbf52d26fb92b4112158716727b3bc1e38
AUX mdev/usbdisk_link 984 SHA256 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858 SHA512 392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 WHIRLPOOL 439e0c86e312e685bce1f7a4a67f709c4556de69b40112d97d6a376bc7da9d73e794663d06097f721173d97bf4f671ddbb4d0c4838db604e7cd13d2c531ede19
AUX ntpd.confd 186 SHA256 4bff7f5c66f4eece52e4381fd2706e591f10eb50f3c3a4132344d34150dc54de SHA512 b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8 WHIRLPOOL a1b228ae22c61de6ecc7fa58edcd4c3941b3762a45fcc38d05bd1c9428bc553b1a158c101d65a99ba63d4bc19b269e834b3f0eba40a5a1c81e0ae876a2ecb42c
-AUX ntpd.initd 432 SHA256 3c5f3098fd87573d22186e90406d9b7efc14924908e057ec2f1396f2284752ff SHA512 e68012988c1941d83fdf38820c139556be84c9e3b5dddf1c74585980f48ed928f7cfe011da9d489a630c1bd648f787a157dc0244bbc9933fb29252db8f3f76f4 WHIRLPOOL 0033ab33811493220e801bd139568375547e7f7518e750a365e15760d784f81cc78ee208ca80029cbf1063fe544100b2b880a801bf358622d7ba10d7dd300cc5
+AUX ntpd.initd 357 SHA256 2d7516f62afa212203944cf242974c953e910398fe11ac76d5d52767dfaff7f3 SHA512 cac39044aff42a0091ad30f6af6eb7c39a7a6a9ff53d3cd5c5665e46f519cd06b81ea399dff56828be6ba5f38e597fc186848fd63ceb450895db375fb5b12814 WHIRLPOOL 347d532a302c6d8de314c02dfb4d7c96869285725a80d29f13f91579bcea4a9c85c11389540b811f607463b5ddd1d5638c65478c2661005b087e86314200ea27
AUX syslogd.confd 234 SHA256 65166088cb173582200b8c0d3bc6ea339b5929dbafa816780bfaf50e3514bc25 SHA512 01a2ecf89c49e3e06dd1b6f6673fca16d0f2dd01ff27c0d609c803bc2c81b5ced8245b6388e48ffa2f05ff4e8c1824af73df6364bbebebc722166447bd412f52 WHIRLPOOL b0a9e82225968d44446025242ac6c9429dc2e01a3720d94349756f71ec3a11c3ff2217bce7c4f1a1ea8a2a8baecd3265c3cce01675138674c05a9f2a96ade2ae
-AUX syslogd.initd 446 SHA256 eba4fa0472ce0587758de17772e095e9abf65a1531d6740339a9524493d71074 SHA512 9e20df5a39d54185fe245e4f43316a33f6fd938da4c6912ae6cc09449afc64e0bf48fc9e775ff54e478ee556d905ee09d1f1825af80855832ecdb0d87a630e3a WHIRLPOOL 9ca11474ec793a9a2678610222ce890ae58c797bbb89e77a8e92355ca187a441f874099a2f1b29ce114351c498de0c2c820a6c1eef6a949c218edca318b42068
+AUX syslogd.initd 402 SHA256 5b373477a0092c26f6c65c52b26edf6aedcacd2a33e610f24d5cd5d3ad919ed8 SHA512 f22196029a34c8227f65b86c37b8e02fc54464a1d96cd6bb4c8f13556c47c1d537244389ff8591f5c6641f501c0e92e352ca195e3d289f4ef8b93b8a87ad8618 WHIRLPOOL 6959a1e78cec14c93157a0b4eb070a47ea152e13c929be33b3edeba1a5a9ad06ca1559e456ee2210fde6c8272a32558c62596fca2d573579fb8c33cca9d8f7db
AUX watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 WHIRLPOOL 8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767
-AUX watchdog.initd 428 SHA256 246aff27249991079396f7a83a5310f16bc2b8e8409771412a7b1adeaa7e905d SHA512 663826e60fda7054a48ed3ff40437409c3d1514251b987ae6abc81cd568682b726c071f2612a9763eb3dc36631b9857d7bc41d58f590b15a13d3a023b4ea5d86 WHIRLPOOL 434cfc952d7508c1de2fe4d14ec403d9428593941b130393c007085051c05926ac3a69624b8626a72c4e7f27fd300f2cdef4131bca1ce93f11ef7130de370c5c
+AUX watchdog.initd 353 SHA256 cbe9f92feacbd5567388ce36a1233838836491e433402ad52575d20e196c4164 SHA512 d05cffe78e59fa9f4f1852da957b400fe20fab9aa12da3a5b435d1d1bd81c52d491fa24285cf9d99089f4f182988aed04bdfe2184aa6252f14935c2de67bc87a WHIRLPOOL bc60fc214cc2cbbf1017c713019002d48f35d12817b262877691db5072e0dee5329699948a461305c2ad5e5692f7e9ebca2be20e35699d9670793fd4a54e006b
EBUILD busybox-9999.ebuild 9340 SHA256 b404de527efa708bbca40711c052e175f0d41ad887d14088a59e58ec590250d3 SHA512 a6827ef5afbc1a9fc79ac98fd32ca25ddb4ee3f0ba803196567cdba6e158adb88ae9e955fd40e8b1593eb931bcb7d5b3f016f19cef69ef28118b26734c20cbe7 WHIRLPOOL 194d4c9596cd3fa9e49023a0729363a9c2ca7b5e9e2f00840fdcdceec660c39f92d0aaa6d4a38c31d23f2159a5587e58bfa1cb79b4ae4ee8e4ae61aaa9944516
MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388
diff --git a/sys-apps/busybox/files/klogd.initd b/sys-apps/busybox/files/klogd.initd
index c34e0be..ad0efad 100644
--- a/sys-apps/busybox/files/klogd.initd
+++ b/sys-apps/busybox/files/klogd.initd
@@ -3,10 +3,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/busybox-sysklogd/files/busybox-sysklogd.initd,v 1.1 2012/08/21 12:44:33 sbriesen Exp $
-command="/bin/busybox"
+command="/bin/busybox klogd"
command_args="${KLOGD_OPTS}"
-start_stop_daemon_args="--name klogd"
-pidfile="/var/run/${SVCNAME#busybox-}.pid"
depend() {
need clock hostname
diff --git a/sys-apps/busybox/files/ntpd.initd b/sys-apps/busybox/files/ntpd.initd
index 5e8038a..54498e2 100644
--- a/sys-apps/busybox/files/ntpd.initd
+++ b/sys-apps/busybox/files/ntpd.initd
@@ -3,10 +3,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/busybox-ntpd/files/busybox-ntpd.initd,v 1.1 2012/08/21 12:39:10 sbriesen Exp $
-command="/bin/busybox"
+command="/bin/busybox nptd"
command_args="${NTPD_OPTS}"
-start_stop_daemon_args="--name ntpd"
-pidfile="/var/run/${SVCNAME#busybox-}.pid"
depend() {
use net dns logger
diff --git a/sys-apps/busybox/files/syslogd.initd b/sys-apps/busybox/files/syslogd.initd
index 8ffe1a2..df8ad5c 100644
--- a/sys-apps/busybox/files/syslogd.initd
+++ b/sys-apps/busybox/files/syslogd.initd
@@ -3,10 +3,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/busybox-sysklogd/files/busybox-sysklogd.initd,v 1.1 2012/08/21 12:44:33 sbriesen Exp $
-command="/bin/busybox"
+command="/bin/busybox syslogd"
command_args="${SYSLOGD_OPTS}"
-start_stop_daemon_args="--name syslogd"
-pidfile="/var/run/${SVCNAME#busybox-}.pid"
+pidfile="/var/run/syslogd.pid"
depend() {
need clock hostname
diff --git a/sys-apps/busybox/files/watchdog.initd b/sys-apps/busybox/files/watchdog.initd
index a72c3ca..cdf9d14 100644
--- a/sys-apps/busybox/files/watchdog.initd
+++ b/sys-apps/busybox/files/watchdog.initd
@@ -3,10 +3,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox-watchdog/files/busybox-watchdog.initd,v 1.2 2012/08/29 13:27:03 sbriesen Exp $
-command="/bin/busybox"
+command="/bin/busybox watchdog"
command_args="${WATCHDOG_OPTS}"
-start_stop_daemon_args="--name watchdog"
-pidfile="/var/run/${SVCNAME#busybox-}.pid"
depend() {
provide watchdog
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-12-04 11:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-01 3:40 [gentoo-commits] dev/blueness:master commit in: sys-apps/busybox/, sys-apps/busybox/files/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2012-12-04 11:47 Anthony G. Basile
2012-12-02 14:49 Anthony G. Basile
2012-12-01 3:17 Anthony G. Basile
2012-12-01 2:41 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox