PEER_DNS now allows OpenVPN to create /etc/resolv.conf or not, #193668

Package-Manager: portage-2.1.3.9

8 files changed, 81 insertions, 71 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 6ae3f2fd9120..4767e3e8914d 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.116 2007/09/15 07:30:31 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.117 2007/09/25 12:47:00 uberlord Exp $
+
+  25 Sep 2007; Roy Marples <uberlord@gentoo.org> files/openvpn-2.1.conf,
+  files/openvpn-2.1.init, files/down.sh, files/up.sh:
+  PEER_DNS now allows OpenVPN to create /etc/resolv.conf or not, #193668
+
+  25 Sep 2007; Roy Marples <uberlord@gentoo.org> files/down.sh, files/up.sh:
+  Pass parameters to service specific scripts, #193724 thanks to Sergiy Borodych
 
   15 Sep 2007; Roy Marples <uberlord@gentoo.org>
   -files/openvpn-2.0.4-darwin.patch, openvpn-2.0.6.ebuild,
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 4791bab217e7..d6880e083718 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,7 +1,7 @@
-AUX down.sh 855 RMD160 0fed7862ed257e13ee93a9c29750eb26c4b83e68 SHA1 e14110015b89ab24b4bfa1b4e91d66bc1e54ea3b SHA256 b06bdbc9b8f9d3b4575fd20f69792625f1b65fcae0d92ad904778bdfb84a7457
-MD5 c777a06955c64fe15f78a9a456abe13b files/down.sh 855
-RMD160 0fed7862ed257e13ee93a9c29750eb26c4b83e68 files/down.sh 855
-SHA256 b06bdbc9b8f9d3b4575fd20f69792625f1b65fcae0d92ad904778bdfb84a7457 files/down.sh 855
+AUX down.sh 906 RMD160 9ef2461c0b2a7035b1bc2da3f33e38aac5ed2bb9 SHA1 484a07fdf86a921e768c47948361347f243ca77f SHA256 a09760aa53d53d6bbbe45798ea953c73a8c9bc08f8e014c08342717e617ac864
+MD5 2b71b4daa1f7eca916729abe34839068 files/down.sh 906
+RMD160 9ef2461c0b2a7035b1bc2da3f33e38aac5ed2bb9 files/down.sh 906
+SHA256 a09760aa53d53d6bbbe45798ea953c73a8c9bc08f8e014c08342717e617ac864 files/down.sh 906
 AUX openvpn-2.0.7-pam.patch 1236 RMD160 3f9035a7005b206e1447dfd75edcb65cb5531b2d SHA1 09c362da6cea1d6f7e6ff060a4e92493a5b34cba SHA256 b5906cc1bff00ebc3dc9a58861388493aa6d2be774dbacba63c2cfcc8bfa4f92
 MD5 968e83fbca1dca7d68c60aacdb51b6be files/openvpn-2.0.7-pam.patch 1236
 RMD160 3f9035a7005b206e1447dfd75edcb65cb5531b2d files/openvpn-2.0.7-pam.patch 1236
@@ -10,14 +10,14 @@ AUX openvpn-2.0.7-persistent.patch 1857 RMD160 b3232feb19810ac405cd7af6bb692ed03
 MD5 3960920a53d3398558b984d2952b6aa6 files/openvpn-2.0.7-persistent.patch 1857
 RMD160 b3232feb19810ac405cd7af6bb692ed03f9c44c2 files/openvpn-2.0.7-persistent.patch 1857
 SHA256 51de714f2191ac3ea59a7f7c5a0aa1c0bf15ee5d79ace10f2276d415cd0f59e0 files/openvpn-2.0.7-persistent.patch 1857
