gentoo auto-resync : 23:01:2024 - 22:46:03

8 files changed, 37 insertions, 173 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 21a627fcaf90..3f99b8931ecf 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 cfb73889c6d7..1e6fc23b0671 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,7 +1,5 @@
-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
+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.48-r1.ebuild 1694 BLAKE2B 267a901a21ea33ae3c21c65913e94960287141c5c16cd121b7fac9c892d971267068183f07c648e2b59a11ff8017456b85cad3462721a33d61b1a2a2687d0ae7 SHA512 4eda7ee3ad5380a82ed3839b0536684d2debb99bad2c2d4e87219f81430e39e3245083103a7d874aa5e71b86f360e0cd8ceacf76784b2071e2404a8d8db9c667
-EBUILD mod_jk-1.2.49.ebuild 1925 BLAKE2B 1256d0752594508fc0e77074ca004d90119ffca6d4cd321b423508137a77b00fc2b53f53f9a53d2dba51c1949e43b40434a2b2bf464edb2901cea452ce2b482e SHA512 931a9d3eb49419dcfc1c6e72a7da5dc53309e2e96ae5ed6a63664f2de818dfa1c03067794ae8636536ac9e04bdd11de10b3198cca341e898a7b2fa15e913a202
+EBUILD mod_jk-1.2.49.ebuild 1977 BLAKE2B 1b331bda765431f12bb9aa40ed562503ec08a2ae44cbc40531dc6f2aba8b62016eee82ebdb8029041d03c8aa02f5e6e3e5106970fff982caf03be585cdbefe11 SHA512 8c5508b3fec0db038dcffc389c6e5e2800b269a094b317d8c8c086cea1337a28413824f12b34b3d2861a8629a89536ca5174e2875a272f45d46421de12cabc69
 MISC metadata.xml 617 BLAKE2B 2fe52915ee2fdf01518b2631479934838c85820e4803792e6c4c69e7ee490cd08aea7f4a269eb456a258d6433fd5f323866439ca61c40f86a256ee941b4457e2 SHA512 0df6992cc0912e1a93b5ca9e5d3c5470e9a91b065714bd77391a8efbf8118bcede4aecb2263a3cd0e4c0a3ad1bfe006db7ee524fe4148e04a69dcbad0dbd18b7
