Revision bump, fixing #125786 thanks to Jason Stubbs and Roy Marples

(Portage version: 2.1_pre5-r4)

6 files changed, 54 insertions, 34 deletions

diff --git a/sys-apps/baselayout-vserver/ChangeLog b/sys-apps/baselayout-vserver/ChangeLog
index 12afe7dc7558..7ecb2e19f68e 100644
--- a/sys-apps/baselayout-vserver/ChangeLog
+++ b/sys-apps/baselayout-vserver/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/baselayout-vserver
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.27 2006/03/11 14:36:21 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.28 2006/03/11 14:53:30 phreak Exp $
+
+*baselayout-vserver-1.11.14-r4 (11 Mar 2006)
+
+  11 Mar 2006; Christian Heim <phreak@gentoo.org>
+  +files/baselayout-vserver-1.11.14-iproute.patch,
+  -baselayout-vserver-1.11.14-r1.ebuild,
+  baselayout-vserver-1.11.14-r3.ebuild,
+  +baselayout-vserver-1.11.14-r4.ebuild:
+  Revision bump, fixing #125786 thanks to Jason Stubbs and Roy Marples
 
   11 Mar 2006; Christian Heim <phreak@gentoo.org>
   -files/baselayout-vserver-1.12.0_pre8-init-timeout-fix.patch,
diff --git a/sys-apps/baselayout-vserver/Manifest b/sys-apps/baselayout-vserver/Manifest
index 6a9f09b3ec7b..befd7dbd7f94 100644
--- a/sys-apps/baselayout-vserver/Manifest
+++ b/sys-apps/baselayout-vserver/Manifest
@@ -1,15 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7a383c0b4bae094aba230bce55753a4a ChangeLog 5671
 RMD160 0816c8f3079817cc5afef4bfaed8654069394f81 ChangeLog 5671
 SHA256 e712b43ff952670e7048e0fef628f26b3bd62db961eadd2b6648b655aeb0c0ca ChangeLog 5671
-MD5 28ead1d66338b46a6ecab7953139b45b baselayout-vserver-1.11.14-r1.ebuild 15841
-RMD160 55e3401d76818284cfa11937de549598e7a0eaf4 baselayout-vserver-1.11.14-r1.ebuild 15841
-SHA256 c24501625dd556bf46f543db281880d1773c9317cc770e4af1a2a88ee760b13a baselayout-vserver-1.11.14-r1.ebuild 15841
-MD5 0b4e7f2987027a73ffed5dc39de3e005 baselayout-vserver-1.11.14-r3.ebuild 16024
-RMD160 581136fca60b7bb7052411ac1cd4d5eea0a0be41 baselayout-vserver-1.11.14-r3.ebuild 16024
-SHA256 3bde266626e6eb946483d6336ecc897ea941756e56708c173a17ba23aa704999 baselayout-vserver-1.11.14-r3.ebuild 16024
+MD5 9d89d8edb2dbbc284ae93e18b0762abe baselayout-vserver-1.11.14-r3.ebuild 15914
+RMD160 4e1a86c5c4316a5970d281105b18303a24dc291e baselayout-vserver-1.11.14-r3.ebuild 15914
+SHA256 d2e5b92f2818b0575892ece9001d5fcb920f1d6e30af471fbc553812c6ce90f5 baselayout-vserver-1.11.14-r3.ebuild 15914
+MD5 62ac5665fb4220c9ff438992997b4774 baselayout-vserver-1.11.14-r4.ebuild 15955
+RMD160 04df6d0459a12e4a563e8926e858b85aa1f8ff92 baselayout-vserver-1.11.14-r4.ebuild 15955
+SHA256 a4249a8e41ad7be24c60268adc35cefb76857794d7674407dda81e0dc1c3a662 baselayout-vserver-1.11.14-r4.ebuild 15955
 MD5 f8f4314afe00de037943e53171b12d48 baselayout-vserver-1.12.0_pre16.ebuild 12515
 RMD160 a78a7db00b11b6173996753d65a5043fffc4dc8a baselayout-vserver-1.12.0_pre16.ebuild 12515
 SHA256 32e485bf21282130ef1cb6d223c35be39cc4d2b02a02b89859e60681409e4615 baselayout-vserver-1.12.0_pre16.ebuild 12515
