gentoo auto-resync : 13:09:2023 - 22:45:20

3 files changed, 78 insertions, 0 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 2ac1a6c8ba9f..cc59076055cb 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 7b652141cab5..d371e202331d 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,4 +1,6 @@
 AUX mod_jk-1.2.48-clang16.patch 2217 BLAKE2B d215679542c35f099dd16f64e1ec50907ae695a3d32c09a602d38c1baf9d75243033299fbc1da73961e19088cbf671b539d7dad460710969552159cb68f6a740 SHA512 4bd44d4004997ce38d148af7b8bb2fcba90d74c6b64b17a148a53d63d4e1ce266e8dd82459246645b7f62e51ad34b22891df7e630ba25349ec8a17a932ba5306
 DIST tomcat-connectors-1.2.48-src.tar.gz 3665280 BLAKE2B eca84f31235e441dea08fd7f0e44de4370799e9781384a0a4329ae48c9dab4b146733bf810669fdcf60ede9e67e139942ccfe12c74e15f4eda19d9107f9b6150 SHA512 955a830724a3902e29032a5d2e7603d3170334e8a383d314f6bf8539d53d9f7ee4cfa0b31cfc954acb0a13d9975ed2229de085d08de3885f8679b509924fde47
+DIST tomcat-connectors-1.2.49-src.tar.gz 1702479 BLAKE2B 5994bbff6b8c11770cfe8287590d3af793d8720b8a54ecb066abe481e158517c25757a575c9db197e39b1ffc957f27237e92818a9da557db78e5d286b58b1d13 SHA512 936eb017ff9d9011996933838d5c306ede9ae1886405f4daed60719ee522cca6075dedb3b647863ef12155cca93f6db8e58209a5d3bbd2da157ffc536a6809f2
 EBUILD mod_jk-1.2.48-r1.ebuild 1694 BLAKE2B 267a901a21ea33ae3c21c65913e94960287141c5c16cd121b7fac9c892d971267068183f07c648e2b59a11ff8017456b85cad3462721a33d61b1a2a2687d0ae7 SHA512 4eda7ee3ad5380a82ed3839b0536684d2debb99bad2c2d4e87219f81430e39e3245083103a7d874aa5e71b86f360e0cd8ceacf76784b2071e2404a8d8db9c667
+EBUILD mod_jk-1.2.49.ebuild 1696 BLAKE2B 2410093ea3a60a34e68b36476eb7533abe03ca5bbc24b8fbcfe5398cf75d751677d23d914fdd08aa2a64fb0d9d36956ef92e884cbf6095f2143671eb7040daae SHA512 4f71d2a26e44cff3daf2c9b9fe9c77aa3f208ebf4a15e2bfcd2497e0e13bf6706ecdd0124812fc567c039241ba76fb2fdc70b0beab4509739def966d815eda05
 MISC metadata.xml 617 BLAKE2B 2fe52915ee2fdf01518b2631479934838c85820e4803792e6c4c69e7ee490cd08aea7f4a269eb456a258d6433fd5f323866439ca61c40f86a256ee941b4457e2 SHA512 0df6992cc0912e1a93b5ca9e5d3c5470e9a91b065714bd77391a8efbf8118bcede4aecb2263a3cd0e4c0a3ad1bfe006db7ee524fe4148e04a69dcbad0dbd18b7
diff --git a/www-apache/mod_jk/mod_jk-1.2.49.ebuild b/www-apache/mod_jk/mod_jk-1.2.49.ebuild
new file mode 100644
index 000000000000..3e2e8a388ccc
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.49.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="tomcat-connectors-${PV#-*}-src"
+
+inherit apache-module autotools
+
+DESCRIPTION="Provides an AJP Apache2-JK-connector for the Tomcat servlet engine"
+HOMEPAGE="https://tomcat.apache.org/connectors-doc/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}/native"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="dev-libs/apr:1="
+RDEPEND="${DEPEND}"
+BDEPEND="dev-lang/perl"
+
+APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
+APACHE2_MOD_DEFINE="JK"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clang16.patch
+)
+
+need_apache2
+
+pkg_setup() {
+	# Calling depend.apache_pkg_setup fails because we do not have
+	# "apache2" in IUSE but the function expects this in order to call
+	# _init_apache2_late which sets the APACHE_MODULESDIR variable.
+	_init_apache2
+	_init_apache2_late
+}
+
+src_prepare() {
+	default
+
+	# Don't add '-Wl,' as prefix for CFLAGS, as linker will fail
+	sed -e '/JK_PREFIX_IF_MISSING/d' -i configure.ac || die
+	eautoreconf
+
+	# Adjust confpath and logpath for Gentoo
+	local logs_path="/var/log/apache2"
+	sed -e "s|conf|${APACHE_CONFDIR}|g" -e "s|logs|${logs_path}|g" -i ../conf/httpd-jk.conf || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--with-apxs="${APXS}"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	LIBTOOL="/bin/sh $(pwd)/libtool --silent"
+	default
+}
+
+src_install() {
+	apache-module_src_install
+
+	insinto "${APACHE_CONFDIR}"
+	doins "${S}"/../conf/*.properties
+
+	insinto "${APACHE_MODULES_CONFDIR}"
+	newins ../conf/httpd-jk.conf 88_mod_jk.conf
+
+	einstalldocs
+}