Updated www/ap2-jk to 1.2.43

The update from 1.2.37 works around  an Apache cstratup crash on NetBSD 8.0

This has first been committed to pkgsrc-2018Q2 by mistake. Here is it on
HEAD now after a pkgsrc-2018Q2 change rollback;

Complete Changelog

1.2.43
61733: LB: Propagate load factor changes applied by the status worker to a load balancer sub worker correctly to all processes. Based on a patch provided by Jonathan Oddy. (rjung)
fix     ISAPI: Align the make files for 32-bit and 64-bit builds. (markt)
update  Update config.guess and config.sub from http://git.savannah.gnu.org/cgit/config.git. (rjung)
update  Update PCRE bundled with the ISAPI redirector to 8.41. (rjung)
fix     Update the ISAPI redirector installation documentation to reflect the currently supported versions of Windows. (markt)
fix     Align the normalization performed by the ISAPI redirector with that implemented by Tomcat. (markt)

1.2.42
fix     Status: Fix displayed number of bytes read from and written to the backend when an AJP worker is used without a load balancer worker. (rjung)
fix     Apache: Don't try to read remaining request body parts during clean up if reading the request body from the client already failed during earlier processing phases. (rjung)
fix     57485: Apache: Propagate errors reading the request body from the client to mod_jk so Tomcat sees an error rather than a truncated body. (markt)
fix     57836: ISAPI: Empty REMOTE_USER should not be translated to "". (rjung)
fix     58249: Add a note the the documentation that max_packet_size will be aligned to the next multiple of 1024 if a value is specified that is not a multiple of 1024. (markt)
update  58309: ISAPI: Update bundled pcre from version 5.0 to 8.38. (rjung)
fix     58286: Fix crash in mod_jk and in the ISAPI Redirector. The crash only happens on Windows when retrieving the jk-status for the HTML format (which is the default format). This regression was
introduced by the fix to 54177. (rjung)
fix     58285: Don't use GCC atomics on platforms, for which GCC doesn't provide an atomics implementation. This regression was introduced by the fix to 44454 and 56703. (rjung)
fix     58425: Fix regression in 1.4.41 that prevented AJP 1.2 workers from initialising. Note that the AJP 1.2 protocol is deprecated. Patch provided by yagisita. (markt)
fix     58504: If a background thread is used to perform worker maintenance, ensure that maintenance runs are not skipped. Patch provided by Hiroto Shimizu. (markt)
fix     58608: ISAPI: Add a new registry option "flush_packets" that allows the flushing behaviour of IIS7+ to be controlled. The default is not to flush. Setting the option to "true" with cause IIS
to write data to the client as each AJP packet is received. (markt)
fix     58813: ISAPI: Correctly release a mutex allowing the plugin to complete initialization. Prior to this fix, the incomplete initialization was causing a hang on shutdown. Patch provided by
Matthew Reiter. (markt)
fix     58895: Correct an off-by-one error in the log messages for the number of attempts made to communicate with the backend server. Patch provided by Hiroto Shimizu. (markt)
fix     59164: Fix crash on first connection if a host name is specified for the worker that cannot be resolved to an IP address. (markt)
fix     59184: HTTPD: Avoid segmentation fault if mod_jk is configured with an invalid value for JkShmFile. This causes the server startup to fail. (markt)
fix     Minor code clean-up and optimization. (markt)

