gentoo auto-resync : 15:12:2022 - 09:32:31

11 files changed, 52 insertions, 33 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index ca024b31c3cb..d36c3ac3787e 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index bd799c5ef967..4d60f4190f81 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -32,4 +32,4 @@ EBUILD haproxy-2.6.9999.ebuild 5574 BLAKE2B dabbbf0b346eb35aa295c53157d81a2b98ba
 EBUILD haproxy-2.7.0.ebuild 5574 BLAKE2B dabbbf0b346eb35aa295c53157d81a2b98ba66668769b620cdc154e617e9c3561423ce797afb602b5fecadc31f5397c35d54dbecb2228b66caa7ae24009ff1b7 SHA512 aa71375bb48eda7109897c2c03b86fba79c98b76a3fa9c50cb37b885da17019c2834d14d402cefe8a292aec0c95463681c36bb5224c562dff3e92f0726452956
 EBUILD haproxy-2.7.9999.ebuild 5574 BLAKE2B dabbbf0b346eb35aa295c53157d81a2b98ba66668769b620cdc154e617e9c3561423ce797afb602b5fecadc31f5397c35d54dbecb2228b66caa7ae24009ff1b7 SHA512 aa71375bb48eda7109897c2c03b86fba79c98b76a3fa9c50cb37b885da17019c2834d14d402cefe8a292aec0c95463681c36bb5224c562dff3e92f0726452956
 EBUILD haproxy-9999.ebuild 5574 BLAKE2B dabbbf0b346eb35aa295c53157d81a2b98ba66668769b620cdc154e617e9c3561423ce797afb602b5fecadc31f5397c35d54dbecb2228b66caa7ae24009ff1b7 SHA512 aa71375bb48eda7109897c2c03b86fba79c98b76a3fa9c50cb37b885da17019c2834d14d402cefe8a292aec0c95463681c36bb5224c562dff3e92f0726452956
-MISC metadata.xml 2063 BLAKE2B ddd51cff72847b617a457ac2baee4dd18a90a6a23e0982bc932ab8d3d101312dc2265884d38fcdc1a1cbb3d982b078e5b03a3c13fce07568d9d477688d210b09 SHA512 2198d3735f32f9c22787b1b43fd59bd6a0018ae25e104ee34ce0f27682ad8d6405a37c1c890b5eb41deabe5a5011d07d379e5df780bd8ab2877bd435bb875a1e
+MISC metadata.xml 1950 BLAKE2B ac55c0bbf5c5d26f92eb2e7cf4c7bf9ab6a432e45c192c6d591a3ba8c5457f3e17ecee6ad3fcbf13108d1893e3c8e582a4c6a5a3d842f0376b32869a59373526 SHA512 bbd3bc13f40649db82489e2f50acec08ec2cc7b401b81c071eabf3508bccda789da6d0bd50267d81b5d08c2eadee4cf3ce7fe8a2b57a04841cab38623025f121
diff --git a/net-proxy/haproxy/metadata.xml b/net-proxy/haproxy/metadata.xml
index 8cd6d3d7e5f2..2844de6d94b9 100644
--- a/net-proxy/haproxy/metadata.xml
+++ b/net-proxy/haproxy/metadata.xml
@@ -21,8 +21,6 @@
 	<use>
 		<flag name="net_ns">Enable network namespace support (CONFIG_NET_NS)</flag>
 		<flag name="pcre-jit">Use JIT support for PCRE</flag>
