Version bump openvpn to 2.3.6-r2 (fixes bug 537318)

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x30380381

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 9c51725f988d00c2cba963243570f93f132c6abb..9a87f103311dd7e807b61245335cded0d296ec65 100644 (file)
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.319 2015/02/08 16:22:58 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.320 2015/02/17 18:46:07 djc Exp $
+
+*openvpn-2.3.6-r2 (17 Feb 2015)
+
+  17 Feb 2015; Dirkjan Ochtman <djc@gentoo.org>
+  +files/2.3.6-disable-compression.patch, +openvpn-2.3.6-r2.ebuild:
+  Version bump openvpn to 2.3.6-r2 (fixes bug 537318)
 
 *openvpn-2.3.6-r1 (08 Feb 2015)
 

diff --git a/net-misc/openvpn/files/2.3.6-disable-compression.patch b/net-misc/openvpn/files/2.3.6-disable-compression.patch
new file mode 100644 (file)
index 0000000..d9d1c76
--- /dev/null
+++ b/net-misc/openvpn/files/2.3.6-disable-compression.patch
@@ -0,0 +1,18 @@
+https://community.openvpn.net/openvpn/changeset/5d5233778868ddd568140c394adfcfc8e3453245/
+
+--- 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);
+   }
+ 

diff --git a/net-misc/openvpn/openvpn-2.3.6-r2.ebuild b/net-misc/openvpn/openvpn-2.3.6-r2.ebuild
new file mode 100644 (file)
index 0000000..c27b7e2
--- /dev/null
+++ b/net-misc/openvpn/openvpn-2.3.6-r2.ebuild
@@ -0,0 +1,136 @@
+# 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-r2.ebuild,v 1.1 2015/02/17 18:46:07 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" || die
+       epatch "${FILESDIR}/2.3.6-disable-compression.patch" || die
+       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."
+}