1.2.40
fix     AJP, LB: Reduce lock contention during maintenance function. This was observable when using a big number of AJP13 and LB workers, especially in combination with the Apache httpd prefork MPM.
(rjung)
fix     57060: Allow building from outside of source tree. Patch contributed by Petr Sumbera. (rjung)
fix     56703: Status: Fix inflated counter for current number of backend connections especially when a connection timeout occurred on the backend. (rjung)
fix     56661: Fix Servlet API getLocalAddr(). Works for Tomcat 6.0.42, 7.0.55 and 8.0.11 and Apache and ISAPI plugins. (rjung)
update  Status: Log old and new values when changing worker attributes. (rjung)
fix     56667: Status: Fix log message when changing activation state of all members. (rjung)
fix     56565: Fix IPV6 address resolve on non-dual network stacks. (mturk)
fix     50511: Reduce log level for "OPTIONS *" requests from warning to debug. (rjung)
fix     Apache: Copy log notes instead of using references to prevent access to memory from closed pool. (rjung)
add     Add option to control handling of multiple adjacent slashes in mount and unmount. New default is collapsing the slashes only in unmount. Configuration is done via new JkOption for Apache
("CollapseSlashesAll", "CollapseSlashesNone" or "CollapseSlashesUnmount") and via property "collapse_slashes" for IIS (values "all", "none", "unmount"). This is the fix for CVE-2014-8111. (rjung)
add     Add more checks for shared memory allocation. (rjung)
add     56869: Status: Add maximum number of open backend connections to status worker. Patch contributed by Martin Knoblauch. (rjung)
add     56770: AJP: Add worker name to all log messages. Patch contributed by Martin Knoblauch. (rjung)
fix     50186: Docs: Clarify relation between "connection_pool_timeout" and "keepAliveTimeout" or "connectionTimeout" in the Tomcat AJP connector configuration. (rjung)
fix     52334: LB: Calculate worker recovery time based on last recovery attempt time instead of original error time after the first recovery attempt. (rjung)
fix     54596 part 1: IIS: Fix missing last character when parsing relative file names with no ".." directory components from configuration. (rjung)
fix     54596 part 2: IIS: Fix using relative file names in config with ".." path segments that go up the directory hierarchy higher than the starting point of the relative file name. (rjung)
fix     Status: Add logging if status worker output was dropped due to insufficient buffer size. (rjung)
fix     Reduce log buffer from 8KB to 1KB. Add logging in case of failed logging and add trailing "..." to lines which were likely truncated. (rjung)
update  Replace fixed allocation of 32 entries for fail_on_status by dynamic allocation. (rjung)
add     Enforce implementation restriction on maximal length "60" of worker attributes "name", "host", "route", "domain", "redirect", "session_cookie", "session_path" and "set_session_cookie". Checks
were added to configuration file processing and configuration updates via the status worker. (rjung)
add     52483: Apache: Add debug logging for result of JkOptions configuration processing. (rjung)
fix     54177: Status: Use numeric time stamps instead of textual ones to avoid non-well-formed XML output. Textual timestamps are formatted according to locale settings and reencoding them to UTF-8
would be cumbersome. (rjung)
fix     56618: Status: Use percent decoding when reading query string parameters. For example this fixes editing IPv6 addresses via the status worker if the client encodes ":" as "%3A". Patch
contributed by Christopher Schultz. (rjung)
fix     56452: Fix crash in debug logging for IPv6 adresses. Patch contributed by Christopher Schultz. (rjung)
fix     34526: Apache: Improve compatibility with mod_deflate request body inflation. An automatic detection of mod_deflate inflation is not implemented. Use the new Apache environment variable
JK_IGNORE_CL instead, to let mod_jk ignore an existing Content-Length request header. (rjung)
update  44454: LB: Add warning to docs about problems with "busyness" load balancing method. (rjung)
fix     44454: Improve busy counter by using atomics. (rjung)
fix     56703: Status: Improve connected counter. Use atomics and for mod_jk (Apache) currectly count down connections closed by child processes that are stopped. (rjung)
fix     44571: Ensure that we return with status 503 if we can not get and endpoint for a worker. (rjung)
fix     Apache: Improve log handling during graceful or normal restart. (rjung)
fix     Don't update last access time of worker connections during optional checking of idle connections using CPing. Updating the time stamp breaks closing idle connections. (rjung)
fix     Adjust linger parameters used during connection shutdown. (rjung)
fix     Fix annoying redefine warnings for the autoconf PACKAGE defines during configure based builds. (rjung)
fix     Status: Use multi-line table headers and fix invalid xml output. (rjung)
fix     44571: Implement an optional limit on concurrent requests allowed for a worker (attribute "busy_limit"). Original patch contributed by zealot0630 at gmail dot com. (rjung)
fix     Correct log message "all endpoints are disconnected" to "no usable connection found, will create a new one". Tone done from info log level to debug for the common case. (rjung)
add     57536: AJP: Allow to configure connection source address. This should only be used on multi-homed hosts. The feature is experimental. (rjung)
add     57540: AJP: Forward name of SSL protocol used for handling the request (SSLv3, TLSv1, TLSv1.1, TLSv1.2). (rjung)

