1 |
commit: ec170227d5fcde74bdae7583fc2665f3a5d11750 |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 30 10:49:09 2021 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 30 10:49:09 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec170227 |
7 |
|
8 |
net-vpn/openvpn: remove libressl support |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
12 |
|
13 |
net-vpn/openvpn/metadata.xml | 1 - |
14 |
net-vpn/openvpn/openvpn-2.4.9.ebuild | 7 ++----- |
15 |
net-vpn/openvpn/openvpn-2.5.0-r1.ebuild | 7 ++----- |
16 |
net-vpn/openvpn/openvpn-2.5.1-r1.ebuild | 7 ++----- |
17 |
net-vpn/openvpn/openvpn-9999.ebuild | 7 ++----- |
18 |
5 files changed, 8 insertions(+), 21 deletions(-) |
19 |
|
20 |
diff --git a/net-vpn/openvpn/metadata.xml b/net-vpn/openvpn/metadata.xml |
21 |
index caa9b97acdf..699f7fa4ff8 100644 |
22 |
--- a/net-vpn/openvpn/metadata.xml |
23 |
+++ b/net-vpn/openvpn/metadata.xml |
24 |
@@ -17,7 +17,6 @@ networks using an encrypted tunnel.</longdescription> |
25 |
<flag name="iproute2">Enabled iproute2 support instead of net-tools</flag> |
26 |
<flag name="mbedtls">Use mbed TLS as the backend crypto library</flag> |
27 |
<flag name="openssl">Use OpenSSL as the backend crypto library</flag> |
28 |
- <flag name="libressl">Use OpenSSL as the backend crypto library</flag> |
29 |
<flag name="pkcs11">Enable PKCS#11 smartcard support</flag> |
30 |
<flag name="plugins">Enable the OpenVPN plugin system</flag> |
31 |
</use> |
32 |
|
33 |
diff --git a/net-vpn/openvpn/openvpn-2.4.9.ebuild b/net-vpn/openvpn/openvpn-2.4.9.ebuild |
34 |
index 6d6d5d7a02d..b29d88937b0 100644 |
35 |
--- a/net-vpn/openvpn/openvpn-2.4.9.ebuild |
36 |
+++ b/net-vpn/openvpn/openvpn-2.4.9.ebuild |
37 |
@@ -13,7 +13,7 @@ LICENSE="GPL-2" |
38 |
SLOT="0" |
39 |
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" |
40 |
|
41 |
-IUSE="down-root examples inotify iproute2 libressl +lz4 +lzo mbedtls pam" |
42 |
+IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls pam" |
43 |
IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD" |
44 |
|
45 |
RESTRICT="!test? ( test )" |
46 |
@@ -29,10 +29,7 @@ CDEPEND=" |
47 |
) |
48 |
pam? ( sys-libs/pam ) |
49 |
ssl? ( |
50 |
- !mbedtls? ( |
51 |
- !libressl? ( >=dev-libs/openssl-0.9.8:0= ) |
52 |
- libressl? ( dev-libs/libressl:0= ) |
53 |
- ) |
54 |
+ !mbedtls? ( >=dev-libs/openssl-0.9.8:0= ) |
55 |
mbedtls? ( net-libs/mbedtls:= ) |
56 |
) |
57 |
lz4? ( app-arch/lz4 ) |
58 |
|
59 |
diff --git a/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild b/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild |
60 |
index 2744ace9271..f0b8f56f6fc 100644 |
61 |
--- a/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild |
62 |
+++ b/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild |
63 |
@@ -13,7 +13,7 @@ LICENSE="GPL-2" |
64 |
SLOT="0" |
65 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
66 |
|
67 |
-IUSE="down-root examples inotify iproute2 libressl +lz4 +lzo mbedtls +openssl" |
68 |
+IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl" |
69 |
IUSE+=" pam pkcs11 +plugins selinux systemd test userland_BSD" |
70 |
|
71 |
RESTRICT="!test? ( test )" |
72 |
@@ -31,10 +31,7 @@ CDEPEND=" |
73 |
lz4? ( app-arch/lz4 ) |
74 |
lzo? ( >=dev-libs/lzo-1.07 ) |
75 |
mbedtls? ( net-libs/mbedtls:= ) |
76 |
- openssl? ( |
77 |
- !libressl? ( >=dev-libs/openssl-0.9.8:0= ) |
78 |
- libressl? ( dev-libs/libressl:0= ) |
79 |
- ) |
80 |
+ openssl? ( >=dev-libs/openssl-0.9.8:0= ) |
81 |
pam? ( sys-libs/pam ) |
82 |
pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) |
83 |
systemd? ( sys-apps/systemd ) |
84 |
|
85 |
diff --git a/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild b/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild |
86 |
index 5d4782a0359..5234e90577c 100644 |
87 |
--- a/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild |
88 |
+++ b/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild |
89 |
@@ -13,7 +13,7 @@ LICENSE="GPL-2" |
90 |
SLOT="0" |
91 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
92 |
|
93 |
-IUSE="down-root examples inotify iproute2 libressl +lz4 +lzo mbedtls +openssl" |
94 |
+IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl" |
95 |
IUSE+=" pam pkcs11 +plugins selinux systemd test userland_BSD" |
96 |
|
97 |
RESTRICT="!test? ( test )" |
98 |
@@ -31,10 +31,7 @@ CDEPEND=" |
99 |
lz4? ( app-arch/lz4 ) |
100 |
lzo? ( >=dev-libs/lzo-1.07 ) |
101 |
mbedtls? ( net-libs/mbedtls:= ) |
102 |
- openssl? ( |
103 |
- !libressl? ( >=dev-libs/openssl-0.9.8:0= ) |
104 |
- libressl? ( dev-libs/libressl:0= ) |
105 |
- ) |
106 |
+ openssl? ( >=dev-libs/openssl-0.9.8:0= ) |
107 |
pam? ( sys-libs/pam ) |
108 |
pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) |
109 |
systemd? ( sys-apps/systemd ) |
110 |
|
111 |
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild |
112 |
index b2945c23a0f..dd958ea3cc0 100644 |
113 |
--- a/net-vpn/openvpn/openvpn-9999.ebuild |
114 |
+++ b/net-vpn/openvpn/openvpn-9999.ebuild |
115 |
@@ -14,7 +14,7 @@ LICENSE="GPL-2" |
116 |
SLOT="0" |
117 |
KEYWORDS="" |
118 |
|
119 |
-IUSE="down-root examples inotify iproute2 libressl +lz4 +lzo mbedtls pam" |
120 |
+IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls pam" |
121 |
IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD" |
122 |
|
123 |
RESTRICT="!test? ( test )" |
124 |
@@ -30,10 +30,7 @@ CDEPEND=" |
125 |
) |
126 |
pam? ( sys-libs/pam ) |
127 |
ssl? ( |
128 |
- !mbedtls? ( |
129 |
- !libressl? ( >=dev-libs/openssl-0.9.8:0= ) |
130 |
- libressl? ( dev-libs/libressl:0= ) |
131 |
- ) |
132 |
+ !mbedtls? ( >=dev-libs/openssl-0.9.8:0= ) |
133 |
mbedtls? ( net-libs/mbedtls:= ) |
134 |
) |
135 |
lz4? ( app-arch/lz4 ) |