Change the baselayout-1.12 compatible ip-up/ip-down scripts, at uberlord request.

(Portage version: 2.0.53)

6 files changed, 65 insertions, 108 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 0b1791963a4a..0242ce0e24d1 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.136 2006/03/12 21:08:41 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.137 2006/03/20 15:42:09 mrness Exp $
+
+*ppp-2.4.3-r12 (20 Mar 2006)
+
+  20 Mar 2006; Alin Nastac <mrness@gentoo.org> files/ip-down.baselayout,
+  files/ip-up.baselayout, -ppp-2.4.3-r11.ebuild, +ppp-2.4.3-r12.ebuild:
+  Change the baselayout-1.12 compatible ip-up/ip-down scripts, at uberlord
+  request.
 
   12 Mar 2006; Alin Nastac <mrness@gentoo.org> -ppp-2.4.3-r10.ebuild,
   ppp-2.4.3-r11.ebuild:
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 32201dc06d6a..a90863559e54 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,82 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 38deaed005af7463079a30b92de82e2b ChangeLog 24405
-RMD160 a3f059d94df15f3623b530e9d0415f751c109267 ChangeLog 24405
-SHA256 de7470d34ff59cb8ff767152776b61f45364d3ac72be538dce8f1cfd336c2af4 ChangeLog 24405
 MD5 1fd88dda7f4996799c69a9501d42cc23 files/README.mpls 530
-RMD160 4814f25fa3d788311f37045188cf285fb588da67 files/README.mpls 530
-SHA256 5ef99aba902533fe9d17b7dfaf91e72b638cc70b9f811d1e518822ee80b5ff57 files/README.mpls 530
 MD5 140bc2a08334d3546f43259934da603e files/chat-default 347
-RMD160 ac269a088985e6ebc1a4229020a897ca2f6de863 files/chat-default 347
-SHA256 5d08b6e16314d82104f36c54eac9172644e74ae13d28d4964b7f5a263a88294f files/chat-default 347
 MD5 c9117abf5fed623d5290779446e9855e files/confd.ppp0 2775
-RMD160 6f1561e4c567d1126cc78753aafee972516656cf files/confd.ppp0 2775
-SHA256 326b1169449f3c4a0bee54315cd621ad1cde884957a4ba45eb203b12c40bc575 files/confd.ppp0 2775
 MD5 5402b1b60b30f4b5d8ade8a225451095 files/digest-ppp-2.4.2-r10 271
-RMD160 b5ece8e76d864a790b34b4afd7ea2ca4bb7d458e files/digest-ppp-2.4.2-r10 271
-SHA256 7b14f3d790f2c6db397eaf840b4dfaa9216c14ef375630abc61ea27f88196153 files/digest-ppp-2.4.2-r10 271
 MD5 4d67dca76b0f8bae664bc4573222f349 files/digest-ppp-2.4.2-r15 271
-RMD160 84883d296efcfdd3fb1ef7dd31a9bb11d11e01af files/digest-ppp-2.4.2-r15 271
-SHA256 c699cfd81c3f36c061b24470ecadecd735441e718a4df8b81d865b5966f36085 files/digest-ppp-2.4.2-r15 271
-MD5 f13a85c4677854146101e4b497c94208 files/digest-ppp-2.4.3-r11 195
-RMD160 279285264b04d9071e228585558ff0fd154103f4 files/digest-ppp-2.4.3-r11 195
-SHA256 9013a36ffc382ec5b36b04365f221efd4c849537067a3755ddd277cd89568133 files/digest-ppp-2.4.3-r11 195
+MD5 f13a85c4677854146101e4b497c94208 files/digest-ppp-2.4.3-r12 195
 MD5 5a554e2a04b9e11bb5bea839213bf97c files/ip-down 931
-RMD160 11619bcb177f0226691c9da6c67520d1f6d284c6 files/ip-down 931
-SHA256 87e2f1aee24cd1fdc1d46249853de302bd9aa4076db8ca2a80b124ef867396bf files/ip-down 931
-MD5 6b7aff8114e83512b42ff1be3b1c2462 files/ip-down.baselayout 990
-RMD160 aebdba46bba83f6780c08e7d82a37d3cf5f1780c files/ip-down.baselayout 990
-SHA256 cd7440bb5a711a1e0d0c423814473083560c67911af12c7640abbd99aa83f255 files/ip-down.baselayout 990
+MD5 d3972d6ae914bc42e2d0c95b3e81d3de files/ip-down.baselayout 962
 MD5 341c2661a11f00fdd1043a4d4e82977e files/ip-up 1083
