summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-10-18 22:57:53 +0000
committerMike Frysinger <vapier@gentoo.org>2014-10-18 22:57:53 +0000
commit1f428f9fc28929d39c0dcc35801083c451010e1b (patch)
treea46e72017c144c3859f5292f121523d66fb589ab /sys-apps
parentadd emacs herd and fix site-init file, thanks to Ulrich Müller (ulm) (diff)
downloadhistorical-1f428f9fc28929d39c0dcc35801083c451010e1b.tar.gz
historical-1f428f9fc28929d39c0dcc35801083c451010e1b.tar.bz2
historical-1f428f9fc28929d39c0dcc35801083c451010e1b.zip
Add lzop fix from upstream #515254 by Kristian Fiskerstrand. Add USE=debug to control build debug options and switch to defconfig #525586 by emil karlson.
Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/busybox/ChangeLog9
-rw-r--r--sys-apps/busybox/Manifest23
-rw-r--r--sys-apps/busybox/busybox-1.22.1-r1.ebuild300
-rw-r--r--sys-apps/busybox/files/busybox-1.22.1-lzop.patch66
-rw-r--r--sys-apps/busybox/files/busybox-1.22.1-nc.patch15
5 files changed, 406 insertions, 7 deletions
diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 5f0d2d23c1e6..64b8fa63cfcc 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-apps/busybox
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.368 2014/07/10 13:33:27 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.369 2014/10/18 22:57:51 vapier Exp $
+
+*busybox-1.22.1-r1 (18 Oct 2014)
+
+ 18 Oct 2014; Mike Frysinger <vapier@gentoo.org> +busybox-1.22.1-r1.ebuild,
+ +files/busybox-1.22.1-lzop.patch, +files/busybox-1.22.1-nc.patch:
+ Add lzop fix from upstream #515254 by Kristian Fiskerstrand. Add USE=debug to
+ control build debug options and switch to defconfig #525586 by emil karlson.
10 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> busybox-1.22.1.ebuild:
Add ~arm64 keyword
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 96f989d9eaea..c6cbf9887a2e 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -16,6 +16,8 @@ AUX busybox-1.22.0-ntpd.patch 328 SHA256 bb54653941bc67178d76c6c800fe1d35600e9f9
AUX busybox-1.22.1-ash.patch 344 SHA256 c3b5b5c5522fda8014b12a23c370d7f70f6d1625fefa93a62c5c14414528ad12 SHA512 297736a2b41badba50a64881e20778e05c9df5f6fed5cbe45cf8c5a31e5486a5fe85ce00897c2ef0c60787cc33467f03fc586f39945f513a7caeaea57aafc8d7 WHIRLPOOL bea756e5335b2ebcabb487b9a4f64e1aae0cf9a4652ed3bbab5232b31fb5730cdb726a152f1ef494aaaacc251a24a30c40bc89485d2b008eb56290f88008ea4e
AUX busybox-1.22.1-date.patch 1008 SHA256 8502dd7454e948a56fcd8201f4fe9d629d2844b9df2bacff7ee0bb09398d12e8 SHA512 0836ef682e24fc0e6d660d0d835200d5f4cd863691a6b58d071e40d001923664389f61670037140c2f95deb2080a93c989037308c761ac9304165d83cbfd3d34 WHIRLPOOL 58b93b0553e81f98c49503bfec33f473c1a7cde2ca3110e96c0d80f45d458c98b5cea1528637b4d9bbbb3df4de6e074446d43cbeeee285cec3ea52a352c374d2
AUX busybox-1.22.1-iplink.patch 425 SHA256 186b41734e43ee117cb367055ce6a4d5b3aac671c09d71f2a6347793874d653b SHA512 f213d11c842841a5b7a6c8b1ffb38719eb038cde220b06f8b5419e63998e21629b0e3f481ad7549d67a764e113abe524d8a7fa0fd9286b8b355a1f20211fd889 WHIRLPOOL c87b1c0dafab79fd707ec22d7540de939595d3fb6665df2c20e22059b4c675fab1d5f81353230e1a172a9fc618c766db32c8e0c35913f160a06224cd13de47a5
+AUX busybox-1.22.1-lzop.patch 2103 SHA256 cc70144cd273464502e04050abb1bd1d2a36d9a7f4aeef2b2f8172f6c7bc18eb SHA512 85c63f80fc76ed91598627663299d2f087609d3983f41dccdfe489d3bbcf6b8e5e553e66294138cdd0a9939b7e3463ee35d098b4ab5ab0277007b9257a0eecae WHIRLPOOL 2fbc1e178922f4fee1b9b51054515a2d1b21932df4e5360386fbf6b2b03adabda625798a6900a9d748657d20e193fbdf15a159b3881ab24117806dead681a6ca
+AUX busybox-1.22.1-nc.patch 615 SHA256 0d2f9ba2e9e5db813fe9feb6fc84052ac85403ce2debefb8b1281a05aadec052 SHA512 9988abf5936f8b8d952627999630c40cbfb4f6f1b91030a2692bbaa7b7e8516758a1ce0959bb5122c6911cd547ee04fce29a0c60c91ccf25e82f59ca52ac1e8f WHIRLPOOL e879b0593db22e53e7fa7153bb7dccd9cda4a6bc570f6d5916e05fe2337f42bcaceb8281c871b24bbd29d33eb1a15c932f3aef8e3cbd638cad4caaa99f4a668c
AUX ginit.c 3097 SHA256 fd6a4715d3dd10f6db479020433da3997d397658301335c847fb779129238b8c SHA512 8bf70f13db0fbeecedf9a9f862c5391c0d8b7aa3ddd2ec85cda9b360c3117a01e32b01017b8c30197f587e521ba360ff70d1caf8d0f69d5c3a27f37ecc252e7c WHIRLPOOL a1ec3ccc296033d88a9504b693c7d249d0bd11b1d75e3f59a62137c5e4b4c914fe2b8971c86dbca2cc8ccc0d86f3f8c2c45bb44cec85a3628c44f091476baa92
AUX klogd.confd 218 SHA256 737b78745964e110da2fd3357c6d5fb80ccacf979039b8d40c03cf1cb969e5f3 SHA512 3348d5376b368b28d1431692a93868cd4550be12ad729340c5f78da35a5bd295e7613d70ce8ccde5029ad6d87a41c2f24155180f3570de8a9174dd63dece143f WHIRLPOOL ea28c1d926e36fba0ab69de8ddfd2503889b7cfa3a4ada347a9d22d9894fe30be068c0ed55f899b952e62b8de3cb69e1a4209f7864787988ded28ede10c7445a
AUX klogd.initd 359 SHA256 ef607b72d270797e4be1fba425c23ba26078633c47c698063bd4b17e7b4ff8c3 SHA512 e9d6215e4b0dcc4fbb507ce2bb84c818ad18951282c47c98b0c98b3fa58e6b28218f608689a7786cb0447673ae1f5c3ba5767f9b29cffd73325d93bf2a928ac9 WHIRLPOOL d7e82a0d2a6a60b2444a3b212022250297ca163001045bf508442972fc6330c4eea55cb965920778e090c92a69441e864e6721f02ecc6d10279b6196b14f7e71
@@ -41,16 +43,25 @@ EBUILD busybox-1.20.2.ebuild 8689 SHA256 7b8d73cfd1fef71b4dff1d1401a06409efcc13f
EBUILD busybox-1.21.0.ebuild 8493 SHA256 c0753eba50809fd0a4520a645f62f632e2c88f90d7b1d8e6afd315ae6952d444 SHA512 10ed172f9ee2fddc8a87a4b2db1b09f5767b1afe148a3d3c67e5c5487f7d7c3eb999f21190672d688d16707fcba2ba0007dda9dfd1871e961545e730cff315d4 WHIRLPOOL 5f2ec0cf5f9cfc5dec73260bce07d564d675c88a34e47c01aed73983dcde522707963c7ec09b9549e82313d724438a9fd26d176d068861e1a1612f6e7fc646b0
EBUILD busybox-1.21.1.ebuild 8506 SHA256 45e6ad003eaa29c594772f24aa1903f36125bb3857d8fb86c6af2290e6755204 SHA512 7b663ee5e3580ab0f5b31c725ce5d7481cc38edcacacda035a20ea953be2a6edbe0b4c8834bb923bbac7a17001f213efdc8a259a92b85cdf7bdcfdd533be4ff3 WHIRLPOOL c66565d1749fccaa0d5e66e975d4497596ac74b114beeade6a68110535616c937d88fbfa5ffe2f3a01b032b164afaefb51da559918a35bcefbe2394bf6754490
EBUILD busybox-1.22.0.ebuild 8506 SHA256 409a8606aacc2292e12fea917d25d15e91e03079b698eb5fc687de767038660b SHA512 68d4434012dd21ed9bebb0f33125fea20eff243af676e5ff6246fd03fccc7b3411dae57327890208c7c74c22b298ab9e482425d44798d75d3200076d8b4d5ed5 WHIRLPOOL e6b6f6301dafda61cd553b5d808e41d7b05098a2b10a7161db74d157097639efcd83d24a92ff5430a17e266c682d293494d82c2eaedf2666b1a32768bf83642b
+EBUILD busybox-1.22.1-r1.ebuild 8611 SHA256 f6d7d70facd2d74146f4bbc6115b542a734c3e76ef290a8d2d53f478f480d6e7 SHA512 77050af4651358b9a9accc3ff1e0c48b9936ed0b5a9a89d9e0438031bb89bf8034f4469a52280617b2bcde10ea76c75b34d2f42eaa291b1672ed01dd26a21aea WHIRLPOOL 22ed631429879a312c0a32021475aa94f21768a6834a4f058dc678d0c66e317ed1bd8c2c308aaed7fb909e19443ee8780c5dc29a98b9167cf64757d7f91a349a
EBUILD busybox-1.22.1.ebuild 8514 SHA256 46a33d9cc0b202130435b0e5439d5f09b52fe746ef6dbbf099f735c2d3452dbf SHA512 bea8bbae90aa1120db826e942baf26cb971df6c61b550928d7428dfee9ba046b50f7210b929377549d0bcacee00848e1d942069f06c8b411bc18dfdc192da188 WHIRLPOOL 42991983892dca8e7228334856ffb0a8d79a82eca26749ef98f5f39102fc2625826c083f8e7452789d4c58bb6b76351d673d8d8de1171336a6e28582ce59c300
EBUILD busybox-9999.ebuild 8506 SHA256 08368826e7140b6d925b7eb348f1ccb99a851b825f9d6f4d80adee57d4f6dec0 SHA512 44f90f8eeb41cd2db2306df90debe289b7cd5ccf72bbd8185f64747067fc41717692a7609976738d6efefc9367a91d68c2ee9ae21ac74e3707dd896b5e6b4b69 WHIRLPOOL 11708cfbf79cb597a9f3ca75d0bffd77b0d1a247dbb25fecefeda5fe35aa5b5141c2b161c1e370c6c088597c0d9f4cd3db207e2071a456b3a66ec7203c11f2b7
-MISC ChangeLog 56428 SHA256 b092de42de20644504029cbd5189737903cd0a9a1017bfde35fbec0856ad8405 SHA512 7dc3aae3d9375e65d8ce1c077e1c42bc2112d45797a5892f7e3e4a92228d494d48c8dfc8b0c75c9140b7c2d488b79bee821ad8167998d1256f11c1a0d2422c3b WHIRLPOOL 7b10a03adbcc8be0fdaa36fc0f9496bc803b3cf9e7eb60e58c2f793855c733ce7bb9b2cd64a6796692e390b8956481fffd141b0cdffc24b78007b1cb495db68b
+MISC ChangeLog 56767 SHA256 d2976c45254224332ad36dea3118bda56e4bd826c8625efb02b0ae95eccec629 SHA512 9a4a1d9e473a2993dea7c4b9286209ceafd465d2885ff0466b0d85b788e2f8436d34e92a7891908c4db2dfeee27184c806fb34e75daf439498cdf30622e1f559 WHIRLPOOL 39c76313ff4ff1e7c7e6addd2f4cf93292a58b173755bd620575696f01037bc34d03f743fdf11ce4fb78c9dd356216eef19c1310779b014b30631119fa4eae38
MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iJwEAQEIAAYFAlO+l2kACgkQG9wOWsQutdbX1AP+NppnGgNd4DnvuLKRzCo3nFPW
-bNLZXAnRNcKFEwXsw1dvo+XVWn8cMIy68V/MV6O+5/2AdoOz+kH+bSEEggWy1y+F
-DqDvJBu21k/4NzfhdOAOJc7Q7mWl9wjzu3xjvwP1NW+OpVMncxr84VuqWoaWEl5D
-PI1VSsPMDiC6isL2Zos=
-=0eZa
+iQIcBAEBCAAGBQJUQvBxAAoJEPGu1DbS6WIATPUP/3HwDI6K/NVusaik9iOP2so2
+mu3KfgOHDKGRiFJSe9P3Z2C6BAN3hEymjCDHv/IhtE+b5uPE6VfNbyfustBEMKuV
+3eilKht5MoPWzLj/QqaNj4MFdtvniKj3eK8HL5DKhD8MI5I7uy4E9WJcVA/gnSoL
+k+mpL5gm3X/1GVZNX+gsRNDB6BFOcfhBLBGawN5sfZ/sDbxdPKFUAXvTXge2ZKFp
+ZHO4OFyv+aa+ok1OT/FPIt5/t8tGDqIurkl6ZqIv2hzRyPeoAPeGJp8juTSa9I8v
+R963GxPRvI0+ov7QIE+55M8A4AK1xegOo4NXpiDPs3UseJxv1EqWSVtmti80mB0G
+bNU1PiIPe+m7ZuGA/WoGDWAb36slGvfd2+PUxLc3+PuKYW6x8UqP4m71PtHTejHY
+2C8uWmEDw9JU3rFk2V97JrU0C6Wo5XmfbaQTGxYiKM9JWquq62ohfQ0BAsYn1RFv
+KElZlUaAb4uxtJs3FDproro7Le7K79DKcU9E1m+C6fUaY43xFPQjDeav2PY7zvgC
+FI6wAr4XrfbLSBqisZDlWoT5KzwE9aEqW9Bnyip0+HHYSxHWlm+UiE+XuafgrOgZ
+V8Ag4EsC9VlhrJbN88O9tlxH6smEfyB8/RzcskofFv3dy9+dQeLeXJ0O4VBlmfQD
+dtCLbvmpBw1bNANj7N6q
+=XUp8
-----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.22.1-r1.ebuild b/sys-apps/busybox/busybox-1.22.1-r1.ebuild
new file mode 100644
index 000000000000..699422f442d4
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.22.1-r1.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.22.1-r1.ebuild,v 1.1 2014/10/18 22:57:51 vapier Exp $
+
+# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
+
+EAPI="4"
+inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="http://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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd"
+RESTRICT="test"
+
+RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
+ pam? ( sys-libs/pam )"
+DEPEND="${RDEPEND}
+ static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
+ >=sys-kernel/linux-headers-2.6.39"
+
+S=${WORKDIR}/${MY_P}
+
+busybox_config_option() {
+ local flag=$1 ; shift
+ if [[ ${flag} != [yn] ]] ; then
+ busybox_config_option $(usex ${flag} y n) "$@"
+ return
+ fi
+ 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 ...)
+ shift
+ done
+}
+
+busybox_config_enabled() {
+ local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
+ case ${val} in
+ "") return 1 ;;
+ y) return 0 ;;
+ *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
+ esac
+}
+
+src_prepare() {
+ unset KBUILD_OUTPUT #88088
+ append-flags -fno-strict-aliasing #310413
+ use ppc64 && append-flags -mminimal-toc #130943
+
+ # patches go here!
+ epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
+ epatch "${FILESDIR}"/${P}-*.patch
+ cp "${FILESDIR}"/ginit.c init/ || die
+
+ # flag cleanup
+ sed -i -r \
+ -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
+ Makefile.flags || die
+ #sed -i '/bbsh/s:^//::' include/applets.h
+ sed -i '/^#error Aborting compilation./d' applets/applets.c || die
+ use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+ sed -i \
+ -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+ -e "/^AR\>/s:=.*:= $(tc-getAR):" \
+ -e "/^CC\>/s:=.*:= $(tc-getCC):" \
+ -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+ -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
+ Makefile || die
+ sed -i \
+ -e 's:-static-libgcc::' \
+ Makefile.flags || die
+}
+
+src_configure() {
+ # check for a busybox config before making one of our own.
+ # if one exist lets return and use it.
+
+ restore_config .config
+ if [ -f .config ]; then
+ yes "" | emake -j1 -s oldconfig >/dev/null
+ return 0
+ else
+ ewarn "Could not locate user configfile, so we will save a default one"
+ fi
+
+ # setup the config file
+ emake -j1 -s defconfig >/dev/null
+ # nommu forces a bunch of things off which we want on #387555
+ busybox_config_option n NOMMU
+ sed -i '/^#/d' .config
+ yes "" | emake -j1 -s oldconfig >/dev/null
+
+ # now turn off stuff we really don't want
+ busybox_config_option n DMALLOC
+ busybox_config_option n FEATURE_SUID_CONFIG
+ busybox_config_option n BUILD_AT_ONCE
+ busybox_config_option n BUILD_LIBBUSYBOX
+ busybox_config_option n FEATURE_CLEAN_UP
+ busybox_config_option n MONOTONIC_SYSCALL
+ busybox_config_option n USE_PORTABLE_CODE
+ busybox_config_option n WERROR
+
+ # If these are not set and we are using a uclibc/busybox setup
+ # all calls to system() will fail.
+ busybox_config_option y ASH
+ busybox_config_option n HUSH
+
+ # disable ipv6 applets
+ if ! use ipv6; then
+ busybox_config_option n FEATURE_IPV6
+ busybox_config_option n TRACEROUTE6
+ busybox_config_option n PING6
+ 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
+ busybox_config_option systemd FEATURE_SYSTEMD
+ busybox_config_option math FEATURE_AWK_LIBM
+
+ # all the debug options are compiler related, so punt them
+ busybox_config_option n DEBUG
+ busybox_config_option y NO_DEBUG_LIB
+ busybox_config_option n DMALLOC
+ busybox_config_option n EFENCE
+ busybox_config_option $(usex debug y n) TFTP_DEBUG
+
+ busybox_config_option selinux SELINUX
+
+ # this opt only controls mounting with <linux-2.6.23
+ busybox_config_option n FEATURE_MOUNT_NFS
+
+ # default a bunch of uncommon options to off
+ local opt
+ for opt in \
+ ADD_SHELL \
+ BEEP BOOTCHARTD \
+ CRONTAB \
+ DC DEVFSD DNSD DPKG{,_DEB} \
+ FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
+ FEATURE_DEVFS \
+ HOSTID HUSH \
+ INETD INOTIFYD IPCALC \
+ LOCALE_SUPPORT LOGNAME LPD \
+ MAKEMIME MKFS_MINIX MSH \
+ OD \
+ RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
+ SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
+ TASKSET TCPSVD \
+ RPM RPM2CPIO \
+ UDPSVD UUDECODE UUENCODE
+ do
+ busybox_config_option n ${opt}
+ done
+
+ emake -j1 oldconfig > /dev/null
+}
+
+src_compile() {
+ unset KBUILD_OUTPUT #88088
+ export SKIP_STRIP=y
+
+ emake V=1 busybox
+}
+
+src_install() {
+ unset KBUILD_OUTPUT #88088
+ save_config .config
+
+ into /
+ dodir /bin
+ if use sep-usr ; then
+ # install /ginit to take care of mounting stuff
+ exeinto /
+ newexe busybox_unstripped ginit
+ dosym /ginit /bin/bb
+ dosym bb /bin/busybox
+ else
+ newbin busybox_unstripped busybox
+ dosym busybox /bin/bb
+ fi
+ if use mdev ; then
+ dodir /$(get_libdir)/mdev/
+ use make-symlinks || dosym /bin/bb /sbin/mdev
+ cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
+
+ exeinto /$(get_libdir)/mdev/
+ doexe "${FILESDIR}"/mdev/*
+
+ newinitd "${FILESDIR}"/mdev.rc.1 mdev
+ fi
+ if use livecd ; then
+ dosym busybox /bin/vi
+ fi
+
+ # add busybox daemon's, bug #444718
+ if busybox_config_enabled FEATURE_NTPD_SERVER; then
+ newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
+ newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
+ fi
+ if busybox_config_enabled SYSLOGD; then
+ newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
+ newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
+ fi
+ if busybox_config_enabled KLOGD; then
+ newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
+ newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
+ fi
+ if busybox_config_enabled WATCHDOG; then
+ newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
+ newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
+ fi
+ if busybox_config_enabled UDHCPC; then
+ local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
+ exeinto "${path%/*}"
+ newexe examples/udhcp/simple.script "${path##*/}"
+ fi
+ if busybox_config_enabled UDHCPD; then
+ insinto /etc
+ doins examples/udhcp/udhcpd.conf
+ fi
+
+ # bundle up the symlink files for use later
+ emake DESTDIR="${ED}" install
+ rm _install/bin/busybox
+ # for compatibility, provide /usr/bin/env
+ mkdir -p _install/usr/bin
+ ln -s /bin/env _install/usr/bin/env
+ tar cf busybox-links.tar -C _install . || : #;die
+ insinto /usr/share/${PN}
+ use make-symlinks && doins busybox-links.tar
+
+ dodoc AUTHORS README TODO
+
+ cd docs
+ docinto txt
+ dodoc *.txt
+ docinto pod
+ dodoc *.pod
+ dohtml *.html
+
+ cd ../examples
+ docinto examples
+ dodoc inittab depmod.pl *.conf *.script undeb unrpm
+}
+
+pkg_preinst() {
+ if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
+ ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
+ ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
+ ewarn "If you are creating a binary only and not merging this is probably ok."
+ ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
+ die "silly options will destroy your system"
+ fi
+
+ if use make-symlinks ; then
+ mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+ fi
+}
+
+pkg_postinst() {
+ savedconfig_pkg_postinst
+
+ if use make-symlinks ; then
+ cd "${T}" || die
+ mkdir _install
+ tar xf busybox-links.tar -C _install || die
+ cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
+ fi
+
+ if use sep-usr ; then
+ elog "In order to use the sep-usr support, you have to update your"
+ elog "kernel command line. Add the option:"
+ elog " init=/ginit"
+ elog "To launch a different init than /sbin/init, use:"
+ elog " init=/ginit /sbin/yourinit"
+ elog "To get a rescue shell, you may boot with:"
+ elog " init=/ginit bb"
+ fi
+}
diff --git a/sys-apps/busybox/files/busybox-1.22.1-lzop.patch b/sys-apps/busybox/files/busybox-1.22.1-lzop.patch
new file mode 100644
index 000000000000..d89cc24a5467
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.22.1-lzop.patch
@@ -0,0 +1,66 @@
+From a9dc7c2f59dc5e92870d2d46316ea5c1f14740e3 Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Mon, 30 Jun 2014 10:14:34 +0200
+Subject: [PATCH] lzop: add overflow check
+
+See CVE-2014-4607
+http://www.openwall.com/lists/oss-security/2014/06/26/20
+
+function old new delta
+lzo1x_decompress_safe 1010 1031 +21
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ archival/libarchive/liblzo.h | 2 ++
+ archival/libarchive/lzo1x_d.c | 3 +++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/archival/libarchive/liblzo.h b/archival/libarchive/liblzo.h
+index 843997c..4596620 100644
+--- a/archival/libarchive/liblzo.h
++++ b/archival/libarchive/liblzo.h
+@@ -76,11 +76,13 @@
+ # define TEST_IP (ip < ip_end)
+ # define NEED_IP(x) \
+ if ((unsigned)(ip_end - ip) < (unsigned)(x)) goto input_overrun
++# define TEST_IV(x) if ((x) > (unsigned)0 - (511)) goto input_overrun
+
+ # undef TEST_OP /* don't need both of the tests here */
+ # define TEST_OP 1
+ # define NEED_OP(x) \
+ if ((unsigned)(op_end - op) < (unsigned)(x)) goto output_overrun
++# define TEST_OV(x) if ((x) > (unsigned)0 - (511)) goto output_overrun
+
+ #define HAVE_ANY_OP 1
+
+diff --git a/archival/libarchive/lzo1x_d.c b/archival/libarchive/lzo1x_d.c
+index 9bc1270..40b167e 100644
+--- a/archival/libarchive/lzo1x_d.c
++++ b/archival/libarchive/lzo1x_d.c
+@@ -92,6 +92,7 @@ int lzo1x_decompress_safe(const uint8_t* in, unsigned in_len,
+ ip++;
+ NEED_IP(1);
+ }
++ TEST_IV(t);
+ t += 15 + *ip++;
+ }
+ /* copy literals */
+@@ -224,6 +225,7 @@ int lzo1x_decompress_safe(const uint8_t* in, unsigned in_len,
+ ip++;
+ NEED_IP(1);
+ }
++ TEST_IV(t);
+ t += 31 + *ip++;
+ }
+ #if defined(COPY_DICT)
+@@ -265,6 +267,7 @@ int lzo1x_decompress_safe(const uint8_t* in, unsigned in_len,
+ ip++;
+ NEED_IP(1);
+ }
++ TEST_IV(t);
+ t += 7 + *ip++;
+ }
+ #if defined(COPY_DICT)
+--
+2.1.2
+
diff --git a/sys-apps/busybox/files/busybox-1.22.1-nc.patch b/sys-apps/busybox/files/busybox-1.22.1-nc.patch
new file mode 100644
index 000000000000..1ddb4834bd7f
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.22.1-nc.patch
@@ -0,0 +1,15 @@
+--- busybox-1.22.1/networking/nc_bloaty.c
++++ busybox-1.22.1-nc/networking/nc_bloaty.c
+@@ -175,9 +175,9 @@ enum {
+ OPT_w = (1 << 5),
+ OPT_l = (1 << 6) * ENABLE_NC_SERVER,
+ OPT_k = (1 << 7) * ENABLE_NC_SERVER,
+- OPT_i = (1 << (7+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+- OPT_o = (1 << (8+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+- OPT_z = (1 << (9+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
++ OPT_i = (1 << (6+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
++ OPT_o = (1 << (7+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
++ OPT_z = (1 << (8+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA,
+ };
+
+ #define o_nflag (option_mask32 & OPT_n)