From 2a9cb3584551393c3ae3c2bfc1b71a8b3ced0034 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 19 Sep 2015 22:58:23 +0000 Subject: [PATCH] Update to ap2-mod_jk-1.2.41. --- www/ap2-mod_jk/Makefile | 7 ++--- www/ap2-mod_jk/distinfo | 4 +-- .../patch-conf_uriworkermap_properties | 27 ------------------ .../patch-conf_workers_properties_minimal | 28 ------------------- www/ap2-mod_jk/patches/patch-native_configure | 16 +++++------ www/ap2-mod_jk/pkg/PLIST | 7 ++--- 6 files changed, 16 insertions(+), 73 deletions(-) delete mode 100644 www/ap2-mod_jk/patches/patch-conf_uriworkermap_properties delete mode 100644 www/ap2-mod_jk/patches/patch-conf_workers_properties_minimal diff --git a/www/ap2-mod_jk/Makefile b/www/ap2-mod_jk/Makefile index 1308e61f6ae..d4085d9c696 100644 --- a/www/ap2-mod_jk/Makefile +++ b/www/ap2-mod_jk/Makefile @@ -1,14 +1,13 @@ -# $OpenBSD: Makefile,v 1.6 2015/07/17 23:58:43 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.7 2015/09/19 22:58:23 ajacoutot Exp $ SHARED_ONLY = Yes COMMENT = Apache-Tomcat AJP Connector for Apache2 -V = 1.2.40 +V = 1.2.41 DISTNAME = tomcat-connectors-${V}-src PKGNAME = ap2-mod_jk-${V} CATEGORIES = www -REVISION = 1 HOMEPAGE = http://tomcat.apache.org/connectors-doc/index.html @@ -34,7 +33,7 @@ MODGNU_CONFIG_GUESS_DIRS =${WRKSRC}/scripts/build/unix DOCDIR = ${PREFIX}/share/doc/ap2-mod_jk EXAMPLEDIR = ${PREFIX}/share/examples/ap2-mod_jk EXAMPLES = uriworkermap.properties workers.properties \ - workers.properties.minimal + httpd-jk.conf do-install: ${INSTALL_DATA_DIR} ${EXAMPLEDIR}/apache2 diff --git a/www/ap2-mod_jk/distinfo b/www/ap2-mod_jk/distinfo index ecf5480c737..3b64058f341 100644 --- a/www/ap2-mod_jk/distinfo +++ b/www/ap2-mod_jk/distinfo @@ -1,2 +1,2 @@ -SHA256 (tomcat-connectors-1.2.40-src.tar.gz) = iV40fE3/dASahIYD+ymVjmz0KeoPxwjVFLOolYI2cF0= -SIZE (tomcat-connectors-1.2.40-src.tar.gz) = 1526449 +SHA256 (tomcat-connectors-1.2.41-src.tar.gz) = 8ZOwKu7HHaqxP8W7uZ8T7KnZFreaAk+ANaZfOVWbx/0= +SIZE (tomcat-connectors-1.2.41-src.tar.gz) = 1554935 diff --git a/www/ap2-mod_jk/patches/patch-conf_uriworkermap_properties b/www/ap2-mod_jk/patches/patch-conf_uriworkermap_properties deleted file mode 100644 index 7f37b36d46d..00000000000 --- a/www/ap2-mod_jk/patches/patch-conf_uriworkermap_properties +++ /dev/null @@ -1,27 +0,0 @@ -$OpenBSD: patch-conf_uriworkermap_properties,v 1.1.1.1 2013/01/25 08:51:16 dcoppa Exp $ ---- conf/uriworkermap.properties.orig Mon Mar 19 18:50:27 2012 -+++ conf/uriworkermap.properties Wed Nov 28 12:17:29 2012 -@@ -15,21 +15,12 @@ - - # uriworkermap.properties - IIS - # --# This file provides sample mappings for example wlb -+# This file provides sample mappings for example node1 - # worker defined in workermap.properties.minimal - # The general syntax for this file is: - # [URL]=[Worker name] - --/admin/*=lb --/manager/*=lb --/jsp-examples/*=lb --/servlets-examples/*=lb --/examples/*=lb -- --# Optionally filter out all .jpeg files inside that context --# For no mapping the url has to start with exclamation (!) -- --!/servlets-examples/*.jpeg=lb -+/examples/*=node1 - - # - # Mount jkstatus to /jkmanager diff --git a/www/ap2-mod_jk/patches/patch-conf_workers_properties_minimal b/www/ap2-mod_jk/patches/patch-conf_workers_properties_minimal deleted file mode 100644 index e1fbc1d4556..00000000000 --- a/www/ap2-mod_jk/patches/patch-conf_workers_properties_minimal +++ /dev/null @@ -1,28 +0,0 @@ -$OpenBSD: patch-conf_workers_properties_minimal,v 1.1.1.1 2013/01/25 08:51:16 dcoppa Exp $ ---- conf/workers.properties.minimal.orig Mon Mar 19 18:50:27 2012 -+++ conf/workers.properties.minimal Wed Nov 28 11:45:51 2012 -@@ -21,22 +21,15 @@ - # The workers that jk should create and work with - # - --worker.list=lb,jk-status -+worker.list=node1,jk-status - - # - # Defining a worker named node1 and of type ajp13 - # Note that the name and the type do not have to match. - # - worker.node1.type=ajp13 --worker.node1.host=localhost -+worker.node1.host=127.0.0.1 - worker.node1.port=8009 -- --# --# Defining a load balancer --# -- --worker.lb.type=lb --worker.lb.balance_workers=node1 - - # - # Define status worker diff --git a/www/ap2-mod_jk/patches/patch-native_configure b/www/ap2-mod_jk/patches/patch-native_configure index ab6a6aa66e7..51c024b668a 100644 --- a/www/ap2-mod_jk/patches/patch-native_configure +++ b/www/ap2-mod_jk/patches/patch-native_configure @@ -1,12 +1,12 @@ -$OpenBSD: patch-native_configure,v 1.2 2014/03/27 10:35:19 dcoppa Exp $ ---- native/configure.orig Thu Feb 27 18:26:26 2014 -+++ native/configure Thu Mar 27 11:28:39 2014 -@@ -3662,7 +3662,7 @@ for as_dir in $PATH +$OpenBSD: patch-native_configure,v 1.3 2015/09/19 22:58:23 ajacoutot Exp $ +--- native/configure.orig Mon Jul 27 00:21:39 2015 ++++ native/configure Sun Sep 20 00:54:12 2015 +@@ -4724,7 +4724,7 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. -- for lt_ac_prog in sed gsed; do -+ for lt_ac_prog in sed; do +- for ac_prog in sed gsed; do ++ for ac_prog in sed; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue diff --git a/www/ap2-mod_jk/pkg/PLIST b/www/ap2-mod_jk/pkg/PLIST index 596e0c48a08..d9f3daa4c9a 100644 --- a/www/ap2-mod_jk/pkg/PLIST +++ b/www/ap2-mod_jk/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2013/01/25 08:51:16 dcoppa Exp $ +@comment $OpenBSD: PLIST,v 1.2 2015/09/19 22:58:23 ajacoutot Exp $ lib/apache2/mod_jk.so share/doc/ap2-mod_jk/ share/doc/ap2-mod_jk/LICENSE @@ -6,9 +6,8 @@ share/doc/ap2-mod_jk/NOTICE share/doc/pkg-readmes/${FULLPKGNAME} share/examples/ap2-mod_jk/ share/examples/ap2-mod_jk/apache2/ -@sample ${SYSCONFDIR}/apache2/ +share/examples/ap2-mod_jk/apache2/httpd-jk.conf +@sample ${SYSCONFDIR}/apache2/httpd-jk.conf share/examples/ap2-mod_jk/apache2/uriworkermap.properties @sample ${SYSCONFDIR}/apache2/uriworkermap.properties share/examples/ap2-mod_jk/apache2/workers.properties -share/examples/ap2-mod_jk/apache2/workers.properties.minimal -@sample ${SYSCONFDIR}/apache2/workers.properties