From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5BBF115838C for ; Tue, 23 Jan 2024 21:25:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6023B2BC01A; Tue, 23 Jan 2024 21:25:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 210F72BC013 for ; Tue, 23 Jan 2024 21:25:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 02561343195 for ; Tue, 23 Jan 2024 21:25:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 61BCAF7D for ; Tue, 23 Jan 2024 21:25:52 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1706045144.579a63f5448e7c055b94a0011e9076bf0f3c47eb.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/, www-apache/mod_jk/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apache/mod_jk/files/mod_jk-1.2.49-musl.patch www-apache/mod_jk/mod_jk-1.2.49.ebuild X-VCS-Directories: www-apache/mod_jk/ www-apache/mod_jk/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 579a63f5448e7c055b94a0011e9076bf0f3c47eb X-VCS-Branch: master Date: Tue, 23 Jan 2024 21:25:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0fe3a356-a09b-4121-942e-4dae401091ef X-Archives-Hash: 134a58aec75c6f77019bbee9158b1f43 commit: 579a63f5448e7c055b94a0011e9076bf0f3c47eb Author: Conrad Kostecki gentoo org> AuthorDate: Tue Jan 23 21:24:36 2024 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Tue Jan 23 21:25:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=579a63f5 www-apache/mod_jk: fix build on musl Closes: https://bugs.gentoo.org/830179 Signed-off-by: Conrad Kostecki gentoo.org> www-apache/mod_jk/files/mod_jk-1.2.49-musl.patch | 26 ++++++++++++++++++++++++ www-apache/mod_jk/mod_jk-1.2.49.ebuild | 9 +++++--- 2 files changed, 32 insertions(+), 3 deletions(-) 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 +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 +--- + 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 + #include + #include +-#if !defined(_OSD_POSIX) && !defined(AS400) && !defined(__CYGWIN__) && !defined(HPUX11) ++#if !defined(_OSD_POSIX) && !defined(AS400) && !defined(__CYGWIN__) && !defined(HPUX11) && !defined(PLATFORM_LINUX) + #include + #endif + #if !defined(HPUX11) && !defined(AS400) 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