gentoo auto-resync : 20:05:2023 - 04:17:09

4 files changed, 65 insertions, 6 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 1073950163b6..c6b72c7dd53c 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index 54c6ae46344d..1daf33c6e618 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -1,5 +1,6 @@
 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
@@ -11,6 +12,6 @@ DIST openconnect-9.11.tar.gz.asc 833 BLAKE2B de1f38aaf6abd158ef8d54934f239b88b72
 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 3521 BLAKE2B beb23a4e41be56bacb9612d3e3850a6561e3e1b8f09295b50d5dd8294430ff4be2a52a9e46ae47b3c99abf263b93ac920dc34ace51fdb72940622786943ebd56 SHA512 bfeb005367eca23f053ca4e12ed4e93fc8c7d71414074ccf0c50dfb05d01b27cbf4dc5e9a2ce635ffcc397473207871a821c3d72c230c680f23d057a3bc1ef65
+EBUILD openconnect-9.11.ebuild 3557 BLAKE2B d7e704e44e6d3b0f637f97a6a5ce861fc0888dacafc66d29f859de554283ee0c8a9af6817a5e56c1d6ec0fb539a7725ee99f988571522c9fa5fa8bea1c232598 SHA512 37af4bc9000870f0680ee09ea846c7a80c38ef7598b748d1a390951ad25c05bca8dcee8b432e10b936314cc732effb088467ba87b95efc2c8e498d9c6bc8ffcc
 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
new file mode 100644
index 000000000000..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 <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
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} == 9999 ]]; 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} == 9999 ]]; then
-		eautoreconf
-	fi
+	eautoreconf
 }
 
 src_configure() {