gentoo auto-resync : 17:10:2022 - 07:54:11

9 files changed, 134 insertions, 5 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 6b84a897ddb2..b16b2492e418 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_fastcgi_handler/Manifest b/www-apache/mod_fastcgi_handler/Manifest
index 7183f3ffa19e..c90551c85ba2 100644
--- a/www-apache/mod_fastcgi_handler/Manifest
+++ b/www-apache/mod_fastcgi_handler/Manifest
@@ -1,4 +1,5 @@
 AUX 20_mod_fastcgi_handler.conf 133 BLAKE2B f99f484da6c2e9f0f3255effa62485c9b9b81a118a6a192134d3631acd26765ef4b32ddf366d9ac0c8979206b891a07f7750a3983354488c50a950edb44d21c7 SHA512 d78c4d4f5ed85d8b42c435684d302dcbfc3f6eae6bdef3035226ad7da6225aee38dc05899b8b8c282bf77c61fe3422b4de5b48db4c948f9df49465e54f999f2f
+AUX mod_fastcgi_handler-0.6-implicit-function-decl.patch 636 BLAKE2B dabc4ba7fcf3ca1ae2f14e47f577bf8e057ce04d6d871401cf31cf6e1f905e4c5a20d6cfb94d90a4b7c6a0722490caaeb7122a431185f2cf2e169d545339972a SHA512 b19cd7452cbd684b3136a860e874fd7e74e41285e7608322e445c5f003bb95ef7d28c14d8a4ddc85692323b20accd2ebae04a9ca01b2b9e2494e3b59d0d94e3f
 DIST mod_fastcgi_handler-0.6.tar.gz 10974 BLAKE2B c5613ba343510845c04e75cef815a2ab938aae9b7e2bc78cd709d562734f01f950ceb0b8bcbf2db0e0897c19d61c8d8667a01d82693d5f99971c80b57f73107d SHA512 05b86eb584b74e86924e84dad74072ea4dc318d2d3f1826477cfc45d2f5ea86b8b35d946f5cb1b6472cf21f18636dd2132af06bd27774551f5f5c8c557ed7d6b
-EBUILD mod_fastcgi_handler-0.6-r2.ebuild 601 BLAKE2B b0c1c9fcde80fd1bba887219121ed28ff7d40c809eba36bdb298ce778c01c1d3e6ff1155e86625baa46d0a0791107a1ad5b8fff07762378854a145a162540774 SHA512 10470b7e78dcf41f80a2a802a1200527e6c2b240084f3d07d934b23b979c248719bdd323d5107cf9aba4fd435c6b4deede734eb3f00946daa7469b14318cf222
+EBUILD mod_fastcgi_handler-0.6-r3.ebuild 668 BLAKE2B b09941b2ce7e6e0db59d300dfaa65fe5712af260515ff0dd874df57752f266e2b75cd789258db048534ccb466dcb411415883055975924f4933d52e5e140ef3d SHA512 938a0d324c8bf84fada069147bcc3372f0cbe98777195b698059638f2fb4d7d587c998c16783bcabe357eba062fea4516a4ac2375df72cdd4dc2f29fe66a5f1e
 MISC metadata.xml 257 BLAKE2B 2cbb256ee0fbc99ec8386f10521264beca23485c5574ca3594411ea6d4dfbaa694e5c1fd2a2ff7c8f80cd0f5a49afe331a798038a8e257a768250d6776949156 SHA512 88a59f7ce8d13d6d082795fe4e61155ed0123ed779e31676be5ecc87413b1791659fe86c5aa2fe7c4dd3e0b62396d498efc128cf1bc8a7b511d07af68b8d16f1
