From 7a51eab2f8b5ace821a0a2cf3c20badcd2e64968 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 5 Jan 2007 08:23:55 +0000 Subject: [PATCH] Grab fix from upstream for #160088 by Martin von Gagern. Package-Manager: portage-2.1.2_rc4-r6 --- sys-apps/busybox/ChangeLog | 7 +++-- sys-apps/busybox/Manifest | 29 +++++++++++---------- sys-apps/busybox/busybox-1.3.1.ebuild | 8 +++--- sys-apps/busybox/files/digest-busybox-1.3.1 | 3 +++ 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index feb08543c949..67f9303ac192 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/busybox -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.120 2006/12/31 10:58:55 vapier Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.121 2007/01/05 08:23:55 vapier Exp $ + + 05 Jan 2007; Mike Frysinger busybox-1.3.1.ebuild: + Grab fix from upstream for #160088 by Martin von Gagern. 31 Dec 2006; Mike Frysinger busybox-1.3.1.ebuild: Redo flag handling and throw out old code since it is no longer relevant diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index 84f3ed6873a0..d50514fe56d2 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -22,19 +22,20 @@ MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853 RMD160 3d62cf31765adbc88c7a39f0f21223d7e73ef627 files/config-netboot 9853 SHA256 75cae861b7bae144ca86998cb90dae9bcb0f54e09ed0c36d1ed81ad79a401e3d files/config-netboot 9853 DIST busybox-1.2.2.1.tar.bz2 1413458 RMD160 f61662f1ee12a7c65b9e65864c23242b6176a242 SHA1 41683c6a31f365ac884b84a376533d9ff372c05e SHA256 e31de8f3fc6639660af08446cc8b49f5831d5e5ecab0a56d9482c1d4eb89a701 +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 EBUILD busybox-1.2.2.1.ebuild 8397 RMD160 6e35665cbb569fb3d0c210d91e440433aa862b4a SHA1 14059b63bb0fa02b56317ef935d0ce0c7d1250a6 SHA256 9718421ca42699dd35d17400731157942d102fb3a3f23123301a0762509a5cca MD5 3bedcbbfebb81d7ed0fe15c8b9a592ff busybox-1.2.2.1.ebuild 8397 RMD160 6e35665cbb569fb3d0c210d91e440433aa862b4a busybox-1.2.2.1.ebuild 8397 SHA256 9718421ca42699dd35d17400731157942d102fb3a3f23123301a0762509a5cca busybox-1.2.2.1.ebuild 8397 -EBUILD busybox-1.3.1.ebuild 8170 RMD160 a03f782b78dcf837a3d4010eb32f72a73cfb876a SHA1 b321c6e36cc6b331a21a5d92162617712dcf46dd SHA256 2a38b3fbbbfb00bf56975c2ef4e83d0b56f5cdc43da946067309e716c3c5c03e -MD5 6c6cb7aa634a15c30c2a0779389269a7 busybox-1.3.1.ebuild 8170 -RMD160 a03f782b78dcf837a3d4010eb32f72a73cfb876a busybox-1.3.1.ebuild 8170 -SHA256 2a38b3fbbbfb00bf56975c2ef4e83d0b56f5cdc43da946067309e716c3c5c03e busybox-1.3.1.ebuild 8170 -MISC ChangeLog 19226 RMD160 756eb736171c5ef30955a176e3b7b51ec51a0b64 SHA1 a27946d28d31b0a0dbbbbc37ed26437eeba2f9d9 SHA256 7a1a578f71cf25dbd454c4782229333dac7035fd6dcd628c5c3c250834fcdb98 -MD5 681e6e9fc4f7db82a5352244f9cb6f80 ChangeLog 19226 -RMD160 756eb736171c5ef30955a176e3b7b51ec51a0b64 ChangeLog 19226 -SHA256 7a1a578f71cf25dbd454c4782229333dac7035fd6dcd628c5c3c250834fcdb98 ChangeLog 19226 +EBUILD busybox-1.3.1.ebuild 8279 RMD160 b761dbe677bda214c4e43fc8a09f19b7fe58f7f5 SHA1 8fe378eb0801d2c0b779cdce626645ed4036c31f SHA256 044c5bdab645d2cd3882563c9096034c43dd450eb0ae82ee6e71afa2345d35ff +MD5 101c6d05bc6879aa6554d1eed0181235 busybox-1.3.1.ebuild 8279 +RMD160 b761dbe677bda214c4e43fc8a09f19b7fe58f7f5 busybox-1.3.1.ebuild 8279 +SHA256 044c5bdab645d2cd3882563c9096034c43dd450eb0ae82ee6e71afa2345d35ff busybox-1.3.1.ebuild 8279 +MISC ChangeLog 19358 RMD160 eca26da0ca38532d344eb0b63b7135c494643fa3 SHA1 24c312035d574636f7cba9fa2ab322bd7394e30c SHA256 ebcbadd5d90e432cab92fae80ec85d4d8b0790319728c65ac0ccb3a02d3ea46d +MD5 71ca8bed79408180f1f1c46fca8969cc ChangeLog 19358 +RMD160 eca26da0ca38532d344eb0b63b7135c494643fa3 ChangeLog 19358 +SHA256 ebcbadd5d90e432cab92fae80ec85d4d8b0790319728c65ac0ccb3a02d3ea46d ChangeLog 19358 MISC metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 SHA1 aa4b2873e32de89c0b0aeb26b5782f77cb00948e SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e MD5 8ef75eba39772bdd1a8facc7815dbebb metadata.xml 161 RMD160 77385273ea1d12ed4093a4167307486b74d1cf82 metadata.xml 161 @@ -42,13 +43,13 @@ SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e metadata MD5 25f839e8bd7a70105b2b44cf151b57fa files/digest-busybox-1.2.2.1 253 RMD160 aa8a187cdaf8ffc550a024deda2f779f31c60ae3 files/digest-busybox-1.2.2.1 253 SHA256 7334648f93857477ce8a8b8d36c2dadbdd6a32b58ad6d15644ed4fdbceafb0dd files/digest-busybox-1.2.2.1 253 -MD5 b676836264c05f0066c645ea8620dca6 files/digest-busybox-1.3.1 247 -RMD160 76e327f1c7760c6159ddc317aa8eb486fd3eb8dc files/digest-busybox-1.3.1 247 -SHA256 b06e896a90e122006f6ab811e6fb2f6c08ffe36693c93271e4e1c7bcb82af939 files/digest-busybox-1.3.1 247 +MD5 e3c1ff69996208807c431e77b8c82b6e files/digest-busybox-1.3.1 500 +RMD160 1c80c9921b3587cec0403fe3b42298b5e81644fd files/digest-busybox-1.3.1 500 +SHA256 c4f8d0daf45f3cbcc2214257e7413c453fd28656722045c6709f591df9f95912 files/digest-busybox-1.3.1 500 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFmvAK8bi6rjpTunYRAsmFAJwPHXpSxFJwZVJn6P0HVWh+rG0SmwCfWT2y -8ycfFB+Dzt/+A4jD6Gu0Zus= -=Dg/d +iD8DBQFFngsk8bi6rjpTunYRAob+AKC/tnAs2y98OuMH+YxXadwTFwOuAwCaA0IZ +4DWSUsUeH0VsC3399TsBZKc= +=J3Cq -----END PGP SIGNATURE----- diff --git a/sys-apps/busybox/busybox-1.3.1.ebuild b/sys-apps/busybox/busybox-1.3.1.ebuild index 5ee4064a401e..57582e72d710 100644 --- a/sys-apps/busybox/busybox-1.3.1.ebuild +++ b/sys-apps/busybox/busybox-1.3.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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.3.1.ebuild,v 1.5 2007/01/02 23:50:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.3.1.ebuild,v 1.6 2007/01/05 08:23:55 vapier Exp $ inherit eutils flag-o-matic @@ -57,7 +57,8 @@ if [[ -n ${SNAPSHOT} ]] ; then 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" + SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2 + http://busybox.net/downloads/fixes-1.3.1/busybox-1.3.1.shadow.patch" fi LICENSE="GPL-2" @@ -105,6 +106,7 @@ src_unpack() { # patches go here! epatch "${FILESDIR}"/1.3.0/bb.patch epatch "${FILESDIR}"/1.3.0/ld.patch + epatch "${DISTDIR}"/${P}.shadow.patch # work around broken ass powerpc compilers use ppc64 && append-flags -mminimal-toc diff --git a/sys-apps/busybox/files/digest-busybox-1.3.1 b/sys-apps/busybox/files/digest-busybox-1.3.1 index 9368ef7299d7..282957d72aaf 100644 --- a/sys-apps/busybox/files/digest-busybox-1.3.1 +++ b/sys-apps/busybox/files/digest-busybox-1.3.1 @@ -1,3 +1,6 @@ +MD5 3cc74cd6ac2200bbb168c64e17f85a78 busybox-1.3.1.shadow.patch 5561 +RMD160 f10dd2af66b439bb4d46056e8fc15756080bb093 busybox-1.3.1.shadow.patch 5561 +SHA256 46cf2a7fb0ec805650e80afab844b1b98fd434dac965ec2b02b852b9b56401a5 busybox-1.3.1.shadow.patch 5561 MD5 571531cfa83726947ccb566de017ad4f busybox-1.3.1.tar.bz2 1485979 RMD160 bdfb93353aa899ef246cea0180c7341c32e6a8ac busybox-1.3.1.tar.bz2 1485979 SHA256 5bf9ead9cca99620d2e56ddf79fdf5fb306fd7f30087b5556e0956e3b1948206 busybox-1.3.1.tar.bz2 1485979 -- 2.26.2