Various fixes for /lib/rcscripts/net.modules.d/helpers.d #73327. Thanks to

Benoit Boissinot for the patches

6 files changed, 45 insertions, 23 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index ddbe0cd301ef..2ca96df610f9 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,19 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.192 2004/12/04 07:14:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.193 2004/12/04 16:11:38 agriffis Exp $
 
 # See the gentoo-src rc-scripts ChangeLog for up-to-date release information:
 # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
 
+*baselayout-1.11.7-r2 (04 Dec 2004)
+
+  04 Dec 2004; Aron Griffis <agriffis@gentoo.org>
+  +files/rc-scripts-1.6.7-dhclient.patch,
+  +files/rc-scripts-1.6.7-udhcpc.patch, -baselayout-1.11.7-r1.ebuild,
+  +baselayout-1.11.7-r2.ebuild:
+  Various fixes for /lib/rcscripts/net.modules.d/helpers.d #73327. Thanks to
+  Benoit Boissinot for the patches
+
 *baselayout-1.11.7-r1 (04 Dec 2004)
 
   04 Dec 2004; Mike Frysinger <vapier@gentoo.org>
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index cf2490252dd5..27946593a474 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,25 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e9600007bc7c696f750fd615d77da50b ChangeLog 43492
-MD5 37aa2ba08d4d2ad1c20deaed1d8f3347 baselayout-1.11.7-r1.ebuild 16591
-MD5 5a6e60d4a0e6baf8f051488786595d0c baselayout-1.9.4-r6.ebuild 16833
 MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
+MD5 5a6e60d4a0e6baf8f051488786595d0c baselayout-1.9.4-r6.ebuild 16833
+MD5 e9600007bc7c696f750fd615d77da50b ChangeLog 43492
 MD5 14278861a1ae53f620f07c07e168ac8c baselayout-1.11.6-r1.ebuild 16524
-MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
-MD5 9933f0b4a90470585f9cee5372ac4d02 files/digest-baselayout-1.11.7-r1 69
-MD5 17086158a470fb1a8cf207c8f97f5a6f files/rc-scripts-1.6.7-fix-runscript.patch 493
-MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
+MD5 f4b88df1e65898839aa4fd9cc58bdb21 baselayout-1.11.7-r2.ebuild 16594
 MD5 dd7fbce62822fed1595f11078e23aa32 files/baselayout-1.8.6.13-r1-gcc2.patch 443
+MD5 d50ca91cbb58c7528a60ddf5bb172956 files/sysvinit-2.84-selinux.patch 3206
 MD5 adc667ea815b256d6f39259f4134f6df files/sysvinit-2.84-selinux1.patch 3556
+MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
 MD5 7b2f5e48c4d9056df539620299c20641 files/rc-scripts-1.4.16-splash.patch 11251
 MD5 d69d18485e6cfc948d9f39b2b766a406 files/digest-baselayout-1.9.4-r6 134
 MD5 3d1b5592b9b3398edb36d29422dc0143 files/rc-scripts-1.4.16-livecd.patch 672
 MD5 91e3a9eebc03ba2f2d2226ee4f78a177 files/digest-baselayout-1.11.6-r1 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBsWRYroRuSHgZdywRAnoRAJ90PjDAubGrWYxtMtttpksWryXSXACghpIT
-qEiyMbtSANczooGbYCe44Q0=
-=h+MD
------END PGP SIGNATURE-----
+MD5 9933f0b4a90470585f9cee5372ac4d02 files/digest-baselayout-1.11.7-r1 69
+MD5 17086158a470fb1a8cf207c8f97f5a6f files/rc-scripts-1.6.7-fix-runscript.patch 493
+MD5 0ba12277a13275a24b5754c0a89010bb files/rc-scripts-1.6.7-dhclient.patch 433
+MD5 ab2cacf47e6d0e69a8d1eb729c840a29 files/rc-scripts-1.6.7-udhcpc.patch 653
+MD5 9933f0b4a90470585f9cee5372ac4d02 files/digest-baselayout-1.11.7-r2 69
diff --git a/sys-apps/baselayout/baselayout-1.11.7-r1.ebuild b/sys-apps/baselayout/baselayout-1.11.7-r2.ebuild
index 3fd8bdb36a7d..2bf7db9361c4 100644
--- a/sys-apps/baselayout/baselayout-1.11.7-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.7-r1.ebuild,v 1.1 2004/12/04 07:14:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.7-r2.ebuild,v 1.1 2004/12/04 16:11:38 agriffis Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -35,6 +35,8 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/rc-scripts-${SV}-fix-runscript.patch
+	epatch ${FILESDIR}/rc-scripts-${SV}-dhclient.patch
+	epatch ${FILESDIR}/rc-scripts-${SV}-udhcpc.patch
 
 	# Fix Sparc specific stuff
 	if [[ ${ARCH} == sparc ]]; then
