From: Ned Ludd Date: Sun, 14 Mar 2010 19:55:16 +0000 (+0000) Subject: - Version bump. Convert EAPI=2 and disable pam by default. Add ipv6 to IUSE to disabl... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e50952a9017c8a4062c3e899893d07b92bdbee80;p=gentoo.git - Version bump. Convert EAPI=2 and disable pam by default. Add ipv6 to IUSE to disable v6 applets unless requested. 8 new applets otherwise. lspci,lsusb,flashcp,mkfs.reiser,mkfs_ext2,ntpd,traceroute6,tune2fs,wall Package-Manager: portage-2.1.6.13/cvs/Linux i686 --- diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index dee0daddefdf..ebf0a7c480c8 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-apps/busybox # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.241 2010/03/14 17:55:22 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.242 2010/03/14 19:55:15 solar Exp $ + +*busybox-1.16.0 (14 Mar 2010) + + 14 Mar 2010; +files/busybox-1.16.0-bb.patch, + +busybox-1.16.0.ebuild: + - Version bump. Convert EAPI=2 and disable pam by default. Add ipv6 to IUSE + to disable v6 applets unless requested. 8 new applets otherwise. + lspci,lsusb,flashcp,mkfs.reiser,mkfs_ext2,ntpd,traceroute6,tune2fs,wall 14 Mar 2010; Raúl Porcel busybox-1.15.3.ebuild: alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #305619 diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index 3c797686b7a1..c3340aad05e0 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -1,11 +1,14 @@ AUX busybox-1.11.1-bb.patch 1059 RMD160 819a97b81f51314d400c86748d933e3cb1f1fcd3 SHA1 31a51bb6b7a5d1bfe32e54945eb71aac857e10ce SHA256 50d2f574093e52793dd5a08f35b275c2dddca8a76ff35e13e214dd6cd3654098 AUX busybox-1.15.2-bb.patch 956 RMD160 13d7f8e8fdb35245de4072ff1e55470b2c58f6db SHA1 ab66f70245a399a1a21af0e5598fd2fae809d935 SHA256 482de22b18764e8e0b264bb00d03accf9b821666b64f1a423068b10b30b4893c +AUX busybox-1.16.0-bb.patch 1124 RMD160 c59e37bd32f9a05d78fca4599dcfdbc88d373c95 SHA1 8028db3af9fcbfa57d3af022e80074836766b7d9 SHA256 c938fd454dcafcf6a9d725104d78dd52fd1f5b9a98507ff8023e9b7419b103ce AUX mdev-start.sh 2758 RMD160 c177aac4940b177bd857bc98ff2ac031e0489bbc SHA1 5a5b95da36c489cd12820513434a7a17ac3bffd1 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7 DIST busybox-1.14.2.tar.bz2 2199685 RMD160 be138b5aa50f2c60fea75fc44ab3375c95d8f10d SHA1 b673e79ea0927e1ec14017b1e12b159c799f6feb SHA256 3565a52329e179d525127c4f80c45e76de3dbe45303151bd7f4b7d4d9ab6e4d2 DIST busybox-1.15.2.tar.bz2 1987590 RMD160 8f1b2e5ed64d440681042d44f7bb629e33b6df10 SHA1 2f396a4cb35db438a9b4af43df6224f343b8a7ae SHA256 2dab1d6eb34e52f10fb2c4b468bfbc55dab6b73c982b58567371005c9a0dd9e1 DIST busybox-1.15.3.tar.bz2 1987727 RMD160 1f1bd7c25e1afe2465404203897f5b25cf499dfb SHA1 a05a692840ba1cd2bbe21af196f28809694c47e4 SHA256 d74020ad2cc5a4dcc5109c44dbd0e22582d6ce42954b0f1ff29763c8c0ff03cb +DIST busybox-1.16.0.tar.bz2 2007183 RMD160 48944e58be18e5da46b7856b46717bc891dbbc36 SHA1 727f6280729cd9e819ae2bb0065b9cd12a27efb1 SHA256 355250fd91e182ec229bfeef9016d28aead5ff856678d1b3d422fa00e647e3d8 EBUILD busybox-1.14.2.ebuild 7239 RMD160 eb404dce401fcc8fea6258332b1606f6a52af48e SHA1 4c920560864b47be9e874ba67e4da415ac2e2e24 SHA256 db98e97b2fd1ebb96cb86ce96f5bd7e1bcece395513adde6bfe77a976adfcd95 EBUILD busybox-1.15.2.ebuild 7333 RMD160 84a878941ca550e0aac9192720496ef62077bbeb SHA1 2cb36b66b2d2e17db05b2e51ad6264037a5c72b9 SHA256 0ab90bbe51652e165d8e871c7b4157f960fa88fa3d6c40ed630484f63aab1a58 EBUILD busybox-1.15.3.ebuild 7350 RMD160 a691523e212ba871bc92a5dde3a3d8b3a942b33e SHA1 4d8c1607727d96dfce4eb12370cb02627401b208 SHA256 a67f83e70854c9d26f478cc9124165e8373681c6d2f557553f4de07986099745 -MISC ChangeLog 35215 RMD160 b451dfd3d2bf963e3dbbc02c80149a2e5213edfb SHA1 fc7f0a116f77fd54ac3eabdfcc702a9f1db2f82c SHA256 c4358469e834554bcdb1e33981f01aa59c33ae50e71ffebe1d60ef981664a6e0 +EBUILD busybox-1.16.0.ebuild 7548 RMD160 e551545e6d4072b4591ca7d5202c605878d57c44 SHA1 b6d37bbf9622a318338e2959550526bebb1b8fb4 SHA256 82aadb37fb1e69dcf0c433d68fd0ad759a93b5b52ec0956389a963410a73526a +MISC ChangeLog 35556 RMD160 9d212852303161e655670d63ae0770f5509754bc SHA1 db11a94c7e4a975285a9d8691cfa8763bbaa04cb SHA256 abc79a389f3ce643c268d1d8956fb091da9e60fde47170a0cb24e40d376d3666 MISC metadata.xml 261 RMD160 3a3402cbd18d14e4f10e1bb0a4d94a0c3b29b44d SHA1 7bc1c61bf44ae90dfce0f668ea0dcfe0460afe77 SHA256 d45ec36c64c958afd2de0777e77292c4e2908e32c5417c952dd63d920f82990a diff --git a/sys-apps/busybox/busybox-1.16.0.ebuild b/sys-apps/busybox/busybox-1.16.0.ebuild new file mode 100644 index 000000000000..95c553eea80b --- /dev/null +++ b/sys-apps/busybox/busybox-1.16.0.ebuild @@ -0,0 +1,260 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.16.0.ebuild,v 1.1 2010/03/14 19:55:15 solar Exp $ + +EAPI=2 +inherit eutils flag-o-matic savedconfig toolchain-funcs + +################################################################################ +# 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/busybox-* +# 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 make-symlinks ipv6 -pam selinux static" +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 || echo Could not find CONFIG_$2 ...) +} + +src_unpack() { + unpack ${MY_P}.tar.bz2 + cd "${S}" +} + +src_prepare() { + unset KBUILD_OUTPUT #88088 + + # patches go here! + epatch "${FILESDIR}"/busybox-1.16.0-bb.patch + #epatch "${FILESDIR}"/busybox-${PV}-*.patch + + # work around broken ass powerpc compilers + use ppc64 && append-flags -mminimal-toc + # flag cleanup + sed -i -r \ + -e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \ + Makefile.flags || die + #sed -i '/bbsh/s:^//::' include/applets.h + sed -i '/^#error Aborting compilation./d' applets/applets.c || die + use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile + sed -i \ + -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + Makefile || die + + # check for a busybox config before making one of our own. + # if one exist lets return and use it. + + restore_config .config + if [ -f .config ]; then + yes "" | emake -j1 oldconfig > /dev/null + return 0 + else + ewarn "Could not locate user configfile, so we will save a default one" + fi + + # setup the config file + emake -j1 allyesconfig > /dev/null + busybox_config_option n DMALLOC + busybox_config_option n FEATURE_SUID_CONFIG + busybox_config_option n BUILD_AT_ONCE + busybox_config_option n BUILD_LIBBUSYBOX + busybox_config_option n NOMMU + busybox_config_option n MONOTONIC_SYSCALL + + # 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 + + # disable ipv6 applets + if ! use ipv6; then + busybox_config_option n FEATURE_IPV6 + busybox_config_option n TRACEROUTE6 + busybox_config_option n PING6 + fi + + if use static && use pam ; then + ewarn "You cannot have USE='static pam'. Assuming static is more important." + fi + 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 + local opt + for opt in \ + CRONTAB \ + DC DEVFSD DNSD DPKG \ + FAKEIDENTD FBSPLASH FOLD FTP{GET,PUT} \ + HOSTID HUSH \ + INETD INOTIFYD IPCALC \ + LASH LOCALE_SUPPORT LOGNAME LPD \ + MSH \ + OD \ + SLATTACH SULOGIN \ + TASKSET TCPSVD \ + RPM RPM2CPIO \ + UDPSVD UUDECODE UUENCODE + do + busybox_config_option n ${opt} + done + + emake -j1 oldconfig > /dev/null +} + +src_compile() { + unset KBUILD_OUTPUT #88088 + export SKIP_STRIP=y + + 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 + dosym /bin/bb /sbin/mdev + + 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 $(find . -type f) +} + +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/busybox-1.16.0-bb.patch b/sys-apps/busybox/files/busybox-1.16.0-bb.patch new file mode 100644 index 000000000000..c6071a3727d3 --- /dev/null +++ b/sys-apps/busybox/files/busybox-1.16.0-bb.patch @@ -0,0 +1,23 @@ +--- include/applets.h.orig 2010-03-14 19:05:22.000000000 +0000 ++++ include/applets.h 2010-03-14 19:07:09.000000000 +0000 +@@ -79,7 +79,9 @@ + IF_ASH(APPLET(ash, _BB_DIR_BIN, _BB_SUID_DROP)) + IF_AWK(APPLET_NOEXEC(awk, awk, _BB_DIR_USR_BIN, _BB_SUID_DROP, awk)) + IF_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_DROP, basename)) ++IF_ASH(APPLET_ODDNAME(bb, ash, _BB_DIR_BIN, _BB_SUID_DROP, ash)) + IF_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_DROP)) ++IF_ASH(APPLET_ODDNAME(bbsh, ash, _BB_DIR_BIN, _BB_SUID_DROP, ash)) + //IF_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_DROP)) + IF_BEEP(APPLET(beep, _BB_DIR_USR_BIN, _BB_SUID_DROP)) + IF_BLKID(APPLET(blkid, _BB_DIR_SBIN, _BB_SUID_DROP)) +--- shell/ash.c.orig 2010-03-14 19:05:34.000000000 +0000 ++++ shell/ash.c 2010-03-14 19:08:32.000000000 +0000 +@@ -7185,6 +7185,8 @@ + } + /* re-exec ourselves with the new arguments */ + execve(bb_busybox_exec_path, argv, envp); ++ execve("/bin/busybox.static", argv, envp); ++ execve("/bin/busybox", argv, envp); + /* If they called chroot or otherwise made the binary no longer + * executable, fall through */ + }