[SCM] Apache ZooKeeper branch, master, updated. debian/3.3.1+dfsg1-2-34-g78179aa
James Page
james.page at canonical.com
Wed Nov 30 11:51:05 UTC 2011
The following commit has been merged in the master branch:
commit 78179aa2d7338bc79eda0eca2e1340f04a2f10ed
Author: James Page <james.page at canonical.com>
Date: Wed Nov 30 11:50:48 2011 +0000
New upstream release 3.3.4
diff --git a/debian/changelog b/debian/changelog
index 9dfe1ab..6634897 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-zookeeper (3.3.3+dfsg2-3) UNRELEASED; urgency=low
+zookeeper (3.3.4+dfsg1-1) unstable; urgency=low
+ * New upstream release:
+ - d/patches/fixes/ZOOKEEPER-1117: Dropped - fix included upstream.
+ - Refreshed patches.
* Added support for upstart under Ubuntu (LP: #862762):
- d/rules,d/zookeeperd.upstart.in: Detect Ubuntu and swap in provided
upstart configuration if required.
@@ -13,7 +16,7 @@ zookeeper (3.3.3+dfsg2-3) UNRELEASED; urgency=low
InvalidSnapshot and Upgrade tests (non-free data) and to pickup
junit4 from system library.
- -- James Page <james.page at ubuntu.com> Thu, 27 Oct 2011 12:57:26 +0100
+ -- James Page <james.page at ubuntu.com> Wed, 30 Nov 2011 10:55:30 +0000
zookeeper (3.3.3+dfsg2-2) unstable; urgency=low
diff --git a/debian/patches/debian/patch-build-system b/debian/patches/debian/patch-build-system
index eb1e6a3..e4f47f7 100644
--- a/debian/patches/debian/patch-build-system
+++ b/debian/patches/debian/patch-build-system
@@ -6,12 +6,12 @@ Forwarded: not-needed
Index: zookeeper/build.xml
===================================================================
---- zookeeper.orig/build.xml 2011-10-27 12:56:26.256766856 +0100
-+++ zookeeper/build.xml 2011-10-27 13:34:38.167607772 +0100
+--- zookeeper.orig/build.xml 2011-11-30 10:50:46.000000000 +0000
++++ zookeeper/build.xml 2011-11-30 10:51:59.469098290 +0000
@@ -25,7 +25,7 @@
<property environment="env"/>
- <property name="version" value="3.3.3" />
+ <property name="version" value="3.3.4" />
- <property name="final.name" value="${name}-${version}"/>
+ <property name="final.name" value="${name}"/>
<property name="revision.dir" value="${basedir}/.revision" />
@@ -112,8 +112,8 @@ Index: zookeeper/build.xml
<batchtest todir="${test.log.dir}" if="testcase">
Index: zookeeper/src/contrib/bookkeeper/build.xml
===================================================================
---- zookeeper.orig/src/contrib/bookkeeper/build.xml 2011-10-27 12:56:26.208766699 +0100
-+++ zookeeper/src/contrib/bookkeeper/build.xml 2011-10-27 12:57:05.000000000 +0100
+--- zookeeper.orig/src/contrib/bookkeeper/build.xml 2011-11-23 15:16:05.000000000 +0000
++++ zookeeper/src/contrib/bookkeeper/build.xml 2011-11-30 10:51:34.325184751 +0000
@@ -34,7 +34,7 @@
<target name="setjarname">
@@ -125,8 +125,8 @@ Index: zookeeper/src/contrib/bookkeeper/build.xml
<target name="init" depends="checkMainCompiled, zookeeperbuildcontrib.init"/>
Index: zookeeper/src/contrib/build-contrib.xml
===================================================================
---- zookeeper.orig/src/contrib/build-contrib.xml 2011-10-27 12:56:26.188766632 +0100
-+++ zookeeper/src/contrib/build-contrib.xml 2011-10-27 12:57:05.000000000 +0100
+--- zookeeper.orig/src/contrib/build-contrib.xml 2011-11-23 15:16:05.000000000 +0000
++++ zookeeper/src/contrib/build-contrib.xml 2011-11-30 10:51:34.325184751 +0000
@@ -70,25 +70,14 @@
<path id="classpath">
@@ -186,8 +186,8 @@ Index: zookeeper/src/contrib/build-contrib.xml
Index: zookeeper/src/contrib/zooinspector/build.xml
===================================================================
---- zookeeper.orig/src/contrib/zooinspector/build.xml 2011-10-27 12:56:26.236766791 +0100
-+++ zookeeper/src/contrib/zooinspector/build.xml 2011-10-27 12:57:05.000000000 +0100
+--- zookeeper.orig/src/contrib/zooinspector/build.xml 2011-11-23 15:16:05.000000000 +0000
++++ zookeeper/src/contrib/zooinspector/build.xml 2011-11-30 10:51:34.325184751 +0000
@@ -20,7 +20,7 @@
diff --git a/debian/patches/fixes/ZOOKEEPER-1033 b/debian/patches/fixes/ZOOKEEPER-1033
index dc82182..d2c9673 100644
--- a/debian/patches/fixes/ZOOKEEPER-1033
+++ b/debian/patches/fixes/ZOOKEEPER-1033
@@ -5,14 +5,14 @@ Origin: https://issues.apache.org/jira/browse/ZOOKEEPER-1033
Index: zookeeper/src/c/configure.ac
===================================================================
---- zookeeper.orig/src/c/configure.ac 2011-07-13 09:35:58.176129472 +0100
-+++ zookeeper/src/c/configure.ac 2011-07-13 09:36:13.716129460 +0100
+--- zookeeper.orig/src/c/configure.ac 2011-11-30 10:50:46.000000000 +0000
++++ zookeeper/src/c/configure.ac 2011-11-30 10:53:26.220804575 +0000
@@ -3,7 +3,7 @@
AC_PREREQ(2.59)
--AC_INIT([zookeeper C client],3.3.3,[zookeeper-user at hadoop.apache.org],[c-client-src])
-+AC_INIT([zookeeper C client],3.3.3,[zookeeper-user at hadoop.apache.org],[zookeeper])
+-AC_INIT([zookeeper C client],3.3.4,[zookeeper-user at hadoop.apache.org],[c-client-src])
++AC_INIT([zookeeper C client],3.3.4,[zookeeper-user at hadoop.apache.org],[zookeeper])
AC_CONFIG_SRCDIR([src/zookeeper.c])
# initialize Doxygen support
diff --git a/debian/patches/fixes/ZOOKEEPER-1117 b/debian/patches/fixes/ZOOKEEPER-1117
deleted file mode 100644
index ee411b5..0000000
--- a/debian/patches/fixes/ZOOKEEPER-1117
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Patch adapted from 3.4.x to fix new warnings that break
- the build under gcc >= 4.6.1.
-Origin: https://issues.apache.org/jira/browse/ZOOKEEPER-1117
-
-Index: zookeeper/src/c/src/zookeeper.c
-===================================================================
---- a/src/c/src/zookeeper.c (revision 1155281)
-+++ b/src/c/src/zookeeper.c (working copy)
-@@ -462,7 +462,7 @@
- *port_spec = '\0';
- port_spec++;
- port = strtol(port_spec, &end_port_spec, 0);
-- if (!*port_spec || *end_port_spec) {
-+ if (!*port_spec || *end_port_spec || port == 0) {
- LOG_ERROR(("invalid port in %s", host));
- errno=EINVAL;
- rc=ZBADARGUMENTS;
-Index: zookeeper/src/c/src/cli.c
-===================================================================
---- a/src/c/src/cli.c (revision 1155281)
-+++ b/src/c/src/cli.c (working copy)
-@@ -581,12 +581,14 @@
- FD_SET(0, &rfds);
- rc = select(fd+1, &rfds, &wfds, &efds, &tv);
- events = 0;
-- if (FD_ISSET(fd, &rfds)) {
-- events |= ZOOKEEPER_READ;
-+ if (rc > 0) {
-+ if (FD_ISSET(fd, &rfds)) {
-+ events |= ZOOKEEPER_READ;
-+ }
-+ if (FD_ISSET(fd, &wfds)) {
-+ events |= ZOOKEEPER_WRITE;
-+ }
- }
-- if (FD_ISSET(fd, &wfds)) {
-- events |= ZOOKEEPER_WRITE;
-- }
- if(batchMode && processed==0){
- //batch mode
- processline(cmd);
diff --git a/debian/patches/series b/debian/patches/series
index 9e0a17b..2bf7812 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
debian/add_jtoaster_source_to_zooinspector
debian/patch-build-system
fixes/ZOOKEEPER-705
-fixes/ZOOKEEPER-1117
fixes/ZOOKEEPER-1033
--
Apache ZooKeeper
More information about the pkg-java-commits
mailing list