1.2.39
Fix forwarding of chunked requests, which is broken in version 1.2.39. (rjung)
fix     56352: Fix regression in memory release. (mturk)
fix     Fix status worker display of worker IP address after name or port was changed. (rjung)
update  56297: Improve key hash function. Copied from APR. (rjung)
fix     55683: Remove quotes from quoted session cookies. (rjung)
fix     53542: ISAPI: Fix grammar in 503 error page. (rjung)
fix     55696: Crash on Mac OS X 10.9 during config parsing. (rjung)

1.2.38
update  Deprecate nt_service from Apache Tomcat Connectors. (mturk)
fix     56133: Fix possible crash when a request fails during request body transfer to the back end and reply_timeout was set. Patch contributed by Hiroto Shimizu. (rjung)
fix     Fix status worker not updating parameters for all members. (mturk)
fix     55853: HTTPD: Use the correct API for setting Content-Length. Patch contributed by areese yahoo-inc.com. (rjung)
add     Add IPV6 support for connection to webserver. New directive prefer_ipv6 has been added to control the hostname resolution and preserve backward compatibility. (mturk)
add     Add --disable-sock-cloexec to configure to disable use of SOCK_CLOEXEC (using FD_CLOEXEC + fnctl instead) so built modules will work with Linux kernels prior to 2.6.27. (timw)
update  Clean up config file parsing. Worker names are now restricted to 60 bytes. (rjung)
update  Allow to set a stickyness cookie in case a web framework breaks Tomcat's adding of the routing ID to the end of the JSESSIONID cookie. (rjung)
update  Use max_packet_size also for request body forwarding. (rjung)
update  Apache 2.4: By default forward logical client address as provided by mod_remoteip. When setting JkOptions ForwardPhysicalAddress mod_jk will instead forward the physical peer address. (rjung)
update  Minor documentation improvements. (rjung)

3 files changed, 26 insertions, 17 deletions

diff --git a/www/ap2-jk/Makefile b/www/ap2-jk/Makefile
index 9c87e5669b1..05bf2845eda 100644
--- a/www/ap2-jk/Makefile
+++ b/www/ap2-jk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2018/01/01 10:23:07 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2018/08/25 01:57:43 manu Exp $
 
 DISTNAME=	tomcat-connectors-${JK_VERSION}-src
 PKGNAME=	${APACHE_PKG_PREFIX}-jk-${JK_VERSION}
-JK_VERSION=	1.2.37
+JK_VERSION=	1.2.43
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE:=tomcat/tomcat-connectors/jk/}
 
@@ -36,9 +36,15 @@ OVERRIDE_DIRDEPTH=	3
 SUBST_CLASSES+=		jk-lt
 SUBST_STAGE.jk-lt=	post-configure
 SUBST_FILES.jk-lt=	Makefile common/Makefile apache-2.0/Makefile
-SUBST_SED.jk-lt=	-e "s|^\\(LIBTOOL =\\) [^ ]*\$$|\\1 \$$(SHELL) \$$(top_builddir)/libtool|g"
+SUBST_SED.jk-lt=	-e "s|^\\(LIBTOOL *=\\).*\$$|\\1 \$$(SHELL) \$$(top_builddir)/libtool|g"
 SUBST_MESSAGE.jk-lt=	Fixing libtool references.
 
