1 |
commit: 8e3b4abba8e585c09b9fcc1146fb2b6cfa49a0c4 |
2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
3 |
AuthorDate: Thu Mar 12 00:25:37 2020 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 12 00:25:55 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e3b4abb |
7 |
|
8 |
net-vpn/openvpn-9999: Sync with 2.4.8 |
9 |
|
10 |
Copyright: Sony Interactive Entertainment Inc. |
11 |
Package-Manager: Portage-2.3.93, Repoman-2.3.20 |
12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
13 |
|
14 |
net-vpn/openvpn/openvpn-9999.ebuild | 42 ++++++++++++++++++------------------- |
15 |
1 file changed, 21 insertions(+), 21 deletions(-) |
16 |
|
17 |
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild |
18 |
index 19122b752be..8ea466d6754 100644 |
19 |
--- a/net-vpn/openvpn/openvpn-9999.ebuild |
20 |
+++ b/net-vpn/openvpn/openvpn-9999.ebuild |
21 |
@@ -1,9 +1,9 @@ |
22 |
# Copyright 1999-2020 Gentoo Authors |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
-EAPI=6 |
26 |
+EAPI=7 |
27 |
|
28 |
-inherit autotools flag-o-matic user systemd linux-info git-r3 |
29 |
+inherit autotools flag-o-matic systemd linux-info git-r3 |
30 |
|
31 |
DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes" |
32 |
EGIT_REPO_URI="https://github.com/OpenVPN/${PN}.git" |
33 |
@@ -18,14 +18,15 @@ IUSE="down-root examples inotify iproute2 libressl lz4 +lzo mbedtls pam" |
34 |
IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD" |
35 |
|
36 |
RESTRICT="!test? ( test )" |
37 |
-REQUIRED_USE="lzo? ( !lz4 ) |
38 |
+REQUIRED_USE="pkcs11? ( ssl ) |
39 |
!plugins? ( !pam !down-root ) |
40 |
- inotify? ( plugins )" |
41 |
+ inotify? ( plugins ) |
42 |
+" |
43 |
|
44 |
CDEPEND=" |
45 |
kernel_linux? ( |
46 |
iproute2? ( sys-apps/iproute2[-minimal] ) |
47 |
- !iproute2? ( sys-apps/net-tools ) |
48 |
+ !iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 ) |
49 |
) |
50 |
pam? ( sys-libs/pam ) |
51 |
ssl? ( |
52 |
@@ -38,18 +39,19 @@ CDEPEND=" |
53 |
lz4? ( app-arch/lz4 ) |
54 |
lzo? ( >=dev-libs/lzo-1.07 ) |
55 |
pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) |
56 |
- systemd? ( sys-apps/systemd )" |
57 |
+ systemd? ( sys-apps/systemd ) |
58 |
+" |
59 |
DEPEND="${CDEPEND} |
60 |
- test? ( dev-util/cmocka )" |
61 |
+ test? ( dev-util/cmocka ) |
62 |
+" |
63 |
RDEPEND="${CDEPEND} |
64 |
- selinux? ( sec-policy/selinux-openvpn )" |
65 |
+ acct-group/openvpn |
66 |
+ acct-user/openvpn |
67 |
+ selinux? ( sec-policy/selinux-openvpn ) |
68 |
+" |
69 |
|
70 |
CONFIG_CHECK="~TUN" |
71 |
|
72 |
-PATCHES=( |
73 |
- "${FILESDIR}/${PN}-2.5-external-cmocka.patch" |
74 |
-) |
75 |
- |
76 |
pkg_setup() { |
77 |
linux-info_pkg_setup |
78 |
} |
79 |
@@ -74,7 +76,6 @@ src_configure() { |
80 |
$(use_enable iproute2) \ |
81 |
$(use_enable pam plugin-auth-pam) \ |
82 |
$(use_enable down-root plugin-down-root) \ |
83 |
- $(use_enable test tests) \ |
84 |
$(use_enable systemd) |
85 |
} |
86 |
|
87 |
@@ -104,17 +105,16 @@ src_install() { |
88 |
# install examples, controlled by the respective useflag |
89 |
if use examples ; then |
90 |
# dodoc does not supportly support directory traversal, #15193 |
91 |
- insinto /usr/share/doc/${PF}/examples |
92 |
- doins -r sample contrib |
93 |
+ docinto /usr/share/doc/${PF}/examples |
94 |
+ dodoc -r sample contrib |
95 |
fi |
96 |
} |
97 |
|
98 |
pkg_postinst() { |
99 |
- # Add openvpn user so openvpn servers can drop privs |
100 |
- # Clients should run as root so they can change ip addresses, |
101 |
- # dns information and other such things. |
102 |
- enewgroup openvpn |
103 |
- enewuser openvpn "" "" "" openvpn |
104 |
+ if use x64-macos; then |
105 |
+ elog "You might want to install tuntaposx for TAP interface support:" |
106 |
+ elog "http://tuntaposx.sourceforge.net" |
107 |
+ fi |
108 |
|
109 |
elog "The openvpn init script expects to find the configuration file" |
110 |
elog "openvpn.conf in /etc/openvpn along with any extra files it may need." |
111 |
@@ -140,7 +140,7 @@ pkg_postinst() { |
112 |
|
113 |
if use plugins ; then |
114 |
einfo "" |
115 |
- einfo "plugins have been installed into /usr/$(get_libdir)/${PN}" |
116 |
+ einfo "plugins have been installed into /usr/$(get_libdir)/${PN}/plugins" |
117 |
fi |
118 |
|
119 |
ewarn "" |