[gentoo-commits] dev/blueness:master commit in: sys-apps/busybox/, sys-apps/busybox/files/ - gentoo-commits

From:	"Anthony G. Basile" <blueness@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] dev/blueness:master commit in: sys-apps/busybox/, sys-apps/busybox/files/
Date:	Sun, 02 Dec 2012 14:49:16
Message-Id:	`1354459728.789cbd72edc6d3ca839d7a784ca1ad37b9142ad7.blueness@gentoo`

1

commit:     789cbd72edc6d3ca839d7a784ca1ad37b9142ad7

2

Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>

3

AuthorDate: Sun Dec  2 14:48:48 2012 +0000

4

Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>

5

CommitDate: Sun Dec  2 14:48:48 2012 +0000

6

URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=789cbd72

7

8

sys-apps/busybox: address points in bug #444718, comment #6

9

10

---

11

 sys-apps/busybox/Manifest                          |   16 +++++----

12

 sys-apps/busybox/busybox-9999.ebuild               |   30 ++++++++--------

13

 sys-apps/busybox/files/busybox-sysklogd.initd      |   38 --------------------

14

 .../files/{busybox-sysklogd.confd => klogd.confd}  |    5 +--

15

 sys-apps/busybox/files/klogd.initd                 |   20 ++++++++++

16

 .../files/{busybox-ntpd.confd => ntpd.confd}       |    0

17

 .../files/{busybox-ntpd.initd => ntpd.initd}       |    4 +-

18

 .../{busybox-sysklogd.confd => syslogd.confd}      |    5 +--

19

 sys-apps/busybox/files/syslogd.initd               |   21 +++++++++++

20

 .../{busybox-watchdog.confd => watchdog.confd}     |    0

21

 .../{busybox-watchdog.initd => watchdog.initd}     |    0

22

 11 files changed, 69 insertions(+), 70 deletions(-)

23

24

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest

25

index 580051f..ed6a0d2 100644

26

--- a/sys-apps/busybox/Manifest

27

+++ b/sys-apps/busybox/Manifest

28

@@ -1,11 +1,7 @@

29

 AUX busybox-1.19.0-bb.patch 908 SHA256 98f92c2edbcf61d1bacef783ea8b08cce07051b0a4489ed3f4579296846f89f1 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c WHIRLPOOL b0d6d9b08ad0930e5243c7addc8a6db61505e95ed8e72c64fbfd734cb6ff9e303b3eb8ea6ec4790b2be567783664230cf278eb3e673fa0844c3881cf993f7cb8

30

-AUX busybox-ntpd.confd 186 SHA256 4bff7f5c66f4eece52e4381fd2706e591f10eb50f3c3a4132344d34150dc54de SHA512 b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8 WHIRLPOOL a1b228ae22c61de6ecc7fa58edcd4c3941b3762a45fcc38d05bd1c9428bc553b1a158c101d65a99ba63d4bc19b269e834b3f0eba40a5a1c81e0ae876a2ecb42c

31

-AUX busybox-ntpd.initd 616 SHA256 011b46dcdbd030c7f365e5ff4c3c9eafcaa2f4a670d33000793e2db1fd965530 SHA512 a00313d1da4f1986977c73556a9a2c7242b350b3276217cf20dde4c4b7106e218b61c96a243db0ccc955c28d767cee1a6b569cd3eebeaa04d192751aadc7edbc WHIRLPOOL f67122c7fbc0de5db7973e5e141a901997bdf094cdb89c3a9f66c0fad188b6e826b81c995e1608c6cc236f1737f36ee8b90e0d764ff1d802c7ce0af2e30ac9b3

32

-AUX busybox-sysklogd.confd 319 SHA256 41a7dcb89156a80387a56579757e3a9f0f87ae4e0e955997e31092ab015a3152 SHA512 c9ddc5bec07c76b1ac4b3ceeb9dcdbaa96ef0791bc3a699b7cf1645d2765d74f5bb105e4d7912d67d8af0bf02e8447b6771edd789a05c7e4d9afeaf3a45896d2 WHIRLPOOL 6f2b18cea47118bfae04ecf932e62464a8574db1a2f45c5d4cb6d7a2352a117865bfffff9e367b51701c15103ef5a68f4b27a83b1e179ddfecb8529f68eb4038

33

-AUX busybox-sysklogd.initd 1291 SHA256 f1c20e299409af7bf882089f2cbcb099e2e2da148c885b3e22e1ecce6d99f359 SHA512 ebe5852b13112e57ab3d5a68ab21e21ac1b7d3fa89ce0e2d14964db08f3eb3f2cfa787ade2f9f7929ec2c2663fd1430dc6ec05c7e38563ebb4e3665cd0847a03 WHIRLPOOL 33f6c504a835873574d27082b822f48679e236081e2aea988dd2af204aa9a48e9d945a9be4c2e65c5575b50cee155df3f882fc848a4f7084f86754320c2d6f4a

34

-AUX busybox-watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 WHIRLPOOL 8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767

35

-AUX busybox-watchdog.initd 654 SHA256 698d9de2945f29a2f38f81501d5634946fa02648cc4a3be965c08310b38110f4 SHA512 889e860500df5890285361c07ece2a66189626707fc61549e7780027f6c6f802a847a9e331ada872aa60a01ddffde356d3484bdb8bc2abcb761c73a782c5529b WHIRLPOOL a5129bbcee9eae374b50628cc1dc76e7ede0c24d4ff01fbe4579a1a89dea3f486626c48c2b915131203829f0bc806981a8b35bc4663da398216e254edbd04c9b

36

 AUX ginit.c 3091 SHA256 c5a4d5dedf402742611fea7607f0d870a918da06ed5ee98796371e158956ca80 SHA512 70afaa9e7eea9f72b30ad43cbb5e70c2105c735eca888836791c2f289274fcec16545134aca4d7ab3d750bdefe445d0586fc115a6060b509a2e77ed8d37f0f3f WHIRLPOOL 43e925d52d2f05b474834288f82777c481d84fe8904e0390e2f3298cbea55f671706fa79dbc7b570c6d700f53b23667dcec058e397a06b1b1979e350c19b3e9b

37

+AUX klogd.confd 218 SHA256 737b78745964e110da2fd3357c6d5fb80ccacf979039b8d40c03cf1cb969e5f3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f WHIRLPOOL ea28c1d926e36fba0ab69de8ddfd2503889b7cfa3a4ada347a9d22d9894fe30be068c0ed55f899b952e62b8de3cb69e1a4209f7864787988ded28ede10c7445a

