devel/zookeeper: Update to 3.4.12.

Version 3.4.12

Bug

- CRC check failed when preAllocSize smaller than node data
- Update documentation source for ZOOKEEPER-2574
- Flaky test:
  org.apache.zookeeper.server.quorum.FLEBackwardElectionRoundTest.testBackwardElectionRound
- Data inconsistency issue due to retain database in leader election
- very poor choice of logging if client fails to connect to server
- The comment of the variable matchSyncs in class CommitProcessor has
  a mistake.
- Flaky Test:
  org.apache.zookeeper.test.LoadFromLogTest.testRestoreWithTransactionErrors
- WriteLock recipe: incorrect znode ordering when the sessionId is
  part of the znode name
- Duplicate Keys in log4j.properties config files
- Specify correct overflow value
- Failing c unit tests on apache jenkins
- zkServer.cmd does not start when JAVA_HOME ends with a \
- Flaky Test: testNoLogBeforeLeaderEstablishment
- The dataDir and dataLogDir are used opposingly
- Fix testElectionFraud Flakyness
- fix potential null pointer exception when deleting node
- The eclipse build target fails due to protocol redirection:
  http->https

Improvement

- Add keys for the Zxid from the stat command to check_zookeeper.py
- Upgrade third party libraries to address vulnerabilities
- The function queueEmpty() in FastLeaderElection.Messenger is not
  used, should be removed.
- Add check to validate dataDir and dataLogDir parameters at startup

Wish

- Change log level for "ZKShutdownHandler is not registered" error
  message



Version 3.4.11

Sub-task

- Fix "Unexpected bean exists!" issue in WatcherTests
- Cleanup findbug warnings in branch-3.4: Correctness Warnings
- Cleanup findbug warnings in branch-3.4: Disable Internationalization
  Warnings
- Cleanup findbug warnings in branch-3.4: Malicious code vulnerability
  Warnings
- Cleanup findbug warnings in branch-3.4: Performance Warnings
- Cleanup findbug warnings in branch-3.4: Dodgy code Warnings
- Cleanup findbug warnings in branch-3.4: Experimental Warnings
- Set up Apache Jenkins job that runs the flaky test analyzer script.
- Multithreaded correctness Warnings
- ZOOKEEPER-2355 fix for branch-3.4

Bug

- Windows: fetch_and_add not 64bit-compatible, may not be correct
- Update documentation for snapCount
- Ephemeral node is never deleted if follower fails while reading the
  proposal packet
- Port ZOOKEEPER-1576 to branch3.4
- recreateSocketAddresses may recreate the unreachable IP address
- Flaky Test:
  org.apache.zookeeper.test.ReadOnlyModeTest.testSessionEstablishment
- Clean up findbug warnings in branch-3.4
- Port ZOOKEEPER-2737 to branch-3.4
- Netty connection leaks JMX connection bean upon connection close in
  certain race conditions.
- Typo: transasction --> transaction
- Flaky test:
  org.apache.zookeeper.server.quorum.QuorumCnxManagerTest.testNoAuthLearnerConnectToAuthRequiredServerWithHigherSid
- Ephemeral znode will not be removed when sesstion timeout, if the
  system time of ZooKeeper node changes unexpectedly.
- ZK Client not able to connect with Xid out of order error
- There is a typo in zk.py which prevents from using/compiling it.
- follower disconnects and cannot reconnect
- Server inappropriately throttles connections under load before SASL
  completes
- Flaky test:
  org.apache.zookeeper.test.ClientTest.testNonExistingOpCode
- Fix flaky test:
  org.apache.zookeeper.test.ReadOnlyModeTest.testConnectionEvents
- Unnecessary stack-trace in server when the client disconnect
  unexpectedly
- PurgeTxnLog#validateAndGetFile: return tag has no arguments.
- Improve the ZooKeeper#setACL java doc
- ZooKeeper public include files leak porting changes
- CMake build doesn't support OS X
- Main-Class JAR manifest attribute is incorrect
- Windows Debug builds don't link with `/MTd`
- Local automatic variable is left uninitialized and then freed.
- Don't include `config.h` in `zookeeper.h`
- The OWASP dependency check jar should not be included in the default
  classpath
- quorum.auth.MiniKdcTest.testKerberosLogin failing with NPE on java 9
- Create ant task to generate ivy dependency reports
- compiler warning using java 9

Improvement

- Operations to server will be timed-out while thousands of sessions
  expired same time
- TCP keepalive for leader election connections
- The define of MAX_CONNECTION_ATTEMPTS in QuorumCnxManager.java seems
  useless, should it be removed?
- ZooKeeperSaslClient#respondToServer should log exception message of
  SaslException
- Add script to run a java api compatibility tool
- Improve the efficiency of AtomicFileOutputStream
- Rename README.txt to README.md
- define dependency versions in build.xml to be easily overridden in
  build.properties

