[SCM] Apache ZooKeeper branch, master, updated. debian/3.3.5+dfsg1-1-3-gfa857d7

[James Page]

The following commit has been merged in the master branch:
commit fa857d7e8401711adba761dec2fa1a5bd724dfea
Author: Matthias Klose <doko at debian.org>
Date:   Thu May 10 18:00:25 2012 +0200

    Imported Debian patch 3.3.5+dfsg1-1.1

diff --git a/debian/changelog b/debian/changelog
index f582e67..dfbc111 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,9 @@
-zookeeper (3.3.5+dfsg1-2) UNRELEASED; urgency=low
+zookeeper (3.3.5+dfsg1-1.1) unstable; urgency=low
 
-  * d/patches/fixes/ZOOKEEPER-1431: Fix up memory leak in zookeeper
-    python binding which results in significant memory growth for large
-    result sets (Closes: #665962). Thanks to Johan Rydberg for identifying 
-    this bug and Kapil Thangavelu for the patch.
+  * Non maintainer upload.
+  * Fix build failure with GCC 4.7.
 
- -- James Page <james.page at ubuntu.com>  Tue, 27 Mar 2012 12:40:37 +0100
+ -- Matthias Klose <doko at debian.org>  Thu, 10 May 2012 18:00:25 +0200
 
 zookeeper (3.3.5+dfsg1-1) unstable; urgency=low
 
diff --git a/debian/patches/fixes/ZOOKEEPER-1431 b/debian/patches/fixes/ZOOKEEPER-1431
deleted file mode 100644
index aaf4f90..0000000
--- a/debian/patches/fixes/ZOOKEEPER-1431
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: Fix up memory leak for large results set in zk
- python bindings.
-Author: Kapil Thangavelu <kapil.thangavelu at canonical.com>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/zookeeper/+bug/963280
-Bug: https://issues.apache.org/jira/browse/ZOOKEEPER-1431
-
-Index: a/src/contrib/zkpython/src/c/zookeeper.c
-===================================================================
---- a/src/contrib/zkpython/src/c/zookeeper.c	(revision 1304459)
-+++ b/src/contrib/zkpython/src/c/zookeeper.c	(working copy)
-@@ -436,7 +436,8 @@
-   if (PyObject_CallObject((PyObject*)callback, arglist) == NULL) {
-     PyErr_Print();
-   }
--  if (pyw->permanent == 0 && (type != ZOO_SESSION_EVENT || is_unrecoverable(zzh) == ZINVALIDSTATE)) {
-+  Py_DECREF(arglist);
-+  if (pyw->permanent == 0 && (type != ZOO_SESSION_EVENT || is_unrecoverable(zzh) == ZINVALIDSTATE)) {   
-     free_pywatcher(pyw);
-   }
-   PyGILState_Release(gstate);
-@@ -457,6 +458,7 @@
-   PyObject *arglist = Py_BuildValue("(i,i)", pyw->zhandle, rc);
-   if (PyObject_CallObject((PyObject*)callback, arglist) == NULL)
-     PyErr_Print();
-+  Py_DECREF(arglist);
-   free_pywatcher(pyw);
-   PyGILState_Release(gstate);
- }
-@@ -474,9 +476,9 @@
-   PyObject *pystat = build_stat(stat);
-   PyObject *arglist = Py_BuildValue("(i,i,O)", pyw->zhandle,rc, pystat);
-   Py_DECREF(pystat);
--
-   if (PyObject_CallObject((PyObject*)callback, arglist) == NULL)
-     PyErr_Print();
-+  Py_DECREF(arglist);
-   free_pywatcher(pyw);
-   PyGILState_Release(gstate);
- }
-@@ -498,6 +500,7 @@
- 
-   if (PyObject_CallObject((PyObject*)callback, arglist) == NULL)
-     PyErr_Print();
-+  Py_DECREF(arglist);
-   free_pywatcher(pyw);
-   PyGILState_Release(gstate);
- }
-@@ -518,6 +521,7 @@
-       PyObject *arglist = Py_BuildValue("(i,i,O)", pyw->zhandle, rc, pystrings);   
-       if (arglist == NULL || PyObject_CallObject((PyObject*)callback, arglist) == NULL)
-         PyErr_Print();
-+      Py_DECREF(arglist);
-     }
-   else
-     PyErr_Print();
-@@ -540,6 +544,7 @@
-   PyObject *arglist = Py_BuildValue("(i,i,s)", pyw->zhandle,rc, value);
-   if (PyObject_CallObject((PyObject*)callback, arglist) == NULL)
-     PyErr_Print();
-+  Py_DECREF(arglist);
-   free_pywatcher(pyw);
-   PyGILState_Release(gstate);
- }
-@@ -565,6 +570,7 @@
-   if (PyObject_CallObject((PyObject*)callback, arglist) == NULL) {
-     PyErr_Print();
-   }
-+  Py_DECREF(arglist);
-   free_pywatcher(pyw);
-   PyGILState_Release(gstate);
- }
diff --git a/debian/patches/ftbfs-gcc-4.7.diff b/debian/patches/ftbfs-gcc-4.7.diff
new file mode 100644
index 0000000..915601b
--- /dev/null
+++ b/debian/patches/ftbfs-gcc-4.7.diff
@@ -0,0 +1,12 @@
+Index: zookeeper-3.3.5+dfsg1/src/contrib/zktreeutil/src/ZkAdaptor.cc
+===================================================================
+--- zookeeper-3.3.5+dfsg1.orig/src/contrib/zktreeutil/src/ZkAdaptor.cc	2012-03-15 20:09:29.000000000 +0000
++++ zookeeper-3.3.5+dfsg1/src/contrib/zktreeutil/src/ZkAdaptor.cc	2012-05-10 16:00:13.741897761 +0000
+@@ -18,6 +18,7 @@
+ 
+ #include "ZkAdaptor.h"
+ #include <string.h>
++#include <unistd.h>
+ #include <sstream>
+ #include <iostream>
+ #include <algorithm>
diff --git a/debian/patches/series b/debian/patches/series
index d4c690d..ec6b7bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,4 @@ fixes/ZOOKEEPER-705
 fixes/ZOOKEEPER-1033
 fixes/ZOOKEEPER-1374
 fixes/ZOOKEEPER-1403
-fixes/ZOOKEEPER-1431
+ftbfs-gcc-4.7.diff

-- 
Apache ZooKeeper