-		<flag name="pcre2">Enable PCRE2 RegEx support</flag>
-		<flag name="pcre2-jit">Use JIT support for PCRE2</flag>
 		<flag name="prometheus-exporter">Also build the prometheus exporter</flag>
 		<flag name="slz">Use <pkg>dev-libs/libslz</pkg> compression library</flag>
 		<flag name="tools">Install additional tools (halog, iprange)</flag>
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 0a1fc13789e2..12a636107dc4 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -11,8 +11,8 @@ DIST squid-4.15.tar.xz 2454176 BLAKE2B 3cb08c806f03fcddd7233b05986434d2be3e62a50
 DIST squid-4.17.tar.xz 2464204 BLAKE2B e227dfbac846dff66f04c6c72d81d667076107653721d14804f079518cef68efc53f5404fbe3306efb0c775a10638661c300a8e7cd3d7ab43c0e57a344387674 SHA512 cea36de10f128f5beb51bdc89604c16af3a820a5ac27284b2aa181ac87144930489688e1d85ce357fe1ed8a4e96e300277b95034a2475cbf86c9d6923ddf7c0a
 DIST squid-5.4.1.tar.xz 2561444 BLAKE2B 3281f592c342b59a1017f4c0829543c857d61c4d1e191461f6e69bda2dc61ff59d5b92a04744dcebb75bd1b5d85c214c1f0bea78a791033a50f29891b6995fb8 SHA512 d53e64e8c44cfc978307f3965c52889d238121735fd201a8286139f974d5db9af41fe886d64e57dfacc87b777f5940cd6123a6e178d12530117cace945a9f6c1
 DIST squid-5.7.tar.xz 2566560 BLAKE2B 4a403ca4f94034356922ea1a4feffd5f5289e2aadbe1585bd04e83ee89712227ce04c53f7e05c10f7c8ac6be67a265a32b47032e7b56e929a172772fa41d5299 SHA512 624a39041a6ceda6c470dc0937616f1aa67200f3db02b4d74095d8d706ed31d6df5e0417dcacde45f6be40b617bee018849793d52c96a626aab32a2b182972aa
-EBUILD squid-4.15-r3.ebuild 8015 BLAKE2B 219a853661c70d8797424bd6461964193b2ad1f173141e546630ba190b61f39a4e89a335db2a6fd184242ecf9bc8fe14b60397a70a865179838f77a0df1ec171 SHA512 ce47b241e6e9fb945214e74439fc94fb0ee68dd024baf8540595ccdd9ef4f246419c09039360b1ba6beab1b2fbc2e8756bc104cb4351e01ce0a3859be21bfcf0
-EBUILD squid-4.17-r1.ebuild 8181 BLAKE2B 4dc3dbebaba4e6f9035a522b92ace1989648957adb4d1c9d614672f8da16a3a9b13dc9ca8378ed2ef00e0aa61ec8a78d639273a9ffcae623a20429297833bf81 SHA512 ad1db57edee84935bfce4dc665bb19115e5b7c06630403284148d569db9ee735527a021311f92cda208c528b96924d2ab4487dd5a966833100cc0b593cea1fa2
-EBUILD squid-5.4.1-r2.ebuild 8248 BLAKE2B c139a046e67cc733c851dd32d29eb339f5ca205bc1b9a0da405fbe0795c76bf061acd049955cc810fc0293e869cb3efeb8620a6c53d56776280545acc5ad03d1 SHA512 f6af01ce4d442a5b18d4a5f824772c3682613fd8e673bd907cf33e7b2c0b34870ca6ed18d46eda7549b31266eea9a8c09576417ef67735749f9abd593557e183
+EBUILD squid-4.15-r3.ebuild 8017 BLAKE2B 0fd277b4ae06a10d440f27775eadc0f1e856a78cf2fca943196ec2a2ff560f387aa1fb6cbdd730858c82be4bca3cbf7f93f17fc817e37944aeb4412c53dd2821 SHA512 808fcf392f01e89609a6266d9a04e9c64b4762b396e16f9e6129069a926311d2247da72221664a31e24e21cf3f48fa1a06df6f37b416c7f7bd55ddd16136fed3
+EBUILD squid-4.17-r1.ebuild 8183 BLAKE2B ca1794b42ea7605d0fc0dae80a5d6071fc7929528d1619848fccd1a05c600057695596026d96efa21a3076b543ac8df20fecbba054a41182cdf317ca2059317b SHA512 7a94968e331c85dd6028d9c958c016c214d936176fae3c2453e8caab31df24bc2b3fa558934b2dc88ceec157af63323fb3ab7e10f893984414f49674fe5b1f6e
+EBUILD squid-5.4.1-r2.ebuild 8250 BLAKE2B 22e77f2b4d875530774a8d73c5fdf71cf0ad7a003c02da559fd52d77aece0e02d120fc4e963791d0baf27764c26d21d631c4f5da8ae30ef97cb1a6fa9d9f983c SHA512 723a783fa59ff8531a661d43669ed49f5013b0b7729f74bd65a831b1c4ba718fd2b6b95f199827ee3c37661de7ff5fc8d3bf330ae6e75179d3c647ec81328fb0
 EBUILD squid-5.7.ebuild 8976 BLAKE2B 036facf09ada31bfcca73131f47646ac07f6b8aee73e4baf3460592a4e2067def5c802d7ef0ba4b68e3d6f6df28b78c235e0ebae0757196e28cf12a012583e23 SHA512 ffc64b6fc1056ab5c906bb1398a07ecb77f620f452c9e1de40553a52544be3d6f7233d5b612c67d09608127a91deb0560037a436e16e862f7cdbc87b97b13f8d
