mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-05-09 04:51:27 +02:00
openvpn: remove as fixes were pushed back to Gentoo
This commit is contained in:
Anton Bolshakov
parent
3f439068c0
commit
7ae7a82319
14 changed files with 0 additions and 1839 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -1,14 +0,0 @@
|
|||
AUX 2.3.6-null-cipher.patch 1531 SHA256 a3f8ac3630c9887d18d21e0ac9781d615cf8dff277c070306b36c5d0faa8a1ac SHA512 0aa288af3c0b43977bf84b099ea28dbf7ab9a1096d76e8f706989570984c70a4c298430eac35b0c80eab8bc05e6072d965c20a9e3689e7448e759abb92c93fb2 WHIRLPOOL cbefb2a1b6d63373890a76d3a6153335f8d05b07e4546893e7a8871c653d39f06941615181308fbf41a07cf702b2a730dfacc6a01840efdbfbeaf301a58362bb
|
||||
AUX 65openvpn 45 SHA256 d5758e39fdc75dcbb5a788b1afa743c3c1f08c63c535aa32c300b965474d765c SHA512 713345092b60d1322d3fa96fd72d69ed82dbfee5031a675114bc60acfdacaf0811f6bf4530cf937ca5a86b3f2665b28951b9087ec91c2c0faf75bdaf1e25bdbb WHIRLPOOL 534e7dcf2ac953e9ec5de05810022471cb26a16806cd036f25d02550e20f8aaa91410bd005bc7a5e4a549d8a40d01ae317be1d1e1e25d91ed989bbbea7ede9d2
|
||||
AUX down.sh 943 SHA256 39debebcd8c899f20e6d355cbc8eaab46e28b83a9f6c33a94c065688a4f3d2c7 SHA512 5defd61edf11cc63f3f8f60bef7fa730c4bcdd2545d664bd94666dd3aea80bd9d190263d8835a555e4287a594f6fce0f52426aed49c60233ff637a2a6164a997 WHIRLPOOL c66fd1e016656fe83d7f55b77bf232058397f9cd3054abe13ec006c227afe6746ee4ada310ff43761ec95510f736b8e542f136711d648642eecafe055975c57e
|
||||
AUX openvpn-2.1.conf 892 SHA256 330149a83684ddabe413d134d4c8efad4c88b18c2ab67165014deff5f7fffad2 SHA512 982ade883afbe2e656a9cbbe36c31c0e8b4f7bbbe5b63df9f7b834f02a9153032fb7445c85d3e91f62c68a7ddd13c3afbf420fb71cdd13d9c4b69f867bdd9f37 WHIRLPOOL 6ef644826e1e9e2a100e0fa20b5c9190e92c9e08a366dee28dccf3f70fa0593f3c4d271e42db3920630f03704aa2aef8e84d9efbb2b4b6a0d08e74bb340fb0a5
|
||||
AUX openvpn-2.1.init 4186 SHA256 d1b1f8a00935d77521bceb62535350444df3470fa45f4d33c3934051a1bb595b SHA512 7ecd0b4dc7341ea0df598752bec8ae6011bea7973ed9dbf17a12c308aed46362e1507fcb3a3bb26049619747f2f819deec1a42c6dce2c13d2a769f1e37735a2f WHIRLPOOL 9d34c438b7d9e45678e2aa48ab42a68b9e2801423688c6280cbb4934a8ef04cbf8a7953a061659f57fb02adf535596ac9313268c29e2dc18cffbf7315681da82
|
||||
AUX openvpn-ssl_compression.patch 488 SHA256 aad83fc996d384874b34d5b7ac9cc94a5553be0c997115a306d2f25d68862dce SHA512 019e99c363f127d2d2aa260e4e896fd37ef7624638247c9bfe32fd0101f9052ea3a0754e8f4f6605f22b9e1d7f9c9fbd9413ea3499e546bc8ce0f72857e47e93 WHIRLPOOL 8fe5abc3552c6aefd60ab8c2107f301511f588bfd7e7515dfea8693b2a7ba132ef8d20a7044acd5769bde9338d58a59382dfcdd9d7775404ab7c6844e3feb014
|
||||
AUX openvpn.init 1486 SHA256 c4b9e0899fa5ee0b90c5100da7711dc7a6a5658f10042b0feda9e7efb90a11cf SHA512 450595b9ec82ded74c26ed9f73182122e05f53655262a342b195dcedfe63a06a5d9927a3bbe50d0d04f810cc786ac3eb78843877f426c893e165b967bc8ac012 WHIRLPOOL e549221283b4b92c9ada312a746c4ad4c645493c1c844ddaddefecee4c31e17bd4bd8555618408e065c83143e157aaf7e75b44f01abe43f507835df2aa1149d3
|
||||
AUX openvpn.service 335 SHA256 a63a6e1505f2b3e20f2c82588dd0c23da9d8c750e1f36fec2ba20a8b5b0c9de1 SHA512 fbd41b80253aaae6750301ac95d8b3bf09e3a70556cc0513792c8e06faa70a716233d134d4928295f381f0f235fcde0eeac9cfa074924b6666a4b46ff7cf91a9 WHIRLPOOL 16f44d10ab03110a21a69716fbac2e64e5376426edd26783d7946d928dd0cc106810126436488843da8e16277d3aa83d208fe50c4aebd9cff86526ce1762b215
|
||||
AUX openvpn.tmpfile 39 SHA256 ef3453056a26487d27908d5ced124285403d8e88deb843fccdba9f6724966826 SHA512 659713b35eee340f2b6578796f4335dda391aa635892e802e3f2531f31c9470460b4e4b3be45457f81f3b08b7d60ce15d16f8d70b968fbf24f846ef5f8611a58 WHIRLPOOL 19e4611ffda68a99851921ccaf3a99d04350cd3e0d8833136da151119c267edc383ff96162aa47a2f77171ae908ad011e4119a7a18961ed0bddcbf38d997b976
|
||||
AUX up.sh 2865 SHA256 d887ee065261affd849227fa27e092cf66549d824a698f302312d15f787dd840 SHA512 35201b0e60ad20358080007e595eb4f96d186ba8e88f0485c55d164c28e3d78a12f3e09347ba3d76abb9b8b03fb4a53664bd74ab484be1548090022b956925fd WHIRLPOOL 8d25a66d192a6710466d149aec7a1719dfe91558205e8ba7e25b93e58869c8fedc96ba4ce2aedb0595b7e0b63299e6e41be1ba82c6b93ae6bbbb26d409c9bf51
|
||||
DIST openvpn-2.3.6.tar.gz 1213272 SHA256 7baed2ff39c12e1a1a289ec0b46fcc49ff094ca58b8d8d5f29b36ac649ee5b26 SHA512 70e0045ea41f6588769ab8b98d8f550b69148adbf7fedcdc36900e25950df43379950492652e243ec6e7965bf9c7dcc86a56ba5dfdc44523aaa81cfc508b1c6e WHIRLPOOL 737f2d1d69ee1c7700d5cd5a4e7d5d1b2f55d8b2229f7c2565fcb8c731ebb719ec8d6bad3b76f763f36e5c70c6e40a666db3508f3024f8e4637c0659061dba48
|
||||
EBUILD openvpn-2.3.6-r2.ebuild 4474 SHA256 b6f96c7e4dec297814f117074201a81621ae27427a97ebc57a98d0f3a6fa578c SHA512 a80cb83b6a4523ac2535524f77b0e9c0172e8aa4e2eac359874a7d9f808de3c7f8f82c9fe63e173669a84b4c0bd8047a5d1d3b5e7783941d9d357bcf77fa1d4a WHIRLPOOL 2174b59d0265b57d464a276e34ed22bbb6337fd228064d343a7b394ebb269f6e89975ab7fe0f23414459cd32f4059aedc1f0562496001a415f838065b707b21b
|
||||
MISC ChangeLog 44229 SHA256 b267623cb0bc4e9956d27a4f060b75f0ee483737ff46b8fa9597c9e7b64bbf82 SHA512 802144bca46822c960d787e7af9966ca7e326965073e1f7bbea89ffd2f8dfe3ae92d0cfaf165060602f6a125c84a34a368035f91ca9d5d4fe8c60b92c8c5f617 WHIRLPOOL 2e4f4c9673636852c3dd44e58ad818e5be65b761dbc9c40d6777a43600bf0c3576ed48b3c91bcda21ccadd4522cac832f5e340c423abbe4a66dd32f088ebe611
|
||||
MISC metadata.xml 937 SHA256 3dfcc28012f2c92f044882c39d56b6ef82bb80749ce688b75d526cc6c8836dd3 SHA512 ad3f218ccc64249fda19d87fe79494280eb880841f2d1e69757e7093e62b446f273fecd074ccac02c28894924b02d6a9c9fbbc1bd12ab13493f7f77e50e5b1ce WHIRLPOOL 65bf683e35f44c306c9ed3297cd954eb490f658f97a2d03af2cba0484030b1eccdf401fdc867a5c35a602bd67bf7052d555c2a48b7bebb4469158e26a530a742
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
The "really fix cipher none" patch has been merged to release/2.3 and master:
|
||||
|
||||
commit 785838614afc20d362b64907b0212e9a779e2287 (release/2.3)
|
||||
commit 98156e90e1e83133a6a6a020db8e7333ada6156b (master)
|
||||
|
||||
diff --git a/src/openvpn/crypto_backend.h b/src/openvpn/crypto_backend.h
|
||||
index 8749878..4e45df0 100644
|
||||
--- a/src/openvpn/crypto_backend.h
|
||||
+++ b/src/openvpn/crypto_backend.h
|
||||
@@ -237,8 +237,7 @@ int cipher_kt_mode (const cipher_kt_t *cipher_kt);
|
||||
*
|
||||
* @return true iff the cipher is a CBC mode cipher.
|
||||
*/
|
||||
-bool cipher_kt_mode_cbc(const cipher_kt_t *cipher)
|
||||
- __attribute__((nonnull));
|
||||
+bool cipher_kt_mode_cbc(const cipher_kt_t *cipher);
|
||||
|
||||
/**
|
||||
* Check if the supplied cipher is a supported OFB or CFB mode cipher.
|
||||
@@ -247,8 +246,7 @@ bool cipher_kt_mode_cbc(const cipher_kt_t *cipher)
|
||||
*
|
||||
* @return true iff the cipher is a OFB or CFB mode cipher.
|
||||
*/
|
||||
-bool cipher_kt_mode_ofb_cfb(const cipher_kt_t *cipher)
|
||||
- __attribute__((nonnull));
|
||||
+bool cipher_kt_mode_ofb_cfb(const cipher_kt_t *cipher);
|
||||
|
||||
|
||||
/**
|
||||
diff --git a/tests/t_lpback.sh b/tests/t_lpback.sh
|
||||
index 8f88ad9..d7792cd 100755
|
||||
--- a/tests/t_lpback.sh
|
||||
+++ b/tests/t_lpback.sh
|
||||
@@ -35,6 +35,9 @@ CIPHERS=$(${top_builddir}/src/openvpn/openvpn --show-ciphers | \
|
||||
# GD, 2014-07-06 do not test RC5-* either (fails on NetBSD w/o libcrypto_rc5)
|
||||
CIPHERS=$(echo "$CIPHERS" | egrep -v '^(DES-EDE3-CFB1|DES-CFB1|RC5-)' )
|
||||
|
||||
+# Also test cipher 'none'
|
||||
+CIPHERS=${CIPHERS}$(printf "\nnone")
|
||||
+
|
||||
"${top_builddir}/src/openvpn/openvpn" --genkey --secret key.$$
|
||||
set +e
|
||||
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
CONFIG_PROTECT="/usr/share/openvpn/easy-rsa"
|
||||
|
|
@ -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 :
|
||||
|
|
@ -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"
|
||||
|
|
@ -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 :
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
--- openvpn-2.3.6/src/openvpn/ssl_openssl.c.orig 2014-11-29 23:00:35.000000000 +0800
|
||||
+++ openvpn-2.3.6/src/openvpn/ssl_openssl.c 2015-01-12 21:14:30.186993686 +0800
|
||||
@@ -238,6 +238,13 @@
|
||||
if (tls_ver_min > TLS_VER_1_2 || tls_ver_max < TLS_VER_1_2)
|
||||
sslopt |= SSL_OP_NO_TLSv1_2;
|
||||
#endif
|
||||
+
|
||||
+#ifdef SSL_OP_NO_COMPRESSION
|
||||
+ msg (M_WARN, "[Workaround] disable SSL compression");
|
||||
+ sslopt |= SSL_OP_NO_COMPRESSION;
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
SSL_CTX_set_options (ctx->ctx, sslopt);
|
||||
}
|
||||
|
||||
|
|
@ -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
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
[Unit]
|
||||
Description=OpenVPN Robust And Highly Flexible Tunneling Application On %I
|
||||
After=syslog.target network.target
|
||||
|
||||
[Service]
|
||||
PrivateTmp=true
|
||||
Type=forking
|
||||
PIDFile=/var/run/openvpn/%i.pid
|
||||
ExecStart=/usr/sbin/openvpn --daemon --writepid /var/run/openvpn/%i.pid --cd /etc/openvpn/ --config %i.conf
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1 +0,0 @@
|
|||
D /var/run/openvpn 0710 root openvpn -
|
||||
|
|
@ -1,100 +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
|
||||
|
||||
min_route() {
|
||||
local n=1
|
||||
local m
|
||||
local r
|
||||
|
||||
eval m="\$route_metric_$n"
|
||||
while [ -n "${m}" ]; do
|
||||
if [ -z "$r" ] || [ "$r" -gt "$m" ]; then
|
||||
r="$m"
|
||||
fi
|
||||
n="$(($n+1))"
|
||||
eval m="\$route_metric_$n"
|
||||
done
|
||||
|
||||
echo "$r"
|
||||
}
|
||||
|
||||
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
|
||||
metric="$(min_route)"
|
||||
printf "${DNS}" | /sbin/resolvconf -a "${dev}" ${metric:+-m ${metric}}
|
||||
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 :
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>djc@gentoo.org</email>
|
||||
<name>Dirkjan Ochtman</name>
|
||||
</maintainer>
|
||||
<longdescription>OpenVPN is an easy-to-use, robust and highly
|
||||
configurable VPN daemon which can be used to securely link two or more
|
||||
networks using an encrypted tunnel.</longdescription>
|
||||
<use>
|
||||
<flag name="down-root">Enable the down-root plugin</flag>
|
||||
<flag name="iproute2">Enabled iproute2 support instead of net-tools</flag>
|
||||
<flag name="passwordsave">Enables openvpn to save passwords</flag>
|
||||
<flag name="polarssl">Use PolarSSL instead of OpenSSL</flag>
|
||||
<flag name="pkcs11">Enable PKCS#11 smartcard support</flag>
|
||||
<flag name="plugins">Enable the OpenVPN plugin system</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:openvpn:openvpn</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
|
@ -1,136 +0,0 @@
|
|||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.6-r1.ebuild,v 1.1 2015/02/08 16:22:58 djc Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit multilib autotools flag-o-matic user systemd
|
||||
|
||||
DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
|
||||
SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
|
||||
HOMEPAGE="http://openvpn.net/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
|
||||
IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins +polarssl selinux +ssl systemd +lzo static userland_BSD"
|
||||
|
||||
REQUIRED_USE="static? ( !plugins !pkcs11 )
|
||||
polarssl? ( ssl )
|
||||
pkcs11? ( ssl )
|
||||
!plugins? ( !pam !down-root )"
|
||||
|
||||
DEPEND="
|
||||
kernel_linux? (
|
||||
iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
|
||||
)
|
||||
pam? ( virtual/pam )
|
||||
ssl? (
|
||||
!polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.2.10 )
|
||||
)
|
||||
lzo? ( >=dev-libs/lzo-1.07 )
|
||||
pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )"
|
||||
RDEPEND="${DEPEND}
|
||||
selinux? ( sec-policy/selinux-openvpn )
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
# Set correct pass to systemd-ask-password binary
|
||||
sed -i "s:\(/bin/systemd-ask-password\):/usr\1:" ./src/openvpn/console.c || die
|
||||
epatch "${FILESDIR}/2.3.6-null-cipher.patch"
|
||||
epatch "${FILESDIR}"/openvpn-ssl_compression.patch
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
|
||||
local myconf
|
||||
echo "DROPPY"
|
||||
use polarssl && echo "FLOZZY"
|
||||
use polarssl && myconf="--with-crypto-library=polarssl"
|
||||
econf \
|
||||
${myconf} \
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
|
||||
--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
|
||||
$(use_enable passwordsave password-save) \
|
||||
$(use_enable ssl) \
|
||||
$(use_enable ssl crypto) \
|
||||
$(use_enable lzo) \
|
||||
$(use_enable pkcs11) \
|
||||
$(use_enable plugins) \
|
||||
$(use_enable iproute2) \
|
||||
$(use_enable pam plugin-auth-pam) \
|
||||
$(use_enable down-root plugin-down-root) \
|
||||
$(use_enable systemd)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
find "${ED}/usr" -name '*.la' -delete
|
||||
# install documentation
|
||||
dodoc AUTHORS ChangeLog PORTS README README.IPv6
|
||||
|
||||
# Install some helper scripts
|
||||
keepdir /etc/openvpn
|
||||
exeinto /etc/openvpn
|
||||
doexe "${FILESDIR}/up.sh"
|
||||
doexe "${FILESDIR}/down.sh"
|
||||
|
||||
# Install the init script and config file
|
||||
newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
|
||||
newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
|
||||
|
||||
# install examples, controlled by the respective useflag
|
||||
if use examples ; then
|
||||
# dodoc does not supportly support directory traversal, #15193
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins -r sample contrib
|
||||
fi
|
||||
|
||||
systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
|
||||
systemd_newunit "${FILESDIR}"/${PN}.service 'openvpn@.service'
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Add openvpn user so openvpn servers can drop privs
|
||||
# Clients should run as root so they can change ip addresses,
|
||||
# dns information and other such things.
|
||||
enewgroup openvpn
|
||||
enewuser openvpn "" "" "" openvpn
|
||||
|
||||
if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
|
||||
ewarn "WARNING: The openvpn init script has changed"
|
||||
ewarn ""
|
||||
fi
|
||||
|
||||
elog "The openvpn init script expects to find the configuration file"
|
||||
elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
|
||||
elog ""
|
||||
elog "To create more VPNs, simply create a new .conf file for it and"
|
||||
elog "then create a symlink to the openvpn init script from a link called"
|
||||
elog "openvpn.newconfname - like so"
|
||||
elog " cd /etc/openvpn"
|
||||
elog " ${EDITOR##*/} foo.conf"
|
||||
elog " cd /etc/init.d"
|
||||
elog " ln -s openvpn openvpn.foo"
|
||||
elog ""
|
||||
elog "You can then treat openvpn.foo as any other service, so you can"
|
||||
elog "stop one vpn and start another if you need to."
|
||||
|
||||
if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
|
||||
ewarn ""
|
||||
ewarn "WARNING: If you use the remote keyword then you are deemed to be"
|
||||
ewarn "a client by our init script and as such we force up,down scripts."
|
||||
ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
|
||||
ewarn "can move your scripts to."
|
||||
fi
|
||||
|
||||
if use plugins ; then
|
||||
einfo ""
|
||||
einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
|
||||
fi
|
||||
|
||||
einfo ""
|
||||
einfo "OpenVPN 2.3.x no longer includes the easy-rsa suite of utilities."
|
||||
einfo "They can now be emerged via app-crypt/easy-rsa."
|
||||
}
|
||||
Loading…
Reference in a new issue