[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/, www-apache/mod_jk/files/
commit: 579a63f5448e7c055b94a0011e9076bf0f3c47eb
Author: Conrad Kostecki gentoo org>
AuthorDate: Tue Jan 23 21:24:36 2024 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Tue Jan 23 21:25:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=579a63f5
www-apache/mod_jk: fix build on musl
Closes: https://bugs.gentoo.org/830179
Signed-off-by: Conrad Kostecki gentoo.org>
www-apache/mod_jk/files/mod_jk-1.2.49-musl.patch | 26
www-apache/mod_jk/mod_jk-1.2.49.ebuild | 9 +---
2 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/www-apache/mod_jk/files/mod_jk-1.2.49-musl.patch
b/www-apache/mod_jk/files/mod_jk-1.2.49-musl.patch
new file mode 100644
index ..65327fcc8bc3
--- /dev/null
+++ b/www-apache/mod_jk/files/mod_jk-1.2.49-musl.patch
@@ -0,0 +1,26 @@
+From 479102b941ac4c8c86ce102ec6e5bc9ad59b0d89 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki
+Date: Tue, 23 Jan 2024 22:10:38 +0100
+Subject: [PATCH] native/common/jk_global.h: fix compilation on musl
+
+On musl, sys/socketvar.h does not exist, so we need to make sure,
+not to use it.
+
+Signed-off-by: Conrad Kostecki
+---
+ common/jk_global.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common/jk_global.h b/common/jk_global.h
+index adcbd95f1..f4680ef8b 100644
+--- a/common/jk_global.h
b/common/jk_global.h
+@@ -148,7 +148,7 @@ extern char *strdup(const char *str);
+ #include
+ #include
+ #include
+-#if !defined(_OSD_POSIX) && !defined(AS400) && !defined(__CYGWIN__) &&
!defined(HPUX11)
++#if !defined(_OSD_POSIX) && !defined(AS400) && !defined(__CYGWIN__) &&
!defined(HPUX11) && !defined(PLATFORM_LINUX)
+ #include
+ #endif
+ #if !defined(HPUX11) && !defined(AS400)
diff --git a/www-apache/mod_jk/mod_jk-1.2.49.ebuild
b/www-apache/mod_jk/mod_jk-1.2.49.ebuild
index c096d3428647..f11868d35b60 100644
--- a/www-apache/mod_jk/mod_jk-1.2.49.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.49.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,11 +21,14 @@ DEPEND="dev-libs/apr:1="
RDEPEND="${DEPEND}"
BDEPEND="
dev-lang/perl
- verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
+ verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.2.49-musl.patch" )
APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
APACHE2_MOD_DEFINE="JK"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
need_apache2
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/, www-apache/mod_jk/files/
commit: 56840607b2d8d7aa1b9d620b7bca1618a8394551
Author: Sam James gentoo org>
AuthorDate: Mon Oct 17 02:49:25 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 17 03:15:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56840607
www-apache/mod_jk: fix build w/ Clang 16
Closes: https://bugs.gentoo.org/875701
Signed-off-by: Sam James gentoo.org>
.../mod_jk/files/mod_jk-1.2.48-clang16.patch | 87 ++
...od_jk-1.2.48.ebuild => mod_jk-1.2.48-r1.ebuild} | 6 +-
2 files changed, 92 insertions(+), 1 deletion(-)
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 ..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
+Date: Wed, 30 Jun 2021 10:58:58 +0100
+Subject: [PATCH] Fix BZ 64878 - Fix build in MaxOS
+
+With thanks to d...@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
++#include
+ $1
+ main()
+ {
+
+From f5403f13b52c50a19afa4e16dbbb66c31dce565b Mon Sep 17 00:00:00 2001
+From: Sam James
+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
+ #include
+ $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
+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
+--- 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
+ #include
+ #include
+ #include
++#include
+
+ int main(void)
+ {
+@@ -344,6 +346,7 @@ AC_TRY_RUN([
+ #include
+ #include
+ #include
++#include
+
+ int main(void)
+ {
+@@ -395,6 +398,7 @@ AC_TRY_RUN([
+ #include
+ #include
+ #include
++#include
+
+ int main(void)
+ {
+@@ -416,6 +420,7 @@ AC_TRY_RUN([
+ #include
+ #include
+ #include
++#include
+
+ 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
similarity index 95%
rename from www-apache/mod_jk/mod_jk-1.2.48.ebuild
rename to 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() {
[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/, www-apache/mod_jk/files/
commit: 2fe9d88f75d60120efe21e4364c343c4b9e6f017 Author: Conrad Kostecki gentoo org> AuthorDate: Sun Apr 4 19:20:42 2021 + Commit: Conrad Kostecki gentoo org> CommitDate: Sun Apr 4 19:20:51 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe9d88f www-apache/mod_jk: drop old version 1.2.42 Dropping old version, as it contains mulitple open security vulnerabilities. Bug: https://bugs.gentoo.org/780051 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Conrad Kostecki gentoo.org> www-apache/mod_jk/Manifest| 1 - www-apache/mod_jk/files/88_mod_jk.conf| 165 -- www-apache/mod_jk/files/jk-workers.properties | 36 -- www-apache/mod_jk/mod_jk-1.2.42.ebuild| 60 -- 4 files changed, 262 deletions(-) diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest index a4a25989cf8..55838aac990 100644 --- a/www-apache/mod_jk/Manifest +++ b/www-apache/mod_jk/Manifest @@ -1,2 +1 @@ -DIST tomcat-connectors-1.2.42-src.tar.gz 3143693 BLAKE2B d1ea2a85ec80a5e207896f3225049c12e96c5cb6d1734306ec7a268d0963f1c368bcf963b529e17efdf448c0f8ad3257902340f969b5a0bc6ee9644af4bb3772 SHA512 9a796e2a7865a99c16595deaead94e843c291ed7229f48414edf0a260b2dda05fc94671e8b863a9ccef719bbe2ca7622c06e3dae6ccf68a41f7d96e847b68791 DIST tomcat-connectors-1.2.48-src.tar.gz 3665280 BLAKE2B eca84f31235e441dea08fd7f0e44de4370799e9781384a0a4329ae48c9dab4b146733bf810669fdcf60ede9e67e139942ccfe12c74e15f4eda19d9107f9b6150 SHA512 955a830724a3902e29032a5d2e7603d3170334e8a383d314f6bf8539d53d9f7ee4cfa0b31cfc954acb0a13d9975ed2229de085d08de3885f8679b509924fde47 diff --git a/www-apache/mod_jk/files/88_mod_jk.conf b/www-apache/mod_jk/files/88_mod_jk.conf deleted file mode 100644 index 1c66783cca1..000 --- a/www-apache/mod_jk/files/88_mod_jk.conf +++ /dev/null @@ -1,165 +0,0 @@ - -LoadModule jk_modulemodules/mod_jk.so - -### -### Where to find workers.properties -### -# JkWorkersFile specify the location where mod_jk will find -# the workers definitions. -JkWorkersFile /etc/apache2/jk-workers.properties - - -### -### Where to put mod_jk logs -### -# specify the location where mod_jk is going to place its log file. -JkLogFile /var/log/apache2/mod_jk.log - -### -### Where to put mod_jk shm file -### -# specify the location where mod_jk is going to place its shared memory file. -JkShmFile /var/log/apache2/jk-runtime-status - -### -### Set the jk log level [debug/error/info] -### -# info log will contains standard mod_jk activity (default). -# error log will contains also error reports. -# debug log will contains all informations on mod_jk activity -JkLogLevel info - - -### -### Select the log format -### -# JkLogStampFormat will configure the date/time format found -# on mod_jk logfile. Using the strftime() format string it's -# set by default to "[%a %b %d %H:%M:%S %Y]" -#JkLogStampFormat "[%a %b %d %H:%M:%S %Y] " - - -### -### JkOptions indicate to send SSL KEY SIZE, -### -# The directive JkOptions allow you to set many forwarding -# options which will enable (+) or disable (-) following option. -# -# -# JkOptions ForwardKeySize , you ask mod_jk, when using ajp13, to -# forward also the SSL Key Size as required by Servlet API 2.3. -# This flag shouldn't be set when servlet engine is Tomcat 3.2.x -# (on by default). -# -# -# JkOptions ForwardURICompat , you told mod_jk to send the URI to -# Tomcat normally, which is less spec compliant but mod_rewrite -# compatible, use it for compatibility with Tomcat 3.2.x engines -# (on by default). -# -# -# JkOptions ForwardURICompatUnparsed , the forwarded URI is unparsed, -# it's spec compliant but broke mod_rewrite. -# -# -# JkOptions ForwardURIEscaped , the forwarded URI is escaped and -# Tomcat (since 3.3 rc2) will do the decoding part. -# -# -# JkOptions ForwardDirectories is used in conjunction with Directory- -# Index directive of Apache web server. As such mod_dir should be -# available to Apache, statically or dynamically (DSO) -# -# When DirectoryIndex is configured, Apache will create sub-requests -# for each of the local-url's specified in the directive, to determine -# if there is a local file that matches (this is done by stat-ing the file). -# -# If ForwardDirectories is set to false (default) and Apache doesn't -# find any files that match, Apache will serve the content of the -# directory (if directive Options specifies Indexes for that directory) -# or a 403 Forbidden response (if directive Options doesn't specify -# Indexes for that directory). -# -# If ForwardDirectories is set to true and Apache doesn't find any -# files that match, the request will be forwarded to Tomcat for -# resolution. This is used in cases when Apache cannot see the index -# files on the file system for various reasons: Tomcat is running on -# a different machine, the JSP file has been precompiled etc. -# -# Note that locally visible files will take
