From b7275b03df9a6ec5f8f6b7c9c1fd3325971abc5a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 7 Aug 2011 21:08:47 +0000 Subject: [PATCH] Version bump #376355 by Chris Slycord. Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64 --- sys-apps/busybox/ChangeLog | 8 ++++- sys-apps/busybox/Manifest | 14 ++++---- ...ox-1.18.3.ebuild => busybox-1.18.5.ebuild} | 35 +++++++++++-------- 3 files changed, 35 insertions(+), 22 deletions(-) rename sys-apps/busybox/{busybox-1.18.3.ebuild => busybox-1.18.5.ebuild} (89%) diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index 6be81fb6f5ee..72236e9a1cde 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,12 @@ # 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.275 2011/07/29 07:52:36 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.276 2011/08/07 21:08:47 vapier Exp $ + +*busybox-1.18.5 (07 Aug 2011) + + 07 Aug 2011; Mike Frysinger -busybox-1.18.3.ebuild, + +busybox-1.18.5.ebuild: + Version bump #376355 by Chris Slycord. 29 Jul 2011; Zac Medico busybox-1.18.4.ebuild: Add ~x86-linux keyword. diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index 68c84ee11660..ed0e7c3a95f5 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX busybox-1.17.0-bb.patch 1039 RMD160 abd095949a1a5797a770dd84fbdd247490a7420f SHA1 4f3399421c00961f066b65f4f1955363dc9ed746 SHA256 be449a26d5e87431e2192f79f945e3bf0c999873306d40bf9c0d6cc61da08d48 AUX busybox-1.18.0-bb.patch 918 RMD160 e6a7be911deb07510ddf46b8a4b8b24ef5b1b29a SHA1 f4815f4cd948c300d65e553486c949c780f05752 SHA256 9e713de11f26a07e5a17d7e62eed7a10b163de91331d50541dcc2c037acbcb67 @@ -20,17 +20,17 @@ AUX mdev/ide_links 440 RMD160 5d133f27d1ab4db5f6f1b5063837b033f47b71ae SHA1 725d AUX mdev/usbdev 1624 RMD160 a448558f058566223072c993cb4ae52f9aa43da3 SHA1 4d1a7a19e58549416dd3bde4fcf2f584adc4feb7 SHA256 113ecaa722fa1f4e1c76489e2a7b24099778615a5bccd443aa9cbab28c6d05d0 AUX mdev/usbdisk_link 984 RMD160 9b86d85f5f27f03f894a062c9f00d3583c4db3ae SHA1 690290b25fa1b90f6d9d7b8947a55746920991a4 SHA256 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858 DIST busybox-1.17.4.tar.bz2 2093389 RMD160 abb7e3ceebac4fdf48b0e717367e64456749016e SHA1 9a2be1e709dd0703d78bed620439bac069d19254 SHA256 0c6b80f007e665228d1b271354b7e80450dcaa67c9162a30eebf936c7cdfcbdc -DIST busybox-1.18.3.tar.bz2 2119251 RMD160 b38e5bc8ca9d586dd1528080b6a866ad8719a31a SHA1 4debdbdf8abb7ae54e0c0e2650cb03d957400533 SHA256 83f112ee88b7eb85bea1cac0b1af33f61387a1036f1898c5ecd79813191a619b DIST busybox-1.18.4.tar.bz2 2130598 RMD160 db21d00498b155f950a3f2fb63fa339253e536c2 SHA1 d285855e5770b0fb7caf477dd41ce0863657b975 SHA256 4d24d37bd6f1bd153e8cf9a984ec2f32f18464f73ca535e2cc2e8be9694097fa +DIST busybox-1.18.5.tar.bz2 2130681 RMD160 22746c6e9ed6b7f8f42a49a5329b8b36da088422 SHA1 0aa287ea0f19a8c0c9224e2aa9c4516a79887139 SHA256 10954fcd5c48d8a262a3497b16227bf983a05658bf2bf661af2fdeca773f2fc0 EBUILD busybox-1.17.4.ebuild 7921 RMD160 2b3306d4c4b21f4fa246e4963f15ad75707d6fe1 SHA1 7808c464cb6e0d2efd4bd24f3aecaef4ce3c40c4 SHA256 31ee8f50c3123db62879b2209e96e020ae143a5e5f960138924a467eef8f7c8a -EBUILD busybox-1.18.3.ebuild 7841 RMD160 6fbecabd528d25db31d82408100b42c2eeb72712 SHA1 7978d3b3e80b08196edfbc320e7f8ae96f0c10d5 SHA256 3f1dafc13a2662312aa7bb51c95a13524a6891c154b1c4905afb75b498618744 EBUILD busybox-1.18.4.ebuild 8228 RMD160 e56dfe2383ba8507b37c15332b87c5800cd007f7 SHA1 4897ba0aaaf03177760b66545c326d3a032aba82 SHA256 f5345e2a1c4f325ac2b36c32b850cd394187ca6c644a03ef0463b8dd06e0729b -MISC ChangeLog 40894 RMD160 9094504b1375c52da3d15c6f4a6f0517c2402caf SHA1 9d8b8a44275b60b0399700ad11be1cc88d33cc33 SHA256 289401cde944de990fa6473eb70de581d94ad377b96cd7f278c61d503e675726 +EBUILD busybox-1.18.5.ebuild 8238 RMD160 8c51129b80b1d13c53619f5b4a9999a51d3b0012 SHA1 9eb3cd60d3145771af091c069b3e1553052f54cc SHA256 d5b70088e8e29e1936c237358e0f2d1628e6efec466e1481c3e32173e77699d2 +MISC ChangeLog 41066 RMD160 38b9ad53684ea8058f33bbb26c2415a88d06ee6f SHA1 d37cd6d071d6cf8843a36e1303cd6c8fd493c792 SHA256 12eb30b5138ba8be9f02e6defb61bfeb54ef115f08ea96eee20d5fb3613c10c4 MISC metadata.xml 420 RMD160 a3d9cd7689418647525460862b05d3adfb9cd4f4 SHA1 c67d73ae61fb0180060ff7d3d13b1b5e9ef2c56c SHA256 1d2b931bd8b4026d665b485a21263438fe5892bf81af7139e409bfd61a68d55c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4yZsoACgkQ/ejvha5XGaPQpgCdHYrSV45ckQsFjUbFDQpBoFZL -VOkAnR/xIqKpv9lOyOzRe/lKJnqnz1Y2 -=C85u +iF4EAREIAAYFAk4+/tcACgkQaC/OocHi7JabzAD7B8RD9gjHXSceFKct1PtNgAkp +1xy/24Yz8yEo1vL54rAA/1OiSamSnCpMQdAQjXR9ZIHVWDCB0cwwx5e2R2uCP2Cs +=ZtMx -----END PGP SIGNATURE----- diff --git a/sys-apps/busybox/busybox-1.18.3.ebuild b/sys-apps/busybox/busybox-1.18.5.ebuild similarity index 89% rename from sys-apps/busybox/busybox-1.18.3.ebuild rename to sys-apps/busybox/busybox-1.18.5.ebuild index df85f6ad5d82..7ae6cada3a54 100644 --- a/sys-apps/busybox/busybox-1.18.3.ebuild +++ b/sys-apps/busybox/busybox-1.18.5.ebuild @@ -1,8 +1,8 @@ # 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.18.3.ebuild,v 1.2 2011/03/27 04:48:38 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.18.5.ebuild,v 1.1 2011/08/07 21:08:47 vapier Exp $ -EAPI=2 +EAPI="3" inherit eutils flag-o-matic savedconfig toolchain-funcs ################################################################################ @@ -57,12 +57,14 @@ else fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="debug ipv6 make-symlinks +mdev -pam selinux static elibc_glibc" +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" -DEPEND="selinux? ( sys-libs/libselinux ) +RDEPEND="selinux? ( sys-libs/libselinux ) pam? ( sys-libs/pam )" +DEPEND="${RDEPEND} + nfs? ( || ( =net-libs/libtirpc-0.2.2-r1 ) )" S=${WORKDIR}/${MY_P} @@ -82,10 +84,11 @@ busybox_config_option() { src_prepare() { unset KBUILD_OUTPUT #88088 append-flags -fno-strict-aliasing #310413 + append-cppflags $($(tc-getPKG_CONFIG) libtirpc --cflags) # patches go here! epatch "${FILESDIR}"/busybox-1.18.0-bb.patch - epatch "${FILESDIR}"/busybox-${PV}-*.patch + #epatch "${FILESDIR}"/busybox-${PV}-*.patch # flag cleanup sed -i -r \ @@ -138,6 +141,7 @@ src_configure() { 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 @@ -153,16 +157,19 @@ src_configure() { # default a bunch of uncommon options to off local opt for opt in \ + ADD_SHELL \ + BEEP BOOTCHARTD \ CRONTAB \ - DC DEVFSD DNSD DPKG \ - FAKEIDENTD FBSPLASH FOLD FTP{GET,PUT} \ + 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 \ - MSH \ + MAKEMIME MKFS_MINIX MSH \ OD \ - RFKILL \ - SLATTACH SULOGIN \ + RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \ + SLATTACH SMEMCAP SULOGIN SV{,LOGD} \ TASKSET TCPSVD \ RPM RPM2CPIO \ UDPSVD UUDECODE UUENCODE @@ -204,7 +211,7 @@ src_install() { if use mdev ; then dodir /$(get_libdir)/mdev/ use make-symlinks || dosym /bin/bb /sbin/mdev - cp "${S}"/examples/mdev_fat.conf "${D}"/etc/mdev.conf + cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf exeinto /$(get_libdir)/mdev/ doexe "${FILESDIR}"/mdev/* @@ -215,7 +222,7 @@ src_install() { fi # bundle up the symlink files for use later - emake install || die + emake DESTDIR="${ED}" install || die rm _install/bin/busybox tar cf busybox-links.tar -C _install . || : #;die insinto /usr/share/${PN} @@ -250,7 +257,7 @@ pkg_preinst() { fi if use make-symlinks ; then - mv "${D}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die + mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die fi } -- 2.26.2