-AUX openvpn-2.1.conf 712 RMD160 0361ea2ceef1256e0726c34aa73139ca91c28a08 SHA1 d2440bcbad3dda12d9264b6ebeb9469271f935e5 SHA256 20c66233746766a53a43a0bfdc8b688fcdb9a00659b116fac6cb8e293924895e
-MD5 945e64c8b2889367785512371e49432d files/openvpn-2.1.conf 712
-RMD160 0361ea2ceef1256e0726c34aa73139ca91c28a08 files/openvpn-2.1.conf 712
-SHA256 20c66233746766a53a43a0bfdc8b688fcdb9a00659b116fac6cb8e293924895e files/openvpn-2.1.conf 712
-AUX openvpn-2.1.init 3986 RMD160 5f25f5961fd13e40ea9746b566c5cfb689412061 SHA1 c24e3a87e1b81bb47d144b1b442d5c54e4f716a9 SHA256 323b10b115b4f8bf142d80b2b0ac8bf4b9496ed7d26b55836a332a0fb82fe53e
-MD5 2d31f3b59811d856b4b76b581d37a16e files/openvpn-2.1.init 3986
-RMD160 5f25f5961fd13e40ea9746b566c5cfb689412061 files/openvpn-2.1.init 3986
-SHA256 323b10b115b4f8bf142d80b2b0ac8bf4b9496ed7d26b55836a332a0fb82fe53e files/openvpn-2.1.init 3986
+AUX openvpn-2.1.conf 892 RMD160 687a747ed2f801b051438d02da8fcd44c6954484 SHA1 e65db7d972483c9391ef92d2931d9db7b69e4329 SHA256 330149a83684ddabe413d134d4c8efad4c88b18c2ab67165014deff5f7fffad2
+MD5 9eca88cac6294027ec1bb7be74185c3a files/openvpn-2.1.conf 892
+RMD160 687a747ed2f801b051438d02da8fcd44c6954484 files/openvpn-2.1.conf 892
+SHA256 330149a83684ddabe413d134d4c8efad4c88b18c2ab67165014deff5f7fffad2 files/openvpn-2.1.conf 892
+AUX openvpn-2.1.init 4057 RMD160 36d5500a0837d89d9f955f867014ba9abb018e66 SHA1 73bd9aa44680f81224b4c72d9c0388d40bc4a823 SHA256 98ae925160431006763a771f0d486e61b801db52a61dbc2a76b0dd36644bd85d
+MD5 579e1199c75ccd09c01a0e257d89d267 files/openvpn-2.1.init 4057
+RMD160 36d5500a0837d89d9f955f867014ba9abb018e66 files/openvpn-2.1.init 4057
+SHA256 98ae925160431006763a771f0d486e61b801db52a61dbc2a76b0dd36644bd85d files/openvpn-2.1.init 4057
 AUX openvpn-2.1_rc4-ip6-mss.patch 9971 RMD160 67d4b0ef282f77dd61da901a4acca861ece36980 SHA1 e02378d9addbc64c01af0b1dbd1353eac9d58b43 SHA256 73c6bcb15be8ae1200241e344094332efcb219c8933a066e78f9c8f369fbdfd2
 MD5 eac58785029b59b56d468885afec5f58 files/openvpn-2.1_rc4-ip6-mss.patch 9971
 RMD160 67d4b0ef282f77dd61da901a4acca861ece36980 files/openvpn-2.1_rc4-ip6-mss.patch 9971
@@ -26,10 +26,10 @@ AUX openvpn.init 1461 RMD160 5b1e41f449e287fc2629c2ecef28f7437d10eb74 SHA1 756af
 MD5 8f8bae9823ceafe8b9a1ac24bb4a23da files/openvpn.init 1461
 RMD160 5b1e41f449e287fc2629c2ecef28f7437d10eb74 files/openvpn.init 1461
 SHA256 81782885fe6b65434404e4d5875071cb9a4c70914f25c71826290bb265ab109e files/openvpn.init 1461
