diff options
Diffstat (limited to 'www-apache')
| -rw-r--r-- | www-apache/Manifest.gz | bin | 5915 -> 5914 bytes | |||
| -rw-r--r-- | www-apache/mod_jk/Manifest | 3 | ||||
| -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/mod_jk-1.2.49-r1.ebuild (renamed from www-apache/mod_jk/mod_jk-1.2.49.ebuild) | 5 |
4 files changed, 46 insertions, 2 deletions
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz Binary files differindex 20f593acb8cd..90e572559d57 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 1e6fc23b0671..66f82fb274a8 100644 --- a/www-apache/mod_jk/Manifest +++ b/www-apache/mod_jk/Manifest @@ -1,5 +1,6 @@ +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.49-src.tar.gz 1702479 BLAKE2B 5994bbff6b8c11770cfe8287590d3af793d8720b8a54ecb066abe481e158517c25757a575c9db197e39b1ffc957f27237e92818a9da557db78e5d286b58b1d13 SHA512 936eb017ff9d9011996933838d5c306ede9ae1886405f4daed60719ee522cca6075dedb3b647863ef12155cca93f6db8e58209a5d3bbd2da157ffc536a6809f2 DIST tomcat-connectors-1.2.49-src.tar.gz.asc 873 BLAKE2B 52cd9b6f051a6a76b1823773c4af2742dfdd686afa951975623d2d2a42730cbd40882e0f6f13600a6e473d265418b662ae1a576889e25685d74d8e692ae1a42e SHA512 41edf25b31bbf280814451dcb9fdc28497394213dfd968c37b2c15670aee34e028a7fc1145a374f128d7ab969c43ca9ae6fd296fee6bf5fae4785ea35908b144 -EBUILD mod_jk-1.2.49.ebuild 1977 BLAKE2B 1b331bda765431f12bb9aa40ed562503ec08a2ae44cbc40531dc6f2aba8b62016eee82ebdb8029041d03c8aa02f5e6e3e5106970fff982caf03be585cdbefe11 SHA512 8c5508b3fec0db038dcffc389c6e5e2800b269a094b317d8c8c086cea1337a28413824f12b34b3d2861a8629a89536ca5174e2875a272f45d46421de12cabc69 +EBUILD mod_jk-1.2.49-r1.ebuild 2041 BLAKE2B 6feb8839f07603dd8d0f68a96ba1af4972086156b826e2e760498970d135e42bcc1e6712e22542f3ca0130946af0a1f2f515aa308b99ea944ab12eac30d2c695 SHA512 26d0bade7d7fb3e6eff8df02fd1be3dd2eae07690cb8d72b625ddc5b47e4cad903fb5689e823563f2428f59f913d9652b0116af6c96559e2a9d2c6a0a730fd1c MISC metadata.xml 617 BLAKE2B 2fe52915ee2fdf01518b2631479934838c85820e4803792e6c4c69e7ee490cd08aea7f4a269eb456a258d6433fd5f323866439ca61c40f86a256ee941b4457e2 SHA512 0df6992cc0912e1a93b5ca9e5d3c5470e9a91b065714bd77391a8efbf8118bcede4aecb2263a3cd0e4c0a3ad1bfe006db7ee524fe4148e04a69dcbad0dbd18b7 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 <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/mod_jk-1.2.49.ebuild b/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" |