From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8B9E059CB4 for ; Wed, 20 Apr 2016 03:58:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3EDF221C076; Wed, 20 Apr 2016 03:58:18 +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 3D86221C067 for ; Wed, 20 Apr 2016 03:58:17 +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 B6E6B340B66 for ; Wed, 20 Apr 2016 03:58:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 57E871AE8 for ; Wed, 20 Apr 2016 03:58:13 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1461124650.e325df509bae58f3830003eb3cd0bf75e05cab23.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/files/, sys-apps/busybox/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/busybox/Manifest sys-apps/busybox/busybox-1.21.0.ebuild sys-apps/busybox/busybox-1.23.1-r1.ebuild sys-apps/busybox/busybox-1.23.1.ebuild sys-apps/busybox/busybox-1.23.2.ebuild sys-apps/busybox/files/busybox-1.20.0-udhcpc6-ipv6.patch sys-apps/busybox/files/busybox-1.20.2-glibc-sys-resource.patch sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch sys-apps/busybox/files/busybox-1.21.0-mdev.patch sys-apps/busybox/files/busybox-1.21.0-platform.patch sys-apps/busybox/files/busybox-1.21.0-xz.patch sys-apps/busybox/files/busybox-1.21.1-trylink-only-prefix-libs-with-l.patch sys-apps/busybox/files/busybox-1.22.0-find.patch sys-apps/busybox/files/busybox-1.22.0-grep.patch sys-apps/busybox/files/busybox-1.22.0-lineedit.patch sys-apps/busybox/files/busybox-1.22.0-ntpd.patch sys-apps/busybox/files/busybox-1.22.1-ash.patch sys-apps/busybox/files/busybox-1.22.1-date.patch sys-apps/busybox/files/busybox-1.22.1-iplink.patch sys-apps/busybox/files/busybox-1.22.1-lzop.p atch sys-apps/busybox/files/busybox-1.22.1-nc.patch sys-apps/busybox/files/busybox-1.22.1-zcat-no-ext.patch sys-apps/busybox/files/busybox-1.23.1-modprobe-small.patch sys-apps/busybox/files/busybox-1.23.1-trylink-flags.patch sys-apps/busybox/files/mdev-start.sh sys-apps/busybox/files/mdev.rc sys-apps/busybox/files/mdev.rc.1 X-VCS-Directories: sys-apps/busybox/files/ sys-apps/busybox/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: e325df509bae58f3830003eb3cd0bf75e05cab23 X-VCS-Branch: master Date: Wed, 20 Apr 2016 03:58:13 +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: 14102955-a681-4983-9031-06b9e136cd5f X-Archives-Hash: c05ca889e8f40717c238a88b45f11b31 commit: e325df509bae58f3830003eb3cd0bf75e05cab23 Author: Mike Frysinger gentoo org> AuthorDate: Wed Apr 20 03:41:01 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Apr 20 03:57:30 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e325df50 sys-apps/busybox: drop old <1.24.1 versions sys-apps/busybox/Manifest | 3 - sys-apps/busybox/busybox-1.21.0.ebuild | 299 -------------------- sys-apps/busybox/busybox-1.23.1-r1.ebuild | 303 -------------------- sys-apps/busybox/busybox-1.23.1.ebuild | 302 -------------------- sys-apps/busybox/busybox-1.23.2.ebuild | 305 --------------------- .../files/busybox-1.20.0-udhcpc6-ipv6.patch | 33 --- .../files/busybox-1.20.2-glibc-sys-resource.patch | 109 -------- .../files/busybox-1.20.2-selinux-pkg-config.patch | 67 ----- sys-apps/busybox/files/busybox-1.21.0-mdev.patch | 35 --- .../busybox/files/busybox-1.21.0-platform.patch | 24 -- sys-apps/busybox/files/busybox-1.21.0-xz.patch | 84 ------ ...ox-1.21.1-trylink-only-prefix-libs-with-l.patch | 51 ---- sys-apps/busybox/files/busybox-1.22.0-find.patch | 40 --- sys-apps/busybox/files/busybox-1.22.0-grep.patch | 80 ------ .../busybox/files/busybox-1.22.0-lineedit.patch | 12 - sys-apps/busybox/files/busybox-1.22.0-ntpd.patch | 11 - sys-apps/busybox/files/busybox-1.22.1-ash.patch | 11 - sys-apps/busybox/files/busybox-1.22.1-date.patch | 30 -- sys-apps/busybox/files/busybox-1.22.1-iplink.patch | 19 -- sys-apps/busybox/files/busybox-1.22.1-lzop.patch | 66 ----- sys-apps/busybox/files/busybox-1.22.1-nc.patch | 15 - .../busybox/files/busybox-1.22.1-zcat-no-ext.patch | 64 ----- .../files/busybox-1.23.1-modprobe-small.patch | 166 ----------- .../files/busybox-1.23.1-trylink-flags.patch | 39 --- sys-apps/busybox/files/mdev-start.sh | 125 --------- sys-apps/busybox/files/mdev.rc | 9 - sys-apps/busybox/files/mdev.rc.1 | 98 ------- 27 files changed, 2400 deletions(-) diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index f3487c1..cedf77c 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -1,5 +1,2 @@ -DIST busybox-1.21.0.tar.bz2 2200841 SHA256 eb9d268627783297f5f459cb9bd61a94e395dc7cb3647e10ec186e0159aa36ed SHA512 ddafded24881f03db550d9793585bb5442c70f2a60a5d9770126f50981dadfe95fc0b280f83d5b8a8ce21c86bb7ce64e9f1a606cea140fb2f2599a21de55ba31 WHIRLPOOL d50378bb823dd59e8a607ed6a72d4890f4e5ad3304f1ddba9f7f3d49b5ab820acc9daa2b3c4619f8b147dec085c53c3c6f4b4ebe4c60b431299031d2af00a4d3 -DIST busybox-1.23.1.tar.bz2 2252635 SHA256 300f1db0a7ca4ecee8f8d8027aba250b903372e8339b7d9123d37c1e900473bf SHA512 60849c220dde596c4197f16dd844573b24dd46c8544345a2d5a2b1976fa0ac340d22fbc97f5a1437b7de1c04f4e16aa07b3d62bc77eb83b2467582a50ed4b362 WHIRLPOOL 7cd25e42e74663849b094df699a72deaf02b1088064a511341f76aaa419c936557bbafd54523c6818082dfd4e17605f06ee51abed238ef57a56a9be12c910f99 -DIST busybox-1.23.2.tar.bz2 2252786 SHA256 05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a SHA512 209c8ef26e40ccb81510f6b663202b080f9bbecac7faf386bbabf7e36a43d63b15dd6ce9f7a84c1ccc5345c524999812251da1e113ef9faadc6af1fedd24c7c9 WHIRLPOOL a0396f7f49ae702f1617e72d5d4646aceec4eba67219c7125bd8d0926d1acb1ef41ea15a7406c3cf5e5e0d8925cc75910ed5128e5fbdd257b80e2cb4f7a048a2 DIST busybox-1.24.1.tar.bz2 2068803 SHA256 37d03132cc078937360b392170b7a1d0e5b322eee9f57c0b82292a8b1f0afe3d SHA512 3afc757ebaae61ae13c2c69097ee734717434f9e658eb77093a8b7b49af3326cbca2d723483ff84a1da99544b822fd2b47d9a97c68f09962e11754e5daf124ca WHIRLPOOL 5e827d08d737caac832e7e5923da624094ff27ee2edbb46dadc339e95edba65378a8fa3db412682724476a2092eee41a804f8f36c2eec0b9f883f5ba855f3ad0 DIST busybox-1.24.2.tar.bz2 2066822 SHA256 e71ef53ec656f31c42633918d301405d40dea1d97eca12f272217ae4a971c855 SHA512 4d20fb68ee440be2855231c7fd5f3cb9dd9bfcc1a688f0b59cd3f7a55c8819e9cc44bd15f91500713571f2a84e5e44adc0fa8ae0ae3ebf63961dfc9e1c9ef8e0 WHIRLPOOL 2d89e3fded8d61567873acdb1e1e21888a4447e19c1b893543bbe82de52e8e3cf091adb10f34aa155da573994d89ae42f40ecce65ec0d32a641d103c8d8ce053 diff --git a/sys-apps/busybox/busybox-1.21.0.ebuild b/sys-apps/busybox/busybox-1.21.0.ebuild deleted file mode 100644 index 6bb6f6d..0000000 --- a/sys-apps/busybox/busybox-1.21.0.ebuild +++ /dev/null @@ -1,299 +0,0 @@ -# Copyright 1999-2014 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. - -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 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="0" - -IUSE="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:.*\.*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 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 allyesconfig > /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 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 - 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 selinux SELINUX - - # this opt only controls mounting with /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/busybox-1.23.1-r1.ebuild b/sys-apps/busybox/busybox-1.23.1-r1.ebuild deleted file mode 100644 index 66057b0..0000000 --- a/sys-apps/busybox/busybox-1.23.1-r1.ebuild +++ /dev/null @@ -1,303 +0,0 @@ -# Copyright 1999-2015 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. - -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" - -COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${COMMON_DEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" -RDEPEND="${COMMON_DEPEND} -mdev? ( !.*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 allyesconfig >/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 START_STOP_DAEMON - 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 /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.initd 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/busybox-1.23.1.ebuild b/sys-apps/busybox/busybox-1.23.1.ebuild deleted file mode 100644 index ad62648..0000000 --- a/sys-apps/busybox/busybox-1.23.1.ebuild +++ /dev/null @@ -1,302 +0,0 @@ -# Copyright 1999-2015 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. - -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" - -COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${COMMON_DEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" -RDEPEND="${COMMON_DEPEND} -mdev? ( !.*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 allyesconfig >/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 /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.initd 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/busybox-1.23.2.ebuild b/sys-apps/busybox/busybox-1.23.2.ebuild deleted file mode 100644 index 5492e2b..0000000 --- a/sys-apps/busybox/busybox-1.23.2.ebuild +++ /dev/null @@ -1,305 +0,0 @@ -# Copyright 1999-2015 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. - -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" - -COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${COMMON_DEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" -RDEPEND="${COMMON_DEPEND} -mdev? ( !.*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}"/${PN}-1.23.1-trylink-flags.patch - # No busybox-1.23.2 specific patches ... yet! - #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 allyesconfig >/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 START_STOP_DAEMON - 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 /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.initd 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.20.0-udhcpc6-ipv6.patch b/sys-apps/busybox/files/busybox-1.20.0-udhcpc6-ipv6.patch deleted file mode 100644 index 0148809..0000000 --- a/sys-apps/busybox/files/busybox-1.20.0-udhcpc6-ipv6.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3da46c8163ecf14a02f8317d0b76b225eceaf28c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Wed, 2 May 2012 21:45:35 -0400 -Subject: [PATCH] udhcpc6: depend on ipv6 - -Signed-off-by: Mike Frysinger ---- - networking/udhcp/d6_dhcpc.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/networking/udhcp/d6_dhcpc.c b/networking/udhcp/d6_dhcpc.c -index a792a9d..7c9f52a 100644 ---- a/networking/udhcp/d6_dhcpc.c -+++ b/networking/udhcp/d6_dhcpc.c -@@ -12,10 +12,11 @@ - */ - - //config:config UDHCPC6 --//config: bool "udhcp client for DHCPv6 (udhcpc6)" --//config: default n # not yet ready --//config: help --//config: udhcpc6 is a DHCPv6 client -+//config: bool "udhcp client for DHCPv6 (udhcpc6)" -+//config: default n # not yet ready -+//config: depends on FEATURE_IPV6 -+//config: help -+//config: udhcpc6 is a DHCPv6 client - - //applet:IF_UDHCPC6(APPLET(udhcpc6, BB_DIR_USR_BIN, BB_SUID_DROP)) - --- -1.7.9.7 - diff --git a/sys-apps/busybox/files/busybox-1.20.2-glibc-sys-resource.patch b/sys-apps/busybox/files/busybox-1.20.2-glibc-sys-resource.patch deleted file mode 100644 index f682d00..0000000 --- a/sys-apps/busybox/files/busybox-1.20.2-glibc-sys-resource.patch +++ /dev/null @@ -1,109 +0,0 @@ -https://bugs.gentoo.org/424954 - -From c5fe9f7b723f949457263ef8e22ab807d5b549ce Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Thu, 5 Jul 2012 23:19:09 -0400 -Subject: [PATCH] include sys/resource.h where needed - -We use functions from sys/resource.h in misc applets, but don't include -the header. This breaks building with newer glibc versions, so add the -include where needed. - -Signed-off-by: Mike Frysinger ---- - loginutils/passwd.c | 1 + - miscutils/time.c | 1 + - networking/inetd.c | 1 + - networking/ntpd.c | 1 + - networking/ntpd_simple.c | 1 + - runit/chpst.c | 1 + - shell/shell_common.c | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/loginutils/passwd.c b/loginutils/passwd.c -index b83db00..a7006f0 100644 ---- a/loginutils/passwd.c -+++ b/loginutils/passwd.c -@@ -15,6 +15,7 @@ - - #include "libbb.h" - #include -+#include /* setrlimit */ - - static void nuke_str(char *str) - { -diff --git a/miscutils/time.c b/miscutils/time.c -index 945f15f..ffed386 100644 ---- a/miscutils/time.c -+++ b/miscutils/time.c -@@ -16,6 +16,7 @@ - //usage: "\n -v Verbose" - - #include "libbb.h" -+#include /* getrusage */ - - /* Information on the resources used by a child process. */ - typedef struct { -diff --git a/networking/inetd.c b/networking/inetd.c -index 1308d74..00baf69 100644 ---- a/networking/inetd.c -+++ b/networking/inetd.c -@@ -165,6 +165,7 @@ - //usage: "\n (default: 0 - disabled)" - - #include -+#include /* setrlimit */ - #include - - #include "libbb.h" -diff --git a/networking/ntpd.c b/networking/ntpd.c -index 72e9d0b..5b92db6 100644 ---- a/networking/ntpd.c -+++ b/networking/ntpd.c -@@ -46,6 +46,7 @@ - #include "libbb.h" - #include - #include /* For IPTOS_LOWDELAY definition */ -+#include /* setpriority */ - #include - #ifndef IPTOS_LOWDELAY - # define IPTOS_LOWDELAY 0x10 -diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c -index 4ad44e4..1b7c66b 100644 ---- a/networking/ntpd_simple.c -+++ b/networking/ntpd_simple.c -@@ -7,6 +7,7 @@ - */ - #include "libbb.h" - #include /* For IPTOS_LOWDELAY definition */ -+#include /* setpriority */ - #ifndef IPTOS_LOWDELAY - # define IPTOS_LOWDELAY 0x10 - #endif -diff --git a/runit/chpst.c b/runit/chpst.c -index ac296ba..ed72c8b 100644 ---- a/runit/chpst.c -+++ b/runit/chpst.c -@@ -91,6 +91,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - //usage: "\n a SIGXCPU after N seconds" - - #include "libbb.h" -+#include /* getrlimit */ - - /* - Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit. -diff --git a/shell/shell_common.c b/shell/shell_common.c -index 51c92d6..780e27e 100644 ---- a/shell/shell_common.c -+++ b/shell/shell_common.c -@@ -18,6 +18,7 @@ - */ - #include "libbb.h" - #include "shell_common.h" -+#include /* getrlimit */ - - const char defifsvar[] ALIGN1 = "IFS= \t\n"; - --- -1.7.9.7 - diff --git a/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch b/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch deleted file mode 100644 index 5e9ef26..0000000 --- a/sys-apps/busybox/files/busybox-1.20.2-selinux-pkg-config.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 5694afd72a0a424fcdd2ac85838229a1a86b7e84 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 20 Oct 2012 15:01:26 -0400 -Subject: [PATCH] build system: use pkg-config to look up selinux libs - -Newer versions of libselinux has started linking against more libs. -Rather than continuing hardcoding things, switch to using pkg-config -to query for its dependencies. - -Signed-off-by: Mike Frysinger ---- - Makefile | 1 + - Makefile.flags | 12 +++++++++++- - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index b2e9477..8995ff5 100644 ---- a/Makefile -+++ b/Makefile -@@ -297,6 +297,7 @@ NM = $(CROSS_COMPILE)nm - STRIP = $(CROSS_COMPILE)strip - OBJCOPY = $(CROSS_COMPILE)objcopy - OBJDUMP = $(CROSS_COMPILE)objdump -+PKG_CONFIG ?= $(CROSS_COMPILE)pkg-config - AWK = awk - GENKSYMS = scripts/genksyms/genksyms - DEPMOD = /sbin/depmod -diff --git a/Makefile.flags b/Makefile.flags -index e77c0e5..307afa7 100644 ---- a/Makefile.flags -+++ b/Makefile.flags -@@ -78,6 +78,12 @@ ARCH_FPIC ?= -fpic - ARCH_FPIE ?= -fpie - ARCH_PIE ?= -pie - -+# Usage: $(eval $(call pkg_check_modules,VARIABLE-PREFIX,MODULES)) -+define pkg_check_modules -+$(1)_CFLAGS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags $(2)) -+$(1)_LIBS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs $(2)) -+endef -+ - ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y) - # on i386: 14% smaller libbusybox.so - # (code itself is 9% bigger, we save on relocs/PLT/GOT) -@@ -89,6 +95,7 @@ endif - - ifeq ($(CONFIG_STATIC),y) - CFLAGS_busybox += -static -+PKG_CONFIG_FLAGS += --static - endif - - ifeq ($(CONFIG_PIE),y) -@@ -131,7 +138,10 @@ LDLIBS += pam pam_misc pthread - endif - - ifeq ($(CONFIG_SELINUX),y) --LDLIBS += selinux sepol -+SELINUX_PC_MODULES = libselinux libsepol -+$(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES))) -+CPPFLAGS += $(SELINUX_CFLAGS) -+LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%)) - endif - - ifeq ($(CONFIG_EFENCE),y) --- -1.7.12 - diff --git a/sys-apps/busybox/files/busybox-1.21.0-mdev.patch b/sys-apps/busybox/files/busybox-1.21.0-mdev.patch deleted file mode 100644 index cb873fa..0000000 --- a/sys-apps/busybox/files/busybox-1.21.0-mdev.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- busybox-1.21.0/util-linux/mdev.c -+++ busybox-1.21.0-mdev/util-linux/mdev.c -@@ -661,6 +661,8 @@ static void make_device(char *device_nam - if (mknod(node_name, rule->mode | type, makedev(major, minor)) && errno != EEXIST) - bb_perror_msg("can't create '%s'", node_name); - if (ENABLE_FEATURE_MDEV_CONF) { -+ if (G.verbose) -+ bb_error_msg("chmod: %o chown: %u:%u", rule->mode, rule->ugid.uid, rule->ugid.gid); - chmod(node_name, rule->mode); - chown(node_name, rule->ugid.uid, rule->ugid.gid); - } -@@ -813,6 +815,7 @@ static void load_firmware(const char *fi - full_write(loading_fd, "-1", 2); - - out: -+ xchdir("/dev"); - if (ENABLE_FEATURE_CLEAN_UP) { - close(firmware_fd); - close(loading_fd); -@@ -919,11 +922,13 @@ int mdev_main(int argc UNUSED_PARAM, cha - } - - { -- int logfd = open("/dev/mdev.log", O_WRONLY | O_APPEND); -+ int logfd = open("mdev.log", O_WRONLY | O_APPEND); - if (logfd >= 0) { - xmove_fd(logfd, STDERR_FILENO); - G.verbose = 1; -- bb_error_msg("seq: %s action: %s", seq, action); -+ if (seq) -+ applet_name = xasprintf("%s[%s]", applet_name, seq); -+ bb_error_msg("action: %s", action); - } - } - diff --git a/sys-apps/busybox/files/busybox-1.21.0-platform.patch b/sys-apps/busybox/files/busybox-1.21.0-platform.patch deleted file mode 100644 index 9be6cb8..0000000 --- a/sys-apps/busybox/files/busybox-1.21.0-platform.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- busybox-1.21.0/archival/libarchive/decompress_unxz.c -+++ busybox-1.21.0-platform/archival/libarchive/decompress_unxz.c -@@ -30,8 +30,8 @@ static uint32_t xz_crc32(const uint8_t * - /* We use arch-optimized unaligned accessors */ - #define get_unaligned_le32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_LE32(v); }) - #define get_unaligned_be32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_BE32(v); }) --#define put_unaligned_le32(val, buf) move_to_unaligned16(buf, SWAP_LE32(val)) --#define put_unaligned_be32(val, buf) move_to_unaligned16(buf, SWAP_BE32(val)) -+#define put_unaligned_le32(val, buf) move_to_unaligned32(buf, SWAP_LE32(val)) -+#define put_unaligned_be32(val, buf) move_to_unaligned32(buf, SWAP_BE32(val)) - - #include "unxz/xz_dec_bcj.c" - #include "unxz/xz_dec_lzma2.c" ---- busybox-1.21.0/include/platform.h -+++ busybox-1.21.0-platform/include/platform.h -@@ -228,7 +228,7 @@ typedef uint32_t bb__aliased_uint32_t FI - # define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4)) - # define move_to_unaligned16(u16p, v) do { \ - uint16_t __t = (v); \ -- memcpy((u16p), &__t, 4); \ -+ memcpy((u16p), &__t, 2); \ - } while (0) - # define move_to_unaligned32(u32p, v) do { \ - uint32_t __t = (v); \ diff --git a/sys-apps/busybox/files/busybox-1.21.0-xz.patch b/sys-apps/busybox/files/busybox-1.21.0-xz.patch deleted file mode 100644 index 56ba1a2..0000000 --- a/sys-apps/busybox/files/busybox-1.21.0-xz.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- busybox-1.21.0/archival/libarchive/decompress_unxz.c -+++ busybox-1.21.0-xz/archival/libarchive/decompress_unxz.c -@@ -40,6 +40,7 @@ static uint32_t xz_crc32(const uint8_t * - IF_DESKTOP(long long) int FAST_FUNC - unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd) - { -+ enum xz_ret xz_result; - struct xz_buf iobuf; - struct xz_dec *state; - unsigned char *membuf; -@@ -63,9 +64,8 @@ unpack_xz_stream(transformer_aux_data_t - /* Limit memory usage to about 64 MiB. */ - state = xz_dec_init(XZ_DYNALLOC, 64*1024*1024); - -+ xz_result = X_OK; - while (1) { -- enum xz_ret r; -- - if (iobuf.in_pos == iobuf.in_size) { - int rd = safe_read(src_fd, membuf, BUFSIZ); - if (rd < 0) { -@@ -73,28 +73,57 @@ unpack_xz_stream(transformer_aux_data_t - total = -1; - break; - } -+ if (rd == 0 && xz_result == XZ_STREAM_END) -+ break; - iobuf.in_size = rd; - iobuf.in_pos = 0; - } -+ if (xz_result == XZ_STREAM_END) { -+ /* -+ * Try to start decoding next concatenated stream. -+ * Stream padding must always be a multiple of four -+ * bytes to preserve four-byte alignment. To keep the -+ * code slightly smaller, we aren't as strict here as -+ * the .xz spec requires. We just skip all zero-bytes -+ * without checking the alignment and thus can accept -+ * files that aren't valid, e.g. the XZ utils test -+ * files bad-0pad-empty.xz and bad-0catpad-empty.xz. -+ */ -+ do { -+ if (membuf[iobuf.in_pos] != 0) { -+ xz_dec_reset(state); -+ goto do_run; -+ } -+ iobuf.in_pos++; -+ } while (iobuf.in_pos < iobuf.in_size); -+ } -+ do_run: - // bb_error_msg(">in pos:%d size:%d out pos:%d size:%d", - // iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size); -- r = xz_dec_run(state, &iobuf); -+ xz_result = xz_dec_run(state, &iobuf); - // bb_error_msg(" -Date: Thu, 12 Sep 2013 00:29:40 -0400 -Subject: [PATCH] trylink: only prefix libs with -l - -If our pkg-config queries pass back a flag like -pthread, the trylink -script will expand that to -l-pthread. So change trylink to only add -the -l prefix to a value that doesn't have a - prefix already. - -Reported-by: thaehaid@incognitomail.org -Signed-off-by: Mike Frysinger ---- - scripts/trylink | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/scripts/trylink b/scripts/trylink -index a8b0b2e..e471699 100755 ---- a/scripts/trylink -+++ b/scripts/trylink -@@ -117,7 +117,7 @@ LDLIBS=`echo "$LDLIBS" | xargs -n1 | sort | uniq | xargs` - # First link with all libs. If it fails, bail out - echo "Trying libraries: $LDLIBS" - # "lib1 lib2 lib3" -> "-llib1 -llib2 -llib3" --l_list=`echo "$LDLIBS" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'` -+l_list=`echo " $LDLIBS " | sed -e 's: \([^- ][^ ]*\): -l\1:g'` - test "x$l_list" != "x" && l_list="$START_GROUP $l_list $END_GROUP" - try $CC $CFLAGS $LDFLAGS \ - -o $EXE \ -@@ -141,7 +141,7 @@ while test "$LDLIBS"; do - for one in $LDLIBS; do - without_one=`echo " $LDLIBS " | sed "s/ $one / /g" | xargs` - # "lib1 lib2 lib3" -> "-llib1 -llib2 -llib3" -- l_list=`echo "$without_one" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'` -+ l_list=`echo " $without_one " | sed -e 's: \([^- ][^ ]*\): -l\1:g'` - test x"$l_list" != x"" && l_list="$START_GROUP $l_list $END_GROUP" - $debug && echo "Trying -l options: '$l_list'" - try $CC $CFLAGS $LDFLAGS \ -@@ -172,7 +172,7 @@ done - - # Make the binary with final, minimal list of libs - echo "Final link with: ${LDLIBS:-}" --l_list=`echo "$LDLIBS" | sed -e 's/ / -l/g' -e 's/^/-l/' -e 's/^-l$//'` -+l_list=`echo " $LDLIBS " | sed -e 's: \([^- ][^ ]*\): -l\1:g'` - test "x$l_list" != "x" && l_list="$START_GROUP $l_list $END_GROUP" - # --verbose gives us gobs of info to stdout (e.g. linker script used) - if ! test -f busybox_ldscript; then --- -1.8.3.2 - diff --git a/sys-apps/busybox/files/busybox-1.22.0-find.patch b/sys-apps/busybox/files/busybox-1.22.0-find.patch deleted file mode 100644 index 75a06a8..0000000 --- a/sys-apps/busybox/files/busybox-1.22.0-find.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- busybox-1.22.0/findutils/find.c -+++ busybox-1.22.0-find/findutils/find.c -@@ -1291,9 +1291,27 @@ int find_main(int argc, char **argv) MAI - int find_main(int argc UNUSED_PARAM, char **argv) - { - int i, firstopt, status = EXIT_SUCCESS; -+ char **past_HLP, *saved; - - INIT_G(); - -+ /* "find -type f" + getopt("+HLP") => disaster. -+ * Need to avoid getopt running into a non-HLP option. -+ * Do this by temporarily storing NULL there: -+ */ -+ past_HLP = argv; -+ for (;;) { -+ saved = *++past_HLP; -+ if (!saved) -+ break; -+ if (saved[0] != '-') -+ break; -+ if (!saved[1]) -+ break; /* it is "-" */ -+ if ((saved+1)[strspn(saved+1, "HLP")] != '\0') -+ break; -+ } -+ *past_HLP = NULL; - /* "+": stop on first non-option */ - i = getopt32(argv, "+HLP"); - if (i & (1<<0)) -@@ -1301,7 +1319,8 @@ int find_main(int argc UNUSED_PARAM, cha - if (i & (1<<1)) - G.recurse_flags |= ACTION_FOLLOWLINKS | ACTION_DANGLING_OK; - /* -P is default and is ignored */ -- argv += optind; -+ argv = past_HLP; /* same result as "argv += optind;" */ -+ *past_HLP = saved; - - for (firstopt = 0; argv[firstopt]; firstopt++) { - if (argv[firstopt][0] == '-') diff --git a/sys-apps/busybox/files/busybox-1.22.0-grep.patch b/sys-apps/busybox/files/busybox-1.22.0-grep.patch deleted file mode 100644 index 053245d..0000000 --- a/sys-apps/busybox/files/busybox-1.22.0-grep.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- busybox-1.22.0/findutils/grep.c -+++ busybox-1.22.0-grep/findutils/grep.c -@@ -373,6 +373,9 @@ static int grep_file(FILE *file) - opt_f_not_found: ; - } - } else { -+#if ENABLE_EXTRA_COMPAT -+ unsigned start_pos; -+#endif - char *match_at; - - if (!(gl->flg_mem_alocated_compiled & COMPILED)) { -@@ -389,15 +392,18 @@ static int grep_file(FILE *file) - #if !ENABLE_EXTRA_COMPAT - gl->matched_range.rm_so = 0; - gl->matched_range.rm_eo = 0; -+#else -+ start_pos = 0; - #endif - match_at = line; - opt_w_again: -+//bb_error_msg("'%s' start_pos:%d line_len:%d", match_at, start_pos, line_len); - if ( - #if !ENABLE_EXTRA_COMPAT - regexec(&gl->compiled_regex, match_at, 1, &gl->matched_range, 0) == 0 - #else - re_search(&gl->compiled_regex, match_at, line_len, -- /*start:*/ 0, /*range:*/ line_len, -+ start_pos, /*range:*/ line_len, - &gl->matched_range) >= 0 - #endif - ) { -@@ -416,8 +422,24 @@ static int grep_file(FILE *file) - if (!c || (!isalnum(c) && c != '_')) { - found = 1; - } else { -- match_at += gl->matched_range.rm_eo; -- goto opt_w_again; -+ /* -+ * Why check gl->matched_range.rm_eo? -+ * Zero-length match makes -w skip the line: -+ * "echo foo | grep ^" prints "foo", -+ * "echo foo | grep -w ^" prints nothing. -+ * Without such check, we can loop forever. -+ */ -+#if !ENABLE_EXTRA_COMPAT -+ if (gl->matched_range.rm_eo != 0) { -+ match_at += gl->matched_range.rm_eo; -+ goto opt_w_again; -+ } -+#else -+ if (gl->matched_range.rm_eo > start_pos) { -+ start_pos = gl->matched_range.rm_eo; -+ goto opt_w_again; -+ } -+#endif - } - } - } ---- busybox-1.22.0/testsuite/grep.tests -+++ busybox-1.22.0-grep/testsuite/grep.tests -@@ -147,6 +147,18 @@ testing "grep -w doesn't stop on 1st mis - "foop foo\n" \ - "" - -+testing "grep -w ^str doesn't match str not at the beginning" \ -+ "grep -w ^str input" \ -+ "" \ -+ "strstr\n" \ -+ "" -+ -+testing "grep -w ^ doesn't hang" \ -+ "grep -w ^ input" \ -+ "" \ -+ "anything\n" \ -+ "" -+ - # testing "test name" "commands" "expected result" "file input" "stdin" - # file input will be file called "input" - # test can create a file "actual" instead of writing to stdout diff --git a/sys-apps/busybox/files/busybox-1.22.0-lineedit.patch b/sys-apps/busybox/files/busybox-1.22.0-lineedit.patch deleted file mode 100644 index e414314..0000000 --- a/sys-apps/busybox/files/busybox-1.22.0-lineedit.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- busybox-1.22.0/libbb/lineedit.c -+++ busybox-1.22.0-lineedit/libbb/lineedit.c -@@ -1255,7 +1255,9 @@ line_input_t* FAST_FUNC new_line_input_t - { - line_input_t *n = xzalloc(sizeof(*n)); - n->flags = flags; -+#if MAX_HISTORY > 0 - n->max_history = MAX_HISTORY; -+#endif - return n; - } - diff --git a/sys-apps/busybox/files/busybox-1.22.0-ntpd.patch b/sys-apps/busybox/files/busybox-1.22.0-ntpd.patch deleted file mode 100644 index 1334f57..0000000 --- a/sys-apps/busybox/files/busybox-1.22.0-ntpd.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- busybox-1.22.0/networking/ntpd.c -+++ busybox-1.22.0-ntpd/networking/ntpd.c -@@ -1445,6 +1445,8 @@ update_local_clock(peer_t *p) - - run_script("step", offset); - -+ recv_time += offset; -+ - #if USING_INITIAL_FREQ_ESTIMATION - if (G.discipline_state == STATE_NSET) { - set_new_values(STATE_FREQ, /*offset:*/ 0, recv_time); diff --git a/sys-apps/busybox/files/busybox-1.22.1-ash.patch b/sys-apps/busybox/files/busybox-1.22.1-ash.patch deleted file mode 100644 index 301e942..0000000 --- a/sys-apps/busybox/files/busybox-1.22.1-ash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- busybox-1.22.1/shell/ash.c -+++ busybox-1.22.1-ash/shell/ash.c -@@ -13014,7 +13014,7 @@ init(void) - setvar2("PPID", utoa(getppid())); - #if ENABLE_ASH_BASH_COMPAT - p = lookupvar("SHLVL"); -- setvar2("SHLVL", utoa(p ? atoi(p) + 1 : 1)); -+ setvar("SHLVL", utoa((p ? atoi(p) : 0) + 1), VEXPORT); - #endif - p = lookupvar("PWD"); - if (p) { diff --git a/sys-apps/busybox/files/busybox-1.22.1-date.patch b/sys-apps/busybox/files/busybox-1.22.1-date.patch deleted file mode 100644 index 6380d87..0000000 --- a/sys-apps/busybox/files/busybox-1.22.1-date.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- busybox-1.22.1/libbb/time.c -+++ busybox-1.22.1-date/libbb/time.c -@@ -68,15 +68,23 @@ void FAST_FUNC parse_datestr(const char - /* else end != NUL and we error out */ - } - } else -- /* yyyy-mm-dd HH */ -- if (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year, -+ if (strchr(date_str, '-') -+ /* Why strchr('-') check? -+ * sscanf below will trash ptm->tm_year, this breaks -+ * if parse_str is "10101010" (iow, "MMddhhmm" form) -+ * because we destroy year. Do these sscanf -+ * only if we saw a dash in parse_str. -+ */ -+ /* yyyy-mm-dd HH */ -+ && (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year, - &ptm->tm_mon, &ptm->tm_mday, - &ptm->tm_hour, - &end) >= 4 -- /* yyyy-mm-dd */ -- || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year, -+ /* yyyy-mm-dd */ -+ || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year, - &ptm->tm_mon, &ptm->tm_mday, - &end) >= 3 -+ ) - ) { - ptm->tm_year -= 1900; /* Adjust years */ - ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */ diff --git a/sys-apps/busybox/files/busybox-1.22.1-iplink.patch b/sys-apps/busybox/files/busybox-1.22.1-iplink.patch deleted file mode 100644 index dbd76c5..0000000 --- a/sys-apps/busybox/files/busybox-1.22.1-iplink.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- busybox-1.22.1/networking/libiproute/iplink.c -+++ busybox-1.22.1-iplink/networking/libiproute/iplink.c -@@ -31,6 +31,16 @@ - #ifndef IFLA_LINKINFO - # define IFLA_LINKINFO 18 - # define IFLA_INFO_KIND 1 -+# define IFLA_INFO_DATA 2 -+#endif -+ -+#ifndef IFLA_VLAN_MAX -+# define IFLA_VLAN_ID 1 -+# define IFLA_VLAN_FLAGS 2 -+struct ifla_vlan_flags { -+ uint32_t flags; -+ uint32_t mask; -+}; - #endif - - /* taken from linux/sockios.h */ diff --git a/sys-apps/busybox/files/busybox-1.22.1-lzop.patch b/sys-apps/busybox/files/busybox-1.22.1-lzop.patch deleted file mode 100644 index d89cc24..0000000 --- a/sys-apps/busybox/files/busybox-1.22.1-lzop.patch +++ /dev/null @@ -1,66 +0,0 @@ -From a9dc7c2f59dc5e92870d2d46316ea5c1f14740e3 Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko -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 ---- - 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 deleted file mode 100644 index 1ddb483..0000000 --- a/sys-apps/busybox/files/busybox-1.22.1-nc.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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) diff --git a/sys-apps/busybox/files/busybox-1.22.1-zcat-no-ext.patch b/sys-apps/busybox/files/busybox-1.22.1-zcat-no-ext.patch deleted file mode 100644 index f468228..0000000 --- a/sys-apps/busybox/files/busybox-1.22.1-zcat-no-ext.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 28dd64a0e1a9cffcde7799f2849b66c0e16bb9cc Mon Sep 17 00:00:00 2001 -From: Denys Vlasenko -Date: Fri, 10 Jan 2014 14:06:57 +0100 -Subject: [PATCH] libarchive: open_zipped() does not need to check extensions - for e.g. gzip - -We only need to check for signature-less extensions, -currently only .lzma. The rest can be happily autodetected. - -This fixes "zcat FILE_WITHOUT_GZ_EXT" case, among others. - -Signed-off-by: Denys Vlasenko -(cherry picked from commit 7c47b560a8fc97956dd8132bd7f1863d83c19866) -Signed-off-by: Mike Frysinger ---- - archival/libarchive/open_transformer.c | 23 +++++++++++------------ - 1 file changed, 11 insertions(+), 12 deletions(-) - -diff --git a/archival/libarchive/open_transformer.c b/archival/libarchive/open_transformer.c -index 4e98264..1aeba13 100644 ---- a/archival/libarchive/open_transformer.c -+++ b/archival/libarchive/open_transformer.c -@@ -182,27 +182,26 @@ int FAST_FUNC setup_unzip_on_fd(int fd, int fail_if_not_detected) - - int FAST_FUNC open_zipped(const char *fname) - { -- char *sfx; - int fd; - - fd = open(fname, O_RDONLY); - if (fd < 0) - return fd; - -- sfx = strrchr(fname, '.'); -- if (sfx) { -- sfx++; -- if (ENABLE_FEATURE_SEAMLESS_LZMA && strcmp(sfx, "lzma") == 0) -- /* .lzma has no header/signature, just trust it */ -+ if (ENABLE_FEATURE_SEAMLESS_LZMA) { -+ /* .lzma has no header/signature, can only detect it by extension */ -+ char *sfx = strrchr(fname, '.'); -+ if (sfx && strcmp(sfx+1, "lzma") == 0) { - open_transformer_with_sig(fd, unpack_lzma_stream, "unlzma"); -- else -- if ((ENABLE_FEATURE_SEAMLESS_GZ && strcmp(sfx, "gz") == 0) -- || (ENABLE_FEATURE_SEAMLESS_BZ2 && strcmp(sfx, "bz2") == 0) -- || (ENABLE_FEATURE_SEAMLESS_XZ && strcmp(sfx, "xz") == 0) -- ) { -- setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1); -+ return fd; - } - } -+ if ((ENABLE_FEATURE_SEAMLESS_GZ) -+ || (ENABLE_FEATURE_SEAMLESS_BZ2) -+ || (ENABLE_FEATURE_SEAMLESS_XZ) -+ ) { -+ setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1); -+ } - - return fd; - } --- -2.1.2 - diff --git a/sys-apps/busybox/files/busybox-1.23.1-modprobe-small.patch b/sys-apps/busybox/files/busybox-1.23.1-modprobe-small.patch deleted file mode 100644 index 50fc877..0000000 --- a/sys-apps/busybox/files/busybox-1.23.1-modprobe-small.patch +++ /dev/null @@ -1,166 +0,0 @@ ---- busybox-1.23.1/modutils/modprobe-small.c -+++ busybox-1.23.1-modprobe-small/modutils/modprobe-small.c -@@ -552,9 +552,23 @@ static int already_loaded(const char *na - return ret; - } - #else --#define already_loaded(name) is_rmmod -+#define already_loaded(name) 0 - #endif - -+static int rmmod(const char *filename) -+{ -+ int r; -+ char modname[MODULE_NAME_LEN]; -+ -+ filename2modname(filename, modname); -+ r = delete_module(modname, O_NONBLOCK | O_EXCL); -+ dbg1_error_msg("delete_module('%s', O_NONBLOCK | O_EXCL):%d", modname, r); -+ if (r != 0 && !(option_mask32 & OPT_q)) { -+ bb_perror_msg("remove '%s'", modname); -+ } -+ return r; -+} -+ - /* - * Given modules definition and module name (or alias, or symbol) - * load/remove the module respecting dependencies. -@@ -571,26 +585,36 @@ static void process_module(char *name, c - module_info **infovec; - module_info *info; - int infoidx; -- int is_rmmod = (option_mask32 & OPT_r) != 0; -+ int is_remove = (option_mask32 & OPT_r) != 0; - - dbg1_error_msg("process_module('%s','%s')", name, cmdline_options); - - replace(name, '-', '_'); - -- dbg1_error_msg("already_loaded:%d is_rmmod:%d", already_loaded(name), is_rmmod); -+ dbg1_error_msg("already_loaded:%d is_remove:%d", already_loaded(name), is_remove); -+ -+ if (applet_name[0] == 'r') { -+ /* rmmod. -+ * Does not remove dependencies, no need to scan, just remove. -+ * (compat note: this allows and strips .ko suffix) -+ */ -+ rmmod(name); -+ return; -+ } -+ - /* -- * We used to have "is_rmmod != already_loaded(name)" check here, but -+ * We used to have "is_remove != already_loaded(name)" check here, but - * modprobe -r pci:v00008086d00007010sv00000000sd00000000bc01sc01i80 - * won't unload modules (there are more than one) - * which have this alias. - */ -- if (!is_rmmod && already_loaded(name)) { -+ if (!is_remove && already_loaded(name)) { - dbg1_error_msg("nothing to do for '%s'", name); - return; - } - - options = NULL; -- if (!is_rmmod) { -+ if (!is_remove) { - char *opt_filename = xasprintf("/etc/modules/%s", name); - options = xmalloc_open_read_close(opt_filename, NULL); - if (options) -@@ -624,7 +648,7 @@ static void process_module(char *name, c - 0 /* depth */ - ); - dbg1_error_msg("dirscan complete"); -- /* Module was not found, or load failed, or is_rmmod */ -+ /* Module was not found, or load failed, or is_remove */ - if (module_found_idx >= 0) { /* module was found */ - infovec = xzalloc(2 * sizeof(infovec[0])); - infovec[0] = &modinfo[module_found_idx]; -@@ -637,7 +661,7 @@ static void process_module(char *name, c - - if (!infovec) { - /* both dirscan and find_alias found nothing */ -- if (!is_rmmod && applet_name[0] != 'd') /* it wasn't rmmod or depmod */ -+ if (!is_remove && applet_name[0] != 'd') /* it wasn't rmmod or depmod */ - bb_error_msg("module '%s' not found", name); - //TODO: _and_die()? or should we continue (un)loading modules listed on cmdline? - goto ret; -@@ -651,29 +675,15 @@ static void process_module(char *name, c - * a *list* of modinfo pointers from find_alias(). - */ - -- /* rmmod or modprobe -r? unload module(s) */ -- if (is_rmmod) { -+ /* modprobe -r? unload module(s) */ -+ if (is_remove) { - infoidx = 0; - while ((info = infovec[infoidx++]) != NULL) { -- int r; -- char modname[MODULE_NAME_LEN]; -- -- filename2modname( -- bb_get_last_path_component_nostrip(info->pathname), modname); -- r = delete_module(modname, O_NONBLOCK | O_EXCL); -- dbg1_error_msg("delete_module('%s', O_NONBLOCK | O_EXCL):%d", modname, r); -+ int r = rmmod(bb_get_last_path_component_nostrip(info->pathname)); - if (r != 0) { -- if (!(option_mask32 & OPT_q)) -- bb_perror_msg("remove '%s'", modname); -- goto ret; -+ goto ret; /* error */ - } - } -- -- if (applet_name[0] == 'r') { -- /* rmmod: do not remove dependencies, exit */ -- goto ret; -- } -- - /* modprobe -r: we do not stop here - - * continue to unload modules on which the module depends: - * "-r --remove: option causes modprobe to remove a module. -@@ -694,7 +704,7 @@ static void process_module(char *name, c - } - free(deps); - -- if (is_rmmod) -+ if (is_remove) - continue; - - /* We are modprobe: load it */ -@@ -897,10 +907,10 @@ int modprobe_main(int argc UNUSED_PARAM, - } - - #if ENABLE_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE -- /* If not rmmod, parse possible module options given on command line. -+ /* If not rmmod/-r, parse possible module options given on command line. - * insmod/modprobe takes one module name, the rest are parameters. */ - options = NULL; -- if ('r' != applet0) { -+ if (!(option_mask32 & OPT_r)) { - char **arg = argv; - while (*++arg) { - /* Enclose options in quotes */ -@@ -911,7 +921,7 @@ int modprobe_main(int argc UNUSED_PARAM, - } - } - #else -- if ('r' != applet0) -+ if (!(option_mask32 & OPT_r)) - argv[1] = NULL; - #endif - -@@ -935,10 +945,11 @@ int modprobe_main(int argc UNUSED_PARAM, - } - - /* Try to load modprobe.dep.bb */ -- load_dep_bb(); -+ if ('r' != applet0) /* not rmmod */ -+ load_dep_bb(); - - /* Load/remove modules. -- * Only rmmod loops here, modprobe has only argv[0] */ -+ * Only rmmod/modprobe -r loops here, insmod/modprobe has only argv[0] */ - do { - process_module(*argv, options); - } while (*++argv); diff --git a/sys-apps/busybox/files/busybox-1.23.1-trylink-flags.patch b/sys-apps/busybox/files/busybox-1.23.1-trylink-flags.patch deleted file mode 100644 index 13725cb..0000000 --- a/sys-apps/busybox/files/busybox-1.23.1-trylink-flags.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6798564b9e2f1a81b8c2d0cb4add97cb736d982b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Mon, 16 Mar 2015 17:47:01 -0400 -Subject: [PATCH] trylink: respect compiler settings when probing features - -The CPPFLAGS/CFLAGS settings might have features that matter, so make -sure we utilize them when testing the compiler. - -URL: https://bugs.gentoo.org/471118 -Signed-off-by: Mike Frysinger ---- - scripts/trylink | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scripts/trylink b/scripts/trylink -index 5a67fcf..48c487b 100755 ---- a/scripts/trylink -+++ b/scripts/trylink -@@ -49,7 +49,7 @@ check_cc() { - local tempname="$(mktemp)" - # Can use "-o /dev/null", but older gcc tend to *unlink it* on failure! :( - # "-xc": C language. "/dev/null" is an empty source file. -- if $CC $1 -shared -xc /dev/null -o "$tempname".o >/dev/null 2>&1; then -+ if $CC $CPPFLAGS $CFLAGS $1 -shared -xc /dev/null -o "$tempname".o >/dev/null 2>&1; then - echo "$1"; - else - echo "$2"; -@@ -66,7 +66,7 @@ check_libc_is_glibc() { - syntax error here - #endif - " >"$tempname".c -- if $CC "$tempname".c -c -o "$tempname".o >/dev/null 2>&1; then -+ if $CC $CPPFLAGS $CFLAGS "$tempname".c -c -o "$tempname".o >/dev/null 2>&1; then - echo "$2"; - else - echo "$1"; --- -2.3.2 - diff --git a/sys-apps/busybox/files/mdev-start.sh b/sys-apps/busybox/files/mdev-start.sh deleted file mode 100644 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.rc b/sys-apps/busybox/files/mdev.rc deleted file mode 100644 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 100644 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 -}