diff options
author | Mike Frysinger <vapier@gentoo.org> | 2011-10-18 20:17:16 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2011-10-18 20:17:16 +0000 |
commit | 236bc8b3b2441057c0962525ecb9764639c19a5a (patch) | |
tree | 8e5aa06bba9d1866b8d7fc6f09ad0c32cd91fa26 /sys-apps | |
parent | Linux patch 3.0.7 and v0.10 of Alps patch from Seth Forshee of Canonical. See... (diff) | |
download | historical-236bc8b3b2441057c0962525ecb9764639c19a5a.tar.gz historical-236bc8b3b2441057c0962525ecb9764639c19a5a.tar.bz2 historical-236bc8b3b2441057c0962525ecb9764639c19a5a.zip |
Undo nommu and rebuild config to get all the ash features enabled by default #387555 by Ortwin Glueck.
Package-Manager: portage-2.2.0_alpha65/cvs/Linux x86_64
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/busybox/ChangeLog | 9 | ||||
-rw-r--r-- | sys-apps/busybox/Manifest | 12 | ||||
-rw-r--r-- | sys-apps/busybox/busybox-1.19.2-r1.ebuild | 279 | ||||
-rw-r--r-- | sys-apps/busybox/files/busybox-1.19.2-tftp.patch | 12 |
4 files changed, 306 insertions, 6 deletions
diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index 59a244617287..50c2a114e7a4 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/busybox # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.285 2011/09/17 03:46:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.286 2011/10/18 20:17:16 vapier Exp $ + +*busybox-1.19.2-r1 (18 Oct 2011) + + 18 Oct 2011; Mike Frysinger <vapier@gentoo.org> +busybox-1.19.2-r1.ebuild, + +files/busybox-1.19.2-tftp.patch: + Undo nommu and rebuild config to get all the ash features enabled by default + #387555 by Ortwin Glueck. *busybox-1.19.2 (17 Sep 2011) diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index d356a6fa5d14..f148b90920fc 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -26,6 +26,7 @@ AUX busybox-1.19.2-crond.patch 555 RMD160 bfae271e5592967b1acb247a3bb1f8a22a82a0 AUX busybox-1.19.2-inetd.patch 1616 RMD160 42514c604a43797625699d6cfc7e78fdcdcd08d7 SHA1 001572374cfa736f9bb847c8d6d985e24b749a84 SHA256 e883c6d8723cf7f18d58c116f164c6dc658e0ad45ff12fd5ef98f3f177589d3a AUX busybox-1.19.2-syslogd.patch 708 RMD160 060e589d58ae66fe55b6b9df600993d361632e2f SHA1 68f38f539823f43a156c87bd2069301d9901ccb3 SHA256 e772510323fb85e59005b80c7fa63072a6fbdb94216f425b14b742f1730b0472 AUX busybox-1.19.2-tail.patch 1320 RMD160 52a19174f618856983e810fce1446b959b3147c4 SHA1 fd680ba279cd06792fd7215c8f7b39fb23162990 SHA256 d114d432ec828fe6b66155224284cbe5d202c56f6de6d4d358eed1822c06ea9d +AUX busybox-1.19.2-tftp.patch 446 RMD160 7b7d93540cb107e895ea9c1a42bd4dd5dc8457f1 SHA1 0caf60cc0015388cf98c87d1d912692152ae2bcd SHA256 a9796f35e00ea24824e9ea678a68f2df11ac976d405c458a4c563a285b17db10 AUX mdev-start.sh 2758 RMD160 c177aac4940b177bd857bc98ff2ac031e0489bbc SHA1 5a5b95da36c489cd12820513434a7a17ac3bffd1 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7 AUX mdev.rc 282 RMD160 6a11e23fbed92acd24088a7885bdc52b9c845fac SHA1 46f1a0494e009332e83b62599842f8213b60ba60 SHA256 e52abbc3399fc85ce1f097e8f12b25a5ca7fe2e3d648bee60c061b547ba39dc5 AUX mdev.rc.1 2191 RMD160 e8cf408e576850868581d011614ca79a2be2dc9c SHA1 56c9b728403f06c821f90e2dd5ac76a28f7e7dce SHA256 1a22210a9d59d7c1f023141768b1d22e51f5102ec1d7e0a9ebd17d7618384c88 @@ -42,13 +43,14 @@ EBUILD busybox-1.17.4.ebuild 7921 RMD160 2b3306d4c4b21f4fa246e4963f15ad75707d6fe EBUILD busybox-1.18.4.ebuild 8228 RMD160 e56dfe2383ba8507b37c15332b87c5800cd007f7 SHA1 4897ba0aaaf03177760b66545c326d3a032aba82 SHA256 f5345e2a1c4f325ac2b36c32b850cd394187ca6c644a03ef0463b8dd06e0729b EBUILD busybox-1.18.5.ebuild 8223 RMD160 a4e3e6cf07d7736d47b21499c1ad30d66ba394df SHA1 c2df0c81bc43746575458e1bf087fcc45a4baa53 SHA256 17517a9d9bfa7fb32375e457fadbb5a31f775001be3624fabce887703edff270 EBUILD busybox-1.19.0.ebuild 8262 RMD160 f49821fee9372116dbced29204e5ea556036c7c0 SHA1 be5ae13267b0bc6a77f45a8ae5b0e75b74179443 SHA256 f403639bfe097b44867c239bf60c21ba9db25e9e192748403a191135985fa579 +EBUILD busybox-1.19.2-r1.ebuild 8366 RMD160 f36299f1148cab14efe40b4ae5b0acded030c2b0 SHA1 e2efa9b3f1572862619cc54e76ab03d07a48299f SHA256 2ed311580378a5b9c82c09245b185beadc7b38928b803fe9e7e3dc7ec0157da4 EBUILD busybox-1.19.2.ebuild 8196 RMD160 4f128381b9ca35fc0e21fc67b88a71101ab27a83 SHA1 26d35c75a88ef33ed0889d6594323cfc5285766c SHA256 6c54100e7a922e9b548305b44a8d781a1a56a41425dc4bd095ab70f7a9bba514 -MISC ChangeLog 42732 RMD160 818d432f656cc962a4b68333a8fdf12354cd7895 SHA1 d68ddaf238b8bbe0d8c8e1dd02069bb95051aaec SHA256 2d06a3a1fd806d61a9305ec80bc7d855f336885edd4e8142afc3322600c8e70c +MISC ChangeLog 42987 RMD160 af92c10d3acb2c6bb656e2249dfaff14c0fb23f4 SHA1 d5675d0482b7c4c24e159914c172ec0cdf8615d7 SHA256 801a99f1db29f2b2ae1caa9710cbc37d673d4dbf986384fee2bd988872d47144 MISC metadata.xml 420 RMD160 a3d9cd7689418647525460862b05d3adfb9cd4f4 SHA1 c67d73ae61fb0180060ff7d3d13b1b5e9ef2c56c SHA256 1d2b931bd8b4026d665b485a21263438fe5892bf81af7139e409bfd61a68d55c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk50GB8ACgkQaC/OocHi7Ja79gD/bFjSoraXZ2KruGI63yQmZkaq -eExPXrgEW7ZGuOM/gMMBAIaoGwAxeKB0KfWucfENaASY60XVto1YR3y63VzpN+p2 -=URjg +iF4EAREIAAYFAk6d3tMACgkQaC/OocHi7Jar5gD/b7lEKJMhW8MJN++lqINU6s/9 +XkdzyJeRktX+6FvnM90A+QEsTxBe1HM3r04DlChtZ/hpKnfdtfSU0pzxD+oSIUmK +=haR/ -----END PGP SIGNATURE----- diff --git a/sys-apps/busybox/busybox-1.19.2-r1.ebuild b/sys-apps/busybox/busybox-1.19.2-r1.ebuild new file mode 100644 index 000000000000..32603802e862 --- /dev/null +++ b/sys-apps/busybox/busybox-1.19.2-r1.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.19.2-r1.ebuild,v 1.1 2011/10/18 20:17:16 vapier Exp $ + +EAPI="3" +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 ~x86-linux" +IUSE="debug ipv6 make-symlinks +mdev nfs -pam selinux static elibc_glibc" +RESTRICT="test" + +RDEPEND="selinux? ( sys-libs/libselinux ) + pam? ( sys-libs/pam )" +DEPEND="${RDEPEND} + nfs? ( || ( <sys-libs/glibc-2.13 >=net-libs/libtirpc-0.2.2-r1 ) )" + +S=${WORKDIR}/${MY_P} + +busybox_config_option() { + case $1 in + y) sed -i -e "s:.*\<CONFIG_$2\>.*set:${new}: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_prepare() { + unset KBUILD_OUTPUT #88088 + append-flags -fno-strict-aliasing #310413 + use ppc64 && append-flags -mminimal-toc #130943 + append-cppflags $($(tc-getPKG_CONFIG) libtirpc --cflags) + + # patches go here! + epatch "${FILESDIR}"/busybox-1.19.0-bb.patch + epatch "${FILESDIR}"/busybox-${PV}-*.patch + + # 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 "/^AR\>/s:=.*:= $(tc-getAR):" \ + -e "/^CC\>/s:=.*:= $(tc-getCC):" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + Makefile || die +} + +src_configure() { + # 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 + # nommu forces a bunch of things off which we want on #387555 + busybox_config_option n NOMMU + sed -i '/^#/d' .config + yes "" | emake -j1 oldconfig >/dev/null + + # now turn off stuff we really don't want + 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 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 ASH + busybox_config_option n HUSH + + # 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 + busybox_config_option nfs FEATURE_MOUNT_NFS + 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 \ + ADD_SHELL \ + BEEP BOOTCHARTD \ + CRONTAB \ + DC DEVFSD DNSD DPKG{,_DEB} \ + FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \ + FEATURE_DEVFS \ + HOSTID HUSH \ + INETD INOTIFYD IPCALC \ + LASH LOCALE_SUPPORT LOGNAME LPD \ + MAKEMIME MKFS_MINIX MSH \ + OD \ + RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \ + SLATTACH SMEMCAP SULOGIN SV{,LOGD} \ + 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 ; then + cp .config{,.bak} + mv busybox_unstripped{,.bak} + use pam && busybox_config_option n PAM + emake CONFIG_STATIC=y busybox || die "static build failed" + mv busybox_unstripped bb + mv busybox_unstripped{.bak,} + mv .config{.bak,} + fi +} + +src_install() { + unset KBUILD_OUTPUT #88088 + save_config .config + + into / + newbin busybox_unstripped busybox || die + if use static ; then + dosym busybox /bin/bb || die + dosym bb /bin/busybox.static || die + else + dobin bb || die + fi + if use mdev ; then + dodir /$(get_libdir)/mdev/ + use make-symlinks || dosym /bin/bb /sbin/mdev + cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf + + exeinto /$(get_libdir)/mdev/ + doexe "${FILESDIR}"/mdev/* || die + + newinitd "${FILESDIR}"/mdev.rc.1 mdev || die + fi + + # bundle up the symlink files for use later + emake DESTDIR="${ED}" 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 + + 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 really what you want." + die "silly options will destroy your system" + fi + + if use make-symlinks ; then + mv "${ED}"/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 + + elog "This ebuild has support for user defined configs" + elog "Please read this ebuild for more details and re-emerge as needed" + elog "if you want to add or remove functionality for ${PN}" +} diff --git a/sys-apps/busybox/files/busybox-1.19.2-tftp.patch b/sys-apps/busybox/files/busybox-1.19.2-tftp.patch new file mode 100644 index 000000000000..15dc9e1d132b --- /dev/null +++ b/sys-apps/busybox/files/busybox-1.19.2-tftp.patch @@ -0,0 +1,12 @@ +--- busybox-1.19.2/networking/tftp.c ++++ busybox-1.19.2-tftp/networking/tftp.c +@@ -813,7 +813,8 @@ int tftpd_main(int argc UNUSED_PARAM, ch + goto err; + } + mode = local_file + strlen(local_file) + 1; +- if (mode >= block_buf + result || strcmp(mode, "octet") != 0) { ++ /* RFC 1350 says mode string is case independent */ ++ if (mode >= block_buf + result || strcasecmp(mode, "octet") != 0) { + goto err; + } + # if ENABLE_FEATURE_TFTP_BLOCKSIZE |