diff --git a/www-apache/mod_fastcgi_handler/files/mod_fastcgi_handler-0.6-implicit-function-decl.patch b/www-apache/mod_fastcgi_handler/files/mod_fastcgi_handler-0.6-implicit-function-decl.patch
new file mode 100644
index 000000000000..602590fb3ed5
--- /dev/null
+++ b/www-apache/mod_fastcgi_handler/files/mod_fastcgi_handler-0.6-implicit-function-decl.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/875701
+--- a/fcgi_request.c
++++ b/fcgi_request.c
+@@ -10,6 +10,7 @@
+ 
+ #include "fcgi_header.h"
+ #include "fcgi_request.h"
++#include "fcgi_server.h"
+ 
+ #include "mod_fastcgi_handler.h"
+ 
+--- a/fcgi_server.c
++++ b/fcgi_server.c
+@@ -7,6 +7,7 @@
+ #include <httpd.h>
+ #include <http_config.h>
+ #include <http_log.h>
++#include <http_request.h>
+ #include <util_filter.h>
+ #include <util_script.h>
+ 
+@@ -424,6 +425,8 @@ int fcgi_server_parse_headers(fcgi_request_t *fr, uint16_t request_id,
+ 		 */
+ 		return HTTP_MOVED_TEMPORARILY;
+ 	}
++
++	return ret;
+ }
+ 
+ int fcgi_server_recv_stdout_stderr_record(fcgi_request_t *fr,
diff --git a/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r2.ebuild b/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r3.ebuild
index fb9676278d0d..2f1bc9162ce7 100644
--- a/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r2.ebuild
+++ b/www-apache/mod_fastcgi_handler/mod_fastcgi_handler-0.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,10 @@ APACHE2_MOD_DEFINE="FASTCGI_HANDLER"
 
 APXS2_ARGS="-o ${PN}.so -c *.c"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6-implicit-function-decl.patch
+)
+
 need_apache2
 
 pkg_setup() {
diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 68dc8e3983ce..7b652141cab5 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,3 +1,4 @@
+AUX mod_jk-1.2.48-clang16.patch 2217 BLAKE2B d215679542c35f099dd16f64e1ec50907ae695a3d32c09a602d38c1baf9d75243033299fbc1da73961e19088cbf671b539d7dad460710969552159cb68f6a740 SHA512 4bd44d4004997ce38d148af7b8bb2fcba90d74c6b64b17a148a53d63d4e1ce266e8dd82459246645b7f62e51ad34b22891df7e630ba25349ec8a17a932ba5306
 DIST tomcat-connectors-1.2.48-src.tar.gz 3665280 BLAKE2B eca84f31235e441dea08fd7f0e44de4370799e9781384a0a4329ae48c9dab4b146733bf810669fdcf60ede9e67e139942ccfe12c74e15f4eda19d9107f9b6150 SHA512 955a830724a3902e29032a5d2e7603d3170334e8a383d314f6bf8539d53d9f7ee4cfa0b31cfc954acb0a13d9975ed2229de085d08de3885f8679b509924fde47
-EBUILD mod_jk-1.2.48.ebuild 1647 BLAKE2B 194a95155693935396536601d36eee2532deb8c47802ee009161937b299f4932e39b6826cb692d24e08d16ad492c4272697bbf73bfe97ed6446792a766e82123 SHA512 24a6ad3f82861c41cba5717ca17cfe798f73d9082da659b1e08f6b5fe9687bfe636801a8363aa705517d738adaa4f17901368d383d83c12efc70f7d026b4cbbc
+EBUILD mod_jk-1.2.48-r1.ebuild 1694 BLAKE2B 267a901a21ea33ae3c21c65913e94960287141c5c16cd121b7fac9c892d971267068183f07c648e2b59a11ff8017456b85cad3462721a33d61b1a2a2687d0ae7 SHA512 4eda7ee3ad5380a82ed3839b0536684d2debb99bad2c2d4e87219f81430e39e3245083103a7d874aa5e71b86f360e0cd8ceacf76784b2071e2404a8d8db9c667
 MISC metadata.xml 617 BLAKE2B 2fe52915ee2fdf01518b2631479934838c85820e4803792e6c4c69e7ee490cd08aea7f4a269eb456a258d6433fd5f323866439ca61c40f86a256ee941b4457e2 SHA512 0df6992cc0912e1a93b5ca9e5d3c5470e9a91b065714bd77391a8efbf8118bcede4aecb2263a3cd0e4c0a3ad1bfe006db7ee524fe4148e04a69dcbad0dbd18b7
diff --git a/www-apache/mod_jk/files/mod_jk-1.2.48-clang16.patch b/www-apache/mod_jk/files/mod_jk-1.2.48-clang16.patch
new file mode 100644
index 000000000000..e776eb626608
--- /dev/null
+++ b/www-apache/mod_jk/files/mod_jk-1.2.48-clang16.patch
@@ -0,0 +1,87 @@
+https://bugs.gentoo.org/875122
+
+First commit: https://github.com/apache/tomcat-connectors/commit/e719874b21a526cb3447c747b9901719cf46eafe
+The rest: https://github.com/apache/tomcat-connectors/pull/6
+
+From: Mark Thomas <markt@apache.org>
+Date: Wed, 30 Jun 2021 10:58:58 +0100
+Subject: [PATCH] Fix BZ 64878 - Fix build in MaxOS
+
+With thanks to don@isle.plus at
+https://bz.apache.org/bugzilla/show_bug.cgi?id=64753#c13
+
+https://bz.apache.org/bugzilla/show_bug.cgi?id=64878
+--- a/scripts/build/jk_common.m4
++++ b/scripts/build/jk_common.m4
+@@ -35,6 +35,7 @@ changequote([, ])dnl
+ AC_MSG_CHECKING(size of $2)
+ AC_CACHE_VAL(AC_CV_NAME,
+ [AC_TRY_RUN([#include <stdio.h>
++#include <stdlib.h>
+ $1
+ main()
+ {
+
+From f5403f13b52c50a19afa4e16dbbb66c31dce565b Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 17 Oct 2022 03:46:06 +0100
+Subject: [PATCH 1/2] Fix -Wimplicit-int
+
+Becomes fatal with Clang 15.
+--- a/scripts/build/jk_common.m4
++++ b/scripts/build/jk_common.m4
+@@ -37,7 +37,7 @@ AC_CACHE_VAL(AC_CV_NAME,
+ [AC_TRY_RUN([#include <stdio.h>
+ #include <stdlib.h>
+ $1
+-main()
++int main()
+ {
+   FILE *f=fopen("conftestval","w");
+   if (!f) exit(1);
+From c896afdb44d26186bd93301827f4b0b7888ac116 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 17 Oct 2022 03:51:06 +0100
+Subject: [PATCH 2/2] configure.ac: Fix more implicit function declarations
+
+Becomes fatal in Clang 16.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -303,9 +303,11 @@ AC_CHECK_HEADERS(sys/filio.h)
+ AC_DEFUN([JK_CHECK_SETSOCKOPT], [
+ AC_MSG_CHECKING(whether to use $1 with setsockopt())
+ AC_TRY_RUN([
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
++#include <stdlib.h>
+ 
+ int main(void)
+ {
+@@ -344,6 +346,7 @@ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
++#include <stdlib.h>
+ 
+ int main(void)
+ {
+@@ -395,6 +398,7 @@ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
++#include <stdlib.h>
+ 
+ int main(void)
+ {
+@@ -416,6 +420,7 @@ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
++#include <stdlib.h>
+ 
+ int main(void)
+ {
diff --git a/www-apache/mod_jk/mod_jk-1.2.48.ebuild b/www-apache/mod_jk/mod_jk-1.2.48-r1.ebuild
index 739db0daedf4..2593c36b65c2 100644
--- a/www-apache/mod_jk/mod_jk-1.2.48.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.48-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,6 +23,10 @@ BDEPEND="dev-lang/perl"
 APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
 APACHE2_MOD_DEFINE="JK"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-clang16.patch
+)
+
 need_apache2
 
 pkg_setup() {
diff --git a/www-apache/mod_musicindex/Manifest b/www-apache/mod_musicindex/Manifest
index 9b86f7fde9e1..6e15d1f6b521 100644
--- a/www-apache/mod_musicindex/Manifest
+++ b/www-apache/mod_musicindex/Manifest
@@ -3,5 +3,5 @@ DIST mod_musicindex-1.4.1.tar.gz 508795 BLAKE2B 272cdddc16097b55c7b89df42f72c460
 DIST mod_musicindex-1.4.1_valid-rss.png 1523 BLAKE2B 679a17627a73561ca2fa02bf3c3a8e3ec71883b65b0215d4a580e441f2c935538e4477228c7e0ea83df2322e7b7158e0f0cfd9f895744cf10080a5e3f698c936 SHA512 e9df8ea0c6da2d1f268f8aa17e396dcdf53a61d1196ed67f44f03f22f0c5a9661a1e8a96f6d506c02374bc4f0923be9371372a2c678b705017ee733be2b402ec
 DIST mod_musicindex-1.4.1_valid-xhtml11 1842 BLAKE2B b145d2c8d36e677db38dc8a8ad31e7c69b29d28a56aae8c0c4c89319d95ece7f164968b02f30b6abb425309f4c77a1ead59b2058365eee161ed9b7898685d4e3 SHA512 8beb13a595b402e7de416ae05992f3e0a17719554fbc83cd5c3e0518cd859c560339a61c2f198c8e4982ca397f29823b521e05f29ed632826bfb02646990cc9c
 DIST mod_musicindex-1.4.1_vcss 1547 BLAKE2B 465f63519c64353e1ec6d62e99ea9cf95c00244c717d9bc8d2213723dc55d6186589446a19725d5b8c95f45800946040ad9bfe89ec0b951c514651a9447ad281 SHA512 6c2fa4a0c3fbad68752d7471f95838b69816fd00f58c28f32076af24972117d8b0f2cebb075548ec1317f886a8955cf5686dda571c4d5a823d3ff09da8e33a70
-EBUILD mod_musicindex-1.4.1-r3.ebuild 1569 BLAKE2B 3164fd536ab3777191b708f20f672587a8cdf5e94b18a1127e20cbf46651dbd3560a42e7cdea204cf38730ab1d7fa2ca9955d7738cc96eab61f2e1b8424eea1c SHA512 d5b43b026243501cc996f3e25f5ada278ed7559041824215138f5ac5cd47798fd3b1ff5dc226be2068ba5abdeead8aff255a57ebc8d62e141b50bb1509d9ac85
+EBUILD mod_musicindex-1.4.1-r3.ebuild 1690 BLAKE2B be444b9af65f8c19ada65e7ae4e5b6f04fe30dbcd3a0fd70de241e9e12a5d62eba249e29b54fdfbda96f4b9c80d63b36916b192410916e399d997ebea5d878d3 SHA512 efa25b5ac26c45f38371acff6fb67096bed0e1d8adab1f409c29aec9f88708b4a2f83b8001f2b8728bb6bf0abc0e04f12cfdb3a23b11c4331bb53e2836869a76
 MISC metadata.xml 334 BLAKE2B bf19e7af99a17373a2634ed2f0d807bacbc1a3f902483b8ebca8e10f348e8fe8290b56c9b88aba3fa99c28b65fa609b0720bc5472e9cbc579c87316e7ae83311 SHA512 4c24167ab1c904d81dd7c08dcc8cbda63e0155566007fedc60562109ac73a231bad27cbf0315680eca759d8c33939a4cad1ac4476a691a5b6a21bc5c5b9a63c7
diff --git a/www-apache/mod_musicindex/mod_musicindex-1.4.1-r3.ebuild b/www-apache/mod_musicindex/mod_musicindex-1.4.1-r3.ebuild
index d8cc0a001219..fa92548ef157 100644
--- a/www-apache/mod_musicindex/mod_musicindex-1.4.1-r3.ebuild
+++ b/www-apache/mod_musicindex/mod_musicindex-1.4.1-r3.ebuild
@@ -38,6 +38,8 @@ pkg_setup() {
 
 src_configure() {
 	econf \
+		--with-vorbis-libraries="${ESYSROOT}/usr/$(get_libdir)" \
+		--with-libFLAC-libraries="${ESYSROOT}/usr/$(get_libdir)" \
 		$(use_enable mp3) \
 		$(use_enable mp4) \
 		$(use_enable flac) \