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

3 files changed, 94 insertions, 2 deletions

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() {