@@ -341,10 +343,8 @@ src_install() {
 
 	# Original design had these in /etc/net.modules.d but that is too
 	# problematic with CONFIG_PROTECT
-	insinto /lib/rcscripts/net.modules.d
-	doins ${S}/lib/rcscripts/net.modules.d/*
-	insinto /lib/rcscripts/net.modules.d/helpers.d
-	doins ${S}/lib/rcscripts/net.modules.d/helpers.d/*
+	dodir /lib/rcscripts
+	cp -a ${S}/lib/rcscripts/net.modules.d ${D}/lib/rcscripts
 
 	#
 	# Install baselayout documentation
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.11.7-r1 b/sys-apps/baselayout/files/digest-baselayout-1.11.7-r2
index c9f0bfb47aaf..c9f0bfb47aaf 100644
--- a/sys-apps/baselayout/files/digest-baselayout-1.11.7-r1
+++ b/sys-apps/baselayout/files/digest-baselayout-1.11.7-r2
diff --git a/sys-apps/baselayout/files/rc-scripts-1.6.7-dhclient.patch b/sys-apps/baselayout/files/rc-scripts-1.6.7-dhclient.patch
new file mode 100644
index 000000000000..49489b317887
--- /dev/null
+++ b/sys-apps/baselayout/files/rc-scripts-1.6.7-dhclient.patch
@@ -0,0 +1,9 @@
+--- lib/rcscripts/net.modules.d/helpers.d/dhclient-ifconfig	2004-12-04 15:58:24.000000000 +0100
++++ dhclient-ifconfig	2004-12-04 15:57:20.000000000 +0100
+@@ -5,5 +5,5 @@
+ # Distributed under the terms of the GNU General Public License V2
+ # Contributed by Roy Marples (uberlord@gentoo.org)
+ 
+-/lib/rcscripts/helpers.d/dhclient-udhcpc-wrapper ifconfig
++/lib/rcscripts/net.modules.d/helpers.d/dhclient-udhcpc-wrapper ifconfig
+ exit $?
diff --git a/sys-apps/baselayout/files/rc-scripts-1.6.7-udhcpc.patch b/sys-apps/baselayout/files/rc-scripts-1.6.7-udhcpc.patch
new file mode 100644
index 000000000000..e550b05e140b
--- /dev/null
+++ b/sys-apps/baselayout/files/rc-scripts-1.6.7-udhcpc.patch
@@ -0,0 +1,11 @@
+--- lib/rcscripts/net.modules.d/helpers.d/udhcpc-ifconfig	2004-12-04 15:58:24.000000000 +0100
++++ udhcpc-ifconfig	2004-12-04 15:57:27.000000000 +0100
+@@ -41,7 +41,7 @@
+ 
+ # If the current address does not match or we are deconfiguring
+ # then we take the all the addresses on the interface down
+-cur=$( ifconfig eth1 | grep 'inet ' | awk -F: '{ print $2,$3 }' | awk '{ print $1,$3 }' )
++cur=$( ifconfig ${interface} | grep 'inet ' | awk -F: '{ print $2,$3 }' | awk '{ print $1,$3 }' )
+ if [[ ${cur} != "${ip} ${subnet}" || ${action} == deconfig ]]; then
+ 	# Remove all aliases
+ 	for i in $( ifconfig | grep -o "^${interface}:[0-9]*" | tac | xargs ); do