remove bashisms from init file, fixes bug 179747 reported by Mike Arthur <mike@mikearthur.co.uk>

Package-Manager: portage-2.1.2.7

3 files changed, 21 insertions, 17 deletions

diff --git a/net-misc/vpnc/ChangeLog b/net-misc/vpnc/ChangeLog
index cb81abd7c564..38df0add7289 100644
--- a/net-misc/vpnc/ChangeLog
+++ b/net-misc/vpnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/vpnc
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.35 2007/03/03 14:08:01 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vpnc/ChangeLog,v 1.36 2007/05/29 08:00:07 opfer Exp $
+
+  29 May 2007; Christian Faulhammer <opfer@gentoo.org> files/vpnc.init:
+  remove bashisms from init file, fixes bug 179747 reported by Mike Arthur
+  <mike@mikearthur.co.uk>
 
   03 Mar 2007; Steve Dibb <beandog@gentoo.org> vpnc-0.4.0.ebuild:
   amd64 stable, security bug 166801
diff --git a/net-misc/vpnc/Manifest b/net-misc/vpnc/Manifest
index 17ce6dcaa0e2..3e52d00ae8c0 100644
--- a/net-misc/vpnc/Manifest
+++ b/net-misc/vpnc/Manifest
@@ -9,10 +9,10 @@ AUX vpnc-iproute-fix-2.diff 331 RMD160 38541f070339a35f04f73c496e65a6dac728144b
 MD5 4e1396bc9dfd19b437f5c69af75ca290 files/vpnc-iproute-fix-2.diff 331
 RMD160 38541f070339a35f04f73c496e65a6dac728144b files/vpnc-iproute-fix-2.diff 331
 SHA256 c94e3446a1f45e20c67fd7c0be995b83e49c8ec1638bf0a087b1fa95e29659f4 files/vpnc-iproute-fix-2.diff 331
-AUX vpnc.init 1169 RMD160 8b36394bc74c465f499de9ca465e57b46dfa2f97 SHA1 375093424c98116e045ba7091b8d94f876b714f0 SHA256 cd5c89f54b7e2f9fad6cad199d44746f133395f6759bc663f85f331b49d10e94
-MD5 0f5a60ffcc17081627b3d329a1ac788f files/vpnc.init 1169
-RMD160 8b36394bc74c465f499de9ca465e57b46dfa2f97 files/vpnc.init 1169
-SHA256 cd5c89f54b7e2f9fad6cad199d44746f133395f6759bc663f85f331b49d10e94 files/vpnc.init 1169
+AUX vpnc.init 1169 RMD160 f669f779d6f236035345229c73e88dbbdc2217e7 SHA1 be723038221f6af072b645cd950637c55f61359e SHA256 8c592ab555fd63e8dc1abfe3bd070ebefd84e191a7b9f10e54413ccc9084a17d
+MD5 f66e435dd3748ef7a1eb1620e995ddff files/vpnc.init 1169
+RMD160 f669f779d6f236035345229c73e88dbbdc2217e7 files/vpnc.init 1169
+SHA256 8c592ab555fd63e8dc1abfe3bd070ebefd84e191a7b9f10e54413ccc9084a17d files/vpnc.init 1169
 DIST vpnc-0.3.3.tar.gz 59939 RMD160 ffcb229fb8cac18f8d6dea0e67f88cec420f31da SHA1 95559e1c5b1f4bc78dc1a0b9f95e1a2d65a84c0a SHA256 be4a8e87b044cb99349e71e6879446739dd537dbde13e99ec61817ed67605bd7
 DIST vpnc-0.4.0.tar.gz 75491 RMD160 1640481601074d4517746f6e3b147b12f24b06e3 SHA1 e39b63bbebf37758e8fb7eb2ec44dfc9b7afdaab SHA256 f91c6bc2547cb503fde4f244ba82304553fec3954c65521482f8db2491700586
 EBUILD vpnc-0.3.3-r1.ebuild 922 RMD160 726521bba7cfb373fdb96ee0e255ef01423ef51f SHA1 3ae592d0584fa9db3509295d2c13d06a4d6f89f7 SHA256 f1806a06e4c4906c79175bee39b1e984164f4d5b225928648f5a597a8b06a855
@@ -31,10 +31,10 @@ EBUILD vpnc-0.4.0.ebuild 745 RMD160 e8c4721e366f05f6c5edf818582ecbd5b368e5b3 SHA
 MD5 ea30837254ca7f41d8a0c3d7fd7f2936 vpnc-0.4.0.ebuild 745
 RMD160 e8c4721e366f05f6c5edf818582ecbd5b368e5b3 vpnc-0.4.0.ebuild 745
 SHA256 6d6a1ab552b584caf4d70dc7bf8263ccf62bedeca61c89ee3da2f07164e8b36f vpnc-0.4.0.ebuild 745
