onkelbeh
/
GentooRepository
mirror of https://github.com/gentoo-mirror/gentoo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: ecd005d079
Signed-off-by: orbea <orbea@riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/35781
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
This commit is contained in:
orbea 2024-03-16 08:32:32 -07:00 committed by Conrad Kostecki
parent 13bd5b6ecc
commit 330b772dc0
No known key found for this signature in database
GPG Key ID: 7A96AB564BF498FB
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
www-apache/mod_jk/files/mod_jk-1.2.49-export-symbols-regex.patch Normal file
View File

@ -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 <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@

5
www-apache/mod_jk/mod_jk-1.2.49.ebuild → www-apache/mod_jk/mod_jk-1.2.49-r1.ebuild
View File

@ -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"