gentoo auto-resync : 22:05:2023 - 02:55:39

5 files changed, 3 insertions, 228 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index e4a049e1b0bf..c06198f2aedf 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index 1daf33c6e618..7c006a1f7180 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -1,17 +1,13 @@
 AUX README.OpenRC 416 BLAKE2B a7dcfde210b217d521fcb7c54eb41d07b0e32321aa9c6cc47c78ad7952ee5b6ceede5850de4c4e30891e29e2c4b631b99f65c2c696a9d4fa01ddd190346363bf SHA512 fed0a786466736cd891de7783994e86bb2a20bdb8aa2f9a18f55bc892be0e50d514855b120def151b6fac7e3d2b819510d7dbf496deca65579fea9b42206c49a
 AUX openconnect-9.01-inttypes.patch 828 BLAKE2B 6eb237174b0c2a232876f0305978db17e432ea33c97b5db7119eb4ac86af42915ec0b67763cfafefd528dfc9999ad931ed451c451b669ada86f4a06d66c4814c SHA512 c2085a872a88b518da792b9293081e76f4e8f58eec1de0c444a755b6762143595d84560e38edcd25a3c652119b89613da4cd1ca7b9359647fe4fa6968329c37b
-AUX openconnect-9.11-json-cflags.patch 2416 BLAKE2B a00bd82cc39beb6a1b7a30028c18deada6f07da71eac62de8aeec235393967e73690da21d17db1ab69696095d3160c615e677ce7284f91af297975c19e3971b2 SHA512 033ad1a9d449e5ef228f3dc568333c8a3516e414109237889ff784a9a56f069e60a0dc6e46375308604b3f96a5551cb2bfe95e578448e4746282fb796ebe2bc2
 AUX openconnect.confd 230 BLAKE2B 6013d6e415ad37f5c4b0d31df011c207978c2f266d94bc081b64c2950ef2a14fd80606abe0f950f443323b43811198838252f2a80e1f3812aed9397ca9809053 SHA512 d773926cf787c5f819f4bdd750ccc6de84a287ce7e0f7322b748a2fb1d88dc4822f8ea0f41c14c60054a54b69caeffe0fc9db76021667b44f0db013ed28cee1b
 AUX openconnect.initd 664 BLAKE2B 5fcf983c474ccb10c2b785f1af161e6f85efcb19fe13abc9710a797633496a48ced470cac73cb9c51e3ad66f5efc9e5c559961cfb4213b12684133410614203c SHA512 5c75143e61fd215e13888b647357cf5626902b74cc4af2a8c147c95412ef9393572a8eb34cd5d86babedf2674ca5c3aa35991101a730a033b5af5c8ee9cc4ad9
 AUX openconnect.logrotate 116 BLAKE2B 308d088f7c06239ec68831e415df420362c1825ae279fa6f736f36df0bf2e7efc8ea6a4ab43d9b53680dd0ab5028c92bf70a0597b56a20da06b302457e7d5f07 SHA512 ea1b6caf6278fea515c299072ee799ab3676014784703d7fa8e4f4d7bfc4599650c386d9706a3e6d92c195c9e5e1628fa6efc1124e1ae72875cc9eaab73cb077
 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
 EBUILD openconnect-9.01-r2.ebuild 3132 BLAKE2B 08ba64720cf15eb6598172e04b27d4424150b9cb9709449e5bb3192923dcd9126cd8bd4ec3fa688cc2fa1b633dda734164c1453e0f38976b463399b422670247 SHA512 24e9038a035afdffb1f95f0c6e9701d1c212aa60667d359a4a1f3ee5e7a705653ec92ee917bd20ec293a204b3c4e4b10d9cec13e65b194d683b22bcd43ca758f
 EBUILD openconnect-9.01-r3.ebuild 3172 BLAKE2B f9d7ad23f49089bbd521cbc64b06939dea570e8b56e93b1cc528227759100555040eb8768292e6538c656d64220d5b1a35be0efe1f2972064980e3a41084c762 SHA512 cf13ffd11a2929b50c68be116613700f6bb975e0b29121fa448bf347e5856fee8211971d25cd257f42c94cfa93934298fcf080759c5ee669584d03187fe12514
