commit: b4e4a9c2906867a41c86e83838c88ad9f213064f
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 3 04:06:40 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Apr 3 04:06:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4e4a9c2
net-vpn/openconnect: fix tests to work with ocserv installed
Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
net-vpn/openconnect/openconnect-8.06.ebuild | 18 ++++++++++++++++--
net-vpn/openconnect/openconnect-9999.ebuild | 18 ++++++++++++++++--
2 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/net-vpn/openconnect/openconnect-8.06.ebuild
b/net-vpn/openconnect/openconnect-8.06.ebuild
index 45d091c8dc3..61191005970 100644
--- a/net-vpn/openconnect/openconnect-8.06.ebuild
+++ b/net-vpn/openconnect/openconnect-8.06.ebuild
@@ -90,9 +90,9 @@ src_configure() {
addwrite /run/netns
local myconf=(
- --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh"
- $(use_enable static-libs static)
+ --disable-dsa-tests
$(use_enable nls)
+ $(use_enable static-libs static)
$(use_with !gnutls openssl)
$(use_with gnutls)
$(use_with libproxy)
@@ -100,12 +100,26 @@ src_configure() {
$(use_with gssapi)
$(use_with smartcard libpcsclite)
$(use_with stoken)
+ --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh"
--without-java
)
econf "${myconf[@]}"
}
+src_test() {
+ local charset
+ for charset in UTF-8 ISO8859-2; do
+ if [[ $(LC_ALL=cs_CZ.${charset} locale charmap 2>/dev/null) !=
${charset} ]]; then
+ # If we don't have valid cs_CZ locale data,
auth-nonascii will fail.
+ # Force a test skip by exiting with status 77.
+ sed -i -e '2i exit 77' tests/auth-nonascii || die
+ break
+ fi
+ done
+ default
+}
+
src_install() {
default
diff --git a/net-vpn/openconnect/openconnect-9999.ebuild
b/net-vpn/openconnect/openconnect-9999.ebuild
index 45d091c8dc3..61191005970 100644
--- a/net-vpn/openconnect/openconnect-9999.ebuild
+++ b/net-vpn/openconnect/openconnect-9999.ebuild
@@ -90,9 +90,9 @@ src_configure() {
addwrite /run/netns
local myconf=(
- --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh"
- $(use_enable static-libs static)
+ --disable-dsa-tests
$(use_enable nls)
+ $(use_enable static-libs static)
$(use_with !gnutls openssl)
$(use_with gnutls)
$(use_with libproxy)
@@ -100,12 +100,26 @@ src_configure() {
$(use_with gssapi)
$(use_with smartcard libpcsclite)
$(use_with stoken)
+ --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh"
--without-java
)
econf "${myconf[@]}"
}
+src_test() {
+ local charset
+ for charset in UTF-8 ISO8859-2; do
+ if [[ $(LC_ALL=cs_CZ.${charset} locale charmap 2>/dev/null) !=
${charset} ]]; then
+ # If we don't have valid cs_CZ locale data,
auth-nonascii will fail.
+ # Force a test skip by exiting with status 77.
+ sed -i -e '2i exit 77' tests/auth-nonascii || die
+ break
+ fi
+ done
+ default
+}
+
src_install() {
default
