summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-03-25 14:51:10 +0000
committerMike Frysinger <vapier@gentoo.org>2007-03-25 14:51:10 +0000
commitf4e6a255760f3a7a105fff7f98f2785c47f38abc (patch)
treeafed1a48aa1be0eb566771d81c7f83197fb62042 /sys-apps
parentx86 stable wrt bug 147432 (diff)
downloadhistorical-f4e6a255760f3a7a105fff7f98f2785c47f38abc.tar.gz
historical-f4e6a255760f3a7a105fff7f98f2785c47f38abc.tar.bz2
historical-f4e6a255760f3a7a105fff7f98f2785c47f38abc.zip
Version bump.
Package-Manager: portage-2.1.2.2
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/busybox/ChangeLog7
-rw-r--r--sys-apps/busybox/Manifest22
-rw-r--r--sys-apps/busybox/busybox-1.4.2.ebuild263
-rw-r--r--sys-apps/busybox/files/digest-busybox-1.4.23
4 files changed, 287 insertions, 8 deletions
diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 051d0ba494f6..82a0952c912c 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/busybox
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.132 2007/03/24 20:48:03 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.133 2007/03/25 14:51:10 vapier Exp $
+
+*busybox-1.4.2 (25 Mar 2007)
+
+ 25 Mar 2007; Mike Frysinger <vapier@gentoo.org> +busybox-1.4.2.ebuild:
+ Version bump.
27 Mar 2007; Stephanie Lockwood-Childs <wormo@gentoo.org>
busybox-1.4.1-r2.ebuild:
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 3d8fa8e7ffcd..3cfa5af526d8 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -37,6 +37,7 @@ DIST busybox-1.2.2.1.tar.bz2 1413458 RMD160 f61662f1ee12a7c65b9e65864c23242b6176
DIST busybox-1.3.1.shadow.patch 5561 RMD160 f10dd2af66b439bb4d46056e8fc15756080bb093 SHA1 29df47a3ebb262f50a11d8be4275574bfe922894 SHA256 46cf2a7fb0ec805650e80afab844b1b98fd434dac965ec2b02b852b9b56401a5
DIST busybox-1.3.1.tar.bz2 1485979 RMD160 bdfb93353aa899ef246cea0180c7341c32e6a8ac SHA1 f054e6060c69e4527bab980a972954860191c028 SHA256 5bf9ead9cca99620d2e56ddf79fdf5fb306fd7f30087b5556e0956e3b1948206
DIST busybox-1.4.1.tar.bz2 1510432 RMD160 6ea5461718fae52b9ee3b966e49a226a0685fd28 SHA1 e349e3585448ba0f7c28504326301ea130eb2e35 SHA256 2936318008322392716a9d3566bcff071cf5c97cb1df1f5953ec5b5a8a1701bb
+DIST busybox-1.4.2.tar.bz2 1509690 RMD160 222c2f2bcabeba45b8233981c8071fe4f4d62bf3 SHA1 d654727c62f324ab13295095c219451b969beb87 SHA256 da1a9b1c9e210e3e129ab8a3b4e6af2fe093673e3f60722931e2c722d4c29b0f
EBUILD busybox-1.2.2.1.ebuild 8396 RMD160 ffbef18529822cae10cc31eccdfd44f93a7c8a60 SHA1 b2c73972405427f088d568e51ef9020af5d8df86 SHA256 da92d568455d43bd1641cc8b08cb577c8d003c6706adab522261d9cfb37e8b73
MD5 a011b6d6d45e98f79185530468b03cbd busybox-1.2.2.1.ebuild 8396
RMD160 ffbef18529822cae10cc31eccdfd44f93a7c8a60 busybox-1.2.2.1.ebuild 8396
@@ -53,10 +54,14 @@ EBUILD busybox-1.4.1-r2.ebuild 8283 RMD160 497b7fb833312314508dbe396da2e160c8c74
MD5 3b9d97c942f77c81609a90462f32383a busybox-1.4.1-r2.ebuild 8283
RMD160 497b7fb833312314508dbe396da2e160c8c745ba busybox-1.4.1-r2.ebuild 8283
SHA256 6bc52bfd1802760150f05ecef423ec3ba7ac7363542fc4a5df6c512a08a0083f busybox-1.4.1-r2.ebuild 8283
-MISC ChangeLog 20955 RMD160 6cd2da5baae75211828a41e527a0af93f03dfe65 SHA1 86dd5682895857241a8cda48b78353c4a9827c28 SHA256 38dee41854cc96e0cbcef57225f83052b4465cd96a4fd76bb0e08ba8427e811d
-MD5 da3691315b2cd8bfffbdf681620c5cbf ChangeLog 20955
-RMD160 6cd2da5baae75211828a41e527a0af93f03dfe65 ChangeLog 20955
-SHA256 38dee41854cc96e0cbcef57225f83052b4465cd96a4fd76bb0e08ba8427e811d ChangeLog 20955
+EBUILD busybox-1.4.2.ebuild 8197 RMD160 924a50f3a7fcb4068230a04436af2ef2fb930bcc SHA1 fa10247cf6f162eccf5e249ff21d5cee72e86579 SHA256 eb95a4599d8459de6aa88979da468d2121fed478f60bcb9d81f40ca1f6368a1d
+MD5 0011bd21b5bd31aaedd38aa7ab890991 busybox-1.4.2.ebuild 8197
+RMD160 924a50f3a7fcb4068230a04436af2ef2fb930bcc busybox-1.4.2.ebuild 8197
+SHA256 eb95a4599d8459de6aa88979da468d2121fed478f60bcb9d81f40ca1f6368a1d busybox-1.4.2.ebuild 8197
+MISC ChangeLog 21076 RMD160 ebd99078e7ca6653c0db50d3e91039eee07f9868 SHA1 95a9c98fbcac774d9a7914ccac8d4e4886511196 SHA256 76ffe4b6e25c7ce6e5b44b0e8c00f5cebe35c03380a463995c3338af7b01e18b
+MD5 7d5356a1bc461f591004655f0c1b8a2b ChangeLog 21076
+RMD160 ebd99078e7ca6653c0db50d3e91039eee07f9868 ChangeLog 21076
+SHA256 76ffe4b6e25c7ce6e5b44b0e8c00f5cebe35c03380a463995c3338af7b01e18b ChangeLog 21076
MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e
MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161
RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161
@@ -73,10 +78,13 @@ SHA256 2669a53173c0714675b01a7293172ce8eaf36319abcd8ca389a9cd35b21f5b55 files/di
MD5 a5150ef066e89f3b358fa27acad7e932 files/digest-busybox-1.4.1-r2 247
RMD160 bc8a40b9b31f95d7bdc81173a67d5ce67b6f082b files/digest-busybox-1.4.1-r2 247
SHA256 2669a53173c0714675b01a7293172ce8eaf36319abcd8ca389a9cd35b21f5b55 files/digest-busybox-1.4.1-r2 247
+MD5 1df578676facc3fe56ed697bc5bfc1e5 files/digest-busybox-1.4.2 247
+RMD160 9695ea532e5496507748302b2f75cacaf3bea5b9 files/digest-busybox-1.4.2 247
+SHA256 404ab986c54ba354af6d6f9ca8ff9c4338372ecad4f3e7019857f8b3f2361863 files/digest-busybox-1.4.2 247
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.3 (GNU/Linux)
-iD8DBQFGBop78bi6rjpTunYRAniFAJ9Gr+5pyxAs0lkRRlEUcKI3yKHC0wCgs/i0
-uE+wEjxQZ7AW+FBMEY6J/o4=
-=2C38
+iD8DBQFGBoyD8bi6rjpTunYRAjLTAJ48blo4SFK4qbU1z1n7wwkXgmyDXQCdHkgC
+EQ/ybvRadwAZZm45H5KY8M0=
+=vASA
-----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.4.2.ebuild b/sys-apps/busybox/busybox-1.4.2.ebuild
new file mode 100644
index 000000000000..9802968f7d35
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.4.2.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.4.2.ebuild,v 1.1 2007/03/25 14:51:10 vapier Exp $
+
+inherit eutils flag-o-matic
+
+################################################################################
+# BUSYBOX ALTERNATE CONFIG MINI-HOWTO
+#
+# Busybox can be modified in many different ways. Here's a few ways to do it:
+#
+# (1) Emerge busybox with FEATURES=keepwork so the work directory won't
+# get erased afterwards. Add a definition like ROOT=/my/root/path to the
+# start of the line if you're installing to somewhere else than the root
+# directory. This command will save the default configuration to
+# ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not
+# defined), and it will tell you that it has done this. Note the location
+# where the config file was saved.
+#
+# FEATURES=keepwork USE=savedconfig emerge busybox
+#
+# (2) Go to the work directory and change the configuration of busybox using its
+# menuconfig feature.
+#
+# cd /var/tmp/portage/busybox*/work
+# make menuconfig
+#
+#
+# (3) Save your configuration to the default location and copy it to the
+# savedconfig location as follows. Replace X.X.X by the version of
+# busybox, and change the path if you're overriding ${ROOT} or
+# ${PORTAGE_CONFIGROOT}. The file should overwrite the default config
+# file that was written by the ebuild during step 1.
+#
+# cp .config /etc/portage/savedconfig/busybox-X.X.X.config
+#
+# (4) Execute the same command as in step 1 to build the new busybox config;
+# the FEATURES=keepwork option is probably no longer necessary unless you
+# want to modify the configuration further.
+#
+################################################################################
+#
+# (1) Alternatively skip the above steps and simply emerge busybox with
+# USE=savedconfig and edit the file it saves by hand. Then remerge bb as
+# needed.
+#
+################################################################################
+
+
+#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 make-symlinks"
+RESTRICT="test"
+
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+# <pebenito> then eventually turning on selinux would mean
+# adding a dep: selinux? ( sys-libs/libselinux )
+
+pkg_setup() {
+ # Catch most people for now #159497 ... delete this check
+ # once we move to stable for releases
+ if [[ $(LC_ALL="C" date +%Z) == "Local time zone must be set--see zic manual page" ]] ; then
+ eerror "You forgot to set up your /etc/localtime."
+ eerror "You should do so now."
+ die "forgetful admin detected"
+ fi
+}
+
+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;;
+ *) use $1 \
+ && busybox_config_option y $2 \
+ || busybox_config_option n $2
+ return 0
+ ;;
+ esac
+ einfo $(grep "CONFIG_$2[= ]" .config)
+}
+
+src_unpack() {
+ unset KBUILD_OUTPUT #88088
+
+ unpack ${MY_P}.tar.bz2
+ cd "${S}"
+
+ # patches go here!
+ epatch "${FILESDIR}"/1.4.0/bb.patch
+
+ # work around broken ass powerpc compilers
+ use ppc64 && append-flags -mminimal-toc
+ # flag cleanup
+ sed -i \
+ -e 's: -Werror : :' \
+ -e 's:-Os -falign-functions=1 -falign-jumps=1 -falign-loops=1::' \
+ -e 's:-fomit-frame-pointer::' \
+ Makefile.flags
+ sed -i 's:-Wl,--gc-sections::' Makefile
+ sed -i "/^CFLAGS.*:=/s:$: ${CFLAGS}:" Makefile
+ echo "CROSS_COMPILE := ${CHOST}-" >> Makefile.flags
+
+ # 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
+ local conf root
+ [[ -r .config ]] && rm .config
+ for conf in {${PF},${P},${PN}}{,-${CHOST}} ; do
+ for root in "${PORTAGE_CONFIGROOT}" "${ROOT}" / ; do
+ configfile=${root}etc/portage/savedconfig/${conf}.config
+ if [[ -r ${configfile} ]] ; then
+ einfo "Found your ${configfile} and using it."
+ cp ${configfile} "${S}"/.config
+ yes "" | make oldconfig > /dev/null
+ return 0
+ fi
+ done
+ done
+ ewarn "Could not locate user configfile, so we will save a default one"
+ 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 DEBUG_YANK_SUSv2 DEBUG_INIT \
+ DEBUG_CROND_OPTION FEATURE_UDHCP_DEBUG TASKSET
+ do
+ busybox_config_option n ${opt}
+ done
+
+ make oldconfig > /dev/null
+}
+
+src_compile() {
+ unset KBUILD_OUTPUT #88088
+
+ emake busybox || die "build failed"
+ if ! use static ; then
+ mv busybox_unstripped{,.bak}
+ LDFLAGS="${LDFLAGS} -static" emake busybox || die "static build failed"
+ mv busybox_unstripped bb
+ mv busybox_unstripped{.bak,}
+ fi
+}
+
+src_install() {
+ unset KBUILD_OUTPUT #88088
+
+ into /
+ newbin busybox_unstripped busybox || die
+ use static \
+ && dosym busybox /bin/bb \
+ || dobin bb
+ dosym bb /bin/busybox.static
+
+ # bundle up the symlink files for use later
+ emake install || die
+ rm _install/bin/busybox
+ tar cf busybox-links.tar -C _install . || : #;die
+ insinto /usr/share/${PN}
+ doins busybox-links.tar || die
+ newins .config ${PF}.config || die
+
+ dodoc AUTHORS README TODO
+
+ cd docs || die
+ docinto txt
+ dodoc *.txt
+ docinto pod
+ dodoc *.pod
+ dohtml *.html *.sgml
+
+ 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
+}
+
+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 realy what you want."
+ die "silly options will destroy your system"
+ fi
+
+ if use make-symlinks ; then
+ mv "${D}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+ fi
+ if use savedconfig ; then
+ mv "${D}"/usr/share/${PN}/${PF}.config "${T}"/ || die
+ fi
+}
+
+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 savedconfig ; then
+ local config_dir="${PORTAGE_CONFIGROOT:-${ROOT}}/etc/portage/savedconfig"
+ einfo "Saving this build config to ${config_dir}/${PF}.config"
+ einfo "Read this ebuild for more info on how to take advantage of this option"
+ mkdir -p "${config_dir}"
+ cp "${T}"/${PF}.config "${config_dir}"/${PF}.config
+ return 0
+ fi
+ 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/digest-busybox-1.4.2 b/sys-apps/busybox/files/digest-busybox-1.4.2
new file mode 100644
index 000000000000..ac9ac28ece23
--- /dev/null
+++ b/sys-apps/busybox/files/digest-busybox-1.4.2
@@ -0,0 +1,3 @@
+MD5 b4c61fb15642be9dde20e8493788c585 busybox-1.4.2.tar.bz2 1509690
+RMD160 222c2f2bcabeba45b8233981c8071fe4f4d62bf3 busybox-1.4.2.tar.bz2 1509690
+SHA256 da1a9b1c9e210e3e129ab8a3b4e6af2fe093673e3f60722931e2c722d4c29b0f busybox-1.4.2.tar.bz2 1509690