diff options
| author |   Cédric Krier <cedk@gentoo.org> | 2008-09-28 12:48:10 +0000 |
|---|---|---|
| committer | Cédric Krier <cedk@gentoo.org> | 2008-09-28 12:48:10 +0000 |
| commit | 9449572fa8e2ccdaafc6d1df039b1c0a7ee19b29 (patch) | |
| tree | 07eef7033971384fc1f0dcf9de1f921120654b05 /net-misc/openvpn | |
| parent | x86 stable, bug #238608 (diff) | |
| download | gentoo-2-9449572fa8e2ccdaafc6d1df039b1c0a7ee19b29.tar.gz gentoo-2-9449572fa8e2ccdaafc6d1df039b1c0a7ee19b29.tar.bz2 gentoo-2-9449572fa8e2ccdaafc6d1df039b1c0a7ee19b29.zip | |
Add tests patch for bug #236877
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-misc/openvpn')
| -rw-r--r-- | net-misc/openvpn/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/openvpn/files/openvpn-2.1_rc9-tests.patch | 23 | ||||
| -rw-r--r-- | net-misc/openvpn/openvpn-2.1_rc9.ebuild | 8 |
3 files changed, 35 insertions, 2 deletions
diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog index 9d8af164ff00..699484dd3983 100644 --- a/net-misc/openvpn/ChangeLog +++ b/net-misc/openvpn/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/openvpn # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.137 2008/08/02 18:14:52 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.138 2008/09/28 12:48:09 cedk Exp $ + + 28 Sep 2008; Cédric Krier <cedk@gentoo.org> + +files/openvpn-2.1_rc9-tests.patch, openvpn-2.1_rc9.ebuild: + Add tests patch for bug #236877 02 Aug 2008; Cédric Krier <cedk@gentoo.org> files/openvpn-2.1.init: Add --script-security 2 for bug #233657 diff --git a/net-misc/openvpn/files/openvpn-2.1_rc9-tests.patch b/net-misc/openvpn/files/openvpn-2.1_rc9-tests.patch new file mode 100644 index 000000000000..d0def40c0fb1 --- /dev/null +++ b/net-misc/openvpn/files/openvpn-2.1_rc9-tests.patch @@ -0,0 +1,23 @@ +--- t_cltsrv.sh.orig 2008-08-07 23:14:55.000000000 +0200 ++++ t_cltsrv.sh 2008-08-07 23:53:27.000000000 +0200 +@@ -38,11 +38,13 @@ + fi + ;; + esac ++downscript="${srcdir}/t_cltsrv-down.sh" ++test -x $downscript || chmod +x $downscript || { echo >&2 "$downscript is not executable, failing." ; exit 1 ; } + echo "the following test will take about two minutes..." >&2 + set +e + ( +-./openvpn --cd "${srcdir}" ${addopts} --down 'echo "srv:${signal}" >&3 ; : #' --tls-exit --ping-exit 180 --config sample-config-files/loopback-server & +-./openvpn --cd "${srcdir}" ${addopts} --down 'echo "clt:${signal}" >&3 ; : #' --tls-exit --ping-exit 180 --config sample-config-files/loopback-client ++./openvpn --script-security 2 --cd "${srcdir}" ${addopts} --setenv role srv --down "$downscript" --tls-exit --ping-exit 180 --config sample-config-files/loopback-server & ++./openvpn --script-security 2 --cd "${srcdir}" ${addopts} --setenv role clt --down "$downscript" --tls-exit --ping-exit 180 --config sample-config-files/loopback-client + ) 3>log.$$.signal >log.$$ 2>&1 + e1=$? + wait $! +--- t_cltsrv-down.sh.orig 2008-08-07 23:24:40.000000000 +0200 ++++ t_cltsrv-down.sh 2008-08-07 23:28:40.000000000 +0200 +@@ -0,0 +1,2 @@ ++#! /bin/sh ++echo "${role}:${signal}" >&3 diff --git a/net-misc/openvpn/openvpn-2.1_rc9.ebuild b/net-misc/openvpn/openvpn-2.1_rc9.ebuild index 06692ed8277a..9ed9d828b122 100644 --- a/net-misc/openvpn/openvpn-2.1_rc9.ebuild +++ b/net-misc/openvpn/openvpn-2.1_rc9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_rc9.ebuild,v 1.1 2008/08/01 09:03:43 cedk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_rc9.ebuild,v 1.2 2008/09/28 12:48:09 cedk Exp $ inherit eutils multilib @@ -32,6 +32,12 @@ pkg_setup() { fi } +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-tests.patch" +} + src_compile() { local myconf="" |