-RMD160 ada258d358dfa1209a2c590b6a28e0793cf8db4e files/ip-up 1083
-SHA256 d44b558d1dcc0a16ee6225615debf80381c07f2e94d378235c956edf238e3c2a files/ip-up 1083
-MD5 684e28baf379cadb97500a1a2d0db06d files/ip-up.baselayout 1337
-RMD160 3ad955cea80ac3401c23ea56bf8bb7d8616afbdc files/ip-up.baselayout 1337
-SHA256 38f2c2070b545c7d45a019b2f71eed079f994308d6c18189fb467e218bac245f files/ip-up.baselayout 1337
+MD5 25693832a3c6c45f41e6fd2518219133 files/ip-up.baselayout 1482
 MD5 1945441c257a952a3de0d95683047ec6 files/modules.ppp 299
-RMD160 ef5ee6fcf66dce67e5bd25220699c3df3ae6ee28 files/modules.ppp 299
-SHA256 8947dd48d3d0c128166edc9bb0917b9af88502296fad791d6d90bf165ca50db3 files/modules.ppp 299
 MD5 2f3f8eb46b9d97a435a8694683f84651 files/net.ppp0 4408
-RMD160 7e5b951d731a90ccf893a6c11fa6e6310a6783f5 files/net.ppp0 4408
-SHA256 7e9f5b0504579388390f1f1ad0226352f2ae640a4e81915f4e3b1a3958b1b29c files/net.ppp0 4408
 MD5 fa2a5b8df496922fa2fb592115953b6b files/options-pppoe 53
-RMD160 fd84d5361750433313c1b8966d4554201f55f538 files/options-pppoe 53
-SHA256 f1f082ea4fe1a58e961eb3d98d44da04dec238e3bd96216d2a58984ba0bff2c3 files/options-pppoe 53
 MD5 2890b47660f967a07ac5b211850e46c5 files/options-pptp 238
-RMD160 357a839291bae283da68db00b91c53ad038e004f files/options-pptp 238
-SHA256 b206f8ad817510feab41202cbcce1c889a35c8a849a19354297c0a8abfe39a5f files/options-pptp 238
 MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
-RMD160 4a9513511a678b7fec04a88ee0cb270972fd1aa7 files/plog 146
-SHA256 43608081ab9d6a755eb4e6fa2011f88b16b1702745d76bced6d546a7c579b39f files/plog 146
 MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723
-RMD160 5a1edfe4c28f81deb712cd0b7340dc6e4cd67bc8 files/poff 2723
-SHA256 e60c79f59cbf3be3ed30bb9562e1ba06cc8f632226ee78ffa54f10791b45a837 files/poff 2723
 MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
-RMD160 13591a1d7a87d6571126df43fc01af47354c5902 files/pon 957
-SHA256 a63273232152442cc38f88f90655e2b5640ad339cbeb7763e76ad34ad603eb49 files/pon 957
 MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607
-RMD160 ab2da8c01cab07300a83fa69c830f3c77310de9b files/pon.1 3607
-SHA256 9bb35eac78898cdc75184bb70fea11fb2e2889e1e2cadf0b7bb8320d7cae0959 files/pon.1 3607
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
-RMD160 e149a0dbac8a0ac32c02e1a4ad617572b1effbce files/pppoe.html 7605
-SHA256 88561486051134e35b20f9d64259854434c96cd9944c041b9779dc090511271a files/pppoe.html 7605
 MD5 e6fdfdc4317d7fe324c50bd0477ca3f8 metadata.xml 295
-RMD160 1bad3fb153298ef71f80807b3d2c5563433d3408 metadata.xml 295
-SHA256 eb07bc1d97ef7ec44448d40ae2f081b2db28a03bb4e612b850d0cb4acbdc29a1 metadata.xml 295
 MD5 aa48e6320cfa9b25e6ffbb743aa1c343 ppp-2.4.2-r10.ebuild 6730
