diff -Nru zookeeper-3.8.0/debian/changelog zookeeper-3.8.0/debian/changelog --- zookeeper-3.8.0/debian/changelog 2022-09-02 18:17:29.000000000 +0200 +++ zookeeper-3.8.0/debian/changelog 2022-09-29 11:30:44.000000000 +0200 @@ -1,3 +1,12 @@ +zookeeper (3.8.0-8ubuntu1) kinetic; urgency=medium + + * Merge from Debian sid keeping d/p/gcc-11-no-throw.patch + (LP: #1990151, LP: #1988541) + * Dropping d/p/18-ZOOKEEPER-3954.patch + https://issues.apache.org/jira/browse/ZOOKEEPER-3954 is resolved + + -- Heinrich Schuchardt Thu, 29 Sep 2022 11:30:44 +0200 + zookeeper (3.8.0-8) unstable; urgency=medium * Team upload @@ -38,6 +47,22 @@ -- Pierre Gruet Fri, 01 Jul 2022 21:19:09 +0200 +zookeeper (3.8.0-3ubuntu2) kinetic; urgency=medium + + * d/p/30-skip-tests-network.patch: Amended to disable a test reaching out to + google.com (LP: #1988541) + + -- Simon Chopin Fri, 02 Sep 2022 11:10:52 +0200 + +zookeeper (3.8.0-3ubuntu1) kinetic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Fix build with gcc -O3. + - Fix zktreeutil compatibility with gcc 11. + * Refresh patches for new upstream release. + + -- Steve Langasek Fri, 01 Jul 2022 12:43:57 -0700 + zookeeper (3.8.0-3) unstable; urgency=medium * Team upload @@ -118,6 +143,32 @@ -- Pierre Gruet Tue, 28 Jun 2022 18:02:04 +0200 +zookeeper (3.4.13-6ubuntu5) kinetic; urgency=medium + + * No-change rebuild against liblog4cxx13 + + -- Steve Langasek Tue, 21 Jun 2022 21:47:40 +0000 + +zookeeper (3.4.13-6ubuntu4) jammy; urgency=medium + + * No-change rebuild with Python 3.10 only + + -- Graham Inggs Wed, 23 Mar 2022 13:40:46 +0000 + +zookeeper (3.4.13-6ubuntu3) jammy; urgency=medium + + * No-change rebuild with Python 3.10 as default version + + -- Graham Inggs Thu, 13 Jan 2022 20:43:18 +0000 + +zookeeper (3.4.13-6ubuntu2) jammy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Fix build with gcc 10 and -O3. + * Use gcc 10 to build zktreeutil (fixing FTBFS with gcc-11) + + -- Gianfranco Costamagna Tue, 11 Jan 2022 10:15:01 +0100 + zookeeper (3.4.13-6) unstable; urgency=medium * Team upload. @@ -126,6 +177,36 @@ -- Emmanuel Bourg Sun, 07 Feb 2021 23:16:46 +0100 +zookeeper (3.4.13-5ubuntu4) hirsute; urgency=medium + + * No-change rebuild to drop python3.8 extensions. + + -- Matthias Klose Mon, 07 Dec 2020 18:45:41 +0100 + +zookeeper (3.4.13-5ubuntu3) hirsute; urgency=medium + + * Rebuild against new liblog4cxx11. + + -- Gianfranco Costamagna Sun, 01 Nov 2020 23:19:48 +0100 + +zookeeper (3.4.13-5ubuntu2) hirsute; urgency=medium + + * No-change rebuild to build with python3.9 as supported. + + -- Matthias Klose Sat, 24 Oct 2020 10:56:22 +0200 + +zookeeper (3.4.13-5ubuntu1) groovy; urgency=medium + + * Fix build with gcc 10 and -O3. + + -- Michael Hudson-Doyle Mon, 05 Oct 2020 12:46:26 +1300 + +zookeeper (3.4.13-5build1) focal; urgency=medium + + * No-change rebuild to drop python3.7. + + -- Matthias Klose Tue, 18 Feb 2020 10:26:56 +0100 + zookeeper (3.4.13-5) unstable; urgency=medium [ tony mancill ] @@ -649,3 +730,4 @@ * Initial release. (Closes: #561947) -- Thomas Koch Wed, 27 Jan 2010 16:41:22 +0100 + diff -Nru zookeeper-3.8.0/debian/control zookeeper-3.8.0/debian/control --- zookeeper-3.8.0/debian/control 2022-07-01 18:51:25.000000000 +0200 +++ zookeeper-3.8.0/debian/control 2022-09-29 11:29:01.000000000 +0200 @@ -1,7 +1,8 @@ Source: zookeeper Section: java Priority: optional -Maintainer: Debian Java Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Java Maintainers Uploaders: James Page , tony mancill Build-Depends: diff -Nru zookeeper-3.8.0/debian/patches/gcc-11-no-throw.patch zookeeper-3.8.0/debian/patches/gcc-11-no-throw.patch --- zookeeper-3.8.0/debian/patches/gcc-11-no-throw.patch 1970-01-01 01:00:00.000000000 +0100 +++ zookeeper-3.8.0/debian/patches/gcc-11-no-throw.patch 2022-09-29 11:29:01.000000000 +0200 @@ -0,0 +1,192 @@ +Description: Fix build with gcc-11 by removing some throw exceptions. +See: https://stackoverflow.com/questions/54239292/how-to-replace-dynamic-exception-specifications-throw + +Author: Gianfranco Costamagna + +Bug-Debian: https://bugs.debian.org/984406 +Last-Update: 2022-01-11 + +--- zookeeper-3.4.13.orig/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkAdaptor.cc ++++ zookeeper-3.4.13/zookeeper-contrib/zookeeper-contrib-zktreeutil/src/ZkAdaptor.cc +@@ -89,7 +89,7 @@ namespace zktreeutil + + // ======================================================================= + +- ZooKeeperAdapter::ZooKeeperAdapter(ZooKeeperConfig config) throw(ZooKeeperException) : ++ ZooKeeperAdapter::ZooKeeperAdapter(ZooKeeperConfig config) : + m_zkConfig(config), + mp_zkHandle(NULL) + { +@@ -127,7 +127,7 @@ namespace zktreeutil + } + } + +- void ZooKeeperAdapter::validatePath(const string &path) throw(ZooKeeperException) ++ void ZooKeeperAdapter::validatePath(const string &path) + { + if (path.find ("/") != 0) + { +@@ -167,7 +167,7 @@ namespace zktreeutil + } + } + +- void ZooKeeperAdapter::reconnect() throw(ZooKeeperException) ++ void ZooKeeperAdapter::reconnect() + { + // Clear the connection state + disconnect(); +@@ -235,7 +235,7 @@ namespace zktreeutil + throw ZooKeeperException (oss.str()); + } + +- void ZooKeeperAdapter::verifyConnection() throw(ZooKeeperException) ++ void ZooKeeperAdapter::verifyConnection() + { + // Check connection state + int state = zoo_state (mp_zkHandle); +@@ -262,7 +262,7 @@ namespace zktreeutil + bool ZooKeeperAdapter::createNode(const string &path, + const string &value, + int flags, +- bool createAncestors) throw(ZooKeeperException) ++ bool createAncestors) + { + const int MAX_PATH_LENGTH = 1024; + char realPath[MAX_PATH_LENGTH]; +@@ -331,7 +331,7 @@ namespace zktreeutil + + bool ZooKeeperAdapter::deleteNode(const string &path, + bool recursive, +- int version) throw(ZooKeeperException) ++ int version) + { + // Validate the zk path + validatePath( path ); +@@ -380,7 +380,7 @@ namespace zktreeutil + return true; + } + +- vector< string > ZooKeeperAdapter::getNodeChildren (const string &path) throw (ZooKeeperException) ++ vector< string > ZooKeeperAdapter::getNodeChildren (const string &path) + { + // Validate the zk path + validatePath( path ); +@@ -423,7 +423,7 @@ namespace zktreeutil + } + } + +- bool ZooKeeperAdapter::nodeExists(const string &path) throw(ZooKeeperException) ++ bool ZooKeeperAdapter::nodeExists(const string &path) + { + // Validate the zk path + validatePath( path ); +@@ -453,7 +453,7 @@ namespace zktreeutil + } + } + +- string ZooKeeperAdapter::getNodeData(const string &path) throw(ZooKeeperException) ++ string ZooKeeperAdapter::getNodeData(const string &path) + { + // Validate the zk path + validatePath( path ); +@@ -488,7 +488,7 @@ namespace zktreeutil + + void ZooKeeperAdapter::setNodeData(const string &path, + const string &value, +- int version) throw(ZooKeeperException) ++ int version) + { + // Validate the zk path + validatePath( path ); +--- zookeeper-3.4.13.orig/zookeeper-contrib/zookeeper-contrib-zktreeutil//src/ZkAdaptor.h ++++ zookeeper-3.4.13/zookeeper-contrib/zookeeper-contrib-zktreeutil//src/ZkAdaptor.h +@@ -184,7 +184,7 @@ namespace zktreeutil + * @param config the ZK configuration + * @throw ZooKeeperException if cannot establish connection to the given ZK + */ +- ZooKeeperAdapter(ZooKeeperConfig config) throw(ZooKeeperException); ++ ZooKeeperAdapter(ZooKeeperConfig config); + + /** + * \brief Destructor. +@@ -203,7 +203,7 @@ namespace zktreeutil + * + * @throw ZooKeeperException if cannot establish connection to the ZK + */ +- void reconnect() throw(ZooKeeperException); ++ void reconnect(); + + /** + * \brief Disconnects from the ZK and unregisters {@link #mp_zkHandle}. +@@ -226,7 +226,7 @@ namespace zktreeutil + bool createNode(const string &path, + const string &value = "", + int flags = 0, +- bool createAncestors = true) throw(ZooKeeperException); ++ bool createAncestors = true); + + /** + * \brief Deletes a node identified by the given path. +@@ -243,7 +243,7 @@ namespace zktreeutil + */ + bool deleteNode(const string &path, + bool recursive = false, +- int version = -1) throw(ZooKeeperException); ++ int version = -1); + + /** + * \brief Retrieves list of all children of the given node. +@@ -252,7 +252,7 @@ namespace zktreeutil + * @return the list of absolute paths of child nodes, possibly empty + * @throw ZooKeeperException if the operation has failed + */ +- vector getNodeChildren( const string &path) throw(ZooKeeperException); ++ vector getNodeChildren( const string &path); + + /** + * \brief Check the existence of path to a znode. +@@ -261,7 +261,7 @@ namespace zktreeutil + * @return TRUE if the znode exists; FALSE otherwise + * @throw ZooKeeperException if the operation has failed + */ +- bool nodeExists(const string &path) throw(ZooKeeperException); ++ bool nodeExists(const string &path); + + /** + * \brief Gets the given node's data. +@@ -271,7 +271,7 @@ namespace zktreeutil + * @return the node's data + * @throw ZooKeeperException if the operation has failed + */ +- string getNodeData(const string &path) throw(ZooKeeperException); ++ string getNodeData(const string &path); + + /** + * \brief Sets the given node's data. +@@ -286,7 +286,7 @@ namespace zktreeutil + */ + void setNodeData(const string &path, + const string &value, +- int version = -1) throw(ZooKeeperException); ++ int version = -1); + + /** + * \brief Validates the given path to a node in ZK. +@@ -296,7 +296,7 @@ namespace zktreeutil + * @throw ZooKeeperException if the given path is not valid + * (for instance it doesn't start with "/") + */ +- static void validatePath(const string &path) throw(ZooKeeperException); ++ static void validatePath(const string &path); + + private: + +@@ -307,7 +307,7 @@ namespace zktreeutil + * @throw ZooKeeperConnection if this client is disconnected + * and auto-reconnect failed or was not allowed + */ +- void verifyConnection() throw(ZooKeeperException); ++ void verifyConnection(); + + private: + diff -Nru zookeeper-3.8.0/debian/patches/series zookeeper-3.8.0/debian/patches/series --- zookeeper-3.8.0/debian/patches/series 2022-07-23 22:08:44.000000000 +0200 +++ zookeeper-3.8.0/debian/patches/series 2022-09-29 11:29:01.000000000 +0200 @@ -31,3 +31,4 @@ 33-spelling.patch 34-no-rpath-with-libtool.patch 35-flaky-test.patch +gcc-11-no-throw.patch