Ensure we work with all bash versions.

Package-Manager: portage-2.1.2_rc1-r2

4 files changed, 23 insertions, 21 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index abd06f06df79..38e1870ea661 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.98 2006/10/17 14:55:03 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.99 2006/11/01 21:45:20 uberlord Exp $
+
+  01 Nov 2006; Roy Marples <uberlord@gentoo.org> files/openvpn-2.1.init,
+  files/up.sh:
+  Ensure we work with all bash versions.
 
   17 Oct 2006; Roy Marples <uberlord@gentoo.org> openvpn-2.0.7.ebuild,
   openvpn-2.1_beta15.ebuild:
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index ecb504d40c93..5967fc0677fa 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -10,18 +10,18 @@ AUX openvpn-2.0.7-pam.patch 1236 RMD160 3f9035a7005b206e1447dfd75edcb65cb5531b2d
 MD5 968e83fbca1dca7d68c60aacdb51b6be files/openvpn-2.0.7-pam.patch 1236
 RMD160 3f9035a7005b206e1447dfd75edcb65cb5531b2d files/openvpn-2.0.7-pam.patch 1236
 SHA256 b5906cc1bff00ebc3dc9a58861388493aa6d2be774dbacba63c2cfcc8bfa4f92 files/openvpn-2.0.7-pam.patch 1236
-AUX openvpn-2.1.init 4035 RMD160 83a55e01f706ba5e50ba1eafb6586e14827c5e0b SHA1 2b5767933e6e55605c5774fd396a6a25eb629238 SHA256 e3306b4ba984ab5d569ea67ee0ab2a42ab4c859eb5c09f0bd78d45c95d31826a
-MD5 2536d0f9eb642b9470627bd81001ca35 files/openvpn-2.1.init 4035
-RMD160 83a55e01f706ba5e50ba1eafb6586e14827c5e0b files/openvpn-2.1.init 4035
-SHA256 e3306b4ba984ab5d569ea67ee0ab2a42ab4c859eb5c09f0bd78d45c95d31826a files/openvpn-2.1.init 4035
+AUX openvpn-2.1.init 4030 RMD160 2fd09ed8b13bdd3cc7010c8101b4df02c3c0563f SHA1 9321aa3acf0440b17bbd97cb8c3f7de68bd05122 SHA256 5fcdb3c7b27584d9a3167e3794fec77b8657814408287ef12fcb58996d66b7da
+MD5 7de21271f38af5f627ec66cc766831b9 files/openvpn-2.1.init 4030
+RMD160 2fd09ed8b13bdd3cc7010c8101b4df02c3c0563f files/openvpn-2.1.init 4030
+SHA256 5fcdb3c7b27584d9a3167e3794fec77b8657814408287ef12fcb58996d66b7da files/openvpn-2.1.init 4030
 AUX openvpn.init 1457 RMD160 233cf3953ee341f025a9bc863e7ad0fac91369ab SHA1 b625de203e357b5e2a8d276c36e2fecc31946c1a SHA256 bfb8ac1e2d8a7d2a0313741e45f6e14ab4076581ba4166709dbe05ab110cb80a
 MD5 35cb74384ed5232c68dbf19f9107bd8e files/openvpn.init 1457
 RMD160 233cf3953ee341f025a9bc863e7ad0fac91369ab files/openvpn.init 1457
 SHA256 bfb8ac1e2d8a7d2a0313741e45f6e14ab4076581ba4166709dbe05ab110cb80a files/openvpn.init 1457
-AUX up.sh 1606 RMD160 1b1180ee687c3276dcad6ba3191b5cd87719fb36 SHA1 210fd62bbd361484f30d62ea312cf7edf09f6c02 SHA256 2440d2d1cedc192c083c771d84ecd9feb127402c78e4b9a1b3af1faf469902fb
-MD5 8b4061c2b60b1f4ed91fcc9ca9d7adca files/up.sh 1606
-RMD160 1b1180ee687c3276dcad6ba3191b5cd87719fb36 files/up.sh 1606
-SHA256 2440d2d1cedc192c083c771d84ecd9feb127402c78e4b9a1b3af1faf469902fb files/up.sh 1606
+AUX up.sh 1629 RMD160 53d88eb11eecf5b3688fbeac4263bdc6bbf0bfdc SHA1 d7e12c7fdc0d4320007ff0f24939ab290862336b SHA256 7078ac2bef9127c3d0ad7a48d62fe54e813aa6ce50289001aac45f209b048a12
+MD5 6a58bfc8b5421f175b321902d3d8cf30 files/up.sh 1629
+RMD160 53d88eb11eecf5b3688fbeac4263bdc6bbf0bfdc files/up.sh 1629
+SHA256 7078ac2bef9127c3d0ad7a48d62fe54e813aa6ce50289001aac45f209b048a12 files/up.sh 1629
 DIST openvpn-2.0.6.tar.gz 664816 RMD160 cf3cd807bb657baf317e896b57900958cf442a63 SHA256 1074c9fb5a7881e6d4ff0b125cf1e44a9fb650beef187f061785698522453003
 DIST openvpn-2.0.7.tar.gz 665129 RMD160 b89f6df5ff08326f4e07e6cd4abda633627ef9e4 SHA1 74a4d19e42ca226f50ab5bdba16aa4a130c5e431 SHA256 9e29ebfb76375379b4ca12c2270dff3b4b1636eb643747c69249ae206833052e
 DIST openvpn-2.1_beta15.tar.gz 776778 RMD160 514246341a9979f1aec4c28b203d8a8f2c64408b SHA1 51bc91cb09f9863cf85c5b3c83755d2dc74dab5a SHA256 35daa28523095d637bc694d4e22f9a0e075f9e8b910998ca7bf2576fa9d8cc05
