[zookeeper] 01/01: Refresh patches

Mon Aug 25 21:43:17 UTC 2014

This is an automated email from the git hooks/post-receive script.

diocles pushed a commit to branch master
in repository zookeeper.

commit da1aa13e08e2433817066c04f8a8bbd130b30282
Author: Tim Retout <tim at retout.co.uk>
Date:   Mon Aug 25 22:17:13 2014 +0100

    Refresh patches
---
 debian/changelog                               |  1 +
 debian/patches/debian/disable-cygwin-detection |  8 +++--
 debian/patches/debian/patch-build-system       | 43 ++++++++++++++++----------
 debian/patches/fixes/ZOOKEEPER-770             | 18 ++++++-----
 4 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 17f2c42..dc71608 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ zookeeper (3.4.6+dfsg-1) UNRELEASED; urgency=medium
 
   [ Tim Retout ]
   * New upstream version.  (Closes: #756982)
+  * debian/patches: Refresh patches.
 
  -- James Page <james.page at ubuntu.com>  Tue, 25 Mar 2014 09:41:18 +0000
 
diff --git a/debian/patches/debian/disable-cygwin-detection b/debian/patches/debian/disable-cygwin-detection
index 9d5a6d1..1ea8f63 100644
--- a/debian/patches/debian/disable-cygwin-detection
+++ b/debian/patches/debian/disable-cygwin-detection
@@ -7,8 +7,10 @@ Description: Disable detection of cygwin under Debian installs
 Author: Akira Kitada <akitada at gmail.com>
 Forwarded: not-needed
 
---- a/bin/zkServer.sh
-+++ b/bin/zkServer.sh
+Index: zookeeper/bin/zkServer.sh
+===================================================================
+--- zookeeper.orig/bin/zkServer.sh
++++ zookeeper/bin/zkServer.sh
 @@ -69,15 +69,6 @@ then
      ZOOCFG="$2"
  fi
@@ -24,7 +26,7 @@ Forwarded: not-needed
 -
  echo "Using config: $ZOOCFG" >&2
  
- if [ -z $ZOOPIDFILE ]; then
+ if [ -z "$ZOOPIDFILE" ]; then
 @@ -140,7 +131,7 @@ stop)
      then
        echo "no zookeeper to stop (could not find file $ZOOPIDFILE)"
diff --git a/debian/patches/debian/patch-build-system b/debian/patches/debian/patch-build-system
index e6e0ad0..745582c 100644
--- a/debian/patches/debian/patch-build-system
+++ b/debian/patches/debian/patch-build-system
@@ -4,18 +4,20 @@ Description: Patches to upstream build system to disable use of ivy,
 Author: James Page <james.page at ubuntu.com>, Thomas Koch <thomas at koch.ro>
 Forwarded: not-needed
 
---- a/build.xml
-+++ b/build.xml
-@@ -25,7 +25,7 @@
+Index: zookeeper/build.xml
+===================================================================
+--- zookeeper.orig/build.xml
++++ zookeeper/build.xml
+@@ -31,7 +31,7 @@ xmlns:maven="antlib:org.apache.maven.art
      <property environment="env"/>
      
-     <property name="version" value="3.4.5" />
+     <property name="version" value="3.4.6" />
 -    <property name="final.name" value="${name}-${version}"/>
 +    <property name="final.name" value="${name}"/>
      <property name="revision.dir" value="${basedir}/.revision" />
      <property name="revision.properties" value="revision.properties" />
      <property file="${basedir}/src/java/${revision.properties}" />
-@@ -184,27 +184,21 @@
+@@ -216,27 +216,21 @@ xmlns:maven="antlib:org.apache.maven.art
      <path id="java.classpath">
        <pathelement location="${build.classes}"/>
        <!-- allow the user to override (e.g. if there are local versions) -->
@@ -53,7 +55,7 @@ Forwarded: not-needed
        </fileset>
        <path refid="java.classpath"/>
      </path>
-@@ -246,7 +240,7 @@
+@@ -278,7 +272,7 @@ xmlns:maven="antlib:org.apache.maven.art
                    targetfile="${src_generated.dir}/.generated"/>
      </target>
  
@@ -62,16 +64,16 @@ Forwarded: not-needed
          <mkdir dir="${src_generated.dir}" />
          <mkdir dir="${csrc_generated.dir}" />
          <java classname="org.apache.jute.compiler.generated.Rcc" fork="true" dir="${src_generated.dir}">
-@@ -354,7 +348,7 @@
-       <ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
+@@ -391,7 +385,7 @@ xmlns:maven="antlib:org.apache.maven.art
+                     pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
+       <ivy:cachepath pathid="mvn-ant-task-classpath" conf="mvn-ant-task"/>
      </target>
- 
 -    <target name="compile" depends="ivy-retrieve,clover,build-generated">
 +    <target name="compile" depends="build-generated">
          <javac srcdir="${java.src.dir}" destdir="${build.classes}" includeantruntime="false"
                 target="${javac.target}" source="${javac.source}" debug="on">
              <classpath refid="java.classpath"/>
-@@ -363,7 +357,7 @@
+@@ -400,7 +394,7 @@ xmlns:maven="antlib:org.apache.maven.art
          </javac>
      </target>
  
@@ -80,12 +82,13 @@ Forwarded: not-needed
        <mkdir dir="${test.java.classes}"/>
        <javac srcdir="${test.src.dir}" destdir="${test.java.classes}" includeantruntime="false"
               target="${javac.target}" source="${javac.source}" debug="on">
