[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 1d5e01aff18b060d8643421dc571ca7aa7abf7d5 Author: Mike Gilbert gentoo org> AuthorDate: Sat Apr 13 15:45:36 2024 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Apr 13 15:45:36 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d5e01af net-vpn/openconnect: QA_CONFIG_IMPL_DECL_SKIP=( memset_s ) This is handled appropriately in the configure script. Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-9.12.ebuild | 2 ++ net-vpn/openconnect/openconnect-.ebuild | 2 ++ 2 files changed, 4 insertions(+) diff --git a/net-vpn/openconnect/openconnect-9.12.ebuild b/net-vpn/openconnect/openconnect-9.12.ebuild index 1fd9c6ff0cf3..f581106dda98 100644 --- a/net-vpn/openconnect/openconnect-9.12.ebuild +++ b/net-vpn/openconnect/openconnect-9.12.ebuild @@ -75,6 +75,8 @@ if [[ ${PV} != ]]; then VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/dw...@kernel.org.key" fi +QA_CONFIG_IMPL_DECL_SKIP=( memset_s ) + CONFIG_CHECK="~TUN" pkg_pretend() { diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index a170cffeb3c6..0751c933b2e4 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -75,6 +75,8 @@ if [[ ${PV} != ]]; then VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/dw...@kernel.org.key" fi +QA_CONFIG_IMPL_DECL_SKIP=( memset_s ) + CONFIG_CHECK="~TUN" pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: f851b812176e1becea54ab0abfd941489129d9ab Author: Mike Gilbert gentoo org> AuthorDate: Sat Apr 13 15:30:49 2024 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Apr 13 15:31:15 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f851b812 net-vpn/openconnect: enable py3.12 Closes: https://bugs.gentoo.org/929745 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-9.12.ebuild | 2 +- net-vpn/openconnect/openconnect-.ebuild | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-vpn/openconnect/openconnect-9.12.ebuild b/net-vpn/openconnect/openconnect-9.12.ebuild index 3918970bc11e..1fd9c6ff0cf3 100644 --- a/net-vpn/openconnect/openconnect-9.12.ebuild +++ b/net-vpn/openconnect/openconnect-9.12.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="xml(+)" inherit linux-info python-any-r1 diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index e93dcc8dc7af..a170cffeb3c6 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -1,9 +1,9 @@ -# Copyright 2011-2023 Gentoo Authors +# Copyright 2011-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) PYTHON_REQ_USE="xml(+)" inherit linux-info python-any-r1
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/files/, net-vpn/openconnect/
commit: 645ac58671ce1918f13479ab38000a9ffc6e5f5e Author: Mike Gilbert gentoo org> AuthorDate: Tue Jan 30 16:13:06 2024 + Commit: Mike Gilbert gentoo org> CommitDate: Tue Jan 30 16:13:06 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=645ac586 net-vpn/openconnect: fix implicit declaration of malloc Closes: https://bugs.gentoo.org/923173 Signed-off-by: Mike Gilbert gentoo.org> .../files/openconnect-9.12-stdlib.patch| 37 ++ net-vpn/openconnect/openconnect-9.12.ebuild| 5 ++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/net-vpn/openconnect/files/openconnect-9.12-stdlib.patch b/net-vpn/openconnect/files/openconnect-9.12-stdlib.patch new file mode 100644 index ..6e8ce06a8bef --- /dev/null +++ b/net-vpn/openconnect/files/openconnect-9.12-stdlib.patch @@ -0,0 +1,37 @@ +https://gitlab.com/openconnect/openconnect/-/merge_requests/533 + +From 5f59c2efa27295d6b3675a8b750357a6e883c45d Mon Sep 17 00:00:00 2001 +From: Brahmajit Das +Date: Mon, 29 Jan 2024 23:28:53 +0530 +Subject: [PATCH] Fix implicit declaration of function 'malloc' + +First observed on Gentoo Linux with GCC 14. This is due to GCC 14 +enabling -Werror=implicit-function-declaration by default. +Thus resulting in errors such as: + +openconnect-internal.h: In function 'alloc_pkt': +openconnect-internal.h:911:27: error: implicit declaration of function 'malloc' [-Werror=implicit-function-declaration] + 911 | struct pkt *pkt = malloc(alloc_len); + | ^~ + +Plese refer gentoo bug: https://bugs.gentoo.org/923173 +Signed-off-by: Brahmajit Das +--- + openconnect-internal.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/openconnect-internal.h b/openconnect-internal.h +index 21460adf..5abfe98d 100644 +--- a/openconnect-internal.h b/openconnect-internal.h +@@ -119,6 +119,7 @@ + #include + + #include ++#include + #include + #include + +-- +2.43.0 + diff --git a/net-vpn/openconnect/openconnect-9.12.ebuild b/net-vpn/openconnect/openconnect-9.12.ebuild index f98706b42254..3918970bc11e 100644 --- a/net-vpn/openconnect/openconnect-9.12.ebuild +++ b/net-vpn/openconnect/openconnect-9.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 2011-2023 Gentoo Authors +# Copyright 2011-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -86,6 +86,9 @@ pkg_setup() { } src_prepare() { + local PATCHES=( + "${FILESDIR}/openconnect-9.12-stdlib.patch" + ) default if [[ ${PV} == ]]; then eautoreconf
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 1e2a19665d271e385df6fcf7549d5c2edd1da1de Author: Mike Gilbert gentoo org> AuthorDate: Tue Jun 6 00:24:52 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Tue Jun 6 00:24:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e2a1966 net-vpn/openconnect: drop unnecessary src_unpack Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-9.12.ebuild | 11 --- net-vpn/openconnect/openconnect-.ebuild | 11 --- 2 files changed, 22 deletions(-) diff --git a/net-vpn/openconnect/openconnect-9.12.ebuild b/net-vpn/openconnect/openconnect-9.12.ebuild index e6e6474a2e57..52dfc9e65b7f 100644 --- a/net-vpn/openconnect/openconnect-9.12.ebuild +++ b/net-vpn/openconnect/openconnect-9.12.ebuild @@ -85,17 +85,6 @@ pkg_setup() { : } -src_unpack() { - if [[ ${PV} == ]]; then - git-r3_src_unpack - else - if use verify-sig; then - verify-sig_verify_detached "${DISTDIR}/${P}".tar.gz{,.asc} - fi - unpack "${P}.tar.gz" - fi -} - src_prepare() { default if [[ ${PV} == ]]; then diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index bda422a32553..27ee9b53a66c 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -85,17 +85,6 @@ pkg_setup() { : } -src_unpack() { - if [[ ${PV} == ]]; then - git-r3_src_unpack - else - if use verify-sig; then - verify-sig_verify_detached "${DISTDIR}/${P}".tar.gz{,.asc} - fi - unpack "${P}.tar.gz" - fi -} - src_prepare() { default if [[ ${PV} == ]]; then
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/files/, net-vpn/openconnect/
commit: efccc84553d9fe442448fda4d57fda7a0150a5e2 Author: Mike Gilbert gentoo org> AuthorDate: Tue Jun 6 00:25:25 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Tue Jun 6 00:25:25 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efccc845 net-vpn/openconnect: drop 9.01-r2, 9.01-r3 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/Manifest | 1 - .../files/openconnect-9.01-inttypes.patch | 32 - net-vpn/openconnect/openconnect-9.01-r2.ebuild | 153 net-vpn/openconnect/openconnect-9.01-r3.ebuild | 154 - 4 files changed, 340 deletions(-) diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index ca17f671e069..24ba24e5dd3f 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1,3 +1,2 @@ -DIST openconnect-9.01.tar.gz 2718526 BLAKE2B e346b30ed8a299bcdd1fc88868d59b4d501c48bc5c02092e92e7ded0cd36e4de6a5b65aae4f6bf8c9aa60cf70f5466b110b64889df8d286016c9a1b4d9f46ff7 SHA512 b7428847a90f8ca9d1f1f61653c1f2486f0a07989f3b7435b746c5e901998194f4ee2b4f9569a548a23bba368bb1e9f273674c0759aac9df30208d2a6a303c34 DIST openconnect-9.12.tar.gz 2843115 BLAKE2B cd5f65ae0d67bece3e5aacdfb4c5c73c893d45d756554a1b6e39e66af5c6a171735d535ca7b16ed94244d02798d3c43a45b252ba05ddb0f3505f1fafc2ec0de9 SHA512 5c622e8bdfac3d21b5881660444e5d2b84e9463a99493d42cbfb480c3aa3972076bdeeb618aca02abed68e31dbeadcb66fb1c370e62a20f20cd544753c7ac48e DIST openconnect-9.12.tar.gz.asc 833 BLAKE2B c974439cef74eea9698a0b565c0d49c6026a0afe322739d5adfee2d484279d7366c6c3c703019ff2492eb3d5725de8e0fe4505d9e3a0e5b6d36201974d20a223 SHA512 ade33209a4c17bbdfd0bea7490588b248c36c4da56a9aec60818ed6c96bc8c3570b1f2ac2685003122a1e52dd9d24e4b678d77e001c752461649114167a7304c diff --git a/net-vpn/openconnect/files/openconnect-9.01-inttypes.patch b/net-vpn/openconnect/files/openconnect-9.01-inttypes.patch deleted file mode 100644 index c9b28913ce9f.. --- a/net-vpn/openconnect/files/openconnect-9.01-inttypes.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c0775e6cd46fb5df6c6aab52314e3038c44d2152 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Fri, 19 Aug 2022 11:55:42 -0400 -Subject: [PATCH] jsondump.c: include for PRId64 - -Fixes a build failure with gnutls and a json-parser snapshot taken on -2021-12-08. - -Building with openssl or with the bundled copy of json-parser causes -inttypes.h to be included indirectly. - -Bug: https://bugs.gentoo.org/865797 -Signed-off-by: Mike Gilbert - jsondump.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/jsondump.c b/jsondump.c -index a18780b5..2b097e8a 100644 a/jsondump.c -+++ b/jsondump.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - /* - * Copyright (C) 2015 Mirko Pasqualetti All rights reserved. --- -GitLab - diff --git a/net-vpn/openconnect/openconnect-9.01-r2.ebuild b/net-vpn/openconnect/openconnect-9.01-r2.ebuild deleted file mode 100644 index 1d3056470a80.. --- a/net-vpn/openconnect/openconnect-9.01-r2.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 2011-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="xml(+)" - -inherit linux-info python-any-r1 - -if [[ ${PV} == ]]; then - EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; - inherit git-r3 autotools -else - SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" -fi - -DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" -HOMEPAGE="https://www.infradead.org/openconnect/; - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-libs/libxml2 - sys-libs/zlib - app-crypt/p11-kit - !gnutls? ( - >=dev-libs/openssl-1.0.1h:0= - dev-libs/libp11 - ) - gnutls? ( - app-crypt/trousers - app-misc/ca-certificates - dev-libs/nettle - >=net-libs/gnutls-3.6.13:0= - dev-libs/libtasn1:0= - app-crypt/tpm2-tss:= - ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - lz4? ( app-arch/lz4:= ) - nls? ( virtual/libintl ) - pskc? ( sys-auth/oath-toolkit[pskc(+)] ) - smartcard? ( sys-apps/pcsc-lite:0= ) - stoken? ( app-crypt/stoken ) -" -DEPEND="${COMMON_DEPEND} - test? ( - net-libs/socket_wrapper - sys-libs/uid_wrapper - !gnutls? ( dev-libs/openssl:0[weak-ssl-ciphers(-)] ) - ) -" -RDEPEND="${COMMON_DEPEND} - sys-apps/iproute2 - >=net-vpn/vpnc-scripts-20210402-r1 - selinux? ( sec-policy/selinux-vpn ) -" -BDEPEND=" - virtual/pkgconfig -
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: e0caf3aea95e7dd0c3cb720c776252d0aee8e598 Author: Sam James gentoo org> AuthorDate: Fri Jun 2 05:34:38 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jun 2 05:34:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0caf3ae net-vpn/openconnect: Stabilize 9.12 amd64, #907665 Signed-off-by: Sam James gentoo.org> net-vpn/openconnect/openconnect-9.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-9.12.ebuild b/net-vpn/openconnect/openconnect-9.12.ebuild index 6cecaa4c7d7e..e6e6474a2e57 100644 --- a/net-vpn/openconnect/openconnect-9.12.ebuild +++ b/net-vpn/openconnect/openconnect-9.12.ebuild @@ -15,7 +15,7 @@ else inherit verify-sig SRC_URI="https://www.infradead.org/openconnect/download/${P}.tar.gz verify-sig? ( https://www.infradead.org/openconnect/download/${P}.tar.gz.asc )" - KEYWORDS="~amd64 arm arm64 ~loong ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: d06b9c67f33122c581dd04ab80fefa8c02dd0ee9 Author: Sam James gentoo org> AuthorDate: Fri Jun 2 02:39:12 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jun 2 02:39:12 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d06b9c67 net-vpn/openconnect: Stabilize 9.12 arm64, #907665 Signed-off-by: Sam James gentoo.org> net-vpn/openconnect/openconnect-9.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-9.12.ebuild b/net-vpn/openconnect/openconnect-9.12.ebuild index 5b7a1f078ad9..6cecaa4c7d7e 100644 --- a/net-vpn/openconnect/openconnect-9.12.ebuild +++ b/net-vpn/openconnect/openconnect-9.12.ebuild @@ -15,7 +15,7 @@ else inherit verify-sig SRC_URI="https://www.infradead.org/openconnect/download/${P}.tar.gz verify-sig? ( https://www.infradead.org/openconnect/download/${P}.tar.gz.asc )" - KEYWORDS="~amd64 arm ~arm64 ~loong ppc64 ~riscv x86" + KEYWORDS="~amd64 arm arm64 ~loong ppc64 ~riscv x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: b8a142e9baaae8d807b61dedf2e5dfcaecd46cd0 Author: Sam James gentoo org> AuthorDate: Fri Jun 2 02:39:09 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jun 2 02:39:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8a142e9 net-vpn/openconnect: Stabilize 9.12 ppc64, #907665 Signed-off-by: Sam James gentoo.org> net-vpn/openconnect/openconnect-9.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-9.12.ebuild b/net-vpn/openconnect/openconnect-9.12.ebuild index 9bb19021d051..5b7a1f078ad9 100644 --- a/net-vpn/openconnect/openconnect-9.12.ebuild +++ b/net-vpn/openconnect/openconnect-9.12.ebuild @@ -15,7 +15,7 @@ else inherit verify-sig SRC_URI="https://www.infradead.org/openconnect/download/${P}.tar.gz verify-sig? ( https://www.infradead.org/openconnect/download/${P}.tar.gz.asc )" - KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv x86" + KEYWORDS="~amd64 arm ~arm64 ~loong ppc64 ~riscv x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 60e8604fce36f073783befa5219f2d267a1e13ab Author: Sam James gentoo org> AuthorDate: Fri Jun 2 02:39:06 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jun 2 02:39:06 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60e8604f net-vpn/openconnect: Stabilize 9.12 x86, #907665 Signed-off-by: Sam James gentoo.org> net-vpn/openconnect/openconnect-9.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-9.12.ebuild b/net-vpn/openconnect/openconnect-9.12.ebuild index d7997124dc5c..9bb19021d051 100644 --- a/net-vpn/openconnect/openconnect-9.12.ebuild +++ b/net-vpn/openconnect/openconnect-9.12.ebuild @@ -15,7 +15,7 @@ else inherit verify-sig SRC_URI="https://www.infradead.org/openconnect/download/${P}.tar.gz verify-sig? ( https://www.infradead.org/openconnect/download/${P}.tar.gz.asc )" - KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: dfa5c3c16e0bbd52204de05ca0e3eefca6063426 Author: Sam James gentoo org> AuthorDate: Fri Jun 2 02:39:04 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jun 2 02:39:04 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfa5c3c1 net-vpn/openconnect: Stabilize 9.12 arm, #907665 Signed-off-by: Sam James gentoo.org> net-vpn/openconnect/openconnect-9.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-9.12.ebuild b/net-vpn/openconnect/openconnect-9.12.ebuild index bda422a32553..d7997124dc5c 100644 --- a/net-vpn/openconnect/openconnect-9.12.ebuild +++ b/net-vpn/openconnect/openconnect-9.12.ebuild @@ -15,7 +15,7 @@ else inherit verify-sig SRC_URI="https://www.infradead.org/openconnect/download/${P}.tar.gz verify-sig? ( https://www.infradead.org/openconnect/download/${P}.tar.gz.asc )" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/files/, net-vpn/openconnect/
commit: a1af029715b1944e743630b661630228c1b90ec1 Author: Mike Gilbert gentoo org> AuthorDate: Sun May 21 20:46:18 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Sun May 21 20:47:03 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1af0297 net-vpn/openconnect: drop 9.10, 9.11 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/Manifest | 4 - .../files/openconnect-9.11-json-cflags.patch | 57 --- net-vpn/openconnect/openconnect-9.10.ebuild| 163 net-vpn/openconnect/openconnect-9.11.ebuild| 164 - 4 files changed, 388 deletions(-) diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index a72035d984f5..ca17f671e069 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1,7 +1,3 @@ DIST openconnect-9.01.tar.gz 2718526 BLAKE2B e346b30ed8a299bcdd1fc88868d59b4d501c48bc5c02092e92e7ded0cd36e4de6a5b65aae4f6bf8c9aa60cf70f5466b110b64889df8d286016c9a1b4d9f46ff7 SHA512 b7428847a90f8ca9d1f1f61653c1f2486f0a07989f3b7435b746c5e901998194f4ee2b4f9569a548a23bba368bb1e9f273674c0759aac9df30208d2a6a303c34 -DIST openconnect-9.10.tar.gz 2843858 BLAKE2B 03349acaf2420fc1acb4e5787159a7185708e9e2fe8f7e3b54141342da361b304967a27d60ea3b3bede62b9e74718cbcc734c33c36bf49a7ab4ca8ee5d96bbbf SHA512 64d10ad67fccd11d1aaae23a77c6cfd8200bbba0eae21a7d01c604688ec9c35b5f19eeb9a47de14d383780eba64a2f6c06daccd4c1fae6289efdb0dc2fb7c536 -DIST openconnect-9.10.tar.gz.asc 833 BLAKE2B 37ac92d70b415ba4d80c6a9028610e5660eecf7bd826d8ea708c8c59b60ff2fc8dcdc583dbc163ad5929c34b034e44273dc91d966b81397daaa8edda6407f5bc SHA512 4ed8be3a8aa1a0bdedff94910b2de792c93025498f83b50033df9ef25fd0a9dd86ab3011183657b49bbc3c2b70a5acb9605bdfa722e2bb2f2318540d1047f730 -DIST openconnect-9.11.tar.gz 2844135 BLAKE2B a5b40c9d70eecd0464daf78367cb0af688596a71ddf90b19435f03446e9cdb1d7aba151436dbe819d2d2d9b70c30d38acd7caebfc8636ed5c960b70cf3e55b58 SHA512 fd1aa12597467102e7c94de9549f02f714736f997b050473d1e0f1a1abd9dc85186436209be9a8b24cafa9dc349329be7d583eb438ce06f14077a7c12598e55e -DIST openconnect-9.11.tar.gz.asc 833 BLAKE2B de1f38aaf6abd158ef8d54934f239b88b72502b2b9205c35e3374eb4ce33cadd929f3ef5517b088bff152016ad12ed5be93fc46c28f7168cac8b36fd28c3360a SHA512 c8c25c12d6573ef2c97e5e6d9d46c4c002e7f8357d1bcc1a8b11c3c1fcbfa7e5b2414ac47b635fdea8d1028d9cb8160f1d79567fe046ac1e8b7136edf0e88e51 DIST openconnect-9.12.tar.gz 2843115 BLAKE2B cd5f65ae0d67bece3e5aacdfb4c5c73c893d45d756554a1b6e39e66af5c6a171735d535ca7b16ed94244d02798d3c43a45b252ba05ddb0f3505f1fafc2ec0de9 SHA512 5c622e8bdfac3d21b5881660444e5d2b84e9463a99493d42cbfb480c3aa3972076bdeeb618aca02abed68e31dbeadcb66fb1c370e62a20f20cd544753c7ac48e DIST openconnect-9.12.tar.gz.asc 833 BLAKE2B c974439cef74eea9698a0b565c0d49c6026a0afe322739d5adfee2d484279d7366c6c3c703019ff2492eb3d5725de8e0fe4505d9e3a0e5b6d36201974d20a223 SHA512 ade33209a4c17bbdfd0bea7490588b248c36c4da56a9aec60818ed6c96bc8c3570b1f2ac2685003122a1e52dd9d24e4b678d77e001c752461649114167a7304c diff --git a/net-vpn/openconnect/files/openconnect-9.11-json-cflags.patch b/net-vpn/openconnect/files/openconnect-9.11-json-cflags.patch deleted file mode 100644 index c09e87bff7c9.. --- a/net-vpn/openconnect/files/openconnect-9.11-json-cflags.patch +++ /dev/null @@ -1,57 +0,0 @@ -From ce49cf495276c737fe95725da8f0773742fb838d Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Thu, 18 May 2023 15:04:17 -0400 -Subject: [PATCH] Move JSON_CFLAGS before LIBPROXY_CFLAGS - -Depending on build options, libproxy-1.0.pc depends indirectly -on json-c.pc: - -libproxy-1.0 -> gio-2.0 -> mount -> libcryptsetup -> json-c - -This causes "pkg-config --cflags libproxy-1.0" to emit -"-I/usr/include/json-c". - -json-c installs a "json.h" file that conflicts with the one provided by -json-parser. If json-c comes before json-parser on the compiler command, -we get a build failure: - -openconnect-internal.h:1654:59: error: unknown type name 'json_value' - -[ dwmw2: This is a combination of at *least* three different bugs in - three different packages conspiring to be my problem. See - https://gitlab.com/openconnect/openconnect/-/merge_requests/476#note_1397129468 - But still, working around it does no harm for now. - Ironically, if the presence of json-c on the include path - wasn't *entirely* gratuitous then hiding it by putting it - last wouldn't actually work because then something would - fail to include the json-c version of instead. ] - -Bug: https://bugs.gentoo.org/906662 -Signed-off-by: Mike Gilbert -Signed-off-by: David Woodhouse - Makefile.am | 8 - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 495b46f2..a09c0614 100644 a/Makefile.am -+++ b/Makefile.am -@@ -128,10 +128,10 @@ endif - - libopenconnect_la_SOURCES = version.c $(library_srcs) -
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 344667400961c2643a5702dc770cdb56386c4ce5 Author: Mike Gilbert gentoo org> AuthorDate: Sun May 21 20:45:35 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Sun May 21 20:47:02 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34466740 net-vpn/openconnect: add 9.12 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/Manifest| 2 + net-vpn/openconnect/openconnect-9.12.ebuild | 163 2 files changed, 165 insertions(+) diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index 7c094705b9ec..a72035d984f5 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -3,3 +3,5 @@ DIST openconnect-9.10.tar.gz 2843858 BLAKE2B 03349acaf2420fc1acb4e5787159a718570 DIST openconnect-9.10.tar.gz.asc 833 BLAKE2B 37ac92d70b415ba4d80c6a9028610e5660eecf7bd826d8ea708c8c59b60ff2fc8dcdc583dbc163ad5929c34b034e44273dc91d966b81397daaa8edda6407f5bc SHA512 4ed8be3a8aa1a0bdedff94910b2de792c93025498f83b50033df9ef25fd0a9dd86ab3011183657b49bbc3c2b70a5acb9605bdfa722e2bb2f2318540d1047f730 DIST openconnect-9.11.tar.gz 2844135 BLAKE2B a5b40c9d70eecd0464daf78367cb0af688596a71ddf90b19435f03446e9cdb1d7aba151436dbe819d2d2d9b70c30d38acd7caebfc8636ed5c960b70cf3e55b58 SHA512 fd1aa12597467102e7c94de9549f02f714736f997b050473d1e0f1a1abd9dc85186436209be9a8b24cafa9dc349329be7d583eb438ce06f14077a7c12598e55e DIST openconnect-9.11.tar.gz.asc 833 BLAKE2B de1f38aaf6abd158ef8d54934f239b88b72502b2b9205c35e3374eb4ce33cadd929f3ef5517b088bff152016ad12ed5be93fc46c28f7168cac8b36fd28c3360a SHA512 c8c25c12d6573ef2c97e5e6d9d46c4c002e7f8357d1bcc1a8b11c3c1fcbfa7e5b2414ac47b635fdea8d1028d9cb8160f1d79567fe046ac1e8b7136edf0e88e51 +DIST openconnect-9.12.tar.gz 2843115 BLAKE2B cd5f65ae0d67bece3e5aacdfb4c5c73c893d45d756554a1b6e39e66af5c6a171735d535ca7b16ed94244d02798d3c43a45b252ba05ddb0f3505f1fafc2ec0de9 SHA512 5c622e8bdfac3d21b5881660444e5d2b84e9463a99493d42cbfb480c3aa3972076bdeeb618aca02abed68e31dbeadcb66fb1c370e62a20f20cd544753c7ac48e +DIST openconnect-9.12.tar.gz.asc 833 BLAKE2B c974439cef74eea9698a0b565c0d49c6026a0afe322739d5adfee2d484279d7366c6c3c703019ff2492eb3d5725de8e0fe4505d9e3a0e5b6d36201974d20a223 SHA512 ade33209a4c17bbdfd0bea7490588b248c36c4da56a9aec60818ed6c96bc8c3570b1f2ac2685003122a1e52dd9d24e4b678d77e001c752461649114167a7304c diff --git a/net-vpn/openconnect/openconnect-9.12.ebuild b/net-vpn/openconnect/openconnect-9.12.ebuild new file mode 100644 index ..bda422a32553 --- /dev/null +++ b/net-vpn/openconnect/openconnect-9.12.ebuild @@ -0,0 +1,163 @@ +# Copyright 2011-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="xml(+)" + +inherit linux-info python-any-r1 + +if [[ ${PV} == ]]; then + EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; + inherit git-r3 autotools +else + inherit verify-sig + SRC_URI="https://www.infradead.org/openconnect/download/${P}.tar.gz + verify-sig? ( https://www.infradead.org/openconnect/download/${P}.tar.gz.asc )" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" +HOMEPAGE="https://www.infradead.org/openconnect/; + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0/5" +IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + dev-libs/json-parser:0= + dev-libs/libxml2 + sys-libs/zlib + app-crypt/p11-kit + !gnutls? ( + >=dev-libs/openssl-1.0.1h:0= + dev-libs/libp11 + ) + gnutls? ( + app-crypt/trousers + app-misc/ca-certificates + dev-libs/nettle + >=net-libs/gnutls-3.6.13:0= + dev-libs/libtasn1:0= + app-crypt/tpm2-tss:= + ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + lz4? ( app-arch/lz4:= ) + nls? ( virtual/libintl ) + pskc? ( sys-auth/oath-toolkit[pskc(+)] ) + smartcard? ( sys-apps/pcsc-lite:0= ) + stoken? ( app-crypt/stoken ) +" +DEPEND="${COMMON_DEPEND} + test? ( + net-libs/socket_wrapper + sys-libs/uid_wrapper + !gnutls? ( dev-libs/openssl:0[weak-ssl-ciphers(-)] ) + ) +" +RDEPEND="${COMMON_DEPEND} + sys-apps/iproute2 + >=net-vpn/vpnc-scripts-20210402-r1 + selinux? ( sec-policy/selinux-vpn ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( ${PYTHON_DEPS} sys-apps/groff ) + nls? ( sys-devel/gettext ) + test? ( net-vpn/ocserv ) +" + +if [[ ${PV} != ]]; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dwmw2 )" + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/dw...@kernel.org.key" +fi + +CONFIG_CHECK="~TUN" +
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/, net-vpn/openconnect/files/
commit: dcd2a5a59bca9b11abdb5a7b56d8efe966ff3928 Author: Mike Gilbert gentoo org> AuthorDate: Sat May 20 02:14:37 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Sat May 20 02:17:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd2a5a5 net-vpn/openconnect: fix build failure Closes: https://bugs.gentoo.org/906662 Signed-off-by: Mike Gilbert gentoo.org> .../files/openconnect-9.11-json-cflags.patch | 57 ++ net-vpn/openconnect/openconnect-9.11.ebuild| 11 +++-- 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/net-vpn/openconnect/files/openconnect-9.11-json-cflags.patch b/net-vpn/openconnect/files/openconnect-9.11-json-cflags.patch new file mode 100644 index ..c09e87bff7c9 --- /dev/null +++ b/net-vpn/openconnect/files/openconnect-9.11-json-cflags.patch @@ -0,0 +1,57 @@ +From ce49cf495276c737fe95725da8f0773742fb838d Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Thu, 18 May 2023 15:04:17 -0400 +Subject: [PATCH] Move JSON_CFLAGS before LIBPROXY_CFLAGS + +Depending on build options, libproxy-1.0.pc depends indirectly +on json-c.pc: + +libproxy-1.0 -> gio-2.0 -> mount -> libcryptsetup -> json-c + +This causes "pkg-config --cflags libproxy-1.0" to emit +"-I/usr/include/json-c". + +json-c installs a "json.h" file that conflicts with the one provided by +json-parser. If json-c comes before json-parser on the compiler command, +we get a build failure: + +openconnect-internal.h:1654:59: error: unknown type name 'json_value' + +[ dwmw2: This is a combination of at *least* three different bugs in + three different packages conspiring to be my problem. See + https://gitlab.com/openconnect/openconnect/-/merge_requests/476#note_1397129468 + But still, working around it does no harm for now. + Ironically, if the presence of json-c on the include path + wasn't *entirely* gratuitous then hiding it by putting it + last wouldn't actually work because then something would + fail to include the json-c version of instead. ] + +Bug: https://bugs.gentoo.org/906662 +Signed-off-by: Mike Gilbert +Signed-off-by: David Woodhouse +--- + Makefile.am | 8 + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 495b46f2..a09c0614 100644 +--- a/Makefile.am b/Makefile.am +@@ -128,10 +128,10 @@ endif + + libopenconnect_la_SOURCES = version.c $(library_srcs) + libopenconnect_la_CFLAGS = $(AM_CFLAGS) $(SSL_CFLAGS) $(DTLS_SSL_CFLAGS) \ +- $(LIBXML2_CFLAGS) $(LIBPROXY_CFLAGS) $(ZLIB_CFLAGS) $(P11KIT_CFLAGS) \ +- $(TSS_CFLAGS) $(LIBSTOKEN_CFLAGS) $(LIBPSKC_CFLAGS) $(GSSAPI_CFLAGS) \ +- $(INTL_CFLAGS) $(ICONV_CFLAGS) $(LIBPCSCLITE_CFLAGS) $(LIBP11_CFLAGS) \ +- $(LIBLZ4_CFLAGS) $(JSON_CFLAGS) ++ $(LIBXML2_CFLAGS) $(JSON_CFLAGS) $(LIBPROXY_CFLAGS) $(ZLIB_CFLAGS) \ ++ $(P11KIT_CFLAGS) $(TSS_CFLAGS) $(LIBSTOKEN_CFLAGS) $(LIBPSKC_CFLAGS) \ ++ $(GSSAPI_CFLAGS) $(INTL_CFLAGS) $(ICONV_CFLAGS) $(LIBPCSCLITE_CFLAGS) \ ++ $(LIBP11_CFLAGS) $(LIBLZ4_CFLAGS) + libopenconnect_la_LIBADD = $(SSL_LIBS) $(DTLS_SSL_LIBS) \ + $(LIBXML2_LIBS) $(LIBPROXY_LIBS) $(ZLIB_LIBS) $(P11KIT_LIBS) \ + $(TSS_LIBS) $(LIBSTOKEN_LIBS) $(LIBPSKC_LIBS) $(GSSAPI_LIBS) \ +-- +GitLab + diff --git a/net-vpn/openconnect/openconnect-9.11.ebuild b/net-vpn/openconnect/openconnect-9.11.ebuild index bda422a32553..c0d892b7dd16 100644 --- a/net-vpn/openconnect/openconnect-9.11.ebuild +++ b/net-vpn/openconnect/openconnect-9.11.ebuild @@ -6,11 +6,11 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="xml(+)" -inherit linux-info python-any-r1 +inherit autotools linux-info python-any-r1 if [[ ${PV} == ]]; then EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; - inherit git-r3 autotools + inherit git-r3 else inherit verify-sig SRC_URI="https://www.infradead.org/openconnect/download/${P}.tar.gz @@ -97,10 +97,11 @@ src_unpack() { } src_prepare() { + local PATCHES=( + "${FILESDIR}/openconnect-9.11-json-cflags.patch" + ) default - if [[ ${PV} == ]]; then - eautoreconf - fi + eautoreconf } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: c2eee0a245e92a1219a0c17334412b9db20395bf Author: Mike Gilbert gentoo org> AuthorDate: Wed May 17 18:28:40 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Wed May 17 18:28:40 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2eee0a2 net-vpn/openconnect: add 9.11 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/Manifest| 2 + net-vpn/openconnect/openconnect-9.11.ebuild | 163 2 files changed, 165 insertions(+) diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index aa92a3417bd2..7c094705b9ec 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1,3 +1,5 @@ DIST openconnect-9.01.tar.gz 2718526 BLAKE2B e346b30ed8a299bcdd1fc88868d59b4d501c48bc5c02092e92e7ded0cd36e4de6a5b65aae4f6bf8c9aa60cf70f5466b110b64889df8d286016c9a1b4d9f46ff7 SHA512 b7428847a90f8ca9d1f1f61653c1f2486f0a07989f3b7435b746c5e901998194f4ee2b4f9569a548a23bba368bb1e9f273674c0759aac9df30208d2a6a303c34 DIST openconnect-9.10.tar.gz 2843858 BLAKE2B 03349acaf2420fc1acb4e5787159a7185708e9e2fe8f7e3b54141342da361b304967a27d60ea3b3bede62b9e74718cbcc734c33c36bf49a7ab4ca8ee5d96bbbf SHA512 64d10ad67fccd11d1aaae23a77c6cfd8200bbba0eae21a7d01c604688ec9c35b5f19eeb9a47de14d383780eba64a2f6c06daccd4c1fae6289efdb0dc2fb7c536 DIST openconnect-9.10.tar.gz.asc 833 BLAKE2B 37ac92d70b415ba4d80c6a9028610e5660eecf7bd826d8ea708c8c59b60ff2fc8dcdc583dbc163ad5929c34b034e44273dc91d966b81397daaa8edda6407f5bc SHA512 4ed8be3a8aa1a0bdedff94910b2de792c93025498f83b50033df9ef25fd0a9dd86ab3011183657b49bbc3c2b70a5acb9605bdfa722e2bb2f2318540d1047f730 +DIST openconnect-9.11.tar.gz 2844135 BLAKE2B a5b40c9d70eecd0464daf78367cb0af688596a71ddf90b19435f03446e9cdb1d7aba151436dbe819d2d2d9b70c30d38acd7caebfc8636ed5c960b70cf3e55b58 SHA512 fd1aa12597467102e7c94de9549f02f714736f997b050473d1e0f1a1abd9dc85186436209be9a8b24cafa9dc349329be7d583eb438ce06f14077a7c12598e55e +DIST openconnect-9.11.tar.gz.asc 833 BLAKE2B de1f38aaf6abd158ef8d54934f239b88b72502b2b9205c35e3374eb4ce33cadd929f3ef5517b088bff152016ad12ed5be93fc46c28f7168cac8b36fd28c3360a SHA512 c8c25c12d6573ef2c97e5e6d9d46c4c002e7f8357d1bcc1a8b11c3c1fcbfa7e5b2414ac47b635fdea8d1028d9cb8160f1d79567fe046ac1e8b7136edf0e88e51 diff --git a/net-vpn/openconnect/openconnect-9.11.ebuild b/net-vpn/openconnect/openconnect-9.11.ebuild new file mode 100644 index ..bda422a32553 --- /dev/null +++ b/net-vpn/openconnect/openconnect-9.11.ebuild @@ -0,0 +1,163 @@ +# Copyright 2011-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="xml(+)" + +inherit linux-info python-any-r1 + +if [[ ${PV} == ]]; then + EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; + inherit git-r3 autotools +else + inherit verify-sig + SRC_URI="https://www.infradead.org/openconnect/download/${P}.tar.gz + verify-sig? ( https://www.infradead.org/openconnect/download/${P}.tar.gz.asc )" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" +HOMEPAGE="https://www.infradead.org/openconnect/; + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0/5" +IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + dev-libs/json-parser:0= + dev-libs/libxml2 + sys-libs/zlib + app-crypt/p11-kit + !gnutls? ( + >=dev-libs/openssl-1.0.1h:0= + dev-libs/libp11 + ) + gnutls? ( + app-crypt/trousers + app-misc/ca-certificates + dev-libs/nettle + >=net-libs/gnutls-3.6.13:0= + dev-libs/libtasn1:0= + app-crypt/tpm2-tss:= + ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + lz4? ( app-arch/lz4:= ) + nls? ( virtual/libintl ) + pskc? ( sys-auth/oath-toolkit[pskc(+)] ) + smartcard? ( sys-apps/pcsc-lite:0= ) + stoken? ( app-crypt/stoken ) +" +DEPEND="${COMMON_DEPEND} + test? ( + net-libs/socket_wrapper + sys-libs/uid_wrapper + !gnutls? ( dev-libs/openssl:0[weak-ssl-ciphers(-)] ) + ) +" +RDEPEND="${COMMON_DEPEND} + sys-apps/iproute2 + >=net-vpn/vpnc-scripts-20210402-r1 + selinux? ( sec-policy/selinux-vpn ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( ${PYTHON_DEPS} sys-apps/groff ) + nls? ( sys-devel/gettext ) + test? ( net-vpn/ocserv ) +" + +if [[ ${PV} != ]]; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dwmw2 )" + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/dw...@kernel.org.key" +fi + +CONFIG_CHECK="~TUN" + +pkg_pretend() { + check_extra_config +} + +pkg_setup() { + : +} + +src_unpack()
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 7e265aeb623df5fa98b9a80d4be665ae16184222 Author: Mike Gilbert gentoo org> AuthorDate: Fri May 5 14:40:13 2023 + Commit: Mike Gilbert gentoo org> CommitDate: Fri May 5 14:42:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e265aeb net-vpn/openconnect: add 9.10 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/Manifest | 2 ++ ...openconnect-.ebuild => openconnect-9.10.ebuild} | 18 +++--- net-vpn/openconnect/openconnect-.ebuild| 18 +++--- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index a855a2300764..aa92a3417bd2 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1 +1,3 @@ DIST openconnect-9.01.tar.gz 2718526 BLAKE2B e346b30ed8a299bcdd1fc88868d59b4d501c48bc5c02092e92e7ded0cd36e4de6a5b65aae4f6bf8c9aa60cf70f5466b110b64889df8d286016c9a1b4d9f46ff7 SHA512 b7428847a90f8ca9d1f1f61653c1f2486f0a07989f3b7435b746c5e901998194f4ee2b4f9569a548a23bba368bb1e9f273674c0759aac9df30208d2a6a303c34 +DIST openconnect-9.10.tar.gz 2843858 BLAKE2B 03349acaf2420fc1acb4e5787159a7185708e9e2fe8f7e3b54141342da361b304967a27d60ea3b3bede62b9e74718cbcc734c33c36bf49a7ab4ca8ee5d96bbbf SHA512 64d10ad67fccd11d1aaae23a77c6cfd8200bbba0eae21a7d01c604688ec9c35b5f19eeb9a47de14d383780eba64a2f6c06daccd4c1fae6289efdb0dc2fb7c536 +DIST openconnect-9.10.tar.gz.asc 833 BLAKE2B 37ac92d70b415ba4d80c6a9028610e5660eecf7bd826d8ea708c8c59b60ff2fc8dcdc583dbc163ad5929c34b034e44273dc91d966b81397daaa8edda6407f5bc SHA512 4ed8be3a8aa1a0bdedff94910b2de792c93025498f83b50033df9ef25fd0a9dd86ab3011183657b49bbc3c2b70a5acb9605bdfa722e2bb2f2318540d1047f730 diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-9.10.ebuild similarity index 84% copy from net-vpn/openconnect/openconnect-.ebuild copy to net-vpn/openconnect/openconnect-9.10.ebuild index 1128cd29c582..bda422a32553 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-9.10.ebuild @@ -12,8 +12,10 @@ if [[ ${PV} == ]]; then EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; inherit git-r3 autotools else - SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + inherit verify-sig + SRC_URI="https://www.infradead.org/openconnect/download/${P}.tar.gz + verify-sig? ( https://www.infradead.org/openconnect/download/${P}.tar.gz.asc )" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" @@ -68,6 +70,11 @@ BDEPEND=" test? ( net-vpn/ocserv ) " +if [[ ${PV} != ]]; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dwmw2 )" + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/dw...@kernel.org.key" +fi + CONFIG_CHECK="~TUN" pkg_pretend() { @@ -81,8 +88,12 @@ pkg_setup() { src_unpack() { if [[ ${PV} == ]]; then git-r3_src_unpack + else + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}/${P}".tar.gz{,.asc} + fi + unpack "${P}.tar.gz" fi - default } src_prepare() { @@ -132,6 +143,7 @@ src_test() { break fi done + addwrite /proc default } diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index 1128cd29c582..bda422a32553 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -12,8 +12,10 @@ if [[ ${PV} == ]]; then EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; inherit git-r3 autotools else - SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + inherit verify-sig + SRC_URI="https://www.infradead.org/openconnect/download/${P}.tar.gz + verify-sig? ( https://www.infradead.org/openconnect/download/${P}.tar.gz.asc )" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" @@ -68,6 +70,11 @@ BDEPEND=" test? ( net-vpn/ocserv ) " +if [[ ${PV} != ]]; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dwmw2 )" + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/dw...@kernel.org.key" +fi + CONFIG_CHECK="~TUN" pkg_pretend() { @@ -81,8 +88,12 @@ pkg_setup() { src_unpack() { if [[ ${PV} == ]]; then git-r3_src_unpack + else + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}/${P}".tar.gz{,.asc} +
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 4316f1119a54d829a9c03da93bb1eda55a7efe02 Author: Sam James gentoo org> AuthorDate: Mon May 1 15:03:45 2023 + Commit: Sam James gentoo org> CommitDate: Mon May 1 15:03:45 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4316f111 net-vpn/openconnect: enable py3.11 Closes: https://bugs.gentoo.org/897156 Signed-off-by: Sam James gentoo.org> net-vpn/openconnect/openconnect-9.01-r2.ebuild | 2 +- net-vpn/openconnect/openconnect-9.01-r3.ebuild | 2 +- net-vpn/openconnect/openconnect-.ebuild| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-vpn/openconnect/openconnect-9.01-r2.ebuild b/net-vpn/openconnect/openconnect-9.01-r2.ebuild index 674af11dba8d..1d3056470a80 100644 --- a/net-vpn/openconnect/openconnect-9.01-r2.ebuild +++ b/net-vpn/openconnect/openconnect-9.01-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="xml(+)" inherit linux-info python-any-r1 diff --git a/net-vpn/openconnect/openconnect-9.01-r3.ebuild b/net-vpn/openconnect/openconnect-9.01-r3.ebuild index 3c983e085b39..397203414c25 100644 --- a/net-vpn/openconnect/openconnect-9.01-r3.ebuild +++ b/net-vpn/openconnect/openconnect-9.01-r3.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="xml(+)" inherit linux-info python-any-r1 diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index 7a0e9cc3cff8..1128cd29c582 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="xml(+)" inherit linux-info python-any-r1
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: e4297f02a042bec9dee908c557c7dfeea7388250 Author: Sam James gentoo org> AuthorDate: Tue Apr 18 06:06:10 2023 + Commit: Sam James gentoo org> CommitDate: Tue Apr 18 06:06:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4297f02 net-vpn/openconnect: adapt tp USE=pskc on oath-toolkit going away Signed-off-by: Sam James gentoo.org> .../openconnect/{openconnect-9.01.ebuild => openconnect-9.01-r2.ebuild} | 2 +- .../{openconnect-9.01-r1.ebuild => openconnect-9.01-r3.ebuild} | 2 +- net-vpn/openconnect/openconnect-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-vpn/openconnect/openconnect-9.01.ebuild b/net-vpn/openconnect/openconnect-9.01-r2.ebuild similarity index 98% rename from net-vpn/openconnect/openconnect-9.01.ebuild rename to net-vpn/openconnect/openconnect-9.01-r2.ebuild index d7f9969df415..674af11dba8d 100644 --- a/net-vpn/openconnect/openconnect-9.01.ebuild +++ b/net-vpn/openconnect/openconnect-9.01-r2.ebuild @@ -44,7 +44,7 @@ COMMON_DEPEND=" libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) - pskc? ( sys-auth/oath-toolkit[pskc] ) + pskc? ( sys-auth/oath-toolkit[pskc(+)] ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) " diff --git a/net-vpn/openconnect/openconnect-9.01-r1.ebuild b/net-vpn/openconnect/openconnect-9.01-r3.ebuild similarity index 98% rename from net-vpn/openconnect/openconnect-9.01-r1.ebuild rename to net-vpn/openconnect/openconnect-9.01-r3.ebuild index d057ec1baeba..3c983e085b39 100644 --- a/net-vpn/openconnect/openconnect-9.01-r1.ebuild +++ b/net-vpn/openconnect/openconnect-9.01-r3.ebuild @@ -45,7 +45,7 @@ COMMON_DEPEND=" libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) - pskc? ( sys-auth/oath-toolkit[pskc] ) + pskc? ( sys-auth/oath-toolkit[pskc(+)] ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) " diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index 1cee385ebd45..7a0e9cc3cff8 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -45,7 +45,7 @@ COMMON_DEPEND=" libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) - pskc? ( sys-auth/oath-toolkit[pskc] ) + pskc? ( sys-auth/oath-toolkit[pskc(+)] ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) "
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 1a90463127a0eced6863c7a0fb3688aa9b0fbd73 Author: WANG Xuerui gentoo org> AuthorDate: Thu Nov 24 07:19:50 2022 + Commit: WANG Xuerui gentoo org> CommitDate: Thu Nov 24 12:00:11 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a904631 net-vpn/openconnect: keyword 9.01-r1 for ~loong Signed-off-by: WANG Xuerui gentoo.org> net-vpn/openconnect/openconnect-9.01-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-9.01-r1.ebuild b/net-vpn/openconnect/openconnect-9.01-r1.ebuild index b94349f0b451..fd7729edeef6 100644 --- a/net-vpn/openconnect/openconnect-9.01-r1.ebuild +++ b/net-vpn/openconnect/openconnect-9.01-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: ee504b3f71c685b1444089f4ee13c3fa37746b10 Author: Michał Górny gentoo org> AuthorDate: Sun Sep 4 19:43:23 2022 + Commit: Michał Górny gentoo org> CommitDate: Wed Sep 7 07:52:06 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee504b3f net-vpn/openconnect: Update PYTHON_REQ_USE to xml(+) Update PYTHON_REQ_USE to specify "xml(+)", as Python 3.11 no longer features the "xml" flag. Signed-off-by: Michał Górny gentoo.org> net-vpn/openconnect/openconnect-9.01-r1.ebuild | 2 +- net-vpn/openconnect/openconnect-9.01.ebuild| 2 +- net-vpn/openconnect/openconnect-.ebuild| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-vpn/openconnect/openconnect-9.01-r1.ebuild b/net-vpn/openconnect/openconnect-9.01-r1.ebuild index b316f68adb45..b94349f0b451 100644 --- a/net-vpn/openconnect/openconnect-9.01-r1.ebuild +++ b/net-vpn/openconnect/openconnect-9.01-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml" +PYTHON_REQ_USE="xml(+)" inherit linux-info python-any-r1 diff --git a/net-vpn/openconnect/openconnect-9.01.ebuild b/net-vpn/openconnect/openconnect-9.01.ebuild index 17a4eb7c23bf..8386defade57 100644 --- a/net-vpn/openconnect/openconnect-9.01.ebuild +++ b/net-vpn/openconnect/openconnect-9.01.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml" +PYTHON_REQ_USE="xml(+)" inherit linux-info python-any-r1 diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index d39bf7565861..a051d4ea91a0 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml" +PYTHON_REQ_USE="xml(+)" inherit linux-info python-any-r1
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: f31cbec7328f7841cb0fb4001899776ad8f29145 Author: Jakov Smolić gentoo org> AuthorDate: Tue Aug 30 08:37:27 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Tue Aug 30 08:37:27 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31cbec7 net-vpn/openconnect: Keyword 9.01-r1 x86, #865819 Signed-off-by: Jakov Smolić gentoo.org> net-vpn/openconnect/openconnect-9.01-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-9.01-r1.ebuild b/net-vpn/openconnect/openconnect-9.01-r1.ebuild index 2e5b1a0480cf..b316f68adb45 100644 --- a/net-vpn/openconnect/openconnect-9.01-r1.ebuild +++ b/net-vpn/openconnect/openconnect-9.01-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 657b8ff92f0fd7d1a805d4d441d8c645e771ffe2 Author: Arthur Zamarin gentoo org> AuthorDate: Tue Aug 23 18:10:07 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Aug 23 18:10:20 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=657b8ff9 net-vpn/openconnect: Keyword 9.01-r1 arm, #865819 Signed-off-by: Arthur Zamarin gentoo.org> net-vpn/openconnect/openconnect-9.01-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-9.01-r1.ebuild b/net-vpn/openconnect/openconnect-9.01-r1.ebuild index bf46017bf0fb..2e5b1a0480cf 100644 --- a/net-vpn/openconnect/openconnect-9.01-r1.ebuild +++ b/net-vpn/openconnect/openconnect-9.01-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 43ec6f2ffb911057bc9a8b871c1c56f2b8daa35e Author: Arthur Zamarin gentoo org> AuthorDate: Sat Aug 20 07:03:34 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Aug 20 07:03:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43ec6f2f net-vpn/openconnect: Keyword 9.01-r1 ppc64, #865819 Signed-off-by: Arthur Zamarin gentoo.org> net-vpn/openconnect/openconnect-9.01-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-9.01-r1.ebuild b/net-vpn/openconnect/openconnect-9.01-r1.ebuild index b37b1d77a5db..bf46017bf0fb 100644 --- a/net-vpn/openconnect/openconnect-9.01-r1.ebuild +++ b/net-vpn/openconnect/openconnect-9.01-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm64 ~riscv" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 093348bf02e1ae8965e1e4b328e9f4073c8ad41c Author: Sam James gentoo org> AuthorDate: Sat Aug 20 03:47:12 2022 + Commit: Sam James gentoo org> CommitDate: Sat Aug 20 03:47:12 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=093348bf net-vpn/openconnect: Keyword 9.01-r1 arm64, #865819 Signed-off-by: Sam James gentoo.org> net-vpn/openconnect/openconnect-9.01-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-9.01-r1.ebuild b/net-vpn/openconnect/openconnect-9.01-r1.ebuild index f8e2341f3c22..b37b1d77a5db 100644 --- a/net-vpn/openconnect/openconnect-9.01-r1.ebuild +++ b/net-vpn/openconnect/openconnect-9.01-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~riscv" + KEYWORDS="~amd64 ~arm64 ~riscv" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 24f9e2883a4526522c262d5737e4afcb6eddec8f Author: Yixun Lan gentoo org> AuthorDate: Fri Aug 19 23:43:13 2022 + Commit: Yixun Lan gentoo org> CommitDate: Sat Aug 20 00:18:27 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24f9e288 net-vpn/openconnect: Keyword 9.01-r1 riscv, #865819 Signed-off-by: Yixun Lan gentoo.org> net-vpn/openconnect/openconnect-9.01-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-9.01-r1.ebuild b/net-vpn/openconnect/openconnect-9.01-r1.ebuild index 2e50b377bc13..f8e2341f3c22 100644 --- a/net-vpn/openconnect/openconnect-9.01-r1.ebuild +++ b/net-vpn/openconnect/openconnect-9.01-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~riscv" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 35569861687a3a2a27e0f5ad9644b97efe03e7b3 Author: Mike Gilbert gentoo org> AuthorDate: Fri Aug 19 19:09:20 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Aug 19 19:12:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35569861 net-vpn/openconnect: fix automagic dep on json-parser Signed-off-by: Mike Gilbert gentoo.org> .../{openconnect-9.01.ebuild => openconnect-9.01-r1.ebuild} | 4 +++- net-vpn/openconnect/openconnect-9.01.ebuild | 1 + net-vpn/openconnect/openconnect-.ebuild | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-9.01.ebuild b/net-vpn/openconnect/openconnect-9.01-r1.ebuild similarity index 97% copy from net-vpn/openconnect/openconnect-9.01.ebuild copy to net-vpn/openconnect/openconnect-9.01-r1.ebuild index e4aa08f994e4..2e50b377bc13 100644 --- a/net-vpn/openconnect/openconnect-9.01.ebuild +++ b/net-vpn/openconnect/openconnect-9.01-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" + KEYWORDS="~amd64" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" @@ -25,6 +25,7 @@ IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test" RESTRICT="!test? ( test )" COMMON_DEPEND=" + dev-libs/json-parser:0= dev-libs/libxml2 sys-libs/zlib app-crypt/p11-kit @@ -117,6 +118,7 @@ src_configure() { $(use_with smartcard libpcsclite) $(use_with stoken) --with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script" + --without-builtin-json --without-java ) diff --git a/net-vpn/openconnect/openconnect-9.01.ebuild b/net-vpn/openconnect/openconnect-9.01.ebuild index e4aa08f994e4..17a4eb7c23bf 100644 --- a/net-vpn/openconnect/openconnect-9.01.ebuild +++ b/net-vpn/openconnect/openconnect-9.01.ebuild @@ -117,6 +117,7 @@ src_configure() { $(use_with smartcard libpcsclite) $(use_with stoken) --with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script" + --with-builtin-json --without-java ) diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index fe5064908c05..d39bf7565861 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -25,6 +25,7 @@ IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test" RESTRICT="!test? ( test )" COMMON_DEPEND=" + dev-libs/json-parser:0= dev-libs/libxml2 sys-libs/zlib app-crypt/p11-kit @@ -114,6 +115,7 @@ src_configure() { $(use_with smartcard libpcsclite) $(use_with stoken) --with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script" + --without-builtin-json --without-java )
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/files/, net-vpn/openconnect/
commit: 40559d7761064c24a692fbf4ec9fa97f450958b2 Author: Mike Gilbert gentoo org> AuthorDate: Fri Aug 19 19:01:43 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Aug 19 19:12:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40559d77 net-vpn/openconnect: include inttypes.h in jsondump.c Closes: https://bugs.gentoo.org/865797 Signed-off-by: Mike Gilbert gentoo.org> .../files/openconnect-9.01-inttypes.patch | 32 ++ net-vpn/openconnect/openconnect-9.01.ebuild| 3 ++ 2 files changed, 35 insertions(+) diff --git a/net-vpn/openconnect/files/openconnect-9.01-inttypes.patch b/net-vpn/openconnect/files/openconnect-9.01-inttypes.patch new file mode 100644 index ..c9b28913ce9f --- /dev/null +++ b/net-vpn/openconnect/files/openconnect-9.01-inttypes.patch @@ -0,0 +1,32 @@ +From c0775e6cd46fb5df6c6aab52314e3038c44d2152 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Fri, 19 Aug 2022 11:55:42 -0400 +Subject: [PATCH] jsondump.c: include for PRId64 + +Fixes a build failure with gnutls and a json-parser snapshot taken on +2021-12-08. + +Building with openssl or with the bundled copy of json-parser causes +inttypes.h to be included indirectly. + +Bug: https://bugs.gentoo.org/865797 +Signed-off-by: Mike Gilbert +--- + jsondump.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/jsondump.c b/jsondump.c +index a18780b5..2b097e8a 100644 +--- a/jsondump.c b/jsondump.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + /* + * Copyright (C) 2015 Mirko Pasqualetti All rights reserved. +-- +GitLab + diff --git a/net-vpn/openconnect/openconnect-9.01.ebuild b/net-vpn/openconnect/openconnect-9.01.ebuild index 824c77958d4b..e4aa08f994e4 100644 --- a/net-vpn/openconnect/openconnect-9.01.ebuild +++ b/net-vpn/openconnect/openconnect-9.01.ebuild @@ -85,6 +85,9 @@ src_unpack() { } src_prepare() { + local PATCHES=( + "${FILESDIR}/openconnect-9.01-inttypes.patch" + ) default if [[ ${PV} == ]]; then eautoreconf
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/files/, net-vpn/openconnect/
commit: 9ea2b28e1c70517b35d40fc0dd93c410c1c18ff7 Author: Mike Gilbert gentoo org> AuthorDate: Sun Jul 31 17:03:53 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Jul 31 17:03:53 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ea2b28e net-vpn/openconnect: drop 8.20-r1 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/Manifest | 1 - .../openconnect/files/8.20-insecure-crypto.patch | 46 --- net-vpn/openconnect/files/8.20-rsa-securid.patch | 51 --- net-vpn/openconnect/openconnect-8.20-r1.ebuild | 153 - 4 files changed, 251 deletions(-) diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index a7dd1ff6597b..a855a2300764 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1,2 +1 @@ -DIST openconnect-8.20.tar.gz 2651542 BLAKE2B 327b437993ee0d705c0194202f6fd7c2b330e69bfbb916ef004b0662c8b9aebc1252aa3c83bd41b4d1cf85b933878d37b1a7608f076d82b50e325a3efaea2dec SHA512 76f5e49948391397ea1f7d2fca5798731f4278fee74c3da9b0f0daba6c386ce79ec5d87d40b6d3d99bb2528a038b5a2076df4159bb29c52cba62efb2ca52c8ab DIST openconnect-9.01.tar.gz 2718526 BLAKE2B e346b30ed8a299bcdd1fc88868d59b4d501c48bc5c02092e92e7ded0cd36e4de6a5b65aae4f6bf8c9aa60cf70f5466b110b64889df8d286016c9a1b4d9f46ff7 SHA512 b7428847a90f8ca9d1f1f61653c1f2486f0a07989f3b7435b746c5e901998194f4ee2b4f9569a548a23bba368bb1e9f273674c0759aac9df30208d2a6a303c34 diff --git a/net-vpn/openconnect/files/8.20-insecure-crypto.patch b/net-vpn/openconnect/files/8.20-insecure-crypto.patch deleted file mode 100644 index 7644e1a264ba.. --- a/net-vpn/openconnect/files/8.20-insecure-crypto.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e2b38313bbd5050acaac49a75f0a024d05b505e5 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Sun, 10 Apr 2022 12:21:57 -0400 -Subject: [PATCH] openssl: allow ALL ciphers when allow-insecure-crypto is - enabled - -Previously, the cipher list was set to "DEFAULT:+3DES:+RC4". However, -according to ciphers(1), the DEFAULT keyword cannot be combined with -other strings using the + characters. In other words, ":+3DES:+RC4" gets -ignored. - -The user is opting into insecure behavior, so let's keep it simple and -just allow everything. - -This change fixes the obsolete-server-crypto test when openconnect is -built against openssl-1.1.x. - -Signed-off-by: Mike Gilbert - openssl.c | 9 +++-- - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/openssl.c b/openssl.c -index 3205dbd7..2bf594e7 100644 a/openssl.c -+++ b/openssl.c -@@ -1868,13 +1868,10 @@ int openconnect_open_https(struct openconnect_info *vpninfo) - struct oc_text_buf *buf = buf_alloc(); - if (vpninfo->pfs) - buf_append(buf, "HIGH:!aNULL:!eNULL:-RSA"); -+ else if (vpninfo->allow_insecure_crypto) -+ buf_append(buf, "ALL"); - else -- buf_append(buf, "DEFAULT"); -- -- if (vpninfo->allow_insecure_crypto) -- buf_append(buf, ":+3DES:+RC4"); -- else -- buf_append(buf, ":-3DES:-RC4"); -+ buf_append(buf, "DEFAULT:-3DES:-RC4"); - - if (buf_error(buf)) { - vpn_progress(vpninfo, PRG_ERR, --- -2.35.1 - diff --git a/net-vpn/openconnect/files/8.20-rsa-securid.patch b/net-vpn/openconnect/files/8.20-rsa-securid.patch deleted file mode 100644 index 57ab2d740707.. --- a/net-vpn/openconnect/files/8.20-rsa-securid.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 19417131895eb39aabf3641a9e4e0d7082b04f6d Mon Sep 17 00:00:00 2001 -From: Daniel Lenski -Date: Mon, 7 Mar 2022 08:50:13 -0800 -Subject: [PATCH] Bugfix RSA SecurID token decryption and PIN entry forms - -As of -https://gitlab.com/openconnect/openconnect/-/commit/386a6edb6d2d1d2cd3e9c9de8d85dc7bfda60d34, -all auth forms are required to have a non-NULL `auth_id`. - -However, we forget to make stoken.c set the `auth_id` for the forms that it -creates for RSA SecurID token decryption and PIN entry. Let's name these: - - - `_rsa_unlock`, for token decryption. - - `_rsa_pin`, for PIN entry. Also, rename the numeric PIN field to `pin` -rather than `password`; there can't be any existing users relying on -`--form-entry` to set its value, because that wouldn't work without the -`auth_id`. - -Fixes #388. - -Signed-off-by: Daniel Lenski - stoken.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/stoken.c b/stoken.c -index 00a67625..45d849f5 100644 a/stoken.c -+++ b/stoken.c -@@ -100,6 +100,7 @@ static int decrypt_stoken(struct openconnect_info *vpninfo) - - form.opts = opts; - form.message = _("Enter credentials to unlock software
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 49e39da36b7681bca2e0714ce1027b1c13a6cbb2 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 31 11:10:10 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 31 11:10:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49e39da3 net-vpn/openconnect: ppc64 stable wrt bug #862405 Signed-off-by: Agostino Sarubbo gentoo.org> net-vpn/openconnect/openconnect-9.01.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-9.01.ebuild b/net-vpn/openconnect/openconnect-9.01.ebuild index 1703f97fdf1c..824c77958d4b 100644 --- a/net-vpn/openconnect/openconnect-9.01.ebuild +++ b/net-vpn/openconnect/openconnect-9.01.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: ff552c22b94f64437983b6596957612b204ef352 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 31 11:07:52 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 31 11:07:56 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff552c22 net-vpn/openconnect: arm64 stable wrt bug #862405 Signed-off-by: Agostino Sarubbo gentoo.org> net-vpn/openconnect/openconnect-9.01.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-9.01.ebuild b/net-vpn/openconnect/openconnect-9.01.ebuild index 3d44ce98d788..1703f97fdf1c 100644 --- a/net-vpn/openconnect/openconnect-9.01.ebuild +++ b/net-vpn/openconnect/openconnect-9.01.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 7be0f87f0c66216b7574cf93692f9526047b87ab Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Jul 31 11:06:25 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Jul 31 11:06:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7be0f87f net-vpn/openconnect: arm stable wrt bug #862405 Signed-off-by: Agostino Sarubbo gentoo.org> net-vpn/openconnect/openconnect-9.01.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-9.01.ebuild b/net-vpn/openconnect/openconnect-9.01.ebuild index 1f2967acde1c..3d44ce98d788 100644 --- a/net-vpn/openconnect/openconnect-9.01.ebuild +++ b/net-vpn/openconnect/openconnect-9.01.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" + KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 7e6028f94ac9811bd39141d54df92066e756ebf5 Author: Sam James gentoo org> AuthorDate: Sun Jul 31 08:26:15 2022 + Commit: Sam James gentoo org> CommitDate: Sun Jul 31 08:26:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e6028f9 net-vpn/openconnect: Stabilize 9.01 amd64, #862405 Signed-off-by: Sam James gentoo.org> net-vpn/openconnect/openconnect-9.01.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-9.01.ebuild b/net-vpn/openconnect/openconnect-9.01.ebuild index fe5064908c05..fb3abe151d4a 100644 --- a/net-vpn/openconnect/openconnect-9.01.ebuild +++ b/net-vpn/openconnect/openconnect-9.01.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 22f3840df0388c26f8ede2cff543d668eba21fa3 Author: Sam James gentoo org> AuthorDate: Sun Jul 31 08:26:44 2022 + Commit: Sam James gentoo org> CommitDate: Sun Jul 31 08:26:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22f3840d net-vpn/openconnect: Stabilize 9.01 x86, #862405 Signed-off-by: Sam James gentoo.org> net-vpn/openconnect/openconnect-9.01.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-9.01.ebuild b/net-vpn/openconnect/openconnect-9.01.ebuild index fb3abe151d4a..1f2967acde1c 100644 --- a/net-vpn/openconnect/openconnect-9.01.ebuild +++ b/net-vpn/openconnect/openconnect-9.01.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 0c6859b941abfe38303c3a266437b4c20a32b1a1 Author: Oskari Pirhonen gmail com> AuthorDate: Sat Jul 30 03:05:39 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Jul 30 21:51:54 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c6859b9 net-vpn/openconnect: fix HOMEPAGE Closes: https://bugs.gentoo.org/862204 Signed-off-by: Oskari Pirhonen gmail.com> Closes: https://github.com/gentoo/gentoo/pull/26660 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-8.10-r7.ebuild | 2 +- net-vpn/openconnect/openconnect-8.20-r1.ebuild | 2 +- net-vpn/openconnect/openconnect-9.01.ebuild| 2 +- net-vpn/openconnect/openconnect-.ebuild| 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.10-r7.ebuild b/net-vpn/openconnect/openconnect-8.10-r7.ebuild index ea5ef2e651bf..8097c4621a18 100644 --- a/net-vpn/openconnect/openconnect-8.10-r7.ebuild +++ b/net-vpn/openconnect/openconnect-8.10-r7.ebuild @@ -17,7 +17,7 @@ else fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" -HOMEPAGE="http://www.infradead.org/openconnect.html; +HOMEPAGE="https://www.infradead.org/openconnect; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" diff --git a/net-vpn/openconnect/openconnect-8.20-r1.ebuild b/net-vpn/openconnect/openconnect-8.20-r1.ebuild index a693bf619d02..f1d0981a8357 100644 --- a/net-vpn/openconnect/openconnect-8.20-r1.ebuild +++ b/net-vpn/openconnect/openconnect-8.20-r1.ebuild @@ -17,7 +17,7 @@ else fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" -HOMEPAGE="http://www.infradead.org/openconnect.html; +HOMEPAGE="https://www.infradead.org/openconnect; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" diff --git a/net-vpn/openconnect/openconnect-9.01.ebuild b/net-vpn/openconnect/openconnect-9.01.ebuild index 7759c17fd9b3..2561ef171f9b 100644 --- a/net-vpn/openconnect/openconnect-9.01.ebuild +++ b/net-vpn/openconnect/openconnect-9.01.ebuild @@ -17,7 +17,7 @@ else fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" -HOMEPAGE="http://www.infradead.org/openconnect.html; +HOMEPAGE="https://www.infradead.org/openconnect; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index 7759c17fd9b3..2561ef171f9b 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -17,7 +17,7 @@ else fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" -HOMEPAGE="http://www.infradead.org/openconnect.html; +HOMEPAGE="https://www.infradead.org/openconnect; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 9b646b2d61e852ffc96ab36e28ae0ab5e7a75ae1 Author: Mike Gilbert gentoo org> AuthorDate: Sat Jul 30 21:53:02 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Jul 30 21:53:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b646b2d net-vpn/openconnect: add trailing slash to HOMEPAGE Avoids a 301 redirect. Bug: https://bugs.gentoo.org/862204 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-8.10-r7.ebuild | 2 +- net-vpn/openconnect/openconnect-8.20-r1.ebuild | 2 +- net-vpn/openconnect/openconnect-9.01.ebuild| 2 +- net-vpn/openconnect/openconnect-.ebuild| 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.10-r7.ebuild b/net-vpn/openconnect/openconnect-8.10-r7.ebuild index 8097c4621a18..e2eef2be77eb 100644 --- a/net-vpn/openconnect/openconnect-8.10-r7.ebuild +++ b/net-vpn/openconnect/openconnect-8.10-r7.ebuild @@ -17,7 +17,7 @@ else fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" -HOMEPAGE="https://www.infradead.org/openconnect; +HOMEPAGE="https://www.infradead.org/openconnect/; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" diff --git a/net-vpn/openconnect/openconnect-8.20-r1.ebuild b/net-vpn/openconnect/openconnect-8.20-r1.ebuild index f1d0981a8357..c9b970792d0e 100644 --- a/net-vpn/openconnect/openconnect-8.20-r1.ebuild +++ b/net-vpn/openconnect/openconnect-8.20-r1.ebuild @@ -17,7 +17,7 @@ else fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" -HOMEPAGE="https://www.infradead.org/openconnect; +HOMEPAGE="https://www.infradead.org/openconnect/; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" diff --git a/net-vpn/openconnect/openconnect-9.01.ebuild b/net-vpn/openconnect/openconnect-9.01.ebuild index 2561ef171f9b..fe5064908c05 100644 --- a/net-vpn/openconnect/openconnect-9.01.ebuild +++ b/net-vpn/openconnect/openconnect-9.01.ebuild @@ -17,7 +17,7 @@ else fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" -HOMEPAGE="https://www.infradead.org/openconnect; +HOMEPAGE="https://www.infradead.org/openconnect/; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index 2561ef171f9b..fe5064908c05 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -17,7 +17,7 @@ else fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" -HOMEPAGE="https://www.infradead.org/openconnect; +HOMEPAGE="https://www.infradead.org/openconnect/; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 7a9732251178ccaf499559bb3386a4eb992a5ea1 Author: Mike Gilbert gentoo org> AuthorDate: Sat Jul 30 21:54:35 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Jul 30 21:54:35 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a973225 net-vpn/openconnect: drop 8.10-r7 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/Manifest | 1 - net-vpn/openconnect/openconnect-8.10-r7.ebuild | 146 - 2 files changed, 147 deletions(-) diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index 4c852ec69782..a7dd1ff6597b 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1,3 +1,2 @@ -DIST openconnect-8.10.tar.gz 2084534 BLAKE2B 98ad0e24e09bc565f359139540f60eb9b6b5ed2239a9c46c56889b8554fc3de3605c10f1bb4fa0b0b206ba35404ae90a389ab8dcee54cf05a24d984529d24c2a SHA512 a36a106cf5c637602fc5bd3cd12df8f6dfe55217c1aae93c66ca33208507f3f8cda15e3a46d75615c7fcea1859d1a04017a07674ad0246876154467305477356 DIST openconnect-8.20.tar.gz 2651542 BLAKE2B 327b437993ee0d705c0194202f6fd7c2b330e69bfbb916ef004b0662c8b9aebc1252aa3c83bd41b4d1cf85b933878d37b1a7608f076d82b50e325a3efaea2dec SHA512 76f5e49948391397ea1f7d2fca5798731f4278fee74c3da9b0f0daba6c386ce79ec5d87d40b6d3d99bb2528a038b5a2076df4159bb29c52cba62efb2ca52c8ab DIST openconnect-9.01.tar.gz 2718526 BLAKE2B e346b30ed8a299bcdd1fc88868d59b4d501c48bc5c02092e92e7ded0cd36e4de6a5b65aae4f6bf8c9aa60cf70f5466b110b64889df8d286016c9a1b4d9f46ff7 SHA512 b7428847a90f8ca9d1f1f61653c1f2486f0a07989f3b7435b746c5e901998194f4ee2b4f9569a548a23bba368bb1e9f273674c0759aac9df30208d2a6a303c34 diff --git a/net-vpn/openconnect/openconnect-8.10-r7.ebuild b/net-vpn/openconnect/openconnect-8.10-r7.ebuild deleted file mode 100644 index e2eef2be77eb.. --- a/net-vpn/openconnect/openconnect-8.10-r7.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 2011-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml" - -inherit linux-info python-any-r1 - -if [[ ${PV} == ]]; then - EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; - inherit git-r3 autotools -else - SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" -fi - -DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" -HOMEPAGE="https://www.infradead.org/openconnect/; - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/libxml2 - sys-libs/zlib - app-crypt/p11-kit - !gnutls? ( - >=dev-libs/openssl-1.0.1h:0= - dev-libs/libp11 - ) - gnutls? ( - app-crypt/trousers - app-misc/ca-certificates - dev-libs/nettle - >=net-libs/gnutls-3.6.13:0= - dev-libs/libtasn1:0= - app-crypt/tpm2-tss:= - ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - lz4? ( app-arch/lz4:= ) - nls? ( virtual/libintl ) - pskc? ( sys-auth/oath-toolkit[pskc] ) - smartcard? ( sys-apps/pcsc-lite:0= ) - stoken? ( app-crypt/stoken ) -" -RDEPEND="${DEPEND} - sys-apps/iproute2 - >=net-vpn/vpnc-scripts-20210402-r1 - selinux? ( sec-policy/selinux-vpn ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( ${PYTHON_DEPS} sys-apps/groff ) - nls? ( sys-devel/gettext ) - test? ( - net-libs/socket_wrapper - net-vpn/ocserv - sys-libs/uid_wrapper - ) -" - -CONFIG_CHECK="~TUN" - -pkg_pretend() { - check_extra_config -} - -pkg_setup() { - : -} - -src_unpack() { - if [[ ${PV} == ]]; then - git-r3_src_unpack - fi - default -} - -src_prepare() { - default - if [[ ${PV} == ]]; then - eautoreconf - fi -} - -src_configure() { - if use doc; then - python_setup - else - export ac_cv_path_PYTHON= - fi - - # Used by tests if userpriv is disabled - addwrite /run/netns - - local myconf=( - --disable-dsa-tests - $(use_enable nls) - --disable-static - $(use_with !gnutls openssl) - $(use_with gnutls) - $(use_with libproxy) - $(use_with lz4) - $(use_with gssapi) - $(use_with pskc libpskc) - $(use_with smartcard libpcsclite) - $(use_with stoken) - --with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script" - --without-java - ) - - econf "${myconf[@]}" -} - -src_test() { - local charset - for charset in UTF-8 ISO8859-2; do -
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: c30930cddba3bbdf9beb08f6109204ca66b786b6 Author: Agostino Sarubbo gentoo org> AuthorDate: Thu May 19 07:49:17 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu May 19 07:49:17 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c30930cd net-vpn/openconnect: arm64 stable wrt bug #844061 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="arm64" Signed-off-by: Agostino Sarubbo gentoo.org> net-vpn/openconnect/openconnect-8.20-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.20-r1.ebuild b/net-vpn/openconnect/openconnect-8.20-r1.ebuild index 44edabdd3793..a693bf619d02 100644 --- a/net-vpn/openconnect/openconnect-8.20-r1.ebuild +++ b/net-vpn/openconnect/openconnect-8.20-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 arm ~arm64 ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: a5e2cdbe8ddccd4731b2ad3684177c2f8052efd7 Author: Jakov Smolić gentoo org> AuthorDate: Sun May 15 09:05:17 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Sun May 15 09:05:17 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5e2cdbe net-vpn/openconnect: Stabilize 8.20-r1 arm, #844061 Signed-off-by: Jakov Smolić gentoo.org> net-vpn/openconnect/openconnect-8.20-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.20-r1.ebuild b/net-vpn/openconnect/openconnect-8.20-r1.ebuild index e2b69ce1bfab..44edabdd3793 100644 --- a/net-vpn/openconnect/openconnect-8.20-r1.ebuild +++ b/net-vpn/openconnect/openconnect-8.20-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86" + KEYWORDS="amd64 arm ~arm64 ppc64 ~riscv x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: c0989c87780e55cb090c535e9d8ed30dbdf6895f Author: Jakov Smolić gentoo org> AuthorDate: Fri May 13 21:06:24 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Fri May 13 21:06:24 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0989c87 net-vpn/openconnect: Stabilize 8.20-r1 ppc64, #844061 Signed-off-by: Jakov Smolić gentoo.org> net-vpn/openconnect/openconnect-8.20-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.20-r1.ebuild b/net-vpn/openconnect/openconnect-8.20-r1.ebuild index 3666126bebb3..e2b69ce1bfab 100644 --- a/net-vpn/openconnect/openconnect-8.20-r1.ebuild +++ b/net-vpn/openconnect/openconnect-8.20-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" + KEYWORDS="amd64 ~arm ~arm64 ppc64 ~riscv x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 2182444c1b1deda9dbe649f4b705c9ee41e7afb8 Author: Jakov Smolić gentoo org> AuthorDate: Fri May 13 20:09:18 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Fri May 13 20:09:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2182444c net-vpn/openconnect: Stabilize 8.20-r1 x86, #844061 Signed-off-by: Jakov Smolić gentoo.org> net-vpn/openconnect/openconnect-8.20-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.20-r1.ebuild b/net-vpn/openconnect/openconnect-8.20-r1.ebuild index 7384e1361d41..3666126bebb3 100644 --- a/net-vpn/openconnect/openconnect-8.20-r1.ebuild +++ b/net-vpn/openconnect/openconnect-8.20-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: f01c892bf2796cb2234cbb48ab7b58bcafd1024d Author: Jakov Smolić gentoo org> AuthorDate: Fri May 13 20:09:05 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Fri May 13 20:09:05 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f01c892b net-vpn/openconnect: Stabilize 8.20-r1 amd64, #844061 Signed-off-by: Jakov Smolić gentoo.org> net-vpn/openconnect/openconnect-8.20-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.20-r1.ebuild b/net-vpn/openconnect/openconnect-8.20-r1.ebuild index 096bd89965dd..7384e1361d41 100644 --- a/net-vpn/openconnect/openconnect-8.20-r1.ebuild +++ b/net-vpn/openconnect/openconnect-8.20-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: b1960491b6e50ce4e51a51640a70486f81486733 Author: Henning Schild hennsch de> AuthorDate: Thu May 5 09:26:58 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Thu May 5 15:09:50 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1960491 net-vpn/openconnect: add 9.01 Closes: https://github.com/gentoo/gentoo/pull/25332 Signed-off-by: Henning Schild hennsch.de> Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/Manifest| 1 + net-vpn/openconnect/openconnect-9.01.ebuild | 149 2 files changed, 150 insertions(+) diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index d98ead0c1db1..4c852ec69782 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1,2 +1,3 @@ DIST openconnect-8.10.tar.gz 2084534 BLAKE2B 98ad0e24e09bc565f359139540f60eb9b6b5ed2239a9c46c56889b8554fc3de3605c10f1bb4fa0b0b206ba35404ae90a389ab8dcee54cf05a24d984529d24c2a SHA512 a36a106cf5c637602fc5bd3cd12df8f6dfe55217c1aae93c66ca33208507f3f8cda15e3a46d75615c7fcea1859d1a04017a07674ad0246876154467305477356 DIST openconnect-8.20.tar.gz 2651542 BLAKE2B 327b437993ee0d705c0194202f6fd7c2b330e69bfbb916ef004b0662c8b9aebc1252aa3c83bd41b4d1cf85b933878d37b1a7608f076d82b50e325a3efaea2dec SHA512 76f5e49948391397ea1f7d2fca5798731f4278fee74c3da9b0f0daba6c386ce79ec5d87d40b6d3d99bb2528a038b5a2076df4159bb29c52cba62efb2ca52c8ab +DIST openconnect-9.01.tar.gz 2718526 BLAKE2B e346b30ed8a299bcdd1fc88868d59b4d501c48bc5c02092e92e7ded0cd36e4de6a5b65aae4f6bf8c9aa60cf70f5466b110b64889df8d286016c9a1b4d9f46ff7 SHA512 b7428847a90f8ca9d1f1f61653c1f2486f0a07989f3b7435b746c5e901998194f4ee2b4f9569a548a23bba368bb1e9f273674c0759aac9df30208d2a6a303c34 diff --git a/net-vpn/openconnect/openconnect-9.01.ebuild b/net-vpn/openconnect/openconnect-9.01.ebuild new file mode 100644 index ..7759c17fd9b3 --- /dev/null +++ b/net-vpn/openconnect/openconnect-9.01.ebuild @@ -0,0 +1,149 @@ +# Copyright 2011-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="xml" + +inherit linux-info python-any-r1 + +if [[ ${PV} == ]]; then + EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; + inherit git-r3 autotools +else + SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" +HOMEPAGE="http://www.infradead.org/openconnect.html; + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0/5" +IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + dev-libs/libxml2 + sys-libs/zlib + app-crypt/p11-kit + !gnutls? ( + >=dev-libs/openssl-1.0.1h:0= + dev-libs/libp11 + ) + gnutls? ( + app-crypt/trousers + app-misc/ca-certificates + dev-libs/nettle + >=net-libs/gnutls-3.6.13:0= + dev-libs/libtasn1:0= + app-crypt/tpm2-tss:= + ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + lz4? ( app-arch/lz4:= ) + nls? ( virtual/libintl ) + pskc? ( sys-auth/oath-toolkit[pskc] ) + smartcard? ( sys-apps/pcsc-lite:0= ) + stoken? ( app-crypt/stoken ) +" +DEPEND="${COMMON_DEPEND} + test? ( + net-libs/socket_wrapper + sys-libs/uid_wrapper + !gnutls? ( dev-libs/openssl:0[weak-ssl-ciphers(-)] ) + ) +" +RDEPEND="${COMMON_DEPEND} + sys-apps/iproute2 + >=net-vpn/vpnc-scripts-20210402-r1 + selinux? ( sec-policy/selinux-vpn ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( ${PYTHON_DEPS} sys-apps/groff ) + nls? ( sys-devel/gettext ) + test? ( net-vpn/ocserv ) +" + +CONFIG_CHECK="~TUN" + +pkg_pretend() { + check_extra_config +} + +pkg_setup() { + : +} + +src_unpack() { + if [[ ${PV} == ]]; then + git-r3_src_unpack + fi + default +} + +src_prepare() { + default + if [[ ${PV} == ]]; then + eautoreconf + fi +} + +src_configure() { + if use doc; then + python_setup + else + export ac_cv_path_PYTHON= + fi + + # Used by tests if userpriv is disabled + addwrite /run/netns + + local myconf=( + --disable-dsa-tests + $(use_enable nls) + --disable-static + $(use_with !gnutls openssl) + $(use_with gnutls) + $(use_with libproxy) + $(use_with lz4) + $(use_with gssapi) + $(use_with pskc libpskc) + $(use_with smartcard libpcsclite) + $(use_with stoken) +
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 880ccdfab73bd23fd14c6c25a65d757b523f9066 Author: Mike Gilbert gentoo org> AuthorDate: Sat Apr 23 23:30:32 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Apr 23 23:30:32 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=880ccdfa net-vpn/openconnect: sync 8.10-r7 from 8.10-r6 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-8.10-r6.ebuild | 146 - net-vpn/openconnect/openconnect-8.10-r7.ebuild | 5 +- 2 files changed, 3 insertions(+), 148 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.10-r6.ebuild b/net-vpn/openconnect/openconnect-8.10-r6.ebuild deleted file mode 100644 index 1251db14a690.. --- a/net-vpn/openconnect/openconnect-8.10-r6.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 2011-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml" - -inherit linux-info python-any-r1 - -if [[ ${PV} == ]]; then - EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; - inherit git-r3 autotools -else - SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" -fi - -DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" -HOMEPAGE="http://www.infradead.org/openconnect.html; - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/libxml2 - sys-libs/zlib - app-crypt/p11-kit - !gnutls? ( - >=dev-libs/openssl-1.0.1h:0= - dev-libs/libp11 - ) - gnutls? ( - app-crypt/trousers - app-misc/ca-certificates - dev-libs/nettle - >=net-libs/gnutls-3.6.13:0= - dev-libs/libtasn1:0= - app-crypt/tpm2-tss - ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - lz4? ( app-arch/lz4:= ) - nls? ( virtual/libintl ) - pskc? ( sys-auth/oath-toolkit[pskc] ) - smartcard? ( sys-apps/pcsc-lite:0= ) - stoken? ( app-crypt/stoken ) -" -RDEPEND="${DEPEND} - sys-apps/iproute2 - >=net-vpn/vpnc-scripts-20210402-r1 - selinux? ( sec-policy/selinux-vpn ) -" -BDEPEND=" - virtual/pkgconfig - doc? ( ${PYTHON_DEPS} sys-apps/groff ) - nls? ( sys-devel/gettext ) - test? ( - net-libs/socket_wrapper - net-vpn/ocserv - sys-libs/uid_wrapper - ) -" - -CONFIG_CHECK="~TUN" - -pkg_pretend() { - check_extra_config -} - -pkg_setup() { - : -} - -src_unpack() { - if [[ ${PV} == ]]; then - git-r3_src_unpack - fi - default -} - -src_prepare() { - default - if [[ ${PV} == ]]; then - eautoreconf - fi -} - -src_configure() { - if use doc; then - python_setup - else - export ac_cv_path_PYTHON= - fi - - # Used by tests if userpriv is disabled - addwrite /run/netns - - local myconf=( - --disable-dsa-tests - $(use_enable nls) - --disable-static - $(use_with !gnutls openssl) - $(use_with gnutls) - $(use_with libproxy) - $(use_with lz4) - $(use_with gssapi) - $(use_with pskc libpskc) - $(use_with smartcard libpcsclite) - $(use_with stoken) - --with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script" - --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 - find "${ED}" -name '*.la' -delete || die - - dodoc "${FILESDIR}"/README.OpenRC - - newconfd "${FILESDIR}"/openconnect.confd openconnect - newinitd "${FILESDIR}"/openconnect.initd openconnect - - insinto /etc/logrotate.d - newins "${FILESDIR}"/openconnect.logrotate openconnect - - keepdir /var/log/openconnect -} diff --git a/net-vpn/openconnect/openconnect-8.10-r7.ebuild b/net-vpn/openconnect/openconnect-8.10-r7.ebuild index b5566891c6e1..ea5ef2e651bf 100644 --- a/net-vpn/openconnect/openconnect-8.10-r7.ebuild +++ b/net-vpn/openconnect/openconnect-8.10-r7.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]];
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 4b6a2d4f4e301f38fec63aca7b73d730d6a17a55 Author: Christopher Byrne gmail com> AuthorDate: Sat Apr 23 19:34:21 2022 + Commit: Sam James gentoo org> CommitDate: Sat Apr 23 21:33:59 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b6a2d4f net-vpn/openconnect: Add sublot operator to app-crypt/tpm2-tss dep Signed-off-by: Christopher Byrne gmail.com> Signed-off-by: Sam James gentoo.org> ...nect-.ebuild => openconnect-8.10-r7.ebuild} | 26 +- ...nect-8.20.ebuild => openconnect-8.20-r1.ebuild} | 2 +- net-vpn/openconnect/openconnect-.ebuild| 2 +- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-8.10-r7.ebuild similarity index 89% copy from net-vpn/openconnect/openconnect-.ebuild copy to net-vpn/openconnect/openconnect-8.10-r7.ebuild index 90982f02608c..b5566891c6e1 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-8.10-r7.ebuild @@ -1,7 +1,7 @@ # Copyright 2011-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=8 +EAPI=7 PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml" @@ -21,10 +21,10 @@ HOMEPAGE="http://www.infradead.org/openconnect.html; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test" +IUSE="doc +gnutls gssapi libproxy lz4 nls pskc smartcard stoken test" RESTRICT="!test? ( test )" -COMMON_DEPEND=" +DEPEND=" dev-libs/libxml2 sys-libs/zlib app-crypt/p11-kit @@ -38,7 +38,7 @@ COMMON_DEPEND=" dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= - app-crypt/tpm2-tss + app-crypt/tpm2-tss:= ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) @@ -48,23 +48,19 @@ COMMON_DEPEND=" smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) " -DEPEND="${COMMON_DEPEND} - test? ( - net-libs/socket_wrapper - sys-libs/uid_wrapper - !gnutls? ( dev-libs/openssl:0[weak-ssl-ciphers(-)] ) - ) -" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} sys-apps/iproute2 >=net-vpn/vpnc-scripts-20210402-r1 - selinux? ( sec-policy/selinux-vpn ) " BDEPEND=" virtual/pkgconfig doc? ( ${PYTHON_DEPS} sys-apps/groff ) nls? ( sys-devel/gettext ) - test? ( net-vpn/ocserv ) + test? ( + net-libs/socket_wrapper + net-vpn/ocserv + sys-libs/uid_wrapper + ) " CONFIG_CHECK="~TUN" @@ -122,7 +118,7 @@ src_configure() { src_test() { local charset - for charset in UTF-8 ISO-8859-2; do + 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. diff --git a/net-vpn/openconnect/openconnect-8.20.ebuild b/net-vpn/openconnect/openconnect-8.20-r1.ebuild similarity index 99% rename from net-vpn/openconnect/openconnect-8.20.ebuild rename to net-vpn/openconnect/openconnect-8.20-r1.ebuild index 005edaf647c5..096bd89965dd 100644 --- a/net-vpn/openconnect/openconnect-8.20.ebuild +++ b/net-vpn/openconnect/openconnect-8.20-r1.ebuild @@ -38,7 +38,7 @@ COMMON_DEPEND=" dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= - app-crypt/tpm2-tss + app-crypt/tpm2-tss:= ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index 90982f02608c..7759c17fd9b3 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -38,7 +38,7 @@ COMMON_DEPEND=" dev-libs/nettle >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= - app-crypt/tpm2-tss + app-crypt/tpm2-tss:= ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy )
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 9f2dd4cbd17dd7b0b35a119713706645b25d7752 Author: Mike Gilbert gentoo org> AuthorDate: Mon Apr 11 12:31:15 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Mon Apr 11 12:31:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f2dd4cb net-vpn/openconnect: fix test deps Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-8.20.ebuild | 21 ++--- net-vpn/openconnect/openconnect-.ebuild | 21 ++--- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.20.ebuild b/net-vpn/openconnect/openconnect-8.20.ebuild index ba5c1e11f3b9..005edaf647c5 100644 --- a/net-vpn/openconnect/openconnect-8.20.ebuild +++ b/net-vpn/openconnect/openconnect-8.20.ebuild @@ -24,17 +24,13 @@ SLOT="0/5" IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test" RESTRICT="!test? ( test )" -DEPEND=" +COMMON_DEPEND=" dev-libs/libxml2 sys-libs/zlib app-crypt/p11-kit !gnutls? ( >=dev-libs/openssl-1.0.1h:0= dev-libs/libp11 - test? ( || ( - >=dev-libs/openssl-1.1.0:0[weak-ssl-ciphers(-)] - =dev-libs/openssl-1.0.1h:0= dev-libs/libp11 - test? ( || ( - >=dev-libs/openssl-1.1.0:0[weak-ssl-ciphers(-)] -
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/files/, net-vpn/openconnect/
commit: cb84d12940f854ce1704fa1afacc92422810b7b5 Author: Mike Gilbert gentoo org> AuthorDate: Mon Apr 11 00:58:05 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Mon Apr 11 00:58:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb84d129 net-vpn/openconnect: add 8.20 Closes: https://bugs.gentoo.org/837638 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/Manifest | 1 + .../openconnect/files/8.20-insecure-crypto.patch | 46 ++ net-vpn/openconnect/files/8.20-rsa-securid.patch | 51 +++ net-vpn/openconnect/openconnect-8.20.ebuild| 154 + 4 files changed, 252 insertions(+) diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index 3938384a6964..d98ead0c1db1 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1 +1,2 @@ DIST openconnect-8.10.tar.gz 2084534 BLAKE2B 98ad0e24e09bc565f359139540f60eb9b6b5ed2239a9c46c56889b8554fc3de3605c10f1bb4fa0b0b206ba35404ae90a389ab8dcee54cf05a24d984529d24c2a SHA512 a36a106cf5c637602fc5bd3cd12df8f6dfe55217c1aae93c66ca33208507f3f8cda15e3a46d75615c7fcea1859d1a04017a07674ad0246876154467305477356 +DIST openconnect-8.20.tar.gz 2651542 BLAKE2B 327b437993ee0d705c0194202f6fd7c2b330e69bfbb916ef004b0662c8b9aebc1252aa3c83bd41b4d1cf85b933878d37b1a7608f076d82b50e325a3efaea2dec SHA512 76f5e49948391397ea1f7d2fca5798731f4278fee74c3da9b0f0daba6c386ce79ec5d87d40b6d3d99bb2528a038b5a2076df4159bb29c52cba62efb2ca52c8ab diff --git a/net-vpn/openconnect/files/8.20-insecure-crypto.patch b/net-vpn/openconnect/files/8.20-insecure-crypto.patch new file mode 100644 index ..7644e1a264ba --- /dev/null +++ b/net-vpn/openconnect/files/8.20-insecure-crypto.patch @@ -0,0 +1,46 @@ +From e2b38313bbd5050acaac49a75f0a024d05b505e5 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sun, 10 Apr 2022 12:21:57 -0400 +Subject: [PATCH] openssl: allow ALL ciphers when allow-insecure-crypto is + enabled + +Previously, the cipher list was set to "DEFAULT:+3DES:+RC4". However, +according to ciphers(1), the DEFAULT keyword cannot be combined with +other strings using the + characters. In other words, ":+3DES:+RC4" gets +ignored. + +The user is opting into insecure behavior, so let's keep it simple and +just allow everything. + +This change fixes the obsolete-server-crypto test when openconnect is +built against openssl-1.1.x. + +Signed-off-by: Mike Gilbert +--- + openssl.c | 9 +++-- + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/openssl.c b/openssl.c +index 3205dbd7..2bf594e7 100644 +--- a/openssl.c b/openssl.c +@@ -1868,13 +1868,10 @@ int openconnect_open_https(struct openconnect_info *vpninfo) + struct oc_text_buf *buf = buf_alloc(); + if (vpninfo->pfs) + buf_append(buf, "HIGH:!aNULL:!eNULL:-RSA"); ++ else if (vpninfo->allow_insecure_crypto) ++ buf_append(buf, "ALL"); + else +- buf_append(buf, "DEFAULT"); +- +- if (vpninfo->allow_insecure_crypto) +- buf_append(buf, ":+3DES:+RC4"); +- else +- buf_append(buf, ":-3DES:-RC4"); ++ buf_append(buf, "DEFAULT:-3DES:-RC4"); + + if (buf_error(buf)) { + vpn_progress(vpninfo, PRG_ERR, +-- +2.35.1 + diff --git a/net-vpn/openconnect/files/8.20-rsa-securid.patch b/net-vpn/openconnect/files/8.20-rsa-securid.patch new file mode 100644 index ..57ab2d740707 --- /dev/null +++ b/net-vpn/openconnect/files/8.20-rsa-securid.patch @@ -0,0 +1,51 @@ +From 19417131895eb39aabf3641a9e4e0d7082b04f6d Mon Sep 17 00:00:00 2001 +From: Daniel Lenski +Date: Mon, 7 Mar 2022 08:50:13 -0800 +Subject: [PATCH] Bugfix RSA SecurID token decryption and PIN entry forms + +As of +https://gitlab.com/openconnect/openconnect/-/commit/386a6edb6d2d1d2cd3e9c9de8d85dc7bfda60d34, +all auth forms are required to have a non-NULL `auth_id`. + +However, we forget to make stoken.c set the `auth_id` for the forms that it +creates for RSA SecurID token decryption and PIN entry. Let's name these: + + - `_rsa_unlock`, for token decryption. + - `_rsa_pin`, for PIN entry. Also, rename the numeric PIN field to `pin` +rather than `password`; there can't be any existing users relying on +`--form-entry` to set its value, because that wouldn't work without the +`auth_id`. + +Fixes #388. + +Signed-off-by: Daniel Lenski +--- + stoken.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/stoken.c b/stoken.c +index 00a67625..45d849f5 100644 +--- a/stoken.c b/stoken.c +@@ -100,6 +100,7 @@ static int decrypt_stoken(struct openconnect_info *vpninfo) + + form.opts = opts; + form.message = _("Enter
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: a5e2d8dd64d3b9b2259501308132aacf8deb06e7 Author: Mike Gilbert gentoo org> AuthorDate: Mon Apr 11 00:50:17 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Mon Apr 11 00:50:17 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5e2d8dd net-vpn/openconnect: update openssl test deps Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-.ebuild | 4 1 file changed, 4 insertions(+) diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index bb793b112140..95f5dc14d1e6 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -31,6 +31,10 @@ DEPEND=" !gnutls? ( >=dev-libs/openssl-1.0.1h:0= dev-libs/libp11 + test? ( || ( + >=dev-libs/openssl-1.1.0:0[weak-ssl-ciphers(-)] +
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 1e7491818a067c35dc9e82b05996f1cb59cf75f1 Author: Mike Gilbert gentoo org> AuthorDate: Sun Apr 10 15:29:03 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Mon Apr 11 00:45:01 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e749181 net-vpn/openconnect: fix test-nonascii Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index d50b4b0ccd4b..bb793b112140 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -119,7 +119,7 @@ src_configure() { src_test() { local charset - for charset in UTF-8 ISO8859-2; do + for charset in UTF-8 ISO-8859-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.
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: f4c1cdd8b95d87226badd8670dd4f46ca4c6e4e3 Author: Mike Gilbert gentoo org> AuthorDate: Sun Apr 10 15:08:21 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Mon Apr 11 00:45:01 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4c1cdd8 net-vpn/openconnect: update EAPI 7 -> 8 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index e3936252095a..d50b4b0ccd4b 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -1,7 +1,7 @@ # Copyright 2011-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 0b606bfd94a06d058d9292980ad23169c537670e Author: Jason Zaman gentoo org> AuthorDate: Sat Apr 9 21:58:39 2022 + Commit: Jason Zaman gentoo org> CommitDate: Sat Apr 9 22:03:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b606bfd net-vpn/openconnect: Add selinux-vpn policy dep Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Jason Zaman gentoo.org> net-vpn/openconnect/openconnect-8.10-r6.ebuild | 5 +++-- net-vpn/openconnect/openconnect-.ebuild| 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.10-r6.ebuild b/net-vpn/openconnect/openconnect-8.10-r6.ebuild index da0988a8a8fc..1251db14a690 100644 --- a/net-vpn/openconnect/openconnect-8.10-r6.ebuild +++ b/net-vpn/openconnect/openconnect-8.10-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 2011-2021 Gentoo Authors +# Copyright 2011-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ HOMEPAGE="http://www.infradead.org/openconnect.html; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls pskc smartcard stoken test" +IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test" RESTRICT="!test? ( test )" DEPEND=" @@ -51,6 +51,7 @@ DEPEND=" RDEPEND="${DEPEND} sys-apps/iproute2 >=net-vpn/vpnc-scripts-20210402-r1 + selinux? ( sec-policy/selinux-vpn ) " BDEPEND=" virtual/pkgconfig diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index 5a6a3065e1dc..e3936252095a 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -1,4 +1,4 @@ -# Copyright 2011-2021 Gentoo Authors +# Copyright 2011-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ HOMEPAGE="http://www.infradead.org/openconnect.html; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls pskc smartcard stoken test" +IUSE="doc +gnutls gssapi libproxy lz4 nls pskc selinux smartcard stoken test" RESTRICT="!test? ( test )" DEPEND=" @@ -51,6 +51,7 @@ DEPEND=" RDEPEND="${DEPEND} sys-apps/iproute2 >=net-vpn/vpnc-scripts-20210402-r1 + selinux? ( sec-policy/selinux-vpn ) " BDEPEND=" virtual/pkgconfig
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: e928dfb16726420de9838fac83fdf93d45270e50 Author: Mike Gilbert gentoo org> AuthorDate: Wed Oct 20 17:44:30 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Wed Oct 20 17:44:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e928dfb1 net-vpn/openconnect: fix automagic deps on p11-kit and libpskc Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/metadata.xml| 1 + .../{openconnect-8.10-r5.ebuild => openconnect-8.10-r6.ebuild} | 6 +- net-vpn/openconnect/openconnect-.ebuild | 6 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/net-vpn/openconnect/metadata.xml b/net-vpn/openconnect/metadata.xml index 41262f103fd..0660a620fe5 100644 --- a/net-vpn/openconnect/metadata.xml +++ b/net-vpn/openconnect/metadata.xml @@ -12,6 +12,7 @@ Build GSSAPI support Enable proxy support + Enable PSKC file storage of HOTP/TOTP keys Enable stoken support diff --git a/net-vpn/openconnect/openconnect-8.10-r5.ebuild b/net-vpn/openconnect/openconnect-8.10-r6.ebuild similarity index 94% rename from net-vpn/openconnect/openconnect-8.10-r5.ebuild rename to net-vpn/openconnect/openconnect-8.10-r6.ebuild index d8210a2b00a..da0988a8a8f 100644 --- a/net-vpn/openconnect/openconnect-8.10-r5.ebuild +++ b/net-vpn/openconnect/openconnect-8.10-r6.ebuild @@ -21,14 +21,16 @@ HOMEPAGE="http://www.infradead.org/openconnect.html; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test" +IUSE="doc +gnutls gssapi libproxy lz4 nls pskc smartcard stoken test" RESTRICT="!test? ( test )" DEPEND=" dev-libs/libxml2 sys-libs/zlib + app-crypt/p11-kit !gnutls? ( >=dev-libs/openssl-1.0.1h:0= + dev-libs/libp11 ) gnutls? ( app-crypt/trousers @@ -42,6 +44,7 @@ DEPEND=" libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) + pskc? ( sys-auth/oath-toolkit[pskc] ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) " @@ -103,6 +106,7 @@ src_configure() { $(use_with libproxy) $(use_with lz4) $(use_with gssapi) + $(use_with pskc libpskc) $(use_with smartcard libpcsclite) $(use_with stoken) --with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script" diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index b2332da693e..5a6a3065e1d 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -21,14 +21,16 @@ HOMEPAGE="http://www.infradead.org/openconnect.html; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test" +IUSE="doc +gnutls gssapi libproxy lz4 nls pskc smartcard stoken test" RESTRICT="!test? ( test )" DEPEND=" dev-libs/libxml2 sys-libs/zlib + app-crypt/p11-kit !gnutls? ( >=dev-libs/openssl-1.0.1h:0= + dev-libs/libp11 ) gnutls? ( app-crypt/trousers @@ -42,6 +44,7 @@ DEPEND=" libproxy? ( net-libs/libproxy ) lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) + pskc? ( sys-auth/oath-toolkit[pskc] ) smartcard? ( sys-apps/pcsc-lite:0= ) stoken? ( app-crypt/stoken ) " @@ -103,6 +106,7 @@ src_configure() { $(use_with libproxy) $(use_with lz4) $(use_with gssapi) + $(use_with pskc libpskc) $(use_with smartcard libpcsclite) $(use_with stoken) --with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/files/, net-vpn/openconnect/
commit: 7f376dc79d0dd572e9771c03558fd631fd86af1e Author: Mike Gilbert gentoo org> AuthorDate: Wed Oct 20 17:27:35 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Wed Oct 20 17:27:35 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f376dc7 net-vpn/openconnect: drop 8.09-r3, 8.10 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/Manifest | 3 - .../files/8.09-gnutls-buffer-overflow.patch| 62 - net-vpn/openconnect/files/README.OpenRC.txt| 25 net-vpn/openconnect/files/openconnect.conf.in | 26 net-vpn/openconnect/files/openconnect.init.in-r4 | 88 net-vpn/openconnect/openconnect-8.09-r3.ebuild | 152 - net-vpn/openconnect/openconnect-8.10.ebuild| 149 7 files changed, 505 deletions(-) diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index 59221ffa774..3938384a696 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1,4 +1 @@ -DIST openconnect-8.09.tar.gz 2083279 BLAKE2B 4588c693a7a641faad271b034e8713f00fda04a872641e45a8ce3e1a236b8d2f4e1b8d973d20e7a9fc656f9460a0e990cbaada008d4ecf9a46353f20c25ac87a SHA512 f6890f5bce4b36b162e4590bce8a61d65fc0ae803d62a3dd408fbb13e96ce41b6443740132808491093032545aea919f9076e34bc11160c503c5e3c46457e7bd DIST openconnect-8.10.tar.gz 2084534 BLAKE2B 98ad0e24e09bc565f359139540f60eb9b6b5ed2239a9c46c56889b8554fc3de3605c10f1bb4fa0b0b206ba35404ae90a389ab8dcee54cf05a24d984529d24c2a SHA512 a36a106cf5c637602fc5bd3cd12df8f6dfe55217c1aae93c66ca33208507f3f8cda15e3a46d75615c7fcea1859d1a04017a07674ad0246876154467305477356 -DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B 8f00ce3dc49725758abce27f3688946df1bbd4e92769ef02aa9ee66db8b9f41bef3442eaa5405ab1467476899c6d364dfea898ed924ca83497823a85515d48e5 SHA512 3a1eac4ccfaefb0f837189c8cef696b33ab8b8a68cb50a3ad29206b708d0aa479e8eed0c09bef6f60d056cd98d63cc898a1609d734030a63df3be2cfa6c00f9a -DIST vpnc-scripts-20200930.tar.gz 22305 BLAKE2B 5db809ef674cb3cb8f1c775adc1e83debbda28fdcf47e0b0527efe6d1cea09781ef02b2827d9704140b884a85e7ec51fba497f47f6793520b471a7bba0dde6b6 SHA512 5f42bc7b168b5fdfc3ebd4bae52a42a654f102982852cc74240972e16e77fe0b54d82175e2a067e1d7e408bd14c3f465f7eb82b23b41885cb25a813d9587fd3d diff --git a/net-vpn/openconnect/files/8.09-gnutls-buffer-overflow.patch b/net-vpn/openconnect/files/8.09-gnutls-buffer-overflow.patch deleted file mode 100644 index bf8990ae3d3..000 --- a/net-vpn/openconnect/files/8.09-gnutls-buffer-overflow.patch +++ /dev/null @@ -1,62 +0,0 @@ -From eef4c1f9d24478aa1d2dd9ac7ec32efb2137f474 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Fri, 8 May 2020 10:39:41 -0400 -Subject: [PATCH] gnutls: prevent buffer overflow in get_cert_name - -The test suite for ocserv calls openconnect with a certificate that has -a name that is 84 bytes in length. The buffer passed to get_cert_name is -currently 80 bytes. - -The gnutls_x509_crt_get_dn_by_oid function will update the buffer size -parameter if the buffer is too small. - -http://man7.org/linux/man-pages/man3/gnutls_x509_crt_get_dn_by_oid.3.html - -RETURNS - GNUTLS_E_SHORT_MEMORY_BUFFER if the provided buffer is not long - enough, and in that case the buf_size will be updated with the - required size. GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE if there are no - data in the current index. On success 0 is returned. - -Use a temporary variable to avoid clobbering the namelen variable that is -passed to get_cert_name. - -Bug: https://bugs.gentoo.org/721570 -Signed-off-by: Sergei Trofimovich -Signed-off-by: Mike Gilbert - gnutls.c | 17 - - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/gnutls.c b/gnutls.c -index 36bc82e0..53bf2a43 100644 a/gnutls.c -+++ b/gnutls.c -@@ -546,12 +546,19 @@ static int count_x509_certificates(gnutls_datum_t *datum) - - static int get_cert_name(gnutls_x509_crt_t cert, char *name, size_t namelen) - { -+ /* When the name buffer is not big enough, gnutls_x509_crt_get_dn*() will -+ * update the length argument to the required size, and return -+ * GNUTLS_E_SHORT_MEMORY_BUFFER. We need to avoid clobbering the original -+ * length variable. */ -+ size_t nl = namelen; - if (gnutls_x509_crt_get_dn_by_oid(cert, GNUTLS_OID_X520_COMMON_NAME, --0, 0, name, ) && -- gnutls_x509_crt_get_dn(cert, name, )) { -- name[namelen-1] = 0; -- snprintf(name, namelen-1, ""); -- return -EINVAL; -+0, 0, name, )) { -+ nl = namelen; -+ if (gnutls_x509_crt_get_dn(cert, name, )) { -+ name[namelen-1] = 0; -+ snprintf(name, namelen-1, ""); -+ return -EINVAL; -+ } - } - return
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 7819d4ce613e872a52113ea4e635daa3299d4136 Author: Sam James gentoo org> AuthorDate: Sat Oct 16 22:03:02 2021 + Commit: Sam James gentoo org> CommitDate: Sat Oct 16 22:03:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7819d4ce net-vpn/openconnect: Stabilize 8.10-r5 ppc64, #818004 Signed-off-by: Sam James gentoo.org> net-vpn/openconnect/openconnect-8.10-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.10-r5.ebuild b/net-vpn/openconnect/openconnect-8.10-r5.ebuild index d49cb7e8c32..d8210a2b00a 100644 --- a/net-vpn/openconnect/openconnect-8.10-r5.ebuild +++ b/net-vpn/openconnect/openconnect-8.10-r5.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 61a331dbbbed525121b2fdaa7e79d66e421c98f9 Author: Sam James gentoo org> AuthorDate: Thu Oct 14 18:32:00 2021 + Commit: Sam James gentoo org> CommitDate: Thu Oct 14 18:32:00 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61a331db net-vpn/openconnect: Stabilize 8.10-r5 arm64, #818004 Signed-off-by: Sam James gentoo.org> net-vpn/openconnect/openconnect-8.10-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.10-r5.ebuild b/net-vpn/openconnect/openconnect-8.10-r5.ebuild index 7ec30890926..d49cb7e8c32 100644 --- a/net-vpn/openconnect/openconnect-8.10-r5.ebuild +++ b/net-vpn/openconnect/openconnect-8.10-r5.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 94676072c4a5cb7195a025dce1f7aad004de8393 Author: Sam James gentoo org> AuthorDate: Thu Oct 14 16:37:06 2021 + Commit: Sam James gentoo org> CommitDate: Thu Oct 14 16:37:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94676072 net-vpn/openconnect: Stabilize 8.10-r5 arm, #818004 Signed-off-by: Sam James gentoo.org> net-vpn/openconnect/openconnect-8.10-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.10-r5.ebuild b/net-vpn/openconnect/openconnect-8.10-r5.ebuild index e2768e511c4..7ec30890926 100644 --- a/net-vpn/openconnect/openconnect-8.10-r5.ebuild +++ b/net-vpn/openconnect/openconnect-8.10-r5.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" + KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 9c61483c6f98fcc4d1c09d92601cbdbf7437f7aa Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Oct 14 05:57:18 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Oct 14 05:57:18 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c61483c net-vpn/openconnect: x86 stable wrt bug #818004 Package-Manager: Portage-3.0.20, Repoman-3.0.3 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> net-vpn/openconnect/openconnect-8.10-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.10-r5.ebuild b/net-vpn/openconnect/openconnect-8.10-r5.ebuild index 4801401cc51..e2768e511c4 100644 --- a/net-vpn/openconnect/openconnect-8.10-r5.ebuild +++ b/net-vpn/openconnect/openconnect-8.10-r5.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 6c49ac6c9db7dbdcd6e3a6453a6abfe6c392d6c5 Author: Sam James gentoo org> AuthorDate: Wed Oct 13 20:33:38 2021 + Commit: Sam James gentoo org> CommitDate: Wed Oct 13 20:33:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c49ac6c net-vpn/openconnect: Stabilize 8.10-r5 amd64, #818004 Signed-off-by: Sam James gentoo.org> net-vpn/openconnect/openconnect-8.10-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.10-r5.ebuild b/net-vpn/openconnect/openconnect-8.10-r5.ebuild index b2332da693e..4801401cc51 100644 --- a/net-vpn/openconnect/openconnect-8.10-r5.ebuild +++ b/net-vpn/openconnect/openconnect-8.10-r5.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" fi DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 6302a48e8ff028e5461cf45a709b4cefa0b8c26c Author: Mike Gilbert gentoo org> AuthorDate: Sun Oct 10 18:42:23 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Sun Oct 10 19:06:05 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6302a48e net-vpn/openconnect: revbump for vpnc-scripts move Signed-off-by: Mike Gilbert gentoo.org> .../{openconnect-8.10-r4.ebuild => openconnect-8.10-r5.ebuild}| 4 ++-- net-vpn/openconnect/openconnect-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.10-r4.ebuild b/net-vpn/openconnect/openconnect-8.10-r5.ebuild similarity index 96% rename from net-vpn/openconnect/openconnect-8.10-r4.ebuild rename to net-vpn/openconnect/openconnect-8.10-r5.ebuild index 13c3da231ba..b2332da693e 100644 --- a/net-vpn/openconnect/openconnect-8.10-r4.ebuild +++ b/net-vpn/openconnect/openconnect-8.10-r5.ebuild @@ -47,7 +47,7 @@ DEPEND=" " RDEPEND="${DEPEND} sys-apps/iproute2 - net-vpn/vpnc-scripts + >=net-vpn/vpnc-scripts-20210402-r1 " BDEPEND=" virtual/pkgconfig @@ -105,7 +105,7 @@ src_configure() { $(use_with gssapi) $(use_with smartcard libpcsclite) $(use_with stoken) - --with-vpnc-script="${EPREFIX}/etc/vpnc-scripts/vpnc-script" + --with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script" --without-java ) diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index 13c3da231ba..b2332da693e 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -47,7 +47,7 @@ DEPEND=" " RDEPEND="${DEPEND} sys-apps/iproute2 - net-vpn/vpnc-scripts + >=net-vpn/vpnc-scripts-20210402-r1 " BDEPEND=" virtual/pkgconfig @@ -105,7 +105,7 @@ src_configure() { $(use_with gssapi) $(use_with smartcard libpcsclite) $(use_with stoken) - --with-vpnc-script="${EPREFIX}/etc/vpnc-scripts/vpnc-script" + --with-vpnc-script="${EPREFIX}/etc/vpnc/vpnc-script" --without-java )
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/, net-vpn/openconnect/files/
commit: d08fe11b2b09f874ea8a2fbd296f69a4ce073702 Author: Mike Gilbert gentoo org> AuthorDate: Sat Oct 2 17:07:50 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Oct 2 17:19:57 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d08fe11b net-vpn/openconnect: rewrite initscript Support for the server_${VPN}, password_${VPN}, and vpnopts_${VPN} variables is dropped. Per-VPN variables are now defined in /etc/conf.d/openconnect.${vpn}. Instead of defining server and vpnopts, the user should set command_args which will be passed to openconnect via the default_start function. Support for 'password' and 'password_file' variables is added. If neither is specified, the password will be prompted for interactively. Support for up/down hooks is dropped. The functionality can be replaced with vpnc-script hooks. Bug: https://bugs.gentoo.org/733614 Bug: https://bugs.gentoo.org/763579 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/files/README.OpenRC| 25 + net-vpn/openconnect/files/openconnect.confd| 6 ++ net-vpn/openconnect/files/openconnect.initd| 107 +++-- ...t-8.10-r3.ebuild => openconnect-8.10-r4.ebuild} | 2 +- net-vpn/openconnect/openconnect-.ebuild| 2 +- 5 files changed, 25 insertions(+), 117 deletions(-) diff --git a/net-vpn/openconnect/files/README.OpenRC b/net-vpn/openconnect/files/README.OpenRC index baa617d94ea..488533e87e3 100644 --- a/net-vpn/openconnect/files/README.OpenRC +++ b/net-vpn/openconnect/files/README.OpenRC @@ -1,30 +1,13 @@ -The service script for openconnect supports multiple vpn tunnels. +The service script for openconnect supports multiple VPN tunnels. -You need to create a symbolic link to /etc/init.d/openconnect in +To enable this, create a symbolic link to /etc/init.d/openconnect in /etc/init.d for each tunnel instead of calling it directly: ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0 -Also, create a configuration file for the tunnel in /etc/openconnect. To -follow this example, the configuration file would be called -/etc/openconnect/vpn0.conf. See man openconnect for the options that can -go in this file. +To define per-VPN settings, copy /etc/conf.d/openconnect to +openconnect.vpn0. You can then start the vpn tunnel like this: rc-service openconnect.vpn0 start - -If you would like to run preup, postup, predown, and/or postdown scripts, -You need to create a directory in /etc/openconnect with the name of the vpn: - -mkdir /etc/openconnect/vpn0 - -Then add executable shell files: - -mkdir /etc/openconnect/vpn0 -cd /etc/openconnect/vpn0 -echo '#!/bin/sh' > preup.sh -cp preup.sh predown.sh -cp preup.sh postup.sh -cp preup.sh postdown.sh -chmod 755 /etc/openconnect/vpn0/* diff --git a/net-vpn/openconnect/files/openconnect.confd b/net-vpn/openconnect/files/openconnect.confd new file mode 100644 index 000..5c00518a693 --- /dev/null +++ b/net-vpn/openconnect/files/openconnect.confd @@ -0,0 +1,6 @@ +# Arguments to pass to openconnect +#command_args="--authgroup AUTHGROUP --user USER SERVERNAME" + +# For non-interactive use, set either password or password_file +#password="PASSWORD" +#password_file="/etc/openconnect/vpn0.password" diff --git a/net-vpn/openconnect/files/openconnect.initd b/net-vpn/openconnect/files/openconnect.initd index 7b33920f498..69ff6ad 100644 --- a/net-vpn/openconnect/files/openconnect.initd +++ b/net-vpn/openconnect/files/openconnect.initd @@ -1,109 +1,28 @@ #!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Authors +# Copyright 2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -VPN="${RC_SVCNAME#*.}" -VPNCONF=/etc/openconnect/${VPN}.conf -VPNDIR="/etc/openconnect/${VPN}" -VPNLOG="/var/log/openconnect/${VPN}" -VPNLOGFILE="${VPNLOG}/openconnect.log" -VPNERRFILE="${VPNLOG}/openconnect.err" - +vpn=${RC_SVCNAME#*.} command="/usr/sbin/openconnect" -name="OpenConnect: ${VPN}" -pidfile="/run/openconnect/${VPN}.pid" +pidfile="/run/openconnect/${vpn}.pid" +command_args="--syslog ${command_args}" +command_args_background="--background --pid-file \"${pidfile}\"" stopsig="SIGINT" -depend() { - before netmount -} - -checkconfig() { - if [ $VPN = "openconnect" ]; then - eerror "You cannot call openconnect directly. You must create a symbolic link to it with the vpn name:" - eerror - eerror "ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0" - eerror - eerror "And then call it instead:" - eerror - eerror "/etc/init.d/openconnect.vpn0 start" - return 1 - fi - return 0 -} - -checktuntap() { - if [ "$RC_UNAME" = "Linux" -a ! -e /dev/net/tun ] ; then - if ! modprobe tun ; then - eerror "TUN/TAP support is not available in this kernel" - return 1 -
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/files/, net-vpn/openconnect/
commit: f8970e67e5f1dc182b59b60690320aab5bff8bfd Author: Mike Gilbert gentoo org> AuthorDate: Sat Oct 2 06:34:23 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Oct 2 06:34:23 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8970e67 net-vpn/openconnect: drop pkg_postinst Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/files/openconnect.initd.8.10 | 105 --- net-vpn/openconnect/openconnect-8.10-r3.ebuild | 10 --- net-vpn/openconnect/openconnect-.ebuild | 10 --- 3 files changed, 125 deletions(-) diff --git a/net-vpn/openconnect/files/openconnect.initd.8.10 b/net-vpn/openconnect/files/openconnect.initd.8.10 deleted file mode 100644 index 020eeb91aa1..000 --- a/net-vpn/openconnect/files/openconnect.initd.8.10 +++ /dev/null @@ -1,105 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -VPN="${RC_SVCNAME#*.}" -VPNCONF=/etc/openconnect/${VPN}.conf -VPNDIR="/etc/openconnect/${VPN}" -VPNLOG="/var/log/openconnect/${VPN}" -VPNLOGFILE="${VPNLOG}/openconnect.log" -VPNERRFILE="${VPNLOG}/openconnect.err" - -command="/usr/sbin/openconnect" -name="OpenConnect: ${VPN}" -pidfile="/run/openconnect/${VPN}.pid" -stopsig="SIGINT" - -depend() { - before netmount -} - -checkconfig() { - if [ $VPN = "openconnect" ]; then - eerror "You cannot call openconnect directly. You must create a symbolic link to it with the vpn name:" - eerror - eerror "ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0" - eerror - eerror "And then call it instead:" - eerror - eerror "/etc/init.d/openconnect.vpn0 start" - return 1 - fi - if [ ! -f "${VPNCONF}" ]; then - ewarn "The configuration file for ${VPN} does not exist." - ewarn "Please create ${VPNCONF}" - ewarn "This will become a fatal error in a future release." - fi - local server vpnopts password - eval server=\$server_${VPN} - eval vpnopts=\$vpnopts_${VPN} - eval password=\$password_${VPN} - if [ -n "$server" ] || [ -n "$vpnopts" ] || [ -n "password" ]; then - ewarn "server_${VPN}, vpnopts${VPN} and password_${VPN} are deprecated" - ewarn"Please move them to the appropriate settings in ${VPNCONF}" - ewarn "They will be ignored in the future." - fi - return 0 -} - -checktuntap() { - if [ "$RC_UNAME" = "Linux" -a ! -e /dev/net/tun ] ; then - if ! modprobe tun ; then - eerror "TUN/TAP support is not available in this kernel" - return 1 - fi - fi -} - -run_hook() { - if [ -x "$1" ]; then - "$@" - fi -} - -start_pre() { - checkconfig || return - checktuntap || return - checkpath -d "${VPNLOG}" || return - checkpath -d /run/openconnect || return - run_hook "${VPNDIR}/preup.sh" -} - -start() { - local server vpnopts password - eval server=\$server_${VPN} - eval vpnopts=\$vpnopts_${VPN} - eval password=\$password_${VPN} - - ebegin "Starting ${name}" - start-stop-daemon --start --exec "${command}" -- \ - --background \ - --config="${VPNCONF:-/dev/null}" \ - --interface="${VPN}" \ - --pid-file="${pidfile}" \ - ${vpnopts} \ - "${server}" \ - >> "${VPNLOGFILE}" \ - 2>> "${VPNERRFILE}" \ - <.conf" - ewarn "For more information see ${EROOT}/usr/share/doc/${PF}/README.OpenRC" - done -} diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index 8b5c8962bee..8e690399601 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -139,13 +139,3 @@ src_install() { keepdir /var/log/openconnect } - -pkg_postinst() { - local v - for v in ${REPLACING_VERSIONS}; do - ver_test $v -ge 8.10-r1 && continue - ewarn "openconnect tunnel-specific configurations stored in ${EROOT}/etc/conf.d" - ewarn "should be migrated to ${EROOT}/etc/openconnect/.conf" - ewarn "For more information see ${EROOT}/usr/share/doc/${PF}/README.OpenRC" - done -}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/files/, net-vpn/openconnect/
commit: e7ea3fbeadbd0524ea7d7498a8eb563b0b780495 Author: Mike Gilbert gentoo org> AuthorDate: Sat Oct 2 05:54:38 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Oct 2 06:00:09 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7ea3fbe net-vpn/openconnect: revise init script Remove warnings about removal of variables. Restore sample conf.d file. Allow for missing config file. Use eval to allow quoted whitespace in vpnopts. Bug: https://bugs.gentoo.org/733614 Closes: https://bugs.gentoo.org/763579 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/files/openconnect.conf.in | 2 +- net-vpn/openconnect/files/openconnect.initd| 109 + ...t-8.10-r2.ebuild => openconnect-8.10-r3.ebuild} | 5 +- net-vpn/openconnect/openconnect-.ebuild| 5 +- 4 files changed, 118 insertions(+), 3 deletions(-) diff --git a/net-vpn/openconnect/files/openconnect.conf.in b/net-vpn/openconnect/files/openconnect.conf.in index 53b14e61378..7e44f569c0c 100644 --- a/net-vpn/openconnect/files/openconnect.conf.in +++ b/net-vpn/openconnect/files/openconnect.conf.in @@ -23,4 +23,4 @@ server_vpn0="vpn.server.tld" password_vpn0="YOUR_PASSWORD" # Any OPENCONNECT options my go here (see openconnect --help) -vpnopts_vpn0="-l --passwd-on-stdin --user=YOUR_USERNAME --script=/etc/openconnect/openconnect.sh" +vpnopts_vpn0="-l --passwd-on-stdin --user=YOUR_USERNAME" diff --git a/net-vpn/openconnect/files/openconnect.initd b/net-vpn/openconnect/files/openconnect.initd new file mode 100644 index 000..7b33920f498 --- /dev/null +++ b/net-vpn/openconnect/files/openconnect.initd @@ -0,0 +1,109 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +VPN="${RC_SVCNAME#*.}" +VPNCONF=/etc/openconnect/${VPN}.conf +VPNDIR="/etc/openconnect/${VPN}" +VPNLOG="/var/log/openconnect/${VPN}" +VPNLOGFILE="${VPNLOG}/openconnect.log" +VPNERRFILE="${VPNLOG}/openconnect.err" + +command="/usr/sbin/openconnect" +name="OpenConnect: ${VPN}" +pidfile="/run/openconnect/${VPN}.pid" +stopsig="SIGINT" + +depend() { + before netmount +} + +checkconfig() { + if [ $VPN = "openconnect" ]; then + eerror "You cannot call openconnect directly. You must create a symbolic link to it with the vpn name:" + eerror + eerror "ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0" + eerror + eerror "And then call it instead:" + eerror + eerror "/etc/init.d/openconnect.vpn0 start" + return 1 + fi + return 0 +} + +checktuntap() { + if [ "$RC_UNAME" = "Linux" -a ! -e /dev/net/tun ] ; then + if ! modprobe tun ; then + eerror "TUN/TAP support is not available in this kernel" + return 1 + fi + fi +} + +run_hook() { + if [ -x "$1" ]; then + "$@" + fi +} + +start_pre() { + checkconfig || return + checktuntap || return + checkpath -d "${VPNLOG}" || return + checkpath -d /run/openconnect || return + run_hook "${VPNDIR}/preup.sh" +} + +ssd_helper() { + if [ -n "${password}" ]; then + start-stop-daemon "$@" <> "${VPNLOGFILE}" \ + 2>> "${VPNERRFILE}" + eend $? +} + +start_post() { + run_hook "${VPNDIR}/postup.sh" +} + +stop_pre() { + checkconfig || return + run_hook "${VPNDIR}/predown.sh" +} + +stop_post() { + run_hook "${VPNDIR}/postdown.sh" +} diff --git a/net-vpn/openconnect/openconnect-8.10-r2.ebuild b/net-vpn/openconnect/openconnect-8.10-r3.ebuild similarity index 96% rename from net-vpn/openconnect/openconnect-8.10-r2.ebuild rename to net-vpn/openconnect/openconnect-8.10-r3.ebuild index ba71fcaef77..8b5c8962bee 100644 --- a/net-vpn/openconnect/openconnect-8.10-r2.ebuild +++ b/net-vpn/openconnect/openconnect-8.10-r3.ebuild @@ -129,8 +129,11 @@ src_install() { default find "${ED}" -name '*.la' -delete || die - newinitd "${FILESDIR}"/openconnect.initd.8.10 openconnect dodoc "${FILESDIR}"/README.OpenRC + + newconfd "${FILESDIR}"/openconnect.conf.in openconnect + newinitd "${FILESDIR}"/openconnect.initd openconnect + insinto /etc/logrotate.d newins "${FILESDIR}"/openconnect.logrotate openconnect diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index ba71fcaef77..8b5c8962bee 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -129,8 +129,11 @@ src_install() { default find "${ED}" -name '*.la' -delete || die - newinitd "${FILESDIR}"/openconnect.initd.8.10 openconnect dodoc "${FILESDIR}"/README.OpenRC + + newconfd "${FILESDIR}"/openconnect.conf.in
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 56eca9dad97c248d645bbea5b8180624898d266c Author: Mike Gilbert gentoo org> AuthorDate: Sat Oct 2 06:00:54 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Oct 2 06:00:54 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56eca9da net-vpn/openconnect: drop 8.09-r1 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-8.09-r1.ebuild | 150 - 1 file changed, 150 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.09-r1.ebuild b/net-vpn/openconnect/openconnect-8.09-r1.ebuild deleted file mode 100644 index fee3227f1fb..000 --- a/net-vpn/openconnect/openconnect-8.09-r1.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 2011-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_7,3_8,3_9} ) -PYTHON_REQ_USE="xml" - -inherit linux-info python-any-r1 - -if [[ ${PV} == ]]; then - EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; - inherit git-r3 autotools -else - ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 arm arm64 ppc64 x86" -fi -VPNC_VER=20200226 -SRC_URI="${ARCHIVE_URI} - ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz; - -DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" -HOMEPAGE="http://www.infradead.org/openconnect.html; - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test" -RESTRICT="!test? ( test )" - -DEPEND=" - dev-libs/libxml2 - sys-libs/zlib - !gnutls? ( - >=dev-libs/openssl-1.0.1h:0=[static-libs?] - ) - gnutls? ( - app-crypt/trousers - app-misc/ca-certificates - dev-libs/nettle - >=net-libs/gnutls-3.6.13:0=[static-libs?] - ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - lz4? ( app-arch/lz4:= ) - nls? ( virtual/libintl ) - smartcard? ( sys-apps/pcsc-lite:0= ) - stoken? ( app-crypt/stoken ) -" -RDEPEND="${DEPEND} - sys-apps/iproute2 -" -BDEPEND=" - virtual/pkgconfig - doc? ( ${PYTHON_DEPS} sys-apps/groff ) - nls? ( sys-devel/gettext ) - test? ( - net-libs/socket_wrapper - net-vpn/ocserv - sys-libs/uid_wrapper - ) -" - -CONFIG_CHECK="~TUN" - -pkg_pretend() { - check_extra_config -} - -pkg_setup() { - : -} - -src_unpack() { - if [[ ${PV} == ]]; then - git-r3_src_unpack - fi - default -} - -src_prepare() { - local PATCHES=( - "${FILESDIR}"/8.09-gnutls-buffer-overflow.patch - ) - default - if [[ ${PV} == ]]; then - eautoreconf - fi -} - -src_configure() { - if use doc; then - python_setup - else - export ac_cv_path_PYTHON= - fi - - # Used by tests if userpriv is disabled - addwrite /run/netns - - local myconf=( - --disable-dsa-tests - $(use_enable nls) - $(use_enable static-libs static) - $(use_with !gnutls openssl) - $(use_with gnutls) - $(use_with libproxy) - $(use_with lz4) - $(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 - - find "${ED}" -name '*.la' -delete || die - - dodoc "${FILESDIR}"/README.OpenRC.txt - - newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect - insinto /etc/openconnect - - newconfd "${FILESDIR}"/openconnect.conf.in openconnect - - exeinto /etc/openconnect - newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh - - insinto /etc/logrotate.d - newins "${FILESDIR}"/openconnect.logrotate openconnect - - keepdir /var/log/openconnect -}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 55bcb6c42ddefa3c20e50df4dc26a0a2138e947d Author: Mike Gilbert gentoo org> AuthorDate: Sat Oct 2 03:56:27 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Oct 2 06:00:08 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55bcb6c4 net-vpn/openconnect: support python3.10 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-8.10-r2.ebuild | 2 +- net-vpn/openconnect/openconnect-.ebuild| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.10-r2.ebuild b/net-vpn/openconnect/openconnect-8.10-r2.ebuild index bd7b218a022..ba71fcaef77 100644 --- a/net-vpn/openconnect/openconnect-8.10-r2.ebuild +++ b/net-vpn/openconnect/openconnect-8.10-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml" inherit linux-info python-any-r1 diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index bd7b218a022..ba71fcaef77 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml" inherit linux-info python-any-r1
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 873102d5cd839fd4efe00b9336a03341d36ab8fb Author: Mike Gilbert gentoo org> AuthorDate: Sat Oct 2 03:55:18 2021 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Oct 2 06:00:08 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=873102d5 net-vpn/openconnect: depend on net-vpn/vpnc-scripts Signed-off-by: Mike Gilbert gentoo.org> ...t-8.10-r1.ebuild => openconnect-8.10-r2.ebuild} | 13 +++- net-vpn/openconnect/openconnect-.ebuild| 37 +++--- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.10-r1.ebuild b/net-vpn/openconnect/openconnect-8.10-r2.ebuild similarity index 87% rename from net-vpn/openconnect/openconnect-8.10-r1.ebuild rename to net-vpn/openconnect/openconnect-8.10-r2.ebuild index f4a03e951f4..bd7b218a022 100644 --- a/net-vpn/openconnect/openconnect-8.10-r1.ebuild +++ b/net-vpn/openconnect/openconnect-8.10-r2.ebuild @@ -12,12 +12,9 @@ if [[ ${PV} == ]]; then EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; inherit git-r3 autotools else - ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; + SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" fi -VPNC_VER=20200930 -SRC_URI="${ARCHIVE_URI} - ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz; DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" HOMEPAGE="http://www.infradead.org/openconnect.html; @@ -50,6 +47,7 @@ DEPEND=" " RDEPEND="${DEPEND} sys-apps/iproute2 + net-vpn/vpnc-scripts " BDEPEND=" virtual/pkgconfig @@ -107,7 +105,7 @@ src_configure() { $(use_with gssapi) $(use_with smartcard libpcsclite) $(use_with stoken) - --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" + --with-vpnc-script="${EPREFIX}/etc/vpnc-scripts/vpnc-script" --without-java ) @@ -131,10 +129,7 @@ src_install() { default find "${ED}" -name '*.la' -delete || die - exeinto /etc/openconnect - newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh - - newinitd "${FILESDIR}"/openconnect.initd.${PV} openconnect + newinitd "${FILESDIR}"/openconnect.initd.8.10 openconnect dodoc "${FILESDIR}"/README.OpenRC insinto /etc/logrotate.d newins "${FILESDIR}"/openconnect.logrotate openconnect diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index 347a0d59793..bd7b218a022 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -1,9 +1,9 @@ -# Copyright 2011-2020 Gentoo Authors +# Copyright 2011-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{3_7,3_8,3_9} ) +PYTHON_COMPAT=( python3_{8,9} ) PYTHON_REQ_USE="xml" inherit linux-info python-any-r1 @@ -12,12 +12,9 @@ if [[ ${PV} == ]]; then EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; inherit git-r3 autotools else - ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" fi -VPNC_VER=20200226 -SRC_URI="${ARCHIVE_URI} - ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz; DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" HOMEPAGE="http://www.infradead.org/openconnect.html; @@ -50,6 +47,7 @@ DEPEND=" " RDEPEND="${DEPEND} sys-apps/iproute2 + net-vpn/vpnc-scripts " BDEPEND=" virtual/pkgconfig @@ -107,7 +105,7 @@ src_configure() { $(use_with gssapi) $(use_with smartcard libpcsclite) $(use_with stoken) - --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" + --with-vpnc-script="${EPREFIX}/etc/vpnc-scripts/vpnc-script" --without-java ) @@ -129,21 +127,22 @@ src_test() { src_install() { default - find "${ED}" -name '*.la' -delete || die - dodoc "${FILESDIR}"/README.OpenRC.txt - - newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect - insinto /etc/openconnect - - newconfd "${FILESDIR}"/openconnect.conf.in openconnect - - exeinto /etc/openconnect - newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh - + newinitd "${FILESDIR}"/openconnect.initd.8.10 openconnect + dodoc "${FILESDIR}"/README.OpenRC insinto /etc/logrotate.d newins "${FILESDIR}"/openconnect.logrotate openconnect keepdir /var/log/openconnect } + +pkg_postinst() { + local v
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: bf361dffcbf59f4b43698aa55d3c69628f3ec0a1 Author: Marek Szuba gentoo org> AuthorDate: Sat Jul 24 22:48:05 2021 + Commit: Marek Szuba gentoo org> CommitDate: Sat Jul 24 23:02:40 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf361dff net-vpn/openconnect: keyword 8.10-r1 for ~riscv Signed-off-by: Marek Szuba gentoo.org> net-vpn/openconnect/openconnect-8.10-r1.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.10-r1.ebuild b/net-vpn/openconnect/openconnect-8.10-r1.ebuild index 3225e8088a0..f4a03e951f4 100644 --- a/net-vpn/openconnect/openconnect-8.10-r1.ebuild +++ b/net-vpn/openconnect/openconnect-8.10-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2011-2020 Gentoo Authors +# Copyright 2011-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{3_7,3_8,3_9} ) +PYTHON_COMPAT=( python3_{8,9} ) PYTHON_REQ_USE="xml" inherit linux-info python-any-r1 @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" fi VPNC_VER=20200930 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: f94aeb8f9290cc7e07556121c53f0c738c9bb4ad Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Mar 27 18:24:11 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Mar 27 18:24:11 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94aeb8f net-vpn/openconnect: ppc64 stable wrt bug #754057 Package-Manager: Portage-3.0.13, Repoman-3.0.2 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> net-vpn/openconnect/openconnect-8.09-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.09-r3.ebuild b/net-vpn/openconnect/openconnect-8.09-r3.ebuild index 6047f92abf2..c5c21a23d94 100644 --- a/net-vpn/openconnect/openconnect-8.09-r3.ebuild +++ b/net-vpn/openconnect/openconnect-8.09-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2011-2020 Gentoo Authors +# Copyright 2011-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 arm arm64 ~ppc64 x86" + KEYWORDS="amd64 arm arm64 ppc64 x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/files/, net-vpn/openconnect/
commit: 41acdc92e655eb64a0d667b3b612fd5312921656 Author: William Hubbs gentoo org> AuthorDate: Sun Nov 22 23:41:54 2020 + Commit: William Hubbs gentoo org> CommitDate: Mon Nov 23 00:03:27 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41acdc92 net-vpn/openconnect: 8.10-r1 revbump to fix openrc service This changes the openrc service to support the use of separate openconnect config files for each tunnel instead of setting the tunnel options in the conf.d files. The config files will be stored in /etc/openconnect/.conf. The contents of these config files is defined in the openconnect man page. Closes: https://bugs.gentoo.org/733614 Signed-off-by: William Hubbs gentoo.org> net-vpn/openconnect/files/README.OpenRC | 30 + net-vpn/openconnect/files/openconnect.initd.8.10 | 105 net-vpn/openconnect/openconnect-8.10-r1.ebuild | 153 +++ 3 files changed, 288 insertions(+) diff --git a/net-vpn/openconnect/files/README.OpenRC b/net-vpn/openconnect/files/README.OpenRC new file mode 100644 index 000..baa617d94ea --- /dev/null +++ b/net-vpn/openconnect/files/README.OpenRC @@ -0,0 +1,30 @@ +The service script for openconnect supports multiple vpn tunnels. + +You need to create a symbolic link to /etc/init.d/openconnect in +/etc/init.d for each tunnel instead of calling it directly: + +ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0 + +Also, create a configuration file for the tunnel in /etc/openconnect. To +follow this example, the configuration file would be called +/etc/openconnect/vpn0.conf. See man openconnect for the options that can +go in this file. + +You can then start the vpn tunnel like this: + +rc-service openconnect.vpn0 start + +If you would like to run preup, postup, predown, and/or postdown scripts, +You need to create a directory in /etc/openconnect with the name of the vpn: + +mkdir /etc/openconnect/vpn0 + +Then add executable shell files: + +mkdir /etc/openconnect/vpn0 +cd /etc/openconnect/vpn0 +echo '#!/bin/sh' > preup.sh +cp preup.sh predown.sh +cp preup.sh postup.sh +cp preup.sh postdown.sh +chmod 755 /etc/openconnect/vpn0/* diff --git a/net-vpn/openconnect/files/openconnect.initd.8.10 b/net-vpn/openconnect/files/openconnect.initd.8.10 new file mode 100644 index 000..cec5350e17c --- /dev/null +++ b/net-vpn/openconnect/files/openconnect.initd.8.10 @@ -0,0 +1,105 @@ +#!/sbin/openrc-run +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +VPN="${RC_SVCNAME#*.}" +VPNCONF=/etc/openconnect/${VPN}.conf +VPNDIR="/etc/openconnect/${VPN}" +VPNLOG="/var/log/openconnect/${VPN}" +VPNLOGFILE="${VPNLOG}/openconnect.log" +VPNERRFILE="${VPNLOG}/openconnect.err" + +command="/usr/sbin/openconnect" +name="OpenConnect: ${VPN}" +pidfile="/run/openconnect/${VPN}.pid" +stopsig="SIGINT" + +depend() { + before netmount +} + +checkconfig() { + if [ $VPN = "openconnect" ]; then + eerror "You cannot call openconnect directly. You must create a symbolic link to it with the vpn name:" + eerror + eerror "ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0" + eerror + eerror "And then call it instead:" + eerror + eerror "/etc/init.d/openconnect.vpn0 start" + return 1 + fi + if [ ! -f "${VPNCONF}" ]; then + ewarn "The configuration file for ${VPN} does not exist." + ewarn "Please create ${VPNCONF}" + ewarn "This will become a fatal error in a future release." + fi + local server vpnopts password + eval server=\$server_${VPN} + eval vpnopts=\$vpnopts_${VPN} + eval password=\$password_${VPN} + if [ -n "$server" ] || [ -n "$vpnopts" ] || [ -n "password" ]; then + ewarn "server_${VPN}, vpnopts${VPN} and password_${VPN} are deprecated" + ewarn"Please move them to the appropriate settings in ${VPNCONF}" + ewarn "They will be ignored in the future." + fi + return 0 +} + +checktuntap() { + if [ "$RC_UNAME" = "Linux" -a ! -e /dev/net/tun ] ; then + if ! modprobe tun ; then + eerror "TUN/TAP support is not available in this kernel" + return 1 + fi + fi +} + +run_hook() { + if [ -x "$1" ]; then + "$@" + fi +} + +start_pre() { + checkconfig || return + checktuntap || return + checkpath -d "${VPNLOG}" || return + checkpath -d /run/openconnect || return + run_hook "${VPNDIR}/preup.sh" +} + +start() { + local server vpnopts password + eval server=\$server_${VPN} + eval vpnopts=\$vpnopts_${VPN} + eval password=\$password_${VPN} + + ebegin "Starting ${name}" + start-stop-daemon --start --exec "${command}" -- \ + --background \ +
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 30e53c9299ff8be2a112af13a1524d4e4b8ed991 Author: Sam James gentoo org> AuthorDate: Thu Nov 12 15:29:31 2020 + Commit: Sam James gentoo org> CommitDate: Thu Nov 12 15:29:31 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30e53c92 net-vpn/openconnect: Stabilize 8.09-r3 arm64, #754057 Signed-off-by: Sam James gentoo.org> net-vpn/openconnect/openconnect-8.09-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.09-r3.ebuild b/net-vpn/openconnect/openconnect-8.09-r3.ebuild index fa5233c4a8f..5008e83fa2c 100644 --- a/net-vpn/openconnect/openconnect-8.09-r3.ebuild +++ b/net-vpn/openconnect/openconnect-8.09-r3.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 arm ~arm64 ~ppc64 x86" + KEYWORDS="amd64 arm arm64 ~ppc64 x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 7cca58ba1e9e6508426296a70bca30dff6846894 Author: Sam James gentoo org> AuthorDate: Thu Nov 12 15:08:51 2020 + Commit: Sam James gentoo org> CommitDate: Thu Nov 12 15:08:51 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cca58ba net-vpn/openconnect: Stabilize 8.09-r3 arm, #754057 Signed-off-by: Sam James gentoo.org> net-vpn/openconnect/openconnect-8.09-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.09-r3.ebuild b/net-vpn/openconnect/openconnect-8.09-r3.ebuild index 3c176005f79..fa5233c4a8f 100644 --- a/net-vpn/openconnect/openconnect-8.09-r3.ebuild +++ b/net-vpn/openconnect/openconnect-8.09-r3.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" + KEYWORDS="amd64 arm ~arm64 ~ppc64 x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 3a1b3f9e7a7bd8756cbdc23f72c8fa3a58164a2a Author: Mike Gilbert gentoo org> AuthorDate: Wed Nov 11 16:43:39 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Wed Nov 11 16:44:29 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a1b3f9e net-vpn/openconnect: restore ~arm keyword Closes: https://bugs.gentoo.org/754054 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-8.09-r3.ebuild | 2 +- net-vpn/openconnect/openconnect-8.10.ebuild| 2 +- net-vpn/openconnect/openconnect-.ebuild| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.09-r3.ebuild b/net-vpn/openconnect/openconnect-8.09-r3.ebuild index 7464150026a..3c176005f79 100644 --- a/net-vpn/openconnect/openconnect-8.09-r3.ebuild +++ b/net-vpn/openconnect/openconnect-8.09-r3.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 ~arm64 ~ppc64 x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI} diff --git a/net-vpn/openconnect/openconnect-8.10.ebuild b/net-vpn/openconnect/openconnect-8.10.ebuild index 65991f594ed..0b5bc45bd93 100644 --- a/net-vpn/openconnect/openconnect-8.10.ebuild +++ b/net-vpn/openconnect/openconnect-8.10.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi VPNC_VER=20200930 SRC_URI="${ARCHIVE_URI} diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index fbf9771f48a..3932a14244b 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 2817623cb1cb8cbdf15e5a2af817643b6c62bccf Author: Mike Gilbert gentoo org> AuthorDate: Wed Nov 11 16:21:15 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Wed Nov 11 16:33:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2817623c net-vpn/openconnect: update live ebuild Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index d341fc87dca..bfa4550fcf4 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~ppc64" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 3be73268640d330e224c1474a9fdc0c805037bc7 Author: Mike Gilbert gentoo org> AuthorDate: Wed Nov 11 16:13:14 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Wed Nov 11 16:33:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3be73268 net-vpn/openconnect: add deps on libtasn1 and tpm2-tss Closes: https://bugs.gentoo.org/753997 Signed-off-by: Mike Gilbert gentoo.org> .../{openconnect-.ebuild => openconnect-8.09-r2.ebuild}| 7 ++- net-vpn/openconnect/openconnect-.ebuild| 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-8.09-r2.ebuild similarity index 95% copy from net-vpn/openconnect/openconnect-.ebuild copy to net-vpn/openconnect/openconnect-8.09-r2.ebuild index bfa4550fcf4..985cc817bf1 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-8.09-r2.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ~ppc64 x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI} @@ -38,6 +38,8 @@ DEPEND=" app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0=[static-libs?] + dev-libs/libtasn1:0= + app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) @@ -78,6 +80,9 @@ src_unpack() { } src_prepare() { + local PATCHES=( + "${FILESDIR}"/8.09-gnutls-buffer-overflow.patch + ) default if [[ ${PV} == ]]; then eautoreconf diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index bfa4550fcf4..7832aecdb02 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI} @@ -38,6 +38,8 @@ DEPEND=" app-misc/ca-certificates dev-libs/nettle >=net-libs/gnutls-3.6.13:0=[static-libs?] + dev-libs/libtasn1:0= + app-crypt/tpm2-tss ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy )
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: ed3d939d22c927d0903394d810e308bf7ae9493f Author: Mike Gilbert gentoo org> AuthorDate: Wed Nov 11 16:27:52 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Wed Nov 11 16:33:09 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed3d939d net-vpn/openconnect: bump to 8.10 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/Manifest| 2 + net-vpn/openconnect/openconnect-8.10.ebuild | 149 2 files changed, 151 insertions(+) diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index 1f8eb6c02ab..59221ffa774 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1,2 +1,4 @@ DIST openconnect-8.09.tar.gz 2083279 BLAKE2B 4588c693a7a641faad271b034e8713f00fda04a872641e45a8ce3e1a236b8d2f4e1b8d973d20e7a9fc656f9460a0e990cbaada008d4ecf9a46353f20c25ac87a SHA512 f6890f5bce4b36b162e4590bce8a61d65fc0ae803d62a3dd408fbb13e96ce41b6443740132808491093032545aea919f9076e34bc11160c503c5e3c46457e7bd +DIST openconnect-8.10.tar.gz 2084534 BLAKE2B 98ad0e24e09bc565f359139540f60eb9b6b5ed2239a9c46c56889b8554fc3de3605c10f1bb4fa0b0b206ba35404ae90a389ab8dcee54cf05a24d984529d24c2a SHA512 a36a106cf5c637602fc5bd3cd12df8f6dfe55217c1aae93c66ca33208507f3f8cda15e3a46d75615c7fcea1859d1a04017a07674ad0246876154467305477356 DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B 8f00ce3dc49725758abce27f3688946df1bbd4e92769ef02aa9ee66db8b9f41bef3442eaa5405ab1467476899c6d364dfea898ed924ca83497823a85515d48e5 SHA512 3a1eac4ccfaefb0f837189c8cef696b33ab8b8a68cb50a3ad29206b708d0aa479e8eed0c09bef6f60d056cd98d63cc898a1609d734030a63df3be2cfa6c00f9a +DIST vpnc-scripts-20200930.tar.gz 22305 BLAKE2B 5db809ef674cb3cb8f1c775adc1e83debbda28fdcf47e0b0527efe6d1cea09781ef02b2827d9704140b884a85e7ec51fba497f47f6793520b471a7bba0dde6b6 SHA512 5f42bc7b168b5fdfc3ebd4bae52a42a654f102982852cc74240972e16e77fe0b54d82175e2a067e1d7e408bd14c3f465f7eb82b23b41885cb25a813d9587fd3d diff --git a/net-vpn/openconnect/openconnect-8.10.ebuild b/net-vpn/openconnect/openconnect-8.10.ebuild new file mode 100644 index 000..65991f594ed --- /dev/null +++ b/net-vpn/openconnect/openconnect-8.10.ebuild @@ -0,0 +1,149 @@ +# Copyright 2011-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} ) +PYTHON_REQ_USE="xml" + +inherit linux-info python-any-r1 + +if [[ ${PV} == ]]; then + EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; + inherit git-r3 autotools +else + ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi +VPNC_VER=20200930 +SRC_URI="${ARCHIVE_URI} + ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz; + +DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" +HOMEPAGE="http://www.infradead.org/openconnect.html; + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0/5" +IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/libxml2 + sys-libs/zlib + !gnutls? ( + >=dev-libs/openssl-1.0.1h:0= + ) + gnutls? ( + app-crypt/trousers + app-misc/ca-certificates + dev-libs/nettle + >=net-libs/gnutls-3.6.13:0= + dev-libs/libtasn1:0= + app-crypt/tpm2-tss + ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + lz4? ( app-arch/lz4:= ) + nls? ( virtual/libintl ) + smartcard? ( sys-apps/pcsc-lite:0= ) + stoken? ( app-crypt/stoken ) +" +RDEPEND="${DEPEND} + sys-apps/iproute2 +" +BDEPEND=" + virtual/pkgconfig + doc? ( ${PYTHON_DEPS} sys-apps/groff ) + nls? ( sys-devel/gettext ) + test? ( + net-libs/socket_wrapper + net-vpn/ocserv + sys-libs/uid_wrapper + ) +" + +CONFIG_CHECK="~TUN" + +pkg_pretend() { + check_extra_config +} + +pkg_setup() { + : +} + +src_unpack() { + if [[ ${PV} == ]]; then + git-r3_src_unpack + fi + default +} + +src_prepare() { + default + if [[ ${PV} == ]]; then + eautoreconf + fi +} + +src_configure() { + if use doc; then + python_setup + else + export ac_cv_path_PYTHON= + fi + + # Used by tests if userpriv is disabled + addwrite /run/netns + + local myconf=( + --disable-dsa-tests + $(use_enable nls) + --disable-static + $(use_with !gnutls openssl) + $(use_with gnutls) + $(use_with libproxy) + $(use_with lz4) + $(use_with gssapi) + $(use_with smartcard libpcsclite) + $(use_with stoken) +
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: fb2c5eceda966c9ec3c7d8ea035df2c82edc4b0d Author: Mike Gilbert gentoo org> AuthorDate: Wed Nov 11 16:15:31 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Wed Nov 11 16:33:09 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb2c5ece net-vpn/openconnect: drop static-libs Signed-off-by: Mike Gilbert gentoo.org> .../{openconnect-8.09-r2.ebuild => openconnect-8.09-r3.ebuild}| 8 net-vpn/openconnect/openconnect-.ebuild | 8 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.09-r2.ebuild b/net-vpn/openconnect/openconnect-8.09-r3.ebuild similarity index 93% rename from net-vpn/openconnect/openconnect-8.09-r2.ebuild rename to net-vpn/openconnect/openconnect-8.09-r3.ebuild index 985cc817bf1..7464150026a 100644 --- a/net-vpn/openconnect/openconnect-8.09-r2.ebuild +++ b/net-vpn/openconnect/openconnect-8.09-r3.ebuild @@ -24,20 +24,20 @@ HOMEPAGE="http://www.infradead.org/openconnect.html; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test" +IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test" RESTRICT="!test? ( test )" DEPEND=" dev-libs/libxml2 sys-libs/zlib !gnutls? ( - >=dev-libs/openssl-1.0.1h:0=[static-libs?] + >=dev-libs/openssl-1.0.1h:0= ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle - >=net-libs/gnutls-3.6.13:0=[static-libs?] + >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) @@ -102,7 +102,7 @@ src_configure() { local myconf=( --disable-dsa-tests $(use_enable nls) - $(use_enable static-libs static) + --disable-static $(use_with !gnutls openssl) $(use_with gnutls) $(use_with libproxy) diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index 7832aecdb02..fbf9771f48a 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -24,20 +24,20 @@ HOMEPAGE="http://www.infradead.org/openconnect.html; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test" +IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard stoken test" RESTRICT="!test? ( test )" DEPEND=" dev-libs/libxml2 sys-libs/zlib !gnutls? ( - >=dev-libs/openssl-1.0.1h:0=[static-libs?] + >=dev-libs/openssl-1.0.1h:0= ) gnutls? ( app-crypt/trousers app-misc/ca-certificates dev-libs/nettle - >=net-libs/gnutls-3.6.13:0=[static-libs?] + >=net-libs/gnutls-3.6.13:0= dev-libs/libtasn1:0= app-crypt/tpm2-tss ) @@ -99,7 +99,7 @@ src_configure() { local myconf=( --disable-dsa-tests $(use_enable nls) - $(use_enable static-libs static) + --disable-static $(use_with !gnutls openssl) $(use_with gnutls) $(use_with libproxy)
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: fdefaf44e67b52a6103b2e21cfb092529b1bf603 Author: Mike Gilbert gentoo org> AuthorDate: Wed Sep 2 16:32:48 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Wed Sep 2 16:32:48 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdefaf44 net-vpn/openconnect: support python 3.8 and 3.9 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-8.09-r1.ebuild | 2 +- net-vpn/openconnect/openconnect-.ebuild| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.09-r1.ebuild b/net-vpn/openconnect/openconnect-8.09-r1.ebuild index 0df25a9e26c..6fbcc846248 100644 --- a/net-vpn/openconnect/openconnect-8.09-r1.ebuild +++ b/net-vpn/openconnect/openconnect-8.09-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} ) PYTHON_REQ_USE="xml" inherit linux-info python-any-r1 diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index bda6b965640..d341fc87dca 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} ) PYTHON_REQ_USE="xml" inherit linux-info python-any-r1
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 0102eabe0befa3f87d530f5fc0e5885187ed20c9 Author: Mike Gilbert gentoo org> AuthorDate: Wed Jun 10 23:32:10 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Wed Jun 10 23:32:10 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0102eabe net-vpn/openconnect: remove old Bug: https://bugs.gentoo.org/719108 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/Manifest| 2 - net-vpn/openconnect/openconnect-8.06.ebuild | 141 -- net-vpn/openconnect/openconnect-8.08.ebuild | 147 3 files changed, 290 deletions(-) diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index c8fc40caedd..1f8eb6c02ab 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1,4 +1,2 @@ -DIST openconnect-8.06.tar.gz 2030905 BLAKE2B d9659e4f027e11a0348c1c4358831e5f470f0305e04c22716010c68810ae300a7062ab8f57e3fc80b7d90caf855ce2f1c0af1b04eb7032b70486eee2eacc47e5 SHA512 6319aa6b20bf16994b376c2cc2a7cbf2b26a36f35e9607c1886e8fa7a2e1fe111bfb37f9349693ef52a3d2ce718c37e15fe263664e6c0bcbd33ced5ddb9e31b2 -DIST openconnect-8.08.tar.gz 2038269 BLAKE2B 78e76aee1d22179dc1e8fff03e57ee5df0d7a04cf88c5f844ba5b87c9b8a0f89766489e0dcc6b1023c07ea8b2e4da8ea2723470423b3c0c8d4bc47ed1c1e3fa4 SHA512 3bf42e194b88f06bbc6c385002e7b76952964e230fc86ee1d803be72204073ffe41286a3d8e189456fd7b905fa63577e6adc64137e893eccada80419c114eeb8 DIST openconnect-8.09.tar.gz 2083279 BLAKE2B 4588c693a7a641faad271b034e8713f00fda04a872641e45a8ce3e1a236b8d2f4e1b8d973d20e7a9fc656f9460a0e990cbaada008d4ecf9a46353f20c25ac87a SHA512 f6890f5bce4b36b162e4590bce8a61d65fc0ae803d62a3dd408fbb13e96ce41b6443740132808491093032545aea919f9076e34bc11160c503c5e3c46457e7bd DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B 8f00ce3dc49725758abce27f3688946df1bbd4e92769ef02aa9ee66db8b9f41bef3442eaa5405ab1467476899c6d364dfea898ed924ca83497823a85515d48e5 SHA512 3a1eac4ccfaefb0f837189c8cef696b33ab8b8a68cb50a3ad29206b708d0aa479e8eed0c09bef6f60d056cd98d63cc898a1609d734030a63df3be2cfa6c00f9a diff --git a/net-vpn/openconnect/openconnect-8.06.ebuild b/net-vpn/openconnect/openconnect-8.06.ebuild deleted file mode 100644 index dc435746805..000 --- a/net-vpn/openconnect/openconnect-8.06.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 2011-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_6,3_7} ) -PYTHON_REQ_USE="xml" - -inherit linux-info python-any-r1 - -if [[ ${PV} == ]]; then - EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; - inherit git-r3 autotools -else - ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 arm arm64 ppc64 x86" -fi -VPNC_VER=20200226 -SRC_URI="${ARCHIVE_URI} - ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz; - -DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" -HOMEPAGE="http://www.infradead.org/openconnect.html; - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken" - -DEPEND=" - dev-libs/libxml2 - sys-libs/zlib - !gnutls? ( - >=dev-libs/openssl-1.0.1h:0=[static-libs?] - ) - gnutls? ( - app-crypt/trousers - app-misc/ca-certificates - dev-libs/nettle - >=net-libs/gnutls-3:0=[static-libs?] - ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - lz4? ( app-arch/lz4:= ) - nls? ( virtual/libintl ) - smartcard? ( sys-apps/pcsc-lite:0= ) - stoken? ( app-crypt/stoken ) -" -RDEPEND="${DEPEND} - sys-apps/iproute2 -" -BDEPEND=" - virtual/pkgconfig - doc? ( ${PYTHON_DEPS} sys-apps/groff ) - nls? ( sys-devel/gettext ) -" - -CONFIG_CHECK="~TUN" - -pkg_pretend() { - check_extra_config -} - -pkg_setup() { - : -} - -src_unpack() { - if [[ ${PV} == ]]; then - git-r3_src_unpack - fi - default -} - -src_prepare() { - default - if [[ ${PV} == ]]; then - eautoreconf - fi -} - -src_configure() { - if use doc; then - python_setup - else - export ac_cv_path_PYTHON= - fi - - # Used by tests if userpriv is disabled - addwrite /run/netns - - local myconf=( - --disable-dsa-tests - $(use_enable nls) - $(use_enable static-libs static) - $(use_with !gnutls openssl) - $(use_with gnutls) - $(use_with libproxy) - $(use_with lz4) - $(use_with gssapi) - $(use_with smartcard libpcsclite) - $(use_with stoken) - --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" - --without-java - ) -
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: e83bbc063e5346a8fb501e6a8bf5cb5b46a8c025 Author: Sam James (sam_c) cmpct info> AuthorDate: Sun Jun 7 02:45:19 2020 + Commit: Michał Górny gentoo org> CommitDate: Mon Jun 8 06:41:24 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e83bbc06 net-vpn/openconnect: arm stable (bug #719108) Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Sam James (sam_c) cmpct.info> Signed-off-by: Michał Górny gentoo.org> net-vpn/openconnect/openconnect-8.09-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.09-r1.ebuild b/net-vpn/openconnect/openconnect-8.09-r1.ebuild index efc77c0bbcd..0df25a9e26c 100644 --- a/net-vpn/openconnect/openconnect-8.09-r1.ebuild +++ b/net-vpn/openconnect/openconnect-8.09-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 ~arm arm64 ppc64 x86" + KEYWORDS="amd64 arm arm64 ppc64 x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: addb50352bc70baca7dd1e3f7ed6cddc740f6719 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu May 14 21:23:20 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu May 14 21:29:30 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=addb5035 net-vpn/openconnect: x86 stable (bug #719108) Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann gentoo.org> net-vpn/openconnect/openconnect-8.09-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.09-r1.ebuild b/net-vpn/openconnect/openconnect-8.09-r1.ebuild index 26838ebbd2c..efc77c0bbcd 100644 --- a/net-vpn/openconnect/openconnect-8.09-r1.ebuild +++ b/net-vpn/openconnect/openconnect-8.09-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" + KEYWORDS="amd64 ~arm arm64 ppc64 x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 2cd979597b0411ef837238ccb0e56e564228ff23 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed May 13 17:14:06 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed May 13 17:14:06 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cd97959 net-vpn/openconnect: ppc64 stable wrt bug #719108 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> net-vpn/openconnect/openconnect-8.09-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.09-r1.ebuild b/net-vpn/openconnect/openconnect-8.09-r1.ebuild index a55ca7731ca..26838ebbd2c 100644 --- a/net-vpn/openconnect/openconnect-8.09-r1.ebuild +++ b/net-vpn/openconnect/openconnect-8.09-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm arm64 ppc64 ~x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/files/, net-vpn/openconnect/
commit: 27513d77015771f8604d9a21f388e9846c8c650a Author: Mike Gilbert gentoo org> AuthorDate: Tue May 12 16:01:57 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Tue May 12 16:02:48 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27513d77 net-vpn/openconnect: fix buffer overflow in get_cert_name Closes: https://bugs.gentoo.org/721570 Signed-off-by: Mike Gilbert gentoo.org> .../files/8.09-gnutls-buffer-overflow.patch| 62 ++ ...nect-8.09.ebuild => openconnect-8.09-r1.ebuild} | 3 ++ 2 files changed, 65 insertions(+) diff --git a/net-vpn/openconnect/files/8.09-gnutls-buffer-overflow.patch b/net-vpn/openconnect/files/8.09-gnutls-buffer-overflow.patch new file mode 100644 index 000..bf8990ae3d3 --- /dev/null +++ b/net-vpn/openconnect/files/8.09-gnutls-buffer-overflow.patch @@ -0,0 +1,62 @@ +From eef4c1f9d24478aa1d2dd9ac7ec32efb2137f474 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Fri, 8 May 2020 10:39:41 -0400 +Subject: [PATCH] gnutls: prevent buffer overflow in get_cert_name + +The test suite for ocserv calls openconnect with a certificate that has +a name that is 84 bytes in length. The buffer passed to get_cert_name is +currently 80 bytes. + +The gnutls_x509_crt_get_dn_by_oid function will update the buffer size +parameter if the buffer is too small. + +http://man7.org/linux/man-pages/man3/gnutls_x509_crt_get_dn_by_oid.3.html + +RETURNS + GNUTLS_E_SHORT_MEMORY_BUFFER if the provided buffer is not long + enough, and in that case the buf_size will be updated with the + required size. GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE if there are no + data in the current index. On success 0 is returned. + +Use a temporary variable to avoid clobbering the namelen variable that is +passed to get_cert_name. + +Bug: https://bugs.gentoo.org/721570 +Signed-off-by: Sergei Trofimovich +Signed-off-by: Mike Gilbert +--- + gnutls.c | 17 - + 1 file changed, 12 insertions(+), 5 deletions(-) + +diff --git a/gnutls.c b/gnutls.c +index 36bc82e0..53bf2a43 100644 +--- a/gnutls.c b/gnutls.c +@@ -546,12 +546,19 @@ static int count_x509_certificates(gnutls_datum_t *datum) + + static int get_cert_name(gnutls_x509_crt_t cert, char *name, size_t namelen) + { ++ /* When the name buffer is not big enough, gnutls_x509_crt_get_dn*() will ++ * update the length argument to the required size, and return ++ * GNUTLS_E_SHORT_MEMORY_BUFFER. We need to avoid clobbering the original ++ * length variable. */ ++ size_t nl = namelen; + if (gnutls_x509_crt_get_dn_by_oid(cert, GNUTLS_OID_X520_COMMON_NAME, +-0, 0, name, ) && +- gnutls_x509_crt_get_dn(cert, name, )) { +- name[namelen-1] = 0; +- snprintf(name, namelen-1, ""); +- return -EINVAL; ++0, 0, name, )) { ++ nl = namelen; ++ if (gnutls_x509_crt_get_dn(cert, name, )) { ++ name[namelen-1] = 0; ++ snprintf(name, namelen-1, ""); ++ return -EINVAL; ++ } + } + return 0; + } +-- +2.26.2 + diff --git a/net-vpn/openconnect/openconnect-8.09.ebuild b/net-vpn/openconnect/openconnect-8.09-r1.ebuild similarity index 97% rename from net-vpn/openconnect/openconnect-8.09.ebuild rename to net-vpn/openconnect/openconnect-8.09-r1.ebuild index 5e1e96852d1..a55ca7731ca 100644 --- a/net-vpn/openconnect/openconnect-8.09.ebuild +++ b/net-vpn/openconnect/openconnect-8.09-r1.ebuild @@ -78,6 +78,9 @@ src_unpack() { } src_prepare() { + local PATCHES=( + "${FILESDIR}"/8.09-gnutls-buffer-overflow.patch + ) default if [[ ${PV} == ]]; then eautoreconf
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 4b3a3c86f8b5f1b439df2552b8354884f1f91354 Author: Sam James (sam_c) cmpct info> AuthorDate: Sat May 9 01:54:49 2020 + Commit: Mart Raudsepp gentoo org> CommitDate: Sat May 9 08:47:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3a3c86 net-vpn/openconnect: arm64 stable (bug #719108) Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Sam James (sam_c) cmpct.info> Signed-off-by: Mart Raudsepp gentoo.org> net-vpn/openconnect/openconnect-8.09.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.09.ebuild b/net-vpn/openconnect/openconnect-8.09.ebuild index c05b28274c7..5e1e96852d1 100644 --- a/net-vpn/openconnect/openconnect-8.09.ebuild +++ b/net-vpn/openconnect/openconnect-8.09.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: b7d5f261b91636a8680d1c51d4ff047eb88998b3 Author: Sam James (sam_c) cmpct info> AuthorDate: Thu May 7 12:57:42 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu May 7 16:35:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d5f261 net-vpn/openconnect: arm keyworded Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Sam James (sam_c) cmpct.info> Signed-off-by: Mikle Kolyada gentoo.org> net-vpn/openconnect/openconnect-8.09.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.09.ebuild b/net-vpn/openconnect/openconnect-8.09.ebuild index 6a286118fe1..c05b28274c7 100644 --- a/net-vpn/openconnect/openconnect-8.09.ebuild +++ b/net-vpn/openconnect/openconnect-8.09.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 55063eaa6feac373cf310b2c1446322578880317 Author: Agostino Sarubbo gentoo org> AuthorDate: Thu May 7 15:57:42 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu May 7 15:57:42 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55063eaa net-vpn/openconnect: amd64 stable wrt bug #719108 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> net-vpn/openconnect/openconnect-8.09.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.09.ebuild b/net-vpn/openconnect/openconnect-8.09.ebuild index 65be38899a1..6a286118fe1 100644 --- a/net-vpn/openconnect/openconnect-8.09.ebuild +++ b/net-vpn/openconnect/openconnect-8.09.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: c8090d84da7e8f2e4b89c0cf4e93f12f79e61ac6 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed May 6 00:59:53 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Wed May 6 01:01:26 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8090d84 net-vpn/openconnect: x86 keyworded (bug #718792) Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann gentoo.org> net-vpn/openconnect/openconnect-8.09.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.09.ebuild b/net-vpn/openconnect/openconnect-8.09.ebuild index 74f5d82f094..65be38899a1 100644 --- a/net-vpn/openconnect/openconnect-8.09.ebuild +++ b/net-vpn/openconnect/openconnect-8.09.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm64 ~ppc64" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: dd34a1ed473bdd6eb7af4cfd998630fe3ae019ab Author: Mike Gilbert gentoo org> AuthorDate: Wed May 6 00:59:59 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Wed May 6 00:59:59 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd34a1ed net-vpn/openconnect: depend on >=net-libs/gnutls-3.6.13 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-8.09.ebuild | 2 +- net-vpn/openconnect/openconnect-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.09.ebuild b/net-vpn/openconnect/openconnect-8.09.ebuild index 6b0b50ab36d..74f5d82f094 100644 --- a/net-vpn/openconnect/openconnect-8.09.ebuild +++ b/net-vpn/openconnect/openconnect-8.09.ebuild @@ -37,7 +37,7 @@ DEPEND=" app-crypt/trousers app-misc/ca-certificates dev-libs/nettle - >=net-libs/gnutls-3:0=[static-libs?] + >=net-libs/gnutls-3.6.13:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index cd814ccbd7e..bda6b965640 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -37,7 +37,7 @@ DEPEND=" app-crypt/trousers app-misc/ca-certificates dev-libs/nettle - >=net-libs/gnutls-3:0=[static-libs?] + >=net-libs/gnutls-3.6.13:0=[static-libs?] ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy )
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 44cfb25446e71ae235802c2a25b2a5fe3ba9 Author: Sam James (sam_c) cmpct info> AuthorDate: Sat May 2 00:53:04 2020 + Commit: Mart Raudsepp gentoo org> CommitDate: Sat May 2 13:15:06 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44cfb254 net-vpn/openconnect: arm64 keyworded Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Sam James (sam_c) cmpct.info> Signed-off-by: Mart Raudsepp gentoo.org> net-vpn/openconnect/openconnect-8.09.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.09.ebuild b/net-vpn/openconnect/openconnect-8.09.ebuild index cd814ccbd7e..6b0b50ab36d 100644 --- a/net-vpn/openconnect/openconnect-8.09.ebuild +++ b/net-vpn/openconnect/openconnect-8.09.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~ppc64" + KEYWORDS="~amd64 ~arm64 ~ppc64" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 7c819e773effc3b348bebe231d5428a5c5ca69c6 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri May 1 09:10:04 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri May 1 09:10:04 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c819e77 net-vpn/openconnect: add ~ppc64 keyword, bug #718792 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev gentoo.org> net-vpn/openconnect/openconnect-8.08.ebuild | 2 +- net-vpn/openconnect/openconnect-8.09.ebuild | 2 +- net-vpn/openconnect/openconnect-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.08.ebuild b/net-vpn/openconnect/openconnect-8.08.ebuild index 85ac062266b..cd814ccbd7e 100644 --- a/net-vpn/openconnect/openconnect-8.08.ebuild +++ b/net-vpn/openconnect/openconnect-8.08.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~ppc64" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI} diff --git a/net-vpn/openconnect/openconnect-8.09.ebuild b/net-vpn/openconnect/openconnect-8.09.ebuild index 85ac062266b..cd814ccbd7e 100644 --- a/net-vpn/openconnect/openconnect-8.09.ebuild +++ b/net-vpn/openconnect/openconnect-8.09.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~ppc64" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI} diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index 85ac062266b..cd814ccbd7e 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~ppc64" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 75a15c5715d8a5393efb8ffed12ae5c1f906ba49 Author: Mike Gilbert gentoo org> AuthorDate: Fri May 1 04:26:51 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Fri May 1 04:27:07 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75a15c57 net-vpn/openconnect: bump to 8.09 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/Manifest| 1 + net-vpn/openconnect/openconnect-8.09.ebuild | 147 2 files changed, 148 insertions(+) diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index f28d52e86ef..c8fc40caedd 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1,3 +1,4 @@ DIST openconnect-8.06.tar.gz 2030905 BLAKE2B d9659e4f027e11a0348c1c4358831e5f470f0305e04c22716010c68810ae300a7062ab8f57e3fc80b7d90caf855ce2f1c0af1b04eb7032b70486eee2eacc47e5 SHA512 6319aa6b20bf16994b376c2cc2a7cbf2b26a36f35e9607c1886e8fa7a2e1fe111bfb37f9349693ef52a3d2ce718c37e15fe263664e6c0bcbd33ced5ddb9e31b2 DIST openconnect-8.08.tar.gz 2038269 BLAKE2B 78e76aee1d22179dc1e8fff03e57ee5df0d7a04cf88c5f844ba5b87c9b8a0f89766489e0dcc6b1023c07ea8b2e4da8ea2723470423b3c0c8d4bc47ed1c1e3fa4 SHA512 3bf42e194b88f06bbc6c385002e7b76952964e230fc86ee1d803be72204073ffe41286a3d8e189456fd7b905fa63577e6adc64137e893eccada80419c114eeb8 +DIST openconnect-8.09.tar.gz 2083279 BLAKE2B 4588c693a7a641faad271b034e8713f00fda04a872641e45a8ce3e1a236b8d2f4e1b8d973d20e7a9fc656f9460a0e990cbaada008d4ecf9a46353f20c25ac87a SHA512 f6890f5bce4b36b162e4590bce8a61d65fc0ae803d62a3dd408fbb13e96ce41b6443740132808491093032545aea919f9076e34bc11160c503c5e3c46457e7bd DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B 8f00ce3dc49725758abce27f3688946df1bbd4e92769ef02aa9ee66db8b9f41bef3442eaa5405ab1467476899c6d364dfea898ed924ca83497823a85515d48e5 SHA512 3a1eac4ccfaefb0f837189c8cef696b33ab8b8a68cb50a3ad29206b708d0aa479e8eed0c09bef6f60d056cd98d63cc898a1609d734030a63df3be2cfa6c00f9a diff --git a/net-vpn/openconnect/openconnect-8.09.ebuild b/net-vpn/openconnect/openconnect-8.09.ebuild new file mode 100644 index 000..85ac062266b --- /dev/null +++ b/net-vpn/openconnect/openconnect-8.09.ebuild @@ -0,0 +1,147 @@ +# Copyright 2011-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_6,3_7} ) +PYTHON_REQ_USE="xml" + +inherit linux-info python-any-r1 + +if [[ ${PV} == ]]; then + EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; + inherit git-r3 autotools +else + ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; + KEYWORDS="~amd64" +fi +VPNC_VER=20200226 +SRC_URI="${ARCHIVE_URI} + ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz; + +DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" +HOMEPAGE="http://www.infradead.org/openconnect.html; + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0/5" +IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/libxml2 + sys-libs/zlib + !gnutls? ( + >=dev-libs/openssl-1.0.1h:0=[static-libs?] + ) + gnutls? ( + app-crypt/trousers + app-misc/ca-certificates + dev-libs/nettle + >=net-libs/gnutls-3:0=[static-libs?] + ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + lz4? ( app-arch/lz4:= ) + nls? ( virtual/libintl ) + smartcard? ( sys-apps/pcsc-lite:0= ) + stoken? ( app-crypt/stoken ) +" +RDEPEND="${DEPEND} + sys-apps/iproute2 +" +BDEPEND=" + virtual/pkgconfig + doc? ( ${PYTHON_DEPS} sys-apps/groff ) + nls? ( sys-devel/gettext ) + test? ( + net-libs/socket_wrapper + net-vpn/ocserv + sys-libs/uid_wrapper + ) +" + +CONFIG_CHECK="~TUN" + +pkg_pretend() { + check_extra_config +} + +pkg_setup() { + : +} + +src_unpack() { + if [[ ${PV} == ]]; then + git-r3_src_unpack + fi + default +} + +src_prepare() { + default + if [[ ${PV} == ]]; then + eautoreconf + fi +} + +src_configure() { + if use doc; then + python_setup + else + export ac_cv_path_PYTHON= + fi + + # Used by tests if userpriv is disabled + addwrite /run/netns + + local myconf=( + --disable-dsa-tests + $(use_enable nls) + $(use_enable static-libs static) + $(use_with !gnutls openssl) + $(use_with gnutls) + $(use_with libproxy) + $(use_with lz4) + $(use_with gssapi) + $(use_with smartcard libpcsclite) + $(use_with stoken) + --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" +
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: bf6851a701904945460c02642d900ad8c0a5d43c Author: Mike Gilbert gentoo org> AuthorDate: Wed Apr 22 18:03:34 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Wed Apr 22 18:03:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf6851a7 net-vpn/openconnect: remove old Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/Manifest| 2 - net-vpn/openconnect/openconnect-8.05.ebuild | 160 2 files changed, 162 deletions(-) diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index 92c5f0d4a3f..f28d52e86ef 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1,5 +1,3 @@ -DIST openconnect-8.05.tar.gz 1922100 BLAKE2B e12a5eccb471dc61c6f3af7492cb753fedcc52bfdb4155c934ca9c0c95da5e8037c0ede4f89345134fee8a09102f797690e101b8f4edba612ac265779feab19a SHA512 3ac9f1fa5a87b06d45c316897c69470264f2fde7525b5b3ef1352041dd0c8ae5eaf5dd325de1bdcf1e5b82e688fec9c36d531da1b75ac3f49896d4186d83aa15 DIST openconnect-8.06.tar.gz 2030905 BLAKE2B d9659e4f027e11a0348c1c4358831e5f470f0305e04c22716010c68810ae300a7062ab8f57e3fc80b7d90caf855ce2f1c0af1b04eb7032b70486eee2eacc47e5 SHA512 6319aa6b20bf16994b376c2cc2a7cbf2b26a36f35e9607c1886e8fa7a2e1fe111bfb37f9349693ef52a3d2ce718c37e15fe263664e6c0bcbd33ced5ddb9e31b2 DIST openconnect-8.08.tar.gz 2038269 BLAKE2B 78e76aee1d22179dc1e8fff03e57ee5df0d7a04cf88c5f844ba5b87c9b8a0f89766489e0dcc6b1023c07ea8b2e4da8ea2723470423b3c0c8d4bc47ed1c1e3fa4 SHA512 3bf42e194b88f06bbc6c385002e7b76952964e230fc86ee1d803be72204073ffe41286a3d8e189456fd7b905fa63577e6adc64137e893eccada80419c114eeb8 -DIST vpnc-scripts-20190611.tar.gz 21439 BLAKE2B 8388cc3f4b795588bed146cf5e6be33f20de010e39ddbc2bebea3680df9f304bc64db9d14c42cb0b0cb3c053376929476f4b52bf3c8da3fb4153d058eb6bab2b SHA512 91f84cf1881916160e26ec48195583ab79e084cc7b7918721581f25dfb5b1504e8073b0eed50c1a15800824d5a4454e9b99cb4fdffe2539e5968909fafdda87a DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B 8f00ce3dc49725758abce27f3688946df1bbd4e92769ef02aa9ee66db8b9f41bef3442eaa5405ab1467476899c6d364dfea898ed924ca83497823a85515d48e5 SHA512 3a1eac4ccfaefb0f837189c8cef696b33ab8b8a68cb50a3ad29206b708d0aa479e8eed0c09bef6f60d056cd98d63cc898a1609d734030a63df3be2cfa6c00f9a diff --git a/net-vpn/openconnect/openconnect-8.05.ebuild b/net-vpn/openconnect/openconnect-8.05.ebuild deleted file mode 100644 index 7ca60ca5159..000 --- a/net-vpn/openconnect/openconnect-8.05.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 2011-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_6,3_7} ) -PYTHON_REQ_USE="xml" - -inherit eutils linux-info python-any-r1 readme.gentoo-r1 - -if [[ ${PV} == ]]; then - EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; - inherit git-r3 autotools -else - ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 arm arm64 ppc64 x86" -fi -VPNC_VER=20190611 -SRC_URI="${ARCHIVE_URI} - ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz; - -DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" -HOMEPAGE="http://www.infradead.org/openconnect.html; - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken" - -DEPEND=" - dev-libs/libxml2 - sys-libs/zlib - !gnutls? ( - >=dev-libs/openssl-1.0.1h:0=[static-libs?] - ) - gnutls? ( - app-crypt/trousers - app-misc/ca-certificates - dev-libs/nettle - >=net-libs/gnutls-3:0=[static-libs?] - ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - lz4? ( app-arch/lz4:= ) - nls? ( virtual/libintl ) - smartcard? ( sys-apps/pcsc-lite:0= ) - stoken? ( app-crypt/stoken ) -" -RDEPEND="${DEPEND} - sys-apps/iproute2 -" -BDEPEND=" - virtual/pkgconfig - doc? ( ${PYTHON_DEPS} sys-apps/groff ) - nls? ( sys-devel/gettext ) -" - -CONFIG_CHECK="~TUN" - -pkg_pretend() { - check_extra_config -} - -pkg_setup() { - : -} - -src_unpack() { - if [[ ${PV} == ]]; then - git-r3_src_unpack - fi - default -} - -src_prepare() { - default - if [[ ${PV} == ]]; then - eautoreconf - fi -} - -src_configure() { - if use doc; then - python_setup - else - export ac_cv_path_PYTHON= - fi - - # Used by tests if userpriv is disabled - addwrite /run/netns - - local myconf=( - --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" - --without-openssl-version-check - $(use_enable static-libs static) - $(use_enable nls) - $(use_with !gnutls openssl) - $(use_with
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: c22a70df7a29c27b158ccd3de53b2e1fba77a628 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Apr 22 17:04:30 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Apr 22 17:04:30 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c22a70df net-vpn/openconnect: ppc64 stable wrt bug #718780 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> net-vpn/openconnect/openconnect-8.06.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.06.ebuild b/net-vpn/openconnect/openconnect-8.06.ebuild index f5927f35022..ebd95b2240f 100644 --- a/net-vpn/openconnect/openconnect-8.06.ebuild +++ b/net-vpn/openconnect/openconnect-8.06.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 arm arm64 ~ppc64 ~x86" + KEYWORDS="amd64 arm arm64 ppc64 ~x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: c866e324eddca6f72b16cc8faddf1309c6b2fde0 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Apr 22 17:05:01 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Apr 22 17:05:01 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c866e324 net-vpn/openconnect: x86 stable wrt bug #718780 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> net-vpn/openconnect/openconnect-8.06.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.06.ebuild b/net-vpn/openconnect/openconnect-8.06.ebuild index ebd95b2240f..dc435746805 100644 --- a/net-vpn/openconnect/openconnect-8.06.ebuild +++ b/net-vpn/openconnect/openconnect-8.06.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 arm arm64 ppc64 ~x86" + KEYWORDS="amd64 arm arm64 ppc64 x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 5c72df5d48f3f2f8041e27def9bc59ecc8e9907b Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Apr 22 17:02:09 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Apr 22 17:02:09 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c72df5d net-vpn/openconnect: arm stable wrt bug #718780 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="arm" Signed-off-by: Agostino Sarubbo gentoo.org> net-vpn/openconnect/openconnect-8.06.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.06.ebuild b/net-vpn/openconnect/openconnect-8.06.ebuild index 29eddc2fcf0..f5927f35022 100644 --- a/net-vpn/openconnect/openconnect-8.06.ebuild +++ b/net-vpn/openconnect/openconnect-8.06.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86" + KEYWORDS="amd64 arm arm64 ~ppc64 ~x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 8993f5bbd51634c27ad07fba2aef3ff1b6c32444 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Apr 22 17:01:02 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Apr 22 17:01:02 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8993f5bb net-vpn/openconnect: amd64 stable wrt bug #718780 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> net-vpn/openconnect/openconnect-8.06.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.06.ebuild b/net-vpn/openconnect/openconnect-8.06.ebuild index cf80280e4bd..29eddc2fcf0 100644 --- a/net-vpn/openconnect/openconnect-8.06.ebuild +++ b/net-vpn/openconnect/openconnect-8.06.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: e2ff9c408e63db740e734be79a3c30d908daa2c6 Author: Sam James (sam_c) cmpct info> AuthorDate: Wed Apr 22 02:08:30 2020 + Commit: Mart Raudsepp gentoo org> CommitDate: Wed Apr 22 16:39:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2ff9c40 net-vpn/openconnect: arm64 stable (bug #718780) Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Sam James (sam_c) cmpct.info> Signed-off-by: Mart Raudsepp gentoo.org> net-vpn/openconnect/openconnect-8.06.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-vpn/openconnect/openconnect-8.06.ebuild b/net-vpn/openconnect/openconnect-8.06.ebuild index 4442fa5bf4d..cf80280e4bd 100644 --- a/net-vpn/openconnect/openconnect-8.06.ebuild +++ b/net-vpn/openconnect/openconnect-8.06.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 0599fc9acaa7b9a84084879c222b836496410ae5 Author: Mike Gilbert gentoo org> AuthorDate: Tue Apr 21 19:57:17 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Tue Apr 21 19:57:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0599fc9a net-vpn/openconnect: add test dependencies Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-8.08.ebuild | 10 -- net-vpn/openconnect/openconnect-.ebuild | 10 -- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.08.ebuild b/net-vpn/openconnect/openconnect-8.08.ebuild index 4442fa5bf4d..85ac062266b 100644 --- a/net-vpn/openconnect/openconnect-8.08.ebuild +++ b/net-vpn/openconnect/openconnect-8.08.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI} @@ -24,7 +24,8 @@ HOMEPAGE="http://www.infradead.org/openconnect.html; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken" +IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test" +RESTRICT="!test? ( test )" DEPEND=" dev-libs/libxml2 @@ -52,6 +53,11 @@ BDEPEND=" virtual/pkgconfig doc? ( ${PYTHON_DEPS} sys-apps/groff ) nls? ( sys-devel/gettext ) + test? ( + net-libs/socket_wrapper + net-vpn/ocserv + sys-libs/uid_wrapper + ) " CONFIG_CHECK="~TUN" diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index 4442fa5bf4d..85ac062266b 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == ]]; then inherit git-r3 autotools else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64" fi VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI} @@ -24,7 +24,8 @@ HOMEPAGE="http://www.infradead.org/openconnect.html; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken" +IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test" +RESTRICT="!test? ( test )" DEPEND=" dev-libs/libxml2 @@ -52,6 +53,11 @@ BDEPEND=" virtual/pkgconfig doc? ( ${PYTHON_DEPS} sys-apps/groff ) nls? ( sys-devel/gettext ) + test? ( + net-libs/socket_wrapper + net-vpn/ocserv + sys-libs/uid_wrapper + ) " CONFIG_CHECK="~TUN"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 888643dc3a1baeffd951280068f921ea52226d32 Author: Mike Gilbert gentoo org> AuthorDate: Tue Apr 21 19:26:23 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Tue Apr 21 19:26:23 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=888643dc net-vpn/openconnect: bump to 8.08 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/Manifest| 1 + net-vpn/openconnect/openconnect-8.08.ebuild | 141 2 files changed, 142 insertions(+) diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index c3eae30416f..92c5f0d4a3f 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1,4 +1,5 @@ DIST openconnect-8.05.tar.gz 1922100 BLAKE2B e12a5eccb471dc61c6f3af7492cb753fedcc52bfdb4155c934ca9c0c95da5e8037c0ede4f89345134fee8a09102f797690e101b8f4edba612ac265779feab19a SHA512 3ac9f1fa5a87b06d45c316897c69470264f2fde7525b5b3ef1352041dd0c8ae5eaf5dd325de1bdcf1e5b82e688fec9c36d531da1b75ac3f49896d4186d83aa15 DIST openconnect-8.06.tar.gz 2030905 BLAKE2B d9659e4f027e11a0348c1c4358831e5f470f0305e04c22716010c68810ae300a7062ab8f57e3fc80b7d90caf855ce2f1c0af1b04eb7032b70486eee2eacc47e5 SHA512 6319aa6b20bf16994b376c2cc2a7cbf2b26a36f35e9607c1886e8fa7a2e1fe111bfb37f9349693ef52a3d2ce718c37e15fe263664e6c0bcbd33ced5ddb9e31b2 +DIST openconnect-8.08.tar.gz 2038269 BLAKE2B 78e76aee1d22179dc1e8fff03e57ee5df0d7a04cf88c5f844ba5b87c9b8a0f89766489e0dcc6b1023c07ea8b2e4da8ea2723470423b3c0c8d4bc47ed1c1e3fa4 SHA512 3bf42e194b88f06bbc6c385002e7b76952964e230fc86ee1d803be72204073ffe41286a3d8e189456fd7b905fa63577e6adc64137e893eccada80419c114eeb8 DIST vpnc-scripts-20190611.tar.gz 21439 BLAKE2B 8388cc3f4b795588bed146cf5e6be33f20de010e39ddbc2bebea3680df9f304bc64db9d14c42cb0b0cb3c053376929476f4b52bf3c8da3fb4153d058eb6bab2b SHA512 91f84cf1881916160e26ec48195583ab79e084cc7b7918721581f25dfb5b1504e8073b0eed50c1a15800824d5a4454e9b99cb4fdffe2539e5968909fafdda87a DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B 8f00ce3dc49725758abce27f3688946df1bbd4e92769ef02aa9ee66db8b9f41bef3442eaa5405ab1467476899c6d364dfea898ed924ca83497823a85515d48e5 SHA512 3a1eac4ccfaefb0f837189c8cef696b33ab8b8a68cb50a3ad29206b708d0aa479e8eed0c09bef6f60d056cd98d63cc898a1609d734030a63df3be2cfa6c00f9a diff --git a/net-vpn/openconnect/openconnect-8.08.ebuild b/net-vpn/openconnect/openconnect-8.08.ebuild new file mode 100644 index 000..4442fa5bf4d --- /dev/null +++ b/net-vpn/openconnect/openconnect-8.08.ebuild @@ -0,0 +1,141 @@ +# Copyright 2011-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_6,3_7} ) +PYTHON_REQ_USE="xml" + +inherit linux-info python-any-r1 + +if [[ ${PV} == ]]; then + EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; + inherit git-r3 autotools +else + ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +fi +VPNC_VER=20200226 +SRC_URI="${ARCHIVE_URI} + ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz; + +DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software" +HOMEPAGE="http://www.infradead.org/openconnect.html; + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0/5" +IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken" + +DEPEND=" + dev-libs/libxml2 + sys-libs/zlib + !gnutls? ( + >=dev-libs/openssl-1.0.1h:0=[static-libs?] + ) + gnutls? ( + app-crypt/trousers + app-misc/ca-certificates + dev-libs/nettle + >=net-libs/gnutls-3:0=[static-libs?] + ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + lz4? ( app-arch/lz4:= ) + nls? ( virtual/libintl ) + smartcard? ( sys-apps/pcsc-lite:0= ) + stoken? ( app-crypt/stoken ) +" +RDEPEND="${DEPEND} + sys-apps/iproute2 +" +BDEPEND=" + virtual/pkgconfig + doc? ( ${PYTHON_DEPS} sys-apps/groff ) + nls? ( sys-devel/gettext ) +" + +CONFIG_CHECK="~TUN" + +pkg_pretend() { + check_extra_config +} + +pkg_setup() { + : +} + +src_unpack() { + if [[ ${PV} == ]]; then + git-r3_src_unpack + fi + default +} + +src_prepare() { + default + if [[ ${PV} == ]]; then + eautoreconf + fi +} + +src_configure() { + if use doc; then + python_setup + else + export ac_cv_path_PYTHON= + fi + + # Used by tests if userpriv is disabled + addwrite /run/netns + + local myconf=( + --disable-dsa-tests + $(use_enable nls) + $(use_enable static-libs static) + $(use_with !gnutls openssl) + $(use_with gnutls) + $(use_with libproxy) + $(use_with lz4) + $(use_with gssapi)
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 92b665c22286041455f9f4a110dbe6b425d962af Author: Mike Gilbert gentoo org> AuthorDate: Fri Apr 3 14:25:24 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Apr 3 14:26:29 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92b665c2 net-vpn/openconnect: drop libressl support Building with LibreSSL is currently broken. When it does work, it doesn't support DTLS anyway. GnuTLS is a more viable alternative. Bug: https://bugs.gentoo.org/695630 Closes: https://bugs.gentoo.org/715990 Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-8.05.ebuild | 5 ++--- net-vpn/openconnect/openconnect-8.06.ebuild | 5 ++--- net-vpn/openconnect/openconnect-.ebuild | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.05.ebuild b/net-vpn/openconnect/openconnect-8.05.ebuild index e07caaec8fc..7ca60ca5159 100644 --- a/net-vpn/openconnect/openconnect-8.05.ebuild +++ b/net-vpn/openconnect/openconnect-8.05.ebuild @@ -24,14 +24,13 @@ HOMEPAGE="http://www.infradead.org/openconnect.html; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy libressl lz4 nls smartcard static-libs stoken" +IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken" DEPEND=" dev-libs/libxml2 sys-libs/zlib !gnutls? ( - !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) - libressl? ( dev-libs/libressl:0=[static-libs?] ) + >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) gnutls? ( app-crypt/trousers diff --git a/net-vpn/openconnect/openconnect-8.06.ebuild b/net-vpn/openconnect/openconnect-8.06.ebuild index 61191005970..4442fa5bf4d 100644 --- a/net-vpn/openconnect/openconnect-8.06.ebuild +++ b/net-vpn/openconnect/openconnect-8.06.ebuild @@ -24,14 +24,13 @@ HOMEPAGE="http://www.infradead.org/openconnect.html; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy libressl lz4 nls smartcard static-libs stoken" +IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken" DEPEND=" dev-libs/libxml2 sys-libs/zlib !gnutls? ( - !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) - libressl? ( dev-libs/libressl:0=[static-libs?] ) + >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) gnutls? ( app-crypt/trousers diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index 61191005970..4442fa5bf4d 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -24,14 +24,13 @@ HOMEPAGE="http://www.infradead.org/openconnect.html; LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" -IUSE="doc +gnutls gssapi libproxy libressl lz4 nls smartcard static-libs stoken" +IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken" DEPEND=" dev-libs/libxml2 sys-libs/zlib !gnutls? ( - !libressl? ( >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) - libressl? ( dev-libs/libressl:0=[static-libs?] ) + >=dev-libs/openssl-1.0.1h:0=[static-libs?] ) gnutls? ( app-crypt/trousers
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/files/, net-vpn/openconnect/
commit: 2d1a910687e204249655184602d6ccb8b0a14c1b Author: Mike Gilbert gentoo org> AuthorDate: Fri Apr 3 03:41:33 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Apr 3 03:42:12 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d1a9106 net-vpn/openconnect: cleanup ebuild Move the OpenRC-related documentation to a static file. Reorganize src_install. Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/files/README.OpenRC.txt | 25 +++ net-vpn/openconnect/openconnect-8.06.ebuild | 50 ++--- net-vpn/openconnect/openconnect-.ebuild | 50 ++--- 3 files changed, 43 insertions(+), 82 deletions(-) diff --git a/net-vpn/openconnect/files/README.OpenRC.txt b/net-vpn/openconnect/files/README.OpenRC.txt new file mode 100644 index 000..6bd43e62dfb --- /dev/null +++ b/net-vpn/openconnect/files/README.OpenRC.txt @@ -0,0 +1,25 @@ +The init script for openconnect supports multiple vpn tunnels. + +You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d +instead of calling it directly: + +ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0 + +You can then start the vpn tunnel like this: + +/etc/init.d/openconnect.vpn0 start + +If you would like to run preup, postup, predown, and/or postdown scripts, +You need to create a directory in /etc/openconnect with the name of the vpn: + +mkdir /etc/openconnect/vpn0 + +Then add executable shell files: + +mkdir /etc/openconnect/vpn0 +cd /etc/openconnect/vpn0 +echo '#!/bin/sh' > preup.sh +cp preup.sh predown.sh +cp preup.sh postup.sh +cp preup.sh postdown.sh +chmod 755 /etc/openconnect/vpn0/* diff --git a/net-vpn/openconnect/openconnect-8.06.ebuild b/net-vpn/openconnect/openconnect-8.06.ebuild index a3c08e954af..45d091c8dc3 100644 --- a/net-vpn/openconnect/openconnect-8.06.ebuild +++ b/net-vpn/openconnect/openconnect-8.06.ebuild @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python{3_6,3_7} ) PYTHON_REQ_USE="xml" -inherit eutils linux-info python-any-r1 readme.gentoo-r1 +inherit linux-info python-any-r1 if [[ ${PV} == ]]; then EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; @@ -106,55 +106,23 @@ src_configure() { econf "${myconf[@]}" } -DOC_CONTENTS="The init script for openconnect supports multiple vpn tunnels. - -You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d -instead of calling it directly: - -ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0 - -You can then start the vpn tunnel like this: - -/etc/init.d/openconnect.vpn0 start - -If you would like to run preup, postup, predown, and/or postdown scripts, -You need to create a directory in /etc/openconnect with the name of the vpn: - -mkdir /etc/openconnect/vpn0 - -Then add executable shell files: - -mkdir /etc/openconnect/vpn0 -cd /etc/openconnect/vpn0 -echo '#!/bin/sh' > preup.sh -cp preup.sh predown.sh -cp preup.sh postup.sh -cp preup.sh postdown.sh -chmod 755 /etc/openconnect/vpn0/* -" - src_install() { default + find "${ED}" -name '*.la' -delete || die + + dodoc "${FILESDIR}"/README.OpenRC.txt + newinitd "${FILESDIR}"/openconnect.init.in-r4 openconnect insinto /etc/openconnect + newconfd "${FILESDIR}"/openconnect.conf.in openconnect + exeinto /etc/openconnect newexe "${WORKDIR}"/vpnc-scripts-${VPNC_VER}/vpnc-script openconnect.sh + insinto /etc/logrotate.d newins "${FILESDIR}"/openconnect.logrotate openconnect - keepdir /var/log/openconnect - find "${ED}" -name '*.la' -delete || die - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog - elog "You may want to consider installing the following optional packages." - optfeature "resolvconf support" virtual/resolvconf - fi + keepdir /var/log/openconnect } diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index a3c08e954af..45d091c8dc3 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python{3_6,3_7} ) PYTHON_REQ_USE="xml" -inherit eutils linux-info python-any-r1 readme.gentoo-r1 +inherit linux-info python-any-r1 if [[ ${PV} == ]]; then EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git; @@ -106,55 +106,23 @@ src_configure() { econf "${myconf[@]}" } -DOC_CONTENTS="The init script for openconnect supports multiple vpn tunnels. - -You need to create a symbolic link to /etc/init.d/openconnect in /etc/init.d -instead of calling it directly: - -ln -s /etc/init.d/openconnect /etc/init.d/openconnect.vpn0 - -You can then start the vpn tunnel like this: -
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: b4e4a9c2906867a41c86e83838c88ad9f213064f Author: Mike Gilbert gentoo org> AuthorDate: Fri Apr 3 04:06:40 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Fri Apr 3 04:06:40 2020 + 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 gentoo.org> net-vpn/openconnect/openconnect-8.06.ebuild | 18 -- net-vpn/openconnect/openconnect-.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-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index 45d091c8dc3..61191005970 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.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
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 27069aa2f728a881c112d03d25f70778ceda4ca9 Author: Mike Gilbert gentoo org> AuthorDate: Thu Apr 2 22:21:16 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Thu Apr 2 22:26:41 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27069aa2 net-vpn/openconnect: use vpnc-scripts-20200226 Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/Manifest| 1 + net-vpn/openconnect/openconnect-.ebuild | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest index 31e1e0b8f0d..3eedcfb145b 100644 --- a/net-vpn/openconnect/Manifest +++ b/net-vpn/openconnect/Manifest @@ -1,2 +1,3 @@ DIST openconnect-8.05.tar.gz 1922100 BLAKE2B e12a5eccb471dc61c6f3af7492cb753fedcc52bfdb4155c934ca9c0c95da5e8037c0ede4f89345134fee8a09102f797690e101b8f4edba612ac265779feab19a SHA512 3ac9f1fa5a87b06d45c316897c69470264f2fde7525b5b3ef1352041dd0c8ae5eaf5dd325de1bdcf1e5b82e688fec9c36d531da1b75ac3f49896d4186d83aa15 DIST vpnc-scripts-20190611.tar.gz 21439 BLAKE2B 8388cc3f4b795588bed146cf5e6be33f20de010e39ddbc2bebea3680df9f304bc64db9d14c42cb0b0cb3c053376929476f4b52bf3c8da3fb4153d058eb6bab2b SHA512 91f84cf1881916160e26ec48195583ab79e084cc7b7918721581f25dfb5b1504e8073b0eed50c1a15800824d5a4454e9b99cb4fdffe2539e5968909fafdda87a +DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B 8f00ce3dc49725758abce27f3688946df1bbd4e92769ef02aa9ee66db8b9f41bef3442eaa5405ab1467476899c6d364dfea898ed924ca83497823a85515d48e5 SHA512 3a1eac4ccfaefb0f837189c8cef696b33ab8b8a68cb50a3ad29206b708d0aa479e8eed0c09bef6f60d056cd98d63cc898a1609d734030a63df3be2cfa6c00f9a diff --git a/net-vpn/openconnect/openconnect-.ebuild b/net-vpn/openconnect/openconnect-.ebuild index bd917331805..95d40ab7dce 100644 --- a/net-vpn/openconnect/openconnect-.ebuild +++ b/net-vpn/openconnect/openconnect-.ebuild @@ -15,7 +15,7 @@ else ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz; KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" fi -VPNC_VER=20190611 +VPNC_VER=20200226 SRC_URI="${ARCHIVE_URI} ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz; @@ -89,7 +89,6 @@ src_configure() { local myconf=( --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh" - --without-openssl-version-check $(use_enable static-libs static) $(use_enable nls) $(use_with !gnutls openssl)
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 3f435bde047790d428155ef8b12a54f0a63bfaa9 Author: Mike Gilbert gentoo org> AuthorDate: Thu Apr 2 22:33:22 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Thu Apr 2 22:33:22 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f435bde net-vpn/openconnect: fix pkgcheck warnings Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1 Signed-off-by: Mike Gilbert gentoo.org> net-vpn/openconnect/openconnect-8.05.ebuild | 9 + net-vpn/openconnect/openconnect-8.06.ebuild | 9 + net-vpn/openconnect/openconnect-.ebuild | 9 + 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/net-vpn/openconnect/openconnect-8.05.ebuild b/net-vpn/openconnect/openconnect-8.05.ebuild index 05a5351003c..e07caaec8fc 100644 --- a/net-vpn/openconnect/openconnect-8.05.ebuild +++ b/net-vpn/openconnect/openconnect-8.05.ebuild @@ -44,14 +44,16 @@ DEPEND=" lz4? ( app-arch/lz4:= ) nls? ( virtual/libintl ) smartcard? ( sys-apps/pcsc-lite:0= ) - stoken? ( app-crypt/stoken )" + stoken? ( app-crypt/stoken ) +" RDEPEND="${DEPEND} sys-apps/iproute2 - !