-AUX up.sh 2439 RMD160 ef4bd245dc6fab63f58e137dffecfbd11416cb7a SHA1 f448c05f5f7e832a8b53a97e1b658bd2a8cefb79 SHA256 4dfabc75408e7123ed6b016908c6bcffe2f29eb3029332c2a5a63b1601f311fc
-MD5 d716eec7427a63d2c97bc033ced89d3c files/up.sh 2439
-RMD160 ef4bd245dc6fab63f58e137dffecfbd11416cb7a files/up.sh 2439
-SHA256 4dfabc75408e7123ed6b016908c6bcffe2f29eb3029332c2a5a63b1601f311fc files/up.sh 2439
+AUX up.sh 2514 RMD160 e83b3a6cda2be6d4e079f482ddd0b0ddc69ccd94 SHA1 8b5c86c53d08c294fbd5e5c1a0bc0dc7662d2230 SHA256 584b4876a99b48a75ed1b92c083e6d71fc6089a3edd8923eff4bf02fdf81da20
+MD5 9903aa8244caf4869bd4fdf0c58e9a7c files/up.sh 2514
+RMD160 e83b3a6cda2be6d4e079f482ddd0b0ddc69ccd94 files/up.sh 2514
+SHA256 584b4876a99b48a75ed1b92c083e6d71fc6089a3edd8923eff4bf02fdf81da20 files/up.sh 2514
 DIST openvpn-2.0.6.tar.gz 664816 RMD160 cf3cd807bb657baf317e896b57900958cf442a63 SHA1 046f3811831a06e4fbc9c64544faaecf04547ae5 SHA256 1074c9fb5a7881e6d4ff0b125cf1e44a9fb650beef187f061785698522453003
 DIST openvpn-2.0.7.tar.gz 665129 RMD160 b89f6df5ff08326f4e07e6cd4abda633627ef9e4 SHA1 74a4d19e42ca226f50ab5bdba16aa4a130c5e431 SHA256 9e29ebfb76375379b4ca12c2270dff3b4b1636eb643747c69249ae206833052e
 DIST openvpn-2.1-udp6.patch.bz2 16625 RMD160 58f7fa1e9eebdfb267782f409b162e84f227faf8 SHA1 cb13e4f7dd973bb782e2bd5cc9a59f5f5bcb3ef0 SHA256 e98bd77e3098a203b23dde34847ba9647f8f0c75d432559d1c3fb1e9ada66322
@@ -46,10 +46,10 @@ EBUILD openvpn-2.1_rc4-r2.ebuild 4593 RMD160 6567672b01b354454f3b28c2b827533d65b
 MD5 97c8d87f26677ee1f6dbb97e55f557f5 openvpn-2.1_rc4-r2.ebuild 4593
 RMD160 6567672b01b354454f3b28c2b827533d65b316be openvpn-2.1_rc4-r2.ebuild 4593
 SHA256 dce1e19c192f8188992a72eefb3b0b5f8aa3d257d8886d40104686a1698d73fb openvpn-2.1_rc4-r2.ebuild 4593
-MISC ChangeLog 18449 RMD160 6bbaf15f7bbc0c8a9f44630878c9917050b37ad1 SHA1 0253a32cf02f2b6fd219fbd056f2bb20091c444a SHA256 da2a09c8d008890cf14e7a106683404905e1e73832821da8cc63e18ec040ee58
-MD5 2de313356127ef262162b5bea06809e7 ChangeLog 18449
-RMD160 6bbaf15f7bbc0c8a9f44630878c9917050b37ad1 ChangeLog 18449
-SHA256 da2a09c8d008890cf14e7a106683404905e1e73832821da8cc63e18ec040ee58 ChangeLog 18449
+MISC ChangeLog 18809 RMD160 3ed9a4ce28753242bb9f251bda8689ef9f92996f SHA1 6a0bee128054ab0549d05e9f0681e9b698264bdf SHA256 d27c3e530baf03db0d7b7328e232c6f7f1622e16700ff692320e4137dce662d8
+MD5 162aaf44f2d9e6f98a54b7c21bbca689 ChangeLog 18809
+RMD160 3ed9a4ce28753242bb9f251bda8689ef9f92996f ChangeLog 18809
+SHA256 d27c3e530baf03db0d7b7328e232c6f7f1622e16700ff692320e4137dce662d8 ChangeLog 18809
 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/digest-openvpn-2.1_rc4 b/net-misc/openvpn/files/digest-openvpn-2.1_rc4