-@@ -1124,21 +1118,10 @@
+@@ -1222,26 +1216,10 @@ xmlns:maven="antlib:org.apache.maven.art
      <target name="test-init" depends="jar,compile-test">
          <delete dir="${test.log.dir}" />
          <delete dir="${test.tmp.dir}" />
 -        <delete dir="${test.data.upgrade.dir}" />
 -        <delete dir="${test.data.invalid.dir}" />
+-        <delete dir="${test.data.buffersize.dir}" />
          <delete dir="${test.data.dir}" />
          <mkdir dir="${test.log.dir}" />
          <mkdir dir="${test.tmp.dir}" />
@@ -98,11 +101,15 @@ Forwarded: not-needed
 -        <copy todir="${test.data.invalid.dir}">
 -            <fileset dir="${basedir}/src/java/test/data/invalidsnap"/>
 -        </copy>
+-        <mkdir dir="${test.data.buffersize.dir}" />
+-        <copy todir="${test.data.buffersize.dir}">
+-            <fileset dir="${basedir}/src/java/test/data/buffersize"/>
+-        </copy>
 -       
      </target>
  
      <condition property="quicktest">
-@@ -1191,6 +1174,9 @@
+@@ -1294,6 +1272,9 @@ xmlns:maven="antlib:org.apache.maven.art
            <batchtest todir="${test.log.dir}" if="fulltest">
              <fileset dir="${test.src.dir}">
                <include name="**/*${test.category}Test.java"/>
@@ -112,8 +119,10 @@ Forwarded: not-needed
              </fileset>
            </batchtest>
            <batchtest todir="${test.log.dir}" if="testcase">
---- a/src/contrib/build-contrib.xml
-+++ b/src/contrib/build-contrib.xml
+Index: zookeeper/src/contrib/build-contrib.xml
+===================================================================
+--- zookeeper.orig/src/contrib/build-contrib.xml
++++ zookeeper/src/contrib/build-contrib.xml
 @@ -70,25 +70,16 @@
  
    <path id="classpath">
@@ -173,8 +182,10 @@ Forwarded: not-needed
    </target>
  
  
---- a/src/contrib/zooinspector/build.xml
-+++ b/src/contrib/zooinspector/build.xml
+Index: zookeeper/src/contrib/zooinspector/build.xml
+===================================================================
+--- zookeeper.orig/src/contrib/zooinspector/build.xml
++++ zookeeper/src/contrib/zooinspector/build.xml
 @@ -20,7 +20,7 @@
  
  
diff --git a/debian/patches/fixes/ZOOKEEPER-770 b/debian/patches/fixes/ZOOKEEPER-770
index 00f21ce..16bbef5 100644
--- a/debian/patches/fixes/ZOOKEEPER-770
+++ b/debian/patches/fixes/ZOOKEEPER-770
@@ -1,8 +1,10 @@
 Description: Slow add_auth calls with multi-threaded client
 Origin: https://issues.apache.org/jira/browse/ZOOKEEPER-770
 
---- a/src/c/tests/TestClient.cc
-+++ b/src/c/tests/TestClient.cc
+Index: zookeeper/src/c/tests/TestClient.cc
+===================================================================
+--- zookeeper.orig/src/c/tests/TestClient.cc
++++ zookeeper/src/c/tests/TestClient.cc
 @@ -181,6 +181,20 @@ public:
      }
  } watchctx_t;
@@ -24,7 +26,7 @@ Origin: https://issues.apache.org/jira/browse/ZOOKEEPER-770
  class Zookeeper_simpleSystem : public CPPUNIT_NS::TestFixture
  {
      CPPUNIT_TEST_SUITE(Zookeeper_simpleSystem);
-@@ -420,6 +434,14 @@ public:
+@@ -432,6 +446,14 @@ public:
          count++;
      }
  
@@ -39,7 +41,7 @@ Origin: https://issues.apache.org/jira/browse/ZOOKEEPER-770
      static void verifyCreateFails(const char *path, zhandle_t *zk) {
        CPPUNIT_ASSERT_EQUAL((int)ZBADARGUMENTS, zoo_create(zk,
            path, "", 0, &ZOO_OPEN_ACL_UNSAFE, 0, 0, 0));
-@@ -507,6 +529,8 @@ public:
+@@ -519,6 +541,8 @@ public:
          zhandle_t *zk = createClient(&ctx1);
          struct ACL_vector nodeAcl;
          struct ACL acl_val;
@@ -48,7 +50,7 @@ Origin: https://issues.apache.org/jira/browse/ZOOKEEPER-770
          rc = zoo_add_auth(0, "", 0, 0, voidCompletion, (void*)-1);
          CPPUNIT_ASSERT_EQUAL((int) ZBADARGUMENTS, rc);
  
-@@ -540,11 +564,13 @@ public:
+@@ -552,11 +576,13 @@ public:
          //create a new client
          zk = createClient(&ctx2);
  
@@ -63,8 +65,10 @@ Origin: https://issues.apache.org/jira/browse/ZOOKEEPER-770
  
          char buf[1024];
          int blen = sizeof(buf);
---- a/src/c/src/zookeeper.c
-+++ b/src/c/src/zookeeper.c
+Index: zookeeper/src/c/src/zookeeper.c
+===================================================================
+--- zookeeper.orig/src/c/src/zookeeper.c
++++ zookeeper/src/c/src/zookeeper.c
 @@ -1314,7 +1314,7 @@ static int send_info_packet(zhandle_t *z
      /* We queued the buffer, so don't free it */
      close_buffer_oarchive(&oa, 0);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/zookeeper.git