-RMD160 13b882e03e79e652a6d590685c9ddc122cc2318a ppp-2.4.2-r10.ebuild 6730
-SHA256 3a05c6e3f9aea57795fc2ee3f6889bd867b8714e62f18d0c54d303c64ac9dc4d ppp-2.4.2-r10.ebuild 6730
 MD5 6e0c238e76736ee6512062d1e4433a2b ppp-2.4.2-r15.ebuild 7755
-RMD160 3b8c93f92f617a399db6db5e078c710194c2d456 ppp-2.4.2-r15.ebuild 7755
-SHA256 a58be58c79b6e0d321c8d43192f0d1524b9ad047c19c604d335d80d6f6d976f1 ppp-2.4.2-r15.ebuild 7755
-MD5 573daf0039a7223e2707de062c10de1f ppp-2.4.3-r11.ebuild 10177
-RMD160 b2bd0f1856557dbc034407d345addc870dd5b164 ppp-2.4.3-r11.ebuild 10177
-SHA256 1be09afd95871cf55db4ab8240840dab67510d1f067b54df88e94634e4530fc2 ppp-2.4.3-r11.ebuild 10177
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEHQKf2+ySkm8kpY0RAocsAJ4388kPo4N1hUyCnGFK2dRExef3PQCeMUC1
-SKg0c0gZ4xDIVdO5RsTzoLY=
-=HNxj
------END PGP SIGNATURE-----
+MD5 573daf0039a7223e2707de062c10de1f ppp-2.4.3-r12.ebuild 10177
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.3-r11 b/net-dialup/ppp/files/digest-ppp-2.4.3-r12
index 90ed7a7cef1a..90ed7a7cef1a 100644
--- a/net-dialup/ppp/files/digest-ppp-2.4.3-r11
+++ b/net-dialup/ppp/files/digest-ppp-2.4.3-r12
diff --git a/net-dialup/ppp/files/ip-down.baselayout b/net-dialup/ppp/files/ip-down.baselayout
index 0bac790932c2..74a1ef546b54 100644
--- a/net-dialup/ppp/files/ip-down.baselayout
+++ b/net-dialup/ppp/files/ip-down.baselayout
@@ -11,28 +11,30 @@
 # $5 = remote-IP-address
 # $6 = ipparam
 
-#Support for the new Gentoo baselayout
-[ -f /sbin/functions.sh ] && source /sbin/functions.sh
-if [ -x "${svclib}/net.modules.d/helpers.d/pppd-wrapper" ] &&
-   [ -x "/etc/init.d/net.$1" ] ; then
+if [ "$USEPEERDNS" ]; then
+	if [ -x /sbin/resolvconf ]; then
+		resolvconf -d "$1"
+	else
+		# taken from debian's 0000usepeerdns
+		# follow any symlink to find the real file
+		REALRESOLVCONF=$(readlink --canonicalize /etc/resolv.conf)
 
-	${svclib}/net.modules.d/helpers.d/pppd-wrapper down $1
+		if [ "$REALRESOLVCONF" != "/etc/ppp/resolv.conf" ]; then
 
-elif [ "$USEPEERDNS" ]; then
+			# if an old resolv.conf file exists, restore it
+			if [ -e $REALRESOLVCONF.pppd-backup ]; then
+				mv $REALRESOLVCONF.pppd-backup $REALRESOLVCONF
+			fi
 
-	# taken from debian's 0000usepeerdns
-	# follow any symlink to find the real file
-	REALRESOLVCONF=$(readlink --canonicalize /etc/resolv.conf)
-
-	if [ "$REALRESOLVCONF" != "/etc/ppp/resolv.conf" ]; then
-
-		# if an old resolv.conf file exists, restore it
-		if [ -e $REALRESOLVCONF.pppd-backup ]; then
-			mv $REALRESOLVCONF.pppd-backup $REALRESOLVCONF
 		fi
-
 	fi
+fi
 
+if [ -x /etc/init.d/net.$1 ]; then
+	if /etc/init.d/net.$1 --quiet --status ; then
+		export IN_BACKGROUND="true"
+		/etc/init.d/net.$1 --quiet stop
+	fi
 fi
 
 [ -f /etc/ppp/ip-down.local ] && . /etc/ppp/ip-down.local "$@"