38

+AUX klogd.initd 611 SHA256 473743b82f34bfcab010ce93263d45e77d23bcbfd1dc400004809103a93b0314 SHA512 9abbadd168bb33a7a649f6a8d560c8990848ab8173c4d7ce570916a0a85e8bd48176e5ac99bc1ce4afa8027f628873538f98731e60156f23e26a588eca5272aa WHIRLPOOL 689038070ecabe920c83061bb442b4d195c70653b82b997a519f02ce314c783d766c98dd31b6c1199499e81fcdb0e98195b7effa01acab034ac8bee57195c776

39

 AUX mdev-start.sh 2758 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7 SHA512 532ececdf40769e8059172b95f600c92ddda9490dcf04dc76b11cd669b2b35740aeb02ef7c152a42c13d5adfefb391de01239ebbb4efd06faadc0d096fcde6f5 WHIRLPOOL aace77a07eedfea3ffab029ce25334ff58f512bf5c67512c1f4a40fd51278c2b8b764e55dbf975f74bb4423cfc3f35482a5d3ee8397032fcbf22ad1f91c7c4ea

40

 AUX mdev.rc 282 SHA256 e52abbc3399fc85ce1f097e8f12b25a5ca7fe2e3d648bee60c061b547ba39dc5 SHA512 b3e5f0810a5e33047ea73c6a4d846087100fb8c566cfa001e07fc0c1448d2024913ac06355122076ec6c79146867af77a02bbc6509b009afa97b5207588da1b9 WHIRLPOOL 2bd20507d115c82076653c6c78899751f8e3b8cde14c81c8f10ef7747ccba867360b463c90b9b3053cd6cb8599f297362153ebbff0dfad90c2fac8f445668320

41

 AUX mdev.rc.1 2202 SHA256 5235a2cd5e4ce92032a5e3e314c6e2980d98df8a6a387d2cf3e0d30d29f62cd5 SHA512 27435ac949ee351aa957f23a31b08f8689f284449928fba495f9432c893e30cd8ab8f883ee131626310f09e9edc615908484c7402009df3cba3a6eaf137f8afc WHIRLPOOL 54c23164ed320efe654d36656bd4be2be383199c003a57806a850692b38556d4f961b9608c1561f16fa108bac64643ab2270a8a1a5edf8e5d1e24a967f549b76

42

@@ -13,5 +9,11 @@ AUX mdev/dvbdev 356 SHA256 ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e20141

43

 AUX mdev/ide_links 440 SHA256 3fccc9ee437e3dcc8ac73bfe3713334a7156a112fe442e052fff4f26ff0f6a88 SHA512 0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec WHIRLPOOL ce02358a65ad2beeab12485379e322736c7b6b58ff44a20b880d9bab8806e04890a385b94228f2db685150dfe0a3c716f842ce5c1c7f579c8208ab4e9a6ae852

44

 AUX mdev/usbdev 1624 SHA256 113ecaa722fa1f4e1c76489e2a7b24099778615a5bccd443aa9cbab28c6d05d0 SHA512 f2d98050eeeb2fbb299298e221f47182a74ed901d2c8c848aa297ebd461c62c30d2fb968bb3eb723a6d9c268fac4a3c40a18aa59ed934043d42c38a1f6b9f5a2 WHIRLPOOL 9b773cb41827bf5777061ec7ed432315bc5bf070768a44ceec7c893af2266d8c06ea4c061711b2696a8228d72c7222fbf52d26fb92b4112158716727b3bc1e38

45

 AUX mdev/usbdisk_link 984 SHA256 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858 SHA512 392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 WHIRLPOOL 439e0c86e312e685bce1f7a4a67f709c4556de69b40112d97d6a376bc7da9d73e794663d06097f721173d97bf4f671ddbb4d0c4838db604e7cd13d2c531ede19

46

-EBUILD busybox-9999.ebuild 9292 SHA256 2fce0ccf747047d6fd3935e17aa3681309ea014832279f04f680d24664ad54a5 SHA512 6989f63a237be62f0ad602c88093a1fb022bdd14c327d3b8102f74b9a49070fd122d26f293ed581bbd27f7d87b31e045540eee11e0444386eb3ff39249b7c49c WHIRLPOOL 241a40c458eaa4e22776731861e798c05da54888928312e3e4c1f5e693f47aa783540260b5e59f7af346f1f9bbf5db74cf907f1d74cc9c1490c00955ab750dd3

47

+AUX ntpd.confd 186 SHA256 4bff7f5c66f4eece52e4381fd2706e591f10eb50f3c3a4132344d34150dc54de SHA512 b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8 WHIRLPOOL a1b228ae22c61de6ecc7fa58edcd4c3941b3762a45fcc38d05bd1c9428bc553b1a158c101d65a99ba63d4bc19b269e834b3f0eba40a5a1c81e0ae876a2ecb42c

48

+AUX ntpd.initd 612 SHA256 40e97febc42ccd4e557c58ab024ef3f6955db8404d0c061ea81c0acfddbe721a SHA512 7e5813417a86948451043fb8b7a8c2cd9b9f98e11defca4b9ea06e2d3a3c4f4341e8df56d2286ad3b36027ae5ef4ae65cd7c0193fdac1dbc83e72a8e0b7e8d17 WHIRLPOOL 96dd02f150d70df1a4a370c7af5ed28ff305eb53ea9539157d35e6fe335444cee2a15a0ce6d4c5dfb1d4edf58b51487160ea537dd9a9c6e4bd889b56450d3b4d

49

+AUX syslogd.confd 234 SHA256 65166088cb173582200b8c0d3bc6ea339b5929dbafa816780bfaf50e3514bc25 SHA512 01a2ecf89c49e3e06dd1b6f6673fca16d0f2dd01ff27c0d609c803bc2c81b5ced8245b6388e48ffa2f05ff4e8c1824af73df6364bbebebc722166447bd412f52 WHIRLPOOL b0a9e82225968d44446025242ac6c9429dc2e01a3720d94349756f71ec3a11c3ff2217bce7c4f1a1ea8a2a8baecd3265c3cce01675138674c05a9f2a96ade2ae

50