-MISC metadata.xml 1178 BLAKE2B ef1e50d591c080e753b2eded1cb9934d26f46358125188ae539489e7bcaa787862c177e3a72f48217ade968fa1bf7870fb0420ae8fc214cc142522a9bf2675f2 SHA512 72db9b79e1861ccd78df889cd5d95e17fdfdc55846b1f3a21171ff5b24ddada441dc807dc818086689b3c20b9e53e6cbc83abfc5afdaea6d744b486e519b6d64
+MISC metadata.xml 1202 BLAKE2B 0e7d6499fc54269fa0c4880c4331659e00cd6d9c5e090a92bd1bb4fe24d31c4a5347e94c3ea0d1d9186e02ebdffb82e2ea579c83bf8df185a3a8a5b359ac0461 SHA512 a71308b1a790661f6cd9db07b4dbca564b1ecfedf16f6c01360be53aae6c2e08d1f2438c171d80a95176c571988d8978f081525e48005b5dc23482eaafc35b34
diff --git a/net-proxy/squid/metadata.xml b/net-proxy/squid/metadata.xml
index ecf120351c73..73367e6c18ed 100644
--- a/net-proxy/squid/metadata.xml
+++ b/net-proxy/squid/metadata.xml
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-    <email>zlogene@gentoo.org</email>
-    <name>Mikle Kolyada</name>
-</maintainer>
-  <use>
-    <flag name="ecap">Adds support for loadable content adaptation modules
-      (http://www.e-cap.org)</flag>
-    <flag name="esi">Enable ESI for accelerators, will cause squid reverse proxies
-      to be capable of the Edge Acceleration Specification (www.esi.org)</flag>
-    <flag name="htcp">Enable HTCP protocol</flag>
-    <flag name="logrotate">Use <pkg>app-admin/logrotate</pkg> for rotating
-      logs</flag>
-    <flag name="qos">Adds support for Quality of Service using netfilter conntrack
-      - see qos_flow directive for more info</flag>
-    <flag name="ssl-crtd">Adds support for dynamic SSL certificate generation in
-      SslBump environments</flag>
-    <flag name="tproxy">Enables real Transparent Proxy support for Linux Netfilter
-      TPROXY</flag>
-    <flag name="wccp">Enable Web Cache Coordination Protocol</flag>
-    <flag name="wccpv2">Enable Web Cache Coordination V2 Protocol</flag>
-  </use>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
+	</maintainer>
+	<use>
+		<flag name="ecap">Adds support for loadable content adaptation modules (http://www.e-cap.org)</flag>
+		<flag name="esi">Enable ESI for accelerators, will cause squid reverse proxies to be capable of the Edge Acceleration Specification (www.esi.org)</flag>
+		<flag name="htcp">Enable HTCP protocol</flag>
+		<flag name="logrotate">Use <pkg>app-admin/logrotate</pkg> for rotating logs</flag>
+		<flag name="qos">Adds support for Quality of Service using netfilter conntrack - see qos_flow directive for more info</flag>
+		<flag name="ssl-crtd">Adds support for dynamic SSL certificate generation in SslBump environments</flag>
+		<flag name="tproxy">Enables real Transparent Proxy support for Linux Netfilter TPROXY</flag>
+		<flag name="wccp">Enable Web Cache Coordination Protocol</flag>
+		<flag name="wccpv2">Enable Web Cache Coordination V2 Protocol</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">squid-cache/squid</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-proxy/squid/squid-4.15-r3.ebuild b/net-proxy/squid/squid-4.15-r3.ebuild
index fa02246b5aea..48cc9cd92fd3 100644
--- a/net-proxy/squid/squid-4.15-r3.ebuild
+++ b/net-proxy/squid/squid-4.15-r3.ebuild
@@ -41,7 +41,7 @@ COMMON_DEPEND="acct-group/squid
 	qos? ( net-libs/libnetfilter_conntrack )
 	ssl? (
 		!gnutls? (
-			dev-libs/openssl:0=
+			<dev-libs/openssl-3:=
 		)
 		dev-libs/nettle:=
 	)
diff --git a/net-proxy/squid/squid-4.17-r1.ebuild b/net-proxy/squid/squid-4.17-r1.ebuild
index 32578aaf7326..1b47ce85183c 100644
--- a/net-proxy/squid/squid-4.17-r1.ebuild
+++ b/net-proxy/squid/squid-4.17-r1.ebuild
@@ -41,7 +41,7 @@ COMMON_DEPEND="acct-group/squid
 	qos? ( net-libs/libnetfilter_conntrack )
 	ssl? (
 		!gnutls? (
-			dev-libs/openssl:0=
+			<dev-libs/openssl-3:=
 		)
 		dev-libs/nettle:=
 	)
diff --git a/net-proxy/squid/squid-5.4.1-r2.ebuild b/net-proxy/squid/squid-5.4.1-r2.ebuild
index 4a8f16e2cd05..00e0b7db7145 100644
--- a/net-proxy/squid/squid-5.4.1-r2.ebuild
+++ b/net-proxy/squid/squid-5.4.1-r2.ebuild
@@ -42,7 +42,7 @@ COMMON_DEPEND="acct-group/squid
 	qos? ( net-libs/libnetfilter_conntrack )
 	ssl? (
 		!gnutls? (
-			dev-libs/openssl:0=
+			<dev-libs/openssl-3:=
 		)
 		dev-libs/nettle:=
 	)
diff --git a/net-proxy/squidguard/Manifest b/net-proxy/squidguard/Manifest
index f2c673d12b7e..9ab240f654ea 100644
--- a/net-proxy/squidguard/Manifest
+++ b/net-proxy/squidguard/Manifest
@@ -3,6 +3,7 @@ AUX squidGuard.conf.blocksites 192 BLAKE2B 0bbb4b05d91bc2ca78a5ba52213967bb5e428
 AUX squidGuard.conf.minimal 61 BLAKE2B ddc399b51d396868be42a7dd1709e0b2df372dc95696da06916542c12a19ec15a7e596e04aa6454fc81315ee27dc1fddb4bb23fe1d31fcde3ca8c4b42298f85b SHA512 301263fcfaf345c34b5a988ce237bc578fb48f63ab2187b5dd2f146e4cf914bf823fcce49c27f8282e745f3125e32455d9c5a5f425d40ce7785f492663eb959c
 AUX squidguard-1.6.0-gcc-10.patch 1351 BLAKE2B f13224eb35e98fb5ec83d286016404fcbb55976f4616d0dfea52472a29ca2ea8686d5450d32fee99c8198d0d3804bfa07624228c3d843294f34357edf5ddaed7 SHA512 906b8ad819f043115958aac90e88c1c8b17ea1a330d6fd734403bee67b4d7e6bf448ff14cd012df893ae5f5e58e126d8ac31c77e4f1b9447e7317c7cc5f749be
 AUX squidguard-1.6.0-gentoo.patch 982 BLAKE2B 9858c7778fbf52573061fd12d3c3941c4f5b5011c09e7cd54859d6fdd9e969f9e7033abd8cfafa019000309aad50ceac63cc082f5b394ea9ee67c30561376879 SHA512 58b8f9a469fe1ca563f1e9e9425362a594eb7a472f0c019f54d42c06dcee2b6a207ee6dded297c86e06288e78ed62879170b8305b20aa29b37d0b658ef843288
+AUX squidguard-1.6.0-stdlib.patch 531 BLAKE2B 14d62576ff058d542c296073612f8c27d96ec476def77a54adbb26534dc84f5ed172a5b25b080d3380c37d3f0ecd05bf73ac5917f1144381e3ed29d4a72c1ced SHA512 6b352f5ff3bfb93899fe29eaa5f5200f9d9c9e243e0dc6746deffb03cbc543a3f5226b6579bdc3ab30b0b4f0df5e4d760064d65acd8aa962c7cf729fe303e690
 DIST squidguard-1.6.0.tar.gz 1902233 BLAKE2B 36b422fb2424c79532e0d9dc237b4a60b7817190a45de3646a50031b341c5e94540f55adea7b3e8241b8d87fdec551c5c40d1f60ea90e25347305ef9e473b5d3 SHA512 d6e934f550cd777d58abda5f4fd905ccc396afc28e1ddb0bb842a9a3364cbe43db5c30834fe1ed7d93623a361dde50362a79ac2b660382c7e81b4f067f2ac65e
-EBUILD squidguard-1.6.0-r1.ebuild 2350 BLAKE2B 7126728f6f755f4c93f0e2b0d6c02f7c061c5146abe0a101473937181528dd8d76ae6f0c42a70ace45785c09f6a0c68f7a9d6dfa41e88ec4730ee9279f595128 SHA512 6636d5a4bc8662bef43770d0d46352ed62d84f54e44636bcd0af45080df123c84cf7c7d0b9b1cb482cf62dfabdcf2fd817be25048105ae392abb575dd310c9ba
+EBUILD squidguard-1.6.0-r1.ebuild 2386 BLAKE2B 8711b05eaefe048d97cf786c1d0f69442df3114cb4b1b3ef2e259f3abf916a59645d55946a33ba6be6bc6eec8e541f28ddff302d1e1de9a3934270f85e663c6e SHA512 1175d6f11b6fce245b924b0605ebb7130230ed0e457ec3fb2538889533abd1bf71fc51425bcc9f22c994f86ca53c8205dc2569892f46223390571e8c64fe66ca
 MISC metadata.xml 248 BLAKE2B 66e4449d4247cee6b9b5f83956e415b9dbb08cf64770a96cbf98d9be71b52f99633ac4724d01684446f72c07e8604ea59c12df34cefda37386d3f43ab1606425 SHA512 01f5f77d52fbb159724187a68a6d5f9fe00ddd3f04657629c8c432dc8290d499779b3920fd3feeb21a8408bacf3c4064fe14827384569c7e044eb6d81dd9dd93
diff --git a/net-proxy/squidguard/files/squidguard-1.6.0-stdlib.patch b/net-proxy/squidguard/files/squidguard-1.6.0-stdlib.patch
new file mode 100644
index 000000000000..51489b32de5e
--- /dev/null
+++ b/net-proxy/squidguard/files/squidguard-1.6.0-stdlib.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac	2022-12-15 10:33:13.845801113 +0300
++++ b/configure.ac	2022-12-15 10:33:39.828949903 +0300
+@@ -342,6 +342,9 @@
+ LIBS="$LIBS -ldb"
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+     #include <db.h>
++    #ifdef HAVE_STDLIB_H
++        #include <stdlib.h>
++    #endif
+     int main() 
+     {
+         int major, minor, patch;
+@@ -377,6 +378,9 @@
+ 
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+     #include <db.h>
++    #ifdef HAVE_STDLIB_H
++        #include <stdlib.h>
++    #endif
+     int main() 
+     {
+         int major, minor, patch;
diff --git a/net-proxy/squidguard/squidguard-1.6.0-r1.ebuild b/net-proxy/squidguard/squidguard-1.6.0-r1.ebuild
index 6d7d3b3886d4..0491a0e5c9de 100644
--- a/net-proxy/squidguard/squidguard-1.6.0-r1.ebuild
+++ b/net-proxy/squidguard/squidguard-1.6.0-r1.ebuild
@@ -45,7 +45,8 @@ suitable_db_version() {
 src_prepare() {
 	eapply \
 		"${FILESDIR}/${P}-gentoo.patch" \
-		"${FILESDIR}/${P}-gcc-10.patch"
+		"${FILESDIR}/${P}-gcc-10.patch" \
+		"${FILESDIR}/${P}-stdlib.patch"
 
 	# Link only with specific BerkDB versions
 	# Do not inject default paths for library searching