@@ -19,6 +16,9 @@ SHA256 5634f36c4f27ddae7a4a22c6dc7b6adad5f83cdb5d9f4291ce061d62361a71c8 files/ba
 MD5 ab0d5a169769126f5c9d679a86244ee2 files/baselayout-vserver-1.11.14-essidnet.patch 619
 RMD160 9cd29b7be10ef4c665be44a84c84df64fca8c64e files/baselayout-vserver-1.11.14-essidnet.patch 619
 SHA256 2fdce59727910e4ae4f30aedc0d1ae32b852bfc9f740e049676104052900407b files/baselayout-vserver-1.11.14-essidnet.patch 619
+MD5 65746e3c9ed3ed82828b005b9a5cc2ed files/baselayout-vserver-1.11.14-iproute.patch 497
+RMD160 70a606c98cc15338426beaa21081f1965193dec5 files/baselayout-vserver-1.11.14-iproute.patch 497
+SHA256 7548f7436a42f09d224ab494cfb7979e2c406192511e01ccc8cdb70befc02672 files/baselayout-vserver-1.11.14-iproute.patch 497
 MD5 00027c12be3e1ed7ce2787cfca1b5a6c files/baselayout-vserver-1.11.14-iwconfig.patch 609
 RMD160 5e5178bb9e100509eefb6dc5bc8a478621941feb files/baselayout-vserver-1.11.14-iwconfig.patch 609
 SHA256 fba67a24d63c29407882894fc78bf6716329a923d7925e9f0cd2b6535afdd292 files/baselayout-vserver-1.11.14-iwconfig.patch 609
@@ -31,22 +31,15 @@ SHA256 99c2274703515f7f52c8480e55c93beea28968a284abb351250bd14a111431fc files/ba
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
 RMD160 43e295598125f39e375a1fcee6e642e37c8b8bd8 files/copyright 2099
 SHA256 38db4636f65ce40ea505a6337138b041ac6be5998982193d16b1fbdeebb2bacd files/copyright 2099
-MD5 a16bb04391567ba9ce418328ddc53104 files/digest-baselayout-vserver-1.11.14-r1 280
-RMD160 1b4837fb57d341c9a7062cd93e73a6febff3be20 files/digest-baselayout-vserver-1.11.14-r1 280
-SHA256 949e1593b90a62939e3a919166fc7789051f2a760574c3f21e89263dd5e68fe8 files/digest-baselayout-vserver-1.11.14-r1 280
 MD5 a16bb04391567ba9ce418328ddc53104 files/digest-baselayout-vserver-1.11.14-r3 280
 RMD160 1b4837fb57d341c9a7062cd93e73a6febff3be20 files/digest-baselayout-vserver-1.11.14-r3 280
 SHA256 949e1593b90a62939e3a919166fc7789051f2a760574c3f21e89263dd5e68fe8 files/digest-baselayout-vserver-1.11.14-r3 280