@@ -37,10 +37,10 @@ EBUILD openvpn-2.1_beta15.ebuild 4200 RMD160 db8df547c0d81076b307afed291610d0514
 MD5 3da39e46eaa4929712f44a47920ee9a0 openvpn-2.1_beta15.ebuild 4200
 RMD160 db8df547c0d81076b307afed291610d051404528 openvpn-2.1_beta15.ebuild 4200
 SHA256 bebe76a2d80fc31f1ca9b2ec6b2ff7c80165f44e653bece9ba8e02d7fe4dec42 openvpn-2.1_beta15.ebuild 4200
-MISC ChangeLog 14972 RMD160 b82aa2e45bf7f117441ce6eec8d518c53cf3ed71 SHA1 493fab720c842b5b2ee6cec8fdd00190549c055a SHA256 0bad357453e4962f5e863f16d0f7d739cedc0bac4a9eb84c8469c8b112e048d6
-MD5 492459a0a58629b55f373b21ab3b47e8 ChangeLog 14972
-RMD160 b82aa2e45bf7f117441ce6eec8d518c53cf3ed71 ChangeLog 14972
-SHA256 0bad357453e4962f5e863f16d0f7d739cedc0bac4a9eb84c8469c8b112e048d6 ChangeLog 14972
+MISC ChangeLog 15102 RMD160 a5160847c989206303194e85b9cd90beb34905a8 SHA1 55e5f61a40d80eac370ce29ba38ff217682a17f2 SHA256 fabca3ae13d94e4f1d535fb87b31833f74eb4570b906e88bccf5504856bf97b3
+MD5 6f2c66d27f56c73490c6423e410aa4f1 ChangeLog 15102
+RMD160 a5160847c989206303194e85b9cd90beb34905a8 ChangeLog 15102
+SHA256 fabca3ae13d94e4f1d535fb87b31833f74eb4570b906e88bccf5504856bf97b3 ChangeLog 15102
 MISC metadata.xml 440 RMD160 120089ec9c799161dfeeacd9a3adfc40b4317f06 SHA1 23d2975ef0f709dc2e754a5867942e679ee60740 SHA256 408ca4fc4f58fa21e629582d0a44a759f9695a018479d70efbd3338b6bdbcfd6
 MD5 62aa0438042b29eba4a6afd971037761 metadata.xml 440
 RMD160 120089ec9c799161dfeeacd9a3adfc40b4317f06 metadata.xml 440
diff --git a/net-misc/openvpn/files/openvpn-2.1.init b/net-misc/openvpn/files/openvpn-2.1.init
index 81d181a65a47..060bc4d4a12b 100755
--- a/net-misc/openvpn/files/openvpn-2.1.init
+++ b/net-misc/openvpn/files/openvpn-2.1.init
@@ -37,16 +37,14 @@ checkconfig() {
 
 	# Other OS's don't, so we rely on a pre-configured interface
 	# per vpn instance
-	local ifname=
-	if [[ ! $'\n'$(<"${VPNCONF}") =~ \
-	$'\n'"[[:space:]]*dev[[:space:]]*([^[[:space:]]*)" ]] ; then
+	local ifname=$(sed -n -e 's/[[:space:]]*dev[[:space:]][[:space:]]*\([^[:space:]]*\).*/\1/p' "${VPNCONF}")
+	if [[ -z ${ifname} ]] ; then
 		eerror "You need to specify the interface that this openvpn" \
 			"instance should use" \
 			"by using the dev option in ${VPNCONF}"
 		return 1
 	fi
 
-	ifname="${BASH_REMATCH[1]}"
 	if ! ifconfig "${ifname}" &>/dev/null ; then
 		# Try and create it
 		echo > /dev/"${ifname}" &>/dev/null
diff --git a/net-misc/openvpn/files/up.sh b/net-misc/openvpn/files/up.sh
index 0a18876aae93..797d81af9f03 100755
--- a/net-misc/openvpn/files/up.sh
+++ b/net-misc/openvpn/files/up.sh
@@ -15,10 +15,10 @@ NS=
 DOMAIN=
 for var in ${!foreign_option_*} ; do
 	opt="${!var}"
-	if [[ ${opt} =~ "dhcp-option DOMAIN (.*)" ]] ; then
-		DOMAIN="${DNS}domain ${BASH_REMATCH[1]}\n"
-	elif [[ ${opt} =~ "dhcp-option DNS (.*)" ]] ; then
-		NS="${DNS}nameserver ${BASH_REMATCH[1]}\n"
+	if [[ ${opt} != "${opt#dhcp-option DOMAIN *}" ]] ; then
+		DOMAIN="${DNS}domain ${opt#dhcp-option DOMAIN *}\n"
+	elif [[ ${opt} != "${opt#dhcp-option DNS *}" ]] ; then
+		NS="${DNS}nameserver ${opt#dhcp-option DNS *}\n"
 	fi
 done