diff options
Diffstat (limited to 'www-apache')
| -rw-r--r-- | www-apache/Manifest.gz | bin | 5571 -> 5572 bytes | |||
| -rw-r--r-- | www-apache/mod_jk/Manifest | 2 | ||||
| -rw-r--r-- | www-apache/mod_jk/files/mod_jk-1.2.49-export-symbols-regex.patch | 40 | ||||
| -rw-r--r-- | www-apache/mod_jk/files/mod_jk-1.2.49-musl.patch | 26 |
4 files changed, 0 insertions, 68 deletions
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz Binary files differindex 56c44f0dab7f..02d0a73fb4a5 100644 --- a/www-apache/Manifest.gz +++ b/www-apache/Manifest.gz diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest index fbd5a5ed27b2..77837a967bd0 100644 --- a/www-apache/mod_jk/Manifest +++ b/www-apache/mod_jk/Manifest @@ -1,5 +1,3 @@ -AUX mod_jk-1.2.49-export-symbols-regex.patch 1352 BLAKE2B dd9c7325be14083b3ba81235c7c195ec450052089061efb5cee58c6bfa7df5bf4ffe63a9eb3a7821863e3131ed4faa8786b5b85e9593ea7054b5fcf38b14d3fe SHA512 cdd7eecc9bc3fe5af9d7c85b18800b4ae1e859c667d5db5262df40da1009e4e944fe73b2c88027f570b6082ea47edf05eff24a99025df7cef3cf20913a77fb9c -AUX mod_jk-1.2.49-musl.patch 985 BLAKE2B e7cc5412d74f2df9c28ebe7eddf7594214931eecf5ec20c1c6486ea48e1aa79e86f95931568425af73535a3df37a44e8e2620e502b03d85338db2b15219b2ceb SHA512 77635b10c5e14466c57512a3423673aa2b488b73abb2727522b321f71db3d7aed39ab0b6f7e783cc246742c973d5f7dd5d8b9039a6cc6274656f1761b174ca07 DIST tomcat-connectors-1.2.50-src.tar.gz 1738508 BLAKE2B ffa76cde244010169753d903735157fadcc93e91f32cb604247a8db801d6c05cf67817f457f11ba1aaa3b9d5ae480fad4bde2e50f3114e4e64a70117062419b4 SHA512 9b5a1eb1c0fd38627c574102b3551cdc96fc438b00be5d65770c55b43234af445e642fe8bcbdfe47686b0f3aadab3679340fa76b54b693f57f2273e83ac114ab DIST tomcat-connectors-1.2.50-src.tar.gz.asc 833 BLAKE2B e27ef4f7a194623f6561b30f9a97ba0dd1391404d44577e8bfe8663513bf12801753d859fbd75c63d1ceafa59493d338f5b0a1db2eb3678caf807293dc2acd7e SHA512 359721d9bbf121415b655082db5dc9ca7e98aa952038e89c49a69da0c77a4cd183a3e4c40107aa4803885332439868abfe9473b296e99480d01dd2ccc4c9b98b EBUILD mod_jk-1.2.50.ebuild 1920 BLAKE2B 46554274869ef2270dcb2d5ec0b7219f3b25688aab6f2aceb77f95ddd32e88c47e5e0414ccdd8c7102c61078dc32ad04b4a73fe55a8c89a984f0a8ae94be5294 SHA512 4bc5b2b4e56d9a10c0f06616be06a0e90bb3c8212462155847b6cd739969724ca505b5c1a485f300287d10c9531228d61571b6afc1af17c10f77a99a9998952f diff --git a/www-apache/mod_jk/files/mod_jk-1.2.49-export-symbols-regex.patch b/www-apache/mod_jk/files/mod_jk-1.2.49-export-symbols-regex.patch deleted file mode 100644 index 1dd05d9c70ed..000000000000 --- a/www-apache/mod_jk/files/mod_jk-1.2.49-export-symbols-regex.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://bugs.gentoo.org/914237 -https://github.com/apache/tomcat-connectors/commit/ecd005d0792441c4510dc4c2d9348979ab71ddcc - -From ecd005d0792441c4510dc4c2d9348979ab71ddcc Mon Sep 17 00:00:00 2001 -From: Rainer Jung <rainer.jung@kippdata.de> -Date: Fri, 10 Nov 2023 11:38:04 +0100 -Subject: [PATCH] BZ 68117: Fix typo and escaping in libtool flag introduced in - 1.2.49. - ---- - apache-2.0/Makefile.apxs.in | 2 +- - apache-2.0/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/apache-2.0/Makefile.apxs.in b/apache-2.0/Makefile.apxs.in -index 36aeada1c..161616502 100644 ---- a/apache-2.0/Makefile.apxs.in -+++ b/apache-2.0/Makefile.apxs.in -@@ -21,7 +21,7 @@ top_builddir=@top_builddir@ - APXS=@APXS@ - APXSCFLAGS=@APXSCFLAGS@ - APXSLDFLAGS=@APXSLDFLAGS@ --JKLDFLAGS=-export-symbols-regex ^jk_module$ -+JKLDFLAGS=-export-symbols-regex ^jk_module\$$ - - COMMON=common - JK_INCL=-DUSE_APACHE_MD5 -I${top_builddir}/${COMMON} -I ${top_srcdir}/${COMMON} -diff --git a/apache-2.0/Makefile.in b/apache-2.0/Makefile.in -index e63f5c921..a9327743b 100644 ---- a/apache-2.0/Makefile.in -+++ b/apache-2.0/Makefile.in -@@ -23,7 +23,7 @@ MKDIR=@MKDIR@ - APXSCFLAGS=@APXSCFLAGS@ - APXSCPPFLAGS=@APXSCPPFLAGS@ - APXSLDFLAGS=@APXSLDFLAGS@ --JKLDFLAGS=-export-symbols-regexp ^jk_module$ -+JKLDFLAGS=-export-symbols-regex ^jk_module\$$ - - CC=@CC@ - SHELL=@SHELL@ 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 deleted file mode 100644 index 65327fcc8bc3..000000000000 --- a/www-apache/mod_jk/files/mod_jk-1.2.49-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 479102b941ac4c8c86ce102ec6e5bc9ad59b0d89 Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <conikost@gentoo.org> -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 <conikost@gentoo.org> ---- - 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 <netinet/tcp.h> - #include <arpa/inet.h> - #include <sys/un.h> --#if !defined(_OSD_POSIX) && !defined(AS400) && !defined(__CYGWIN__) && !defined(HPUX11) -+#if !defined(_OSD_POSIX) && !defined(AS400) && !defined(__CYGWIN__) && !defined(HPUX11) && !defined(PLATFORM_LINUX) - #include <sys/socketvar.h> - #endif - #if !defined(HPUX11) && !defined(AS400) |