8 files changed, 0 insertions, 376 deletions
diff --git a/net-misc/openvpn/files/65openvpn b/net-misc/openvpn/files/65openvpn
deleted file mode 100644
index 4ddb034..0000000
--- a/net-misc/openvpn/files/65openvpn
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PROTECT="/usr/share/openvpn/easy-rsa"
diff --git a/net-misc/openvpn/files/down.sh b/net-misc/openvpn/files/down.sh
deleted file mode 100755
index 1c70db0..0000000
--- a/net-misc/openvpn/files/down.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2006-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# If we have a service specific script, run this now
-if [ -x /etc/openvpn/"${SVCNAME}"-down.sh ] ; then
-	/etc/openvpn/"${SVCNAME}"-down.sh "$@"
-fi
-
-# Restore resolv.conf to how it was
-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
-
-if [ -n "${SVCNAME}" ]; then
-	# Re-enter the init script to start any dependant services
-	if /etc/init.d/"${SVCNAME}" --quiet status ; then
-		export IN_BACKGROUND=true
-		/etc/init.d/"${SVCNAME}" --quiet stop
-	fi
-fi
-
-exit 0
-
-# vim: ts=4 :
diff --git a/net-misc/openvpn/files/openvpn-2.1.conf b/net-misc/openvpn/files/openvpn-2.1.conf
deleted file mode 100644
index 72510c3..0000000
--- a/net-misc/openvpn/files/openvpn-2.1.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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
-# OpenVPN configuration looks like a client, but it's really a peer or
-# something else. DETECT_CLIENT controls this behaviour.
-DETECT_CLIENT="yes"
-
-# If DETECT_CLIENT is no and you have your own scripts to re-enter the openvpn
-# init script (ie, it first becomes "inactive" and the script then starts the
-# script again to make it "started") then you can state this below.
-# In other words, unless you understand service dependencies and are a
-# competent shell scripter, don't set this.
-RE_ENTER="no"
diff --git a/net-misc/openvpn/files/openvpn-2.1.init b/net-misc/openvpn/files/openvpn-2.1.init
deleted file mode 100755
index d65e6f8..0000000
--- a/net-misc/openvpn/files/openvpn-2.1.init
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VPNDIR=${VPNDIR:-/etc/openvpn}
-VPN=${SVCNAME#*.}
-if [ -n "${VPN}" ] && [ ${SVCNAME} != "openvpn" ]; then
-	VPNPID="/var/run/openvpn.${VPN}.pid"
-else
-	VPNPID="/var/run/openvpn.pid"
-fi
-VPNCONF="${VPNDIR}/${VPN}.conf"
-
-depend() {
-	need localmount net
-	use dns
-	after bootmisc
-}
-
-checkconfig() {
-	# Linux has good dynamic tun/tap creation
-	if [ $(uname -s) = "Linux" ] ; 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
-			ebegin "Detected broken /dev/net/tun symlink, fixing..."
-			rm -f /dev/net/tun
-			ln -s /dev/misc/net/tun /dev/net/tun
-			eend $?
-		fi
-		return 0
-	fi
-
-	# Other OS's don't, so we rely on a pre-configured interface
-	# per vpn instance
-	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
-
-	if ! ifconfig "${ifname}" >/dev/null 2>/dev/null ; then
-		# Try and create it
-		echo > /dev/"${ifname}" >/dev/null
-	fi
-	if ! ifconfig "${ifname}" >/dev/null 2>/dev/null ; then
-		eerror "${VPNCONF} requires interface ${ifname}" \
-			"but that does not exist"
-		return 1
-	fi
-}
-
-start() {
-	# If we are re-called by the openvpn gentoo-up.sh script
-	# then we don't actually want to start openvpn
-	[ "${IN_BACKGROUND}" = "true" ] && return 0
-	
-	ebegin "Starting ${SVCNAME}"
-
-	checkconfig || return 1
-
-	local args="" reenter=${RE_ENTER:-no}
-	# If the config file does not specify the cd option, we do
-	# But if we specify it, we override the config option which we do not want
-	if ! grep -q "^[ 	]*cd[ 	].*" "${VPNCONF}" ; then
-		args="${args} --cd ${VPNDIR}"
-	fi
-	
-	# We mark the service as inactive and then start it.
-	# When we get an authenticated packet from the peer then we run our script
-	# which configures our DNS if any and marks us as up.
-	if [ "${DETECT_CLIENT:-yes}" = "yes" ] && \
-	grep -q "^[ 	]*remote[ 	].*" "${VPNCONF}" ; then
-		reenter="yes"
-		args="${args} --up-delay --up-restart"
-		args="${args} --script-security 2"
-		args="${args} --up /etc/openvpn/up.sh"
-		args="${args} --down-pre --down /etc/openvpn/down.sh"
-
-		# Warn about setting scripts as we override them
-		if grep -Eq "^[ 	]*(up|down)[ 	].*" "${VPNCONF}" ; then
-			ewarn "WARNING: You have defined your own up/down scripts"
-			ewarn "As you're running as a client, we now force Gentoo specific"
-			ewarn "scripts to be run for up and down events."
-			ewarn "These scripts will call /etc/openvpn/${SVCNAME}-{up,down}.sh"
-			ewarn "where you can put your own code."
-		fi
-
-		# Warn about the inability to change ip/route/dns information when
-		# dropping privs
-		if grep -q "^[ 	]*user[ 	].*" "${VPNCONF}" ; then
-			ewarn "WARNING: You are dropping root privileges!"
-			ewarn "As such openvpn may not be able to change ip, routing"
-			ewarn "or DNS configuration."
-		fi
-	else
-		# So we're a server. Run as openvpn unless otherwise specified
-		grep -q "^[ 	]*user[ 	].*" "${VPNCONF}" || args="${args} --user openvpn"
-		grep -q "^[ 	]*group[ 	].*" "${VPNCONF}" || args="${args} --group openvpn"
-	fi
-
-	# Ensure that our scripts get the PEER_DNS variable
-	[ -n "${PEER_DNS}" ] && args="${args} --setenv PEER_DNS ${PEER_DNS}"
-
-	[ "${reenter}" = "yes" ] && mark_service_inactive "${SVCNAME}"
-	start-stop-daemon --start --exec /usr/sbin/openvpn --pidfile "${VPNPID}" \
-		-- --config "${VPNCONF}" --writepid "${VPNPID}" --daemon \
-		--setenv SVCNAME "${SVCNAME}" ${args}
-	eend $? "Check your logs to see why startup failed"
-}
-
-stop() {
-	# If we are re-called by the openvpn gentoo-down.sh script
-	# then we don't actually want to stop openvpn
-	if [ "${IN_BACKGROUND}" = "true" ] ; then
-		mark_service_inactive "${SVCNAME}"
-		return 0
-	fi
-
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet \
-		--exec /usr/sbin/openvpn --pidfile "${VPNPID}"
-	eend $?
-}
-
-# vim: set ts=4 :
diff --git a/net-misc/openvpn/files/openvpn-2.1_rc13-peercred.patch b/net-misc/openvpn/files/openvpn-2.1_rc13-peercred.patch
deleted file mode 100644
index 6592cf1..0000000
--- a/net-misc/openvpn/files/openvpn-2.1_rc13-peercred.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- socket.c~	2008-11-02 01:39:00.406009999 +0100
-+++ socket.c	2008-11-02 01:39:00.406009999 +0100
-@@ -22,6 +22,7 @@
-  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
-+#define _GNU_SOURCE
- #include "syshead.h"
- 
- #include "socket.h"
diff --git a/net-misc/openvpn/files/openvpn-2.2.2-pkcs11.patch b/net-misc/openvpn/files/openvpn-2.2.2-pkcs11.patch
deleted file mode 100644
index c7115cc..0000000
--- a/net-misc/openvpn/files/openvpn-2.2.2-pkcs11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/easy-rsa/2.0/openssl-0.9.8.cnf b/easy-rsa/2.0/openssl-0.9.8.cnf
-index 340b8af..89602a2 100755
---- a/easy-rsa/2.0/openssl-0.9.8.cnf
-+++ b/easy-rsa/2.0/openssl-0.9.8.cnf
-@@ -283,8 +283,8 @@ authorityKeyIdentifier=keyid:always,issuer:always
- #pkcs11 = pkcs11_section
- 
- [ pkcs11_section ]
--engine_id = pkcs11
--dynamic_path = /usr/lib/engines/engine_pkcs11.so
--MODULE_PATH = $ENV::PKCS11_MODULE_PATH
--PIN = $ENV::PKCS11_PIN
--init = 0
-+#engine_id = pkcs11
-+#dynamic_path = /usr/lib/engines/engine_pkcs11.so
-+#MODULE_PATH = $ENV::PKCS11_MODULE_PATH
-+#PIN = $ENV::PKCS11_PIN
-+#init = 0
-diff --git a/easy-rsa/2.0/openssl-1.0.0.cnf b/easy-rsa/2.0/openssl-1.0.0.cnf
-index fa258a5..527919d 100755
---- a/easy-rsa/2.0/openssl-1.0.0.cnf
-+++ b/easy-rsa/2.0/openssl-1.0.0.cnf
-@@ -278,8 +278,8 @@ authorityKeyIdentifier=keyid:always,issuer:always
- #pkcs11 = pkcs11_section
- 
- [ pkcs11_section ]
--engine_id = pkcs11
--dynamic_path = /usr/lib/engines/engine_pkcs11.so
--MODULE_PATH = $ENV::PKCS11_MODULE_PATH
--PIN = $ENV::PKCS11_PIN
--init = 0
-+#engine_id = pkcs11
-+#dynamic_path = /usr/lib/engines/engine_pkcs11.so
-+#MODULE_PATH = $ENV::PKCS11_MODULE_PATH
-+#PIN = $ENV::PKCS11_PIN
-+#init = 0
diff --git a/net-misc/openvpn/files/openvpn.init b/net-misc/openvpn/files/openvpn.init
deleted file mode 100644
index 489ab49..0000000
--- a/net-misc/openvpn/files/openvpn.init
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VPNDIR="/etc/openvpn"
-VPN="${SVCNAME#*.}"
-if [ -n "${VPN}" ] && [ "${SVCNAME}" != "openvpn" ]; then
-	VPNPID="/var/run/openvpn.${VPN}.pid"
-else
-	VPNPID="/var/run/openvpn.pid"
-fi
-VPNCONF="${VPNDIR}/${VPN}.conf"
-
-depend() {
-	need localmount net
-	before netmount
-	after bootmisc
-}
-
-checktundevice() {
-	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
-		ebegin "Detected broken /dev/net/tun symlink, fixing..."
-		rm -f /dev/net/tun
-		ln -s /dev/misc/net/tun /dev/net/tun
-		eend $?
-	fi
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-
-	checktundevice || return 1
-
-	if [ ! -e "${VPNCONF}" ]; then
-		eend 1 "${VPNCONF} does not exist"
-		return 1
-	fi
-
-	local args=""
-	# If the config file does not specify the cd option, we do
-	# But if we specify it, we override the config option which we do not want
-	if ! grep -q "^[ 	]*cd[ 	].*" "${VPNCONF}" ; then
-		args="${args} --cd ${VPNDIR}"
-	fi
-
-	start-stop-daemon --start --exec /usr/sbin/openvpn --pidfile "${VPNPID}" \
-		-- --config "${VPNCONF}" --writepid "${VPNPID}" --daemon ${args}
-	eend $? "Check your logs to see why startup failed"
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/sbin/openvpn --pidfile "${VPNPID}"
-	eend $?
-}
-
-# vim: ts=4
diff --git a/net-misc/openvpn/files/up.sh b/net-misc/openvpn/files/up.sh
deleted file mode 100755
index 4a88687..0000000
--- a/net-misc/openvpn/files/up.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2006-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# Setup our resolv.conf
-# Vitally important that we use the domain entry in resolv.conf so we
-# can setup the nameservers are for the domain ONLY in resolvconf if
-# we're using a decent dns cache/forwarder like dnsmasq and NOT nscd/libc.
-# nscd/libc users will get the VPN nameservers before their other ones
-# and will use the first one that responds - maybe the LAN ones?
-# non resolvconf users just the the VPN resolv.conf
-
-# FIXME:- if we have >1 domain, then we have to use search :/
-# We need to add a flag to resolvconf to say
-# "these nameservers should only be used for the listed search domains
-#  if other global nameservers are present on other interfaces"
-# This however, will break compatibility with Debians resolvconf
-# A possible workaround would be to just list multiple domain lines
-# and try and let resolvconf handle it
-
-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}${SEARCH:+ }${opt#dhcp-option DOMAIN *}"
-			fi
-		elif [ "${opt}" != "${opt#dhcp-option DNS *}" ] ; then
-			NS="${NS}nameserver ${opt#dhcp-option DNS *}\n"
-		fi
-		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"
-		elif [ -n "${DOMAIN}" ]; then
-			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
-	fi
-fi
-
-# Below section is Gentoo specific
-# Quick summary - our init scripts are re-entrant and set the SVCNAME env var
-# as we could have >1 openvpn service
-
-if [ -n "${SVCNAME}" ]; then
-	# If we have a service specific script, run this now
-	if [ -x /etc/openvpn/"${SVCNAME}"-up.sh ] ; then
-		/etc/openvpn/"${SVCNAME}"-up.sh "$@"
-	fi
-
-	# Re-enter the init script to start any dependant services
-	if ! /etc/init.d/"${SVCNAME}" --quiet status ; then
-		export IN_BACKGROUND=true
-		/etc/init.d/${SVCNAME} --quiet start
-	fi
-fi
-
-exit 0
-
-# vim: ts=4 :