diff --git a/net-dialup/ppp/files/ip-up.baselayout b/net-dialup/ppp/files/ip-up.baselayout
index c3792f998f0e..786ace1e3785 100644
--- a/net-dialup/ppp/files/ip-up.baselayout
+++ b/net-dialup/ppp/files/ip-up.baselayout
@@ -11,39 +11,45 @@
 # $5 = remote-IP-address
 # $6 = ipparam
 
-#Support for the new Gentoo baselayout
-[ -f /sbin/functions.sh ] && source /sbin/functions.sh
-if [ -x "${svclib}/net.modules.d/helpers.d/pppd-wrapper" ] &&
-   [ -x "/etc/init.d/net.$1" ] ; then
-
-	${svclib}/net.modules.d/helpers.d/pppd-wrapper up $1
-
-elif [ "$USEPEERDNS" ]; then
-
-	# add the server supplied DNS entries to /etc/resolv.conf
-	# (taken from debian's 0000usepeerdns)
-
-	# follow any symlink to find the real file
-	REALRESOLVCONF=$(readlink --canonicalize /etc/resolv.conf)
-
-	if [ "$REALRESOLVCONF" != "/etc/ppp/resolv.conf" ]; then
-
-		# merge the new nameservers with the other options from the old configuration
-		{
+if [ "$USEPEERDNS" ]; then
+
+	if [ -x /sbin/resolvconf ]; then
+		conf="# Generated by ppp for $1\n"
+		[ -n "$DNS1" ] && conf="${conf}nameserver $DNS1\n"
+		[ -n "$DNS2" ] && conf="${conf}nameserver $DNS2\n"
+		echo -e "$conf" | resolvconf -a "$1"
+	else
+		# add the server supplied DNS entries to /etc/resolv.conf
+		# (taken from debian's 0000usepeerdns)
+
+		# follow any symlink to find the real file
+		REALRESOLVCONF=$(readlink --canonicalize /etc/resolv.conf)
+	
+		if [ "$REALRESOLVCONF" != "/etc/ppp/resolv.conf" ]; then
+
+			# merge the new nameservers with the other options from the old configuration
+			{
 			grep --invert-match '^nameserver[[:space:]]' $REALRESOLVCONF
 			cat /etc/ppp/resolv.conf
-		} > $REALRESOLVCONF.tmp
-
-		# backup the old configuration and install the new one
-		cp -dpP $REALRESOLVCONF $REALRESOLVCONF.pppd-backup
-		mv $REALRESOLVCONF.tmp $REALRESOLVCONF
+			} > $REALRESOLVCONF.tmp
+
+			# backup the old configuration and install the new one
+			cp -dpP $REALRESOLVCONF $REALRESOLVCONF.pppd-backup
+			mv $REALRESOLVCONF.tmp $REALRESOLVCONF
+	
+			# correct permissions
+			chmod 0644 /etc/resolv.conf
+			chown root:root /etc/resolv.conf
+		fi
+	fi
 
-		# correct permissions
-		chmod 0644 /etc/resolv.conf
-		chown root:root /etc/resolv.conf
+fi
 
+if [ -x /etc/init.d/net.$1 ]; then
+	if ! /etc/init.d/net.$1 --quiet status ; then
+		export IN_BACKGROUND="true"
+		/etc/init.d/net.$1 --quiet start
 	fi
-
 fi
 
 [ -f /etc/ppp/ip-up.local ] && . /etc/ppp/ip-up.local "$@"
diff --git a/net-dialup/ppp/ppp-2.4.3-r11.ebuild b/net-dialup/ppp/ppp-2.4.3-r12.ebuild
index 0a6ce552b82d..342dbdbbb0c0 100644
--- a/net-dialup/ppp/ppp-2.4.3-r11.ebuild
+++ b/net-dialup/ppp/ppp-2.4.3-r12.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/net-dialup/ppp/ppp-2.4.3-r11.ebuild,v 1.3 2006/03/19 07:04:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r12.ebuild,v 1.1 2006/03/20 15:42:09 mrness Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info