| 1 |
commit: e928dfb16726420de9838fac83fdf93d45270e50 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 20 17:44:30 2021 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 20 17:44:30 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e928dfb1 |
| 7 |
|
| 8 |
net-vpn/openconnect: fix automagic deps on p11-kit and libpskc |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
net-vpn/openconnect/metadata.xml | 1 + |
| 13 |
.../{openconnect-8.10-r5.ebuild => openconnect-8.10-r6.ebuild} | 6 +++++- |
| 14 |
net-vpn/openconnect/openconnect-9999.ebuild | 6 +++++- |
| 15 |
3 files changed, 11 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-vpn/openconnect/metadata.xml b/net-vpn/openconnect/metadata.xml |
| 18 |
index 41262f103fd..0660a620fe5 100644 |
| 19 |
--- a/net-vpn/openconnect/metadata.xml |
| 20 |
+++ b/net-vpn/openconnect/metadata.xml |
| 21 |
@@ -12,6 +12,7 @@ |
| 22 |
<use> |
| 23 |
<flag name="gssapi">Build GSSAPI support</flag> |
| 24 |
<flag name="libproxy">Enable proxy support</flag> |
| 25 |
+ <flag name="pskc">Enable PSKC file storage of HOTP/TOTP keys</flag> |
| 26 |
<flag name="stoken">Enable stoken support</flag> |
| 27 |
</use> |
| 28 |
</pkgmetadata> |
| 29 |
|
| 30 |
diff --git a/net-vpn/openconnect/openconnect-8.10-r5.ebuild b/net-vpn/openconnect/openconnect-8.10-r6.ebuild |
| 31 |
similarity index 94% |
| 32 |
rename from net-vpn/openconnect/openconnect-8.10-r5.ebuild |
| 33 |
rename to net-vpn/openconnect/openconnect-8.10-r6.ebuild |
| 34 |
index d8210a2b00a..da0988a8a8f 100644 |
| 35 |
--- a/net-vpn/openconnect/openconnect-8.10-r5.ebuild |
| 36 |
+++ b/net-vpn/openconnect/openconnect-8.10-r6.ebuild |
| 37 |
@@ -21,14 +21,16 @@ HOMEPAGE="http://www.infradead.org/openconnect.html" |
| 38 |
|
| 39 |
LICENSE="LGPL-2.1 GPL-2" |
| 40 |
SLOT="0/5" |
| 41 |
-IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test" |
| 42 |
+IUSE="doc +gnutls gssapi libproxy lz4 nls pskc smartcard stoken test" |
| 43 |
RESTRICT="!test? ( test )" |
| 44 |
|
| 45 |
DEPEND=" |
| 46 |
dev-libs/libxml2 |
| 47 |
sys-libs/zlib |
| 48 |
+ app-crypt/p11-kit |
| 49 |
!gnutls? ( |
| 50 |
>=dev-libs/openssl-1.0.1h:0= |
| 51 |
+ dev-libs/libp11 |
| 52 |
) |
| 53 |
gnutls? ( |
| 54 |
app-crypt/trousers |
| 55 |
@@ -42,6 +44,7 @@ DEPEND=" |
| 56 |
libproxy? ( net-libs/libproxy ) |
| 57 |
lz4? ( app-arch/lz4:= ) |
| 58 |
nls? ( virtual/libintl ) |
| 59 |
+ pskc? ( sys-auth/oath-toolkit[pskc] ) |
| 60 |
smartcard? ( sys-apps/pcsc-lite:0= ) |
| 61 |
stoken? ( app-crypt/stoken ) |
| 62 |
" |
| 63 |
@@ -103,6 +106,7 @@ src_configure() { |
| 64 |
$(use_with libproxy) |
| 65 |
$(use_with lz4) |
| 66 |
$(use_with gssapi) |
| 67 |
+ $(use_with pskc libpskc) |
| 68 |
$(use_with smartcard libpcsclite) |
| 69 |
$(use_with stoken) |
| 70 |
--with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script" |
| 71 |
|
| 72 |
diff --git a/net-vpn/openconnect/openconnect-9999.ebuild b/net-vpn/openconnect/openconnect-9999.ebuild |
| 73 |
index b2332da693e..5a6a3065e1d 100644 |
| 74 |
--- a/net-vpn/openconnect/openconnect-9999.ebuild |
| 75 |
+++ b/net-vpn/openconnect/openconnect-9999.ebuild |
| 76 |
@@ -21,14 +21,16 @@ HOMEPAGE="http://www.infradead.org/openconnect.html" |
| 77 |
|
| 78 |
LICENSE="LGPL-2.1 GPL-2" |
| 79 |
SLOT="0/5" |
| 80 |
-IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test" |
| 81 |
+IUSE="doc +gnutls gssapi libproxy lz4 nls pskc smartcard stoken test" |
| 82 |
RESTRICT="!test? ( test )" |
| 83 |
|
| 84 |
DEPEND=" |
| 85 |
dev-libs/libxml2 |
| 86 |
sys-libs/zlib |
| 87 |
+ app-crypt/p11-kit |
| 88 |
!gnutls? ( |
| 89 |
>=dev-libs/openssl-1.0.1h:0= |
| 90 |
+ dev-libs/libp11 |
| 91 |
) |
| 92 |
gnutls? ( |
| 93 |
app-crypt/trousers |
| 94 |
@@ -42,6 +44,7 @@ DEPEND=" |
| 95 |
libproxy? ( net-libs/libproxy ) |
| 96 |
lz4? ( app-arch/lz4:= ) |
| 97 |
nls? ( virtual/libintl ) |
| 98 |
+ pskc? ( sys-auth/oath-toolkit[pskc] ) |
| 99 |
smartcard? ( sys-apps/pcsc-lite:0= ) |
| 100 |
stoken? ( app-crypt/stoken ) |
| 101 |
" |
| 102 |
@@ -103,6 +106,7 @@ src_configure() { |
| 103 |
$(use_with libproxy) |
| 104 |
$(use_with lz4) |
| 105 |
$(use_with gssapi) |
| 106 |
+ $(use_with pskc libpskc) |
| 107 |
$(use_with smartcard libpcsclite) |
| 108 |
$(use_with stoken) |
| 109 |
--with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script" |
Archives