From: Mike Frysinger Date: Tue, 28 Mar 2006 02:39:58 +0000 (+0000) Subject: Version bump #127420 by Natanael Copa. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f184891932448b7724358c93f0582359ddcc2102;p=gentoo.git Version bump #127420 by Natanael Copa. Package-Manager: portage-2.1_pre7-r2 --- diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index 8803a088bd08..cf10e1d52cfb 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/busybox # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.83 2006/03/28 00:28:04 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.84 2006/03/28 02:39:58 vapier Exp $ + +*busybox-1.1.1 (28 Mar 2006) + + 28 Mar 2006; Mike Frysinger +files/1.1.1/bb.patch, + +busybox-1.1.1.ebuild: + Version bump #127420 by Natanael Copa. 28 Mar 2006; Gustavo Zacarias busybox-1.1.0.ebuild: Stable on sparc wrt #127377 diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index ed2997e6f82b..eb52799cb6c0 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -1,34 +1,91 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 80a2f8f2fb8f547366396ec5182fa57e ChangeLog 14797 +MD5 253b9314b5245a48c3edc83b78cb4ecf ChangeLog 14965 +RMD160 3e831f15de2a46fcd4b7a5bb4045b5301c2573f6 ChangeLog 14965 +SHA256 d3b9490e0568be121fea9cdeac81ee1b4048bf3e4a39636294fee7a4ff409af2 ChangeLog 14965 MD5 ef371aabe6da10b27577d6b87f35df44 busybox-1.00-r4.ebuild 7100 +RMD160 450e11502218ffc5b667cc2390437f5f1fa07e3b busybox-1.00-r4.ebuild 7100 +SHA256 b18b6474046e4ac82ed7d09379e4a4e399e1a8d9a5d489fc6767866b90086185 busybox-1.00-r4.ebuild 7100 MD5 b0336ac088a950a2da4f6466bc199b02 busybox-1.01.ebuild 6933 -MD5 9fcb3743f0bc23397536a944d8d27213 busybox-1.1.0.ebuild 6630 +RMD160 312c03f049ba105482851f0708c6d8aee649c205 busybox-1.01.ebuild 6933 +SHA256 33833d698e1eb0c94aa02d2cd995b5f62d3df51aa7fff0d1ded4110e46a91239 busybox-1.01.ebuild 6933 +MD5 30ecaf2d5329c52963956d900816e5d7 busybox-1.1.0.ebuild 6677 +RMD160 c40ce0d88b6f011458eb01c59dfa9f9f52c331f9 busybox-1.1.0.ebuild 6677 +SHA256 58d33560e7dd3d3be0ff6b5e81791e86336419dd7fac650ee79807f86f63bdc0 busybox-1.1.0.ebuild 6677 +MD5 2adf1073675f0b6644323313f6845853 busybox-1.1.1.ebuild 6407 +RMD160 b251ec840311ba3a43c68e6e068189b746e866e6 busybox-1.1.1.ebuild 6407 +SHA256 d7bd057f47736513fa5a2b16b2b5abfd9b5ac59f63011892b946d7f381c565e2 busybox-1.1.1.ebuild 6407 MD5 81f4a0289354f964e744acb2f74c1894 files/1.00/bash-tests.patch 1474 +RMD160 01c16591ff5d5b339a605a4372c6e431270862ed files/1.00/bash-tests.patch 1474 +SHA256 091f9aa2a5294cf9659ffaa2c6f995e9af2d0cdc2388ecab3620d06fd4ac4cb2 files/1.00/bash-tests.patch 1474 MD5 02bde866363ce5357e8dfadcf870b230 files/1.00/bb.patch 155 +RMD160 2a963bb2f9658d6d3500b2680785328c5b342475 files/1.00/bb.patch 155 +SHA256 a38b1fde80af6d8654fa5f393e3eae468c19b4a69685c65babf2fac664891c12 files/1.00/bb.patch 155 MD5 1587853e73bcbda7157048299fc659fe files/1.00/busybox-read-timeout.patch 1964 +RMD160 aa623aab22fba5a8ca7133b2ee8cc826437889df files/1.00/busybox-read-timeout.patch 1964 +SHA256 9fc405ca0fc964425c9b09a5fa38bed60040dad30d405edce8b1be79c1983e9d files/1.00/busybox-read-timeout.patch 1964 MD5 4972a3b12accd80b77304ff4ff6b6a3a files/1.00/cp-posix-opts.patch 1245 +RMD160 bebbde60e5b4ceda9c61ad3775195a145ec219af files/1.00/cp-posix-opts.patch 1245 +SHA256 c4e90f6af392fbb8abab98fd74952243250d94b63ce0301f56ed5fc91e6d8f55 files/1.00/cp-posix-opts.patch 1245 MD5 c5891798e8da55d3441b5361b62ee377 files/1.00/fix-amd64-insmod.patch 427 +RMD160 6b56a2346340bdc046bf0e448dc865f4a96e150f files/1.00/fix-amd64-insmod.patch 427 +SHA256 6e8bab9e384094515f19818e2bce2feac04fa2ab3f67183e43eb7b0929a9af3f files/1.00/fix-amd64-insmod.patch 427 MD5 8a3287074aab50454f7785651ddea71c files/1.00/gcc4.patch 632 +RMD160 e9186bc23092aa8db89414cd772578c05a5ce1fb files/1.00/gcc4.patch 632 +SHA256 3936befab1dca6723acde8f525ca58cced29bdb42e1c33f9750c7ecb35e1d6b9 files/1.00/gcc4.patch 632 MD5 42df6649bab3689e562877edf2694f04 files/1.00/more-insmod-arches.patch 1079 +RMD160 d87f4643ae279873b6b2f6257e4af20ceca953b3 files/1.00/more-insmod-arches.patch 1079 +SHA256 89f75f8ba728a517fdb6eb4032be5dcc8db521d08498863ffaa82142be01e6b5 files/1.00/more-insmod-arches.patch 1079 MD5 6209b38225ac1d7cc77f84799acbe3ca files/1.00/nice.patch 4571 +RMD160 52c825cdf2ed37540834cf9aa8dbe6afd28d4605 files/1.00/nice.patch 4571 +SHA256 7da1c4b4abda30146457c968a5d14d5c28556dd02e0108a60a59b8c2a2719174 files/1.00/nice.patch 4571 MD5 0e50cd0ad938a8c15f1af8b59028c959 files/1.00/printenv.patch 3365 +RMD160 a4942fa54d17f92c5d75b93f5b22aeb70a924f4b files/1.00/printenv.patch 3365 +SHA256 3389c26ebff4638981e8d0cd3d8ec74c89f6b170f844446e60dfd7c1b2f13f83 files/1.00/printenv.patch 3365 MD5 f16657b6a3bf9602a65dbb5f431afbda files/1.00/readlink-follow.patch 2795 +RMD160 cfe7634e97f3b56d2573d77ceb2747e8c5642153 files/1.00/readlink-follow.patch 2795 +SHA256 6ed3d3c49ed768d261ec67cdac6d45a99449d570ff6b27e9754217f82ced2716 files/1.00/readlink-follow.patch 2795 MD5 e4391db361a2ab2985811ec466f08cdc files/1.00/standalone.patch 1007 +RMD160 e047d9959393f7d9cb15c995fe9259f82b4ef48e files/1.00/standalone.patch 1007 +SHA256 ac3c6c1d4a9e1e7f73aed6fed4d016f75e53077284409e43c1031cba7697f90f files/1.00/standalone.patch 1007 MD5 593c8f8e26c0a381db171d9be08076c0 files/1.00/sum.patch 6723 +RMD160 6cedc91bc8acb696dd2c629851e052e22065c46b files/1.00/sum.patch 6723 +SHA256 f1b10d90fdcf0ee370ffb8a760dd3e82d3a6df4e213c03be99ed3803e7460a7d files/1.00/sum.patch 6723 MD5 9a2f1a6d14ff310ef48f55cc4841aa99 files/1.1.0/bb.patch 156 +RMD160 7dea06b8cad20585129845980fe06eb6d27ed159 files/1.1.0/bb.patch 156 +SHA256 094d7a95f64198666ea65bdd59f2ea93b7f489b9019bb045aa1c1d25e9f0ee53 files/1.1.0/bb.patch 156 MD5 aca87da03c58ee5ef16cc423a40b2249 files/1.1.0/glibc.patch 605 +RMD160 537c9fd550d61aea7c1f2a05d44ce0a9af8060a0 files/1.1.0/glibc.patch 605 +SHA256 0a252b3a7da5265cf439300d9a98e2c39bf418acc29b4f113a53e2552098415f files/1.1.0/glibc.patch 605 MD5 09f8e41306220183f16a668aa9e3cc76 files/1.1.0/ppc64-insmod.patch 359 +RMD160 4f423c216dbe5ba36e2589e51091775b21e398c2 files/1.1.0/ppc64-insmod.patch 359 +SHA256 822f72925dbff554a1f4e8c34a979bf7fc192b5683b62a40f6d78316b80d8a8c files/1.1.0/ppc64-insmod.patch 359 +MD5 b18000984506dc9c97619aa1cb7dd9f1 files/1.1.1/bb.patch 539 +RMD160 d3e9bc94ddb868c97b6fbd55af103fcac815ba19 files/1.1.1/bb.patch 539 +SHA256 9fc3caffbce98bbb985b1495ae9c54da0ddee9b235b29a0587693718a530204a files/1.1.1/bb.patch 539 MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853 +RMD160 3d62cf31765adbc88c7a39f0f21223d7e73ef627 files/config-netboot 9853 +SHA256 75cae861b7bae144ca86998cb90dae9bcb0f54e09ed0c36d1ed81ad79a401e3d files/config-netboot 9853 MD5 8eca6aae55dad92090e0136b58a9fcf7 files/digest-busybox-1.00-r4 142 +RMD160 ab359264555cd808eef30f09f5b82070043fc096 files/digest-busybox-1.00-r4 142 +SHA256 50b70755826d2949f40cbf2e650d37759b2179f0d6ba3389cd5dfa614d577fed files/digest-busybox-1.00-r4 142 MD5 adbc93ab59ec8e00c78e1807b35a0c6c files/digest-busybox-1.01 141 +RMD160 06e7f1b13073f8bffd958ed67535eb298651f7ff files/digest-busybox-1.01 141 +SHA256 38219f6679549d0e6b888b2a91b97fc466107e7410c50fbbc3cb1461a4e537d0 files/digest-busybox-1.01 141 MD5 f6c0e8bba77ce0a1ed09e590071c033c files/digest-busybox-1.1.0 247 +RMD160 960eafa3aed947d819a4f5e56935c5942f3b6999 files/digest-busybox-1.1.0 247 +SHA256 282946af248671965c9462ace860bf663937b5a784aa894585e0c36e56f8b6c8 files/digest-busybox-1.1.0 247 +MD5 254257cdc3e7a26e8f27dbd5182000fa files/digest-busybox-1.1.1 247 +RMD160 2d0a53fdcd784bec8dac774f14db5c0d3aad90ea files/digest-busybox-1.1.1 247 +SHA256 3cc230fe38ccbbefa6e64bcf6a9509a2847c54e553009a655e2d546926a3ae5d files/digest-busybox-1.1.1 247 MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161 +RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161 +SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e metadata.xml 161 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux) +Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFEKIM2KRy60XGEcJIRAlLsAJsGwG/FLhmCN2u1SsJ3naO6+F5ZhwCgl1/8 -7i26MBD4pebrrjW/8DHLJUU= -=47tM +iD8DBQFEKKJZ2+ySkm8kpY0RAvTVAJ4mrnCpYpzGpxS2lY9tDEsTRqBWegCeNDTJ +HslVrsc/CFPwOd07M65/E9s= +=ewwX -----END PGP SIGNATURE----- diff --git a/sys-apps/busybox/busybox-1.1.1.ebuild b/sys-apps/busybox/busybox-1.1.1.ebuild new file mode 100644 index 000000000000..6bc84c875e9e --- /dev/null +++ b/sys-apps/busybox/busybox-1.1.1.ebuild @@ -0,0 +1,232 @@ +# 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.1 2006/03/28 02:39:58 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 + +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} + +# 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." + 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 + 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 '/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.1.1/bb.patch b/sys-apps/busybox/files/1.1.1/bb.patch new file mode 100644 index 000000000000..43d3bc974a71 --- /dev/null +++ b/sys-apps/busybox/files/1.1.1/bb.patch @@ -0,0 +1,10 @@ +--- busybox-1.1.1/include/applets.h ++++ busybox-1.1.1/include/applets.h +@@ -57,6 +57,7 @@ + USE_ASH(APPLET_NOUSAGE(ash, ash_main, _BB_DIR_BIN, _BB_SUID_NEVER)) + USE_AWK(APPLET(awk, awk_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) + USE_BASENAME(APPLET(basename, basename_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) ++APPLET_NOUSAGE(bb, ash_main, _BB_DIR_BIN, _BB_SUID_NEVER) + USE_BBCONFIG(APPLET(bbconfig, bbconfig_main, _BB_DIR_BIN, _BB_SUID_NEVER)) + USE_BUNZIP2(APPLET(bunzip2, bunzip2_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) + /* Always enabled. */ diff --git a/sys-apps/busybox/files/digest-busybox-1.1.1 b/sys-apps/busybox/files/digest-busybox-1.1.1 new file mode 100644 index 000000000000..4994a530ed1c --- /dev/null +++ b/sys-apps/busybox/files/digest-busybox-1.1.1 @@ -0,0 +1,3 @@ +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