diff options
author | Steve Dibb <beandog@gentoo.org> | 2007-10-17 18:58:28 +0000 |
---|---|---|
committer | Steve Dibb <beandog@gentoo.org> | 2007-10-17 18:58:28 +0000 |
commit | 7c54b452b65bf4dd86dae422ef5687199398d06f (patch) | |
tree | 8866efd58cceaf512d949ee502c343ccdf63e800 /sys-apps/busybox | |
parent | stable x86, security bug 196164 (diff) | |
download | historical-7c54b452b65bf4dd86dae422ef5687199398d06f.tar.gz historical-7c54b452b65bf4dd86dae422ef5687199398d06f.tar.bz2 historical-7c54b452b65bf4dd86dae422ef5687199398d06f.zip |
Version bump
Package-Manager: portage-2.1.3.12
Diffstat (limited to 'sys-apps/busybox')
-rw-r--r-- | sys-apps/busybox/ChangeLog | 7 | ||||
-rw-r--r-- | sys-apps/busybox/Manifest | 16 | ||||
-rw-r--r-- | sys-apps/busybox/busybox-1.7.2.ebuild | 235 | ||||
-rw-r--r-- | sys-apps/busybox/files/digest-busybox-1.7.2 | 3 |
4 files changed, 256 insertions, 5 deletions
diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index 9fd4aaa7575d..f5119747cbc6 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.161 2007/10/15 14:50:40 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.162 2007/10/17 18:58:28 beandog Exp $ + +*busybox-1.7.2 (17 Oct 2007) + + 17 Oct 2007; Steve Dibb <beandog@gentoo.org> +busybox-1.7.2.ebuild: + Version bump 15 Oct 2007; Markus Rothe <corsair@gentoo.org> busybox-1.6.1.ebuild: Stable on ppc64 diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index d4cb63a4fc4a..85f7ebd8ca4d 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -46,6 +46,7 @@ DIST busybox-1.6.0.tar.bz2 1689981 RMD160 56ee3ebefa5f2c6bfad84375b3f7f0752d31fc DIST busybox-1.6.1.tar.bz2 1692099 RMD160 5fc8a3abeea8988777a9699bdffe025804ec1056 SHA1 ff79db26fa53c20808de4d6f3514f34044749a77 SHA256 d1c7ee084266a168372755929cc59cd27a5ddc136a97608b855f0dba5f7ba8c2 DIST busybox-1.7.0.tar.bz2 1726650 RMD160 23691b0e908028d109138c1fdf719c35aada6bdc SHA1 84395ec037f23f08bdfc35e808622f344ab3c708 SHA256 b8b991dda8d386ef0210b421670efa6f72da2a5c382c544e6791efa0cbaeac76 DIST busybox-1.7.1.tar.bz2 1728262 RMD160 42ba3ef6033b8d74c31251810f73c48ddb3820e1 SHA1 439ebcbe2b48e19e1c9acc5aa886b24795d523b1 SHA256 8b6a5fe183cbc19c73db475aaba73af0ba2cba386f3b206fb7720dcf94da549c +DIST busybox-1.7.2.tar.bz2 1729040 RMD160 f9850b3949ad61dfae37c7ab48eac6c9507eb537 SHA1 d9c618a7b104af4e70d623b1b6f3bc454405e12b SHA256 83c4cc813124a43f13e2ebb83cea9da9909d63891b824bf4bc7006f0567db7cf EBUILD busybox-1.4.1-r2.ebuild 7981 RMD160 83426ba5b68db54a6201fcbe9f7213908b8b8457 SHA1 6394e28e73cdea532532afbb674076d029a029b7 SHA256 bf7a7ee065cefa47aa00eb06714cf6225b664968a95f826d8ada3f8489cb79a3 MD5 7221bd06e12defbe8b271d914f0e1b95 busybox-1.4.1-r2.ebuild 7981 RMD160 83426ba5b68db54a6201fcbe9f7213908b8b8457 busybox-1.4.1-r2.ebuild 7981 @@ -78,10 +79,14 @@ EBUILD busybox-1.7.1.ebuild 7015 RMD160 895fb24957205cae59cf631642934418773066d4 MD5 74247c508dd7103a9e4d580741f7ae92 busybox-1.7.1.ebuild 7015 RMD160 895fb24957205cae59cf631642934418773066d4 busybox-1.7.1.ebuild 7015 SHA256 6e4bde9de725a4ac3d02f44daac357824831050b594fe082a58af2da687758a3 busybox-1.7.1.ebuild 7015 -MISC ChangeLog 24390 RMD160 991681d12e1ae947ba6d6838ee39c9c67918371d SHA1 998210c4f600dc54187fed672837d41494f14b18 SHA256 490f4b82507fba6749ad48a75f15e17fd7a901b3e20eba9bd343fcdd05cb2114 -MD5 500b37443e15d4d6627a9c8a5715684a ChangeLog 24390 -RMD160 991681d12e1ae947ba6d6838ee39c9c67918371d ChangeLog 24390 -SHA256 490f4b82507fba6749ad48a75f15e17fd7a901b3e20eba9bd343fcdd05cb2114 ChangeLog 24390 +EBUILD busybox-1.7.2.ebuild 7017 RMD160 f9385d31753be5c1d38713f40c32c4425956feaa SHA1 fefd0c431e5e759fe385f5991586196586745ff5 SHA256 b12b6a6df4da7a6d888091b8e4e3bc350dd51aeb2896906c0028ecaabdfed15f +MD5 dc8fd178fcf88e873e82a552b5a62462 busybox-1.7.2.ebuild 7017 +RMD160 f9385d31753be5c1d38713f40c32c4425956feaa busybox-1.7.2.ebuild 7017 +SHA256 b12b6a6df4da7a6d888091b8e4e3bc350dd51aeb2896906c0028ecaabdfed15f busybox-1.7.2.ebuild 7017 +MISC ChangeLog 24506 RMD160 83adb61e1b1ff9538c2a938456c68955561ec25f SHA1 71fb8fc4c0fa8f4acd5b65f9e7bfbfb851318d2b SHA256 ac156e55e23e2bb2f1224daa01b0cb939320985ca0d17f2ae12a59fc1b07e30b +MD5 e5314e84b8fa1b826f023e5fb83895da ChangeLog 24506 +RMD160 83adb61e1b1ff9538c2a938456c68955561ec25f ChangeLog 24506 +SHA256 ac156e55e23e2bb2f1224daa01b0cb939320985ca0d17f2ae12a59fc1b07e30b ChangeLog 24506 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161 @@ -110,3 +115,6 @@ SHA256 f879f15c80c48716cdd3d0b2daf84dca99b91b9149d371a55793b4eb6d16fdcb files/di MD5 b845a7940bb1d8df2d9dc58815e5e000 files/digest-busybox-1.7.1 247 RMD160 fcc24a9c07f874b544eaec3d3635f2a73d192108 files/digest-busybox-1.7.1 247 SHA256 759e7a72ce1d693dce080e707a86f6e97f4cac8e441815525e98f113ca977892 files/digest-busybox-1.7.1 247 +MD5 d378f96c7e0917c8a112ee59cb5e12b5 files/digest-busybox-1.7.2 247 +RMD160 b454bfb2035301ed7a71e78735761d4479dd684d files/digest-busybox-1.7.2 247 +SHA256 45828cbb8ff1bf28b44e3b750812585eff99c87a99d87d2a9694a360285d68b1 files/digest-busybox-1.7.2 247 diff --git a/sys-apps/busybox/busybox-1.7.2.ebuild b/sys-apps/busybox/busybox-1.7.2.ebuild new file mode 100644 index 000000000000..547a2179686f --- /dev/null +++ b/sys-apps/busybox/busybox-1.7.2.ebuild @@ -0,0 +1,235 @@ +# 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.7.2.ebuild,v 1.1 2007/10/17 18:58:28 beandog Exp $ + +inherit eutils flag-o-matic savedconfig + +################################################################################ +# 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 +# one of the locations listed in /usr/portage/eclass/savedconfig.eclass +# +# (4) Emerge busybox with USE=savedconfig to use the configuration file you +# just generated. +# +################################################################################ +# +# (1) Alternatively skip the above steps and simply emerge busybox without +# USE=savedconfig. +# +# (2) Edit the file it saves by hand. ${ROOT}"/etc/portage/savedconfig/${CATEGORY}/${PF} +# +# (3) Remerge busybox as using USE=savedconfig. +# +################################################################################ + +#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 pam static make-symlinks selinux" +RESTRICT="test" + +DEPEND="selinux? ( sys-libs/libselinux ) + pam? ( sys-libs/pam )" + +S=${WORKDIR}/${MY_P} + +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}"/busybox-1.7.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 '/^#error Aborting compilation./d' applets/applets.c + 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. + + restore_config .config + if [ -f .config ]; then + yes "" | make oldconfig > /dev/null + return 0 + else + 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 + + if use static && use pam ; then + ewarn "You cannot have USE='static pam'. Assuming static is more important." + fi + use static \ + && busybox_config_option n PAM \ + || busybox_config_option pam PAM + 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 && ! use pam ; then + mv busybox_unstripped{,.bak} + emake CONFIG_STATIC=y busybox || die "static build failed" + mv busybox_unstripped bb + mv busybox_unstripped{.bak,} + fi +} + +src_install() { + unset KBUILD_OUTPUT #88088 + save_config .config + + into / + newbin busybox_unstripped busybox || die + if use static || use pam ; then + dosym busybox /bin/bb || die + dosym bb /bin/busybox.static || die + else + dobin bb || die + fi + + insinto /$(get_libdir)/rcscripts/addons + doins "${FILESDIR}"/mdev-start.sh || die + + # 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 +} + +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 + + 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.7.2 b/sys-apps/busybox/files/digest-busybox-1.7.2 new file mode 100644 index 000000000000..ff8d1d00d89b --- /dev/null +++ b/sys-apps/busybox/files/digest-busybox-1.7.2 @@ -0,0 +1,3 @@ +MD5 c91ec9756e2000073a9dd8fa9fc3f89e busybox-1.7.2.tar.bz2 1729040 +RMD160 f9850b3949ad61dfae37c7ab48eac6c9507eb537 busybox-1.7.2.tar.bz2 1729040 +SHA256 83c4cc813124a43f13e2ebb83cea9da9909d63891b824bf4bc7006f0567db7cf busybox-1.7.2.tar.bz2 1729040 |