openvpn: update to 2.3.7.
This commit is contained in:
parent
957d5815b7
commit
74746595d2
3 changed files with 5 additions and 76 deletions
|
@ -1,10 +0,0 @@
|
||||||
[Unit]
|
|
||||||
Description=OpenVPN connection to %i
|
|
||||||
After=network.target
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=forking
|
|
||||||
ExecStart=/usr/sbin/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i --cd /etc/openvpn
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
|
@ -1,57 +0,0 @@
|
||||||
commit 98156e90e1e83133a6a6a020db8e7333ada6156b
|
|
||||||
Author: Steffan Karger <stef...@karger.me>
|
|
||||||
Date: Tue Dec 2 21:42:00 2014 +0100
|
|
||||||
|
|
||||||
Really fix '--cipher none' regression
|
|
||||||
|
|
||||||
... by not incorrectly hinting to the compiler the function argument of
|
|
||||||
cipher_kt_mode_{cbc,ofb_cfb}() is nonnull, since that no longer is the
|
|
||||||
case.
|
|
||||||
|
|
||||||
Verified the fix on Debian Wheezy, one of the platforms the reporter in
|
|
||||||
trac #473 mentions with a compiler that would optimize out the required
|
|
||||||
checks.
|
|
||||||
|
|
||||||
Also add a testcase for --cipher none to t_lpback, to prevent further
|
|
||||||
regressions.
|
|
||||||
|
|
||||||
Signed-off-by: Steffan Karger <stef...@karger.me>
|
|
||||||
Acked-by: Gert Doering <g...@greenie.muc.de>
|
|
||||||
Message-Id: <1417552920-31770-1-git-send-email-stef...@karger.me>
|
|
||||||
URL: http://article.gmane.org/gmane.network.openvpn.devel/9300
|
|
||||||
Signed-off-by: Gert Doering <g...@greenie.muc.de>
|
|
||||||
|
|
||||||
--- src/openvpn/crypto_backend.h
|
|
||||||
+++ src/openvpn/crypto_backend.h
|
|
||||||
@@ -237,8 +237,7 @@ int cipher_kt_mode (const cipher_kt_t *c
|
|
||||||
*
|
|
||||||
* @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_
|
|
||||||
*
|
|
||||||
* @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);
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
--- tests/t_lpback.sh
|
|
||||||
+++ tests/t_lpback.sh
|
|
||||||
@@ -35,6 +35,9 @@ CIPHERS=$(${top_builddir}/src/openvpn/op
|
|
||||||
# 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,24 +1,20 @@
|
||||||
# Template file for 'openvpn'
|
# Template file for 'openvpn'
|
||||||
pkgname=openvpn
|
pkgname=openvpn
|
||||||
version=2.3.6
|
version=2.3.7
|
||||||
revision=7
|
revision=1
|
||||||
build_options="systemd"
|
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--sbindir=/usr/bin --enable-password-save --enable-iproute2 $(vopt_enable systemd)"
|
configure_args="--enable-password-save --enable-iproute2 --disable-systemd"
|
||||||
hostmakedepends="iproute2"
|
hostmakedepends="iproute2"
|
||||||
makedepends="libressl-devel lzo-devel pam-devel $(vopt_if systemd systemd-devel)"
|
makedepends="libressl-devel lzo-devel pam-devel"
|
||||||
depends="iproute2"
|
depends="iproute2"
|
||||||
short_desc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
|
short_desc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
|
||||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
license="GPL-2"
|
license="GPL-2"
|
||||||
homepage="http://www.openvpn.net"
|
homepage="http://www.openvpn.net"
|
||||||
distfiles="http://swupdate.openvpn.org/community/releases/${pkgname}-${version}.tar.gz"
|
distfiles="http://swupdate.openvpn.org/community/releases/${pkgname}-${version}.tar.gz"
|
||||||
checksum=7baed2ff39c12e1a1a289ec0b46fcc49ff094ca58b8d8d5f29b36ac649ee5b26
|
checksum=1f02a4cd6aeb6250ca9311560875b10ce8957a3c9101a8005bd1e17e5b03146e
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
if [ "$build_option_systemd" ]; then
|
|
||||||
vinstall ${FILESDIR}/openvpn@.service 644 usr/lib/systemd/system
|
|
||||||
fi
|
|
||||||
vmkdir usr/share/examples/${pkgname}
|
vmkdir usr/share/examples/${pkgname}
|
||||||
cp -r sample/sample-config-files/* ${DESTDIR}/usr/share/examples/${pkgname}
|
cp -r sample/sample-config-files/* ${DESTDIR}/usr/share/examples/${pkgname}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue