%{python_sitearch} → %{python2_sitearch}

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>

.gitignore

@@ -1 +1,3 @@
 /zookeeper-3.4.5.tar.gz
+/zookeeper-3.4.6-601207e.tar.gz
+/zookeeper-3.4.9.tar.gz

0001-cppunit-config-no-longer-exists-use-pkg-config.patch

@@ -0,0 +1,62 @@
+From f5fe371100b44d667065c8bba2c1522b26224c23 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Mon, 15 Feb 2016 19:08:14 +0100
+Subject: [PATCH] cppunit-config no longer exists, use pkg-config
+
+---
+ src/c/configure.ac                   | 4 +++-
+ src/recipes/lock/src/c/configure.ac  | 2 +-
+ src/recipes/queue/src/c/configure.ac | 2 +-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/c/configure.ac b/src/c/configure.ac
+index b4ed639..09860d9 100644
+--- a/src/c/configure.ac
++++ b/src/c/configure.ac
+@@ -25,6 +25,8 @@ DX_INIT_DOXYGEN([zookeeper],[c-doc.Doxyfile],[docs])
+ AM_INIT_AUTOMAKE([-Wall foreign])
+ AC_CONFIG_HEADER([config.h])
+ 
++PKG_PROG_PKG_CONFIG
++
+ # Checks for programs.
+ AC_ARG_WITH(cppunit,
+         [  --without-cppunit       do not use CPPUNIT])
+@@ -34,7 +36,7 @@ if test "$with_cppunit" = "no" ; then
+    CPPUNIT_INCLUDE=
+    CPPUNIT_LIBS=
+ else
+-   AM_PATH_CPPUNIT(1.10.2)
++   PKG_CHECK_MODULES([CPPUNIT], [cppunit])
+ fi
+ 
+ if test "$CALLER" = "ANT" ; then
+diff --git a/src/recipes/lock/src/c/configure.ac b/src/recipes/lock/src/c/configure.ac
+index 3954123..f494058 100644
+--- a/src/recipes/lock/src/c/configure.ac
++++ b/src/recipes/lock/src/c/configure.ac
+@@ -72,7 +72,7 @@ AC_C_VOLATILE
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ #check for cppunit 
+-AM_PATH_CPPUNIT(1.10.2)
++PKG_CHECK_MODULES([CPPUNIT], [cppunit])
+ # Checks for library functions.
+ AC_FUNC_UTIME_NULL
+ AC_CHECK_FUNCS([gettimeofday memset mkdir rmdir strdup strerror strstr strtol strtoul strtoull utime])
+diff --git a/src/recipes/queue/src/c/configure.ac b/src/recipes/queue/src/c/configure.ac
+index a9fb7b1..a2b840d 100644
+--- a/src/recipes/queue/src/c/configure.ac
++++ b/src/recipes/queue/src/c/configure.ac
+@@ -72,7 +72,7 @@ AC_C_VOLATILE
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ #check for cppunit 
+-AM_PATH_CPPUNIT(1.10.2)
++PKG_CHECK_MODULES([CPPUNIT], [cppunit])
+ # Checks for library functions.
+ AC_FUNC_UTIME_NULL
+ AC_CHECK_FUNCS([gettimeofday memset mkdir rmdir strdup strerror strstr strtol strtoul strtoull utime])
+-- 
+2.5.0
+

ZOOKEEPER-1557.patch

@@ -1,152 +0,0 @@
-diff --git src/java/test/org/apache/zookeeper/test/SaslAuthFailNotifyTest.java src/java/test/org/apache/zookeeper/test/SaslAuthFailNotifyTest.java
-new file mode 100644
-index 0000000..2b00d86
---- /dev/null
-+++ src/java/test/org/apache/zookeeper/test/SaslAuthFailNotifyTest.java
-@@ -0,0 +1,98 @@
-+/**
-+ * Licensed to the Apache Software Foundation (ASF) under one
-+ * or more contributor license agreements.  See the NOTICE file
-+ * distributed with this work for additional information
-+ * regarding copyright ownership.  The ASF licenses this file
-+ * to you under the Apache License, Version 2.0 (the
-+ * "License"); you may not use this file except in compliance
-+ * with the License.  You may obtain a copy of the License at
-+ *
-+ *     http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+package org.apache.zookeeper.test;
-+
-+import java.io.File;
-+import java.io.FileWriter;
-+import java.io.IOException;
-+import java.util.concurrent.atomic.AtomicInteger;
-+
-+import org.apache.zookeeper.CreateMode;
-+import org.apache.zookeeper.TestableZooKeeper;
-+import org.apache.zookeeper.WatchedEvent;
-+import org.apache.zookeeper.ZooKeeper;
-+import org.apache.zookeeper.Watcher.Event.KeeperState;
-+import org.apache.zookeeper.ZooDefs.Ids;
-+import org.junit.Test;
-+import org.junit.Assert;
-+
-+public class SaslAuthFailNotifyTest extends ClientBase {
-+    static {
-+        System.setProperty("zookeeper.authProvider.1","org.apache.zookeeper.server.auth.SASLAuthenticationProvider");
-+        System.setProperty("zookeeper.allowSaslFailedClients","true");
-+
-+        try {
-+            File tmpDir = createTmpDir();
-+            File saslConfFile = new File(tmpDir, "jaas.conf");
-+            FileWriter fwriter = new FileWriter(saslConfFile);
-+
-+            fwriter.write("" +
-+                    "Server {\n" +
-+                    "          org.apache.zookeeper.server.auth.DigestLoginModule required\n" +
-+                    "          user_super=\"test\";\n" +
-+                    "};\n" +
-+                    "Client {\n" +
-+                    "       org.apache.zookeeper.server.auth.DigestLoginModule required\n" +
-+                    "       username=\"super\"\n" +
-+                    "       password=\"test1\";\n" + // NOTE: wrong password ('test' != 'test1') : this is to test SASL authentication failure.
-+                    "};" + "\n");
-+            fwriter.close();
-+            System.setProperty("java.security.auth.login.config",saslConfFile.getAbsolutePath());
-+        }
-+        catch (IOException e) {
-+            // could not create tmp directory to hold JAAS conf file.
-+        }
-+    }
-+
-+    private AtomicInteger authFailed = new AtomicInteger(0);
-+    
-+    @Override
-+    protected TestableZooKeeper createClient(String hp)
-+    throws IOException, InterruptedException
-+    {
-+        MyWatcher watcher = new MyWatcher();
-+        return createClient(watcher, hp);
-+    }
-+
-+    private class MyWatcher extends CountdownWatcher {
-+        @Override
-+        public synchronized void process(WatchedEvent event) {
-+            if (event.getState() == KeeperState.AuthFailed) {
-+                synchronized(authFailed) {
-+                    authFailed.incrementAndGet();
-+                    authFailed.notify();
-+                }
-+            }
-+            else {
-+                super.process(event);
-+            }
-+        }
-+    }
-+
-+    @Test
-+    public void testBadSaslAuthNotifiesWatch() throws Exception {
-+        ZooKeeper zk = createClient();
-+        // wait for authFailed event from client's EventThread.
-+        synchronized(authFailed) {
-+            authFailed.wait();
-+        }
-+        Assert.assertEquals(authFailed.get(),1);
-+        zk.close();
-+    }
-+}
-diff --git src/java/test/org/apache/zookeeper/test/SaslAuthFailTest.java src/java/test/org/apache/zookeeper/test/SaslAuthFailTest.java
-index 1589b1f..33a505e 100644
---- src/java/test/org/apache/zookeeper/test/SaslAuthFailTest.java
-+++ src/java/test/org/apache/zookeeper/test/SaslAuthFailTest.java
-@@ -59,43 +59,6 @@ public class SaslAuthFailTest extends ClientBase {
-             // could not create tmp directory to hold JAAS conf file.
-         }
-     }
--
--    private AtomicInteger authFailed = new AtomicInteger(0);
--    
--    @Override
--    protected TestableZooKeeper createClient(String hp)
--    throws IOException, InterruptedException
--    {
--        MyWatcher watcher = new MyWatcher();
--        return createClient(watcher, hp);
--    }
--
--    private class MyWatcher extends CountdownWatcher {
--        @Override
--        public synchronized void process(WatchedEvent event) {
--            if (event.getState() == KeeperState.AuthFailed) {
--                synchronized(authFailed) {
--                    authFailed.incrementAndGet();
--                    authFailed.notify();
--                }
--            }
--            else {
--                super.process(event);
--            }
--        }
--    }
--
--    @Test
--    public void testBadSaslAuthNotifiesWatch() throws Exception {
--        ZooKeeper zk = createClient();
--        // wait for authFailed event from client's EventThread.
--        synchronized(authFailed) {
--            authFailed.wait();
--        }
--        Assert.assertEquals(authFailed.get(),1);
--        zk.close();
--    }
--
-     
-     @Test
-     public void testAuthFail() throws Exception {

missing-pom.template.patch

@@ -0,0 +1,47 @@
+diff --git a/src/pom.template b/src/pom.template
+new file mode 100644
+index 0000000..a02c0b3
+--- /dev/null
++++ b/src/pom.template
+@@ -0,0 +1,41 @@
++SKIP_LINE  ***************************************************************
++SKIP_LINE  * Licensed to the Apache Software Foundation (ASF) under one
++SKIP_LINE  * or more contributor license agreements.  See the NOTICE file
++SKIP_LINE  * distributed with this work for additional information
++SKIP_LINE  * regarding copyright ownership.  The ASF licenses this file
++SKIP_LINE  * to you under the Apache License, Version 2.0 (the
++SKIP_LINE  * "License"); you may not use this file except in compliance
++SKIP_LINE  * with the License.  You may obtain a copy of the License at
++SKIP_LINE  * 
++SKIP_LINE  *   http://www.apache.org/licenses/LICENSE-2.0
++SKIP_LINE  * 
++SKIP_LINE  * Unless required by applicable law or agreed to in writing,
++SKIP_LINE  * software distributed under the License is distributed on an
++SKIP_LINE  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++SKIP_LINE  * KIND, either express or implied.  See the License for the
++SKIP_LINE  * specific language governing permissions and limitations
++SKIP_LINE  * under the License.
++SKIP_LINE  ***************************************************************
++<?xml version="1.0" encoding="UTF-8"?>
++${ivy.pom.license}
++${ivy.pom.header}
++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
++    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
++
++  <modelVersion>4.0.0</modelVersion>
++  <groupId>${ivy.pom.groupId}</groupId>
++  <artifactId>${ivy.pom.artifactId}</artifactId>
++  <packaging>${ivy.pom.packaging}</packaging>
++  <version>${ivy.pom.version}</version>
++  <name>${ivy.pom.name}</name>
++  <description>${ivy.pom.description}</description>
++  <url>${ivy.pom.url}</url>
++
++  <licenses>
++    <license>
++      <name>The Apache Software License, Version 2.0</name>
++      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
++      <distribution>repo</distribution>
++   </license>
++  </licenses>
++</project>

mt_adaptor.c.patch

@@ -1,11 +1,11 @@
-diff -up zookeeper-3.4.5/src/c/src/mt_adaptor.c.atomic zookeeper-3.4.5/src/c/src/mt_adaptor.c
---- zookeeper-3.4.5/src/c/src/mt_adaptor.c.atomic	2013-06-14 09:58:27.000000000 +0200
-+++ zookeeper-3.4.5/src/c/src/mt_adaptor.c	2013-06-14 10:00:09.000000000 +0200
-@@ -482,27 +482,7 @@ int32_t inc_ref_counter(zhandle_t* zh,in
- 
+diff --git a/src/c/src/mt_adaptor.c b/src/c/src/mt_adaptor.c
+index 7dc7878..1b18ac6 100644
+--- a/src/c/src/mt_adaptor.c
++++ b/src/c/src/mt_adaptor.c
+@@ -483,25 +483,9 @@ int32_t inc_ref_counter(zhandle_t* zh,int i)
  int32_t fetch_and_add(volatile int32_t* operand, int incr)
  {
--#ifndef WIN32
+ #ifndef WIN32
 -    int32_t result;
 -    asm __volatile__(
 -         "lock xaddl %0,%1\n"
@@ -13,7 +13,8 @@ diff -up zookeeper-3.4.5/src/c/src/mt_adaptor.c.atomic zookeeper-3.4.5/src/c/src
 -         : "0"(incr)
 -         : "memory");
 -   return result;
--#else
++    return __sync_fetch_and_add(operand, incr);
+ #else
 -    volatile int32_t result;
 -    _asm
 -    {
@@ -25,8 +26,7 @@ diff -up zookeeper-3.4.5/src/c/src/mt_adaptor.c.atomic zookeeper-3.4.5/src/c/src
 -        mov result, ecx; // result = ebx;        
 -     }
 -     return result;    
--#endif
-+    return __atomic_add_fetch(operand, incr, __ATOMIC_SEQ_CST);
++    return InterlockedExchangeAdd(operand, incr);
+ #endif
  }
  
- // make sure the static xid is initialized before any threads started

sources

@@ -1 +1 @@
-f64fef86c0bf2e5e0484d19425b22dcb  zookeeper-3.4.5.tar.gz
+SHA512 (zookeeper-3.4.9.tar.gz) = 4f3e003c6ce5e3338f642f7deaa0fd2cfd1b30591d3ed4fe880492dded6c4bf01d30483e28f3a38b43bb6d2696ff4d819fc9577733224cec07e236437e88a657

zkEnv.sh

@@ -0,0 +1,150 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script should be sourced into other zookeeper
+# scripts to setup the env variables
+
+# We use ZOOCFGDIR if defined,
+# otherwise we use /etc/zookeeper
+# or the conf directory that is
+# a sibling of this script's directory
+
+ZOOBINDIR="${ZOOBINDIR:-/usr/bin}"
+ZOOKEEPER_PREFIX="${ZOOBINDIR}/.."
+ZOOCFGDIR="/etc/zookeeper"
+ZOO_LOG_DIR="/var/log/zookeeper"
+
+if [ -f "${ZOOCFGDIR}/zookeeper-env.sh" ]; then
+  . "${ZOOCFGDIR}/zookeeper-env.sh"
+fi
+
+if [ "x$ZOOCFG" = "x" ]
+then
+    ZOOCFG="zoo.cfg"
+fi
+
+ZOOCFG="$ZOOCFGDIR/$ZOOCFG"
+
+if [ -f "$ZOOCFGDIR/java.env" ]
+then
+    . "$ZOOCFGDIR/java.env"
+fi
+
+if [ "x${ZOO_LOG_DIR}" = "x" ]
+then
+    ZOO_LOG_DIR="."
+fi
+
+if [ "x${ZOO_LOG4J_PROP}" = "x" ]
+then
+    ZOO_LOG4J_PROP="INFO,CONSOLE"
+fi
+
+if [ "$JAVA_HOME" != "" ]; then
+  JAVA="$JAVA_HOME/bin/java"
+else
+  JAVA=java
+fi
+
+## TSTCLAIR: May need to add jar soup to classpath
+#add the zoocfg dir to classpath
+CLASSPATH="/usr/share/java/zookeeper/zookeeper.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/zookeeper/zookeeper-ZooInspector.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/zookeeper/zookeeper-tests.jar"
+
+# This section is sorted for easy maintenance
+CLASSPATH="$CLASSPATH:/usr/lib/java/jline1/jline-1.0.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/antlr.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/avalon-framework-api.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/avalon-logkit.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/cglib.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/checkstyle.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/commons-beanutils.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/commons-cli.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/commons-logging.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/geronimo-jms_1.1_spec.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/guava.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/all.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/core.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/generator.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/integration.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/library.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/hamcrest/text.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/javax.mail/javax.mail.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jdiff.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-annotations.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-client.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-continuation.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-deploy.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-http.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-io.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jaas.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jmx.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jndi.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jsp.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-jspc-maven-plugin.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-maven-plugin.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-plus.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-proxy.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-rewrite.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-security.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-server.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-servlet.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-servlets.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-util-ajax.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-util.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-webapp.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/jetty-xml.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-api.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-client.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-common.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-server.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jetty/websocket-servlet.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jtoaster.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/junit.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/jzlib.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/mockito.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/netty.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/objectweb-asm/asm.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/objenesis/objenesis-tck.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/objenesis/objenesis.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/api.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/ext.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/jcl-over-slf4j.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/jul-to-slf4j.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/migrator.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/site.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-api.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-ext.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-migrator.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-site.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/tomcat-servlet-api.jar"
+
+# We use slf4j-log4j12.jar as our logging binding
+CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-log4j12.jar"
+# These Conflict with slf4j-log4j12.jar
+#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-jcl.jar"
+#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-nop.jar"
+#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-simple.jar"
+
+# Explicitly add the log4j 1.2 jars
+CLASSPATH="$CLASSPATH:/usr/share/java/log4j-1.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/log4j.jar"
+
+# Not required according to https://issues.apache.org/jira/browse/SOLR-2369
+#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/log4j-over-slf4j.jar"
+#CLASSPATH="$CLASSPATH:/usr/share/java/slf4j/slf4j-jdk14.jar"

zookeeper-3.4.4-build.patch

@@ -1,447 +0,0 @@
-diff -Nru zookeeper-3.4.4/build.xml zookeeper-3.4.4-gil/build.xml
---- zookeeper-3.4.4/build.xml	2012-09-17 10:34:37.000000000 +0200
-+++ zookeeper-3.4.4-gil/build.xml	2012-10-12 17:51:43.676211458 +0200
-@@ -36,7 +36,7 @@
-     <property name="src.dir" value="${basedir}/src" />
-     <property name="java.src.dir" value="${src.dir}/java/main" />
- 
--    <property name="lib.dir" value="${src.dir}/java/lib" />
-+    <property name="lib.dir" value="/usr/share/java" />
-     <property name="lib.dir.includes" value="**/*.jar" />
-     <property name="lib.dir.excludes" value="**/excluded/" />
- 
-@@ -89,46 +89,28 @@
-     <property name="dist.dir" value="${build.dir}/${final.name}"/>
-     <property name="dist.maven.dir" value="${dist.dir}/dist-maven"/>
- 
--    <property name="clover.home" location="${env.CLOVER_HOME}"/>
--    <property name="clover.jar" location="${clover.home}/lib/clover.jar" />
--    <property name="clover.db.dir" location="${test.java.build.dir}/clover/db"/>
--    <property name="clover.report.dir"
--              location="${test.java.build.dir}/clover/reports"/>
--
-     <property name="contrib.dir" value="${src.dir}/contrib"/>
-     <property name="recipes.dir" value="${src.dir}/recipes"/>
- 
-     <property name="ivy.version" value="2.2.0"/>
-     <property name="ivy.url"
--              value="http://repo2.maven.org/maven2/org/apache/ivy/ivy" />
--    <property name="ivy.home" value="${user.home}/.ant" />
--    <property name="ivy.lib" value="${build.dir}/lib"/>
-+              value="file:/usr/share/java/" />
-+    <property name="ivy.home" value="${basedir}/.ant" />
-+    <property name="ivy.lib" value="/usr/share/java"/>
-     <property name="ivy.package.lib" value="${build.dir}/package/lib"/>
-     <property name="ivy.test.lib" value="${build.dir}/test/lib"/>
-     <property name="ivy.jdiff.lib" value="${build.dir}/jdiff/lib"/>
-     <property name="ivysettings.xml" value="${basedir}/ivysettings.xml"/>
- 
--    <available property="clover.present"
--               classname="com.cenqua.clover.CloverInstr"
--               classpath="${clover.home}/lib/clover.jar"/>
--
-     <available file="${c.src.dir}/Makefile" property="Makefile.present"/>
- 
-     <!-- check if clover reports should be generated -->
--    <condition property="clover.enabled">
--      <and>
--        <isset property="run.clover"/>
--        <isset property="clover.present"/>
--      </and>
--    </condition>
- 
- 
-     <property name="test.cobertura.output.format" value="html" />
-     <property name="coveragereport.dir" value="${build.dir}/cobertura" />
- 
-     <!-- rats properties -->
--    <property name="rats_url" value="http://arat.googlecode.com/files/rat-lib-all-0.5.1.jar" />
--    <property name="rat.reporting.classname" value="rat.Report"/>
- 
-         <!-- test patch properties -->
-     <property name="scratch.dir" value="${user.home}/tmp"/>
-@@ -198,7 +180,6 @@
-       <fileset dir="${ivy.lib}">
-         <include name="**/*.jar" />
-       </fileset>
--      <pathelement path="${clover.jar}" />
-     </path>
- 
-     <path id="test.java.classpath">
-@@ -225,7 +206,7 @@
-         <mkdir dir="${ivy.package.lib}"/>
-         <mkdir dir="${ivy.test.lib}"/>
-         <condition property="ivy.jar.exists">
--          <available file="${lib.dir}/ivy-${ivy.version}.jar"/>
-+          <available file="${lib.dir}/ivy.jar"/>
-         </condition>
- 
-         <tstamp>
-@@ -312,8 +293,8 @@
-     <target name="ivy-download" unless="ivy.jar.exists" depends="init">
-       <delete dir="${lib.dir}"
-               includes="ivy-*.jar" excludes="ivy-${ivy.version}.jar"/>
--      <get src="${ivy.url}/${ivy.version}/ivy-${ivy.version}.jar"
--           dest="${lib.dir}/ivy-${ivy.version}.jar" usetimestamp="true"/>
-+      <get src="${ivy.url}/ivy.jar"
-+           dest="${lib.dir}/ivy.jar" usetimestamp="true"/>
-     </target>
- 
-     <target name="ivy-taskdef" unless="ivy.initialized">
-@@ -329,32 +310,20 @@
- 
-     <target name="ivy-retrieve" depends="init,ivy-init">
-       <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="default"
--                    pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
-+                    pattern="${ivy.lib}/[artifact].[ext]"/>
-     </target>
- 
-     <target name="ivy-retrieve-test" depends="init,ivy-init">
-       <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="test"
--                    pattern="${ivy.test.lib}/[artifact]-[revision].[ext]"/>
-+                    pattern="${ivy.test.lib}/[artifact].[ext]"/>
-     </target>
- 
-     <target name="ivy-retrieve-package" depends="init,ivy-init">
-       <ivy:retrieve settingsRef="${ant.project.name}" conf="package"
--                    pattern="${ivy.package.lib}/[artifact]-[revision].[ext]"/>
--    </target>
--
--    <target name="ivy-retrieve-jdiff" depends="init,ivy-init">
--      <mkdir dir="${ivy.jdiff.lib}"/>
--      <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="jdiff"
--                    pattern="${ivy.jdiff.lib}/[artifact]-[revision].[ext]"/>
--    </target>
--
--    <target name="ivy-retrieve-releaseaudit" depends="init,ivy-init">
--      <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="releaseaudit"
--                    pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
--      <ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
-+                    pattern="${ivy.package.lib}/[artifact].[ext]"/>
-     </target>
- 
--    <target name="compile" depends="ivy-retrieve,clover,build-generated">
-+    <target name="compile" depends="ivy-retrieve">
-         <javac srcdir="${java.src.dir}" destdir="${build.classes}" includeantruntime="false"
-                target="${javac.target}" source="${javac.source}" debug="on">
-             <classpath refid="java.classpath"/>
-@@ -498,7 +467,6 @@
-             <arg value="--revision" />
-             <classpath>
-                 <pathelement path="${build.classes}" />
--                <pathelement path="${clover.jar}" />
-             </classpath>
-         </java>
-         <exec executable="hostname" outputproperty="host.name"/>
-@@ -541,7 +509,6 @@
-             <arg value="--revision" />
-             <classpath>
-                 <pathelement path="${build.classes}" />
--                <pathelement path="${clover.jar}" />
-             </classpath>
-         </java>
-         <exec executable="hostname" outputproperty="host.name"/>
-@@ -634,7 +601,7 @@
-     <!--                                                                    -->
-     <!-- ================================================================== -->
-     <target name="package" 
--            depends="jar,bin-jar,src-jar,javadoc-jar,test-jar,api-report,create-cppunit-configure,compile-test"
-+            depends="jar,bin-jar,src-jar,javadoc-jar,test-jar,create-cppunit-configure,compile-test"
-             description="Build distribution">
-       <mkdir dir="${dist.dir}"/>
-       <mkdir dir="${dist.dir}/lib"/>
-@@ -733,7 +700,7 @@
-     </target>
- 
-     <target name="bin-package"
--            depends="jar,bin-jar,src-jar,javadoc-jar,test-jar,api-report,create-cppunit-configure,compile-test"
-+            depends="jar,bin-jar,src-jar,javadoc-jar,test-jar,create-cppunit-configure,compile-test"
-             description="Build binary distribution">
-       <delete dir="${dist.dir}"/>
-       <mkdir dir="${dist.dir}"/>
-@@ -1094,9 +1061,6 @@
-       <delete dir="${docs.src}/build"/>
-       <delete dir="${src_generated.dir}" />
-       <delete dir="${csrc_generated.dir}" />
--      <delete file="${lib.dir}/Null.java"/>
--      <delete file="${lib.dir}/rats.jar" />
--      <delete file="${jdiff.xml.dir}/${name}_${version}.xml"/>	
-       <delete file="${jar.name}" />
-       <delete dir="${distribution}"/>
-       <delete dir="${revision.dir}"/>
-@@ -1260,7 +1224,6 @@
- 		<env key="LD_LIBRARY_PATH" value="${env.LD_LIBRARY_PATH};${cppunit.lib}"/>
- 		<env key="PATH" path="${env.PATH};${c.src.dir};"/>
-                 <env key="CALLER" value="ANT"/>
--                <env key="CLOVER_HOME" value="${clover.home}"/>
-                 <env key="base_dir" value="${basedir}"/>
- 		<arg line="clean run-check"/>
- 	</exec>
-@@ -1304,50 +1267,6 @@
-     <!-- Run optional third-party tool targets                  -->
-     <!-- ====================================================== -->
- 
--    <!-- clover code coverage -->
--    <target name="clover" depends="clover.setup, clover.info" 
--            description="Instrument the Unit tests using Clover.  Requires a Clover license and CLOVER_HOME environment variable set appropriately.  To use, specify -Drun.clover=true on the command line."/>
--
--    <target name="clover.setup" if="clover.enabled">
--      <taskdef resource="cloverlib.xml" classpath="${clover.jar}"/>
--      <mkdir dir="${clover.db.dir}"/>
--      <clover-setup initString="${clover.db.dir}/zookeeper_coverage.db">
--        <fileset dir="${java.src.dir}"
--                 includes="org/apache/zookeeper/**/*"
--                 excludes="org/apache/zookeeper/version/**/*"/>
--      </clover-setup>
--    </target>
--
--    <target name="clover.info" if="run.clover" unless="clover.present">
--      <echo>
--        Clover not found. Code coverage reports disabled.
--      </echo>
--    </target>
--
--    <target name="clover.check">
--      <fail unless="clover.present">
--        ##################################################################
--        Clover not found.
--        Please make sure clover.jar is in ANT_HOME/lib, or made available
--        to Ant using other mechanisms like -lib or CLASSPATH.
--        ##################################################################
--      </fail>
--    </target>
--
--    <target name="generate-clover-reports" depends="clover.check, clover">
--      <mkdir dir="${clover.report.dir}"/>
--      <clover-report>
--        <current outfile="${clover.report.dir}" title="${final.name}">
--          <format type="html"/>
--        </current>
--      </clover-report>
--      <clover-report>
--        <current outfile="${clover.report.dir}/clover.xml" title="${final.name}">
--          <format type="xml"/>
--        </current>
--      </clover-report>
--    </target>
--
-     <!-- Run with 'ant -Dfindbugs.home="path to Findbugs directory" findbugs -->
-     <property name="findbugs.home" value="" />
-     <target name="findbugs" depends="check-for-findbugs, jar" if="findbugs.present">
-@@ -1356,11 +1275,11 @@
-         <property name="findbugs.report.htmlfile" value="${findbugs.out.dir}/zookeeper-findbugs-report.html" />
-         <property name="findbugs.report.xmlfile" value="${findbugs.out.dir}/zookeeper-findbugs-report.xml" />
-         <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" 
--                classpath="${findbugs.home}/lib/findbugs-ant.jar" />
-+                classpath="${ivy.lib}/ant/ant-findbugs.jar" />
-         <mkdir dir="${findbugs.out.dir}" />
-         <findbugs home="${findbugs.home}" output="xml:withMessages" excludeFilter="${findbugs.exclude.file}" 
-                 outputFile="${findbugs.report.xmlfile}" effort="max" jvmargs="-Xmx512M">
--            <auxClasspath path="${ivy.lib}/log4j-1.2.15.jar" />
-+            <auxClasspath path="${ivy.lib}/log4j.jar" />
-             <sourcePath path="${java.src.dir}" />
-             <class location="${build.dir}/${final.name}.jar" />
-         </findbugs>
-@@ -1369,7 +1288,7 @@
-     </target>
- 
-     <target name="check-for-findbugs">
--        <available property="findbugs.present" file="${findbugs.home}/lib/findbugs.jar" />
-+        <available property="findbugs.present" file="${ivy.lib}/findbugs.jar" />
-     </target>
- 
-     <!-- Code coverage -->
-@@ -1479,51 +1398,6 @@
-     <!-- ================================================================== -->
-     <!-- Perform audit activities for the release                           -->
-     <!-- ================================================================== -->
--    <target name="rats-taskdef" depends="ivy-retrieve-releaseaudit">
--      <typedef format="xml" resource="org/apache/rat/anttasks/antlib.xml" uri="antlib:org.apache.rat.anttasks"
--               classpathref="releaseaudit-classpath"/>
--    </target>
--
--    <target name="releaseaudit" depends="package,rats-taskdef" description="Release Audit activities">
--      <rat:report xmlns:rat="antlib:org.apache.rat.anttasks">
--        <fileset dir="${dist.dir}">
--          <exclude name="**/*.m4"/>
--          <exclude name="**/*.md5"/>
--          <exclude name="**/*.pom"/>
--          <exclude name="**/*.sha1"/>
--          <exclude name="**/.gitignore"/>
--          <exclude name="**/Makefile**"/>
--          <exclude name="**/winconfig.h"/>
--          <exclude name="**/configure**"/>
--          <exclude name="**/*Doxyfile"/>
--          <exclude name="**/*.am"/>
--          <exclude name="**/compile"/>
--          <exclude name="**/depcomp"/>
--          <exclude name="**/install-sh"/>
--          <exclude name="**/ltmain.sh"/>
--          <exclude name="**/missing"/>
--          <exclude name="**/wrappers*.opt"/>
--          <exclude name="CHANGES.txt"/>
--          <exclude name="**/VERSION"/>
--          <exclude name="**/ChangeLog"/>
--          <exclude name="**/OldChangeLog"/>
--          <exclude name="**/Changes"/>
--          <exclude name="**/contrib/zkperl/MANIFEST"/>
--          <exclude name="**/conf/*"/>
--          <exclude name="**/docs/"/>
--          <exclude name="**/lib/jdiff/"/>
--          <exclude name="src/c/autom4te.cache/**"/>
--          <exclude name="src/c/config**"/>
--          <exclude name="src/c/src/hashtable/"/>
--          <exclude name="src/java/generated/.generated/"/>
--          <exclude name="src/java/test/checkstyle*.xml"/>
--          <exclude name="src/java/test/checkstyle*.xsl"/>
--          <exclude name="src/java/test/config/findbugs*.xml"/>
--          <exclude name="src/**/*.vcproj"/>
--          <exclude name="src/**/*.sln"/>
--        </fileset>
--      </rat:report>
--    </target>
- 
-     <target name="findbugs.check" depends="check-for-findbugs" unless="findbugs.present">
-     	<fail message="'findbugs.home' is not defined. Please pass -Dfindbugs.home=&lt;base of Findbugs installation&gt; 
-@@ -1575,65 +1449,6 @@
-      <!-- this target runs the hudson trunk build -->
-      <target name="hudson-test-trunk" depends="docs,tar,findbugs"/>
- 
--     <target name="api-xml" depends="ivy-retrieve-jdiff, javadoc, write-null">
--       <javadoc>
--         <doclet name="jdiff.JDiff"
--                 path="${ivy.jdiff.lib}/jdiff-1.0.9.jar:${ivy.jdiff.lib}/xerces-1.4.4.jar">
--           <param name="-apidir" value="${jdiff.xml.dir}"/>
--           <param name="-apiname" value="${name} ${version}"/>
--         </doclet>
--         <packageset dir="${java.src.dir}">
--           <include name="org/apache/zookeeper"/>
--           <exclude name="org/apache/jute"/>
--         </packageset>
--         <classpath>
--           <pathelement location="${build.classes}"/>
--           <fileset dir="${lib.dir}">
--             <include name="**/*.jar" />
--             <exclude name="**/excluded/" />
--           </fileset>
--           <fileset dir="${ivy.lib}">
--             <include name="**/*.jar" />
--           </fileset>
--         </classpath>
--       </javadoc>
--     </target>
--     
--     <target name="write-null">
--       <exec executable="touch">
--         <arg value="${jdiff.home}/Null.java"/>
--       </exec>
--     </target> 
--
--     <target name="api-report" depends="api-xml">
--       <mkdir dir="${jdiff.build.dir}"/>
--       <javadoc sourcepath="${java.src.dir}"
--                destdir="${jdiff.build.dir}"
--                excludepackagenames="org.apache.jute"	
--                sourceFiles="${jdiff.home}/Null.java">
--         <doclet name="jdiff.JDiff"
--                 path="${ivy.jdiff.lib}/jdiff-1.0.9.jar:${ivy.jdiff.lib}/xerces-1.4.4.jar">
--           <param name="-oldapi" value="${name} ${jdiff.stable}"/>
--           <param name="-newapi" value="${name} ${version}"/>
--           <param name="-oldapidir" value="${jdiff.xml.dir}"/>
--           <param name="-newapidir" value="${jdiff.xml.dir}"/>
--           <param name="-javadocold" value="${jdiff.stable.javadoc}"/>
--           <param name="-javadocnew" value="../../api/"/>
--           <param name="-stats"/>
--         </doclet>
--         <classpath>
--           <pathelement location="${build.classes}"/>
--           <fileset dir="${lib.dir}">
--             <include name="**/*.jar" />
--             <exclude name="**/excluded/" />
--           </fileset>
--           <fileset dir="${ivy.lib}">
--             <include name="**/*.jar" />
--           </fileset>
--         </classpath>
--       </javadoc>
--     </target>
--
-      <condition property="ant-eclipse.jar.exists">
-        <available file="${lib.dir}/ant-eclipse-1.0-jvm1.2.jar"/>
-      </condition>
-diff -Nru zookeeper-3.4.4/ivysettings.xml zookeeper-3.4.4-gil/ivysettings.xml
---- zookeeper-3.4.4/ivysettings.xml	2012-09-17 10:34:37.000000000 +0200
-+++ zookeeper-3.4.4-gil/ivysettings.xml	2012-10-12 17:02:35.706545077 +0200
-@@ -18,13 +18,13 @@
- -->
- 
-   <property name="repo.maven.org"
--    value="http://repo1.maven.org/maven2/" override="false"/>
-+    value="file:///usr/share/java/" override="false"/>
-   <property name="repo.jboss.org"
--    value="http://repository.jboss.org/nexus/content/groups/public/" override="false"/>
-+    value="file:///usr/share/java/" override="false"/>
-   <property name="repo.sun.org"
--    value="http://download.java.net/maven/2/" override="false"/>
-+    value="file:///usr/share/java/" override="false"/>
-   <property name="maven2.pattern"
--    value="[organisation]/[module]/[revision]/[module]-[revision]"/>
-+    value="[module]"/>
-   <property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
-   <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
-   <settings defaultResolver="default"/>
-diff -Nru zookeeper-3.4.4/ivy.xml zookeeper-3.4.4-gil/ivy.xml
---- zookeeper-3.4.4/ivy.xml	2012-09-17 10:34:37.000000000 +0200
-+++ zookeeper-3.4.4-gil/ivy.xml	2012-10-12 17:41:46.216338834 +0200
-@@ -39,36 +39,36 @@
-   </publications>
- 
-   <dependencies>
--    <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"/>
--    <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
-+    <dependency org="org.slf4j" name="slf4j/api" rev=""/>
-+    <dependency org="org.slf4j" name="slf4j/log4j12" rev="" transitive="false"/>
-   
-     <!-- transitive false turns off dependency checking, log4j deps seem borked -->
--    <dependency org="log4j" name="log4j" rev="1.2.15" transitive="false" conf="default"/>
--    <dependency org="jline" name="jline" rev="0.9.94" transitive="false" conf="default"/>
-+    <dependency org="log4j" name="log4j" rev="" transitive="false" conf="default"/>
-+    <dependency org="jline" name="jline" rev="" transitive="false" conf="default"/>
- 
--    <dependency org="org.jboss.netty" name="netty" conf="default" rev="3.2.2.Final">
-+    <dependency org="org.jboss.netty" name="netty" conf="default" rev="">
-       <artifact name="netty" type="jar" conf="default"/>
-     </dependency>
- 
--    <dependency org="org.vafer" name="jdeb" rev="0.8" conf="package->master"/>
-+    <!--dependency org="org.vafer" name="jdeb" rev="0.8" conf="package->master"/-->
- 
--    <dependency org="junit" name="junit" rev="4.8.1" conf="test->default"/>
--     <dependency org="org.mockito" name="mockito-all" rev="1.8.2"
-+    <dependency org="junit" name="junit" rev="" conf="test->default"/>
-+     <dependency org="org.mockito" name="mockito" rev=""
-                conf="test->default"/>
--    <dependency org="checkstyle" name="checkstyle" rev="5.0"
-+    <dependency org="checkstyle" name="checkstyle" rev=""
-                 conf="test->default"/>
- 
--    <dependency org="jdiff" name="jdiff" rev="1.0.9"
-+    <!--dependency org="jdiff" name="jdiff" rev=""
-                 conf="jdiff->default"/>
--    <dependency org="xerces" name="xerces" rev="1.4.4"
-+    <dependency org="xerces" name="xerces-j2" rev=""
-                 conf="jdiff->default"/>
- 
--    <dependency org="org.apache.rat" name="apache-rat-tasks" 
--                rev="0.6" conf="releaseaudit->default"/>
-+    <dependency org="org.apache.rat" name="apache-rat/apache-rat-tasks" 
-+                rev="" conf="releaseaudit->default"/>
-     <dependency org="commons-lang" name="commons-lang" 
--                rev="2.4" conf="releaseaudit->default"/>
-+                rev="" conf="releaseaudit->default"/>
-     <dependency org="commons-collections" name="commons-collections" 
--                rev="3.1" conf="releaseaudit->default"/>
-+                rev="" conf="releaseaudit->default"/-->
-   </dependencies>
- 
- </ivy-module>