deleted file mode 100644
index 66b8a036079c..000000000000
--- a/net-misc/openvpn/files/digest-openvpn-2.1_rc4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9fffc0aa0f797b612fa4f52b1e92197b openvpn-2.1_rc4.tar.gz 803125
-RMD160 d9843c2fb6fda64b5cf9474f42b36068bb4cd845 openvpn-2.1_rc4.tar.gz 803125
-SHA256 5d14e101c40e396250727fae7ee9ab734edd4e6e7f55b8209e0e215423775ff3 openvpn-2.1_rc4.tar.gz 803125
diff --git a/net-misc/openvpn/files/digest-openvpn-2.1_rc4-r1 b/net-misc/openvpn/files/digest-openvpn-2.1_rc4-r1
deleted file mode 100644
index 56dcf25ffe7f..000000000000
--- a/net-misc/openvpn/files/digest-openvpn-2.1_rc4-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 225d07591c239977d874fa3e7b495506 openvpn-2.1-udp6.patch.bz2 16625
-RMD160 58f7fa1e9eebdfb267782f409b162e84f227faf8 openvpn-2.1-udp6.patch.bz2 16625
-SHA256 e98bd77e3098a203b23dde34847ba9647f8f0c75d432559d1c3fb1e9ada66322 openvpn-2.1-udp6.patch.bz2 16625
-MD5 9fffc0aa0f797b612fa4f52b1e92197b openvpn-2.1_rc4.tar.gz 803125
-RMD160 d9843c2fb6fda64b5cf9474f42b36068bb4cd845 openvpn-2.1_rc4.tar.gz 803125
-SHA256 5d14e101c40e396250727fae7ee9ab734edd4e6e7f55b8209e0e215423775ff3 openvpn-2.1_rc4.tar.gz 803125
diff --git a/net-misc/openvpn/files/down.sh b/net-misc/openvpn/files/down.sh
index 23d9c264b9fb..1c5885311b39 100755
--- a/net-misc/openvpn/files/down.sh
+++ b/net-misc/openvpn/files/down.sh
@@ -5,17 +5,19 @@
 
 # If we have a service specific script, run this now
 if [ -x /etc/openvpn/"${SVCNAME}"-down.sh ] ; then
-	/etc/openvpn/"${SVCNAME}"-down.sh
+	/etc/openvpn/"${SVCNAME}"-down.sh "$@"
 fi
 
 # Restore resolv.conf to how it was
-if [ -x /sbin/resolvconf ] ; then
-	/sbin/resolvconf -d "${dev}"
-elif [ -e /etc/resolv.conf-"${dev}".sv ] ; then
-	# Important that we copy instead of move incase resolv.conf is
-	# a symlink and not an actual file
-	cp /etc/resolv.conf-"${dev}".sv /etc/resolv.conf
-	rm -f /etc/resolv.conf-"${dev}".sv
+if [ "${PEER_DNS}" != "no" ]; then
+	if [ -x /sbin/resolvconf ] ; then
+		/sbin/resolvconf -d "${dev}"
+	elif [ -e /etc/resolv.conf-"${dev}".sv ] ; then
+		# Important that we copy instead of move incase resolv.conf is
+		# a symlink and not an actual file
+		cp /etc/resolv.conf-"${dev}".sv /etc/resolv.conf
+		rm -f /etc/resolv.conf-"${dev}".sv
+	fi
 fi
 
 # Re-enter the init script to start any dependant services
diff --git a/net-misc/openvpn/files/openvpn-2.1.conf b/net-misc/openvpn/files/openvpn-2.1.conf
index 17c93dc07f31..72510c34aed3 100644
--- a/net-misc/openvpn/files/openvpn-2.1.conf
+++ b/net-misc/openvpn/files/openvpn-2.1.conf
@@ -1,3 +1,8 @@
+# OpenVPN automatically creates an /etc/resolv.conf (or sends it to
+# resolvconf) if given DNS information by the OpenVPN server.
+# Set PEER_DNS="no" to stop this.
+PEER_DNS="yes"
+
 # OpenVPN can run in many modes. Most people will want the init script
 # to automatically detect the mode and try and apply a good default
 # configuration and setup scripts. However, there are cases where the