+SUBST_CLASSES+=		jk-shlt
+SUBST_STAGE.jk-shlt=	post-configure
+SUBST_FILES.jk-shlt=	scripts/build/instdso.s
+SUBST_SED.jk-shlt=	-e "s|^\\(SH_LIBTOOL *=\\).*\$$|\\1 \$$(SHELL) \$$(top_builddir)/libtool|g"
+SUBST_MESSAGE.jk-shlt=	Fixing libtool references in install script.
+
 # XXX The standard --with-apxs2 when using apache2 doesn't work
 CONFIGURE_ARGS+=	--with-apxs=${APXS:Q}
 
diff --git a/www/ap2-jk/distinfo b/www/ap2-jk/distinfo
index 628f104a4f6..1288222e1c6 100644
--- a/www/ap2-jk/distinfo
+++ b/www/ap2-jk/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 02:46:48 agc Exp $
+$NetBSD: distinfo,v 1.3 2018/08/25 01:57:43 manu Exp $
 
-SHA1 (tomcat-connectors-1.2.37-src.tar.gz) = 99e9ba0b2e72b28da7de6b14f103302e7b392a5d
-RMD160 (tomcat-connectors-1.2.37-src.tar.gz) = fbc47d9f767c75b039554dfc0776876290c580d9
-SHA512 (tomcat-connectors-1.2.37-src.tar.gz) = 96d0d3baba661a14a2235424ad7bdd78b8b44db168cabd015cba328a200f3df00aa922fd6afb4cd3cff896591e7aeb65cdde16c641ccff5bdcb84518d8d0862f
-Size (tomcat-connectors-1.2.37-src.tar.gz) = 1528647 bytes
-SHA1 (patch-ab) = ce0e84952f94a97d55fe143a27d3208afe027cf0
+SHA1 (tomcat-connectors-1.2.43-src.tar.gz) = 04136649eca7ea42a31564021a7f8959dbcb9822
+RMD160 (tomcat-connectors-1.2.43-src.tar.gz) = 9669e16a8dbec6b2e1a07f88b2d2fb281a95523b
+SHA512 (tomcat-connectors-1.2.43-src.tar.gz) = eee06e5eaadd237aa98cd0f6a15c4d8f96edb3b4d8b6b8d9cbdd91abc6b89b50aa75132d76b87791d1800b904d84aea03bafabbe5697541e5ec66bf07cc507f4
+Size (tomcat-connectors-1.2.43-src.tar.gz) = 3242555 bytes
+SHA1 (patch-ab) = b9e0422fd52a8e153623258fc4a83ebd800a421e
diff --git a/www/ap2-jk/patches/patch-ab b/www/ap2-jk/patches/patch-ab
index 5242e871a62..b5be1236c5b 100644
--- a/www/ap2-jk/patches/patch-ab
+++ b/www/ap2-jk/patches/patch-ab
@@ -1,15 +1,18 @@
-$NetBSD: patch-ab,v 1.1 2014/06/12 13:34:15 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2018/08/25 01:57:43 manu Exp $
 
 Fixup the Makefile so it uses the right libtool.
 
---- apache-2.0/Makefile.in.orig	2012-05-09 08:08:26.000000000 -0500
-+++ apache-2.0/Makefile.in	2012-10-21 15:25:01.000000000 -0500
-@@ -34,6 +34,8 @@
- # Apache2 settings, values guessed by Apache config and used to build it
+--- apache-2.0/Makefile.in.orig
++++ apache-2.0/Makefile.in
+@@ -36,8 +36,11 @@
+ # Apache settings, values guessed by Apache config and used to build it
  # Will define libexecdir, LIBTOOL, etc
  include @APACHE_CONFIG_VARS@
-+top_builddir = ..
-+LIBTOOL = 
  
++top_builddir = ..
++LIBTOOL =
++
  # Local settings ( overriding/appending to Apache's )
- COMMON=../common
+ COMMON=common
+ JK_INCL=-DUSE_APACHE_MD5 -I${top_builddir}/${COMMON} -I ${top_srcdir}/${COMMON}
+ CFLAGS=@apache_include@ @CFLAGS@ ${JK_INCL} ${APXSCPPFLAGS} ${APXSCFLAGS} ${EXTRA_CFLAGS} ${EXTRA_CPPFLAGS}