+AUX syslogd.initd 703 SHA256 1770b34dbcdec83440b5daad76234c3ff30c54816ad85e00fca8909d9f0923c8 SHA512 42dafcccbc5d6a423ff6b11d0bd359e2f7c830ba84d6ed58d3f83df4b54b5a4ebe041a88fd0cb6ca0138376f6c277644fe099f63e73cc61358a324b70250ec27 WHIRLPOOL a3f2af95372552629cb5e3878abb312dd9662a3cfef7c35ab88f28aa8154970641d71b8d4154b9833d1622c20b0ee20c184ffd3c4c10fe72f4cf0edb494cec0f

51

+AUX watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 WHIRLPOOL 8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767

52

+AUX watchdog.initd 654 SHA256 698d9de2945f29a2f38f81501d5634946fa02648cc4a3be965c08310b38110f4 SHA512 889e860500df5890285361c07ece2a66189626707fc61549e7780027f6c6f802a847a9e331ada872aa60a01ddffde356d3484bdb8bc2abcb761c73a782c5529b WHIRLPOOL a5129bbcee9eae374b50628cc1dc76e7ede0c24d4ff01fbe4579a1a89dea3f486626c48c2b915131203829f0bc806981a8b35bc4663da398216e254edbd04c9b

53

+EBUILD busybox-9999.ebuild 9340 SHA256 b404de527efa708bbca40711c052e175f0d41ad887d14088a59e58ec590250d3 SHA512 a6827ef5afbc1a9fc79ac98fd32ca25ddb4ee3f0ba803196567cdba6e158adb88ae9e955fd40e8b1593eb931bcb7d5b3f016f19cef69ef28118b26734c20cbe7 WHIRLPOOL 194d4c9596cd3fa9e49023a0729363a9c2ca7b5e9e2f00840fdcdceec660c39f92d0aaa6d4a38c31d23f2159a5587e58bfa1cb79b4ae4ee8e4ae61aaa9944516

54

 MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388

55

56

diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild

57

index b360865..19fa0d2 100644

58

--- a/sys-apps/busybox/busybox-9999.ebuild

59

+++ b/sys-apps/busybox/busybox-9999.ebuild

60

@@ -81,12 +81,8 @@ busybox_config_option() {

61

 	einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...)

62

}

63

64