-MISC ChangeLog 4525 RMD160 1b092306e021c86ed84fc613655f0ca06e645366 SHA1 77f341c79d53be901fc5cde7ba42d32cff74ba0f SHA256 0af75a1cac73213824448378564899c96a6edcffad0db818997469e37cefb71b
-MD5 1b23858b95f9ad4cb7eeddeea4d19ce7 ChangeLog 4525
-RMD160 1b092306e021c86ed84fc613655f0ca06e645366 ChangeLog 4525
-SHA256 0af75a1cac73213824448378564899c96a6edcffad0db818997469e37cefb71b ChangeLog 4525
+MISC ChangeLog 4697 RMD160 0af8d2a46d83abbf6a64d7c0714dc2c51da3d269 SHA1 aa192bf8442a78788e762e19a5b59b7ee904c1e8 SHA256 2b15c71ace4a07cfbdcea26889dc307c736b038c3b3210b4c0d32156c6824774
+MD5 402b128f3834c206579bb4bf019e4188 ChangeLog 4697
+RMD160 0af8d2a46d83abbf6a64d7c0714dc2c51da3d269 ChangeLog 4697
+SHA256 2b15c71ace4a07cfbdcea26889dc307c736b038c3b3210b4c0d32156c6824774 ChangeLog 4697
 MISC metadata.xml 318 RMD160 8d962d7e90c67d40b6560d14528b0df48a753286 SHA1 822bfa896902a43039ce449fbe983a9167ca1d28 SHA256 3c6d7c46a52ba3011843331915b2178ad42de643e6ba3b497453123bd151a892
 MD5 d39e3ffd56e4e35cc45d0d2ca177384b metadata.xml 318
 RMD160 8d962d7e90c67d40b6560d14528b0df48a753286 metadata.xml 318
@@ -52,9 +52,9 @@ MD5 7b2c41ef52521e341ec4304d8d88f9cb files/digest-vpnc-0.4.0-r2 229
 RMD160 f61397fe4b333ac603b97cf80896555933855b8e files/digest-vpnc-0.4.0-r2 229
 SHA256 060c9a58904eb607272f38694e59898767fd6e443a3259f27345c4c79629be8c files/digest-vpnc-0.4.0-r2 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGLgVOr2QksT29OyARAp2uAJwPqNo/dOtShV2ALOMXqGArr2ih8ACglhTn
-K0VljMHI1grI8Lho6DPppR0=
-=56xp
+iD8DBQFGW92NNQqtfCuFneMRArWLAJ96sR6vWJxxwgNNXL69a9E9T2kpjQCeI84F
+yqd+5ZT5NITrnjW13l5R86o=
+=ufY0
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vpnc/files/vpnc.init b/net-misc/vpnc/files/vpnc.init
index 1f18348db3b6..23da5b75a56a 100644
--- a/net-misc/vpnc/files/vpnc.init
+++ b/net-misc/vpnc/files/vpnc.init
@@ -4,7 +4,7 @@
 
 VPNDIR="/etc/vpnc"
 VPN="${SVCNAME#*.}"
-if [[ -n ${VPN} && ${SVCNAME} != "vpnc" ]]; then
+if [ -n ${VPN} ] && [ ${SVCNAME} != "vpnc" ]; then
 	VPNPID="/var/run/vpnc/${VPN}.pid"
 else
 	VPNPID="/var/run/vpnc.pid"
@@ -17,13 +17,13 @@ depend() {
 }
 
 checktundevice() {
-	if [[ ! -e /dev/net/tun ]]; then
+	if [ ! -e /dev/net/tun ]; then
 		if ! modprobe tun ; then
 			eerror "TUN/TAP support is not available in this kernel"
 			return 1
 		fi
 	fi
-	if [[ -h /dev/net/tun && -c /dev/misc/net/tun ]]; then
+	if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then
 		ebegin "Detected broken /dev/net/tun symlink, fixing..."
 		rm -f /dev/net/tun
 		ln -s /dev/misc/net/tun /dev/net/tun
@@ -36,7 +36,7 @@ start() {
 
 	checktundevice || return 1
 
-	if [[ ! -e "${VPNCONF}" ]]; then
+	if [ ! -e "${VPNCONF}" ]; then
 		eend 1 "${VPNCONF} does not exist"
 		return 1
 	fi