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

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

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

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

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

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

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

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

[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/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"