[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/files/, www-apache/mod_jk/

2024-03-16 Thread Conrad Kostecki 
commit: 330b772dc0b59671cb55ed36856d876868bc94b7
Author: orbea  riseup  net>
AuthorDate: Sat Mar 16 15:32:32 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Mar 16 20:25:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=330b772d

www-apache/mod_jk: fix global symbols

The libtool -export-symbols-regex flag controls which symbols are
exported globally in the library, but GNU libtool silently drops many
unknown flags...

Closes: https://bugs.gentoo.org/914237
Upstream-Commit: 
https://github.com/apache/tomcat-connectors/commit/ecd005d0792441c4510dc4c2d9348979ab71ddcc
Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/35781
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/mod_jk-1.2.49-export-symbols-regex.patch | 40 ++
 ...od_jk-1.2.49.ebuild => mod_jk-1.2.49-r1.ebuild} |  5 ++-
 2 files changed, 44 insertions(+), 1 deletion(-)

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 ..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 
+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
similarity index 94%
rename from www-apache/mod_jk/mod_jk-1.2.49.ebuild
rename to 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"

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/, www-apache/mod_jk/files/

2024-01-23 Thread Conrad Kostecki 
commit: 579a63f5448e7c055b94a0011e9076bf0f3c47eb
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Tue Jan 23 21:24:36 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Jan 23 21:25:44 2024 +
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 ..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

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/files/, www-apache/mod_jk/

2024-01-23 Thread Conrad Kostecki 
commit: 8a4bcf3aebcacd9d02099206fc5aed716f238f18
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Tue Jan 23 21:25:17 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Jan 23 21:25:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a4bcf3a

www-apache/mod_jk: drop 1.2.48-r1

Signed-off-by: Conrad Kostecki  gentoo.org>

 www-apache/mod_jk/Manifest |  1 -
 .../mod_jk/files/mod_jk-1.2.48-clang16.patch   | 87 --
 www-apache/mod_jk/mod_jk-1.2.48-r1.ebuild  | 76 ---
 3 files changed, 164 deletions(-)

diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index ada527e80f79..698f03cb11cb 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -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

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..
--- 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 
-Date: Wed, 30 Jun 2021 10:58:58 +0100
-Subject: [PATCH] Fix BZ 64878 - Fix build in MaxOS
-
-With thanks to d...@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 
-+#include 
- $1
- main()
- {
-
-From f5403f13b52c50a19afa4e16dbbb66c31dce565b Mon Sep 17 00:00:00 2001
-From: Sam James 
-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 
- #include 
- $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 
-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 
 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 
- #include 
- #include 
- #include 
-+#include 
- 
- int main(void)
- {
-@@ -344,6 +346,7 @@ AC_TRY_RUN([
- #include 
- #include 
- #include 
-+#include 
- 
- int main(void)
- {
-@@ -395,6 +398,7 @@ AC_TRY_RUN([
- #include 
- #include 
- #include 
-+#include 
- 
- int main(void)
- {
-@@ -416,6 +420,7 @@ AC_TRY_RUN([
- #include 
- #include 
- #include 
-+#include 
- 
- int main(void)
- {

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..
--- 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=(
-

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2023-10-17 Thread Sam James 
commit: 53362e159c1290d5983a0332e0352d27e73b6bf3
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 17 13:02:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 17 13:02:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53362e15

www-apache/mod_jk: Stabilize 1.2.49 amd64, #915877

Signed-off-by: Sam James  gentoo.org>

 www-apache/mod_jk/mod_jk-1.2.49.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 cd5d35199dfa..4c782701a591 100644
--- a/www-apache/mod_jk/mod_jk-1.2.49.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.49.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}/native"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="dev-libs/apr:1="
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2023-10-17 Thread Sam James 
commit: ffc170f110d4d6317b38bf523ad5e618b332533a
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 17 13:01:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 17 13:01:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc170f1

www-apache/mod_jk: Stabilize 1.2.49 x86, #915877

Signed-off-by: Sam James  gentoo.org>

 www-apache/mod_jk/mod_jk-1.2.49.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8b6a43685192..cd5d35199dfa 100644
--- a/www-apache/mod_jk/mod_jk-1.2.49.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.49.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}/native"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="dev-libs/apr:1="
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2023-09-14 Thread Conrad Kostecki 
commit: 60090b30661bfb48a727e21d2a86ac02c3f9f6e4
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Thu Sep 14 21:31:55 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Sep 14 21:31:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60090b30

www-apache/mod_jk: drop clang16 patch

Merged, so unneeded.

Closes: https://bugs.gentoo.org/914162
Signed-off-by: Conrad Kostecki  gentoo.org>

 www-apache/mod_jk/mod_jk-1.2.49.ebuild | 4 
 1 file changed, 4 deletions(-)

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 251b393dcf5e..8b6a43685192 100644
--- a/www-apache/mod_jk/mod_jk-1.2.49.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.49.ebuild
@@ -27,10 +27,6 @@ 
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-connectors.a
 APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
 APACHE2_MOD_DEFINE="JK"
 
-PATCHES=(
-   "${FILESDIR}"/${P}-clang16.patch
-)
-
 need_apache2
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2023-09-14 Thread Conrad Kostecki 
commit: abe6c0046a4bd85bd8568e4049e06b6220c9905c
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Sep 14 11:55:47 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Sep 14 21:20:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe6c004

www-apache/mod_jk: add verify-sig

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/32777
Signed-off-by: Conrad Kostecki  gentoo.org>

 www-apache/mod_jk/Manifest |  1 +
 www-apache/mod_jk/mod_jk-1.2.49.ebuild | 10 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 2d6953707903..ada527e80f79 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,2 +1,3 @@
 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

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 3e2e8a388ccc..251b393dcf5e 100644
--- a/www-apache/mod_jk/mod_jk-1.2.49.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.49.ebuild
@@ -5,11 +5,12 @@ EAPI=7
 
 MY_P="tomcat-connectors-${PV#-*}-src"
 
-inherit apache-module autotools
+inherit apache-module autotools verify-sig
 
 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"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/${MY_P}.tar.gz
+   verify-sig? ( 
https://downloads.apache.org/tomcat/tomcat-connectors/jk/tomcat-connectors-${PV}-src.tar.gz.asc
  )"
 S="${WORKDIR}/${MY_P}/native"
 
 LICENSE="Apache-2.0"
@@ -18,7 +19,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc 
~x86"
 
 DEPEND="dev-libs/apr:1="
 RDEPEND="${DEPEND}"
-BDEPEND="dev-lang/perl"
+BDEPEND="
+   dev-lang/perl
+   verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
 
 APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
 APACHE2_MOD_DEFINE="JK"

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2023-09-13 Thread Conrad Kostecki 
commit: d9b006b538282da676d63953ff1cb6e77da5
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Wed Sep 13 19:41:12 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Sep 13 19:41:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9b006b5

www-apache/mod_jk: add 1.2.49

Signed-off-by: Conrad Kostecki  gentoo.org>

 www-apache/mod_jk/Manifest |  1 +
 www-apache/mod_jk/mod_jk-1.2.49.ebuild | 76 ++
 2 files changed, 77 insertions(+)

diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 55838aac9901..2d6953707903 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1 +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

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 ..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
+}

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/, www-apache/mod_jk/files/

2022-10-16 Thread Sam James 
commit: 56840607b2d8d7aa1b9d620b7bca1618a8394551
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 17 02:49:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 17 03:15:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56840607

www-apache/mod_jk: fix build w/ Clang 16

Closes: https://bugs.gentoo.org/875701
Signed-off-by: Sam James  gentoo.org>

 .../mod_jk/files/mod_jk-1.2.48-clang16.patch   | 87 ++
 ...od_jk-1.2.48.ebuild => mod_jk-1.2.48-r1.ebuild} |  6 +-
 2 files changed, 92 insertions(+), 1 deletion(-)

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
new file mode 100644
index ..e776eb626608
--- /dev/null
+++ b/www-apache/mod_jk/files/mod_jk-1.2.48-clang16.patch
@@ -0,0 +1,87 @@
+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 
+Date: Wed, 30 Jun 2021 10:58:58 +0100
+Subject: [PATCH] Fix BZ 64878 - Fix build in MaxOS
+
+With thanks to d...@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 
++#include 
+ $1
+ main()
+ {
+
+From f5403f13b52c50a19afa4e16dbbb66c31dce565b Mon Sep 17 00:00:00 2001
+From: Sam James 
+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 
+ #include 
+ $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 
+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 
+--- 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 
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ int main(void)
+ {
+@@ -344,6 +346,7 @@ AC_TRY_RUN([
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ int main(void)
+ {
+@@ -395,6 +398,7 @@ AC_TRY_RUN([
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ int main(void)
+ {
+@@ -416,6 +420,7 @@ AC_TRY_RUN([
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ int main(void)
+ {

diff --git a/www-apache/mod_jk/mod_jk-1.2.48.ebuild 
b/www-apache/mod_jk/mod_jk-1.2.48-r1.ebuild
similarity index 95%
rename from www-apache/mod_jk/mod_jk-1.2.48.ebuild
rename to www-apache/mod_jk/mod_jk-1.2.48-r1.ebuild
index 739db0daedf4..2593c36b65c2 100644
--- a/www-apache/mod_jk/mod_jk-1.2.48.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.48-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,6 +23,10 @@ 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() {

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2021-10-12 Thread Sam James 
commit: cd72107631486baf1ba68d091c32cf739a9dda47
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 12 23:58:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 12 23:58:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd721076

www-apache/mod_jk: Keyword 1.2.48 arm64, #800512

Signed-off-by: Sam James  gentoo.org>

 www-apache/mod_jk/mod_jk-1.2.48.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apache/mod_jk/mod_jk-1.2.48.ebuild 
b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
index f54d8c5b36f..739db0daedf 100644
--- a/www-apache/mod_jk/mod_jk-1.2.48.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}/native"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="dev-libs/apr:1="
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2021-10-12 Thread Sam James 
commit: 95820edb334a0c6388027b79a3cd866252130d34
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 12 23:58:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 12 23:58:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95820edb

www-apache/mod_jk: Keyword 1.2.48 arm, #800512

Signed-off-by: Sam James  gentoo.org>

 www-apache/mod_jk/mod_jk-1.2.48.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apache/mod_jk/mod_jk-1.2.48.ebuild 
b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
index f731284a89e..f54d8c5b36f 100644
--- a/www-apache/mod_jk/mod_jk-1.2.48.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}/native"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="dev-libs/apr:1="
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2021-10-12 Thread Conrad Kostecki 
commit: 41a142b4a90546124996e732aa305b3984b6189b
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Tue Oct 12 20:59:25 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Oct 12 20:59:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41a142b4

www-apache/mod_jk: fix linker

Build systems passes CFLAGS to linker and prefixes them all with '-Wl,'
which will always cause the linker to fail with unknown options.

Closes: https://bugs.gentoo.org/817896
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 www-apache/mod_jk/mod_jk-1.2.48.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/www-apache/mod_jk/mod_jk-1.2.48.ebuild 
b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
index f84c81d573c..f731284a89e 100644
--- a/www-apache/mod_jk/mod_jk-1.2.48.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_P="tomcat-connectors-${PV#-*}-src"
 
-inherit apache-module
+inherit apache-module autotools
 
 DESCRIPTION="Provides an AJP Apache2-JK-connector for the Tomcat servlet 
engine"
 HOMEPAGE="https://tomcat.apache.org/connectors-doc/;
@@ -36,6 +36,10 @@ pkg_setup() {
 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

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2021-07-08 Thread Sergei Trofimovich 
commit: a1cf4597095575ddb217043a27170c127241754c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Jul  8 07:10:31 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Jul  8 07:10:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1cf4597

www-apache/mod_jk: keyworded 1.2.48 for ppc64

keyworded wrt bug #800512

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 www-apache/mod_jk/mod_jk-1.2.48.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apache/mod_jk/mod_jk-1.2.48.ebuild 
b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
index e1a49172da6..f84c81d573c 100644
--- a/www-apache/mod_jk/mod_jk-1.2.48.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}/native"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="dev-libs/apr:1="
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2021-07-08 Thread Sergei Trofimovich 
commit: e25ee42e0d57c1c770d5b422094ccb89ba867062
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Jul  8 07:08:23 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Jul  8 07:08:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e25ee42e

www-apache/mod_jk: keyworded 1.2.48 for ia64

keyworded wrt bug #800512

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 www-apache/mod_jk/mod_jk-1.2.48.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apache/mod_jk/mod_jk-1.2.48.ebuild 
b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
index e3747b500c7..e1a49172da6 100644
--- a/www-apache/mod_jk/mod_jk-1.2.48.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}/native"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
+KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~sparc x86"
 
 DEPEND="dev-libs/apr:1="
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2021-07-05 Thread Sergei Trofimovich 
commit: 3ed3e86807948267fd436dedb7dd0502d3459c01
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Jul  5 05:26:54 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jul  5 06:05:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ed3e868

www-apache/mod_jk: keyworded 1.2.48 for hppa/sparc, bug #800512

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 www-apache/mod_jk/mod_jk-1.2.48.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apache/mod_jk/mod_jk-1.2.48.ebuild 
b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
index ef0ffb04409..e3747b500c7 100644
--- a/www-apache/mod_jk/mod_jk-1.2.48.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}/native"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
 
 DEPEND="dev-libs/apr:1="
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2021-04-13 Thread Agostino Sarubbo 
commit: d554258936ffdb94621719eec10e5b55ae860316
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Apr 13 07:35:17 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Apr 13 07:35:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5542589

www-apache/mod_jk: amd64 stable wrt bug #780051

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 www-apache/mod_jk/mod_jk-1.2.48.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apache/mod_jk/mod_jk-1.2.48.ebuild 
b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
index c89e54a9939..ef0ffb04409 100644
--- a/www-apache/mod_jk/mod_jk-1.2.48.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}/native"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND="dev-libs/apr:1="
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2021-04-05 Thread Thomas Deutschmann 
commit: 636818b7552d6639656627e0949210aa7f7a56f2
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Apr  5 18:59:30 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Apr  5 18:59:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=636818b7

www-apache/mod_jk: x86 stable (bug #780051)

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 www-apache/mod_jk/mod_jk-1.2.48.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apache/mod_jk/mod_jk-1.2.48.ebuild 
b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
index 6b2c3c705c9..c89e54a9939 100644
--- a/www-apache/mod_jk/mod_jk-1.2.48.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}/native"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 DEPEND="dev-libs/apr:1="
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2021-04-04 Thread Conrad Kostecki 
commit: 5bf08eafb64f6645b731874415837eea490afd61
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Apr  4 19:44:13 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Apr  4 19:44:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bf08eaf

www-apache/mod_jk: fix metadata

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 www-apache/mod_jk/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apache/mod_jk/metadata.xml b/www-apache/mod_jk/metadata.xml
index df3733f1bd8..34fdd63d09f 100644
--- a/www-apache/mod_jk/metadata.xml
+++ b/www-apache/mod_jk/metadata.xml
@@ -1,7 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
conik...@gentoo.org
Conrad Kostecki

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/, www-apache/mod_jk/files/

2021-04-04 Thread Conrad Kostecki 
commit: 2fe9d88f75d60120efe21e4364c343c4b9e6f017
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Apr  4 19:20:42 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Apr  4 19:20:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe9d88f

www-apache/mod_jk: drop old version 1.2.42

Dropping old version, as it contains mulitple open security
vulnerabilities.

Bug: https://bugs.gentoo.org/780051
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 www-apache/mod_jk/Manifest|   1 -
 www-apache/mod_jk/files/88_mod_jk.conf| 165 --
 www-apache/mod_jk/files/jk-workers.properties |  36 --
 www-apache/mod_jk/mod_jk-1.2.42.ebuild|  60 --
 4 files changed, 262 deletions(-)

diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index a4a25989cf8..55838aac990 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,2 +1 @@
-DIST tomcat-connectors-1.2.42-src.tar.gz 3143693 BLAKE2B 
d1ea2a85ec80a5e207896f3225049c12e96c5cb6d1734306ec7a268d0963f1c368bcf963b529e17efdf448c0f8ad3257902340f969b5a0bc6ee9644af4bb3772
 SHA512 
9a796e2a7865a99c16595deaead94e843c291ed7229f48414edf0a260b2dda05fc94671e8b863a9ccef719bbe2ca7622c06e3dae6ccf68a41f7d96e847b68791
 DIST tomcat-connectors-1.2.48-src.tar.gz 3665280 BLAKE2B 
eca84f31235e441dea08fd7f0e44de4370799e9781384a0a4329ae48c9dab4b146733bf810669fdcf60ede9e67e139942ccfe12c74e15f4eda19d9107f9b6150
 SHA512 
955a830724a3902e29032a5d2e7603d3170334e8a383d314f6bf8539d53d9f7ee4cfa0b31cfc954acb0a13d9975ed2229de085d08de3885f8679b509924fde47

diff --git a/www-apache/mod_jk/files/88_mod_jk.conf 
b/www-apache/mod_jk/files/88_mod_jk.conf
deleted file mode 100644
index 1c66783cca1..000
--- a/www-apache/mod_jk/files/88_mod_jk.conf
+++ /dev/null
@@ -1,165 +0,0 @@
-
-LoadModule jk_modulemodules/mod_jk.so
-
-###
-### Where to find workers.properties
-###
-# JkWorkersFile specify the location where mod_jk will find
-# the workers definitions.
-JkWorkersFile  /etc/apache2/jk-workers.properties
-
-
-###
-### Where to put mod_jk logs
-###
-# specify the location where mod_jk is going to place its log file.
-JkLogFile  /var/log/apache2/mod_jk.log
-
-###
-### Where to put mod_jk shm file
-###
-# specify the location where mod_jk is going to place its shared memory file.
-JkShmFile  /var/log/apache2/jk-runtime-status
-
-###
-### Set the jk log level [debug/error/info]
-###
-# info log will contains standard mod_jk activity (default).
-# error log will contains also error reports.
-# debug log will contains all informations on mod_jk activity
-JkLogLevel info
-
-
-###
-### Select the log format
-###
-# JkLogStampFormat will configure the date/time format found
-# on mod_jk logfile. Using the strftime() format string it's
-# set by default to "[%a %b %d %H:%M:%S %Y]"
-#JkLogStampFormat "[%a %b %d %H:%M:%S %Y] "
-
-
-###
-### JkOptions indicate to send SSL KEY SIZE,
-###
-# The directive JkOptions allow you to set many forwarding
-# options which will enable (+) or disable (-) following option.
-#
-#
-# JkOptions ForwardKeySize , you ask mod_jk, when using ajp13, to
-# forward also the SSL Key Size as required by Servlet API 2.3.
-# This flag shouldn't be set when servlet engine is Tomcat 3.2.x
-# (on by default).
-#
-#
-# JkOptions ForwardURICompat , you told mod_jk to send the URI to
-# Tomcat normally, which is less spec compliant but mod_rewrite
-# compatible, use it for compatibility with Tomcat 3.2.x engines
-# (on by default).
-#
-#
-# JkOptions ForwardURICompatUnparsed , the forwarded URI is unparsed,
-# it's spec compliant but broke mod_rewrite.
-#
-#
-# JkOptions ForwardURIEscaped , the forwarded URI is escaped and
-# Tomcat (since 3.3 rc2) will do the decoding part.
-#
-#
-# JkOptions ForwardDirectories is used in conjunction with Directory-
-# Index directive of Apache web server. As such mod_dir should be
-# available to Apache, statically or dynamically (DSO)
-#
-# When DirectoryIndex is configured, Apache will create sub-requests
-# for each of the local-url's specified in the directive, to determine
-# if there is a local file that matches (this is done by stat-ing the file).
-#
-# If ForwardDirectories is set to false (default) and Apache doesn't
-# find any files that match, Apache will serve the content of the
-# directory (if directive Options specifies Indexes for that directory)
-# or a 403 Forbidden response (if directive Options doesn't specify
-# Indexes for that directory).
-#
-# If ForwardDirectories is set to true and Apache doesn't find any
-# files that match, the request will be forwarded to Tomcat for
-# resolution. This is used in cases when Apache cannot see the index
-# files on the file system for various reasons: Tomcat is running on
-# a different machine, the JSP file has been precompiled etc.
-#
-# Note that locally visible files will take

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2021-04-04 Thread Conrad Kostecki 
commit: c5d0264d6572ce14e70a08bc9478a10838ddd3b3
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Apr  4 19:08:53 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Apr  4 19:12:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5d0264d

www-apache/mod_jk: bump to version 1.2.48

Closes: https://bugs.gentoo.org/778758
Bug: https://bugs.gentoo.org/780051
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 www-apache/mod_jk/Manifest |  1 +
 www-apache/mod_jk/mod_jk-1.2.48.ebuild | 68 ++
 2 files changed, 69 insertions(+)

diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 14e280fda2d..a4a25989cf8 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1 +1,2 @@
 DIST tomcat-connectors-1.2.42-src.tar.gz 3143693 BLAKE2B 
d1ea2a85ec80a5e207896f3225049c12e96c5cb6d1734306ec7a268d0963f1c368bcf963b529e17efdf448c0f8ad3257902340f969b5a0bc6ee9644af4bb3772
 SHA512 
9a796e2a7865a99c16595deaead94e843c291ed7229f48414edf0a260b2dda05fc94671e8b863a9ccef719bbe2ca7622c06e3dae6ccf68a41f7d96e847b68791
+DIST tomcat-connectors-1.2.48-src.tar.gz 3665280 BLAKE2B 
eca84f31235e441dea08fd7f0e44de4370799e9781384a0a4329ae48c9dab4b146733bf810669fdcf60ede9e67e139942ccfe12c74e15f4eda19d9107f9b6150
 SHA512 
955a830724a3902e29032a5d2e7603d3170334e8a383d314f6bf8539d53d9f7ee4cfa0b31cfc954acb0a13d9975ed2229de085d08de3885f8679b509924fde47

diff --git a/www-apache/mod_jk/mod_jk-1.2.48.ebuild 
b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
new file mode 100644
index 000..6b2c3c705c9
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="tomcat-connectors-${PV#-*}-src"
+
+inherit apache-module
+
+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 ~ppc ~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"
+
+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
+
+   # 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
+}

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2021-04-04 Thread Conrad Kostecki 
commit: 124b2d0db51731ff2270fc4300da6e04a88c4012
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Apr  4 18:22:53 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Apr  4 19:12:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=124b2d0d

www-apache/mod_jk: add myself as maintainer

Also updated slightly metadata description.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Conrad Kostecki  gentoo.org>

 www-apache/mod_jk/metadata.xml | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/www-apache/mod_jk/metadata.xml b/www-apache/mod_jk/metadata.xml
index 7502a331d87..df3733f1bd8 100644
--- a/www-apache/mod_jk/metadata.xml
+++ b/www-apache/mod_jk/metadata.xml
@@ -1,13 +1,19 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+   
+   conik...@gentoo.org
+   Conrad Kostecki
+   

j...@gentoo.org
Java


-   mod_jk is a connector used to connect Tomcat JSP/Servlet 
-   container with web servers such as Apache, Netscape, 
-   Iplanet, SunOne and even IIS using the AJP protocol.
+   Mod_JK is a connector used to connect to the Tomcat Servlet 
Engine,
+   used with web servers such as Apache and IIS using the AJP 
protocol.

+   
+   apache/tomcat-connectors
+

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2017-08-08 Thread Aaron Bauman 
commit: 18d1534ee94f8a925cefb3f153230e2676c10758
Author: Aaron Bauman  gentoo  org>
AuthorDate: Wed Aug  9 02:41:15 2017 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Aug  9 02:41:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18d1534e

www-apache/mod_jk: cleanup vulnerable wrt sec bug #551216

 www-apache/mod_jk/Manifest |  2 -
 www-apache/mod_jk/mod_jk-1.2.37.ebuild | 74 --
 www-apache/mod_jk/mod_jk-1.2.40.ebuild | 65 -
 3 files changed, 141 deletions(-)

diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 1a3592c1ebb..a265d05d5df 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,3 +1 @@
-DIST tomcat-connectors-1.2.37-src.tar.gz 1528647 SHA256 
38a92623ddd28b85bbf54cf77f4c867ccbebafb71233131471623691e4e751f9 SHA512 
96d0d3baba661a14a2235424ad7bdd78b8b44db168cabd015cba328a200f3df00aa922fd6afb4cd3cff896591e7aeb65cdde16c641ccff5bdcb84518d8d0862f
 WHIRLPOOL 
4d6b7b24610309f0fa44951dca81e0638aa92646e171df95fa225d1f813841592c687d6204dd0be4fb03303ad84ccee3f2adf54b542ee365877e74caaa5581d4
-DIST tomcat-connectors-1.2.40-src.tar.gz 1526449 SHA256 
895e347c4dff74049a848603fb29958e6cf429ea0fc708d514b3a8958236705d SHA512 
502424add813e85d725dfd0658809db113510a9ed755d24257fa4ee50224971f9cd679fad4f6b4ecbcca0a6ecd1414c86b0d08023ce123374dc28538f1e53c1c
 WHIRLPOOL 
7a5810727987b4aa76134fd813c611ea813bbd99b68bb283fdebc77ee0e67f00676a410de01984f880611e8033e80fadbb8bc6b480df5d3c5ea4c456cb11fa4b
 DIST tomcat-connectors-1.2.42-src.tar.gz 3143693 SHA256 
ea119f234c716649d4e7d4abd428852185b6b23a9205655e45554b88f01f3e31 SHA512 
9a796e2a7865a99c16595deaead94e843c291ed7229f48414edf0a260b2dda05fc94671e8b863a9ccef719bbe2ca7622c06e3dae6ccf68a41f7d96e847b68791
 WHIRLPOOL 
e103c1bff37b841d629b42b0a2b23f5048666f58e102da4c42571a54323454e5a799c1c2494f8641ad8b16e267954d7eb60688f4ca13b8fe12d3d81f9897565a

diff --git a/www-apache/mod_jk/mod_jk-1.2.37.ebuild 
b/www-apache/mod_jk/mod_jk-1.2.37.ebuild
deleted file mode 100644
index 03013156b80..000
--- a/www-apache/mod_jk/mod_jk-1.2.37.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit apache-module java-pkg-2
-
-MY_P="tomcat-connectors-${PV}-src"
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 
protocol"
-HOMEPAGE="http://tomcat.apache.org/connectors-doc/;
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}/native"
-
-APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
-APACHE2_MOD_CONF="88_${PN}"
-APACHE2_MOD_DEFINE="JK"
-
-DOCFILES="CHANGES"
-CONF_DIR="${WORKDIR}/${MY_P}/conf"
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=""
-
-need_apache
-
-pkg_setup() {
-   java-pkg-2_pkg_setup
-}
-
-src_configure() {
-   econf \
-   --with-apxs=${APXS} \
-   --with-apr-config=/usr/bin/apr-config \
-   || die "econf failed"
-}
-
-src_compile() {
-   emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed"
-}
-
-src_install() {
-   # install the workers.properties file
-   insinto "${APACHE_CONFDIR}"
-   newins "${CONF_DIR}/workers.properties.minimal" \
-   jk-workers-minimal.properties || die
-   newins "${CONF_DIR}/workers.properties" \
-   jk-workers.properties || die
-   doins "${CONF_DIR}/uriworkermap.properties" || die
-
-   # call the nifty default src_install :-)
-   apache-module_src_install
-}
-
-pkg_postinst() {
-   elog "Tomcat is not a dependency of mod_jk any longer, if you intend"
-   elog "to use it with Tomcat, you have to merge www-servers/tomcat on"
-   elog "your own."
-
-   elog "Advanced Directives and Options can be found at: "
-   elog "http://tomcat.apache.org/connectors-doc/reference/workers.html;
-
-   elog ""
-   elog "JNI Worker Deprecation:"
-   elog "Workers of type jni are broken since a long time."
-   elog "Since there is no more use for them, they have been deprecated 
now,"
-   elog "and will be removed in a future release."
-}

diff --git a/www-apache/mod_jk/mod_jk-1.2.40.ebuild 
b/www-apache/mod_jk/mod_jk-1.2.40.ebuild
deleted file mode 100644
index aac99dff2b1..000
--- a/www-apache/mod_jk/mod_jk-1.2.40.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit apache-module java-pkg-opt-2 readme.gentoo
-
-MY_P="tomcat-connectors-${PV#-*}-src"
-
-KEYWORDS="amd64 ~ppc x86"
-
-DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 
protocol."
-HOMEPAGE="http://tomcat.apache.org/connectors-doc/;
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/${MY_P}.tar.gz"

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2017-08-06 Thread Aaron Bauman 
commit: 245f362ddebffd72ddda9fbb7306713800670770
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sun Aug  6 17:00:47 2017 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Aug  6 17:00:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=245f362d

www-apache/mod_jk: x86 stable wrt bug #551216

 www-apache/mod_jk/mod_jk-1.2.42.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apache/mod_jk/mod_jk-1.2.42.ebuild 
b/www-apache/mod_jk/mod_jk-1.2.42.ebuild
index ddf61f8b0b2..b3af1a40099 100644
--- a/www-apache/mod_jk/mod_jk-1.2.42.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.42.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="java"
 
 S="${WORKDIR}/${MY_P}/native"

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2017-07-16 Thread Tobias Klausmann 
commit: 0e013523002658a9ea2cd9f053ef3d7b2486fbcd
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sun Jul 16 09:18:56 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sun Jul 16 09:18:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e013523

www-apache/mod_jk-1.2.42-r0: add amd64 keyword

Gentoo-Bug: 551216

 www-apache/mod_jk/mod_jk-1.2.42.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apache/mod_jk/mod_jk-1.2.42.ebuild 
b/www-apache/mod_jk/mod_jk-1.2.42.ebuild
index eed7662cad2..ddf61f8b0b2 100644
--- a/www-apache/mod_jk/mod_jk-1.2.42.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.42.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="java"
 
 S="${WORKDIR}/${MY_P}/native"

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/

2017-06-23 Thread Patrice Clement 
commit: 60290adad4d42993cb31da23cba379895e750ece
Author: Patrice Clement  gentoo  org>
AuthorDate: Fri Jun 23 15:30:59 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Jun 23 15:30:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60290ada

www-apache/mod_jk: remove proxy-maintainers.

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 www-apache/mod_jk/metadata.xml | 9 -
 1 file changed, 9 deletions(-)

diff --git a/www-apache/mod_jk/metadata.xml b/www-apache/mod_jk/metadata.xml
index b697d7a30b2..7502a331d87 100644
--- a/www-apache/mod_jk/metadata.xml
+++ b/www-apache/mod_jk/metadata.xml
@@ -1,19 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   m...@weisso.com
-   Mike Weissman
-   Proxy maintainer
-   

j...@gentoo.org
Java

-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   

mod_jk is a connector used to connect Tomcat JSP/Servlet 
container with web servers such as Apache, Netscape,

[gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/files/, www-apache/mod_jk/

2017-06-23 Thread Patrice Clement 
commit: 2620cebb313f435d213434e210692a0744fb7475
Author: Timo Gurr  gmail  com>
AuthorDate: Tue Jun 20 13:23:59 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Fri Jun 23 15:22:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2620cebb

www-apache/mod_jk: version bump to 1.2.42.

Gentoo-Bug: https://bugs.gentoo.org/551216

Closes: https://github.com/gentoo/gentoo/pull/4962

 www-apache/mod_jk/Manifest |  1 +
 www-apache/mod_jk/files/88_mod_jk.conf |  5 +++
 www-apache/mod_jk/mod_jk-1.2.42.ebuild | 60 ++
 3 files changed, 66 insertions(+)

diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index ceb4768bb50..1a3592c1ebb 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,2 +1,3 @@
 DIST tomcat-connectors-1.2.37-src.tar.gz 1528647 SHA256 
38a92623ddd28b85bbf54cf77f4c867ccbebafb71233131471623691e4e751f9 SHA512 
96d0d3baba661a14a2235424ad7bdd78b8b44db168cabd015cba328a200f3df00aa922fd6afb4cd3cff896591e7aeb65cdde16c641ccff5bdcb84518d8d0862f
 WHIRLPOOL 
4d6b7b24610309f0fa44951dca81e0638aa92646e171df95fa225d1f813841592c687d6204dd0be4fb03303ad84ccee3f2adf54b542ee365877e74caaa5581d4
 DIST tomcat-connectors-1.2.40-src.tar.gz 1526449 SHA256 
895e347c4dff74049a848603fb29958e6cf429ea0fc708d514b3a8958236705d SHA512 
502424add813e85d725dfd0658809db113510a9ed755d24257fa4ee50224971f9cd679fad4f6b4ecbcca0a6ecd1414c86b0d08023ce123374dc28538f1e53c1c
 WHIRLPOOL 
7a5810727987b4aa76134fd813c611ea813bbd99b68bb283fdebc77ee0e67f00676a410de01984f880611e8033e80fadbb8bc6b480df5d3c5ea4c456cb11fa4b
+DIST tomcat-connectors-1.2.42-src.tar.gz 3143693 SHA256 
ea119f234c716649d4e7d4abd428852185b6b23a9205655e45554b88f01f3e31 SHA512 
9a796e2a7865a99c16595deaead94e843c291ed7229f48414edf0a260b2dda05fc94671e8b863a9ccef719bbe2ca7622c06e3dae6ccf68a41f7d96e847b68791
 WHIRLPOOL 
e103c1bff37b841d629b42b0a2b23f5048666f58e102da4c42571a54323454e5a799c1c2494f8641ad8b16e267954d7eb60688f4ca13b8fe12d3d81f9897565a

diff --git a/www-apache/mod_jk/files/88_mod_jk.conf 
b/www-apache/mod_jk/files/88_mod_jk.conf
index 60d40baba4f..1c66783cca1 100644
--- a/www-apache/mod_jk/files/88_mod_jk.conf
+++ b/www-apache/mod_jk/files/88_mod_jk.conf
@@ -15,6 +15,11 @@ JkWorkersFile/etc/apache2/jk-workers.properties
 # specify the location where mod_jk is going to place its log file.
 JkLogFile  /var/log/apache2/mod_jk.log
 
+###
+### Where to put mod_jk shm file
+###
+# specify the location where mod_jk is going to place its shared memory file.
+JkShmFile  /var/log/apache2/jk-runtime-status
 
 ###
 ### Set the jk log level [debug/error/info]

diff --git a/www-apache/mod_jk/mod_jk-1.2.42.ebuild 
b/www-apache/mod_jk/mod_jk-1.2.42.ebuild
new file mode 100644
index 000..eed7662cad2
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.42.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit apache-module java-pkg-opt-2 readme.gentoo-r1
+
+MY_P="tomcat-connectors-${PV#-*}-src"
+
+DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 
protocol"
+HOMEPAGE="https://tomcat.apache.org/connectors-doc/;
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="java"
+
+S="${WORKDIR}/${MY_P}/native"
+
+APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
+APACHE2_MOD_CONF="88_${PN}"
+APACHE2_MOD_DEFINE="JK"
+
+CONF_DIR="${WORKDIR}/${MY_P}/conf"
+
+DEPEND="java? ( >=virtual/jdk-1.4 )"
+RDEPEND=""
+
+need_apache2
+
+DOC_CONTENTS="
+   Advanced Directives and Options can be found at:
+   https://tomcat.apache.org/connectors-doc/reference/workers.html
+"
+
+pkg_setup() {
+   use java && java-pkg-2_pkg_setup
+}
+
+src_configure() {
+   econf \
+   --with-apxs=${APXS}
+}
+
+src_compile() {
+   emake LIBTOOL="/bin/sh $(pwd)/libtool --silent"
+}
+
+src_install() {
+   # install the workers.properties file
+   insinto "${APACHE_CONFDIR}"
+   newins "${CONF_DIR}/workers.properties" \
+   jk-workers.properties
+   doins "${CONF_DIR}/uriworkermap.properties"
+
+   apache-module_src_install
+
+   readme.gentoo_create_doc
+}