zookeeper-3.4.5-build-contrib.patch

@@ -1,133 +0,0 @@
-diff -Nru zookeeper-3.4.5/src/contrib/build-contrib.xml zookeeper-3.4.5-gil/src/contrib/build-contrib.xml
---- zookeeper-3.4.5/src/contrib/build-contrib.xml	2012-09-30 19:53:32.000000000 +0200
-+++ zookeeper-3.4.5-gil/src/contrib/build-contrib.xml	2013-04-27 11:51:59.684011892 +0200
-@@ -43,9 +43,9 @@
- 
-   <property name="ivy.version" value="2.2.0"/>
-   <property name="ivy.url"
--            value="http://repo2.maven.org/maven2/org/apache/ivy/ivy" />
-+            value="file:/usr/share/java/" />
-   <property name="ivy.home" value="${user.home}/.ant" />
--  <property name="ivy.lib" value="${build.dir}/lib"/>
-+  <property name="ivy.lib" value="/usr/share/java"/>
-   <property name="ivy.test.lib" value="${build.test}/lib"/>
-   <property name="ivysettings.xml" value="${zk.root}/ivysettings.xml"/>
- 
-@@ -70,24 +70,17 @@
- 
-   <path id="classpath">
-     <pathelement location="${build.classes}"/>
--    <!-- allow the user to override (e.g. if there are local versions) -->
--    <fileset dir="${additional.lib.dir}">
--      <include name="${additional.lib.dir.includes}" />
--      <exclude name="${additional.lib.dir.excludes}" />
-+    <fileset dir="/usr/share/java">
-+      <include name="jline.jar" />
-+      <include name="jtoaster.jar" />
-+      <include name="log4j.jar" />
-+      <include name="netty.jar" />
-+      <include name="slf4j/api.jar" />
-+      <include name="slf4j/log4j12.jar" />
-+      <include name="xerces-j2.jar" />
-     </fileset>
--    <fileset refid="lib.jars"/>
--    <pathelement location="${zk.root}/build/classes"/>
--    <fileset dir="${ivy.lib}">
--      <include name="**/*.jar" />
--    </fileset>
--    <fileset dir="${ivy.test.lib}">
--      <include name="**/*.jar" />
--    </fileset>
--    <fileset dir="${zk.root}/src/java/lib">
--      <include name="**/*.jar" />
--    </fileset>
--    <fileset dir="${ant.home}/lib">
--      <include name="ant.jar" />
-+    <fileset dir="${zk.root}/build">
-+      <include name="zookeeper-${version}.jar" />
-     </fileset>
-   </path>
- 
-@@ -103,7 +96,7 @@
-     <mkdir dir="${ivy.lib}"/>
-     <mkdir dir="${ivy.test.lib}"/>
-     <condition property="ivy.jar.exists">
--      <available file="${lib.dir}/ivy-${ivy.version}.jar"/>
-+      <available file="${lib.dir}/ivy.jar"/>
-     </condition>
- 
-     <antcall target="init-contrib"/>
-@@ -133,7 +126,7 @@
-   <target name="jar" depends="compile" unless="skip.contrib">
-     <echo message="contrib: ${name}"/>
-     <jar
--      jarfile="${build.dir}/zookeeper-${version}-${name}.jar"
-+      jarfile="${build.dir}/zookeeper-${name}.jar"
-       basedir="${build.classes}"      
-     />
-   </target>
-@@ -233,15 +226,9 @@
-   </target>
- 
-   <target name="ivy-retrieve" depends="init,ivy-init">
--    <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="default"
--                  pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
--    <ivy:retrieve settingsRef="${ant.project.name}" type="bundle" conf="default"
--  				  pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
-   </target>
- 
-   <target name="ivy-retrieve-test" depends="init,ivy-init">
--    <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="test"
--                  pattern="${ivy.test.lib}/[artifact]-[revision].[ext]"/>
-   </target>
- 
- 
-diff -Nru zookeeper-3.4.5/src/contrib/zooinspector/build.xml zookeeper-3.4.5-gil/src/contrib/zooinspector/build.xml
---- zookeeper-3.4.5/src/contrib/zooinspector/build.xml	2012-09-30 19:53:32.000000000 +0200
-+++ zookeeper-3.4.5-gil/src/contrib/zooinspector/build.xml	2013-04-27 11:42:13.257105341 +0200
-@@ -20,7 +20,7 @@
- 
- 
- 	<target name="setjarname">
--		<property name="jarname" value="${build.dir}/zookeeper-${version}-${name}.jar" />
-+		<property name="jarname" value="${build.dir}/zookeeper-${name}-${version}.jar" />
- 	</target>
- 
- 	<target name="init" depends="checkMainCompiled, zookeeperbuildcontrib.init">
-@@ -37,11 +37,11 @@
- 			<fileset dir="${basedir}/config" />
- 		</copy>
- 		<copy todir="${build.dir}/lib">
--			<fileset file="${basedir}/lib/jtoaster-1.0.4.jar" />
-+			<!--fileset file="${basedir}/lib/jtoaster-1.0.4.jar" /-->
- 			<fileset file="${basedir}/lib/log4j.properties" />
- 		</copy>
- 		<copy todir="${build.dir}/lib">
--			<fileset file="../../../build/zookeeper-3.3.0.jar" />
-+			<fileset file="../../../build/zookeeper-${version}.jar" />
- 		</copy>
- 		<copy todir="${build.dir}">
- 			<fileset dir="${basedir}" includes="*.*" excludes="build.xml,ivy.xml" />
-@@ -55,7 +55,6 @@
- 		<jar jarfile="${jarname}">
- 			<manifest>
- 				<attribute name="Main-Class" value="org.apache.zookeeper.inspector.ZooInspector" />
--				<attribute name="Class-Path" value="lib/log4j-1.2.15.jar lib/TableLayout-20050920.jar lib/zookeeper-3.3.0.jar lib/jToaster-1.0.4.jar lib" />
- 				<attribute name="Built-By" value="${user.name}" />
- 				<attribute name="Built-At" value="${build.time}" />
- 				<attribute name="Built-On" value="${host.name}" />
-@@ -140,12 +139,12 @@
- 		<copy todir="${dist.dir}/contrib/${name}/config">
- 			<fileset dir="${basedir}/config" />
- 		</copy>
--		<copy todir="${dist.dir}/contrib/${name}/lib">
-+		<!--copy todir="${dist.dir}/contrib/${name}/lib">
- 			<fileset file="${basedir}/lib/jtoaster-1.0.4.jar" />
- 		</copy>
- 		<copy todir="${dist.dir}/contrib/${name}/lib">
- 			<fileset file="../../../build/zookeeper-3.3.0.jar" />
--		</copy>
-+		</copy-->
- 	</target>
- 
- </project>