+MD5 a16bb04391567ba9ce418328ddc53104 files/digest-baselayout-vserver-1.11.14-r4 280
+RMD160 1b4837fb57d341c9a7062cd93e73a6febff3be20 files/digest-baselayout-vserver-1.11.14-r4 280
+SHA256 949e1593b90a62939e3a919166fc7789051f2a760574c3f21e89263dd5e68fe8 files/digest-baselayout-vserver-1.11.14-r4 280
 MD5 df8b7ff09184684431afa2d74667a3e6 files/digest-baselayout-vserver-1.12.0_pre16 298
 RMD160 7272acfb7faca410ef2d90c5c12c775775608d20 files/digest-baselayout-vserver-1.12.0_pre16 298
 SHA256 89d7211dc57314c1709e05326f364247de371e76df6b10299115362360431414 files/digest-baselayout-vserver-1.12.0_pre16 298
 MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231
 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 metadata.xml 231
 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442 metadata.xml 231
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEEu8kflZ8QqxhrsMRAlKjAKCQ3xopJRMj6nwjhEQBd9fSrCN6IgCeMJHZ
-VwaWBbSLT1+K7vt08ZOitfE=
-=ooNx
------END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r3.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r3.ebuild
index 77ab1b70d54e..072a22cb7b2c 100644
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r3.ebuild
+++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r3.ebuild,v 1.2 2006/02/23 07:11:03 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r3.ebuild,v 1.3 2006/03/11 14:53:30 phreak Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -40,11 +40,11 @@ src_unpack() {
 		sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
 	fi
 
-	epatch "${FILESDIR}"/baselayout-vserver-1.11.14-adsl.patch
-	epatch "${FILESDIR}"/baselayout-vserver-1.11.14-essidnet.patch
-	epatch "${FILESDIR}"/baselayout-vserver-1.11.14-iwconfig.patch
-	epatch "${FILESDIR}"/baselayout-vserver-1.11.14-udhcpc.patch
-	epatch "${FILESDIR}"/baselayout-vserver-1.11.14-manuser.patch
+	epatch "${FILESDIR}"/${P}-adsl.patch
+	epatch "${FILESDIR}"/${P}-essidnet.patch
+	epatch "${FILESDIR}"/${P}-iwconfig.patch
+	epatch "${FILESDIR}"/${P}-udhcpc.patch
+	epatch "${FILESDIR}"/${P}-manuser.patch
 }
 
 src_compile() {
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r1.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r4.ebuild
index e9cfedb7205e..67d6111ef159 100644
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r1.ebuild
+++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r4.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r1.ebuild,v 1.2 2006/02/07 07:04:33 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r4.ebuild,v 1.1 2006/03/11 14:53:30 phreak Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
 SV=1.6.${PV##*.}
-SVREV=
 
-S="${WORKDIR}/rc-scripts-vserver-${SV}${SVREV}"
+S="${WORKDIR}/rc-scripts-vserver-${SV}"
 DESCRIPTION="Filesystem baselayout and init scripts for Linux-VServer"
 HOMEPAGE="http://dev.croup.de/proj/gentoo-vps"
-SRC_URI="mirror://gentoo/rc-scripts-vserver-${SV}${SVREV}.tar.bz2
-	http://dev.gentoo.org/~hollow/distfiles/rc-scripts-vserver-${SV}${SVREV}.tar.bz2
-	http://dev.gentoo.org/~phreak/distfiles/rc-scripts-vserver-${SV}${SVREV}.tar.bz2"
+SRC_URI="mirror://gentoo/rc-scripts-vserver-${SV}.tar.bz2
+	http://dev.gentoo.org/~hollow/distfiles/rc-scripts-vserver-${SV}.tar.bz2
+	http://dev.gentoo.org/~phreak/distfiles/rc-scripts-vserver-${SV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -41,8 +40,12 @@ src_unpack() {
 		sed -i -e '/^UNICODE=/s:no:yes:' etc/rc.conf
 	fi
 
-	epatch "${FILESDIR}"/baselayout-vserver-1.11.14-adsl.patch
-	epatch "${FILESDIR}"/baselayout-vserver-1.11.14-essidnet.patch
+	epatch "${FILESDIR}"/${P}-adsl.patch
+	epatch "${FILESDIR}"/${P}-essidnet.patch
+	epatch "${FILESDIR}"/${P}-iwconfig.patch
+	epatch "${FILESDIR}"/${P}-udhcpc.patch
+	epatch "${FILESDIR}"/${P}-manuser.patch
+	epatch "${FILESDIR}"/${P}-iproute.patch
 }
 
 src_compile() {
@@ -312,6 +315,7 @@ src_install() {
 		docinto /
 		dodoc ${FILESDIR}/copyright
 		dodoc "${S}"/ChangeLog
+		dodoc "${S}"/ChangeLog.vserver
 	fi
 
 	#
diff --git a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-iproute.patch b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-iproute.patch
new file mode 100644
index 000000000000..d6ba47a2192d
--- /dev/null
+++ b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.14-iproute.patch
@@ -0,0 +1,14 @@
+--- lib/rcscripts/net.modules.d/ifconfig	(revision 276)
++++ lib/rcscripts/net.modules.d/ifconfig	(revision 278)
+@@ -278,9 +278,9 @@ ifconfig_post_start() {
+ 		ebegin "${x}"
+ 		# Support adding IPv6 addresses easily
+ 		if [[ ${x} == *:* && ${x} != *'-A inet6'* ]]; then
+-			/sbin/route add -A inet6 ${x} &>${devnull}
++			/sbin/route add -A inet6 ${x} dev ${iface} &>${devnull}
+ 		else
+-			/sbin/route add ${x} &>${devnull}
++			/sbin/route add ${x} dev ${iface} &>${devnull}
+ 		fi
+ 		eend $?
+ 	done
diff --git a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r1 b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r4
index 0f46c7b52cdd..0f46c7b52cdd 100644
--- a/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r1
+++ b/sys-apps/baselayout-vserver/files/digest-baselayout-vserver-1.11.14-r4