commit: 330b772dc0b59671cb55ed36856d876868bc94b7 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Sat Mar 16 15:32:32 2024 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sat Mar 16 20:25:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=330b772d
www-apache/mod_jk: fix global symbols The libtool -export-symbols-regex flag controls which symbols are exported globally in the library, but GNU libtool silently drops many unknown flags... Closes: https://bugs.gentoo.org/914237 Upstream-Commit: https://github.com/apache/tomcat-connectors/commit/ecd005d0792441c4510dc4c2d9348979ab71ddcc Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/gentoo/pull/35781 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../files/mod_jk-1.2.49-export-symbols-regex.patch | 40 ++++++++++++++++++++++ ...od_jk-1.2.49.ebuild => mod_jk-1.2.49-r1.ebuild} | 5 ++- 2 files changed, 44 insertions(+), 1 deletion(-) 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 new file mode 100644 index 000000000000..1dd05d9c70ed --- /dev/null +++ b/www-apache/mod_jk/files/mod_jk-1.2.49-export-symbols-regex.patch @@ -0,0 +1,40 @@ +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 <[email protected]> +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/mod_jk-1.2.49.ebuild b/www-apache/mod_jk/mod_jk-1.2.49-r1.ebuild similarity index 94% rename from www-apache/mod_jk/mod_jk-1.2.49.ebuild rename to www-apache/mod_jk/mod_jk-1.2.49-r1.ebuild index f11868d35b60..4356eed57aec 100644 --- a/www-apache/mod_jk/mod_jk-1.2.49.ebuild +++ b/www-apache/mod_jk/mod_jk-1.2.49-r1.ebuild @@ -24,7 +24,10 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors ) " -PATCHES=( "${FILESDIR}/${PN}-1.2.49-musl.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-1.2.49-export-symbols-regex.patch" #914237 + "${FILESDIR}/${PN}-1.2.49-musl.patch" +) APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so" APACHE2_MOD_DEFINE="JK"