zookeeper-3.4.5-disable-cygwin-detection.patch

@@ -1,27 +0,0 @@
---- bin/zkServer.sh	2012-09-30 19:53:31.000000000 +0200
-+++ bin/zkServer.sh-gil	2013-04-27 11:27:59.972764863 +0200
-@@ -69,15 +69,6 @@
-     ZOOCFG="$2"
- fi
- 
--if $cygwin
--then
--    ZOOCFG=`cygpath -wp "$ZOOCFG"`
--    # cygwin has a "kill" in the shell itself, gets confused
--    KILL=/bin/kill
--else
--    KILL=kill
--fi
--
- echo "Using config: $ZOOCFG" >&2
- 
- if [ -z $ZOOPIDFILE ]; then
-@@ -140,7 +131,7 @@
-     then
-       echo "no zookeeper to stop (could not find file $ZOOPIDFILE)"
-     else
--      $KILL -9 $(cat "$ZOOPIDFILE")
-+      kill -9 $(cat "$ZOOPIDFILE")
-       rm "$ZOOPIDFILE"
-       echo STOPPED
-     fi

zookeeper-3.4.5-log4j.patch

@@ -1,26 +0,0 @@
---- a/conf/log4j.properties	2012-09-30 12:53:31.000000000 -0500
-+++ b/conf/log4j.properties	2013-06-25 12:28:56.833948571 -0500
-@@ -1,10 +1,11 @@
- # Define some default values that can be overridden by system properties
--zookeeper.root.logger=INFO, CONSOLE
-+zookeeper.root.logger=INFO, SYSTEMD
- zookeeper.console.threshold=INFO
--zookeeper.log.dir=.
-+zookeeper.systemd.threshold=INFO
-+zookeeper.log.dir=/var/log/zookeeper
- zookeeper.log.file=zookeeper.log
- zookeeper.log.threshold=DEBUG
--zookeeper.tracelog.dir=.
-+zookeeper.tracelog.dir=/var/log/zookeeper
- zookeeper.tracelog.file=zookeeper_trace.log
- 
- #
-@@ -56,3 +57,8 @@
- log4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout
- ### Notice we are including log4j's NDC here (%x)
- log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} [myid:%X{myid}] - %-5p [%t:%C{1}@%L][%x] - %m%n
-+
-+log4j.appender.SYSTEMD=org.apache.log4j.ConsoleAppender
-+log4j.appender.SYSTEMD.Threshold=${zookeeper.systemd.threshold}
-+log4j.appender.SYSTEMD.layout=org.apache.log4j.PatternLayout
-+log4j.appender.SYSTEMD.layout.ConversionPattern=[myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n

zookeeper-3.4.5-zktreeutil-gcc.patch

@@ -1,5 +1,5 @@
---- src/contrib/zktreeutil/src/ZkAdaptor.h	2012-09-30 19:53:32.000000000 +0200
-+++ src/contrib/zktreeutil/src/ZkAdaptor.h-gil	2013-04-04 03:37:46.731950855 +0200
+--- a/src/contrib/zktreeutil/src/ZkAdaptor.h	2012-09-30 19:53:32.000000000 +0200
++++ b/src/contrib/zktreeutil/src/ZkAdaptor.h	2013-04-04 03:37:46.731950855 +0200
 @@ -21,6 +21,7 @@
  
  #include <string>

zookeeper-3.4.9-ivy-build.patch

@@ -0,0 +1,407 @@
+diff --git a/build.xml b/build.xml
+index 8562000..7975f13 100644
+--- a/build.xml
++++ b/build.xml
+@@ -257,7 +257,7 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
+         <mkdir dir="${ivy.package.lib}"/>
+         <mkdir dir="${ivy.test.lib}"/>
+         <condition property="ivy.jar.exists">
+-          <available file="${lib.dir}/ivy-${ivy.version}.jar"/>
++          <available file="/usr/share/java/ivy.jar"/>
+         </condition>
+ 
+         <tstamp>
+@@ -343,9 +343,9 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
+     
+     <target name="ivy-download" unless="ivy.jar.exists" depends="init">
+       <delete dir="${lib.dir}"
+-              includes="ivy-*.jar" excludes="ivy-${ivy.version}.jar"/>
+-      <get src="${ivy.url}/${ivy.version}/ivy-${ivy.version}.jar"
+-           dest="${lib.dir}/ivy-${ivy.version}.jar" usetimestamp="true"/>
++              includes="ivy.jar" excludes="ivy.jar"/>
++      <get src="${ivy.url}/ivy.jar"
++           dest="${lib.dir}/ivy.jar" usetimestamp="true"/>
+     </target>
+ 
+     <target name="ivy-taskdef" unless="ivy.initialized">
+diff --git a/ivy.xml b/ivy.xml
+index 95b0e5a..0ea5c4d 100644
+--- a/ivy.xml
++++ b/ivy.xml
+@@ -46,10 +46,10 @@
+     <dependency org="org.apache.maven.wagon" name="wagon-http" rev="2.4" conf="mvn-ant-task->default"/>
+     <dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.1.3" conf="mvn-ant-task->default"/>
+     <!-- transitive false turns off dependency checking, log4j deps seem borked -->
+-    <dependency org="log4j" name="log4j" rev="1.2.16" transitive="false" conf="default"/>
+-    <dependency org="jline" name="jline" rev="0.9.94" transitive="false" conf="default"/>
++    <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false" conf="default"/>
++    <dependency org="jline" name="jline" rev="1.0" transitive="false" conf="default"/>
+ 
+-    <dependency org="io.netty" name="netty" conf="default" rev="3.10.5.Final">
++    <dependency org="io.netty" name="netty" conf="default" rev="3.9.3.Final">
+       <artifact name="netty" type="jar" conf="default"/>
+     </dependency>
+ 
+@@ -58,14 +58,14 @@
+     <dependency org="junit" name="junit" rev="4.8.1" conf="test->default"/>
+      <dependency org="org.mockito" name="mockito-all" rev="1.8.2"
+                conf="test->default"/>
+-    <dependency org="checkstyle" name="checkstyle" rev="5.0"
++    <dependency org="com.puppycrawl.tools" name="checkstyle" rev="5.6"
+                 conf="test->default"/>
+     <dependency org="commons-collections" name="commons-collections" 
+                 rev="3.2.2" conf="test->default"/>
+ 
+-    <dependency org="jdiff" name="jdiff" rev="1.0.9"
++    <dependency org="jdiff" name="jdiff" rev="1.1.1"
+                 conf="jdiff->default"/>
+-    <dependency org="xerces" name="xerces" rev="1.4.4"
++    <dependency org="xerces" name="xercesImpl" rev="1.4.4"
+                 conf="jdiff->default"/>
+ 
+     <dependency org="org.apache.rat" name="apache-rat-tasks" 
+diff --git a/ivysettings.xml b/ivysettings.xml
+index 52cfa52..595dd4c 100644
+--- a/ivysettings.xml
++++ b/ivysettings.xml
+@@ -17,29 +17,14 @@
+    limitations under the License.
+ -->
+ 
+-  <property name="repo.maven.org"
+-    value="http://repo1.maven.org/maven2/" override="false"/>
+-  <property name="repo.jboss.org"
+-    value="http://repository.jboss.org/nexus/content/groups/public/" override="false"/>
+-  <property name="repo.sun.org"
+-    value="http://download.java.net/maven/2/" override="false"/>
+-  <property name="maven2.pattern"
+-    value="[organisation]/[module]/[revision]/[module]-[revision]"/>
+-  <property name="maven2.pattern.ext" value="${maven2.pattern}.[ext]"/>
+   <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
+   <settings defaultResolver="default"/>
++  <typedef name="xmvn" classname="org.fedoraproject.xmvn.connector.ivy.IvyResolver"/>
+   <resolvers>
+-    <ibiblio name="maven2" root="${repo.maven.org}"
+-      pattern="${maven2.pattern.ext}" m2compatible="true"/>
+-    <ibiblio name="jboss-maven2" root="${repo.jboss.org}"
+-      pattern="${maven2.pattern.ext}" m2compatible="true"/>
+-    <ibiblio name="sun-maven2" root="${repo.sun.org}"
+-      pattern="${maven2.pattern.ext}" m2compatible="true"/>
++    <xmvn name="XMvn"/>
+ 
+     <chain name="default" dual="true">
+-      <resolver ref="maven2"/>
+-      <resolver ref="jboss-maven2"/>
+-      <resolver ref="sun-maven2"/>
++      <resolver ref="XMvn"/>
+     </chain>
+ 
+   </resolvers>
+diff --git a/src/contrib/build-contrib.xml b/src/contrib/build-contrib.xml
+index fab8a5f..80518a8 100644
+--- a/src/contrib/build-contrib.xml
++++ b/src/contrib/build-contrib.xml
+@@ -103,7 +103,7 @@
+     <mkdir dir="${ivy.lib}"/>
+     <mkdir dir="${ivy.test.lib}"/>
+     <condition property="ivy.jar.exists">
+-      <available file="${lib.dir}/ivy-${ivy.version}.jar"/>
++      <available file="/usr/share/java/ivy.jar"/>
+     </condition>
+ 
+     <antcall target="init-contrib"/>
+@@ -219,9 +219,9 @@
+   <!-- ====================================================== -->
+   <target name="ivy-download" unless="ivy.jar.exists" depends="init">
+     <delete dir="${lib.dir}"
+-            includes="ivy-*.jar" excludes="ivy-${ivy.version}.jar"/>
+-    <get src="${ivy.url}/${ivy.version}/ivy-${ivy.version}.jar"
+-         dest="${lib.dir}/ivy-${ivy.version}.jar" usetimestamp="true"/>
++            includes="ivy.jar" excludes="ivy.jar"/>
++    <get src="${ivy.url}/ivy.jar"
++         dest="${lib.dir}/ivy.jar" usetimestamp="true"/>
+   </target>
+ 
+   <target name="ivy-init" depends="ivy-download" unless="ivy.initialized">
+diff --git a/src/contrib/build.xml b/src/contrib/build.xml
+index 7f7ba4f..701dfea 100644
+--- a/src/contrib/build.xml
++++ b/src/contrib/build.xml
+@@ -20,7 +20,7 @@
+ <project name="zookeepercontrib" default="compile" basedir=".">
+ 
+   <property name="contribfilesetincludes" value="*/build.xml" />
+-  <property name="contribfilesetexcludes" value="" />
++  <property name="contribfilesetexcludes" value="rest/build.xml" />
+ 
+   <fileset id="contribfileset" dir=".">
+     <include name="${contribfilesetincludes}"/>
+diff --git a/src/contrib/rest/build.xml b/src/contrib/rest/build.xml
+deleted file mode 100644
+index fb628bc..0000000
+--- a/src/contrib/rest/build.xml
++++ /dev/null
+@@ -1,183 +0,0 @@
+-<?xml version="1.0"?>
+-
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-
+-<project name="rest" default="jar">
+-  <import file="../build-contrib.xml"/>
+-
+-	<property name="test.build.dir" value="${build.test}" />
+-    <property name="test.src.dir" value="src/test"/>
+-    <property name="test.log.dir" value="${test.build.dir}/logs" />
+-    <property name="test.data.dir" value="${test.build.dir}/data" />
+-    <property name="test.data.upgrade.dir" value="${test.data.dir}/upgrade" />
+-    <property name="test.tmp.dir" value="${test.build.dir}/tmp" />
+-    <property name="test.output" value="no" />
+-    <property name="test.timeout" value="900000" />
+-    <property name="test.junit.output.format" value="plain" />
+-    <property name="test.junit.fork.mode" value="perTest" />
+-    <property name="test.junit.printsummary" value="yes" />
+-    <property name="test.junit.haltonfailure" value="no" />
+-    <property name="test.junit.maxmem" value="512m" />
+-
+-    <!-- ====================================================== -->
+-    <!-- Macro definitions                                      -->
+-    <!-- ====================================================== -->
+-    <macrodef name="macro_tar" description="Worker Macro for tar">
+-      <attribute name="param.destfile"/>
+-      <element name="param.listofitems"/>
+-      <sequential>
+-        <tar compression="gzip" longfile="gnu"
+-             destfile="@{param.destfile}">
+-          <param.listofitems/>
+-        </tar>
+-      </sequential>
+-    </macrodef>
+-
+-  <target name="package" depends="jar" unless="skip.contrib">
+-    <echo message="contrib: ${name}"/>
+-    <mkdir dir="${dist.dir}${package.share}/contrib/${name}"/>
+-    <copy todir="${dist.dir}${package.share}/contrib/${name}">
+-      <fileset dir="${build.dir}">
+-        <include name="zookeeper-${version}-${name}.jar" />
+-      </fileset>
+-    </copy>
+-    <copy todir="${dist.dir}${package.share}/contrib/${name}/lib">
+-      <fileset dir="${build.dir}/lib" />
+-    </copy>
+-    <copy todir="${dist.dir}${package.share}/contrib/${name}/conf">
+-      <fileset dir="conf" />
+-    </copy>
+-  </target>
+-
+-  <target name="setjarname">
+-    <property name="jarname"
+-              value="${build.dir}/zookeeper-${version}-${name}.jar"/>
+-  </target>
+-
+-  <target name="compile" depends="ivy-retrieve,zookeeperbuildcontrib.compile"/>
+-
+-  <target name="test"
+-          depends="compile-test,test-init,test-category,test-start,junit.run,test-stop" />
+-
+-	<target name="compile-test" depends="ivy-retrieve-test,compile">
+-  		<property name="target.jdk" value="${ant.java.version}" />	
+-		<property name="src.test.local" location="${basedir}/src/test" />
+-		<mkdir dir="${build.test}"/>
+-		<javac srcdir="${src.test.local}" 
+-			destdir="${build.test}" 
+-			target="${target.jdk}" 
+-			debug="on" >
+-			<classpath refid="classpath" />
+-		</javac>
+-	</target>
+-	
+-    <target name="test-init" depends="jar,compile-test">
+-        <delete dir="${test.log.dir}" />
+-        <delete dir="${test.tmp.dir}" />
+-        <delete dir="${test.data.dir}" />
+-        <mkdir dir="${test.log.dir}" />
+-        <mkdir dir="${test.tmp.dir}" />
+-        <mkdir dir="${test.data.dir}" />
+-    </target>
+-
+-    <target name="test-start">
+-      <exec executable="${test.src.dir}/zkServer.sh">
+-        <arg value="startClean"/>
+-      </exec>
+-    </target>
+-
+-    <target name="test-stop">
+-      <exec executable="${test.src.dir}/zkServer.sh">
+-        <arg value="stop"/>
+-      </exec>
+-    </target>
+-
+-	<target name="test-category">
+-         <property name="test.category" value=""/>
+-    </target>
+-
+-	<target name="junit.run">
+-		<echo message="${test.src.dir}" />
+-        <junit showoutput="${test.output}"
+-               printsummary="${test.junit.printsummary}"
+-               haltonfailure="${test.junit.haltonfailure}"
+-               fork="yes"
+-               forkmode="${test.junit.fork.mode}"
+-               maxmemory="${test.junit.maxmem}"
+-               dir="${basedir}" timeout="${test.timeout}"
+-               errorProperty="tests.failed" failureProperty="tests.failed">
+-          <sysproperty key="build.test.dir" value="${test.tmp.dir}" />
+-          <sysproperty key="test.data.dir" value="${test.data.dir}" />
+-          <sysproperty key="log4j.configuration"
+-                    value="file:${basedir}/conf/log4j.properties" />
+-          <classpath refid="classpath"/>
+-          <classpath>
+-             <pathelement path="${build.test}" />
+-          </classpath>
+-          <formatter type="${test.junit.output.format}" />
+-          <batchtest todir="${test.log.dir}" unless="testcase">
+-              <fileset dir="${test.src.dir}"
+-                     includes="**/*${test.category}Test.java"/>
+-          </batchtest>
+-          <batchtest todir="${test.log.dir}" if="testcase">
+-              <fileset dir="${test.src.dir}" includes="**/${testcase}.java"/>
+-          </batchtest>
+-       </junit>
+-       <fail if="tests.failed">Tests failed!</fail>
+-    </target>
+-
+-  <target name="jar" depends="checkMainCompiled, setjarname, compile">
+-    <echo message="contrib: ${name}"/>
+-    <jar jarfile="${jarname}">
+-      <fileset file="${zk.root}/LICENSE.txt" />
+-      <fileset dir="${build.classes}"/>
+-      <fileset dir="${build.test}"/>
+-    </jar>
+-  </target>
+-
+-  <target name="run" depends="jar">
+-    <echo message="contrib: ${name}"/>
+-    <java classname="org.apache.zookeeper.server.jersey.RestMain" fork="true">
+-      <classpath>
+-        <pathelement path="${jarname}" />
+-        <fileset dir="${build.dir}/lib" includes="*.jar"/>
+-        <fileset dir="${zk.root}/build" includes="zookeeper-*.jar"/>
+-        <pathelement path="${zk.root}/src/contrib/${name}/conf" />
+-        <fileset dir="${zk.root}/src/java/lib">
+-          <include name="**/*.jar" />
+-        </fileset>
+-      </classpath>
+-    </java>
+-  </target>
+-
+-  <target name="tar" depends="clean, jar">
+-    <echo message="building tar.gz: ${name}" />
+-    <macro_tar param.destfile="${build.dir}/zookeeper-${version}-${name}.tar.gz">
+-      <param.listofitems>
+-        <tarfileset dir="${build.dir}/lib" prefix="lib" includes="**/*.jar" />
+-        <tarfileset file="${build.dir}/zookeeper-*-rest.jar" />
+-        <tarfileset dir="${zk.root}/build" includes="zookeeper-*.jar" prefix="lib" />
+-        <tarfileset dir="${zk.root}/src/contrib/${name}/conf" prefix="conf" />
+-        <tarfileset dir="${zk.root}/src/java/lib" prefix="lib" includes="**/*.jar" />
+-        <tarfileset file="${zk.root}/src/contrib/${name}/rest.sh" />
+-      </param.listofitems>
+-    </macro_tar>
+-  </target>
+-
+-</project>
+-
+diff --git a/src/contrib/rest/ivy.xml b/src/contrib/rest/ivy.xml
+deleted file mode 100644
+index 903d390..0000000
+--- a/src/contrib/rest/ivy.xml
++++ /dev/null
+@@ -1,48 +0,0 @@
+-<!--
+-   Licensed to the Apache Software Foundation (ASF) under one or more
+-   contributor license agreements.  See the NOTICE file distributed with
+-   this work for additional information regarding copyright ownership.
+-   The ASF licenses this file to You under the Apache License, Version 2.0
+-   (the "License"); you may not use this file except in compliance with
+-   the License.  You may obtain a copy of the License at
+-
+-       http://www.apache.org/licenses/LICENSE-2.0
+-
+-   Unless required by applicable law or agreed to in writing, software
+-   distributed under the License is distributed on an "AS IS" BASIS,
+-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-   See the License for the specific language governing permissions and
+-   limitations under the License.
+--->
+-
+-<ivy-module version="2.0"
+-            xmlns:e="http://ant.apache.org/ivy/extra">
+-
+-  <info organisation="org.apache.zookeeper"
+-        module="${name}" revision="${version}">
+-    <license name="Apache 2.0"/>
+-    <ivyauthor name="Apache ZooKeeper" url="http://zookeeper.apache.org"/>
+-    <description>ZooKeeper REST</description>
+-  </info>
+-
+-  <configurations defaultconfmapping="default">
+-    <conf name="default"/>
+-    <conf name="test"/>
+-  </configurations>
+-
+-  <dependencies>
+-    <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"/>
+-    <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
+-  
+-    <!-- transitive false turns off dependency checking, log4j deps seem borked -->
+-    <dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/>
+-    <dependency org="asm" name="asm" rev="3.1" />
+-    <dependency org="com.sun.grizzly" name="grizzly-servlet-webserver" rev="1.9.8" />
+-    <dependency org="com.sun.jersey" name="jersey-server" rev="1.1.5.1" />
+-    <dependency org="com.sun.jersey" name="jersey-json" rev="1.1.5.1" />
+-
+-    <dependency org="junit" name="junit" rev="4.8.1" conf="test->default"/>
+-    <dependency org="com.sun.jersey" name="jersey-client" rev="1.1.5.1" conf="test->default"/>
+-  </dependencies>
+-
+-</ivy-module>
+diff --git a/src/contrib/loggraph/ivy.xml b/src/contrib/loggraph/ivy.xml
+index d6fa9d6..fdcc35f 100644
+--- a/src/contrib/loggraph/ivy.xml
++++ b/src/contrib/loggraph/ivy.xml
+@@ -35,7 +35,7 @@
+     <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
+   
+     <!-- transitive false turns off dependency checking, log4j deps seem borked -->
+-    <dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/>
++    <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false"/>
+     <dependency org="org.eclipse.jetty" name="jetty-server" rev="7.0.1.v20091125" />
+     <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="7.0.1.v20091125" />
+     <dependency org="com.googlecode.json-simple" name="json-simple" rev="1.1" />
+diff --git a/src/contrib/zooinspector/ivy.xml b/src/contrib/zooinspector/ivy.xml
+index bc02946..cb4061f 100644
+--- a/src/contrib/zooinspector/ivy.xml
++++ b/src/contrib/zooinspector/ivy.xml
+@@ -35,7 +35,7 @@
+     <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"/>
+     <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
+             
+-    <dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/>
++    <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false"/>
+     <dependency org="junit" name="junit" rev="4.7" conf="test->default"/>
+         <dependency org="org.apache.rat" name="apache-rat-tasks" 
+                 rev="0.6" conf="releaseaudit->default"/>

zookeeper-3.4.9-server.patch

@@ -0,0 +1,20 @@
+diff --git a/bin/zkServer.sh b/bin/zkServer.sh
+index 51dbe9f..bc9be90 100755
+--- a/bin/zkServer.sh
++++ b/bin/zkServer.sh
+@@ -92,14 +92,7 @@ then
+     ZOOCFG="$2"
+ fi
+ 
+-if $cygwin
+-then
+-    ZOOCFG=`cygpath -wp "$ZOOCFG"`
+-    # cygwin has a "kill" in the shell itself, gets confused
+-    KILL=/bin/kill
+-else
+-    KILL=kill
+-fi
++KILL=kill
+ 
+ echo "Using config: $ZOOCFG" >&2
+ 

zookeeper-test-template.pom

@@ -1,48 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.zookeeper</groupId>
-  <artifactId>zookeeper-test</artifactId>
-  <version>@version@</version>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.zookeeper</groupId>
-      <artifactId>zookeeper</artifactId>
-      <version>@version@</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>any</version>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>any</version>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>any</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.netty</groupId>
-      <artifactId>netty</artifactId>
-      <version>any</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>any</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>any</version>
-    </dependency>
-    <dependency>
-      <groupId>com.puppycrawl.tools</groupId>
-      <artifactId>checkstyle</artifactId>
-      <version>any</version>
-    </dependency>
-  </dependencies>
-</project>

zookeeper.service

@@ -3,18 +3,21 @@ Description=Apache ZooKeeper
 After=network.target
 ConditionPathExists=/etc/zookeeper/zoo.cfg
 ConditionPathExists=/etc/zookeeper/log4j.properties
-ConditionPathExists=/var/lib/zookeeper/data/myid
 
 [Service]
-Type=simple
+Type=forking
 User=zookeeper
 SyslogIdentifier=zookeeper
 WorkingDirectory=/var/lib/zookeeper
-UMask=0027
-Environment="CP=/etc/zookeeper:/usr/share/java/slf4j/slf4j-log4j12.jar:/usr/share/java/slf4j/slf4j-api.jar:/usr/share/java/netty.jar:/usr/share/java/log4j.jar:/usr/share/java/jline.jar:/usr/share/java/zookeeper/zookeeper.jar"
-Environment="IPv6=-Djava.net.preferIPv4Stack=false -Djava.net.preferIPv6Addresses=true"
-#Environment="JMX=-Dcom.sun.management.jmxremote"
-ExecStart=/usr/lib/jvm/jre-1.7.0/bin/java -cp $CP $JMX $IPv6 org.apache.zookeeper.server.quorum.QuorumPeerMain /etc/zookeeper/zoo.cfg
+ExecStart=/usr/bin/zkServer.sh start zoo.cfg
+ExecStop=/usr/bin/zkServer.sh stop
+
+User=root
+Group=root
+# TODO: check updated permissions.
+# Group=zookeeper
+Restart=always
+RestartSec=20
 
 [Install]
 WantedBy=multi-user.target

zookeeper.spec

@@ -1,274 +1,218 @@
 %global _hardened_build 1
+%global skiptests       1
+
 Name:          zookeeper
-Version:       3.4.5
-Release:       8%{?dist}
+Version:       3.4.9
+Release:       11%{?dist}
 Summary:       A high-performance coordination service for distributed applications
-Group:         Development/Libraries
 License:       ASL 2.0 and BSD
-URL:           http://zookeeper.apache.org/
-Source0:       http://www.apache.org/dist/%{name}/stable/%{name}-%{version}.tar.gz
-Source1:       %{name}-test-template.pom
-Source2:       %{name}-ZooInspector-template.pom
-Source3:       %{name}.service
-# remove non free clover references
-# configure ivy to use system libraries
-# disable rat-lib and jdiff support
-Patch0:        %{name}-3.4.4-build.patch
-# https://issues.apache.org/jira/browse/ZOOKEEPER-1557
-Patch1:        https://issues.apache.org/jira/secure/attachment/12548109/ZOOKEEPER-1557.patch
-Patch2:        %{name}-3.4.5-zktreeutil-gcc.patch
-Patch3:        %{name}-3.4.5-disable-cygwin-detection.patch
-Patch4:        %{name}-3.4.5-build-contrib.patch
-Patch5:        %{name}-3.4.5-add-PIE-and-RELRO.patch
-Patch6:        %{name}-3.4.5-atomic.patch
-# remove date/time from console output since journald will keep track of date/time
-Patch7:        %{name}-3.4.5-log4j.patch
+URL:           https://zookeeper.apache.org/
+Source0:       https://www.apache.org/dist/%{name}/%{name}-%{version}.tar.gz
+Source1:       %{name}-ZooInspector-template.pom
+Source2:       %{name}.service
+Source3:       zkEnv.sh
+
+Patch1:        %{name}-3.4.5-zktreeutil-gcc.patch
+Patch2:        %{name}-3.4.9-ivy-build.patch
+Patch3:        %{name}-3.4.9-server.patch
+# ZOOKEEPER-1643; patch accepted in 3.5.0
+Patch4:        mt_adaptor.c.patch
+Patch5:        0001-cppunit-config-no-longer-exists-use-pkg-config.patch
+Patch6:        missing-pom.template.patch
+
 
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: boost-devel
-BuildRequires: cppunit-devel
+BuildRequires: pkgconfig(cppunit)
 BuildRequires: dos2unix
 BuildRequires: doxygen
+BuildRequires: gcc-c++
 BuildRequires: graphviz
 BuildRequires: java-devel
 BuildRequires: java-javadoc
 BuildRequires: jpackage-utils
 BuildRequires: libtool
 BuildRequires: libxml2-devel
-BuildRequires: log4cxx-devel
-BuildRequires: python-devel
+BuildRequires: python2-devel
 
 BuildRequires: ant
 BuildRequires: ant-junit
 BuildRequires: apache-ivy
 BuildRequires: checkstyle
-BuildRequires: jline
+BuildRequires: ivy-local
+BuildRequires: javapackages-tools
+
 BuildRequires: jtoaster
 BuildRequires: junit
-BuildRequires: log4j
-BuildRequires: mockito
+BuildRequires: jdiff
+%if 0%{?fedora} >= 21 || 0%{?rhel} > 7
+BuildRequires: mvn(org.slf4j:slf4j-log4j12)
+BuildRequires: objectweb-pom
+BuildRequires: jline1
+BuildRequires: netty3
+Requires:      log4j12
+%else
+BuildRequires: mvn(log4j:log4j)
+BuildRequires: jline
 BuildRequires: netty
+Requires:      log4j
+%endif
+
+BuildRequires: json_simple
+
+BuildRequires: mockito
 BuildRequires: slf4j
 BuildRequires: xerces-j2
 BuildRequires: xml-commons-apis
 
-# BuildRequires: rat-lib
-# BuildRequires: apache-rat-tasks
-# BuildRequires: apache-commons-collections
-# BuildRequires: apache-commons-lang
-# BuildRequires: jdiff
-
+# remove later on.
+BuildRequires: apache-commons-parent
+BuildRequires: jetty-server
+BuildRequires: jetty-servlet
 BuildRequires: systemd
 
+Requires:      checkstyle
+Requires:      jline1
+Requires:      jtoaster
+Requires:      junit
+Requires:      mockito
+Requires:      netty3
+Requires:      slf4j
+Requires:      java
+Requires:      jpackage-utils
+Requires:      %{name}-java = %{version}-%{release}
+
 %description
 ZooKeeper is a centralized service for maintaining configuration information,
 naming, providing distributed synchronization, and providing group services.
 
-%package lib
-Summary:       Zookeeper C client library
-Group:         System Environment/Libraries
-
-%description lib
-ZooKeeper C client library for communicating with ZooKeeper Server.
-
-%package lib-devel
+##############################################
+%package devel
 Summary:       Development files for the %{name} library
-Group:         Development/Libraries
-Requires:      %{name}-lib%{?_isa} = %{version}-%{release}
+Requires:      %{name}%{?_isa} = %{version}-%{release}
 
-%description lib-devel
+%description devel
 Development files for the ZooKeeper C client library.
 
-%package lib-doc
-Summary:       Documentation for the %{name} library
-Group:         Documentation
-BuildArch:     noarch
-
-%description lib-doc
-Documentation for the ZooKeeper C client library.
-
+##############################################
 %package java
-Group:         Development/Libraries
-Summary:       Zookeeper Java client library
-# Requires:      felix-framework
-# Requires:      felix-osgi-compendium
-Requires:      checkstyle
-Requires:      jline
-Requires:      jtoaster
-Requires:      junit
-Requires:      log4j
-Requires:      mockito
-Requires:      netty
-Requires:      slf4j
-
-Requires:      java
-Requires:      jpackage-utils
-BuildArch:     noarch
+Summary:        Java interface for %{name}
+Group:          Development/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description java
-This package provides a Java client interface to Zookeeper server.
+The %{name}-java package contains Java bindings for %{name}.
 
+##############################################
 %package javadoc
-Group:         Documentation
 Summary:       Javadoc for %{name}
 BuildArch:     noarch
 
 %description javadoc
 This package contains javadoc for %{name}.
 
-%package -n python-ZooKeeper
-Group:         Development/Libraries
-Summary:       ZooKeeper python binding library
-Requires:      %{name}-lib%{?_isa} = %{version}-%{release}
+%package -n python2-%{name}
+%{?python_provide:%python_provide python2-%{name}}
+Summary:       Python support for %{name}
+Requires:      %{name}%{?_isa} = %{version}-%{release}
 Provides:      zkpython%{?_isa} = %{version}-%{release}
+Requires:      python2
 
-%description -n python-ZooKeeper
-ZooKeeper python binding library
-
-%package server
-Group:         System Environment/Daemons
-Summary:       ZooKeeper server
-Requires:      %{name}-java = %{version}-%{release}
-Requires(post):   systemd
-Requires(preun):  systemd
-Requires(postun): systemd
-Requires(pre):    shadow-utils
-BuildArch:        noarch
-
-%description server
-ZooKeeper server
+%description -n python2-%{name}
+The python-%{name} package contains Python bindings for %{name}.
 
 %prep
-%setup -q
-find -name "*.jar" -delete
-find -name "*.class" -delete
-find -name "*.cmd" -delete
-find -name "*.so*" -delete
-find -name "*.dll" -delete
-
-%patch0 -p1
-%patch1 -p0
-%pom_remove_dep org.vafer:jdeb dist-maven/%{name}-%{version}.pom
-# jdiff task deps
-%pom_remove_dep jdiff:jdiff dist-maven/%{name}-%{version}.pom
-%pom_remove_dep xerces:xerces dist-maven/%{name}-%{version}.pom
-# rat-lib task deps
-%pom_remove_dep org.apache.rat:apache-rat-tasks dist-maven/%{name}-%{version}.pom
-%pom_remove_dep commons-collections:commons-collections dist-maven/%{name}-%{version}.pom
-%pom_remove_dep commons-lang:commons-lang dist-maven/%{name}-%{version}.pom
-
-%patch2 -p0
-%patch3 -p0
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-
-sed -i "s|<packaging>pom</packaging>|<packaging>jar</packaging>|" dist-maven/%{name}-%{version}.pom
-sed -i "s|<groupId>checkstyle</groupId>|<groupId>com.puppycrawl.tools</groupId>|" dist-maven/%{name}-%{version}.pom
-sed -i "s|<artifactId>mockito-all</artifactId>|<artifactId>mockito-core</artifactId>|" dist-maven/%{name}-%{version}.pom
-
-cp -p %{SOURCE1} dist-maven/%{name}-%{version}-test.pom
-cp -p %{SOURCE2} dist-maven/%{name}-%{version}-ZooInspector.pom
-sed -i "s|@version@|%{version}|" dist-maven/%{name}-%{version}-test.pom dist-maven/%{name}-%{version}-ZooInspector.pom
+%autosetup -p1
 
 iconv -f iso8859-1 -t utf-8 src/c/ChangeLog > src/c/ChangeLog.conv && mv -f src/c/ChangeLog.conv src/c/ChangeLog
 sed -i 's/\r//' src/c/ChangeLog
 
-# fix build problem on f18
 sed -i 's|<exec executable="hostname" outputproperty="host.name"/>|<!--exec executable="hostname" outputproperty="host.name"/-->|' build.xml
 sed -i 's|<attribute name="Built-On" value="${host.name}" />|<attribute name="Built-On" value="${user.name}" />|' build.xml
 
 sed -i 's@^dataDir=.*$@dataDir=%{_sharedstatedir}/zookeeper/data\ndataLogDir=%{_sharedstatedir}/zookeeper/log@' conf/zoo_sample.cfg
 
 %build
+%ant -Divy.mode=local \
+-DCLASSPATH=/usr/share/java/log4j12-1.2.17.jar \
+-Dtarget.jdk=1.5 \
+-Djavadoc.link.java=%{_javadocdir}/java \
+-Dant.build.javac.source=1.5 \
+-Dant.build.javac.target=1.5 \
+package
 
-# ensure that source and target are 1.5
-%ant -Dtarget.jdk=1.5 \
-     -Djavadoc.link.java=%{_javadocdir}/java \
-     -Dant.build.javac.source=1.5 \
-     -Dant.build.javac.target=1.5 \
-     build-generated jar test-jar javadoc javadoc-dev
-
-(
-cd src/contrib
-%ant -Dversion=%{version} \
-     -Dcontribfilesetincludes="zooinspector/build.xml" \
-     -Dant.build.javac.source=1.5 \
-     -Dant.build.javac.target=1.5 \
-     -Dtarget.jdk=1.5 \
-     -DlastRevision=-1 \
-     -Divy.jar.exists=true \
-     -Divy.initialized=true \
-     -Ddest.dir=../../build/zookeeper
-)
-
-pushd src/c
-rm -rf autom4te.cache
-autoreconf -fis
-
-%configure --disable-static --disable-rpath --with-syncapi
-# Remove rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-%{__make} %{?_smp_mflags}
-make doxygen-doc
-popd
-
-# Compile zktreeutil
-pushd src/contrib/zktreeutil
-rm -rf autom4te.cache
+# cppunit-config patch touches configure.ac in these dirs
+pushd src/recipes/lock/src/c
 autoreconf -if
-%configure
+popd
+pushd src/recipes/queue/src/c
+autoreconf -if
+popd
+
+pushd src/c
+autoreconf -if
+%configure --disable-static --disable-rpath
 %{__make} %{?_smp_mflags}
 popd
 
-%if 0
+## TODO: install utilities?
+
 %check
-# Execute multi-threaded test suite
-mkdir -p build/lib
-for jar in jline log4j xerces-j2 xml-commons-apis; do \
-ln -sf %{_javadir}/$jar.jar build/lib/$jar.jar; \
-done
-pushd src/c
-%{__make} %{?_smp_mflags} zktest-mt
-./zktest-mt
-popd
-%ifarch i386
-# Run core Java test suite against zookeeper
-ant -Dversion=%{version} -DlastRevision=-1 test-core-java
-%endif
+%if %skiptests
+  echo "Testing disabled, please enable in mock"
+%else
+  %ant -Divy.mode=local test
 %endif
 
 %install
 
+# the following is used to update zkEnv.sh
+# find . -name "*.jar" -exec basename {} \; |sort|uniq
+# remove items that don't belong and update execute build-classpath
+
+#install the c tools
+pushd src/c
+%make_install
+popd
+
+# install the java dependencies.
 mkdir -p %{buildroot}%{_javadir}/%{name}
 install -pm 644 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
-install -pm 644 build/%{name}-%{version}-test.jar %{buildroot}%{_javadir}/%{name}/%{name}-test.jar
-install -pm 644 build/contrib/ZooInspector/%{name}-ZooInspector-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-ZooInspector.jar
+install -pm 644 build/%{name}-%{version}-test.jar %{buildroot}%{_javadir}/%{name}/%{name}-tests.jar
+install -pm 644 build/contrib/ZooInspector/%{name}-%{version}-ZooInspector.jar %{buildroot}%{_javadir}/%{name}/%{name}-ZooInspector.jar
 
+install -pm 755 bin/zkCleanup.sh %{buildroot}%{_bindir}
+install -pm 755 bin/zkCli.sh %{buildroot}%{_bindir}
+install -pm 755 bin/zkServer.sh %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_libexecdir}
+install -pm 755 %{SOURCE3} %{buildroot}%{_libexecdir}
+
+%if 0%{?fedora} >= 21 || 0%{?rhel} > 7
+mkdir -p %{buildroot}%{_datadir}/maven-metadata
+mkdir -p %{buildroot}%{_datadir}/maven-poms
+install -pm 644 build/%{name}-%{version}/dist-maven/%{name}-%{version}.pom %{buildroot}%{_datadir}/maven-poms/%{name}-%{name}.pom
+
+%add_maven_depmap %{name}-%{name}.pom %{name}/%{name}.jar
+%add_maven_depmap org.apache.zookeeper:zookeeper::tests:%{version} %{name}/%{name}-tests.jar
+
+install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/maven-poms/%{name}-%{name}-ZooInspector.pom
+sed -i "s|@version@|%{version}|" %{buildroot}%{_datadir}/maven-poms/%{name}-%{name}-ZooInspector.pom
+%add_maven_depmap %{name}-%{name}-ZooInspector.pom %{name}/%{name}-ZooInspector.jar
+%else
 mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 dist-maven/%{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
+install -pm 644 build/%{name}-%{version}/dist-maven/%{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
+
 %add_maven_depmap JPP.%{name}-%{name}.pom %{name}/%{name}.jar
-install -pm 644 dist-maven/%{name}-%{version}-test.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-test.pom
-%add_maven_depmap JPP.%{name}-%{name}-test.pom %{name}/%{name}-test.jar
-install -pm 644 dist-maven/%{name}-%{version}-ZooInspector.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom
+%add_maven_depmap org.apache.zookeeper:zookeeper::tests:%{version} %{name}/%{name}-tests.jar
+
+install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom
+sed -i "s|@version@|%{version}|" %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom
 %add_maven_depmap JPP.%{name}-%{name}-ZooInspector.pom %{name}/%{name}-ZooInspector.jar
+%endif
 
-mkdir -p %{buildroot}%{_javadocdir}/%{name}/dev
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
 cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/%{name}/
-cp -pr build/docs/dev-api/* %{buildroot}%{_javadocdir}/%{name}/dev/
-
-pushd src/c
-%{__make} install DESTDIR=%{buildroot}
-# cleanup
-rm -f docs/html/*.map
-popd
-
-pushd src/contrib/zktreeutil
-%{__make} install DESTDIR=%{buildroot}
-popd
 
 pushd src/contrib/zkpython
 %{__python} src/python/setup.py build --build-base=$PWD/build \
@@ -277,6 +221,7 @@ chmod 0755 %{buildroot}%{python_sitearch}/zookeeper.so
 popd
 
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.a' -exec rm -f {} ';'
 
 mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_sysconfdir}/zookeeper
@@ -284,99 +229,211 @@ mkdir -p %{buildroot}%{_localstatedir}/log/zookeeper
 mkdir -p %{buildroot}%{_sharedstatedir}/zookeeper
 mkdir -p %{buildroot}%{_sharedstatedir}/zookeeper/data
 mkdir -p %{buildroot}%{_sharedstatedir}/zookeeper/log
-install -p -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}
+install -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}
 install -p -m 0640 conf/log4j.properties %{buildroot}%{_sysconfdir}/zookeeper
 install -p -m 0640 conf/zoo_sample.cfg %{buildroot}%{_sysconfdir}/zookeeper
 touch %{buildroot}%{_sysconfdir}/zookeeper/zoo.cfg
 touch %{buildroot}%{_sharedstatedir}/zookeeper/data/myid
 
-# TODO
-# bin/zkCleanup.sh
-# bin/zkCli.sh
-# bin/zkEnv.sh
-
-%post lib -p /sbin/ldconfig
-%postun lib -p /sbin/ldconfig
-
-%pre server
+%pre
 getent group zookeeper >/dev/null || groupadd -r zookeeper
 getent passwd zookeeper >/dev/null || \
     useradd -r -g zookeeper -d %{_sharedstatedir}/zookeeper -s /sbin/nologin \
     -c "ZooKeeper service account" zookeeper
-%post server
-%systemd_post zookeeper.service
 
-%preun server
+%post
+%systemd_post zookeeper.service
+/sbin/ldconfig
+
+%preun
 %systemd_preun zookeeper.service
 
-%postun server
+%postun
 %systemd_postun_with_restart zookeeper.service
+/sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/cli_mt
 %{_bindir}/cli_st
 %{_bindir}/load_gen
-%{_bindir}/zktreeutil
-%doc src/c/ChangeLog src/c/LICENSE src/c/NOTICE.txt src/c/README src/contrib/zktreeutil/README.txt
-
-%files lib
-%defattr(-,root,root,-)
+%{_bindir}/zk*.sh
+%{_libexecdir}/zkEnv.sh
 %{_libdir}/lib*.so.*
-%doc src/c/LICENSE src/c/NOTICE.txt
 
-%files lib-devel
-%defattr(-,root,root,-)
-%dir %{_includedir}/%{name}
-%{_includedir}/%{name}/*.h
+%attr(0755,root,root) %dir %{_sysconfdir}/zookeeper
+%attr(0644,root,root) %ghost %config(noreplace) %{_sysconfdir}/zookeeper/zoo.cfg
+%attr(0644,root,root) %{_sysconfdir}/zookeeper/zoo_sample.cfg
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/zookeeper/log4j.properties
+
+%attr(0755,zookeeper,zookeeper) %dir %{_localstatedir}/log/zookeeper
+%attr(0755,root,root) %dir %{_sharedstatedir}/zookeeper
+%attr(0750,zookeeper,zookeeper) %dir %{_sharedstatedir}/zookeeper/data
+%attr(0640,zookeeper,zookeeper) %ghost %{_sharedstatedir}/zookeeper/data/myid
+%attr(0755,zookeeper,zookeeper) %dir %{_sharedstatedir}/zookeeper/log
+%{_unitdir}/zookeeper.service
+%doc CHANGES.txt LICENSE.txt NOTICE.txt README.txt
+
+%files java
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/%{name}.jar
+%{_javadir}/%{name}/%{name}-tests.jar
+%{_javadir}/%{name}/%{name}-ZooInspector.jar
+%if 0%{?fedora} >= 21 || 0%{?rhel} > 7
+%{_datadir}/maven-poms/%{name}-%{name}.pom
+%{_datadir}/maven-poms/%{name}-%{name}-ZooInspector.pom
+%{_datadir}/maven-metadata/%{name}.xml
+%else
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP.%{name}-%{name}.pom
+%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom
+%endif
+%doc CHANGES.txt LICENSE.txt NOTICE.txt README.txt
+
+%files devel
+%{_includedir}/%{name}/
 %{_libdir}/*.so
 %doc src/c/LICENSE src/c/NOTICE.txt
 
-%files lib-doc
-%defattr(-,root,root,-)
-%doc src/c/LICENSE src/c/NOTICE.txt src/c/docs/html/*
-
-%files java
-%defattr(-,root,root,-)
-%{_javadir}/%{name}/%{name}.jar
-%{_javadir}/%{name}/%{name}-test.jar
-%{_javadir}/%{name}/%{name}-ZooInspector.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%{_mavenpomdir}/JPP.%{name}-%{name}-test.pom
-%{_mavenpomdir}/JPP.%{name}-%{name}-ZooInspector.pom
-%{_mavendepmapfragdir}/%{name}
-%doc CHANGES.txt LICENSE.txt NOTICE.txt README.txt
-
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 %doc LICENSE.txt NOTICE.txt
 
-%files -n python-ZooKeeper
-%defattr(-,root,root,-)
-%{python_sitearch}/ZooKeeper-?.?-py%{python_version}.egg-info
-%{python_sitearch}/zookeeper.so
+%files -n python2-%{name}
+%{python2_sitearch}/ZooKeeper-?.?-py%{python_version}.egg-info
+%{python2_sitearch}/zookeeper.so
 %doc LICENSE.txt NOTICE.txt src/contrib/zkpython/README
 
-%files server
-%defattr(-,root,root,-)
-%dir %{_sysconfdir}/zookeeper
-%ghost %config(noreplace) %{_sysconfdir}/zookeeper/zoo.cfg
-%{_sysconfdir}/zookeeper/zoo_sample.cfg
-%config(noreplace) %{_sysconfdir}/zookeeper/log4j.properties
-
-%attr(0750,zookeeper,zookeeper) %dir %{_localstatedir}/log/zookeeper
-%attr(0750,zookeeper,zookeeper) %dir %{_sharedstatedir}/zookeeper
-%attr(0750,zookeeper,zookeeper) %dir %{_sharedstatedir}/zookeeper/data
-%attr(0640,zookeeper,zookeeper) %ghost %{_sharedstatedir}/zookeeper/data/myid
-%attr(0750,zookeeper,zookeeper) %dir %{_sharedstatedir}/zookeeper/log
-%{_unitdir}/zookeeper.service
-
 %changelog
-* Tue Jun 15 2013 Timothy St. Clair <tstclair@redhat.com> - 3.4.5-8
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.9-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Mar 27 2018 Iryna Shcherbina <ishcherb@redhat.com> - 3.4.9-10
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Thu Mar 08 2018 Christopher Tubbs <ctubbsii@fedoraproject.org> - 3.4.9-9
+- Add gcc-c++ BuildRequires
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.9-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Sep 07 2017 Troy Dawson <tdawson@redhat.com> - 3.4.9-7
+- Cleanup spec file conditionals
+
+* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.4.9-6
+- Python 2 binary package renamed to python2-zookeeper
+  See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 3.4.9-2
+- Rebuilt for Boost 1.63
+
+* Thu Dec 22 2016 Christopher Tubbs <ctubbsii@fedoraproject.org> - 3.4.9-1
+- Update to 3.4.9; CVE-2016-5017 (bz#1377281)
+
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.6-17
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.6-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sat Jan 16 2016 Jonathan Wakely <jwakely@redhat.com> - 3.4.6-15
+- Rebuilt for Boost 1.60
+
+* Sun Nov 15 2015 Christopher Tubbs <ctubbsii-fedora@apache.org> - 3.4.6-14
+- Remove duplicates and fix broken classpath items in zkEnv
+
+* Tue Nov 03 2015 Christopher Tubbs <ctubbsii-fedora@apache.org> - 3.4.6-13
+- Remove unused build dependency log4cxx
+
+* Mon Oct 19 2015 Christopher Tubbs <ctubbsii-fedora@apache.org> - 3.4.6-12
+- Fix bz#1272694 Remove precondition on myid file for standalone defaults
+
+* Fri Oct 16 2015 Christopher Tubbs <ctubbsii-fedora@apache.org> - 3.4.6-11
+- Fix bad rollback. Rollback to netty 3.6.6, not 3.7.0 (f21 only)
+
+* Fri Oct 16 2015 Christopher Tubbs <ctubbsii-fedora@apache.org> - 3.4.6-10
+- Rollback changes for netty 3.9.3 for f21 only
+
+* Fri Oct 16 2015 Christopher Tubbs <ctubbsii-fedora@apache.org> - 3.4.6-9
+- Update zkEnv.sh CLASSPATH to fix bz#1261458
+
+* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 3.4.6-8
+- Rebuilt for Boost 1.59
+
+* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.6-7
+- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
+
+* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 3.4.6-6
+- rebuild for Boost 1.58
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sun Feb 15 2015 Peter Robinson <pbrobinson@fedoraproject.org> 3.4.6-4
+- Update netty3 patch for 3.9.3
+
+* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 3.4.6-3
+- Rebuild for boost 1.57.0
+
+* Thu Oct 23 2014 Timothy St. Clair <tstclair@redhat.com> - 3.4.6-2
+- Add back -java subpackage
+
+* Tue Oct 21 2014 Timothy St. Clair <tstclair@redhat.com> - 3.4.6-1
+- Update to latest stable series
+- Cleanup and overhaul package
+- Updated system integration
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.5-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.5-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 3.4.5-18
+- Rebuild for boost 1.55.0
+
+* Mon Feb 24 2014 Timothy St. Clair <tstclair@redhat.com> - 3.4.5-17
+- Update due to cascading dependencies around java-headless
+
+* Fri Jan 31 2014 Timothy St. Clair <tstclair@redhat.com> - 3.4.5-16
+- Update of tests.jar due to netty3 compat packaging conflicts
+
+* Fri Jan 24 2014 Timothy St. Clair <tstclair@redhat.com> - 3.4.5-15
+- Update jline and netty3 for f21 builds
+
+* Fri Oct 25 2013 Timothy St. Clair <tstclair@redhat.com> - 3.4.5-14
+- Update dependencies to jline1
+
+* Wed Sep 18 2013 Timothy St. Clair <tstclair@redhat.com> - 3.4.5-13
+- Fixed the atomic patch which actually caused recursive crashing on zookeeper_close
+
+* Tue Jul 30 2013 Petr Machata <pmachata@redhat.com> - 3.4.5-12
+- Rebuild for boost 1.54.0
+
+* Tue Jul 30 2013 gil cattaneo <puntogil@libero.it> 3.4.5-11
+- fix changelog entries
+
+* Mon Jul 22 2013 Timothy St. Clair <tstclair@redhat.com> - 3.4.5-10
+- update permissions to be in line with default policies
+
+* Mon Jul 22 2013 gil cattaneo <puntogil@libero.it> 3.4.5-9
+- removed not needed %%defattr (only required for rpm < 4.4)
+- removed not needed Group fields (new package guideline)
+- fix directory ownership in java sub package
+
+* Mon Jul 22 2013 Timothy St. Clair <tstclair@redhat.com> - 3.4.5-8
 - cleanup file ownership properties.
 
-* Tue Jun 15 2013 Jeffrey C. Ollie <jeff@ocjtech.us> - 3.4.5-7
+* Sat Jun 15 2013 Jeffrey C. Ollie <jeff@ocjtech.us> - 3.4.5-7
 - add server subpackage
 
 * Fri Jun 14 2013 Dan Horák <dan[at]danny.cz> - 3.4.5-6