-EBUILD openconnect-9.10.ebuild 3521 BLAKE2B beb23a4e41be56bacb9612d3e3850a6561e3e1b8f09295b50d5dd8294430ff4be2a52a9e46ae47b3c99abf263b93ac920dc34ace51fdb72940622786943ebd56 SHA512 bfeb005367eca23f053ca4e12ed4e93fc8c7d71414074ccf0c50dfb05d01b27cbf4dc5e9a2ce635ffcc397473207871a821c3d72c230c680f23d057a3bc1ef65
-EBUILD openconnect-9.11.ebuild 3557 BLAKE2B d7e704e44e6d3b0f637f97a6a5ce861fc0888dacafc66d29f859de554283ee0c8a9af6817a5e56c1d6ec0fb539a7725ee99f988571522c9fa5fa8bea1c232598 SHA512 37af4bc9000870f0680ee09ea846c7a80c38ef7598b748d1a390951ad25c05bca8dcee8b432e10b936314cc732effb088467ba87b95efc2c8e498d9c6bc8ffcc
+EBUILD openconnect-9.12.ebuild 3521 BLAKE2B beb23a4e41be56bacb9612d3e3850a6561e3e1b8f09295b50d5dd8294430ff4be2a52a9e46ae47b3c99abf263b93ac920dc34ace51fdb72940622786943ebd56 SHA512 bfeb005367eca23f053ca4e12ed4e93fc8c7d71414074ccf0c50dfb05d01b27cbf4dc5e9a2ce635ffcc397473207871a821c3d72c230c680f23d057a3bc1ef65
 EBUILD openconnect-9999.ebuild 3521 BLAKE2B beb23a4e41be56bacb9612d3e3850a6561e3e1b8f09295b50d5dd8294430ff4be2a52a9e46ae47b3c99abf263b93ac920dc34ace51fdb72940622786943ebd56 SHA512 bfeb005367eca23f053ca4e12ed4e93fc8c7d71414074ccf0c50dfb05d01b27cbf4dc5e9a2ce635ffcc397473207871a821c3d72c230c680f23d057a3bc1ef65
 MISC metadata.xml 594 BLAKE2B 63b24f0d189e935368858b3f7f4160d9121847dc598ee6fb0cd8ed313d51e03de983584a48a799553349f779c6a18d1f080a906449fe0f4d05cec0f43c4a2c70 SHA512 6a474d13019ee9a325c3b262220a41b1faeaa3315500a2e73670bfea2cb2778036d107fcf783f89d286ec4125460b0cf7a19b85155f9b6b9f9d9459cbf87e070
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..000000000000
--- 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 <floppym@gentoo.org>
-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 <json.h> instead. ]
-
-Bug: https://bugs.gentoo.org/906662
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
-Signed-off-by: David Woodhouse <dwmw2@infradead.org>
----
- 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
deleted file mode 100644
index c0d892b7dd16..000000000000
--- a/net-vpn/openconnect/openconnect-9.11.ebuild
+++ /dev/null
@@ -1,164 +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 autotools linux-info python-any-r1
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git"
-	inherit git-r3
-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} != 9999 ]]; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dwmw2 )"
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/dwmw2@kernel.org.key"
-fi
-
-CONFIG_CHECK="~TUN"
-
-pkg_pretend() {
-	check_extra_config
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; 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() {
-	local PATCHES=(
-		"${FILESDIR}/openconnect-9.11-json-cflags.patch"
-	)
-	default
-	eautoreconf
-}
-
-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-builtin-json
-		--without-java
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	local charset
-	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.
-			sed -i -e '2i exit 77' tests/auth-nonascii || die
-			break
-		fi
-	done
-	addwrite /proc
-	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-9.10.ebuild b/net-vpn/openconnect/openconnect-9.12.ebuild
index bda422a32553..bda422a32553 100644
--- a/net-vpn/openconnect/openconnect-9.10.ebuild
+++ b/net-vpn/openconnect/openconnect-9.12.ebuild