commit: de62e2640e8f1561ac827d6bf1a3e70919622346
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sun Mar 12 20:47:13 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Sun Mar 12 20:47:13 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=de62e264
sys-apps/busybox: sync with upstream
sys-apps/busybox/Manifest | 21 +++---
sys-apps/busybox/busybox-1.25.1.ebuild | 9 ++-
sys-apps/busybox/busybox-1.26.0.ebuild | 7 +-
sys-apps/busybox/busybox-1.26.2.ebuild | 29 ++++----
.../files/busybox-1.24.1-trylink-ldflags.patch | 32 ---------
.../files/busybox-1.24.2-CVE-2016-2147.patch | 72 -------------------
.../files/busybox-1.24.2-CVE-2016-2148.patch | 55 --------------
.../busybox-1.24.2-ash-recursive-heredocs.patch | 83 ----------------------
.../busybox/files/busybox-1.25.1-setfiles.patch | 34 +++++++++
sys-apps/busybox/files/klogd.initd | 3 +-
sys-apps/busybox/files/mdev.initd | 1 -
sys-apps/busybox/files/ntpd.initd | 3 +-
sys-apps/busybox/files/syslogd.initd | 3 +-
sys-apps/busybox/files/watchdog.initd | 3 +-
14 files changed, 71 insertions(+), 284 deletions(-)
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 7f76ff5..444f044 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,27 +1,24 @@
AUX busybox-1.19.0-bb.patch 908 SHA256
98f92c2edbcf61d1bacef783ea8b08cce07051b0a4489ed3f4579296846f89f1 SHA512
d4024e531ce7113cf554646608b1ef356e51691e3e21d165621b3690c82b56a319867b90d9daba548b635d9dbd41be5efea63181b7123d4505e529d863a8214c
WHIRLPOOL
b0d6d9b08ad0930e5243c7addc8a6db61505e95ed8e72c64fbfd734cb6ff9e303b3eb8ea6ec4790b2be567783664230cf278eb3e673fa0844c3881cf993f7cb8
-AUX busybox-1.24.1-trylink-ldflags.patch 1179 SHA256
2d57a1e34f3a8a6c4e08a0214ae646f3807ce9d9236d9e9c340ccce0294a6d89 SHA512
9fcd02ad067846db4e4b1fe7fe4b28b9d2088e7ca311f47d103124336e96a19dd0fa6813d7e8d408d4bad70d1856964ef1726f23185ec828f68510477115cd11
WHIRLPOOL
23d46f1027ae2600fe850c3d5f9abc013a4964197e784e6e52147a335871eda80439e54e47824a486620ec40147588a1c6722a58d78db65c7484b8f0d62b164d
-AUX busybox-1.24.2-CVE-2016-2147.patch 3453 SHA256
7cedbcfe2744a7efc1d811372932bc8ef610b8bbdfe34d28ba5a0b5d582b885d SHA512
1268f11089ab5bc4d296995ff8216a8f2f6fbb644d20f04502f92fcadd1cafade43eb6e613fe4b9ab7e475e2bcc3b85ae8196d78c4d56a62db2ce0f3564ba644
WHIRLPOOL
38c30e4256e18cb2f366c5d5b35cd8b268fd0375a94616c38b43ef283df1c7772ec28f61fb4d181e5448ddc04bdc8ab3a0fdc8dd4f97ccd82bfa38cdfd190c0e
-AUX busybox-1.24.2-CVE-2016-2148.patch 1956 SHA256
0d42e12334ff14616ce9dc22f02f15c8f3df3ef3334c9ef81abd29d21b5ac687 SHA512
0ffdfa24d5943a15d924fdd42b5d410c0a215d0cad1753caf6c6aba7d0e5be7a883b561a683a4ac8b906e96b1839f4e6f235501c1467afe50508284f51e42c0c
WHIRLPOOL
6a37440abe63b75815b41d2bb4ddc8de1a557bca3a7a17802b7443079fd7418260d81231900f697cab4b4fbbd892be37dc9d97df6880e342db07fa5792f556bb
-AUX busybox-1.24.2-ash-recursive-heredocs.patch 2442 SHA256
2e4b028036b6e983f04f51a2cfb5e61a6e71e4143e5342c54b96bc2296e5d45c SHA512
24cd081d29fd013b9e1893ceb6f3fb8e240e46f69c1d225eed4c71ab5b630e064a15d158f37a2a1ad3f00dafa972af84fe79bd32917b4f126d557839b3288b02
WHIRLPOOL
d9108189f20b0326f3095d420aab74dae4bad00381781558f4d6360c62aa9021b01194b773be13625dd7ab97732ea737685e330f19046527792f0f278f761e26
+AUX busybox-1.25.1-setfiles.patch 1153 SHA256
bd0f75f3d3eeab0d140cd7497617875330b5f70de14c04b78047e76aa1c08611 SHA512
2b3b4aba3be49437b1875ce00887e385abae275cc269ca0e80af797a6a6acfa2f20ea4bcf195e67490d8fe691c1ca7493adbf7e097bd4f6f0e1d7e07e493dca4
WHIRLPOOL
9442abafe26be8a1b2e60b81df2446957e6d135f2d7038ea71eba55f10e1ed3677743d93b2ffd7a1977d214d7ec3916ca4ec40c9cd46d16f5ba47ea3198357ec
AUX busybox-1.26.2-bb.patch 2172 SHA256
46893ff6666269df3af68fbe2bdd09cb1aca57f5e1166adfe93db3c29ec5ae28 SHA512
ead355aa1882ac7394d1803efb045d6a3039569c8f33bbd51e41654a1d50ca47c7d5f5caeadc8d36ddd360416e7b23bcd270cae1d515b524dd3ab08338b1b910
WHIRLPOOL
6dd0bbe52cc6a0b1e3ed98fc1c9bc3585d0cbcd5c7143096b5793d484b28733f79da56d09eea662cb2cb1ab172412273256f548a03b7b9a44e834e1d275ed5b5
AUX ginit.c 3097 SHA256
fd6a4715d3dd10f6db479020433da3997d397658301335c847fb779129238b8c SHA512
8bf70f13db0fbeecedf9a9f862c5391c0d8b7aa3ddd2ec85cda9b360c3117a01e32b01017b8c30197f587e521ba360ff70d1caf8d0f69d5c3a27f37ecc252e7c
WHIRLPOOL
a1ec3ccc296033d88a9504b693c7d249d0bd11b1d75e3f59a62137c5e4b4c914fe2b8971c86dbca2cc8ccc0d86f3f8c2c45bb44cec85a3628c44f091476baa92
AUX klogd.confd 218 SHA256
737b78745964e110da2fd3357c6d5fb80ccacf979039b8d40c03cf1cb969e5f3 SHA512
3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f
WHIRLPOOL
ea28c1d926e36fba0ab69de8ddfd2503889b7cfa3a4ada347a9d22d9894fe30be068c0ed55f899b952e62b8de3cb69e1a4209f7864787988ded28ede10c7445a
-AUX klogd.initd 256 SHA256
50b2596723b566cf3621ce408de8aaa2210118187fcb7b4bc64d499fa9fc9ee8 SHA512
d7810c5744b6d2bf0796413838baaac90c53c7495acee058d412a274b4c8cf80de5ba88665ee6dc8aaf3abc43dddee8d7ef794814eafe61aa2e3a40a9f051be3
WHIRLPOOL
65f7ec4ac19ce5f60f41f3be1bdf2934a379f8cbcedbb395792c09569608f2239312d8d7116e4d6d0f939b62413d8b78d8727576ae64be8f534b85459075f092
-AUX mdev.initd 876 SHA256
f659f30fea7af8b6a1466806e8663d92540c564b67cc29e2c950b2271b56ba6d SHA512
2192a7ade06742a4a75250cb337953b78686c71fd5179003e1d68741f837e01c810b0eb4f9cc34f4a38d93c11f3513aab64a1d6ae395560fbbeed8781267a2db
WHIRLPOOL
c5eb86ff88bded9b6c5f6cd0b591cc801adeb71714eae7c9b6e1231c886d0ddfcf4730863055bb93ba134dda12d53d5b25ded4d7141450bd1c95798df129f693
+AUX klogd.initd 245 SHA256
c8d6f43e5b658eeb54892fea21c0afaa15447e903c55c3bd3d011773f20bb773 SHA512
6c28b5f2db40eeeae14f859f56a5e4f96a034b69639f38da3a437eabd1f74f61240b87eac2f7e5ca9a3377ceb9a37e939ab69b7db6a70c962062e5ae29f7e835
WHIRLPOOL
949802460f708c3db1633fa4e070aa01c243912b437c3999e9c22887d8111195efc1b9f29cfcaeaa6ee5e5ccdd7fb37f89c5ebb3f035388a6ea0d8b5e5f611e2
+AUX mdev.initd 869 SHA256
1ad1fb4d9d92e804a4042ec27534970351516ac5d4367e759a77de8b9f6208f6 SHA512
d7c7074384e8fcc6c8e7e55f94103bc575b101426ed8012a352546e8c741e90dd224869a9308a29e21491021d4372a4fab73c0f0d4453c6a53ea8ae537ca8e7a
WHIRLPOOL
a401aee17e7359582261ddca204336bbd0d1b5d5b217c3a587e20298af05c094e967f234eee5964a0402c3d4f0a2fdfef228f2a4328d5e6b05f14e10933876b5
AUX mdev/dvbdev 356 SHA256
ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e201419b08c4e71de SHA512
ebd82f935da2ca89097234dd8a8f47e179a423652c151123a1f3343f3e1e7bfaba2b8800380e988d4e8f4294545d3a9ab6708ae2e77c5b108b5f091bbce8f94a
WHIRLPOOL
ec24a4afe8333e2d4d856fe3853b844d113057daf3fe536a4c8ef481a5ec925254c7daeb09df378922fabb96400440f4bde40979417b7c35467934d7e2235739
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
c72cdf4bfde9a8f8334a9d6bfce2a468c926a5530532b8a16a13a63d798abeb3 SHA512
05bc589f067cf988f97f10def3c05e139ac4f4ebe045bdb4c2f5453f5e672bf61d3dc1636974c5680c8c9cf22498bee9cfa28a8f4a264d9f5b10a72a9da0ca16
WHIRLPOOL
03f71c6ce87ea19d9b78615e06adbb5ad73e05b2e3dd69d28092df5e961aea2d06db6c97389d000d20b42b0df241a5e8a7f23056d0f40c5cde0557ce7fdf1fcc
AUX ntpd.confd 186 SHA256
4bff7f5c66f4eece52e4381fd2706e591f10eb50f3c3a4132344d34150dc54de SHA512
b0ef111ea7dd6a096acf711d2d84a7c3d38e7e8c181f734053d38c565ab44ecf843ef32c0de0c4e7ecec990e97468a2545f83821beedb125cd6723ed74c67ad8
WHIRLPOOL
a1b228ae22c61de6ecc7fa58edcd4c3941b3762a45fcc38d05bd1c9428bc553b1a158c101d65a99ba63d4bc19b269e834b3f0eba40a5a1c81e0ae876a2ecb42c
-AUX ntpd.initd 270 SHA256
fd2d883a7580bba72e347851a6e589b7d7afba6762580c965ff276828434eba0 SHA512
1f3cdd76d3c0bef346f6ca0e422aee162c7edda153816e52933d95e79bc81b9b8b457c49c1ed832a1dec315de5218b15416494da4dcfe8ea6a3e2c84d658de09
WHIRLPOOL
1988ba8ce3a6f14ac5bfc52fcf86ddeeff5999e7d723ad4ff078fc1c0ced41416bea2ffa28a61a53a7880631ad147a9427d5a0f724f1b13a724af2abd8cd9479
+AUX ntpd.initd 259 SHA256
50ebc260adc5fafa283039ed44ccab7d81762470b33c3876e1b4f66e3883c6b6 SHA512
bdae71e811af7165f014bd9a918824ee1b0c68df78f3457296d6be36e85c5e6d813610979f6d6b9af3c9e2fd4c95a451a63900461a948cbe88d7b6e3201cf03a
WHIRLPOOL
d0caae91e26f55afbdcff890cce38d2d2b5be45efbc7a4fe958a31741aba68b35f6b698c50c8f71f6a45315e0dff5e3f2a792d51d3d41ba59e4e1eb4e801a385
AUX syslogd.confd 234 SHA256
65166088cb173582200b8c0d3bc6ea339b5929dbafa816780bfaf50e3514bc25 SHA512
01a2ecf89c49e3e06dd1b6f6673fca16d0f2dd01ff27c0d609c803bc2c81b5ced8245b6388e48ffa2f05ff4e8c1824af73df6364bbebebc722166447bd412f52
WHIRLPOOL
b0a9e82225968d44446025242ac6c9429dc2e01a3720d94349756f71ec3a11c3ff2217bce7c4f1a1ea8a2a8baecd3265c3cce01675138674c05a9f2a96ade2ae
-AUX syslogd.initd 278 SHA256
4ed842fa5b5331327ed2deb8de20b186c45796e6b280fc148321dc8bc6ace685 SHA512
1a48a0ca7024d985ae4f4918973a4fd197c9f13bb4447154bf4e20778f7e8a7b9caf7cdc64b8ae5b5479964c94ad1aa2d234e60ad271f55dc91bc8388bfbd544
WHIRLPOOL
587525bc1449cfc606cd99ba5e8824fcf9863fd9ebbfef66810c0a21355ea8bc8d5c6710eac9f966e2886d11d26bfa77886815baab7eab3cf73f98a184dcab7b
+AUX syslogd.initd 267 SHA256
e8dff11a6756650efccd7071331462026d3b1f3008a0f2d08c82654a70052eb7 SHA512
856dd97ed46b08fdd13e497737f1eb192594e33bfc5d395d7ca6eed2e6bc212cf0cf33518b36a6f9a18d6962d462430c7b50c07e9dc08e85606ef68b240b1211
WHIRLPOOL
5d91dab5443c3555a34b27d1a9f921fdf957d3ce97c7c85e9ceeab503f281b5edd6fb465a94c8979d796db3822ce965f4fa75f49ed513f1f2878301f6e2e2a7b
AUX watchdog.confd 232 SHA256
786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512
8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232
WHIRLPOOL
8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767
-AUX watchdog.initd 230 SHA256
ef7f8dc91fe058323336558cb0659f402a45783a69f6c2da80975ec69d785e0e SHA512
262967c00428a6dfb8dfe0d5913ea9bf9202d1a77c0b661d1cc6522650c78333ce89f12ff27a382f21d9928427e12cc677964d78ff5d5c74c17e57ca101d06f2
WHIRLPOOL
c247926f5d99a179586286281e34da3dc292973089b450a81e3dd9c0644eb10e7e3989ff47423371c9f7a5780a1be1deb576734dee35dfade439fbd37fca7170
+AUX watchdog.initd 219 SHA256
68831d9e8c460a605f20c2e476ff6f80dcf977412e509f4fcb5ee1f4f3b5d813 SHA512
d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
WHIRLPOOL
69de35443fb58b3188b026787ded43997ca9fb6cafe6d971e72546d9fed4b17eef635fc400d2b3ee1a918eadb8e1dedc051e616f8d418687a8a933dd67865f4b
DIST busybox-1.25.1.tar.bz2 2103070 SHA256
27667e0f2328fdbd79cfd622e4453e5c57e58f781c5da97c9be337d93aa2a02e SHA512
9648877ed11e5a55213cd14fd64f6fc64dbd17013fbfaa4e67f4fd433f59e9231ed78a88e6e8100a4794d833f1d9863bb86f75faae093418866770804bf873cb
WHIRLPOOL
4b7bc6d3a88559812797feb4574975b9fdeb6eac6ac7a0fe51e4750a3b05a614ecb8bd9d58547047cdf1e0b66d9bcd189c8a4193fc2f3b491a6268bc06761ad1
DIST busybox-1.26.0.tar.bz2 2143958 SHA256
3ad227375ee870d529007f6ce83f173b8bd5a37df624ecb460295554261c0f4c SHA512
9e38c2f4c5ddb6c3a184170b5526c1a78cf53a575ed359fb18c407976cab9788fa95a26ca2d4e5c32e1d639890944d98e118149ee1402b18fe085b0baf0186d3
WHIRLPOOL
c8a7419bd711d3e0249807ef9f9ff6123ff8d0767479ea3b3e54ef48f6132514942bc37b79334ca2afd6009d32c5e242712bd6b3995f49904c33040c66df9dcc
DIST busybox-1.26.2.tar.bz2 2120931 SHA256
da3e44913fc1a9c9b7c5337ea5292da518683cbff32be630777f565d6036af16 SHA512
9926d211d0b4f34b513d934d7b111ebbf933c2dc31206bdd80426a62d47d5b1475b70bec5aaa14a26b94a202ab1465d994062a002750a312dcb8167096eb3719
WHIRLPOOL
64fdbd3ede8e382d0237b1576000555f563c4ca93d58cfbb72f71374b662e3201863110a069f0e4a27dab7c0a6102d98ccfd4d57f1dfe44c9b12a17c6a30128a
-EBUILD busybox-1.25.1.ebuild 8808 SHA256
7e1018cb8319bacad230d2714122a64d6d91cfbad5827fc9dc6a92cd578bcbed SHA512
a22023117d44e2e23529e296e08545372f30f356a3d281ed106c1863782bc495c13f687d427e32bc460eeaae3cce4f7a8f2d7d1898eceb81d52f20ea53559e1d
WHIRLPOOL
7a8936c0a02f736e474b4e7e16cd84451058367280633547ede83269d02ce3dfc0bfae08f1cbaab7661f9f2543d60f05f3941cea5148ffdb3ffb47e866e6974c
-EBUILD busybox-1.26.0.ebuild 8812 SHA256
6fbc35ef5b176e55db72046bb23152111a36232f48afd3d0609196d0a0fe8f46 SHA512
a9ae6af14c6136a07cd485ccf8c1cf8a057fbf97a9602507698f9cb19810f3129bb5ca16743e2d9bcc1b11e3a314dcaca202cebbbbc832f824a6b394975404f3
WHIRLPOOL
2b669f258e34304315a53908fdc5492d4e149e1ef638d57a6cebb48e5b60ee1bbf4cee52f4b07f14a8b2585acb137f393233336ee773af25a6f4c2e8d96863a9
-EBUILD busybox-1.26.2.ebuild 8812 SHA256
142f77e3913743bcf0262ad0acb9b3cfb7d5cc7447d311661e80e800801159ba SHA512
84d5da9a4ec5cf83eb51ab5a63437ee63c9ac4509f0feecea75261ea0f5061bbc6f5c51f11bf8c07c9e8ce719de7900c093d5e7ac1c24e273cd587b341afcd33
WHIRLPOOL
1d94d513f7c9c6fb9197628335ad189f8c6e338d7bf5b2893ab498e8b83873bb59171c3678d5e9d1e67c53d32b2ad8864cfecd0901aadccb2a9335879b4b7724
+EBUILD busybox-1.25.1.ebuild 8864 SHA256
285e8b7dc579518db1bcf481bf8c5d7227694cea10eb1b281f2435709944a69e SHA512
4d5a177d70c8feddc4d1291e955d57c7f575b14202d2f2413581e7424a68ae73718110e9179eb6837519bdc142b48fdcc5d7ca9652ff9a4fc905f83dab42177f
WHIRLPOOL
d73b3963773fb610fc0c2b513be01df044cbce058d93a5ee1bb2e01a4f6b96a1ee5db1a4c1b4a808c97f359c6301417aec1c28d4d536f60a23b95aee8e259e85
+EBUILD busybox-1.26.0.ebuild 8878 SHA256
dbad583d3c3bb51eadb38dbeae45030e913a7b4dfc35b9000de55b9b6e36b650 SHA512
70ad67d759367fefb07ff7cef544c232fd5830da9b4f142d9c4c9482fbcf4702c1bf8dca06234e9996dd08a2a1c47c6442fcdcfcbbdbb8ab5e94b673676b837d
WHIRLPOOL
85d4eaad13ce1ffaf28714664631d429377271c87509027120cfbf5ac89c903991aa46a48d89dbbdb62000fb4bc3e84ea1ad2d0d01b5ac6de4d7d9b27844fa5a
+EBUILD busybox-1.26.2.ebuild 9130 SHA256
ff9f81278aff3bb6424b00ea5f58b4e7cfe4811524ee277cad8924094d90b8ea SHA512
e9bc3a464a43e580a98d16f3bf084429d7fb5e7d46f0e79aca81505e5c91c182b6effbfa5ae3fc51fc3b3393f44f86c491d718d6865ab26d5e9c79533aaa5289
WHIRLPOOL
2127552537e322c807153d1d44b3fca3286fdac72c89baad891be98f0c853f6376ee78e9db3759b124d26ce74459e77822747cba2af21edd754229c6ba6342ce
MISC metadata.xml 872 SHA256
1cf483a8d55e8cbe20edb30261276d71e0ba0a1b06d73621f849496d1f6c4a17 SHA512
c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
WHIRLPOOL
91b126a39ecd6937e6058814b88043e9fbbf7b434854e25a4e4a7ad8e666de37978b8bac0c8dca0255096a42af9afed412bb5bbccdffaf03ba75c2fd2e4b3428
diff --git a/sys-apps/busybox/busybox-1.25.1.ebuild
b/sys-apps/busybox/busybox-1.25.1.ebuild
index bbc4c77..3576ead 100644
--- a/sys-apps/busybox/busybox-1.25.1.ebuild
+++ b/sys-apps/busybox/busybox-1.25.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
@@ -16,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P=${PN}-${PV/_/-}
SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2";
- KEYWORDS="amd64 arm ~mips ppc x86"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh
sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
fi
LICENSE="GPL-2" # GPL-2 only
@@ -68,7 +67,7 @@ src_prepare() {
# patches go here!
epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
-# epatch "${FILESDIR}"/${P}-*.patch
+ epatch "${FILESDIR}"/${P}-*.patch
cp "${FILESDIR}"/ginit.c init/ || die
# flag cleanup
@@ -121,7 +120,7 @@ src_configure() {
# triming the BSS size may be dangerous
busybox_config_option n FEATURE_USE_BSS_TAIL
- # These causes trouble with musl. Since we don't really
+ # These cause trouble with musl. Since we don't really
# depend on busybox for most of the musl work, we'll lazily
# just turn them off.
busybox_config_option n FEATURE_UTMP
@@ -141,7 +140,7 @@ src_configure() {
busybox_config_option n UDHCPC6
fi
- busybox_config_option $(usex static n pam) PAM
+ busybox_config_option pam PAM
busybox_config_option static STATIC
busybox_config_option syslog {K,SYS}LOGD LOGGER
busybox_config_option systemd FEATURE_SYSTEMD
diff --git a/sys-apps/busybox/busybox-1.26.0.ebuild
b/sys-apps/busybox/busybox-1.26.0.ebuild
index f4dff92..5af2fa5 100644
--- a/sys-apps/busybox/busybox-1.26.0.ebuild
+++ b/sys-apps/busybox/busybox-1.26.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
@@ -16,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P=${PN}-${PV/_/-}
SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2";
- KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
fi
LICENSE="GPL-2" # GPL-2 only
@@ -121,7 +120,7 @@ src_configure() {
# triming the BSS size may be dangerous
busybox_config_option n FEATURE_USE_BSS_TAIL
- # These causes trouble with musl. Since we don't really
+ # These cause trouble with musl. Since we don't really
# depend on busybox for most of the musl work, we'll lazily
# just turn them off.
busybox_config_option n FEATURE_UTMP
@@ -141,7 +140,7 @@ src_configure() {
busybox_config_option n UDHCPC6
fi
- busybox_config_option $(usex static n pam) PAM
+ busybox_config_option pam PAM
busybox_config_option static STATIC
busybox_config_option syslog {K,SYS}LOGD LOGGER
busybox_config_option systemd FEATURE_SYSTEMD
diff --git a/sys-apps/busybox/busybox-1.26.2.ebuild
b/sys-apps/busybox/busybox-1.26.2.ebuild
index 5569856..dc1c87d 100644
--- a/sys-apps/busybox/busybox-1.26.2.ebuild
+++ b/sys-apps/busybox/busybox-1.26.2.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
@@ -16,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P=${PN}-${PV/_/-}
SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2";
- KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
fi
LICENSE="GPL-2" # GPL-2 only
@@ -37,17 +36,19 @@ S=${WORKDIR}/${MY_P}
busybox_config_option() {
local flag=$1 ; shift
- if [[ ${flag} != [yn] ]] ; then
+ if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
busybox_config_option $(usex ${flag} y n) "$@"
return
fi
+ local expr
while [[ $# -gt 0 ]] ; do
- if [[ ${flag} == "y" ]] ; then
- sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config
- else
- sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g"
.config
- fi
- einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find
CONFIG_$1 ...)
+ case ${flag} in
+ y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
+ n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
+ *) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
+ esac
+ sed -i -e "${expr}" .config || die
+ einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find
CONFIG_$1 ...")"
shift
done
}
@@ -111,6 +112,7 @@ src_configure() {
# now turn off stuff we really don't want
busybox_config_option n DMALLOC
+ busybox_config_option n FEATURE_2_4_MODULES #607548
busybox_config_option n FEATURE_SUID_CONFIG
busybox_config_option n BUILD_AT_ONCE
busybox_config_option n BUILD_LIBBUSYBOX
@@ -121,7 +123,7 @@ src_configure() {
# triming the BSS size may be dangerous
busybox_config_option n FEATURE_USE_BSS_TAIL
- # These causes trouble with musl. Since we don't really
+ # These cause trouble with musl. Since we don't really
# depend on busybox for most of the musl work, we'll lazily
# just turn them off.
busybox_config_option n FEATURE_UTMP
@@ -133,6 +135,9 @@ src_configure() {
busybox_config_option y ASH
busybox_config_option n HUSH
+ busybox_config_option '"/run"' PID_FILE_PATH
+ busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
+
# disable ipv6 applets
if ! use ipv6; then
busybox_config_option n FEATURE_IPV6
@@ -141,7 +146,7 @@ src_configure() {
busybox_config_option n UDHCPC6
fi
- busybox_config_option $(usex static n pam) PAM
+ busybox_config_option pam PAM
busybox_config_option static STATIC
busybox_config_option syslog {K,SYS}LOGD LOGGER
busybox_config_option systemd FEATURE_SYSTEMD
diff --git a/sys-apps/busybox/files/busybox-1.24.1-trylink-ldflags.patch
b/sys-apps/busybox/files/busybox-1.24.1-trylink-ldflags.patch
deleted file mode 100644
index 9d61ceb..0000000
--- a/sys-apps/busybox/files/busybox-1.24.1-trylink-ldflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 77e2bde6a50f0f6b9b3c9983c86e661a9872b5f6 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vap...@gentoo.org>
-Date: Tue, 1 Dec 2015 11:25:10 -0500
-Subject: [PATCH] trylink: include LDFLAGS when checking linkage
-
-The user might be including options in their LDFLAGS (like -fuse-ld=gold)
-that change the behavior of the linker and thus change the results of the
-flag tests. Make sure we include the user's LDFLAGS when running these
-tests so we filter out flags that will fail when used later on.
-
-URL: https://bugs.gentoo.org/499712
-Signed-off-by: Mike Frysinger <vap...@gentoo.org>
----
- scripts/trylink | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/trylink b/scripts/trylink
-index 6e1187e..3c431ed 100755
---- a/scripts/trylink
-+++ b/scripts/trylink
-@@ -54,7 +54,7 @@ check_cc() {
- # "eval" may be needed if CFLAGS can contain
- # '... -D"BB_VER=KBUILD_STR(1.N.M)" ...'
- # and we need shell to process quotes!
-- $CC $CFLAGS $1 "$tempname".c -o "$tempname" >/dev/null 2>&1
-+ $CC $CFLAGS $LDFLAGS $1 "$tempname".c -o "$tempname" >/dev/null 2>&1
- r=$?
- rm -f "$tempname" "$tempname".c "$tempname".o
- return $r
---
-2.6.2
-
diff --git a/sys-apps/busybox/files/busybox-1.24.2-CVE-2016-2147.patch
b/sys-apps/busybox/files/busybox-1.24.2-CVE-2016-2147.patch
deleted file mode 100644
index 2187c9b..0000000
--- a/sys-apps/busybox/files/busybox-1.24.2-CVE-2016-2147.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 3c4de6e36c4d387a648622e7b828a05f2b1b47e6 Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <vda.li...@googlemail.com>
-Date: Fri, 26 Feb 2016 15:54:56 +0100
-Subject: [PATCH] udhcpc: fix OPTION_6RD parsing (could overflow its malloced
- buffer)
-
-Signed-off-by: Denys Vlasenko <vda.li...@googlemail.com>
-Signed-off-by: Mike Frysinger <vap...@gentoo.org>
-(cherry picked from commit 352f79acbd759c14399e39baef21fc4ffe180ac2)
----
- networking/udhcp/common.c | 15 +++++++++++++--
- networking/udhcp/dhcpc.c | 4 ++--
- 2 files changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
-index bc41c8d..680852c 100644
---- a/networking/udhcp/common.c
-+++ b/networking/udhcp/common.c
-@@ -142,7 +142,7 @@ const char dhcp_option_strings[] ALIGN1 =
- * udhcp_str2optset: to determine how many bytes to allocate.
- * xmalloc_optname_optval: to estimate string length
- * from binary option length: (option[LEN] / dhcp_option_lengths[opt_type])
-- * is the number of elements, multiply in by one element's string width
-+ * is the number of elements, multiply it by one element's string width
- * (len_of_option_as_string[opt_type]) and you know how wide string you need.
- */
- const uint8_t dhcp_option_lengths[] ALIGN1 = {
-@@ -162,7 +162,18 @@ const uint8_t dhcp_option_lengths[] ALIGN1 = {
- [OPTION_S32] = 4,
- /* Just like OPTION_STRING, we use minimum length here */
- [OPTION_STATIC_ROUTES] = 5,
-- [OPTION_6RD] = 22, /* ignored by udhcp_str2optset */
-+ [OPTION_6RD] = 12, /* ignored by udhcp_str2optset */
-+ /* The above value was chosen as follows:
-+ * len_of_option_as_string[] for this option is >60: it's a string of
the form
-+ * "32 128 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 255.255.255.255 ".
-+ * Each additional ipv4 address takes 4 bytes in binary option and
appends
-+ * another "255.255.255.255 " 16-byte string. We can set [OPTION_6RD] =
4
-+ * but this severely overestimates string length: instead of 16 bytes,
-+ * it adds >60 for every 4 bytes in binary option.
-+ * We cheat and declare here that option is in units of 12 bytes.
-+ * This adds more than 60 bytes for every three ipv4 addresses - more
than enough.
-+ * (Even 16 instead of 12 should work, but let's be paranoid).
-+ */
- };
-
-
-diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
-index 915f659..2332b57 100644
---- a/networking/udhcp/dhcpc.c
-+++ b/networking/udhcp/dhcpc.c
-@@ -113,7 +113,7 @@ static const uint8_t len_of_option_as_string[] = {
- [OPTION_IP ] = sizeof("255.255.255.255 "),
- [OPTION_IP_PAIR ] = sizeof("255.255.255.255 ") * 2,
- [OPTION_STATIC_ROUTES ] = sizeof("255.255.255.255/32 255.255.255.255
"),
-- [OPTION_6RD ] = sizeof("32 128
ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 255.255.255.255 "),
-+ [OPTION_6RD ] = sizeof("132 128
ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff 255.255.255.255 "),
- [OPTION_STRING ] = 1,
- [OPTION_STRING_HOST ] = 1,
- #if ENABLE_FEATURE_UDHCP_RFC3397
-@@ -220,7 +220,7 @@ static NOINLINE char *xmalloc_optname_optval(uint8_t
*option, const struct dhcp_
- type = optflag->flags & OPTION_TYPE_MASK;
- optlen = dhcp_option_lengths[type];
- upper_length = len_of_option_as_string[type]
-- * ((unsigned)(len + optlen - 1) / (unsigned)optlen);
-+ * ((unsigned)(len + optlen) / (unsigned)optlen);
-
- dest = ret = xmalloc(upper_length + strlen(opt_name) + 2);
- dest += sprintf(ret, "%s=", opt_name);
---
-2.7.4
-
diff --git a/sys-apps/busybox/files/busybox-1.24.2-CVE-2016-2148.patch
b/sys-apps/busybox/files/busybox-1.24.2-CVE-2016-2148.patch
deleted file mode 100644
index 08e08be..0000000
--- a/sys-apps/busybox/files/busybox-1.24.2-CVE-2016-2148.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 3a76bb5136d05f94ee62e377aa723e63444912c7 Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <vda.li...@googlemail.com>
-Date: Thu, 10 Mar 2016 11:47:58 +0100
-Subject: [PATCH] udhcp: fix a SEGV on malformed RFC1035-encoded domain name
-
-Signed-off-by: Denys Vlasenko <vda.li...@googlemail.com>
-Signed-off-by: Mike Frysinger <vap...@gentoo.org>
-(cherry picked from commit d474ffc68290e0a83651c4432eeabfa62cd51e87)
----
- networking/udhcp/domain_codec.c | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/networking/udhcp/domain_codec.c b/networking/udhcp/domain_codec.c
-index c1325d8..8429367 100644
---- a/networking/udhcp/domain_codec.c
-+++ b/networking/udhcp/domain_codec.c
-@@ -63,11 +63,10 @@ char* FAST_FUNC dname_dec(const uint8_t *cstr, int clen,
const char *pre)
- if (crtpos + *c + 1 > clen) /* label too long?
abort */
- return NULL;
- if (dst)
-- memcpy(dst + len, c + 1, *c);
-+ /* \3com ---> "com." */
-+ ((char*)mempcpy(dst + len, c + 1,
*c))[0] = '.';
- len += *c + 1;
- crtpos += *c + 1;
-- if (dst)
-- dst[len - 1] = '.';
- } else {
- /* NUL: end of current domain name */
- if (retpos == 0) {
-@@ -78,7 +77,10 @@ char* FAST_FUNC dname_dec(const uint8_t *cstr, int clen,
const char *pre)
- crtpos = retpos;
- retpos = depth = 0;
- }
-- if (dst)
-+ if (dst && len != 0)
-+ /* \4host\3com\0\4host and we are at \0:
-+ * \3com was converted to "com.",
change dot to space.
-+ */
- dst[len - 1] = ' ';
- }
-
-@@ -228,6 +230,9 @@ int main(int argc, char **argv)
- int len;
- uint8_t *encoded;
-
-+ uint8_t str[6] = { 0x00, 0x00, 0x02, 0x65, 0x65, 0x00 };
-+ printf("NUL:'%s'\n", dname_dec(str, 6, ""));
-+
- #define DNAME_DEC(encoded,pre) dname_dec((uint8_t*)(encoded),
sizeof(encoded), (pre))
- printf("'%s'\n", DNAME_DEC("\4host\3com\0", "test1:"));
- printf("test2:'%s'\n", DNAME_DEC("\4host\3com\0\4host\3com\0", ""));
---
-2.7.4
-
diff --git a/sys-apps/busybox/files/busybox-1.24.2-ash-recursive-heredocs.patch
b/sys-apps/busybox/files/busybox-1.24.2-ash-recursive-heredocs.patch
deleted file mode 100644
index 5405eaf..0000000
--- a/sys-apps/busybox/files/busybox-1.24.2-ash-recursive-heredocs.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 4194c2875310c13ee3ca2bb0e1aea6a2ae67c55a Mon Sep 17 00:00:00 2001
-From: Ron Yorston <r...@pobox.com>
-Date: Thu, 29 Oct 2015 16:44:56 +0000
-Subject: [PATCH] ash: fix error during recursive processing of here document
-
-Save the value of the checkkwd flag to prevent it being clobbered
-during recursion.
-
-Based on commit ec2c84d from git://git.kernel.org/pub/scm/utils/dash/dash.git
-by Herbert Xu.
-
-function old new delta
-readtoken 190 203 +13
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 1/0 up/down: 13/0) Total: 13 bytes
-
-Signed-off-by: Ron Yorston <r...@pobox.com>
-Signed-off-by: Denys Vlasenko <vda.li...@googlemail.com>
-Signed-off-by: Mike Frysinger <vap...@gentoo.org>
-(cherry picked from commit 713f07d906d9171953be0c12e2369869855b6ca6)
----
- shell/ash.c | 5 +++--
- shell/ash_test/ash-heredoc/heredoc3.right | 1 +
- shell/ash_test/ash-heredoc/heredoc3.tests | 9 +++++++++
- 3 files changed, 13 insertions(+), 2 deletions(-)
- create mode 100644 shell/ash_test/ash-heredoc/heredoc3.right
- create mode 100755 shell/ash_test/ash-heredoc/heredoc3.tests
-
-diff --git a/shell/ash.c b/shell/ash.c
-index 8a1628e..256e933 100644
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -11893,6 +11893,7 @@ static int
- readtoken(void)
- {
- int t;
-+ int kwd = checkkwd;
- #if DEBUG
- smallint alreadyseen = tokpushback;
- #endif
-@@ -11906,7 +11907,7 @@ readtoken(void)
- /*
- * eat newlines
- */
-- if (checkkwd & CHKNL) {
-+ if (kwd & CHKNL) {
- while (t == TNL) {
- parseheredoc();
- t = xxreadtoken();
-@@ -11920,7 +11921,7 @@ readtoken(void)
- /*
- * check for keywords
- */
-- if (checkkwd & CHKKWD) {
-+ if (kwd & CHKKWD) {
- const char *const *pp;
-
- pp = findkwd(wordtext);
-diff --git a/shell/ash_test/ash-heredoc/heredoc3.right
b/shell/ash_test/ash-heredoc/heredoc3.right
-new file mode 100644
-index 0000000..ce01362
---- /dev/null
-+++ b/shell/ash_test/ash-heredoc/heredoc3.right
-@@ -0,0 +1 @@
-+hello
-diff --git a/shell/ash_test/ash-heredoc/heredoc3.tests
b/shell/ash_test/ash-heredoc/heredoc3.tests
-new file mode 100755
-index 0000000..96c227c
---- /dev/null
-+++ b/shell/ash_test/ash-heredoc/heredoc3.tests
-@@ -0,0 +1,9 @@
-+echo hello >greeting
-+cat <<EOF &&
-+$(cat greeting)
-+EOF
-+{
-+ echo $?
-+ cat greeting
-+} >/dev/null
-+rm greeting
---
-2.7.4
-
diff --git a/sys-apps/busybox/files/busybox-1.25.1-setfiles.patch
b/sys-apps/busybox/files/busybox-1.25.1-setfiles.patch
new file mode 100644
index 0000000..3a5f5ed
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.25.1-setfiles.patch
@@ -0,0 +1,34 @@
+From c1704a34745f8e49373eb2cbe1c83199ab2d0091 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vap...@gentoo.org>
+Date: Fri, 9 Dec 2016 18:14:12 -0500
+Subject: [PATCH] setfiles: fix build failure after common_bufsiz change
+
+Commit 47cfbf32fd66563f8c4e09ad6cced6abfbe2fad5 ("*: add most of the
+required setup_common_bufsiz() calls") switched this tool over to use
+the common_bufsiz logic but missed including the header leading to a
+build failure when enabled:
+selinux/setfiles.c:80:30: error: 'bb_common_bufsiz1' undeclared (first use in
this function)
+
+URL: https://bugs.gentoo.org/600106
+Reported-by: Jonas Jelten <j...@stusta.net>
+Signed-off-by: Mike Frysinger <vap...@gentoo.org>
+(cherry picked from commit 1cda8790803a6fb072375c8fa53273333d2d4607)
+---
+ selinux/setfiles.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/selinux/setfiles.c b/selinux/setfiles.c
+index 51a7e63bd741..d8083d4fd580 100644
+--- a/selinux/setfiles.c
++++ b/selinux/setfiles.c
+@@ -46,6 +46,7 @@
+ //usage: "\n if it has changed"
+
+ #include "libbb.h"
++#include "common_bufsiz.h"
+ #if ENABLE_FEATURE_SETFILES_CHECK_OPTION
+ #include <sepol/sepol.h>
+ #endif
+--
+2.11.0.rc2
+
diff --git a/sys-apps/busybox/files/klogd.initd
b/sys-apps/busybox/files/klogd.initd
index 99f5f7b..95d5eb0 100644
--- a/sys-apps/busybox/files/klogd.initd
+++ b/sys-apps/busybox/files/klogd.initd
@@ -1,11 +1,10 @@
#!/sbin/openrc-run
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
command="/bin/busybox klogd"
command_args="${KLOGD_OPTS}"
-pidfile="/var/run/klogd.pid"
+pidfile="/run/klogd.pid"
depend() {
need clock hostname
diff --git a/sys-apps/busybox/files/mdev.initd
b/sys-apps/busybox/files/mdev.initd
index fbe7a2c..1145707 100644
--- a/sys-apps/busybox/files/mdev.initd
+++ b/sys-apps/busybox/files/mdev.initd
@@ -1,7 +1,6 @@
#!/sbin/openrc-run
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
depend()
{
diff --git a/sys-apps/busybox/files/ntpd.initd
b/sys-apps/busybox/files/ntpd.initd
index 769394c..dffea3b 100644
--- a/sys-apps/busybox/files/ntpd.initd
+++ b/sys-apps/busybox/files/ntpd.initd
@@ -1,11 +1,10 @@
#!/sbin/openrc-run
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
command="/bin/busybox ntpd"
command_args="${NTPD_OPTS}"
-pidfile="/var/run/ntpd.pid"
+pidfile="/run/ntpd.pid"
depend() {
use net dns logger
diff --git a/sys-apps/busybox/files/syslogd.initd
b/sys-apps/busybox/files/syslogd.initd
index 62a99fe..b2ac5ac 100644
--- a/sys-apps/busybox/files/syslogd.initd
+++ b/sys-apps/busybox/files/syslogd.initd
@@ -1,11 +1,10 @@
#!/sbin/openrc-run
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
command="/bin/busybox syslogd"
command_args="${SYSLOGD_OPTS}"
-pidfile="/var/run/syslogd.pid"
+pidfile="/run/syslogd.pid"
depend() {
need clock hostname
diff --git a/sys-apps/busybox/files/watchdog.initd
b/sys-apps/busybox/files/watchdog.initd
index aa1d33e..8904373 100644
--- a/sys-apps/busybox/files/watchdog.initd
+++ b/sys-apps/busybox/files/watchdog.initd
@@ -1,8 +1,7 @@
#!/sbin/openrc-run
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
command="/bin/busybox watchdog"
command_args="${WATCHDOG_OPTS}"
-pidfile="/var/run/watchdog.pid"
+pidfile="/run/watchdog.pid"
