mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
www-apache/mod_jk: drop 1.2.48-r1
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
This commit is contained in:
@@ -1,3 +1,2 @@
|
||||
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
|
||||
DIST tomcat-connectors-1.2.49-src.tar.gz.asc 873 BLAKE2B 52cd9b6f051a6a76b1823773c4af2742dfdd686afa951975623d2d2a42730cbd40882e0f6f13600a6e473d265418b662ae1a576889e25685d74d8e692ae1a42e SHA512 41edf25b31bbf280814451dcb9fdc28497394213dfd968c37b2c15670aee34e028a7fc1145a374f128d7ab969c43ca9ae6fd296fee6bf5fae4785ea35908b144
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
@@ -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
|
||||
}
|
||||
Reference in New Issue
Block a user