summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-07-02 07:15:07 +0000
committerMike Frysinger <vapier@gentoo.org>2006-07-02 07:15:07 +0000
commit43977a6a18bdd9a8dd4aa45cf1b22acdac89e38d (patch)
tree8c35d9864a461d512ce66bc014f5e8d7864a834c /sys-apps/busybox
parentUpdated sun-jdk-1.3 to generation-2 (diff)
downloadgentoo-2-43977a6a18bdd9a8dd4aa45cf1b22acdac89e38d.tar.gz
gentoo-2-43977a6a18bdd9a8dd4aa45cf1b22acdac89e38d.tar.bz2
gentoo-2-43977a6a18bdd9a8dd4aa45cf1b22acdac89e38d.zip
old
Diffstat (limited to 'sys-apps/busybox')
-rw-r--r--sys-apps/busybox/busybox-1.00-r4.ebuild249
-rw-r--r--sys-apps/busybox/busybox-1.01.ebuild243
-rw-r--r--sys-apps/busybox/busybox-1.1.1.ebuild233
-rw-r--r--sys-apps/busybox/busybox-1.1.2.ebuild232
-rw-r--r--sys-apps/busybox/files/1.00/bash-tests.patch45
-rw-r--r--sys-apps/busybox/files/1.00/bb.patch6
-rw-r--r--sys-apps/busybox/files/1.00/busybox-read-timeout.patch92
-rw-r--r--sys-apps/busybox/files/1.00/cp-posix-opts.patch45
-rw-r--r--sys-apps/busybox/files/1.00/fix-amd64-insmod.patch15
-rw-r--r--sys-apps/busybox/files/1.00/gcc4.patch25
-rw-r--r--sys-apps/busybox/files/1.00/more-insmod-arches.patch43
-rw-r--r--sys-apps/busybox/files/1.00/nice.patch152
-rw-r--r--sys-apps/busybox/files/1.00/printenv.patch113
-rw-r--r--sys-apps/busybox/files/1.00/readlink-follow.patch97
-rw-r--r--sys-apps/busybox/files/1.00/standalone.patch37
-rw-r--r--sys-apps/busybox/files/1.00/sum.patch245
-rw-r--r--sys-apps/busybox/files/digest-busybox-1.00-r46
-rw-r--r--sys-apps/busybox/files/digest-busybox-1.016
-rw-r--r--sys-apps/busybox/files/digest-busybox-1.1.13
-rw-r--r--sys-apps/busybox/files/digest-busybox-1.1.23
20 files changed, 0 insertions, 1890 deletions
diff --git a/sys-apps/busybox/busybox-1.00-r4.ebuild b/sys-apps/busybox/busybox-1.00-r4.ebuild
deleted file mode 100644
index ed492b9121d0..000000000000
--- a/sys-apps/busybox/busybox-1.00-r4.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.00-r4.ebuild,v 1.19 2006/03/19 08:16:47 vapier Exp $
-
-inherit eutils
-
-#SNAPSHOT=20040726
-SNAPSHOT=""
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ -n ${SNAPSHOT} ]] ; then
- MY_P=${PN}
- SRC_URI="http://www.busybox.net/downloads/snapshots/${PN}-${SNAPSHOT}.tar.bz2"
-else
- MY_P=${PN}-${PV/_/-}
- SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
-fi
-SRC_URI="${SRC_URI} mirror://gentoo/${P}-e2fsprogs.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="debug static savedconfig netboot floppyboot make-symlinks"
-RESTRICT="test"
-
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-# <pebenito> then eventually turning on selinux would mean
-# adding a dep: selinux? ( sys-libs/libselinux )
-
-busybox_set_env() {
- type -p ${CHOST}-ar && export CROSS=${CHOST}-
- # Don't let KBUILD_OUTPUT mess us up #88088
- unset KBUILD_OUTPUT
-}
-
-busybox_config_option() {
- case $1 in
- y) sed -i -e "s:.*CONFIG_$2.*set:CONFIG_$2=y:g" .config;;
- n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;;
- Y) echo "CONFIG_$2=y" >> .config;;
- N) echo "CONFIG_$2=n" >> .config;;
- *) use $1 \
- && busybox_config_option y $2 \
- || busybox_config_option n $2
- return 0
- ;;
- esac
- einfo $(grep "CONFIG_$2[= ]" .config)
-}
-
-src_unpack() {
- busybox_set_env
- unpack ${A}
- cd "${S}"
-
- # patches for 1.00 go here.
- epatch "${FILESDIR}"/1.00/busybox-read-timeout.patch
- epatch "${FILESDIR}"/1.00/readlink-follow.patch
- epatch "${FILESDIR}"/1.00/more-insmod-arches.patch
- epatch "${FILESDIR}"/1.00/fix-amd64-insmod.patch
- epatch "${FILESDIR}"/1.00/bash-tests.patch
- epatch "${FILESDIR}"/1.00/cp-posix-opts.patch
- epatch "${FILESDIR}"/1.00/standalone.patch
- epatch "${FILESDIR}"/1.00/nice.patch
- epatch "${FILESDIR}"/1.00/printenv.patch
- epatch "${FILESDIR}"/1.00/sum.patch
- epatch "${FILESDIR}"/1.00/bb.patch
- epatch "${WORKDIR}"/${P}-e2fsprogs.patch
- epatch "${FILESDIR}"/1.00/gcc4.patch
-
- #bunzip
- #ftp://ftp.simtreas.ru/pub/my/bb/new/find.c.gz
-
- # check for a busybox config before making one of our own.
- # if one exist lets return and use it.
- # fine grained config control for user defined busybox configs.
- # [package]-[version]-[revision].config
- # [package]-[version].config
- # [package].config
-
- if use savedconfig ; then
- [[ -r .config ]] && rm .config
- for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do
- configfile=${ROOT}/etc/${PN}/${CHOST}/${conf}.config
- [[ -r ${configfile} ]] || configfile=/etc/${PN}/${CHOST}/${conf}.config
- if [[ -r ${configfile} ]] ; then
- cp ${configfile} ${S}/.config
- break
- fi
- done
- if [[ -r ${S}/.config ]] ; then
- einfo "Found your ${configfile} and using it."
- return 0
- fi
- fi
- if use netboot ; then
- cp "${FILESDIR}"/config-netboot .config
- sed -i \
- -e '/DEFAULT_SCRIPT/s:/share/udhcpc/default.script:/lib/udhcpc.script:' \
- networking/udhcp/libbb_udhcp.h \
- || die "fixing netboot/udhcpc"
- elif use floppyboot ; then
- cp "${FILESDIR}"/config-floppyboot .config
- fi
-
- # setup the config file
- make allyesconfig > /dev/null
- busybox_config_option n DMALLOC
- busybox_config_option n FEATURE_SUID_CONFIG
-
- # If these are not set and we are using a uclibc/busybox setup
- # all calls to system() will fail.
- busybox_config_option y FEATURE_SH_IS_ASH
- busybox_config_option n FEATURE_SH_IS_NONE
-
- busybox_config_option static STATIC
- busybox_config_option debug DEBUG
- use debug \
- && busybox_config_option Y NO_DEBUG_LIB \
- && busybox_config_option N DMALLOC \
- && busybox_config_option N EFENCE
-
- # 1.00-pre5 uses the old selinux api which is no longer maintained
- #busybox_config_option selinux SELINUX
- busybox_config_option n SELINUX
-
- # default a bunch of uncommon options to off
- for opt in LOCALE_SUPPORT TFTP FTP{GET,PUT} IPCALC TFTP HUSH \
- LASH MSH INETD DPKG RPM2CPIO RPM FOLD LOGNAME OD CRONTAB \
- UUDECODE UUENCODE SULOGIN DC
- do
- busybox_config_option n ${opt}
- done
-
- make oldconfig > /dev/null
-}
-
-src_compile() {
- busybox_set_env
- emake -j1 CROSS="${CROSS}" depend || die "depend failed"
- emake CROSS="${CROSS}" busybox || die "build failed"
- if ! use static ; then
- mv busybox{,.bak}
- local failed=0
- emake -j1 \
- LDFLAGS="${LDFLAGS} -static" \
- CROSS="${CROSS}" \
- busybox || failed=1
- if [[ ${failed} == 1 ]] ; then
- if has_version '<sys-libs/glibc-2.3.5' ; then
- eerror "Your glibc has broken static support, ignorning static build failure."
- eerror "See http://bugs.gentoo.org/show_bug.cgi?id=94879"
- cp busybox.bak bb
- else
- die "static build failed"
- fi
- else
- mv busybox bb
- fi
- mv busybox{.bak,}
- fi
-}
-
-src_install() {
- busybox_set_env
-
- into /
- dobin busybox
- use static \
- && dosym busybox /bin/bb \
- || dobin bb
-
- if use make-symlinks ; then
- if [[ ! ${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 realy what you want."
- die "silly options will destroy your system"
- fi
- make CROSS="${CROSS}" install || die
- dodir /bin
- cp -pPR _install/bin/* "${D}"/bin/
- dodir /sbin
- cp -pPR _install/sbin/* "${D}"/sbin/
- cd "${D}"
- local symlink
- for symlink in {bin,sbin}/* ; do
- [[ -L ${symlink} ]] || continue
- [[ -e ${ROOT}/${symlink} ]] \
- && eerror "Deleting symlink ${symlink} because it exists in ${ROOT}" \
- && rm ${symlink}
- done
- cd "${S}"
- fi
-
- dodoc AUTHORS Changelog README TODO
-
- cd docs || die
- docinto txt
- dodoc *.txt
- docinto pod
- dodoc *.pod
- dohtml *.html *.sgml
-
- # no man files?
- # cd ../man && doman *.1
-
- cd ../examples || die
- docinto examples
- dodoc inittab depmod.pl
-
- cd bootfloppy || die
- docinto bootfloppy
- dodoc bootfloppy.txt display.txt mkdevs.sh etc/* etc/init.d/* 2>/dev/null
-
- cd ../../ || die
- if has buildpkg ${FEATURES} && has keepwork ${FEATURES} ; then
- cd "${S}"
- # this should install to the ./_install/ dir by default.
- # we make a micro pkg of busybox that can be used for
- # embedded systems -solar
- if ! use make-symlinks ; then
- make CROSS="${CROSS}" install || die
- fi
- cd ./_install/ \
- && tar --no-same-owner -jcvf ${WORKDIR}/${MY_P}-${ARCH}.bz2 . \
- && cd ..
- fi
-
- if use savedconfig ; then
- einfo "Saving this build config to /etc/${PN}/${CHOST}/${PN}-${PV}-${PR}.config"
- einfo "Read this ebuild for more info on how to take advantage of this option"
- insinto /etc/${PN}/${CHOST}/
- newins "${S}"/.config ${PN}-${PV}-${PR}.config
- fi
-}
-
-pkg_postinst() {
- echo
- einfo "This ebuild has support for user defined configs"
- einfo "Please read this ebuild for more details and re-emerge as needed"
- einfo "if you want to add or remove functionality for ${PN}"
- echo
-}
diff --git a/sys-apps/busybox/busybox-1.01.ebuild b/sys-apps/busybox/busybox-1.01.ebuild
deleted file mode 100644
index 3694d7a87fc3..000000000000
--- a/sys-apps/busybox/busybox-1.01.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.01.ebuild,v 1.7 2006/03/19 08:16:07 vapier Exp $
-
-inherit eutils
-
-#SNAPSHOT=20040726
-SNAPSHOT=""
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ -n ${SNAPSHOT} ]] ; then
- MY_P=${PN}
- SRC_URI="http://www.busybox.net/downloads/snapshots/${PN}-${SNAPSHOT}.tar.bz2"
-else
- MY_P=${PN}-${PV/_/-}
- SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
-fi
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-1.00-e2fsprogs.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86"
-IUSE="debug static savedconfig netboot floppyboot make-symlinks"
-RESTRICT="test"
-
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-# <pebenito> then eventually turning on selinux would mean
-# adding a dep: selinux? ( sys-libs/libselinux )
-
-busybox_set_env() {
- type -p ${CHOST}-ar > /dev/null && export CROSS=${CHOST}-
- # Don't let KBUILD_OUTPUT mess us up #88088
- unset KBUILD_OUTPUT
-}
-
-busybox_config_option() {
- case $1 in
- y) sed -i -e "s:.*CONFIG_$2.*set:CONFIG_$2=y:g" .config;;
- n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;;
- Y) echo "CONFIG_$2=y" >> .config;;
- N) echo "CONFIG_$2=n" >> .config;;
- *) use $1 \
- && busybox_config_option y $2 \
- || busybox_config_option n $2
- return 0
- ;;
- esac
- einfo $(grep "CONFIG_$2[= ]" .config)
-}
-
-src_unpack() {
- busybox_set_env
- unpack ${A}
- cd "${S}"
-
- # patches for 1.00 go here.
- epatch "${FILESDIR}"/1.00/busybox-read-timeout.patch
- epatch "${FILESDIR}"/1.00/readlink-follow.patch
- epatch "${FILESDIR}"/1.00/more-insmod-arches.patch
- epatch "${FILESDIR}"/1.00/bash-tests.patch
- epatch "${FILESDIR}"/1.00/standalone.patch
- epatch "${FILESDIR}"/1.00/nice.patch
- epatch "${FILESDIR}"/1.00/printenv.patch
- epatch "${FILESDIR}"/1.00/sum.patch
- epatch "${FILESDIR}"/1.00/bb.patch
- epatch "${WORKDIR}"/${PN}-1.00-e2fsprogs.patch
-
- # check for a busybox config before making one of our own.
- # if one exist lets return and use it.
- # fine grained config control for user defined busybox configs.
- # [package]-[version]-[revision].config
- # [package]-[version].config
- # [package].config
-
- if use savedconfig ; then
- [[ -r .config ]] && rm .config
- for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do
- configfile=${ROOT}/etc/${PN}/${CHOST}/${conf}.config
- [[ -r ${configfile} ]] || configfile=/etc/${PN}/${CHOST}/${conf}.config
- if [[ -r ${configfile} ]] ; then
- cp ${configfile} ${S}/.config
- break
- fi
- done
- if [[ -r ${S}/.config ]] ; then
- einfo "Found your ${configfile} and using it."
- return 0
- fi
- fi
- if use netboot ; then
- cp "${FILESDIR}"/config-netboot .config
- sed -i \
- -e '/DEFAULT_SCRIPT/s:/share/udhcpc/default.script:/lib/udhcpc.script:' \
- networking/udhcp/libbb_udhcp.h \
- || die "fixing netboot/udhcpc"
- elif use floppyboot ; then
- cp "${FILESDIR}"/config-floppyboot .config
- fi
-
- # setup the config file
- make allyesconfig > /dev/null
- busybox_config_option n DMALLOC
- busybox_config_option n FEATURE_SUID_CONFIG
-
- # If these are not set and we are using a uclibc/busybox setup
- # all calls to system() will fail.
- busybox_config_option y FEATURE_SH_IS_ASH
- busybox_config_option n FEATURE_SH_IS_NONE
-
- busybox_config_option static STATIC
- busybox_config_option debug DEBUG
- use debug \
- && busybox_config_option Y NO_DEBUG_LIB \
- && busybox_config_option N DMALLOC \
- && busybox_config_option N EFENCE
-
- # 1.00-pre5 uses the old selinux api which is no longer maintained
- #busybox_config_option selinux SELINUX
- busybox_config_option n SELINUX
-
- # default a bunch of uncommon options to off
- for opt in LOCALE_SUPPORT TFTP FTP{GET,PUT} IPCALC TFTP HUSH \
- LASH MSH INETD DPKG RPM2CPIO RPM FOLD LOGNAME OD CRONTAB \
- UUDECODE UUENCODE SULOGIN DC
- do
- busybox_config_option n ${opt}
- done
-
- make oldconfig > /dev/null
-}
-
-src_compile() {
- busybox_set_env
- emake -j1 CROSS="${CROSS}" depend || die "depend failed"
- emake CROSS="${CROSS}" busybox || die "build failed"
- if ! use static ; then
- mv busybox{,.bak}
- local failed=0
- emake -j1 \
- LDFLAGS="${LDFLAGS} -static" \
- CROSS="${CROSS}" \
- busybox || failed=1
- if [[ ${failed} == 1 ]] ; then
- if has_version '<sys-libs/glibc-2.3.5' ; then
- eerror "Your glibc has broken static support, ignorning static build failure."
- eerror "See http://bugs.gentoo.org/show_bug.cgi?id=94879"
- cp busybox.bak bb
- else
- die "static build failed"
- fi
- else
- mv busybox bb
- fi
- mv busybox{.bak,}
- fi
-}
-
-src_install() {
- busybox_set_env
-
- into /
- dobin busybox
- use static \
- && dosym busybox /bin/bb \
- || dobin bb
-
- if use make-symlinks ; then
- if [[ ! ${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 realy what you want."
- die "silly options will destroy your system"
- fi
- make CROSS="${CROSS}" install || die
- dodir /bin
- cp -pPR _install/bin/* "${D}"/bin/
- dodir /sbin
- cp -pPR _install/sbin/* "${D}"/sbin/
- cd "${D}"
- local symlink
- for symlink in {bin,sbin}/* ; do
- [[ -L ${symlink} ]] || continue
- [[ -e ${ROOT}/${symlink} ]] \
- && eerror "Deleting symlink ${symlink} because it exists in ${ROOT}" \
- && rm ${symlink}
- done
- cd "${S}"
- fi
-
- dodoc AUTHORS Changelog README TODO
-
- cd docs || die
- docinto txt
- dodoc *.txt
- docinto pod
- dodoc *.pod
- dohtml *.html *.sgml
-
- # no man files?
- # cd ../man && doman *.1
-
- cd ../examples || die
- docinto examples
- dodoc inittab depmod.pl
-
- cd bootfloppy || die
- docinto bootfloppy
- dodoc bootfloppy.txt display.txt mkdevs.sh etc/* etc/init.d/* 2>/dev/null
-
- cd ../../ || die
- if has buildpkg ${FEATURES} && has keepwork ${FEATURES} ; then
- cd "${S}"
- # this should install to the ./_install/ dir by default.
- # we make a micro pkg of busybox that can be used for
- # embedded systems -solar
- if ! use make-symlinks ; then
- make CROSS="${CROSS}" install || die
- fi
- cd ./_install/ \
- && tar --no-same-owner -jcvf ${WORKDIR}/${MY_P}-${ARCH}.bz2 . \
- && cd ..
- fi
-
- if use savedconfig ; then
- einfo "Saving this build config to /etc/${PN}/${CHOST}/${PN}-${PV}-${PR}.config"
- einfo "Read this ebuild for more info on how to take advantage of this option"
- insinto /etc/${PN}/${CHOST}/
- newins "${S}"/.config ${PN}-${PV}-${PR}.config
- fi
-}
-
-pkg_postinst() {
- echo
- einfo "This ebuild has support for user defined configs"
- einfo "Please read this ebuild for more details and re-emerge as needed"
- einfo "if you want to add or remove functionality for ${PN}"
- echo
-}
diff --git a/sys-apps/busybox/busybox-1.1.1.ebuild b/sys-apps/busybox/busybox-1.1.1.ebuild
deleted file mode 100644
index 0efda5fc3ab6..000000000000
--- a/sys-apps/busybox/busybox-1.1.1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.1.1.ebuild,v 1.5 2006/06/28 06:52:04 corsair Exp $
-
-inherit eutils
-
-#SNAPSHOT=20040726
-SNAPSHOT=""
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ -n ${SNAPSHOT} ]] ; then
- MY_P=${PN}
- SRC_URI="http://www.busybox.net/downloads/snapshots/${PN}-${SNAPSHOT}.tar.bz2"
-else
- MY_P=${PN}-${PV/_/-}
- SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug static savedconfig netboot floppyboot make-symlinks"
-RESTRICT="test"
-
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-# <pebenito> then eventually turning on selinux would mean
-# adding a dep: selinux? ( sys-libs/libselinux )
-
-busybox_set_env() {
- type -p ${CHOST}-ar > /dev/null && export CROSS=${CHOST}-
- # Don't let KBUILD_OUTPUT mess us up #88088
- unset KBUILD_OUTPUT
-}
-
-busybox_config_option() {
- case $1 in
- y) sed -i -e "s:.*CONFIG_$2.*set:CONFIG_$2=y:g" .config;;
- n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;;
- Y) echo "CONFIG_$2=y" >> .config;;
- N) echo "CONFIG_$2=n" >> .config;;
- *) use $1 \
- && busybox_config_option y $2 \
- || busybox_config_option n $2
- return 0
- ;;
- esac
- einfo $(grep "CONFIG_$2[= ]" .config)
-}
-
-src_unpack() {
- busybox_set_env
- unpack ${A}
- cd "${S}"
-
- # patches go here!
- epatch "${FILESDIR}"/1.1.1/bb.patch
- epatch "${FILESDIR}"/1.1.1/insmod.patch
-
- # check for a busybox config before making one of our own.
- # if one exist lets return and use it.
- # fine grained config control for user defined busybox configs.
- # [package]-[version]-[revision].config
- # [package]-[version].config
- # [package].config
-
- if use savedconfig ; then
- [[ -r .config ]] && rm .config
- for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do
- configfile=${ROOT}/etc/${PN}/${CHOST}/${conf}.config
- [[ -r ${configfile} ]] || configfile=/etc/${PN}/${CHOST}/${conf}.config
- if [[ -r ${configfile} ]] ; then
- cp ${configfile} ${S}/.config
- break
- fi
- done
- if [[ -r ${S}/.config ]] ; then
- einfo "Found your ${configfile} and using it."
- make oldconfig > /dev/null
- return 0
- fi
- fi
- if use netboot ; then
- cp "${FILESDIR}"/config-netboot .config
- sed -i \
- -e '/DEFAULT_SCRIPT/s:/share/udhcpc/default.script:/lib/udhcpc.script:' \
- networking/udhcp/libbb_udhcp.h \
- || die "fixing netboot/udhcpc"
- elif use floppyboot ; then
- cp "${FILESDIR}"/config-floppyboot .config
- fi
-
- # setup the config file
- make allyesconfig > /dev/null
- 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
-
- # If these are not set and we are using a uclibc/busybox setup
- # all calls to system() will fail.
- busybox_config_option y FEATURE_SH_IS_ASH
- busybox_config_option n FEATURE_SH_IS_NONE
-
- busybox_config_option static STATIC
- busybox_config_option debug DEBUG
- use debug \
- && busybox_config_option Y NO_DEBUG_LIB \
- && busybox_config_option N DMALLOC \
- && busybox_config_option N EFENCE
-
- busybox_config_option selinux SELINUX
-
- # default a bunch of uncommon options to off
- for opt in LOCALE_SUPPORT TFTP FTP{GET,PUT} IPCALC TFTP HUSH \
- LASH MSH INETD DPKG RPM2CPIO RPM FOLD LOGNAME OD CRONTAB \
- UUDECODE UUENCODE SULOGIN DC
- do
- busybox_config_option n ${opt}
- done
-
- make oldconfig > /dev/null
-}
-
-src_compile() {
- busybox_set_env
- use ppc64 && CFLAGS="${CFLAGS} -mminimal-toc"
- emake CROSS="${CROSS}" busybox || die "build failed"
- if ! use static ; then
- mv busybox_unstripped{,.bak}
- local failed=0
- LDFLAGS="${LDFLAGS} -static" \
- emake \
- CROSS="${CROSS}" \
- busybox || failed=1
- if [[ ${failed} == 1 ]] ; then
- if has_version '<sys-libs/glibc-2.3.5' ; then
- eerror "Your glibc has broken static support, ignorning static build failure."
- eerror "See http://bugs.gentoo.org/94879"
- cp busybox_unstripped bb
- else
- die "static build failed"
- fi
- else
- mv busybox_unstripped bb
- fi
- mv busybox_unstripped{.bak,}
- fi
-}
-
-src_install() {
- busybox_set_env
-
- into /
- newbin busybox_unstripped busybox || die
- use static \
- && dosym busybox /bin/bb \
- || dobin bb
-
- if use make-symlinks ; then
- if [[ ! ${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 realy what you want."
- die "silly options will destroy your system"
- fi
- make CROSS="${CROSS}" install || die
- cp -pPR _install/${x}/* "${D}"/ || die "copying links for ${x} failed"
- cd "${D}"
- # XXX: should really move this to pkg_preinst() ...
- local symlink
- for symlink in {,usr/}{bin,sbin}/* linuxrc ; do
- [[ -L ${symlink} ]] || continue
- [[ -e ${ROOT}/${symlink} ]] \
- && eerror "Deleting symlink ${symlink} because it exists in ${ROOT}" \
- && rm ${symlink}
- done
- cd "${S}"
- fi
-
- dodoc AUTHORS README TODO
-
- cd docs || die
- docinto txt
- dodoc *.txt
- docinto pod
- dodoc *.pod
- dohtml *.html *.sgml
-
- # no man files?
- # cd ../man && doman *.1
-
- cd ../examples || die
- docinto examples
- dodoc inittab depmod.pl *.conf *.script undeb unrpm
-
- cd bootfloppy || die
- docinto bootfloppy
- dodoc * etc/* etc/init.d/* 2>/dev/null
-
- cd ../../ || die
- if has buildpkg ${FEATURES} && has keepwork ${FEATURES} ; then
- cd "${S}"
- # this should install to the ./_install/ dir by default.
- # we make a micro pkg of busybox that can be used for
- # embedded systems -solar
- if ! use make-symlinks ; then
- make CROSS="${CROSS}" install || die
- fi
- cd ./_install/ \
- && tar --no-same-owner -jcvf ${WORKDIR}/${MY_P}-${ARCH}.bz2 . \
- && cd ..
- fi
-
- if use savedconfig ; then
- einfo "Saving this build config to /etc/${PN}/${CHOST}/${PN}-${PV}-${PR}.config"
- einfo "Read this ebuild for more info on how to take advantage of this option"
- insinto /etc/${PN}/${CHOST}/
- newins "${S}"/.config ${PN}-${PV}-${PR}.config
- fi
-}
-
-pkg_postinst() {
- echo
- einfo "This ebuild has support for user defined configs"
- einfo "Please read this ebuild for more details and re-emerge as needed"
- einfo "if you want to add or remove functionality for ${PN}"
- echo
-}
diff --git a/sys-apps/busybox/busybox-1.1.2.ebuild b/sys-apps/busybox/busybox-1.1.2.ebuild
deleted file mode 100644
index 9537d917d7b6..000000000000
--- a/sys-apps/busybox/busybox-1.1.2.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.1.2.ebuild,v 1.3 2006/06/28 06:52:04 corsair Exp $
-
-inherit eutils
-
-#SNAPSHOT=20040726
-SNAPSHOT=""
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="http://www.busybox.net/"
-if [[ -n ${SNAPSHOT} ]] ; then
- MY_P=${PN}
- SRC_URI="http://www.busybox.net/downloads/snapshots/${PN}-${SNAPSHOT}.tar.bz2"
-else
- MY_P=${PN}-${PV/_/-}
- SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug static savedconfig netboot floppyboot make-symlinks"
-RESTRICT="test"
-
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-# <pebenito> then eventually turning on selinux would mean
-# adding a dep: selinux? ( sys-libs/libselinux )
-
-busybox_set_env() {
- type -p ${CHOST}-ar > /dev/null && export CROSS=${CHOST}-
- # Don't let KBUILD_OUTPUT mess us up #88088
- unset KBUILD_OUTPUT
-}
-
-busybox_config_option() {
- case $1 in
- y) sed -i -e "s:.*CONFIG_$2.*set:CONFIG_$2=y:g" .config;;
- n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;;
- Y) echo "CONFIG_$2=y" >> .config;;
- N) echo "CONFIG_$2=n" >> .config;;
- *) use $1 \
- && busybox_config_option y $2 \
- || busybox_config_option n $2
- return 0
- ;;
- esac
- einfo $(grep "CONFIG_$2[= ]" .config)
-}
-
-src_unpack() {
- busybox_set_env
- unpack ${A}
- cd "${S}"
-
- # patches go here!
- epatch "${FILESDIR}"/1.1.1/bb.patch
-
- # check for a busybox config before making one of our own.
- # if one exist lets return and use it.
- # fine grained config control for user defined busybox configs.
- # [package]-[version]-[revision].config
- # [package]-[version].config
- # [package].config
-
- if use savedconfig ; then
- [[ -r .config ]] && rm .config
- for conf in ${PN}-${PV}-${PR} ${PN}-${PV} ${PN}; do
- configfile=${ROOT}/etc/${PN}/${CHOST}/${conf}.config
- [[ -r ${configfile} ]] || configfile=/etc/${PN}/${CHOST}/${conf}.config
- if [[ -r ${configfile} ]] ; then
- cp ${configfile} ${S}/.config
- break
- fi
- done
- if [[ -r ${S}/.config ]] ; then
- einfo "Found your ${configfile} and using it."
- yes "" | make oldconfig > /dev/null
- return 0
- fi
- fi
- if use netboot ; then
- cp "${FILESDIR}"/config-netboot .config
- sed -i \
- -e '/DEFAULT_SCRIPT/s:/share/udhcpc/default.script:/lib/udhcpc.script:' \
- networking/udhcp/libbb_udhcp.h \
- || die "fixing netboot/udhcpc"
- elif use floppyboot ; then
- cp "${FILESDIR}"/config-floppyboot .config
- fi
-
- # setup the config file
- make allyesconfig > /dev/null
- 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
-
- # If these are not set and we are using a uclibc/busybox setup
- # all calls to system() will fail.
- busybox_config_option y FEATURE_SH_IS_ASH
- busybox_config_option n FEATURE_SH_IS_NONE
-
- busybox_config_option static STATIC
- busybox_config_option debug DEBUG
- use debug \
- && busybox_config_option Y NO_DEBUG_LIB \
- && busybox_config_option N DMALLOC \
- && busybox_config_option N EFENCE
-
- busybox_config_option selinux SELINUX
-
- # default a bunch of uncommon options to off
- for opt in LOCALE_SUPPORT TFTP FTP{GET,PUT} IPCALC TFTP HUSH \
- LASH MSH INETD DPKG RPM2CPIO RPM FOLD LOGNAME OD CRONTAB \
- UUDECODE UUENCODE SULOGIN DC
- do
- busybox_config_option n ${opt}
- done
-
- make oldconfig > /dev/null
-}
-
-src_compile() {
- busybox_set_env
- use ppc64 && CFLAGS="${CFLAGS} -mminimal-toc"
- emake CROSS="${CROSS}" busybox || die "build failed"
- if ! use static ; then
- mv busybox_unstripped{,.bak}
- local failed=0
- LDFLAGS="${LDFLAGS} -static" \
- emake \
- CROSS="${CROSS}" \
- busybox || failed=1
- if [[ ${failed} == 1 ]] ; then
- if has_version '<sys-libs/glibc-2.3.5' ; then
- eerror "Your glibc has broken static support, ignorning static build failure."
- eerror "See http://bugs.gentoo.org/94879"
- cp busybox_unstripped bb
- else
- die "static build failed"
- fi
- else
- mv busybox_unstripped bb
- fi
- mv busybox_unstripped{.bak,}
- fi
-}
-
-src_install() {
- busybox_set_env
-
- into /
- newbin busybox_unstripped busybox || die
- use static \
- && dosym busybox /bin/bb \
- || dobin bb
-
- if use make-symlinks ; then
- if [[ ! ${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 realy what you want."
- die "silly options will destroy your system"
- fi
- make CROSS="${CROSS}" install || die
- cp -pPR _install/${x}/* "${D}"/ || die "copying links for ${x} failed"
- cd "${D}"
- # XXX: should really move this to pkg_preinst() ...
- local symlink
- for symlink in {,usr/}{bin,sbin}/* linuxrc ; do
- [[ -L ${symlink} ]] || continue
- [[ -e ${ROOT}/${symlink} ]] \
- && eerror "Deleting symlink ${symlink} because it exists in ${ROOT}" \
- && rm ${symlink}
- done
- cd "${S}"
- fi
-
- dodoc AUTHORS README TODO
-
- cd docs || die
- docinto txt
- dodoc *.txt
- docinto pod
- dodoc *.pod
- dohtml *.html *.sgml
-
- # no man files?
- # cd ../man && doman *.1
-
- cd ../examples || die
- docinto examples
- dodoc inittab depmod.pl *.conf *.script undeb unrpm
-
- cd bootfloppy || die
- docinto bootfloppy
- dodoc * etc/* etc/init.d/* 2>/dev/null
-
- cd ../../ || die
- if has buildpkg ${FEATURES} && has keepwork ${FEATURES} ; then
- cd "${S}"
- # this should install to the ./_install/ dir by default.
- # we make a micro pkg of busybox that can be used for
- # embedded systems -solar
- if ! use make-symlinks ; then
- make CROSS="${CROSS}" install || die
- fi
- cd ./_install/ \
- && tar --no-same-owner -jcvf ${WORKDIR}/${MY_P}-${ARCH}.bz2 . \
- && cd ..
- fi
-
- if use savedconfig ; then
- einfo "Saving this build config to /etc/${PN}/${CHOST}/${PN}-${PV}-${PR}.config"
- einfo "Read this ebuild for more info on how to take advantage of this option"
- insinto /etc/${PN}/${CHOST}/
- newins "${S}"/.config ${PN}-${PV}-${PR}.config
- fi
-}
-
-pkg_postinst() {
- echo
- einfo "This ebuild has support for user defined configs"
- einfo "Please read this ebuild for more details and re-emerge as needed"
- einfo "if you want to add or remove functionality for ${PN}"
- echo
-}
diff --git a/sys-apps/busybox/files/1.00/bash-tests.patch b/sys-apps/busybox/files/1.00/bash-tests.patch
deleted file mode 100644
index 9e8b099049ca..000000000000
--- a/sys-apps/busybox/files/1.00/bash-tests.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: coreutils/test.c
-===================================================================
---- coreutils/test.c (revision 10073)
-+++ coreutils/test.c (revision 10096)
-@@ -51,7 +51,7 @@
- unary-operator ::= "-r"|"-w"|"-x"|"-f"|"-d"|"-c"|"-b"|"-p"|
- "-u"|"-g"|"-k"|"-s"|"-t"|"-z"|"-n"|"-o"|"-O"|"-G"|"-L"|"-S";
-
-- binary-operator ::= "="|"!="|"-eq"|"-ne"|"-ge"|"-gt"|"-le"|"-lt"|
-+ binary-operator ::= "="|"=="|"!="|"-eq"|"-ne"|"-ge"|"-gt"|"-le"|"-lt"|
- "-nt"|"-ot"|"-ef";
- operand ::= <any legal UNIX file name>
- */
-@@ -135,6 +135,7 @@
- "-L", FILSYM, UNOP}, {
- "-S", FILSOCK, UNOP}, {
- "=", STREQ, BINOP}, {
-+ "==", STREQ, BINOP}, {
- "!=", STRNE, BINOP}, {
- "<", STRLT, BINOP}, {
- ">", STRGT, BINOP}, {
-@@ -191,6 +192,11 @@
- bb_error_msg_and_die("missing ]");
- argv[argc] = NULL;
- }
-+ if (strcmp(bb_applet_name, "[[") == 0) {
-+ if (strcmp(argv[--argc], "]]"))
-+ bb_error_msg_and_die("missing ]]");
-+ argv[argc] = NULL;
-+ }
- /* Implement special cases from POSIX.2, section 4.62.4 */
- switch (argc) {
- case 1:
-Index: include/applets.h
-===================================================================
---- include/applets.h (revision 10073)
-+++ include/applets.h (revision 10096)
-@@ -50,6 +50,7 @@
-
- #ifdef CONFIG_TEST
- APPLET_NOUSAGE("[", test_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
-+ APPLET_NOUSAGE("[[", test_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
- #endif
- #ifdef CONFIG_ADDGROUP
- APPLET(addgroup, addgroup_main, _BB_DIR_BIN, _BB_SUID_NEVER)
diff --git a/sys-apps/busybox/files/1.00/bb.patch b/sys-apps/busybox/files/1.00/bb.patch
deleted file mode 100644
index 61e5f16f6a1a..000000000000
--- a/sys-apps/busybox/files/1.00/bb.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- include/applets.h
-+++ include/applets.h
-@@ -78,2 +78,3 @@
- #endif
-+ APPLET_NOUSAGE("bb", ash_main, _BB_DIR_BIN, _BB_SUID_NEVER)
- #ifdef CONFIG_BUNZIP2
diff --git a/sys-apps/busybox/files/1.00/busybox-read-timeout.patch b/sys-apps/busybox/files/1.00/busybox-read-timeout.patch
deleted file mode 100644
index 04f5d1386c37..000000000000
--- a/sys-apps/busybox/files/1.00/busybox-read-timeout.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -ur busybox-1.00/shell/ash.c busybox-1.00.plasmaroo/shell/ash.c
---- busybox-1.00/shell/ash.c 2004-08-06 02:49:04.000000000 +0100
-+++ busybox-1.00.plasmaroo/shell/ash.c 2004-10-16 20:15:43.023201048 +0100
-@@ -12580,17 +12580,33 @@
- char *prompt;
- const char *ifs;
- char *p;
-+#if JOBS
-+ fd_set set;
-+ int timeout;
-+ struct timeval timeout_struct;
-+ struct termios tty, old_tty;
-+#endif
- int startword;
- int status;
- int i;
-
- rflag = 0;
- prompt = NULL;
-+#if JOBS
-+ timeout = 0;
-+
-+ while ((i = nextopt("p:rt:")) != '\0') {
-+#else
- while ((i = nextopt("p:r")) != '\0') {
-+#endif
- if (i == 'p')
- prompt = optionarg;
-- else
-+ else if (i == 'r')
- rflag = 1;
-+#if JOBS
-+ else
-+ timeout = atoi(optionarg);
-+#endif
- }
- if (prompt && isatty(0)) {
- out2str(prompt);
-@@ -12599,11 +12615,53 @@
- error("arg count");
- if ((ifs = bltinlookup("IFS")) == NULL)
- ifs = defifs;
-+#if JOBS
-+ c = 0;
-+#endif
- status = 0;
- startword = 1;
- backslash = 0;
-+
- STARTSTACKSTR(p);
-+#if JOBS
-+ if (timeout > 0) {
-+ tcgetattr(0, &tty);
-+ old_tty = tty;
-+
-+ /* cfmakeraw(...) disables too much; we just do this instead. */
-+ tty.c_lflag &= ~(ECHO|ECHONL|ICANON|IEXTEN);
-+ tcsetattr(0, TCSANOW, &tty);
-+
-+ FD_ZERO (&set);
-+ FD_SET (0, &set);
-+
-+ timeout_struct.tv_sec = timeout;
-+ timeout_struct.tv_usec = 0;
-+
-+ i = select (FD_SETSIZE, &set, NULL, NULL, &timeout_struct);
-+ if(i == 1)
-+ {
-+ read(0, &c, 1);
-+ if(c == '\n' || c == 4) /* Handle newlines and EOF */
-+ i = 0; /* Don't read further... */
-+ else
-+ STPUTC(c, p); /* Keep reading... */
-+ }
-+ tcsetattr(0, TCSANOW, &old_tty);
-+
-+ /* Echo the character so the user knows it was read...
-+ Yes, this can be done by setting the ECHO flag, but that
-+ echoes ^D and other control characters at this state */
-+ if(c != 0)
-+ write(1, &c, 1);
-+
-+ } else
-+ i = 1;
-+
-+ for (;i == 1;) {
-+#else
- for (;;) {
-+#endif
- if (read(0, &c, 1) != 1) {
- status = 1;
- break;
diff --git a/sys-apps/busybox/files/1.00/cp-posix-opts.patch b/sys-apps/busybox/files/1.00/cp-posix-opts.patch
deleted file mode 100644
index f944bb1abb33..000000000000
--- a/sys-apps/busybox/files/1.00/cp-posix-opts.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Grabbed from upstream SVN
-
---- coreutils/cp.c
-+++ coreutils/cp.c
-@@ -42,7 +42,7 @@
- #include "libcoreutils/coreutils.h"
-
- /* WARNING!! ORDER IS IMPORTANT!! */
--static const char cp_opts[] = "pdRfiar";
-+static const char cp_opts[] = "pdRfiarPHL";
-
- extern int cp_main(int argc, char **argv)
- {
-@@ -79,6 +79,20 @@
- */
- flags |= FILEUTILS_DEREFERENCE;
- }
-+ if (flags & 128) {
-+ /* Make -P a synonym for -d,
-+ * -d is the GNU option while -P is the POSIX 2003 option
-+ */
-+ flags |= FILEUTILS_DEREFERENCE;
-+ }
-+ /* Default behavior of cp is to dereference, so we don't have to do
-+ * anything special when we are given -L.
-+ * The behavior of -H is *almost* like -L, but not quite, so let's
-+ * just ignore it too for fun.
-+ if (flags & 256 || flags & 512) {
-+ ;
-+ }
-+ */
-
- flags ^= FILEUTILS_DEREFERENCE; /* The sense of this flag was reversed. */
-
---- include/usage.h
-+++ include/usage.h
-@@ -205,6 +205,7 @@
- "\n" \
- "\t-a\tSame as -dpR\n" \
-- "\t-d\tPreserves links\n" \
-+ "\t-d,-P\tPreserves links\n" \
-+ "\t-H,-L\tDereference all symlinks (implied by default)\n" \
- "\t-p\tPreserves file attributes if possible\n" \
- "\t-f\tforce (implied; ignored) - always set\n" \
- "\t-i\tinteractive, prompt before overwrite\n" \
diff --git a/sys-apps/busybox/files/1.00/fix-amd64-insmod.patch b/sys-apps/busybox/files/1.00/fix-amd64-insmod.patch
deleted file mode 100644
index 8d60f0650066..000000000000
--- a/sys-apps/busybox/files/1.00/fix-amd64-insmod.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: modutils/insmod.c
-===================================================================
---- modutils/insmod.c (revision 9620)
-+++ modutils/insmod.c (revision 10061)
-@@ -290,8 +290,8 @@
- /* X86_64 */
- #if defined(__x86_64__)
- #define MATCH_MACHINE(x) (x == EM_X86_64)
--#define SHT_RELM SHT_REL
--#define Elf64_RelM Elf64_Rel
-+#define SHT_RELM SHT_RELA
-+#define Elf64_RelM Elf64_Rela
- #define ELFCLASSM ELFCLASS64
- #endif
-
diff --git a/sys-apps/busybox/files/1.00/gcc4.patch b/sys-apps/busybox/files/1.00/gcc4.patch
deleted file mode 100644
index bd11c00ff653..000000000000
--- a/sys-apps/busybox/files/1.00/gcc4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-gcc 4 fixes from upstream
-
---- busybox-1.00/archival/gzip.c
-+++ busybox-1.00/archival/gzip.c
-@@ -2162,7 +2162,7 @@
- * Construct the Huffman tree for the bit lengths and return the index in
- * bl_order of the last bit length code to send.
- */
--static const int build_bl_tree()
-+static int build_bl_tree()
- {
- int max_blindex; /* index of last bit length code of non zero freq */
-
---- busybox-1.00/networking/ifupdown.c
-+++ busybox-1.00/networking/ifupdown.c
-@@ -150,7 +150,9 @@
-
- static char no_act = 0;
- static char verbose = 0;
-+#ifndef __USE_GNU
- static char **environ = NULL;
-+#endif
-
- #ifdef CONFIG_FEATURE_IFUPDOWN_IP
-
diff --git a/sys-apps/busybox/files/1.00/more-insmod-arches.patch b/sys-apps/busybox/files/1.00/more-insmod-arches.patch
deleted file mode 100644
index 3056942b94a1..000000000000
--- a/sys-apps/busybox/files/1.00/more-insmod-arches.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: insmod.c
-===================================================================
-RCS file: /var/cvs/busybox/modutils/insmod.c,v
-retrieving revision 1.125
-retrieving revision 1.126
-diff -u -r1.125 -r1.126
---- modutils/insmod.c 2 Sep 2004 23:03:25 -0000 1.125
-+++ modutils/insmod.c 26 Dec 2004 09:13:32 -0000 1.126
-@@ -109,6 +109,14 @@
- #endif
-
-
-+/* Alpha */
-+#if defined(__alpha__)
-+#define MATCH_MACHINE(x) (x == EM_ALPHA)
-+#define SHT_RELM SHT_RELA
-+#define Elf64_RelM Elf64_Rela
-+#define ELFCLASSM ELFCLASS64
-+#endif
-+
- /* ARM support */
- #if defined(__arm__)
- #define MATCH_MACHINE(x) (x == EM_ARM)
-@@ -135,6 +143,19 @@
- #endif
- #endif
-
-+/* PA-RISC / HP-PA */
-+#if defined(__hppa__)
-+#define MATCH_MACHINE(x) (x == EM_PARISC)
-+#define SHT_RELM SHT_RELA
-+#if defined(__LP64__)
-+#define Elf64_RelM Elf64_Rela
-+#define ELFCLASSM ELFCLASS64
-+#else
-+#define Elf32_RelM Elf32_Rela
-+#define ELFCLASSM ELFCLASS32
-+#endif
-+#endif
-+
- /* H8/300 */
- #if defined(__H8300H__) || defined(__H8300S__)
- #define MATCH_MACHINE(x) (x == EM_H8_300)
diff --git a/sys-apps/busybox/files/1.00/nice.patch b/sys-apps/busybox/files/1.00/nice.patch
deleted file mode 100644
index d75fe517ddc7..000000000000
--- a/sys-apps/busybox/files/1.00/nice.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-Index: coreutils/Makefile.in
-===================================================================
---- coreutils/Makefile.in (revision 9867)
-+++ coreutils/Makefile.in (revision 9868)
-@@ -58,6 +58,7 @@
- COREUTILS-$(CONFIG_MKFIFO) += mkfifo.o
- COREUTILS-$(CONFIG_MKNOD) += mknod.o
- COREUTILS-$(CONFIG_MV) += mv.o
-+COREUTILS-$(CONFIG_NICE) += nice.o
- COREUTILS-$(CONFIG_OD) += od.o
- COREUTILS-$(CONFIG_PRINTF) += printf.o
- COREUTILS-$(CONFIG_PWD) += pwd.o
-Index: coreutils/nice.c
-===================================================================
---- coreutils/nice.c (revision 0)
-+++ coreutils/nice.c (revision 9868)
-@@ -0,0 +1,86 @@
-+/* vi: set sw=4 ts=4: */
-+/*
-+ * nice implementation for busybox
-+ *
-+ * Copyright (C) 2005 Manuel Novoa III <mjn3@codepoet.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <limits.h>
-+#include <errno.h>
-+#include <unistd.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
-+#include "busybox.h"
-+
-+static inline int int_add_no_wrap(int a, int b)
-+{
-+ int s = a + b;
-+
-+ if (b < 0) {
-+ if (s > a) s = INT_MIN;
-+ } else {
-+ if (s < a) s = INT_MAX;
-+ }
-+
-+ return s;
-+}
-+
-+int nice_main(int argc, char **argv)
-+{
-+ static const char Xetpriority_msg[] = "cannot %cet priority";
-+
-+ int old_priority, adjustment;
-+
-+ errno = 0; /* Needed for getpriority error detection. */
-+ old_priority = getpriority(PRIO_PROCESS, 0);
-+ if (errno) {
-+ bb_perror_msg_and_die(Xetpriority_msg, 'g');
-+ }
-+
-+ if (!*++argv) { /* No args, so (GNU) output current nice value. */
-+ bb_printf("%d\n", old_priority);
-+ bb_fflush_stdout_and_exit(EXIT_SUCCESS);
-+ }
-+
-+ adjustment = 10; /* Set default adjustment. */
-+
-+ if ((argv[0][0] == '-') && (argv[0][1] == 'n') && !argv[0][2]) { /* "-n" */
-+ if (argc < 4) { /* Missing priority and/or utility! */
-+ bb_show_usage();
-+ }
-+ adjustment = bb_xgetlarg(argv[1], 10, INT_MIN, INT_MAX);
-+ argv += 2;
-+ }
-+
-+ { /* Set our priority. Handle integer wrapping for old + adjust. */
-+ int new_priority = int_add_no_wrap(old_priority, adjustment);
-+
-+ if (setpriority(PRIO_PROCESS, 0, new_priority) < 0) {
-+ bb_perror_msg_and_die(Xetpriority_msg, 's');
-+ }
-+ }
-+
-+ execvp(*argv, argv); /* Now exec the desired program. */
-+
-+ /* The exec failed... */
-+ bb_default_error_retval = (errno == ENOENT) ? 127 : 126; /* SUSv3 */
-+ bb_perror_msg_and_die("%s", *argv);
-+}
-Index: coreutils/Config.in
-===================================================================
---- coreutils/Config.in (revision 9867)
-+++ coreutils/Config.in (revision 9868)
-@@ -329,6 +329,12 @@
- help
- mv is used to move or rename files or directories.
-
-+config CONFIG_NICE
-+ bool "nice"
-+ default n
-+ help
-+ nice runs a program with modified scheduling priority.
-+
- config CONFIG_OD
- bool "od"
- default n
-Index: include/usage.h
-===================================================================
---- include/usage.h (revision 9867)
-+++ include/usage.h (revision 9868)
-@@ -1813,6 +1813,13 @@
- "\t-w raw sockets\n" \
- "\t-x unix sockets"
-
-+#define nice_trivial_usage \
-+ "[-n ADJUST] [COMMAND [ARG] ...]"
-+#define nice_full_usage \
-+ "Nice runs a program with modified scheduling priority.\n\n" \
-+ "Options:\n" \
-+ "\t-n ADJUST\tAdjust the scheduling priority by ADJUST.\n" \
-+
- #define nslookup_trivial_usage \
- "[HOST] [SERVER]"
- #define nslookup_full_usage \
-Index: include/applets.h
-===================================================================
---- include/applets.h (revision 9867)
-+++ include/applets.h (revision 9868)
-@@ -412,6 +412,9 @@
- #ifdef CONFIG_NETSTAT
- APPLET(netstat, netstat_main, _BB_DIR_BIN, _BB_SUID_NEVER)
- #endif
-+#ifdef CONFIG_NICE
-+ APPLET(nice, nice_main, _BB_DIR_BIN, _BB_SUID_NEVER)
-+#endif
- #ifdef CONFIG_NSLOOKUP
- APPLET(nslookup, nslookup_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
- #endif
diff --git a/sys-apps/busybox/files/1.00/printenv.patch b/sys-apps/busybox/files/1.00/printenv.patch
deleted file mode 100644
index 4057395628d7..000000000000
--- a/sys-apps/busybox/files/1.00/printenv.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Index: coreutils/Makefile.in
-===================================================================
---- coreutils/Makefile.in (revision 10146)
-+++ coreutils/Makefile.in (revision 10147)
-@@ -60,6 +60,7 @@
- COREUTILS-$(CONFIG_MV) += mv.o
- COREUTILS-$(CONFIG_NICE) += nice.o
- COREUTILS-$(CONFIG_OD) += od.o
-+COREUTILS-$(CONFIG_PRINTENV) += printenv.o
- COREUTILS-$(CONFIG_PRINTF) += printf.o
- COREUTILS-$(CONFIG_PWD) += pwd.o
- COREUTILS-$(CONFIG_REALPATH) += realpath.o
-Index: coreutils/printenv.c
-===================================================================
---- coreutils/printenv.c (revision 0)
-+++ coreutils/printenv.c (revision 10147)
-@@ -0,0 +1,52 @@
-+/*
-+ * printenv implementation for busybox
-+ *
-+ * Copyright (C) 2005 by Erik Andersen <andersen@codepoet.org>
-+ * Copyright (C) 2005 by Mike Frysinger <vapier@gentoo.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
-+
-+int printenv_main(int argc, char **argv)
-+{
-+ extern char **environ;
-+ int e = 0;
-+
-+ /* no variables specified, show whole env */
-+ if (argc == 1)
-+ while (environ[e])
-+ puts(environ[e++]);
-+
-+ /* search for specified variables and print them out if found */
-+ else {
-+ int i;
-+ size_t l;
-+ char *arg, *env;
-+
-+ for (i=1; (arg = argv[i]); ++i)
-+ for (; (env = environ[e]); ++e) {
-+ l = strlen(arg);
-+ if (!strncmp(env, arg, l) && env[l] == '=')
-+ puts(env + l + 1);
-+ }
-+ }
-+
-+ exit(EXIT_SUCCESS);
-+}
-Index: coreutils/Config.in
-===================================================================
---- coreutils/Config.in (revision 10146)
-+++ coreutils/Config.in (revision 10147)
-@@ -164,6 +164,12 @@
- a command; without options it displays the current
- environment.
-
-+config CONFIG_PRINTENV
-+ bool "printenv"
-+ default n
-+ help
-+ printenv is used to print all or part of environment.
-+
- config CONFIG_EXPR
- bool "expr"
- default n
---- include/usage.h
-+++ include/usage.h
-@@ -1949,6 +1949,12 @@
- "Options:\n" \
- "\t-d\t\tdelay interval for shutting off."
-
-+#define printenv_trivial_usage \
-+ "[VARIABLES...]"
-+#define printenv_full_usage \
-+ "print all or part of environment\n\n" \
-+ "If no environment VARIABLE specified, print them all."
-+
- #define printf_trivial_usage \
- "FORMAT [ARGUMENT...]"
- #define printf_full_usage \
---- include/applets.h
-+++ include/applets.h
-@@ -452,6 +452,9 @@
- #ifdef CONFIG_POWEROFF
- APPLET(poweroff, poweroff_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
- #endif
-+#ifdef CONFIG_PRINTENV
-+ APPLET(printenv, printenv_main, _BB_DIR_BIN, _BB_SUID_NEVER)
-+#endif
- #ifdef CONFIG_PRINTF
- APPLET(printf, printf_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
- #endif
diff --git a/sys-apps/busybox/files/1.00/readlink-follow.patch b/sys-apps/busybox/files/1.00/readlink-follow.patch
deleted file mode 100644
index d7ecd1bdf864..000000000000
--- a/sys-apps/busybox/files/1.00/readlink-follow.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Index: debianutils/Config.in
-===================================================================
-RCS file: /var/cvs/busybox/debianutils/Config.in,v
-retrieving revision 1.7
-diff -p -u -r1.7 Config.in
---- debianutils/Config.in 15 Mar 2004 08:28:24 -0000 1.7
-+++ debianutils/Config.in 16 Nov 2004 11:46:41 -0000
-@@ -24,6 +24,13 @@ config CONFIG_READLINK
- This program reads a symbolic link and returns the name
- of the file it points to
-
-+config CONFIG_FEATURE_READLINK_FOLLOW
-+ bool " Enable canonicalization by following all symlinks (-f)"
-+ default n
-+ depends on CONFIG_READLINK
-+ help
-+ Enable the readlink option (-f).
-+
- config CONFIG_RUN_PARTS
- bool "run-parts"
- default n
-Index: debianutils/readlink.c
-===================================================================
-RCS file: /var/cvs/busybox/debianutils/readlink.c,v
-retrieving revision 1.2
-diff -p -u -r1.2 readlink.c
---- debianutils/readlink.c 19 Mar 2003 09:11:41 -0000 1.2
-+++ debianutils/readlink.c 16 Nov 2004 11:46:41 -0000
-@@ -23,18 +23,38 @@
- #include <errno.h>
- #include <unistd.h>
- #include <stdlib.h>
-+#include <getopt.h>
- #include "busybox.h"
-
-+#ifdef CONFIG_FEATURE_READLINK_FOLLOW
-+# define READLINK_FOLLOW "f"
-+# define READLINK_FLAG_f (1 << 0)
-+#else
-+# define READLINK_FOLLOW ""
-+#endif
-+
-+static const char readlink_options[] = READLINK_FOLLOW;
-+
- int readlink_main(int argc, char **argv)
- {
- char *buf = NULL;
-+ unsigned long opt = bb_getopt_ulflags(argc, argv, readlink_options);
-+#ifdef CONFIG_FEATURE_READLINK_FOLLOW
-+ RESERVE_CONFIG_BUFFER(resolved_path, PATH_MAX);
-+#endif
-
- /* no options, no getopt */
-
-- if (argc != 2)
-+ if (optind + 1 != argc)
- bb_show_usage();
-
-- buf = xreadlink(argv[1]);
-+#ifdef CONFIG_FEATURE_READLINK_FOLLOW
-+ if (opt & READLINK_FLAG_f) {
-+ buf = realpath(argv[optind], resolved_path);
-+ } else
-+#endif
-+ buf = xreadlink(argv[optind]);
-+
- if (!buf)
- return EXIT_FAILURE;
- puts(buf);
-Index: include/usage.h
-===================================================================
-RCS file: /var/cvs/busybox/include/usage.h,v
-retrieving revision 1.222
-diff -p -u -r1.222 usage.h
---- include/usage.h 14 Sep 2004 16:23:56 -0000 1.222
-+++ include/usage.h 16 Nov 2004 11:46:42 -0000
-@@ -1985,10 +1985,18 @@
- "\t-s\tSet the system date and time (default).\n" \
- "\t-p\tPrint the date and time."
-
-+#ifdef CONFIG_FEATURE_READLINK_FOLLOW
-+#define USAGE_READLINK_FOLLOW(a) a
-+#else
-+#define USAGE_READLINK_FOLLOW(a)
-+#endif
-+
- #define readlink_trivial_usage \
-- ""
-+ USAGE_READLINK_FOLLOW("[-f] ") "FILE"
- #define readlink_full_usage \
-- "Displays the value of a symbolic link."
-+ "Displays the value of a symbolic link." \
-+ USAGE_READLINK_FOLLOW("\n\nOptions:\n" \
-+ "\t-f\tcanonicalize by following all symlinks")
-
- #define realpath_trivial_usage \
- "pathname ..."
diff --git a/sys-apps/busybox/files/1.00/standalone.patch b/sys-apps/busybox/files/1.00/standalone.patch
deleted file mode 100644
index 25acc4faabef..000000000000
--- a/sys-apps/busybox/files/1.00/standalone.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- trunk/busybox/shell/ash.c 2005/02/10 00:44:31 9838
-+++ trunk/busybox/shell/ash.c 2005/05/07 08:27:34 10264
-@@ -3722,27 +3722,13 @@
- {
- int repeated = 0;
- #ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL
-- int flg_bb = 0;
-- char *name = cmd;
--
-- if(strchr(name, '/') == NULL && find_applet_by_name(name) != NULL) {
-- flg_bb = 1;
-- }
-- if(flg_bb) {
-- char **ap;
-- char **new;
--
-- *argv = name;
-- if(strcmp(name, "busybox")) {
-- for (ap = argv; *ap; ap++);
-- ap = new = xmalloc((ap - argv + 2) * sizeof(char *));
-- *ap++ = cmd = "/bin/busybox";
-- while ((*ap++ = *argv++));
-- argv = new;
-- repeated++;
-- } else {
-- cmd = "/bin/busybox";
-- }
-+ if(find_applet_by_name(cmd) != NULL) {
-+ /* re-exec ourselves with the new arguments */
-+ execve("/proc/self/exe",argv,envp);
-+ /* If proc isn't mounted, try hardcoded path to busybox binary*/
-+ execve("/bin/busybox",argv,envp);
-+ /* If they called chroot or otherwise made the binary no longer
-+ * executable, fall through */
- }
- #endif
-
diff --git a/sys-apps/busybox/files/1.00/sum.patch b/sys-apps/busybox/files/1.00/sum.patch
deleted file mode 100644
index 106bdbb47edf..000000000000
--- a/sys-apps/busybox/files/1.00/sum.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-Index: coreutils/Makefile.in
-===================================================================
---- coreutils/Makefile.in (revision 10147)
-+++ coreutils/Makefile.in (revision 10148)
-@@ -71,6 +71,7 @@
- COREUTILS-$(CONFIG_SLEEP) += sleep.o
- COREUTILS-$(CONFIG_SORT) += sort.o
- COREUTILS-$(CONFIG_STTY) += stty.o
-+COREUTILS-$(CONFIG_SUM) += sum.o
- COREUTILS-$(CONFIG_SYNC) += sync.o
- COREUTILS-$(CONFIG_TAIL) += tail.o
- COREUTILS-$(CONFIG_TEE) += tee.o
-Index: coreutils/sum.c
-===================================================================
---- coreutils/sum.c (revision 0)
-+++ coreutils/sum.c (revision 10148)
-@@ -0,0 +1,182 @@
-+/*
-+ * sum -- checksum and count the blocks in a file
-+ * Like BSD sum or SysV sum -r, except like SysV sum if -s option is given.
-+ *
-+ * Copyright (C) 86, 89, 91, 1995-2002, 2004 Free Software Foundation, Inc.
-+ * Copyright (C) 2005 by Erik Andersen <andersen@codepoet.org>
-+ * Copyright (C) 2005 by Mike Frysinger <vapier@gentoo.org>
-+ *
-+ * Written by Kayvan Aghaiepour and David MacKenzie
-+ * Taken from coreutils and turned into a busybox applet by Mike Frysinger
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ */
-+
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include <getopt.h>
-+
-+#include "libbb.h"
-+
-+/* 1 if any of the files read were the standard input */
-+static int have_read_stdin;
-+
-+/* make a little more readable and avoid using strcmp for just 2 bytes */
-+#define IS_STDIN(s) (s[0] == '-' && s[1] == '\0')
-+
-+/* Calculate and print the rotated checksum and the size in 1K blocks
-+ of file FILE, or of the standard input if FILE is "-".
-+ If PRINT_NAME is >1, print FILE next to the checksum and size.
-+ The checksum varies depending on sizeof (int).
-+ Return 1 if successful. */
-+static int bsd_sum_file(const char *file, int print_name)
-+{
-+ register FILE *fp;
-+ register int checksum = 0; /* The checksum mod 2^16. */
-+ register uintmax_t total_bytes = 0; /* The number of bytes. */
-+ register int ch; /* Each character read. */
-+
-+ if (IS_STDIN(file)) {
-+ fp = stdin;
-+ have_read_stdin = 1;
-+ } else {
-+ fp = fopen(file, "r");
-+ if (fp == NULL) {
-+ bb_perror_msg(file);
-+ return 0;
-+ }
-+ }
-+
-+ while ((ch = getc(fp)) != EOF) {
-+ ++total_bytes;
-+ checksum = (checksum >> 1) + ((checksum & 1) << 15);
-+ checksum += ch;
-+ checksum &= 0xffff; /* Keep it within bounds. */
-+ }
-+
-+ if (ferror(fp)) {
-+ bb_perror_msg(file);
-+ if (!IS_STDIN(file))
-+ fclose(fp);
-+ return 0;
-+ }
-+
-+ if (!IS_STDIN(file) && fclose(fp) == EOF) {
-+ bb_perror_msg(file);
-+ return 0;
-+ }
-+
-+ printf("%05d %5s ", checksum,
-+ make_human_readable_str(total_bytes, 1, 1024));
-+ if (print_name > 1)
-+ printf(file);
-+ putchar('\n');
-+
-+ return 1;
-+}
-+
-+/* Calculate and print the checksum and the size in 512-byte blocks
-+ of file FILE, or of the standard input if FILE is "-".
-+ If PRINT_NAME is >0, print FILE next to the checksum and size.
-+ Return 1 if successful. */
-+static int sysv_sum_file(const char *file, int print_name)
-+{
-+ int fd;
-+ unsigned char buf[8192];
-+ uintmax_t total_bytes = 0;
-+ int r;
-+ int checksum;
-+
-+ /* The sum of all the input bytes, modulo (UINT_MAX + 1). */
-+ unsigned int s = 0;
-+
-+ if (IS_STDIN(file)) {
-+ fd = 0;
-+ have_read_stdin = 1;
-+ } else {
-+ fd = open(file, O_RDONLY);
-+ if (fd == -1) {
-+ bb_perror_msg(file);
-+ return 0;
-+ }
-+ }
-+
-+ while (1) {
-+ size_t i;
-+ size_t bytes_read = safe_read(fd, buf, sizeof(buf));
-+
-+ if (bytes_read == 0)
-+ break;
-+
-+ if (bytes_read == -1) {
-+ bb_perror_msg(file);
-+ if (!IS_STDIN(file))
-+ close(fd);
-+ return 0;
-+ }
-+
-+ for (i = 0; i < bytes_read; i++)
-+ s += buf[i];
-+ total_bytes += bytes_read;
-+ }
-+
-+ if (!IS_STDIN(file) && close(fd) == -1) {
-+ bb_perror_msg(file);
-+ return 0;
-+ }
-+
-+ r = (s & 0xffff) + ((s & 0xffffffff) >> 16);
-+ checksum = (r & 0xffff) + (r >> 16);
-+
-+ printf("%d %s ", checksum,
-+ make_human_readable_str(total_bytes, 1, 512));
-+ if (print_name)
-+ printf(file);
-+ putchar('\n');
-+
-+ return 1;
-+}
-+
-+int sum_main(int argc, char **argv)
-+{
-+ int flags;
-+ int ok;
-+ int files_given;
-+ int (*sum_func)(const char *, int) = bsd_sum_file;
-+
-+ /* give the bsd func priority over sysv func */
-+ flags = bb_getopt_ulflags(argc, argv, "sr");
-+ if (flags & 1)
-+ sum_func = sysv_sum_file;
-+ if (flags & 2)
-+ sum_func = bsd_sum_file;
-+
-+ have_read_stdin = 0;
-+ files_given = argc - optind;
-+ if (files_given <= 0)
-+ ok = sum_func("-", files_given);
-+ else
-+ for (ok = 1; optind < argc; optind++)
-+ ok &= sum_func(argv[optind], files_given);
-+
-+ if (have_read_stdin && fclose(stdin) == EOF)
-+ bb_perror_msg_and_die("-");
-+
-+ exit(ok ? EXIT_SUCCESS : EXIT_FAILURE);
-+}
-Index: coreutils/Config.in
-===================================================================
---- coreutils/Config.in (revision 10147)
-+++ coreutils/Config.in (revision 10148)
-@@ -428,6 +428,12 @@
- help
- stty is used to change and print terminal line settings.
-
-+config CONFIG_SUM
-+ bool "sum"
-+ default n
-+ help
-+ checksum and count the blocks in a file
-+
- config CONFIG_SYNC
- bool "sync"
- default n
---- include/usage.h
-+++ include/usage.h
-@@ -2316,6 +2322,14 @@
- "\t-h\tName of the remote host for this login.\n" \
- "\t-p\tPreserve environment."
-
-+#define sum_trivial_usage \
-+ "[rs] [files...]"
-+#define sum_full_usage \
-+ "checksum and count the blocks in a file\n\n" \
-+ "Options:\n" \
-+ "\t-r\tuse BSD sum algorithm (1K blocks)\n" \
-+ "\t-s\tuse System V sum algorithm (512byte blocks)\n"
-+
- #define swapoff_trivial_usage \
- "[OPTION] [DEVICE]"
- #define swapoff_full_usage \
---- include/applets.h
-+++ include/applets.h
-@@ -545,6 +548,9 @@
- #ifdef CONFIG_SULOGIN
- APPLET(sulogin, sulogin_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
- #endif
-+#ifdef CONFIG_SUM
-+ APPLET(sum, sum_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
-+#endif
- #ifdef CONFIG_SWAPONOFF
- APPLET(swapoff, swap_on_off_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
- #endif
diff --git a/sys-apps/busybox/files/digest-busybox-1.00-r4 b/sys-apps/busybox/files/digest-busybox-1.00-r4
deleted file mode 100644
index de383caef616..000000000000
--- a/sys-apps/busybox/files/digest-busybox-1.00-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 af5bc43f345f102fc257787d7beacaac busybox-1.00-e2fsprogs.patch.bz2 16713
-RMD160 7c70d03f902f916fff02cf4ce126ba19db65ea56 busybox-1.00-e2fsprogs.patch.bz2 16713
-SHA256 15fa252f80c08e7d9a82d78f5b7d2118c6ffbe233ae732d3289f7ac3830612b6 busybox-1.00-e2fsprogs.patch.bz2 16713
-MD5 5c7ea9b5d3b3677dfcdcec38b281a756 busybox-1.00.tar.bz2 1118427
-RMD160 357a65c86ca9188a381c69e9c8ded8a3c80a2f50 busybox-1.00.tar.bz2 1118427
-SHA256 aefbd1abb592a3234298ab80ba58567fc46fa63348b054de3471ec9a717291a0 busybox-1.00.tar.bz2 1118427
diff --git a/sys-apps/busybox/files/digest-busybox-1.01 b/sys-apps/busybox/files/digest-busybox-1.01
deleted file mode 100644
index cec09d6958c9..000000000000
--- a/sys-apps/busybox/files/digest-busybox-1.01
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 af5bc43f345f102fc257787d7beacaac busybox-1.00-e2fsprogs.patch.bz2 16713
-RMD160 7c70d03f902f916fff02cf4ce126ba19db65ea56 busybox-1.00-e2fsprogs.patch.bz2 16713
-SHA256 15fa252f80c08e7d9a82d78f5b7d2118c6ffbe233ae732d3289f7ac3830612b6 busybox-1.00-e2fsprogs.patch.bz2 16713
-MD5 f250842dae2854a38470ed16a46bba66 busybox-1.01.tar.bz2 954613
-RMD160 dfd9027208161977a8bcc920c7656fbf1b305446 busybox-1.01.tar.bz2 954613
-SHA256 3e2ceb893d6267e6ed230826b2e5990cb20999b349621a1a6ae9f927fdb85499 busybox-1.01.tar.bz2 954613
diff --git a/sys-apps/busybox/files/digest-busybox-1.1.1 b/sys-apps/busybox/files/digest-busybox-1.1.1
deleted file mode 100644
index 4994a530ed1c..000000000000
--- a/sys-apps/busybox/files/digest-busybox-1.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ff1ade47255c643b68c9113c267ce712 busybox-1.1.1.tar.bz2 1424767
-RMD160 f95b4f0756a7391922ee477635719a7bfbac78e9 busybox-1.1.1.tar.bz2 1424767
-SHA256 1334d7631305eb700f03006f9b3f2cf1031d774f2ff584325531186e33e9852a busybox-1.1.1.tar.bz2 1424767
diff --git a/sys-apps/busybox/files/digest-busybox-1.1.2 b/sys-apps/busybox/files/digest-busybox-1.1.2
deleted file mode 100644
index c682f2e887a9..000000000000
--- a/sys-apps/busybox/files/digest-busybox-1.1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0b5d78072302fe687407956537bdb9e3 busybox-1.1.2.tar.bz2 1427310
-RMD160 106dfce4d83438a77ef87799fdddc3d246f570ff busybox-1.1.2.tar.bz2 1427310
-SHA256 068cd2b46273d722b178314c8eab755d771d52bb5f82c6db34dbeca0e56db350 busybox-1.1.2.tar.bz2 1427310