diff --git a/www-apache/mod_jk/files/mod_jk-1.2.48-clang16.patch b/www-apache/mod_jk/files/mod_jk-1.2.48-clang16.patch
deleted file mode 100644
index e776eb626608..000000000000
--- a/www-apache/mod_jk/files/mod_jk-1.2.48-clang16.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-https://bugs.gentoo.org/875122
-
-First commit: https://github.com/apache/tomcat-connectors/commit/e719874b21a526cb3447c747b9901719cf46eafe
-The rest: https://github.com/apache/tomcat-connectors/pull/6
-
-From: Mark Thomas <markt@apache.org>
-Date: Wed, 30 Jun 2021 10:58:58 +0100
-Subject: [PATCH] Fix BZ 64878 - Fix build in MaxOS
-
-With thanks to don@isle.plus at
-https://bz.apache.org/bugzilla/show_bug.cgi?id=64753#c13
-
-https://bz.apache.org/bugzilla/show_bug.cgi?id=64878
---- a/scripts/build/jk_common.m4
-+++ b/scripts/build/jk_common.m4
-@@ -35,6 +35,7 @@ changequote([, ])dnl
- AC_MSG_CHECKING(size of $2)
- AC_CACHE_VAL(AC_CV_NAME,
- [AC_TRY_RUN([#include <stdio.h>
-+#include <stdlib.h>
- $1
- main()
- {
-
-From f5403f13b52c50a19afa4e16dbbb66c31dce565b Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 17 Oct 2022 03:46:06 +0100
-Subject: [PATCH 1/2] Fix -Wimplicit-int
-
-Becomes fatal with Clang 15.
---- a/scripts/build/jk_common.m4
-+++ b/scripts/build/jk_common.m4
-@@ -37,7 +37,7 @@ AC_CACHE_VAL(AC_CV_NAME,
- [AC_TRY_RUN([#include <stdio.h>
- #include <stdlib.h>
- $1
--main()
-+int main()
- {
-   FILE *f=fopen("conftestval","w");
-   if (!f) exit(1);
-From c896afdb44d26186bd93301827f4b0b7888ac116 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 17 Oct 2022 03:51:06 +0100
-Subject: [PATCH 2/2] configure.ac: Fix more implicit function declarations
-
-Becomes fatal in Clang 16.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -303,9 +303,11 @@ AC_CHECK_HEADERS(sys/filio.h)
- AC_DEFUN([JK_CHECK_SETSOCKOPT], [
- AC_MSG_CHECKING(whether to use $1 with setsockopt())
- AC_TRY_RUN([
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/time.h>
-+#include <stdlib.h>
- 
- int main(void)
- {
-@@ -344,6 +346,7 @@ AC_TRY_RUN([
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/time.h>
-+#include <stdlib.h>
- 
- int main(void)
- {
-@@ -395,6 +398,7 @@ AC_TRY_RUN([
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/time.h>
-+#include <stdlib.h>
- 
- int main(void)
- {
-@@ -416,6 +420,7 @@ AC_TRY_RUN([
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-+#include <stdlib.h>
- 
- int main(void)
- {
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
new file mode 100644
index 000000000000..65327fcc8bc3
--- /dev/null
+++ b/www-apache/mod_jk/files/mod_jk-1.2.49-musl.patch
@@ -0,0 +1,26 @@
+From 479102b941ac4c8c86ce102ec6e5bc9ad59b0d89 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conikost@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 <conikost@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)
diff --git a/www-apache/mod_jk/mod_jk-1.2.48-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.48-r1.ebuild
deleted file mode 100644
index 2593c36b65c2..000000000000
--- a/www-apache/mod_jk/mod_jk-1.2.48-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 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
-}
diff --git a/www-apache/mod_jk/mod_jk-1.2.49.ebuild b/www-apache/mod_jk/mod_jk-1.2.49.ebuild
index c096d3428647..f11868d35b60 100644
--- a/www-apache/mod_jk/mod_jk-1.2.49.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.49.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,11 +21,14 @@ DEPEND="dev-libs/apr:1="
 RDEPEND="${DEPEND}"
 BDEPEND="
 	dev-lang/perl
-	verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
+	verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.2.49-musl.patch" )
 
 APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
 APACHE2_MOD_DEFINE="JK"
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
 
 need_apache2
 
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index d8b184e79edf..f4bf86f4f8ef 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -4,6 +4,6 @@ DIST passenger-6.0.18.tar.gz 8424409 BLAKE2B 50f3639d0233892c85b97383689599c0845
 DIST passenger-6.0.19.tar.gz 8426094 BLAKE2B d0c6cf8b1b27cb11723f28b019d45710a53db76001f1449fd207b7e552080e1b303378acfbc3194076a4a33d03a8eeed9e716471a24706a5a5049343f2b93ef8 SHA512 3ac9b1d85549c8b69f9895d2b0fe00bee68bedfd2ef36ec148fb5e76a88db6498caf7bf6aa2255298aa51bb6b3d14e05c48de519398a0271402cc81e926b206d
 DIST passenger-6.0.20.tar.gz 8476308 BLAKE2B dc1ac3a1e2be1a9138594d68cf23fc0a73b6b0aca0550c022de56bc156825b3627de741128f163871c89747f178fb26fc41533962ba83ef2659ca71793c0fa62 SHA512 b46864cd7fa83fe39a2a4f42d581660c9a521b96942604b56caa567adff272bb092e82a46a6817a7b68be4830ad1015c9af4429a6d5b26edfe9c3e3884046559
 EBUILD passenger-6.0.18.ebuild 4035 BLAKE2B 0eed0beefd8bfe373961c84735bc7086e2f4282179c1b5706f8bb4df6d3679f7170a4341a6fcec849e37a3d4da2202ce9e6e9438088024040563098adbcc1cb0 SHA512 0a244b427f4aa7a47feee4ed6f8aca2492be504a0bc34f98a48782da84a661fcd2d776b66ba160349205b4daa98c9da059b9603b6e87da41b1039375cc361395
-EBUILD passenger-6.0.19.ebuild 4030 BLAKE2B 8151b6e01f3b7673cd01b5e22599faa1f278566df0689d52d7a6e53536e8b063a56125820d1b4cab54964a07e909fb46b526f14bf36b3165df9f817cf59e22e1 SHA512 6463be5bfb0dd2608fd7cec1d394875ff3822e457db3e82ca3e63226d8306837cd963dcf4b80c47346b251d023b3c9da55eeca3b369150e0988bef4bfb83b6b8
+EBUILD passenger-6.0.19.ebuild 4028 BLAKE2B fd5374b04bbd32ecbb9561844f0fb7f8f67b7f37035440f36ddf1bfb20dd3604a9fbe4b3daefbe3fcc7d54f98255e0b81a96cc1a9174c7fed402e53334a00033 SHA512 6d496c48c8061ad41b68f24ebb2112f43120271aa7865f90a0523d6c16615005ef917313185212537ff41d4b40c3ff43288217f8806fb6d60d154628d71b4c7f
 EBUILD passenger-6.0.20.ebuild 4037 BLAKE2B 011ddae946f9313462c25a7e9b0c044dcfdfb96d6693400da96f11333faf5a276e2e49b1082bec1996c46e607b4e0301772f62f3cfa62578aca76ece901ec25a SHA512 5c341279b8f222d8ab48d89722da467358d81336045069bbb87defd2e02c92b49678fcb79932676e9c7e047a4a64abbbcf8f736f1ef062180d83e20f19fe0fda
 MISC metadata.xml 331 BLAKE2B 5cc7b65a8ac511e9065cdb9fc6f4a04923029f718f02ba0da718c798e0bb3a554a8da7f05e639daa88c2fec34888e6e1316ccab4a44a0d99b616354006e7c762 SHA512 95f21209228559e1b775f8b44c49e1d311a6c2955ba26fb24fb72bf64afd42048d9d0186828be8b733963b4aec245f5abc4540c1ca8baa14ee59b2fba0c33086
diff --git a/www-apache/passenger/passenger-6.0.19.ebuild b/www-apache/passenger/passenger-6.0.19.ebuild
index 3a3213e367bb..881b0b4073de 100644
--- a/www-apache/passenger/passenger-6.0.19.ebuild
+++ b/www-apache/passenger/passenger-6.0.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
 # Passenger is licensed MIT, but vendored code licenses should also be taken into account.
 LICENSE="Boost-1.0 MIT BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="apache2 debug"
 
 ruby_add_bdepend "dev-ruby/rake"