diff --git a/net-misc/openvpn/files/openvpn-2.1.init b/net-misc/openvpn/files/openvpn-2.1.init
index b61456334ae9..b976cccf5211 100755
--- a/net-misc/openvpn/files/openvpn-2.1.init
+++ b/net-misc/openvpn/files/openvpn-2.1.init
@@ -104,6 +104,9 @@ start() {
 		grep -q "^[ \t]*group[ \t].*" "${VPNCONF}" || args="${args} --group openvpn"
 	fi
 
+	# Ensure that our scripts get the PEER_DNS variable
+	export PEER_DNS
+
 	[ "${reenter}" = "yes" ] && mark_service_inactive "${SVCNAME}"
 	start-stop-daemon --start --exec /usr/sbin/openvpn --pidfile "${VPNPID}" \
 		-- --config "${VPNCONF}" --writepid "${VPNPID}" --daemon ${args}
diff --git a/net-misc/openvpn/files/up.sh b/net-misc/openvpn/files/up.sh
index da1a527cd8fa..463e72fccbc7 100755
--- a/net-misc/openvpn/files/up.sh
+++ b/net-misc/openvpn/files/up.sh
@@ -19,42 +19,44 @@
 # A possible workaround would be to just list multiple domain lines
 # and try and let resolvconf handle it
 
-NS=
-DOMAIN=
-SEARCH=
-i=1
-while true ; do
-	eval opt=\$foreign_option_${i}
-	[ -z "${opt}" ] && break
-	if [ "${opt}" != "${opt#dhcp-option DOMAIN *}" ] ; then
-		if [ -z "${DOMAIN}" ] ; then
-			DOMAIN="${opt#dhcp-option DOMAIN *}"
-		else
-			SEARCH="${SEARCH:+ }${opt#dhcp-option DOMAIN *}"
+if [ "${PEER_DNS}" != "no" ]; then
+	NS=
+	DOMAIN=
+	SEARCH=
+	i=1
+	while true ; do
+		eval opt=\$foreign_option_${i}
+		[ -z "${opt}" ] && break
+		if [ "${opt}" != "${opt#dhcp-option DOMAIN *}" ] ; then
+			if [ -z "${DOMAIN}" ] ; then
+				DOMAIN="${opt#dhcp-option DOMAIN *}"
+			else
+				SEARCH="${SEARCH:+ }${opt#dhcp-option DOMAIN *}"
+			fi
+		elif [ "${opt}" != "${opt#dhcp-option DNS *}" ] ; then
+			NS="${NS}nameserver ${opt#dhcp-option DNS *}\n"
 		fi
-	elif [ "${opt}" != "${opt#dhcp-option DNS *}" ] ; then
-		NS="${NS}nameserver ${opt#dhcp-option DNS *}\n"
-	fi
-	i=$((${i} + 1))
-done
+		i=$((${i} + 1))
+	done
 
-if [ -n "${NS}" ] ; then
-	DNS="# Generated by openvpn for interface ${dev}\n"
-	if [ -n "${SEARCH}" ] ; then
-		DNS="${DNS}search ${DOMAIN} ${SEARCH}\n"
-	else
-		DNS="${DNS}domain ${DOMAIN}\n"
-	fi
-	DNS="${DNS}${NS}"
-	if [ -x /sbin/resolvconf ] ; then
-		printf "${DNS}" | /sbin/resolvconf -a "${dev}"
-	else
-		# Preserve the existing resolv.conf
-		if [ -e /etc/resolv.conf ] ; then
-			cp /etc/resolv.conf /etc/resolv.conf-"${dev}".sv
+	if [ -n "${NS}" ] ; then
+		DNS="# Generated by openvpn for interface ${dev}\n"
+		if [ -n "${SEARCH}" ] ; then
+			DNS="${DNS}search ${DOMAIN} ${SEARCH}\n"
+		else
+			DNS="${DNS}domain ${DOMAIN}\n"
+		fi
+		DNS="${DNS}${NS}"
+		if [ -x /sbin/resolvconf ] ; then
+			printf "${DNS}" | /sbin/resolvconf -a "${dev}"
+		else
+			# Preserve the existing resolv.conf
+			if [ -e /etc/resolv.conf ] ; then
+				cp /etc/resolv.conf /etc/resolv.conf-"${dev}".sv
+			fi
+			printf "${DNS}" > /etc/resolv.conf
+			chmod 644 /etc/resolv.conf
 		fi
-		printf "${DNS}" > /etc/resolv.conf
-		chmod 644 /etc/resolv.conf
 	fi
 fi