From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 71D531395E4 for ; Fri, 11 Nov 2016 20:15:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2FEBE0B7E; Fri, 11 Nov 2016 20:15:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B6355E0B79 for ; Fri, 11 Nov 2016 20:15:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B065934166E for ; Fri, 11 Nov 2016 20:15:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 574B8967 for ; Fri, 11 Nov 2016 20:15:54 +0000 (UTC) From: "Aric Belsito" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" Message-ID: <1478895300.0a4f0869d0f6445003c6c0bf9fd077141447016b.lluixhi@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: sys-apps/busybox/, sys-apps/busybox/files/ X-VCS-Repository: proj/musl X-VCS-Files: sys-apps/busybox/Manifest sys-apps/busybox/busybox-1.24.2-r99.ebuild sys-apps/busybox/busybox-1.24.2.ebuild sys-apps/busybox/busybox-1.25.1.ebuild sys-apps/busybox/files/klogd.initd sys-apps/busybox/files/mdev-start.sh sys-apps/busybox/files/mdev.initd sys-apps/busybox/files/mdev.rc sys-apps/busybox/files/mdev.rc.1 sys-apps/busybox/files/ntpd.initd sys-apps/busybox/files/syslogd.initd sys-apps/busybox/files/watchdog.initd X-VCS-Directories: sys-apps/busybox/files/ sys-apps/busybox/ X-VCS-Committer: lluixhi X-VCS-Committer-Name: Aric Belsito X-VCS-Revision: 0a4f0869d0f6445003c6c0bf9fd077141447016b X-VCS-Branch: master Date: Fri, 11 Nov 2016 20:15:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 06e40985-8ee6-484a-9664-17a752276f90 X-Archives-Hash: 817eeead5b8f7e2717d203bf95f13001 commit: 0a4f0869d0f6445003c6c0bf9fd077141447016b Author: Aric Belsito gmail com> AuthorDate: Fri Nov 11 20:15:00 2016 +0000 Commit: Aric Belsito gmail com> CommitDate: Fri Nov 11 20:15:00 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=0a4f0869 sys-apps/busybox: Update to 1.25.1 Sync with upstream and drop '-r99' suffix. Clean up FILESDIR sys-apps/busybox/Manifest | 17 ++- ...box-1.24.2-r99.ebuild => busybox-1.24.2.ebuild} | 6 +- ...box-1.24.2-r99.ebuild => busybox-1.25.1.ebuild} | 20 ++-- sys-apps/busybox/files/klogd.initd | 4 +- sys-apps/busybox/files/mdev-start.sh | 125 --------------------- sys-apps/busybox/files/mdev.initd | 4 +- sys-apps/busybox/files/mdev.rc | 9 -- sys-apps/busybox/files/mdev.rc.1 | 98 ---------------- sys-apps/busybox/files/ntpd.initd | 2 +- sys-apps/busybox/files/syslogd.initd | 2 +- sys-apps/busybox/files/watchdog.initd | 2 +- 11 files changed, 27 insertions(+), 262 deletions(-) diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index b53bb59..b8af2b0 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -5,21 +5,20 @@ AUX busybox-1.24.2-CVE-2016-2148.patch 1956 SHA256 0d42e12334ff14616ce9dc22f02f1 AUX busybox-1.24.2-ash-recursive-heredocs.patch 2442 SHA256 2e4b028036b6e983f04f51a2cfb5e61a6e71e4143e5342c54b96bc2296e5d45c SHA512 24cd081d29fd013b9e1893ceb6f3fb8e240e46f69c1d225eed4c71ab5b630e064a15d158f37a2a1ad3f00dafa972af84fe79bd32917b4f126d557839b3288b02 WHIRLPOOL d9108189f20b0326f3095d420aab74dae4bad00381781558f4d6360c62aa9021b01194b773be13625dd7ab97732ea737685e330f19046527792f0f278f761e26 AUX ginit.c 3097 SHA256 fd6a4715d3dd10f6db479020433da3997d397658301335c847fb779129238b8c SHA512 8bf70f13db0fbeecedf9a9f862c5391c0d8b7aa3ddd2ec85cda9b360c3117a01e32b01017b8c30197f587e521ba360ff70d1caf8d0f69d5c3a27f37ecc252e7c WHIRLPOOL a1ec3ccc296033d88a9504b693c7d249d0bd11b1d75e3f59a62137c5e4b4c914fe2b8971c86dbca2cc8ccc0d86f3f8c2c45bb44cec85a3628c44f091476baa92 AUX klogd.confd 218 SHA256 737b78745964e110da2fd3357c6d5fb80ccacf979039b8d40c03cf1cb969e5f3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f WHIRLPOOL ea28c1d926e36fba0ab69de8ddfd2503889b7cfa3a4ada347a9d22d9894fe30be068c0ed55f899b952e62b8de3cb69e1a4209f7864787988ded28ede10c7445a -AUX klogd.initd 255 SHA256 ee9213bdb5f5b9ec7691f414349c0e5db3ec8ea91353c63121dd90d8d7f3b4e3 SHA512 a4cd9e53f2e4383765d66cd063f628b8358bc7696d21a1b450e7bd89e5a6fb323138d48c729d6a5b40ac3eb511bceaec37eb4806ba4348c715c8d7fa894567f4 WHIRLPOOL 26e600b2a09f45c6e5a3eac9c1b73dc7a969ae28a9c624fe8a1e9696757bfa6c809b13b6544e0e48e94f6d864b06bd0d9bee6cf785829782b1ede17477ab5943 -AUX mdev-start.sh 2758 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7 SHA512 532ececdf40769e8059172b95f600c92ddda9490dcf04dc76b11cd669b2b35740aeb02ef7c152a42c13d5adfefb391de01239ebbb4efd06faadc0d096fcde6f5 WHIRLPOOL aace77a07eedfea3ffab029ce25334ff58f512bf5c67512c1f4a40fd51278c2b8b764e55dbf975f74bb4423cfc3f35482a5d3ee8397032fcbf22ad1f91c7c4ea -AUX mdev.initd 875 SHA256 314089dc74567674e26ee1b3c1dc413027888cc232c70fe98548ff14cededd8f SHA512 49e6603a4e7487df0de80b000f7f418a1141889549d191bac7431cfc24a843dfcd7006b154eb382a0b9830755045a44ec3a97deb800bfb81e1b1da696eaa9639 WHIRLPOOL 0224cdb5ec0cd4acf3c5cc4e5590c571ec7432f47f131b14fa4a604fff512974ca6bbb1031443af2e3c8c11e85a824712e2ef5253fb7a94e82657db63e9bbb69 -AUX mdev.rc 184 SHA256 6a9f51237007ed558dda44e06072107cd3cde8d0588c6cd3dc6b98fad1534adb SHA512 dcb9e998a41eb3f9702ae081c52a83a1ede5c4a0db19b12bf251a553eb8fa7f2325115e6e7e760d189a23900bdf553308cb0cf87b7f4f1c25955c85d5e325312 WHIRLPOOL 8d328de529590f28148632eb79f9469a928ea8b3429c3b7a0c7756bb22558215b50511853634c21d4b7a2da12de3b659c2b70a8052924ba9ecfc2894160c2776 -AUX mdev.rc.1 2101 SHA256 1b0cdf97d062a5e78ce4f7dc005da66743330a946388f0df529f6531438be60f SHA512 537747ce91533c89de733f4da5aa4ccfb71f5f9225d9f8411c6e2da5821d790fa072d023407041b8532e97c0ec2e001653fdb2dda35dd9aafc26db1fd4081a72 WHIRLPOOL 0c31c88f81ce211dff57d706b23241219c675fe84784c552b2ff0ee54d9574bc6d36b25e67a744e3f84203f140e9e03583f8fea256a1a09816d9b8d4470d31d5 +AUX klogd.initd 256 SHA256 50b2596723b566cf3621ce408de8aaa2210118187fcb7b4bc64d499fa9fc9ee8 SHA512 d7810c5744b6d2bf0796413838baaac90c53c7495acee058d412a274b4c8cf80de5ba88665ee6dc8aaf3abc43dddee8d7ef794814eafe61aa2e3a40a9f051be3 WHIRLPOOL 65f7ec4ac19ce5f60f41f3be1bdf2934a379f8cbcedbb395792c09569608f2239312d8d7116e4d6d0f939b62413d8b78d8727576ae64be8f534b85459075f092 +AUX mdev.initd 876 SHA256 f659f30fea7af8b6a1466806e8663d92540c564b67cc29e2c950b2271b56ba6d SHA512 2192a7ade06742a4a75250cb337953b78686c71fd5179003e1d68741f837e01c810b0eb4f9cc34f4a38d93c11f3513aab64a1d6ae395560fbbeed8781267a2db WHIRLPOOL c5eb86ff88bded9b6c5f6cd0b591cc801adeb71714eae7c9b6e1231c886d0ddfcf4730863055bb93ba134dda12d53d5b25ded4d7141450bd1c95798df129f693 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 269 SHA256 c49bfaa7babd0633043ace369e4e14695524beba195b15ca66d836c9ea3a9ca5 SHA512 4a51df4b8a9ccabed93769fac4276484465bb4dcc0c8f41a5cd99bda97027ee1bc9fa06fdda41fe19a005ceac3299962d90b11f5f61398d338cf2a8170e62938 WHIRLPOOL c2ab4e2acf9f5e9885dfdefbda8d9e47afd9f49c7e2e7b592c5f8d92c377f56a7baa792b42a95f31a417c471321dd79999b1e2f0e594ee448434ecc0d800988a +AUX ntpd.initd 270 SHA256 fd2d883a7580bba72e347851a6e589b7d7afba6762580c965ff276828434eba0 SHA512 1f3cdd76d3c0bef346f6ca0e422aee162c7edda153816e52933d95e79bc81b9b8b457c49c1ed832a1dec315de5218b15416494da4dcfe8ea6a3e2c84d658de09 WHIRLPOOL 1988ba8ce3a6f14ac5bfc52fcf86ddeeff5999e7d723ad4ff078fc1c0ced41416bea2ffa28a61a53a7880631ad147a9427d5a0f724f1b13a724af2abd8cd9479 AUX syslogd.confd 234 SHA256 65166088cb173582200b8c0d3bc6ea339b5929dbafa816780bfaf50e3514bc25 SHA512 01a2ecf89c49e3e06dd1b6f6673fca16d0f2dd01ff27c0d609c803bc2c81b5ced8245b6388e48ffa2f05ff4e8c1824af73df6364bbebebc722166447bd412f52 WHIRLPOOL b0a9e82225968d44446025242ac6c9429dc2e01a3720d94349756f71ec3a11c3ff2217bce7c4f1a1ea8a2a8baecd3265c3cce01675138674c05a9f2a96ade2ae -AUX syslogd.initd 277 SHA256 47fac609c382b4fb6feaef6b86c12d0f46464370a7fed713fa9a1d70d7c9871f SHA512 3700355b3473c034d8e368a68aa4b44059d6d056ab59987e4e914dda72d02d7c9e4c13799211fd865d885b360a43094e18e80741713f78dfe6162a9a68e768cf WHIRLPOOL fcbea7f7a0e5e8f4cd91bf6203abc5559ce4d380a932d6c70ec8aee2ead8e76209e54557007f23f668019dee5404e1cd5ec48a3df75f0d5613b31e7ac896b61f +AUX syslogd.initd 278 SHA256 4ed842fa5b5331327ed2deb8de20b186c45796e6b280fc148321dc8bc6ace685 SHA512 1a48a0ca7024d985ae4f4918973a4fd197c9f13bb4447154bf4e20778f7e8a7b9caf7cdc64b8ae5b5479964c94ad1aa2d234e60ad271f55dc91bc8388bfbd544 WHIRLPOOL 587525bc1449cfc606cd99ba5e8824fcf9863fd9ebbfef66810c0a21355ea8bc8d5c6710eac9f966e2886d11d26bfa77886815baab7eab3cf73f98a184dcab7b AUX watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461deb29c3eba1c63 SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232 WHIRLPOOL 8ea0f6b759198c978f10bf0b2b00cc73343e72401a05edf257b9c5e1032e8a619328aaa02936b5b5a717a021baa84b5653b8c9826e14e5c07c7b7af98f878767 -AUX watchdog.initd 229 SHA256 b9dd1284af20bf43198807c8d17829fc12e0c39ca3b6f4f7f766c5cd6b581997 SHA512 fddd3dfa9ab4fe324c7d4c683a60062ceb068b7648e21950758af8993606db6fd92bbcf3326f56c4b5b488e61ae50b8620cf94645600734ba43ed3cfc3be3070 WHIRLPOOL d18af9faa3dbec43928933a9a1e5f525a4cd72eab7441dab0d3185e7336848f8694d807d9a43feb4a39af51ba1e2350d3ccd93f0d3c0ad58bac321c42a5f3af6 +AUX watchdog.initd 230 SHA256 ef7f8dc91fe058323336558cb0659f402a45783a69f6c2da80975ec69d785e0e SHA512 262967c00428a6dfb8dfe0d5913ea9bf9202d1a77c0b661d1cc6522650c78333ce89f12ff27a382f21d9928427e12cc677964d78ff5d5c74c17e57ca101d06f2 WHIRLPOOL c247926f5d99a179586286281e34da3dc292973089b450a81e3dd9c0644eb10e7e3989ff47423371c9f7a5780a1be1deb576734dee35dfade439fbd37fca7170 DIST busybox-1.24.2.tar.bz2 2066822 SHA256 e71ef53ec656f31c42633918d301405d40dea1d97eca12f272217ae4a971c855 SHA512 4d20fb68ee440be2855231c7fd5f3cb9dd9bfcc1a688f0b59cd3f7a55c8819e9cc44bd15f91500713571f2a84e5e44adc0fa8ae0ae3ebf63961dfc9e1c9ef8e0 WHIRLPOOL 2d89e3fded8d61567873acdb1e1e21888a4447e19c1b893543bbe82de52e8e3cf091adb10f34aa155da573994d89ae42f40ecce65ec0d32a641d103c8d8ce053 -EBUILD busybox-1.24.2-r99.ebuild 8968 SHA256 c4fb8825e59285530c15d9e9641b945fc97792157f731c858d656169a48c0091 SHA512 1a2156e40629bca1b4246f5f198fd15ab74bc9f3197261d4025162c80fd00463139ac6bf20fac51537c1984293f4d31501d793712c11799e6bf75090c4775b98 WHIRLPOOL d7e195bd0474986332302f5cf5d786c2e9ed785ab98a954bf9e445d749ca9e887b8158464798164cafa1f49cfd095b1f22a6f5846a917dcf0dd47a991c1aed5e +DIST busybox-1.25.1.tar.bz2 2103070 SHA256 27667e0f2328fdbd79cfd622e4453e5c57e58f781c5da97c9be337d93aa2a02e SHA512 9648877ed11e5a55213cd14fd64f6fc64dbd17013fbfaa4e67f4fd433f59e9231ed78a88e6e8100a4794d833f1d9863bb86f75faae093418866770804bf873cb WHIRLPOOL 4b7bc6d3a88559812797feb4574975b9fdeb6eac6ac7a0fe51e4750a3b05a614ecb8bd9d58547047cdf1e0b66d9bcd189c8a4193fc2f3b491a6268bc06761ad1 +EBUILD busybox-1.24.2.ebuild 9055 SHA256 0bd35ab2b62c5054d28a39cad1dd43439d2c30b890b6dc093e45d9d52474d275 SHA512 3bec13a8ceda6c9b3fc576ea642323fba73457458b908fe064c8b359dca8e3d1b9b60c9b555167d8d2df9ef450198305192bf66f719b0001d4b1e480d4e4f9f2 WHIRLPOOL 5feafb3143dbf2051bb646cdb85fe65429a544f428622a58242a6d042698789efec128cfd7aeecc39c43343b12f296b5dcbea575868b21c0851112542cc60903 +EBUILD busybox-1.25.1.ebuild 8903 SHA256 00da8d5c73d1941b95e853ed1deaf33b41f95d104e4ecdf7441a089d30f323d2 SHA512 29010bf96ec440c256997e97fd46b51e8a9419d51b884bb1887aca8bf08e5324de172f60a5fbb70665749798dcf5e1fbaadf1445e34c0d6c62a3d57274fa9fe2 WHIRLPOOL eb3562830a44c97c538170b5494e94e99e361045d19f74408fbfd10549a486b75eb6edc52ae2e1752b19ed3f2da6cc1627b752e385143564a75c84cefe3fa6d0 MISC metadata.xml 872 SHA256 1cf483a8d55e8cbe20edb30261276d71e0ba0a1b06d73621f849496d1f6c4a17 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07 WHIRLPOOL 91b126a39ecd6937e6058814b88043e9fbbf7b434854e25a4e4a7ad8e666de37978b8bac0c8dca0255096a42af9afed412bb5bbccdffaf03ba75c2fd2e4b3428 diff --git a/sys-apps/busybox/busybox-1.24.2-r99.ebuild b/sys-apps/busybox/busybox-1.24.2.ebuild similarity index 97% copy from sys-apps/busybox/busybox-1.24.2-r99.ebuild copy to sys-apps/busybox/busybox-1.24.2.ebuild index 7b814ba..8bd7151 100644 --- a/sys-apps/busybox/busybox-1.24.2-r99.ebuild +++ b/sys-apps/busybox/busybox-1.24.2.ebuild @@ -8,15 +8,15 @@ EAPI="4" inherit eutils flag-o-matic savedconfig toolchain-funcs multilib DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="http://www.busybox.net/" +HOMEPAGE="https://www.busybox.net/" if [[ ${PV} == "9999" ]] ; then MY_P=${PN} EGIT_REPO_URI="git://busybox.net/busybox.git" inherit git-2 else MY_P=${PN}-${PV/_/-} - SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="amd64 arm ~mips ~ppc x86" + SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2" + 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 diff --git a/sys-apps/busybox/busybox-1.24.2-r99.ebuild b/sys-apps/busybox/busybox-1.25.1.ebuild similarity index 94% rename from sys-apps/busybox/busybox-1.24.2-r99.ebuild rename to sys-apps/busybox/busybox-1.25.1.ebuild index 7b814ba..c710c3e 100644 --- a/sys-apps/busybox/busybox-1.24.2-r99.ebuild +++ b/sys-apps/busybox/busybox-1.25.1.ebuild @@ -4,24 +4,25 @@ # See `man savedconfig.eclass` for info on how to use USE=savedconfig. -EAPI="4" +EAPI="5" inherit eutils flag-o-matic savedconfig toolchain-funcs multilib DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="http://www.busybox.net/" +HOMEPAGE="https://www.busybox.net/" if [[ ${PV} == "9999" ]] ; then MY_P=${PN} EGIT_REPO_URI="git://busybox.net/busybox.git" inherit git-2 else MY_P=${PN}-${PV/_/-} - SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="amd64 arm ~mips ~ppc x86" + SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2" + 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 SLOT="0" IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd" +REQUIRED_USE="pam? ( !static )" RESTRICT="test" COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) @@ -67,10 +68,7 @@ src_prepare() { # patches go here! epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch - epatch "${FILESDIR}"/busybox-1.24.1-trylink-ldflags.patch - epatch "${FILESDIR}"/busybox-1.24.2-ash-recursive-heredocs.patch - epatch "${FILESDIR}"/busybox-1.24.2-CVE-2016-2147.patch - epatch "${FILESDIR}"/busybox-1.24.2-CVE-2016-2148.patch +# epatch "${FILESDIR}"/${P}-*.patch cp "${FILESDIR}"/ginit.c init/ || die # flag cleanup @@ -120,6 +118,8 @@ src_configure() { busybox_config_option n MONOTONIC_SYSCALL busybox_config_option n USE_PORTABLE_CODE busybox_config_option n WERROR + # 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 # depend on busybox for most of the musl work, we'll lazily @@ -141,9 +141,6 @@ src_configure() { busybox_config_option n UDHCPC6 fi - if use static && use pam ; then - ewarn "You cannot have USE='static pam'. Assuming static is more important." - fi busybox_config_option $(usex static n pam) PAM busybox_config_option static STATIC busybox_config_option syslog {K,SYS}LOGD LOGGER @@ -151,6 +148,7 @@ src_configure() { busybox_config_option math FEATURE_AWK_LIBM # all the debug options are compiler related, so punt them + busybox_config_option n DEBUG_SANITIZE busybox_config_option n DEBUG busybox_config_option y NO_DEBUG_LIB busybox_config_option n DMALLOC diff --git a/sys-apps/busybox/files/klogd.initd b/sys-apps/busybox/files/klogd.initd index 6fe97b7..99f5f7b 100644 --- a/sys-apps/busybox/files/klogd.initd +++ b/sys-apps/busybox/files/klogd.initd @@ -1,5 +1,5 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation +#!/sbin/openrc-run +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-apps/busybox/files/mdev-start.sh b/sys-apps/busybox/files/mdev-start.sh deleted file mode 100755 index 8784cd5..0000000 --- a/sys-apps/busybox/files/mdev-start.sh +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -find_mdev() -{ - if [ -x /sbin/mdev ] ; then - echo "/sbin/mdev" - else - echo "/bin/busybox mdev" - fi -} - -populate_mdev() -{ - # populate /dev with devices already found by the kernel - - if get_bootparam "nocoldplug" ; then - RC_COLDPLUG="no" - ewarn "Skipping mdev coldplug as requested in kernel cmdline" - fi - - ebegin "Populating /dev with existing devices with mdev -s" - $(find_mdev) -s - eend $? - - return 0 -} - -seed_dev() -{ - # Seed /dev with some things that we know we need - - # creating /dev/console and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before mdev creates it - [ -c /dev/console ] || mknod /dev/console c 5 1 - [ -c /dev/tty1 ] || mknod /dev/tty1 c 4 1 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ -c /dev/null ] || mknod /dev/null c 1 3 - - # copy over any persistant things - if [ -d /lib/mdev/devices ] ; then - cp -RPp /lib/mdev/devices/* /dev 2>/dev/null - fi - - # Not provided by sysfs but needed - ln -snf /proc/self/fd /dev/fd - ln -snf fd/0 /dev/stdin - ln -snf fd/1 /dev/stdout - ln -snf fd/2 /dev/stderr - [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core - - # Create problematic directories - mkdir -p /dev/pts /dev/shm -} - -mount_it_b1() -{ - if [ "${RC_USE_FSTAB}" = "yes" ] ; then - mntcmd=$(get_mount_fstab /dev) - else - unset mntcmd - fi - if [ -n "${mntcmd}" ] ; then - try mount -n ${mntcmd} - else - if grep -Eq "[[:space:]]+tmpfs$" /proc/filesystems ; then - mntcmd="tmpfs" - else - mntcmd="ramfs" - fi - # many video drivers require exec access in /dev #92921 - try mount -n -t "${mntcmd}" -o exec,nosuid,mode=0755 mdev /dev - fi -} -mount_it_b2() -{ - if fstabinfo --quiet /dev ; then - mount -n /dev - else - # Some devices require exec, Bug #92921 - mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=10M" mdev /dev - fi -} -mount_it() -{ - type fstabinfo && mount_it_b2 || mount_it_b1 -} - -main() -{ - # Setup temporary storage for /dev - ebegin "Mounting /dev for mdev" - mount_it - eend $? - - # Create a file so that our rc system knows it's still in sysinit. - # Existance means init scripts will not directly run. - # rc will remove the file when done with sysinit. - touch /dev/.rcsysinit - - # Selinux lovin; /selinux should be mounted by selinux-patched init - if [ -x /sbin/restorecon ] && [ -c /selinux/null ] ; then - restorecon /dev > /selinux/null - fi - - seed_dev - - # Setup hotplugging (if possible) - if [ -e /proc/sys/kernel/hotplug ] ; then - ebegin "Setting up proper hotplug agent" - eindent - einfo "Setting /sbin/mdev as hotplug agent ..." - echo $(find_mdev) > /proc/sys/kernel/hotplug - eoutdent - eend 0 - fi - - populate_mdev -} - -main - -# vim:ts=4 diff --git a/sys-apps/busybox/files/mdev.initd b/sys-apps/busybox/files/mdev.initd index 2759304..fbe7a2c 100644 --- a/sys-apps/busybox/files/mdev.initd +++ b/sys-apps/busybox/files/mdev.initd @@ -1,5 +1,5 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation +#!/sbin/openrc-run +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-apps/busybox/files/mdev.rc b/sys-apps/busybox/files/mdev.rc deleted file mode 100755 index df55e25..0000000 --- a/sys-apps/busybox/files/mdev.rc +++ /dev/null @@ -1,9 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -start() -{ - . /lib/rcscripts/addons/mdev-start.sh -} diff --git a/sys-apps/busybox/files/mdev.rc.1 b/sys-apps/busybox/files/mdev.rc.1 deleted file mode 100755 index 74cc8c6..0000000 --- a/sys-apps/busybox/files/mdev.rc.1 +++ /dev/null @@ -1,98 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -depend() -{ - provide dev dev-mount - need sysfs -} - -find_mdev() -{ - if [ -x /sbin/mdev ] ; then - echo "/sbin/mdev" - else - echo "/bin/busybox mdev" - fi -} - -populate_mdev() -{ - # populate /dev with devices already found by the kernel - - if get_bootparam "nocoldplug" ; then - RC_COLDPLUG="no" - ewarn "Skipping mdev coldplug as requested in kernel cmdline" - fi - - ebegin "Populating /dev with existing devices with mdev -s" - $(find_mdev) -s - eend $? - - return 0 -} - -seed_dev() -{ - # Seed /dev with some things that we know we need - - # creating /dev/console and /dev/tty1 to be able to write - # to $CONSOLE with/without bootsplash before mdev creates it - [ -c /dev/console ] || mknod /dev/console c 5 1 - [ -c /dev/tty1 ] || mknod /dev/tty1 c 4 1 - - # udevd will dup its stdin/stdout/stderr to /dev/null - # and we do not want a file which gets buffered in ram - [ -c /dev/null ] || mknod /dev/null c 1 3 - - # copy over any persistant things - if [ -d /lib/mdev/devices ] ; then - cp -RPp /lib/mdev/devices/* /dev 2>/dev/null - fi - - # Not provided by sysfs but needed - ln -snf /proc/self/fd /dev/fd - ln -snf fd/0 /dev/stdin - ln -snf fd/1 /dev/stdout - ln -snf fd/2 /dev/stderr - [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core - - # Create problematic directories - mkdir -p /dev/pts /dev/shm -} - -mount_it() -{ - if fstabinfo --quiet /dev ; then - mount -n /dev - else - # Some devices require exec, Bug #92921 - mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=10M" mdev /dev - fi -} - -start() -{ - # Setup temporary storage for /dev - ebegin "Mounting /dev for mdev" - mount_it - eend $? - - # Create a file so that our rc system knows it's still in sysinit. - # Existance means init scripts will not directly run. - # rc will remove the file when done with sysinit. - touch /dev/.rcsysinit - - seed_dev - - # Setup hotplugging (if possible) - if [ -e /proc/sys/kernel/hotplug ] ; then - ebegin "Setting up mdev as hotplug agent" - echo $(find_mdev) > /proc/sys/kernel/hotplug - eend 0 - fi - - populate_mdev -} diff --git a/sys-apps/busybox/files/ntpd.initd b/sys-apps/busybox/files/ntpd.initd index 06e37ed..769394c 100644 --- a/sys-apps/busybox/files/ntpd.initd +++ b/sys-apps/busybox/files/ntpd.initd @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-apps/busybox/files/syslogd.initd b/sys-apps/busybox/files/syslogd.initd index b23ca05..62a99fe 100644 --- a/sys-apps/busybox/files/syslogd.initd +++ b/sys-apps/busybox/files/syslogd.initd @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-apps/busybox/files/watchdog.initd b/sys-apps/busybox/files/watchdog.initd index 9949aad..aa1d33e 100644 --- a/sys-apps/busybox/files/watchdog.initd +++ b/sys-apps/busybox/files/watchdog.initd @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$