[zookeeper] 01/03: Merge branch 'cve-2017-5637'

[Tony Mancill]

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

tmancill pushed a commit to branch master
in repository zookeeper.

commit bf9a7e90938b544d9234e6abfef563def062b0a1
Merge: 11d0ead 78db181
Author: tony mancill <tmancill at debian.org>
Date:   Thu Jun 1 21:07:00 2017 -0700

    Merge branch 'cve-2017-5637'

 debian/changelog                      |  10 +-
 debian/patches/10-CVE-2017-5637.patch | 599 ++++++++++++++++++++++++++++++++++
 debian/patches/series                 |   1 +
 3 files changed, 609 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 188f4c4,dc9b426..0c9ca4d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,11 +1,19 @@@
- zookeeper (3.4.9-3) UNRELEASED; urgency=medium
++zookeeper (3.4.9-4) UNRELEASED; urgency=medium
 +
 +  * Team upload.
 +
 +  * use PKG_CHECK_MDOULES instead of AM_PATH_CPPUNIT (closes: #862135)
 +
 + -- Rene Engelhard <rene at debian.org>  Mon, 15 May 2017 19:46:30 +0200
 +
+ zookeeper (3.4.9-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Apply patch for CVE-2017-5637 (Closes: #863811)
+     "wchp" and "wchc" are now disabled by default.
+ 
+  -- tony mancill <tmancill at debian.org>  Thu, 01 Jun 2017 16:26:44 -0700
+ 
  zookeeper (3.4.9-2) unstable; urgency=medium
  
    * Team upload.
diff --cc debian/patches/series
index bca415e,718175b..843b05f
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -7,4 -7,4 +7,5 @@@
  07-remove-non-reproducible-manifest-entries.patch
  08-reproducible-javadoc.patch
  09-spell-check.patch
 +10-cppunit-pkg-config.patch
+ 10-CVE-2017-5637.patch

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