New Feature

- Please add instructions for running the tutorial
- Add ant task for running OWASP dependency report

Test

- Flaky Test: org.apache.zookeeper.test.WatcherTest.

4 files changed, 25 insertions, 24 deletions

diff --git a/devel/zookeeper/Makefile.common b/devel/zookeeper/Makefile.common
index 2bbee5af31f..ae628c30a71 100644
--- a/devel/zookeeper/Makefile.common
+++ b/devel/zookeeper/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.3 2017/09/06 11:12:19 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.4 2018/06/14 11:48:35 fhajny Exp $
 #
 # used by devel/libzookeeper/Makefile
 # used by devel/zookeeper/Makefile
 
-DISTNAME=	zookeeper-3.4.10
+DISTNAME=	zookeeper-3.4.12
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE:=zookeeper/${DISTNAME}/}
 
diff --git a/devel/zookeeper/PLIST b/devel/zookeeper/PLIST
index 8dce0b700a6..323b951af0f 100644
--- a/devel/zookeeper/PLIST
+++ b/devel/zookeeper/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2017/09/06 11:12:19 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/06/14 11:48:35 fhajny Exp $
 bin/zkCli.sh
 libexec/zkEnv.sh
 sbin/zkServer.sh
@@ -6,6 +6,7 @@ share/examples/zookeeper/configuration.xsl
 share/examples/zookeeper/log4j.properties
 share/examples/zookeeper/zoo.cfg
 share/examples/zookeeper/zookeeper-env.sh
+share/zookeeper/audience-annotations-0.5.0.jar
 share/zookeeper/cobertura/README.txt
 share/zookeeper/contrib/ZooInspector/${PKGNAME}-ZooInspector.jar
 share/zookeeper/contrib/fatjar/${PKGNAME}-fatjar.jar
@@ -43,9 +44,9 @@ share/zookeeper/jdiff/zookeeper_3.1.1.xml
 share/zookeeper/jdiff/zookeeper_${PKGVERSION}.xml
 share/zookeeper/jline-0.9.94.LICENSE.txt
 share/zookeeper/jline-0.9.94.jar
-share/zookeeper/log4j-1.2.16.LICENSE.txt
-share/zookeeper/log4j-1.2.16.jar
-share/zookeeper/netty-3.10.5.Final.jar
+share/zookeeper/log4j-1.2.17.LICENSE.txt
+share/zookeeper/log4j-1.2.17.jar
+share/zookeeper/netty-3.10.6.Final.jar
 share/zookeeper/recipes/election/${PKGNAME}-recipes-election.jar
 share/zookeeper/recipes/lock/build.xml
 share/zookeeper/recipes/lock/src/c/INSTALL
@@ -90,9 +91,9 @@ share/zookeeper/recipes/queue/src/c/tests/zkServer.sh
 share/zookeeper/recipes/queue/src/java/org/apache/zookeeper/recipes/queue/DistributedQueue.java
 share/zookeeper/recipes/queue/test/org/apache/zookeeper/recipes/queue/DistributedQueueTest.java
 share/zookeeper/recipes/queue/${PKGNAME}-recipes-queue.jar
-share/zookeeper/slf4j-1.6.1.LICENSE.txt
-share/zookeeper/slf4j-api-1.6.1.jar
-share/zookeeper/slf4j-log4j12-1.6.1.jar
+share/zookeeper/slf4j-1.7.25.LICENSE.txt
+share/zookeeper/slf4j-api-1.7.25.jar
+share/zookeeper/slf4j-log4j12-1.7.25.jar
 share/zookeeper/templates/conf/zoo.cfg
 share/zookeeper/templates/conf/zookeeper-env.sh
 share/zookeeper/${PKGNAME}.jar
diff --git a/devel/zookeeper/distinfo b/devel/zookeeper/distinfo
index 37407a260ed..609c6d94a9d 100644
--- a/devel/zookeeper/distinfo
+++ b/devel/zookeeper/distinfo
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.5 2017/09/06 11:12:19 fhajny Exp $
+$NetBSD: distinfo,v 1.6 2018/06/14 11:48:35 fhajny Exp $
 
