Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/openvpn/
Date: Wed, 21 Jun 2017 17:58:24
Message-Id: 1498067884.c5249db880f4ceed20aa7da11de7487cb3d85356.mrueg@gentoo
1 commit: c5249db880f4ceed20aa7da11de7487cb3d85356
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 21 17:58:04 2017 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 21 17:58:04 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5249db8
7
8 net-vpn/openvpn: Remove old
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 net-vpn/openvpn/Manifest | 2 -
13 net-vpn/openvpn/metadata.xml | 2 -
14 net-vpn/openvpn/openvpn-2.3.12.ebuild | 137 ----------------------------------
15 net-vpn/openvpn/openvpn-2.3.15.ebuild | 137 ----------------------------------
16 4 files changed, 278 deletions(-)
17
18 diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
19 index ae855f747a5..fc71d5c8504 100644
20 --- a/net-vpn/openvpn/Manifest
21 +++ b/net-vpn/openvpn/Manifest
22 @@ -1,5 +1,3 @@
23 DIST mock_msg.h 1356 SHA256 d6c56a423753c0b938a5dc32c978984eebb97243a2671a1652440093f67d61fb SHA512 930775a5837bc7f97a26817ea028782d555e0e71ba06b04c39941f4c01bbc3ca0a5dc63bcf19dc694e0e746b3a382f22daf6a6373a3443c5afd7398cbaaef6ea WHIRLPOOL 4cce848abc141e9d39cca1f8a0c9d11c0819d8a6e640c541968df491d2a6c3c0746233742418ee43c8bbc6ef19028a41159efae2922bcc719bd86442da05df86
24 -DIST openvpn-2.3.12.tar.gz 1235262 SHA256 f5d39b8c55f75b0aab943059b20571452b494146d997b12d48ce9bd753c01cff SHA512 8de40e9177268cce64906915ddc0d23381b4040ed00e6eefe4784b04d48f50d5c5ce9e99886eb18fe45d22c5c047478b9aa942e4c4eeaf115cc443a1d3ebe631 WHIRLPOOL 4adeb0da83a4fbff27bc90a3941b593f97dfdc3f50c3ccf10c113293bb0e4f85ead680b53645a2a078f907026549c8dbf068dcc64c9f89b6a967b3eb919f2c8c
25 -DIST openvpn-2.3.15.tar.gz 1324132 SHA256 705cecebe67ff581db4654f2d7977771546dd0e33f4b09656b5377a6972d84c1 SHA512 bcd7cf01f6da45de6b234d614702242485745f1318a294938b29e750b104e345a8776b10b11a6b4e37f1523bd91db045cf210f4500afcf6d5a232ef859eb9a0e WHIRLPOOL fa269f7aee093c5ec56c28a1117c018a92248db3da3926cab76edc90ca73facaa42bc1b5293ededcca76f3d4ab903c10a82768f3b4d33e0769e86744919574e6
26 DIST openvpn-2.4.2.tar.gz 1402516 SHA256 b24740c9d44a81eaf2befc4846d51445a520104321e32aaf0c135ed2e098a624 SHA512 9be3cef25f398c426087581d8bb2589ae2a3a1b3b812c73f7e9a4d3c35098421eea3099b33fc90606162d0429dcd7d9ae3449af89602e060e47cd4c053720e72 WHIRLPOOL 53343492084ac2c3a1672179521b89f0e4c0fda27c80ef4cf7a6e5fd61000e5ad0b0f3db420c1d03131b104c9c64e2fdccc4f689d3585351e54afee815804f7d
27 DIST openvpn-2.4.3.tar.gz 1397306 SHA256 84a01aa3df0c12a3552ca3baaa39d700137b5bce4b6de683fe87fb79bfa5df0b SHA512 e6fbe65d9071832871dcd173f5031ae3615b32f122d03a798afa05d2e5af1a6019dcdcf5107c9ea2c47aedf86c8cb61305e429c24696262ca9bc76c54adc1370 WHIRLPOOL 9fcbf2e32106158c58fc44d60a580fd5a6e4e49cb3de96f97bad468a718df0f8c3c8be8b1b1bfc5bc7f8e9463073abba535a955f6dd4f04e30c61f102fec24f8
28
29 diff --git a/net-vpn/openvpn/metadata.xml b/net-vpn/openvpn/metadata.xml
30 index d6c211a689c..7638a471b11 100644
31 --- a/net-vpn/openvpn/metadata.xml
32 +++ b/net-vpn/openvpn/metadata.xml
33 @@ -17,10 +17,8 @@ networks using an encrypted tunnel.</longdescription>
34 <flag name="iproute2">Enabled iproute2 support instead of net-tools</flag>
35 <flag name="lz4">Enable LZ4 support</flag>
36 <flag name="mbedtls">Use mbed TLS instead of OpenSSL</flag>
37 - <flag name="polarssl">Use PolarSSL instead of OpenSSL</flag>
38 <flag name="pkcs11">Enable PKCS#11 smartcard support</flag>
39 <flag name="plugins">Enable the OpenVPN plugin system</flag>
40 - <flag name="socks">Enable socks support</flag>
41 </use>
42 <upstream>
43 <remote-id type="cpe">cpe:/a:openvpn:openvpn</remote-id>
44
45 diff --git a/net-vpn/openvpn/openvpn-2.3.12.ebuild b/net-vpn/openvpn/openvpn-2.3.12.ebuild
46 deleted file mode 100644
47 index f19a6f16328..00000000000
48 --- a/net-vpn/openvpn/openvpn-2.3.12.ebuild
49 +++ /dev/null
50 @@ -1,137 +0,0 @@
51 -# Copyright 1999-2017 Gentoo Foundation
52 -# Distributed under the terms of the GNU General Public License v2
53 -
54 -EAPI=5
55 -
56 -inherit multilib flag-o-matic user systemd linux-info
57 -
58 -DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
59 -SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
60 -HOMEPAGE="http://openvpn.net/"
61 -
62 -LICENSE="GPL-2"
63 -SLOT="0"
64 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
65 -IUSE="examples down-root iproute2 libressl +lzo pam pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD"
66 -
67 -REQUIRED_USE="static? ( !plugins !pkcs11 )
68 - polarssl? ( ssl !libressl )
69 - pkcs11? ( ssl )
70 - !plugins? ( !pam !down-root )"
71 -
72 -DEPEND="
73 - kernel_linux? (
74 - iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
75 - )
76 - pam? ( virtual/pam )
77 - ssl? (
78 - !polarssl? (
79 - !libressl? ( >=dev-libs/openssl-0.9.7:* )
80 - libressl? ( dev-libs/libressl )
81 - )
82 - polarssl? ( >=net-libs/polarssl-1.3.8 )
83 - )
84 - lzo? ( >=dev-libs/lzo-1.07 )
85 - pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
86 - systemd? ( sys-apps/systemd )"
87 -RDEPEND="${DEPEND}
88 - selinux? ( sec-policy/selinux-openvpn )
89 -"
90 -
91 -CONFIG_CHECK="~TUN"
92 -
93 -pkg_setup() {
94 - linux-info_pkg_setup
95 -}
96 -
97 -src_configure() {
98 - use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
99 - local myconf
100 - use polarssl && myconf="--with-crypto-library=polarssl"
101 - econf \
102 - ${myconf} \
103 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
104 - --with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
105 - $(use_enable ssl) \
106 - $(use_enable ssl crypto) \
107 - $(use_enable lzo) \
108 - $(use_enable pkcs11) \
109 - $(use_enable plugins) \
110 - $(use_enable iproute2) \
111 - $(use_enable socks) \
112 - $(use_enable pam plugin-auth-pam) \
113 - $(use_enable down-root plugin-down-root) \
114 - $(use_enable systemd)
115 -}
116 -
117 -src_install() {
118 - default
119 - find "${ED}/usr" -name '*.la' -delete
120 - # install documentation
121 - dodoc AUTHORS ChangeLog PORTS README README.IPv6
122 -
123 - # Install some helper scripts
124 - keepdir /etc/openvpn
125 - exeinto /etc/openvpn
126 - doexe "${FILESDIR}/up.sh"
127 - doexe "${FILESDIR}/down.sh"
128 -
129 - # Install the init script and config file
130 - newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
131 - newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
132 -
133 - # install examples, controlled by the respective useflag
134 - if use examples ; then
135 - # dodoc does not supportly support directory traversal, #15193
136 - insinto /usr/share/doc/${PF}/examples
137 - doins -r sample contrib
138 - fi
139 -
140 - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
141 - systemd_newunit distro/systemd/openvpn-client@.service openvpn-client@.service
142 - systemd_newunit distro/systemd/openvpn-server@.service openvpn-server@.service
143 -}
144 -
145 -pkg_postinst() {
146 - # Add openvpn user so openvpn servers can drop privs
147 - # Clients should run as root so they can change ip addresses,
148 - # dns information and other such things.
149 - enewgroup openvpn
150 - enewuser openvpn "" "" "" openvpn
151 -
152 - if path_exists -o "${EROOT%/}"/etc/openvpn/*/local.conf ; then
153 - ewarn "WARNING: The openvpn init script has changed"
154 - ewarn ""
155 - fi
156 -
157 - elog "The openvpn init script expects to find the configuration file"
158 - elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
159 - elog ""
160 - elog "To create more VPNs, simply create a new .conf file for it and"
161 - elog "then create a symlink to the openvpn init script from a link called"
162 - elog "openvpn.newconfname - like so"
163 - elog " cd /etc/openvpn"
164 - elog " ${EDITOR##*/} foo.conf"
165 - elog " cd /etc/init.d"
166 - elog " ln -s openvpn openvpn.foo"
167 - elog ""
168 - elog "You can then treat openvpn.foo as any other service, so you can"
169 - elog "stop one vpn and start another if you need to."
170 -
171 - if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
172 - ewarn ""
173 - ewarn "WARNING: If you use the remote keyword then you are deemed to be"
174 - ewarn "a client by our init script and as such we force up,down scripts."
175 - ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
176 - ewarn "can move your scripts to."
177 - fi
178 -
179 - if use plugins ; then
180 - einfo ""
181 - einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
182 - fi
183 -
184 - einfo ""
185 - einfo "OpenVPN 2.3.x no longer includes the easy-rsa suite of utilities."
186 - einfo "They can now be emerged via app-crypt/easy-rsa."
187 -}
188
189 diff --git a/net-vpn/openvpn/openvpn-2.3.15.ebuild b/net-vpn/openvpn/openvpn-2.3.15.ebuild
190 deleted file mode 100644
191 index 9ad833e7b9b..00000000000
192 --- a/net-vpn/openvpn/openvpn-2.3.15.ebuild
193 +++ /dev/null
194 @@ -1,137 +0,0 @@
195 -# Copyright 1999-2017 Gentoo Foundation
196 -# Distributed under the terms of the GNU General Public License v2
197 -
198 -EAPI=6
199 -
200 -inherit multilib flag-o-matic user systemd linux-info
201 -
202 -DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
203 -SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
204 -HOMEPAGE="http://openvpn.net/"
205 -
206 -LICENSE="GPL-2"
207 -SLOT="0"
208 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
209 -IUSE="examples down-root iproute2 libressl +lzo pam pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD"
210 -
211 -REQUIRED_USE="static? ( !plugins !pkcs11 )
212 - polarssl? ( ssl !libressl )
213 - pkcs11? ( ssl )
214 - !plugins? ( !pam !down-root )"
215 -
216 -DEPEND="
217 - kernel_linux? (
218 - iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
219 - )
220 - pam? ( virtual/pam )
221 - ssl? (
222 - !polarssl? (
223 - !libressl? ( >=dev-libs/openssl-0.9.7:* )
224 - libressl? ( dev-libs/libressl )
225 - )
226 - polarssl? ( >=net-libs/polarssl-1.3.8 )
227 - )
228 - lzo? ( >=dev-libs/lzo-1.07 )
229 - pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
230 - systemd? ( sys-apps/systemd )"
231 -RDEPEND="${DEPEND}
232 - selinux? ( sec-policy/selinux-openvpn )
233 -"
234 -
235 -CONFIG_CHECK="~TUN"
236 -
237 -pkg_setup() {
238 - linux-info_pkg_setup
239 -}
240 -
241 -src_configure() {
242 - use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
243 - local myconf
244 - use polarssl && myconf="--with-crypto-library=polarssl"
245 - econf \
246 - ${myconf} \
247 - --docdir="${EPREFIX}/usr/share/doc/${PF}" \
248 - --with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
249 - $(use_enable ssl) \
250 - $(use_enable ssl crypto) \
251 - $(use_enable lzo) \
252 - $(use_enable pkcs11) \
253 - $(use_enable plugins) \
254 - $(use_enable iproute2) \
255 - $(use_enable socks) \
256 - $(use_enable pam plugin-auth-pam) \
257 - $(use_enable down-root plugin-down-root) \
258 - $(use_enable systemd)
259 -}
260 -
261 -src_install() {
262 - default
263 - find "${ED}/usr" -name '*.la' -delete
264 - # install documentation
265 - dodoc AUTHORS ChangeLog PORTS README README.IPv6
266 -
267 - # Install some helper scripts
268 - keepdir /etc/openvpn
269 - exeinto /etc/openvpn
270 - doexe "${FILESDIR}/up.sh"
271 - doexe "${FILESDIR}/down.sh"
272 -
273 - # Install the init script and config file
274 - newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
275 - newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
276 -
277 - # install examples, controlled by the respective useflag
278 - if use examples ; then
279 - # dodoc does not supportly support directory traversal, #15193
280 - insinto /usr/share/doc/${PF}/examples
281 - doins -r sample contrib
282 - fi
283 -
284 - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
285 - systemd_newunit distro/systemd/openvpn-client@.service openvpn-client@.service
286 - systemd_newunit distro/systemd/openvpn-server@.service openvpn-server@.service
287 -}
288 -
289 -pkg_postinst() {
290 - # Add openvpn user so openvpn servers can drop privs
291 - # Clients should run as root so they can change ip addresses,
292 - # dns information and other such things.
293 - enewgroup openvpn
294 - enewuser openvpn "" "" "" openvpn
295 -
296 - if path_exists -o "${EROOT%/}"/etc/openvpn/*/local.conf ; then
297 - ewarn "WARNING: The openvpn init script has changed"
298 - ewarn ""
299 - fi
300 -
301 - elog "The openvpn init script expects to find the configuration file"
302 - elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
303 - elog ""
304 - elog "To create more VPNs, simply create a new .conf file for it and"
305 - elog "then create a symlink to the openvpn init script from a link called"
306 - elog "openvpn.newconfname - like so"
307 - elog " cd /etc/openvpn"
308 - elog " ${EDITOR##*/} foo.conf"
309 - elog " cd /etc/init.d"
310 - elog " ln -s openvpn openvpn.foo"
311 - elog ""
312 - elog "You can then treat openvpn.foo as any other service, so you can"
313 - elog "stop one vpn and start another if you need to."
314 -
315 - if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
316 - ewarn ""
317 - ewarn "WARNING: If you use the remote keyword then you are deemed to be"
318 - ewarn "a client by our init script and as such we force up,down scripts."
319 - ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
320 - ewarn "can move your scripts to."
321 - fi
322 -
323 - if use plugins ; then
324 - einfo ""
325 - einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
326 - fi
327 -
328 - einfo ""
329 - einfo "OpenVPN 2.3.x no longer includes the easy-rsa suite of utilities."
330 - einfo "They can now be emerged via app-crypt/easy-rsa."
331 -}