1 |
djc 15/02/08 16:22:58 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: openvpn-2.3.6-r1.ebuild |
5 |
Log: |
6 |
Fix support for null ciphers (bug 531700; thanks to gentoo@×××××××.org) |
7 |
|
8 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 30380381) |
9 |
|
10 |
Revision Changes Path |
11 |
1.319 net-misc/openvpn/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?rev=1.319&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?rev=1.319&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?r1=1.318&r2=1.319 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v |
20 |
retrieving revision 1.318 |
21 |
retrieving revision 1.319 |
22 |
diff -u -r1.318 -r1.319 |
23 |
--- ChangeLog 18 Jan 2015 12:39:12 -0000 1.318 |
24 |
+++ ChangeLog 8 Feb 2015 16:22:58 -0000 1.319 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for net-misc/openvpn |
27 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.318 2015/01/18 12:39:12 djc Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.319 2015/02/08 16:22:58 djc Exp $ |
30 |
+ |
31 |
+*openvpn-2.3.6-r1 (08 Feb 2015) |
32 |
+ |
33 |
+ 08 Feb 2015; Dirkjan Ochtman <djc@g.o> +files/2.3.6-null-cipher.patch, |
34 |
+ +openvpn-2.3.6-r1.ebuild: |
35 |
+ Fix support for null ciphers (bug 531700; thanks to gentoo@×××××××.org) |
36 |
|
37 |
18 Jan 2015; Dirkjan Ochtman <djc@g.o> openvpn-2.3.6.ebuild: |
38 |
Fix minimum version of libpkcs11-helper dependency (fixes bug 536332) |
39 |
|
40 |
|
41 |
|
42 |
1.1 net-misc/openvpn/openvpn-2.3.6-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-2.3.6-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-2.3.6-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: openvpn-2.3.6-r1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2015 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $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 $ |
52 |
|
53 |
EAPI=4 |
54 |
|
55 |
inherit multilib autotools flag-o-matic user systemd |
56 |
|
57 |
DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes" |
58 |
SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz" |
59 |
HOMEPAGE="http://openvpn.net/" |
60 |
|
61 |
LICENSE="GPL-2" |
62 |
SLOT="0" |
63 |
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" |
64 |
IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins +polarssl selinux +ssl systemd +lzo static userland_BSD" |
65 |
|
66 |
REQUIRED_USE="static? ( !plugins !pkcs11 ) |
67 |
polarssl? ( ssl ) |
68 |
pkcs11? ( ssl ) |
69 |
!plugins? ( !pam !down-root )" |
70 |
|
71 |
DEPEND=" |
72 |
kernel_linux? ( |
73 |
iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) |
74 |
) |
75 |
pam? ( virtual/pam ) |
76 |
ssl? ( |
77 |
!polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.2.10 ) |
78 |
) |
79 |
lzo? ( >=dev-libs/lzo-1.07 ) |
80 |
pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )" |
81 |
RDEPEND="${DEPEND} |
82 |
selinux? ( sec-policy/selinux-openvpn ) |
83 |
" |
84 |
|
85 |
src_prepare() { |
86 |
# Set correct pass to systemd-ask-password binary |
87 |
sed -i "s:\(/bin/systemd-ask-password\):/usr\1:" ./src/openvpn/console.c || die |
88 |
epatch "${FILESDIR}/2.3.6-null-cipher.patch" || die |
89 |
eautoreconf |
90 |
} |
91 |
|
92 |
src_configure() { |
93 |
use static && LDFLAGS="${LDFLAGS} -Xcompiler -static" |
94 |
local myconf |
95 |
echo "DROPPY" |
96 |
use polarssl && echo "FLOZZY" |
97 |
use polarssl && myconf="--with-crypto-library=polarssl" |
98 |
econf \ |
99 |
${myconf} \ |
100 |
--docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
101 |
--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \ |
102 |
$(use_enable passwordsave password-save) \ |
103 |
$(use_enable ssl) \ |
104 |
$(use_enable ssl crypto) \ |
105 |
$(use_enable lzo) \ |
106 |
$(use_enable pkcs11) \ |
107 |
$(use_enable plugins) \ |
108 |
$(use_enable iproute2) \ |
109 |
$(use_enable pam plugin-auth-pam) \ |
110 |
$(use_enable down-root plugin-down-root) \ |
111 |
$(use_enable systemd) |
112 |
} |
113 |
|
114 |
src_install() { |
115 |
default |
116 |
find "${ED}/usr" -name '*.la' -delete |
117 |
# install documentation |
118 |
dodoc AUTHORS ChangeLog PORTS README README.IPv6 |
119 |
|
120 |
# Install some helper scripts |
121 |
keepdir /etc/openvpn |
122 |
exeinto /etc/openvpn |
123 |
doexe "${FILESDIR}/up.sh" |
124 |
doexe "${FILESDIR}/down.sh" |
125 |
|
126 |
# Install the init script and config file |
127 |
newinitd "${FILESDIR}/${PN}-2.1.init" openvpn |
128 |
newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn |
129 |
|
130 |
# install examples, controlled by the respective useflag |
131 |
if use examples ; then |
132 |
# dodoc does not supportly support directory traversal, #15193 |
133 |
insinto /usr/share/doc/${PF}/examples |
134 |
doins -r sample contrib |
135 |
fi |
136 |
|
137 |
systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf |
138 |
systemd_newunit "${FILESDIR}"/${PN}.service 'openvpn@.service' |
139 |
} |
140 |
|
141 |
pkg_postinst() { |
142 |
# Add openvpn user so openvpn servers can drop privs |
143 |
# Clients should run as root so they can change ip addresses, |
144 |
# dns information and other such things. |
145 |
enewgroup openvpn |
146 |
enewuser openvpn "" "" "" openvpn |
147 |
|
148 |
if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then |
149 |
ewarn "WARNING: The openvpn init script has changed" |
150 |
ewarn "" |
151 |
fi |
152 |
|
153 |
elog "The openvpn init script expects to find the configuration file" |
154 |
elog "openvpn.conf in /etc/openvpn along with any extra files it may need." |
155 |
elog "" |
156 |
elog "To create more VPNs, simply create a new .conf file for it and" |
157 |
elog "then create a symlink to the openvpn init script from a link called" |
158 |
elog "openvpn.newconfname - like so" |
159 |
elog " cd /etc/openvpn" |
160 |
elog " ${EDITOR##*/} foo.conf" |
161 |
elog " cd /etc/init.d" |
162 |
elog " ln -s openvpn openvpn.foo" |
163 |
elog "" |
164 |
elog "You can then treat openvpn.foo as any other service, so you can" |
165 |
elog "stop one vpn and start another if you need to." |
166 |
|
167 |
if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then |
168 |
ewarn "" |
169 |
ewarn "WARNING: If you use the remote keyword then you are deemed to be" |
170 |
ewarn "a client by our init script and as such we force up,down scripts." |
171 |
ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you" |
172 |
ewarn "can move your scripts to." |
173 |
fi |
174 |
|
175 |
if use plugins ; then |
176 |
einfo "" |
177 |
einfo "plugins have been installed into /usr/$(get_libdir)/${PN}" |
178 |
fi |
179 |
|
180 |
einfo "" |
181 |
einfo "OpenVPN 2.3.x no longer includes the easy-rsa suite of utilities." |
182 |
einfo "They can now be emerged via app-crypt/easy-rsa." |
183 |
} |