-SHA1 (zookeeper-3.4.10-deps.tar.gz) = 560e5340bda5fc9ba61d230f85af040939e75b81
-RMD160 (zookeeper-3.4.10-deps.tar.gz) = 4c9b835b1204a4ef269aafb5792c5de58419aed5
-SHA512 (zookeeper-3.4.10-deps.tar.gz) = 2993e3247d010206706e56e2c67290da7042d4a90cbde0409f6c8af091981313e70233e527adbc50ce5c980eab47f79e77f30657b6f284a60cafbd840f2a5eff
-Size (zookeeper-3.4.10-deps.tar.gz) = 23663350 bytes
-SHA1 (zookeeper-3.4.10.tar.gz) = eb2145498c5f7a0d23650d3e0102318363206fba
-RMD160 (zookeeper-3.4.10.tar.gz) = 4b9b48d4a12abed14dd80071423d578afc68a5ba
-SHA512 (zookeeper-3.4.10.tar.gz) = 4c54e40ac8d0b267db4a188a30e39ed0ac2c3e8a8fadaf244be45ff5adee956df28f6cb9f1eb56f175e924fa3629b64f98286a090c46764c91c017613c80a51b
-Size (zookeeper-3.4.10.tar.gz) = 35042811 bytes
-SHA1 (patch-bin_zkEnv.sh) = 210b94572a221cc46898750da0a822c90708ef9f
-SHA1 (patch-build.xml) = 60abaa3f4a5eeb51d4c3e57bc3230e9725fd7abe
+SHA1 (zookeeper-3.4.12-deps.tar.gz) = e7d40793e226e154065ee885beff486989dd20d6
+RMD160 (zookeeper-3.4.12-deps.tar.gz) = f105847734e46f587cc65930e53eb050fbcb1d0a
+SHA512 (zookeeper-3.4.12-deps.tar.gz) = 5e227700e572e6b0f2a2663e9a3a077f4331c17d9ed82feb74c9a1de97f477fd2e08cbb3fc7d91b206a51eb7c8324b35d613f7d5693623dde9f268a95bf89cfc
+Size (zookeeper-3.4.12-deps.tar.gz) = 23292699 bytes
+SHA1 (zookeeper-3.4.12.tar.gz) = 8e2cc8784794e24df90fa1a9dbe6cd1695c79a44
+RMD160 (zookeeper-3.4.12.tar.gz) = 0cf88d820da8c7c84198992d73becb7449fb5fdc
+SHA512 (zookeeper-3.4.12.tar.gz) = 026c7feb4a660bf8d99b1b719fec2b7e4603c3c46f2b77bac372df15ed0ceb4d971aa9c954082d61d73929ef8dc38c31693604ae75244f746cafb4eb6e67320c
+Size (zookeeper-3.4.12.tar.gz) = 36667596 bytes
+SHA1 (patch-build.xml) = 15db87390ad232df4713b20a1e4318b922ffc6aa
 SHA1 (patch-conf_zoo__sample.cfg) = 74885bea53e5b9b723fb1564db362a08d7b47705
 SHA1 (patch-src_c_src_zookeeper.c) = 0cc9710914d2a329eb8f7d18683778f460180b72
 SHA1 (patch-src_contrib_build-contrib.xml) = 309385cf89f87df116832c51acc298e934bbffdf
diff --git a/devel/zookeeper/patches/patch-build.xml b/devel/zookeeper/patches/patch-build.xml
index 4eb3496d359..d558dc9a7bc 100644
--- a/devel/zookeeper/patches/patch-build.xml
+++ b/devel/zookeeper/patches/patch-build.xml
@@ -1,9 +1,9 @@
-$NetBSD: patch-build.xml,v 1.2 2017/09/06 11:12:20 fhajny Exp $
+$NetBSD: patch-build.xml,v 1.3 2018/06/14 11:48:35 fhajny Exp $
 
 Don't look for a specific Ivy version.
 Add Ivy resolver tasks to let us forbid fetch on demand.
 
---- build.xml.orig	2017-03-23 10:14:59.000000000 +0000
+--- build.xml.orig	2018-03-27 04:32:33.000000000 +0000
 +++ build.xml
 @@ -108,7 +108,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.ch
      <property name="contrib.dir" value="${src.dir}/contrib"/>
@@ -14,7 +14,7 @@ Add Ivy resolver tasks to let us forbid fetch on demand.
      <property name="ivy.url"
                value="https://repo1.maven.org/maven2/org/apache/ivy/ivy" />
      <property name="ivy.home" value="${user.home}/.ant" />
-@@ -364,33 +364,45 @@ xmlns:cs="antlib:com.puppycrawl.tools.ch
+@@ -403,27 +403,37 @@ xmlns:cs="antlib:com.puppycrawl.tools.ch
      </target>
  
      <target name="ivy-retrieve" depends="init,ivy-init">
@@ -50,8 +50,9 @@ Add Ivy resolver tasks to let us forbid fetch on demand.
 +      <ivy:resolve settingsRef="${ant.project.name}" conf="releaseaudit"
 +                    useCacheOnly="true"/>
        <ivy:retrieve settingsRef="${ant.project.name}" conf="releaseaudit"
-                     pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
+                     pattern="${ivy.releaseaudit.lib}/[artifact]-[revision].[ext]"/>
        <ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
+@@ -436,6 +446,8 @@ xmlns:cs="antlib:com.puppycrawl.tools.ch
      </target>
  
      <target name="ivy-retrieve-mvn-ant-task" depends="init,ivy-init">