commit: 50f46cc62d7d32b4887acadc68f70bd67a7fb594 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Mon Oct 14 15:37:06 2024 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Tue Oct 15 21:45:38 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50f46cc6
www-apache/mod_jk: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../files/mod_jk-1.2.49-export-symbols-regex.patch | 40 ---------------------- www-apache/mod_jk/files/mod_jk-1.2.49-musl.patch | 26 -------------- 2 files changed, 66 deletions(-) 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.j...@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 <conik...@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 <conik...@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)