-busybox_has() {

65

-	if grep "^CONFIG_$1=y" -q .config >/dev/null; then

66

-		return 0

67

-	else

68

-		return 1

69

-	fi

70

+busybox_config_enabled() {

71

+	grep "^CONFIG_$1=y" -q .config

72

}

73

74

 src_prepare() {

75

@@ -241,17 +237,21 @@ src_install() {

76

fi

77

78

 	# add busybox daemon's, bug #444718

79

-	if busybox_has NTPD && busybox_has FEATURE_NTPD_SERVER; then

80

-		newconfd "${FILESDIR}/busybox-ntpd.confd" "busybox-ntpd"

81

-		newinitd "${FILESDIR}/busybox-ntpd.initd" "busybox-ntpd"

82

+	if busybox_config_enabled FEATURE_NTPD_SERVER; then

83

+		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"

84

+		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"

85

+	fi

86

+	if busybox_config_enabled SYSLOGD; then

87

+		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"

88

+		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"

89

fi

90

-	if busybox_has SYSLOGD && busybox_has KLOGD; then

91

-		newconfd "${FILESDIR}/busybox-sysklogd.confd" "busybox-sysklogd"

92

-		newinitd "${FILESDIR}/busybox-sysklogd.initd" "busybox-sysklogd"

93

+	if busybox_config_enabled KLOGD; then

94

+		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"

95

+		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"

96

fi

97

-	if busybox_has WATCHDOG; then

98

-		newconfd "${FILESDIR}/busybox-watchdog.confd" "busybox-watchdog"

99

-		newinitd "${FILESDIR}/busybox-watchdog.initd" "busybox-watchdog"

100

+	if busybox_config_enabled WATCHDOG; then

101

+		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"

102

+		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"

103

fi

104

105

 	# bundle up the symlink files for use later

106

107

diff --git a/sys-apps/busybox/files/busybox-sysklogd.initd b/sys-apps/busybox/files/busybox-sysklogd.initd

108

deleted file mode 100644

109

index 4121a1c..0000000

110

--- a/sys-apps/busybox/files/busybox-sysklogd.initd

111

+++ /dev/null

112

@@ -1,38 +0,0 @@

113

-#!/sbin/runscript

114

-# Copyright 1999-2012 Gentoo Foundation

115

-# Distributed under the terms of the GNU General Public License v2

116

-# $Header: /var/cvsroot/gentoo-x86/app-admin/busybox-sysklogd/files/busybox-sysklogd.initd,v 1.1 2012/08/21 12:44:33 sbriesen Exp $

117

-

118

-depend() {

119

-	need clock hostname

120

-	provide logger

121

-}

122

-

123

-start() {

124

-	local retval=0 daemon="busybox-syslogd"

125

-	ebegin "Starting busybox-sysklogd"

126

-	start-stop-daemon --start --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid -- ${SYSLOGD_OPTS}

127

-	retval=${?}

128

-	if [ ${retval} -eq 0 ]; then

129

-		daemon="busybox-klogd"

130

-		start-stop-daemon --start --quiet --name klogd --exec /bin/busybox -- ${KLOGD_OPTS}

131

-		retval=${?}

132

-		if [ ${retval} -ne 0 ]; then

133

-			start-stop-daemon --stop --retry 15 --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid

134

-		fi

135

-	fi

136

-	eend ${retval} "Failed to start ${daemon}"

137

-}

138

-

139

-stop() {

140

-	local retval=0 daemon="busybox-klogd"

141

-	ebegin "Stopping busybox-sysklogd"

142

-	start-stop-daemon --stop --retry 15 --quiet --name klogd --exec /bin/busybox

143

-	retval=${?}

144

-	if [ ${retval} -eq 0 ]; then

145

-		daemon="busybox-syslogd"

146

-		start-stop-daemon --stop --retry 15 --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid

147

-		retval=${?}

148

-	fi

149

-	eend ${retval} "Failed to stop ${daemon}"

150

-}

151

152

diff --git a/sys-apps/busybox/files/busybox-sysklogd.confd b/sys-apps/busybox/files/klogd.confd

153

similarity index 50%

154

copy from sys-apps/busybox/files/busybox-sysklogd.confd

155

copy to sys-apps/busybox/files/klogd.confd

156

index 793f475..4c16096 100644

157

--- a/sys-apps/busybox/files/busybox-sysklogd.confd

158

+++ b/sys-apps/busybox/files/klogd.confd

159

@@ -1,12 +1,9 @@

160

 # Config file for /etc/init.d/busybox-sysklogd

161

162

-# run "/sbin/syslogd --help" and "/sbin/klogd --help" to see all possible options.

163

+# run "/sbin/klogd --help" to see all possible options.

164

165

 # activate if you need remote logging

166

 #rc_need="net"

167

168

-# Log to shared mem buffer (use logread to read it)

169

-SYSLOGD_OPTS="-C128"

170

-

171

 # send warnings and above to the console

172

 KLOGD_OPTS="-c 3"

173

174

diff --git a/sys-apps/busybox/files/klogd.initd b/sys-apps/busybox/files/klogd.initd

175

new file mode 100644

176

index 0000000..0a6b0d8

177

--- /dev/null

178

+++ b/sys-apps/busybox/files/klogd.initd

179

@@ -0,0 +1,20 @@

180

+#!/sbin/runscript

181

+# Copyright 1999-2012 Gentoo Foundation

182

+# Distributed under the terms of the GNU General Public License v2

183

+# $Header: /var/cvsroot/gentoo-x86/app-admin/busybox-sysklogd/files/busybox-sysklogd.initd,v 1.1 2012/08/21 12:44:33 sbriesen Exp $

184

+

185

+depend() {

186

+	need clock hostname

187

+}

188

+

189

+start() {

190

+	ebegin "Starting busybox-klogd"

191

+	start-stop-daemon --start --quiet --name klogd --exec /bin/busybox -- ${KLOGD_OPTS}

192

+	eend $? "Failed to start klogd"

193

+}

194

+

195

+stop() {

196

+	ebegin "Stopping busybox-klogd"

197

+	start-stop-daemon --stop --retry 15 --quiet --name klogd --exec /bin/busybox

198

+	eend $? "Failed to stop klogd"

199

+}

200

201

diff --git a/sys-apps/busybox/files/busybox-ntpd.confd b/sys-apps/busybox/files/ntpd.confd

202

similarity index 100%

203

rename from sys-apps/busybox/files/busybox-ntpd.confd

204

rename to sys-apps/busybox/files/ntpd.confd

205

206

diff --git a/sys-apps/busybox/files/busybox-ntpd.initd b/sys-apps/busybox/files/ntpd.initd

207

similarity index 89%

208

rename from sys-apps/busybox/files/busybox-ntpd.initd

209

rename to sys-apps/busybox/files/ntpd.initd

210

index e212ffc..f51946f 100644

211

--- a/sys-apps/busybox/files/busybox-ntpd.initd

212

+++ b/sys-apps/busybox/files/ntpd.initd

213

@@ -11,11 +11,11 @@ depend() {

214

 start() {

215

 	ebegin "Starting busybox-ntpd"

216

 	start-stop-daemon --start --quiet --name ntpd --exec /bin/busybox -- ${NTPD_OPTS}

217

-	eend ${?} "Failed to start ntpd"

218

+	eend $? "Failed to start ntpd"

219

}

220

221

 stop() {

222

 	ebegin "Stopping busybox-ntpd"

223

 	start-stop-daemon --stop --retry 15 --quiet --name ntpd --exec /bin/busybox

224

-	eend ${?} "Failed to stop ntpd"

225

+	eend $? "Failed to stop ntpd"

226

}

227

228

diff --git a/sys-apps/busybox/files/busybox-sysklogd.confd b/sys-apps/busybox/files/syslogd.confd

229

similarity index 55%

230

rename from sys-apps/busybox/files/busybox-sysklogd.confd

231

rename to sys-apps/busybox/files/syslogd.confd

232

index 793f475..7df6885 100644

233

--- a/sys-apps/busybox/files/busybox-sysklogd.confd

234

+++ b/sys-apps/busybox/files/syslogd.confd

235

@@ -1,12 +1,9 @@

236

 # Config file for /etc/init.d/busybox-sysklogd

237

238

-# run "/sbin/syslogd --help" and "/sbin/klogd --help" to see all possible options.

239

+# run "/sbin/syslogd --help" to see all possible options.

240

241

 # activate if you need remote logging

242

 #rc_need="net"

243

244

 # Log to shared mem buffer (use logread to read it)

245

 SYSLOGD_OPTS="-C128"

246

-

247

-# send warnings and above to the console

248

-KLOGD_OPTS="-c 3"

249

250

diff --git a/sys-apps/busybox/files/syslogd.initd b/sys-apps/busybox/files/syslogd.initd

251

new file mode 100644

252

index 0000000..d9ba2c2

253

--- /dev/null

254

+++ b/sys-apps/busybox/files/syslogd.initd

255

@@ -0,0 +1,21 @@

256

+#!/sbin/runscript

257

+# Copyright 1999-2012 Gentoo Foundation

258

+# Distributed under the terms of the GNU General Public License v2

259

+# $Header: /var/cvsroot/gentoo-x86/app-admin/busybox-sysklogd/files/busybox-sysklogd.initd,v 1.1 2012/08/21 12:44:33 sbriesen Exp $

260

+

261

+depend() {

262

+	need clock hostname

263

+	provide logger

264

+}

265

+

266

+start() {

267

+	ebegin "Starting busybox-syslogd"

268

+	start-stop-daemon --start --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid -- ${SYSLOGD_OPTS}

269

+	eend $? "Failed to start syslogd"

270

+}

271

+

272

+stop() {

273

+	ebegin "Stopping busybox-syslogd"

274

+	start-stop-daemon --stop --retry 15 --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid

275

+	eend $? "Failed to stop syslogd"

276

+}

277

278

diff --git a/sys-apps/busybox/files/busybox-watchdog.confd b/sys-apps/busybox/files/watchdog.confd

279

similarity index 100%

280

rename from sys-apps/busybox/files/busybox-watchdog.confd

281

rename to sys-apps/busybox/files/watchdog.confd

282

283

diff --git a/sys-apps/busybox/files/busybox-watchdog.initd b/sys-apps/busybox/files/watchdog.initd

284

similarity index 100%

285

rename from sys-apps/busybox/files/busybox-watchdog.initd

286

rename to sys-apps/busybox/files/watchdog.initd

1	commit: 789cbd72edc6d3ca839d7a784ca1ad37b9142ad7
2	Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3	AuthorDate: Sun Dec 2 14:48:48 2012 +0000
4	Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5	CommitDate: Sun Dec 2 14:48:48 2012 +0000
6	URL: http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=789cbd72
7
8	sys-apps/busybox: address points in bug #444718, comment #6
9
10	---
11	sys-apps/busybox/Manifest \| 16 +++++----
12	sys-apps/busybox/busybox-9999.ebuild \| 30 ++++++++--------
13	sys-apps/busybox/files/busybox-sysklogd.initd \| 38 --------------------
14	.../files/{busybox-sysklogd.confd => klogd.confd} \| 5 +--
15	sys-apps/busybox/files/klogd.initd \| 20 ++++++++++
16	.../files/{busybox-ntpd.confd => ntpd.confd} \| 0
17	.../files/{busybox-ntpd.initd => ntpd.initd} \| 4 +-
18	.../{busybox-sysklogd.confd => syslogd.confd} \| 5 +--
19	sys-apps/busybox/files/syslogd.initd \| 21 +++++++++++
20	.../{busybox-watchdog.confd => watchdog.confd} \| 0
21	.../{busybox-watchdog.initd => watchdog.initd} \| 0
22	11 files changed, 69 insertions(+), 70 deletions(-)
23
24	diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
25	index 580051f..ed6a0d2 100644
26	--- a/sys-apps/busybox/Manifest
27	+++ b/sys-apps/busybox/Manifest
28	@@ -1,11 +1,7 @@
29	AUX busybox-1.19.0-bb.patch 908 SHA256 98f92c2edbcf61d1bacef783ea8b08cce07051b0a4489ed3f4579296846f89f1 SHA512 d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c WHIRLPOOL b0d6d9b08ad0930e5243c7addc8a6db61505e95ed8e72c64fbfd734cb6ff9e303b3eb8ea6ec4790b2be567783664230cf278eb3e673fa0844c3881cf993f7cb8
30	-AUX busybox-ntpd.confd 186 SHA256 4bff7f5c66f4eece52e4381fd2706e591f10eb50f3c3a4132344d34150dc54de SHA512 b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8 WHIRLPOOL a1b228ae22c61de6ecc7fa58edcd4c3941b3762a45fcc38d05bd1c9428bc553b1a158c101d65a99ba63d4bc19b269e834b3f0eba40a5a1c81e0ae876a2ecb42c
31	-AUX busybox-ntpd.initd 616 SHA256 011b46dcdbd030c7f365e5ff4c3c9eafcaa2f4a670d33000793e2db1fd965530 SHA512 a00313d1da4f1986977c73556a9a2c7242b350b3276217cf20dde4c4b7106e218b61c96a243db0ccc955c28d767cee1a6b569cd3eebeaa04d192751aadc7edbc WHIRLPOOL f67122c7fbc0de5db7973e5e141a901997bdf094cdb89c3a9f66c0fad188b6e826b81c995e1608c6cc236f1737f36ee8b90e0d764ff1d802c7ce0af2e30ac9b3
32	-AUX busybox-sysklogd.confd 319 SHA256 41a7dcb89156a80387a56579757e3a9f0f87ae4e0e955997e31092ab015a3152 SHA512 c9ddc5bec07c76b1ac4b3ceeb9dcdbaa96ef0791bc3a699b7cf1645d2765d74f5bb105e4d7912d67d8af0bf02e8447b6771edd789a05c7e4d9afeaf3a45896d2 WHIRLPOOL 6f2b18cea47118bfae04ecf932e62464a8574db1a2f45c5d4cb6d7a2352a117865bfffff9e367b51701c15103ef5a68f4b27a83b1e179ddfecb8529f68eb4038
33	-AUX busybox-sysklogd.initd 1291 SHA256 f1c20e299409af7bf882089f2cbcb099e2e2da148c885b3e22e1ecce6d99f359 SHA512 ebe5852b13112e57ab3d5a68ab21e21ac1b7d3fa89ce0e2d14964db08f3eb3f2cfa787ade2f9f7929ec2c2663fd1430dc6ec05c7e38563ebb4e3665cd0847a03 WHIRLPOOL 33f6c504a835873574d27082b822f48679e236081e2aea988dd2af204aa9a48e9d945a9be4c2e65c5575b50cee155df3f882fc848a4f7084f86754320c2d6f4a
34	-AUX busybox-watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 WHIRLPOOL 8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767
35	-AUX busybox-watchdog.initd 654 SHA256 698d9de2945f29a2f38f81501d5634946fa02648cc4a3be965c08310b38110f4 SHA512 889e860500df5890285361c07ece2a66189626707fc61549e7780027f6c6f802a847a9e331ada872aa60a01ddffde356d3484bdb8bc2abcb761c73a782c5529b WHIRLPOOL a5129bbcee9eae374b50628cc1dc76e7ede0c24d4ff01fbe4579a1a89dea3f486626c48c2b915131203829f0bc806981a8b35bc4663da398216e254edbd04c9b
36	AUX ginit.c 3091 SHA256 c5a4d5dedf402742611fea7607f0d870a918da06ed5ee98796371e158956ca80 SHA512 70afaa9e7eea9f72b30ad43cbb5e70c2105c735eca888836791c2f289274fcec16545134aca4d7ab3d750bdefe445d0586fc115a6060b509a2e77ed8d37f0f3f WHIRLPOOL 43e925d52d2f05b474834288f82777c481d84fe8904e0390e2f3298cbea55f671706fa79dbc7b570c6d700f53b23667dcec058e397a06b1b1979e350c19b3e9b
37	+AUX klogd.confd 218 SHA256 737b78745964e110da2fd3357c6d5fb80ccacf979039b8d40c03cf1cb969e5f3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f WHIRLPOOL ea28c1d926e36fba0ab69de8ddfd2503889b7cfa3a4ada347a9d22d9894fe30be068c0ed55f899b952e62b8de3cb69e1a4209f7864787988ded28ede10c7445a
38	+AUX klogd.initd 611 SHA256 473743b82f34bfcab010ce93263d45e77d23bcbfd1dc400004809103a93b0314 SHA512 9abbadd168bb33a7a649f6a8d560c8990848ab8173c4d7ce570916a0a85e8bd48176e5ac99bc1ce4afa8027f628873538f98731e60156f23e26a588eca5272aa WHIRLPOOL 689038070ecabe920c83061bb442b4d195c70653b82b997a519f02ce314c783d766c98dd31b6c1199499e81fcdb0e98195b7effa01acab034ac8bee57195c776
39	AUX mdev-start.sh 2758 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7 SHA512 532ececdf40769e8059172b95f600c92ddda9490dcf04dc76b11cd669b2b35740aeb02ef7c152a42c13d5adfefb391de01239ebbb4efd06faadc0d096fcde6f5 WHIRLPOOL aace77a07eedfea3ffab029ce25334ff58f512bf5c67512c1f4a40fd51278c2b8b764e55dbf975f74bb4423cfc3f35482a5d3ee8397032fcbf22ad1f91c7c4ea
40	AUX mdev.rc 282 SHA256 e52abbc3399fc85ce1f097e8f12b25a5ca7fe2e3d648bee60c061b547ba39dc5 SHA512 b3e5f0810a5e33047ea73c6a4d846087100fb8c566cfa001e07fc0c1448d2024913ac06355122076ec6c79146867af77a02bbc6509b009afa97b5207588da1b9 WHIRLPOOL 2bd20507d115c82076653c6c78899751f8e3b8cde14c81c8f10ef7747ccba867360b463c90b9b3053cd6cb8599f297362153ebbff0dfad90c2fac8f445668320
41	AUX mdev.rc.1 2202 SHA256 5235a2cd5e4ce92032a5e3e314c6e2980d98df8a6a387d2cf3e0d30d29f62cd5 SHA512 27435ac949ee351aa957f23a31b08f8689f284449928fba495f9432c893e30cd8ab8f883ee131626310f09e9edc615908484c7402009df3cba3a6eaf137f8afc WHIRLPOOL 54c23164ed320efe654d36656bd4be2be383199c003a57806a850692b38556d4f961b9608c1561f16fa108bac64643ab2270a8a1a5edf8e5d1e24a967f549b76
42	@@ -13,5 +9,11 @@ AUX mdev/dvbdev 356 SHA256 ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e20141
43	AUX mdev/ide_links 440 SHA256 3fccc9ee437e3dcc8ac73bfe3713334a7156a112fe442e052fff4f26ff0f6a88 SHA512 0142234d0bda86ad1e5f88f1da34669e5fda46a0fd52ce507bd49ce74d2b7c12c323e8db863bccb924e6d632b568db8b243361b217c5b2e1d92a25feb6e62dec WHIRLPOOL ce02358a65ad2beeab12485379e322736c7b6b58ff44a20b880d9bab8806e04890a385b94228f2db685150dfe0a3c716f842ce5c1c7f579c8208ab4e9a6ae852
44	AUX mdev/usbdev 1624 SHA256 113ecaa722fa1f4e1c76489e2a7b24099778615a5bccd443aa9cbab28c6d05d0 SHA512 f2d98050eeeb2fbb299298e221f47182a74ed901d2c8c848aa297ebd461c62c30d2fb968bb3eb723a6d9c268fac4a3c40a18aa59ed934043d42c38a1f6b9f5a2 WHIRLPOOL 9b773cb41827bf5777061ec7ed432315bc5bf070768a44ceec7c893af2266d8c06ea4c061711b2696a8228d72c7222fbf52d26fb92b4112158716727b3bc1e38
45	AUX mdev/usbdisk_link 984 SHA256 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858 SHA512 392c40d223bdff59a624bd67907c06cff9c1b5468c25c19e10dbc3cef3208275d93966e760f140d71a86cb36ec796ea08dbaa767b40c12e9326c3c72964b28a8 WHIRLPOOL 439e0c86e312e685bce1f7a4a67f709c4556de69b40112d97d6a376bc7da9d73e794663d06097f721173d97bf4f671ddbb4d0c4838db604e7cd13d2c531ede19
46	-EBUILD busybox-9999.ebuild 9292 SHA256 2fce0ccf747047d6fd3935e17aa3681309ea014832279f04f680d24664ad54a5 SHA512 6989f63a237be62f0ad602c88093a1fb022bdd14c327d3b8102f74b9a49070fd122d26f293ed581bbd27f7d87b31e045540eee11e0444386eb3ff39249b7c49c WHIRLPOOL 241a40c458eaa4e22776731861e798c05da54888928312e3e4c1f5e693f47aa783540260b5e59f7af346f1f9bbf5db74cf907f1d74cc9c1490c00955ab750dd3
47	+AUX ntpd.confd 186 SHA256 4bff7f5c66f4eece52e4381fd2706e591f10eb50f3c3a4132344d34150dc54de SHA512 b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8 WHIRLPOOL a1b228ae22c61de6ecc7fa58edcd4c3941b3762a45fcc38d05bd1c9428bc553b1a158c101d65a99ba63d4bc19b269e834b3f0eba40a5a1c81e0ae876a2ecb42c
48	+AUX ntpd.initd 612 SHA256 40e97febc42ccd4e557c58ab024ef3f6955db8404d0c061ea81c0acfddbe721a SHA512 7e5813417a86948451043fb8b7a8c2cd9b9f98e11defca4b9ea06e2d3a3c4f4341e8df56d2286ad3b36027ae5ef4ae65cd7c0193fdac1dbc83e72a8e0b7e8d17 WHIRLPOOL 96dd02f150d70df1a4a370c7af5ed28ff305eb53ea9539157d35e6fe335444cee2a15a0ce6d4c5dfb1d4edf58b51487160ea537dd9a9c6e4bd889b56450d3b4d
49	+AUX syslogd.confd 234 SHA256 65166088cb173582200b8c0d3bc6ea339b5929dbafa816780bfaf50e3514bc25 SHA512 01a2ecf89c49e3e06dd1b6f6673fca16d0f2dd01ff27c0d609c803bc2c81b5ced8245b6388e48ffa2f05ff4e8c1824af73df6364bbebebc722166447bd412f52 WHIRLPOOL b0a9e82225968d44446025242ac6c9429dc2e01a3720d94349756f71ec3a11c3ff2217bce7c4f1a1ea8a2a8baecd3265c3cce01675138674c05a9f2a96ade2ae
50	+AUX syslogd.initd 703 SHA256 1770b34dbcdec83440b5daad76234c3ff30c54816ad85e00fca8909d9f0923c8 SHA512 42dafcccbc5d6a423ff6b11d0bd359e2f7c830ba84d6ed58d3f83df4b54b5a4ebe041a88fd0cb6ca0138376f6c277644fe099f63e73cc61358a324b70250ec27 WHIRLPOOL a3f2af95372552629cb5e3878abb312dd9662a3cfef7c35ab88f28aa8154970641d71b8d4154b9833d1622c20b0ee20c184ffd3c4c10fe72f4cf0edb494cec0f
51	+AUX watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 WHIRLPOOL 8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767
52	+AUX watchdog.initd 654 SHA256 698d9de2945f29a2f38f81501d5634946fa02648cc4a3be965c08310b38110f4 SHA512 889e860500df5890285361c07ece2a66189626707fc61549e7780027f6c6f802a847a9e331ada872aa60a01ddffde356d3484bdb8bc2abcb761c73a782c5529b WHIRLPOOL a5129bbcee9eae374b50628cc1dc76e7ede0c24d4ff01fbe4579a1a89dea3f486626c48c2b915131203829f0bc806981a8b35bc4663da398216e254edbd04c9b
53	+EBUILD busybox-9999.ebuild 9340 SHA256 b404de527efa708bbca40711c052e175f0d41ad887d14088a59e58ec590250d3 SHA512 a6827ef5afbc1a9fc79ac98fd32ca25ddb4ee3f0ba803196567cdba6e158adb88ae9e955fd40e8b1593eb931bcb7d5b3f016f19cef69ef28118b26734c20cbe7 WHIRLPOOL 194d4c9596cd3fa9e49023a0729363a9c2ca7b5e9e2f00840fdcdceec660c39f92d0aaa6d4a38c31d23f2159a5587e58bfa1cb79b4ae4ee8e4ae61aaa9944516
54	MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388
55
56	diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
57	index b360865..19fa0d2 100644
58	--- a/sys-apps/busybox/busybox-9999.ebuild
59	+++ b/sys-apps/busybox/busybox-9999.ebuild
60	@@ -81,12 +81,8 @@ busybox_config_option() {
61	einfo $(grep "CONFIG_$2[= ]" .config \|\| echo Could not find CONFIG_$2 ...)
62	}
63
64	-busybox_has() {
65	- if grep "^CONFIG_$1=y" -q .config >/dev/null; then
66	- return 0
67	- else
68	- return 1
69	- fi
70	+busybox_config_enabled() {
71	+ grep "^CONFIG_$1=y" -q .config
72	}
73
74	src_prepare() {
75	@@ -241,17 +237,21 @@ src_install() {
76	fi
77
78	# add busybox daemon's, bug #444718
79	- if busybox_has NTPD && busybox_has FEATURE_NTPD_SERVER; then
80	- newconfd "${FILESDIR}/busybox-ntpd.confd" "busybox-ntpd"
81	- newinitd "${FILESDIR}/busybox-ntpd.initd" "busybox-ntpd"
82	+ if busybox_config_enabled FEATURE_NTPD_SERVER; then
83	+ newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
84	+ newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
85	+ fi
86	+ if busybox_config_enabled SYSLOGD; then
87	+ newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
88	+ newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
89	fi
90	- if busybox_has SYSLOGD && busybox_has KLOGD; then
91	- newconfd "${FILESDIR}/busybox-sysklogd.confd" "busybox-sysklogd"
92	- newinitd "${FILESDIR}/busybox-sysklogd.initd" "busybox-sysklogd"
93	+ if busybox_config_enabled KLOGD; then
94	+ newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
95	+ newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
96	fi
97	- if busybox_has WATCHDOG; then
98	- newconfd "${FILESDIR}/busybox-watchdog.confd" "busybox-watchdog"
99	- newinitd "${FILESDIR}/busybox-watchdog.initd" "busybox-watchdog"
100	+ if busybox_config_enabled WATCHDOG; then
101	+ newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
102	+ newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
103	fi
104
105	# bundle up the symlink files for use later
106
107	diff --git a/sys-apps/busybox/files/busybox-sysklogd.initd b/sys-apps/busybox/files/busybox-sysklogd.initd
108	deleted file mode 100644
109	index 4121a1c..0000000
110	--- a/sys-apps/busybox/files/busybox-sysklogd.initd
111	+++ /dev/null
112	@@ -1,38 +0,0 @@
113	-#!/sbin/runscript
114	-# Copyright 1999-2012 Gentoo Foundation
115	-# Distributed under the terms of the GNU General Public License v2
116	-# $Header: /var/cvsroot/gentoo-x86/app-admin/busybox-sysklogd/files/busybox-sysklogd.initd,v 1.1 2012/08/21 12:44:33 sbriesen Exp $
117	-
118	-depend() {
119	- need clock hostname
120	- provide logger
121	-}
122	-
123	-start() {
124	- local retval=0 daemon="busybox-syslogd"
125	- ebegin "Starting busybox-sysklogd"
126	- start-stop-daemon --start --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid -- ${SYSLOGD_OPTS}
127	- retval=${?}
128	- if [ ${retval} -eq 0 ]; then
129	- daemon="busybox-klogd"
130	- start-stop-daemon --start --quiet --name klogd --exec /bin/busybox -- ${KLOGD_OPTS}
131	- retval=${?}
132	- if [ ${retval} -ne 0 ]; then
133	- start-stop-daemon --stop --retry 15 --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid
134	- fi
135	- fi
136	- eend ${retval} "Failed to start ${daemon}"
137	-}
138	-
139	-stop() {
140	- local retval=0 daemon="busybox-klogd"
141	- ebegin "Stopping busybox-sysklogd"
142	- start-stop-daemon --stop --retry 15 --quiet --name klogd --exec /bin/busybox
143	- retval=${?}
144	- if [ ${retval} -eq 0 ]; then
145	- daemon="busybox-syslogd"
146	- start-stop-daemon --stop --retry 15 --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid
147	- retval=${?}
148	- fi
149	- eend ${retval} "Failed to stop ${daemon}"
150	-}
151
152	diff --git a/sys-apps/busybox/files/busybox-sysklogd.confd b/sys-apps/busybox/files/klogd.confd
153	similarity index 50%
154	copy from sys-apps/busybox/files/busybox-sysklogd.confd
155	copy to sys-apps/busybox/files/klogd.confd
156	index 793f475..4c16096 100644
157	--- a/sys-apps/busybox/files/busybox-sysklogd.confd
158	+++ b/sys-apps/busybox/files/klogd.confd
159	@@ -1,12 +1,9 @@
160	# Config file for /etc/init.d/busybox-sysklogd
161
162	-# run "/sbin/syslogd --help" and "/sbin/klogd --help" to see all possible options.
163	+# run "/sbin/klogd --help" to see all possible options.
164
165	# activate if you need remote logging
166	#rc_need="net"
167
168	-# Log to shared mem buffer (use logread to read it)
169	-SYSLOGD_OPTS="-C128"
170	-
171	# send warnings and above to the console
172	KLOGD_OPTS="-c 3"
173
174	diff --git a/sys-apps/busybox/files/klogd.initd b/sys-apps/busybox/files/klogd.initd
175	new file mode 100644
176	index 0000000..0a6b0d8
177	--- /dev/null
178	+++ b/sys-apps/busybox/files/klogd.initd
179	@@ -0,0 +1,20 @@
180	+#!/sbin/runscript
181	+# Copyright 1999-2012 Gentoo Foundation
182	+# Distributed under the terms of the GNU General Public License v2
183	+# $Header: /var/cvsroot/gentoo-x86/app-admin/busybox-sysklogd/files/busybox-sysklogd.initd,v 1.1 2012/08/21 12:44:33 sbriesen Exp $
184	+
185	+depend() {
186	+ need clock hostname
187	+}
188	+
189	+start() {
190	+ ebegin "Starting busybox-klogd"
191	+ start-stop-daemon --start --quiet --name klogd --exec /bin/busybox -- ${KLOGD_OPTS}
192	+ eend $? "Failed to start klogd"
193	+}
194	+
195	+stop() {
196	+ ebegin "Stopping busybox-klogd"
197	+ start-stop-daemon --stop --retry 15 --quiet --name klogd --exec /bin/busybox
198	+ eend $? "Failed to stop klogd"
199	+}
200
201	diff --git a/sys-apps/busybox/files/busybox-ntpd.confd b/sys-apps/busybox/files/ntpd.confd
202	similarity index 100%
203	rename from sys-apps/busybox/files/busybox-ntpd.confd
204	rename to sys-apps/busybox/files/ntpd.confd
205
206	diff --git a/sys-apps/busybox/files/busybox-ntpd.initd b/sys-apps/busybox/files/ntpd.initd
207	similarity index 89%
208	rename from sys-apps/busybox/files/busybox-ntpd.initd
209	rename to sys-apps/busybox/files/ntpd.initd
210	index e212ffc..f51946f 100644
211	--- a/sys-apps/busybox/files/busybox-ntpd.initd
212	+++ b/sys-apps/busybox/files/ntpd.initd
213	@@ -11,11 +11,11 @@ depend() {
214	start() {
215	ebegin "Starting busybox-ntpd"
216	start-stop-daemon --start --quiet --name ntpd --exec /bin/busybox -- ${NTPD_OPTS}
217	- eend ${?} "Failed to start ntpd"
218	+ eend $? "Failed to start ntpd"
219	}
220
221	stop() {
222	ebegin "Stopping busybox-ntpd"
223	start-stop-daemon --stop --retry 15 --quiet --name ntpd --exec /bin/busybox
224	- eend ${?} "Failed to stop ntpd"
225	+ eend $? "Failed to stop ntpd"
226	}
227
228	diff --git a/sys-apps/busybox/files/busybox-sysklogd.confd b/sys-apps/busybox/files/syslogd.confd
229	similarity index 55%
230	rename from sys-apps/busybox/files/busybox-sysklogd.confd
231	rename to sys-apps/busybox/files/syslogd.confd
232	index 793f475..7df6885 100644
233	--- a/sys-apps/busybox/files/busybox-sysklogd.confd
234	+++ b/sys-apps/busybox/files/syslogd.confd
235	@@ -1,12 +1,9 @@
236	# Config file for /etc/init.d/busybox-sysklogd
237
238	-# run "/sbin/syslogd --help" and "/sbin/klogd --help" to see all possible options.
239	+# run "/sbin/syslogd --help" to see all possible options.
240
241	# activate if you need remote logging
242	#rc_need="net"
243
244	# Log to shared mem buffer (use logread to read it)
245	SYSLOGD_OPTS="-C128"
246	-
247	-# send warnings and above to the console
248	-KLOGD_OPTS="-c 3"
249
250	diff --git a/sys-apps/busybox/files/syslogd.initd b/sys-apps/busybox/files/syslogd.initd
251	new file mode 100644
252	index 0000000..d9ba2c2
253	--- /dev/null
254	+++ b/sys-apps/busybox/files/syslogd.initd
255	@@ -0,0 +1,21 @@
256	+#!/sbin/runscript
257	+# Copyright 1999-2012 Gentoo Foundation
258	+# Distributed under the terms of the GNU General Public License v2
259	+# $Header: /var/cvsroot/gentoo-x86/app-admin/busybox-sysklogd/files/busybox-sysklogd.initd,v 1.1 2012/08/21 12:44:33 sbriesen Exp $
260	+
261	+depend() {
262	+ need clock hostname
263	+ provide logger
264	+}
265	+
266	+start() {
267	+ ebegin "Starting busybox-syslogd"
268	+ start-stop-daemon --start --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid -- ${SYSLOGD_OPTS}
269	+ eend $? "Failed to start syslogd"
270	+}
271	+
272	+stop() {
273	+ ebegin "Stopping busybox-syslogd"
274	+ start-stop-daemon --stop --retry 15 --quiet --name syslogd --exec /bin/busybox --pidfile /var/run/syslogd.pid
275	+ eend $? "Failed to stop syslogd"
276	+}
277
278	diff --git a/sys-apps/busybox/files/busybox-watchdog.confd b/sys-apps/busybox/files/watchdog.confd
279	similarity index 100%
280	rename from sys-apps/busybox/files/busybox-watchdog.confd
281	rename to sys-apps/busybox/files/watchdog.confd
282
283	diff --git a/sys-apps/busybox/files/busybox-watchdog.initd b/sys-apps/busybox/files/watchdog.initd
284	similarity index 100%
285	rename from sys-apps/busybox/files/busybox-watchdog.initd
286	rename to sys-apps/busybox/files/watchdog.initd

Gentoo Archives: gentoo-commits