[Git][java-team/zookeeper][master] 5 commits: refresh patches to address offset fuzz
Tony Mancill
gitlab at salsa.debian.org
Sat Aug 17 19:19:40 BST 2019
Tony Mancill pushed to branch master at Debian Java Maintainers / zookeeper
Commits:
a9cc6bec by tony mancill at 2019-08-17T17:16:33Z
refresh patches to address offset fuzz
- - - - -
e9d4b698 by tony mancill at 2019-08-17T17:29:43Z
Address cmd strncpy bounds checking with patch (#925869)
- - - - -
d9daad55 by tony mancill at 2019-08-17T17:57:42Z
Bump Standards-Version to 4.4.0
- - - - -
033d9a0f by tony mancill at 2019-08-17T18:01:45Z
Freshen years in debian/copyright
- - - - -
60d34d2d by tony mancill at 2019-08-17T18:02:12Z
prepare changelog for upload to unstable
- - - - -
10 changed files:
- debian/changelog
- debian/control
- debian/copyright
- debian/patches/02-patch-build-system.patch
- debian/patches/07-remove-non-reproducible-manifest-entries.patch
- debian/patches/08-reproducible-javadoc.patch
- debian/patches/13-disable-netty-connection-factory.patch
- debian/patches/15-javadoc-doclet.patch
- + debian/patches/17-gcc9-ftbfs-925869.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+zookeeper (3.4.13-3) unstable; urgency=medium
+
+ * Address FTBFS with GCC 9 (Closes: #925869)
+ * Bump Standards-Version to 4.4.0
+ * Freshen years in debian/copyright and update Source:
+
+ -- tony mancill <tmancill at debian.org> Sat, 17 Aug 2019 10:59:19 -0700
+
zookeeper (3.4.13-2) unstable; urgency=medium
* Add patch for CVE-2019-0201 (Debian: #929283)
=====================================
debian/control
=====================================
@@ -35,7 +35,7 @@ Build-Depends:
pkg-config,
procps,
python-all-dev (>= 2.6.6-3~)
-Standards-Version: 4.2.1
+Standards-Version: 4.4.0
Vcs-Git: https://salsa.debian.org/java-team/zookeeper.git
Vcs-Browser: https://salsa.debian.org/java-team/zookeeper
Homepage: https://zookeeper.apache.org
=====================================
debian/copyright
=====================================
@@ -1,9 +1,9 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Apache Zookeeper
-Source: http://hadoop.apache.org/zookeeper/releases.html
+Upstream-Name: Apache ZooKeeper
+Source: https://zookeeper.apache.org/
Files: *
-Copyright: 2008-2016, The Apache Software Foundation
+Copyright: 2008-2018, The Apache Software Foundation
License: Apache-2.0
Files: src/contrib/zooinspector/src/java/com/*
@@ -232,6 +232,7 @@ License: BSD-3-clause
Files: debian/*
Copyright: 2010, Thomas Koch <thomas.koch at ymc.ch>,
2011, Canonical Ltd (http://www.canonical.com)
+ 2015-2019, tony mancill <tmancill at debian.org>
License: Apache-2.0
License: Apache-2.0
=====================================
debian/patches/02-patch-build-system.patch
=====================================
@@ -4,7 +4,7 @@ Author: James Page <james.page at ubuntu.com>, Thomas Koch <thomas at koch.ro>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -1297,30 +1297,10 @@
+@@ -1308,30 +1308,10 @@
<target name="test-init" depends="jar,compile-test">
<delete dir="${test.log.dir}" />
<delete dir="${test.tmp.dir}" />
@@ -35,7 +35,7 @@ Forwarded: not-needed
</target>
<condition property="quicktest">
-@@ -1373,6 +1353,9 @@
+@@ -1384,6 +1364,9 @@
<batchtest todir="${test.log.dir}" if="fulltest">
<fileset dir="${test.src.dir}">
<include name="**/*${test.category}Test.java"/>
=====================================
debian/patches/07-remove-non-reproducible-manifest-entries.patch
=====================================
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/build.xml
+++ b/build.xml
-@@ -602,9 +602,6 @@
+@@ -613,9 +613,6 @@
<fileset dir="${src_generated.dir}" excludes="**/.generated"/>
<manifest>
<attribute name="Main-Class" value="org.apache.zookeeper.server.quorum.QuorumPeerMain" />
@@ -13,7 +13,7 @@ Forwarded: no
<attribute name="Implementation-Title" value="org.apache.zookeeper"/>
<attribute name="Implementation-Version" value="${revision}"/>
<attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-@@ -643,9 +640,6 @@
+@@ -654,9 +651,6 @@
<fileset dir="${build.classes}" excludes="**/.generated"/>
<manifest>
<attribute name="Main-Class" value="org.apache.zookeeper.server.quorum.QuorumPeerMain" />
@@ -23,7 +23,7 @@ Forwarded: no
<attribute name="Implementation-Title" value="org.apache.zookeeper"/>
<attribute name="Implementation-Version" value="${revision}"/>
<attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-@@ -675,9 +669,6 @@
+@@ -686,9 +680,6 @@
<fileset dir="${java.src.dir}"/>
<fileset dir="${src_generated.dir}" excludes="**/.generated"/>
<manifest>
@@ -33,7 +33,7 @@ Forwarded: no
<attribute name="Implementation-Title" value="org.apache.zookeeper"/>
<attribute name="Implementation-Version" value="${revision}"/>
<attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-@@ -693,9 +684,6 @@
+@@ -704,9 +695,6 @@
<fileset file="LICENSE.txt" />
<fileset dir="${build.javadoc}"/>
<manifest>
@@ -43,7 +43,7 @@ Forwarded: no
<attribute name="Implementation-Title" value="org.apache.zookeeper"/>
<attribute name="Implementation-Version" value="${revision}"/>
<attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-@@ -711,9 +699,6 @@
+@@ -722,9 +710,6 @@
<fileset file="LICENSE.txt" />
<fileset dir="${test.java.classes}"/>
<manifest>
=====================================
debian/patches/08-reproducible-javadoc.patch
=====================================
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/build.xml
+++ b/build.xml
-@@ -525,6 +525,8 @@
+@@ -536,6 +536,8 @@
windowtitle="${Name} ${version} API"
doctitle="${Name} ${version} API"
bottom="Copyright © ${year} The Apache Software Foundation"
@@ -12,7 +12,7 @@ Forwarded: no
>
<packageset dir="${java.src.dir}">
<include name="org/apache/**"/>
-@@ -549,6 +551,8 @@
+@@ -560,6 +562,8 @@
windowtitle="${Name} ${version} API"
doctitle="${Name} ${version} API"
bottom="Copyright © ${year} The Apache Software Foundation"
=====================================
debian/patches/13-disable-netty-connection-factory.patch
=====================================
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -448,6 +448,7 @@
+@@ -455,6 +455,7 @@
<target name="compile" depends="ivy-retrieve,clover,build-generated">
<javac srcdir="${java.src.dir}" destdir="${build.classes}" includeantruntime="false"
=====================================
debian/patches/15-javadoc-doclet.patch
=====================================
@@ -10,11 +10,9 @@ Forwarded: not-needed
build.xml | 2 --
1 file changed, 2 deletions(-)
-diff --git a/build.xml b/build.xml
-index 9e81b99..7c1fa40 100644
--- a/build.xml
+++ b/build.xml
-@@ -554,8 +554,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
+@@ -565,8 +565,6 @@
bottom="Copyright © ${year} The Apache Software Foundation"
locale="en"
additionalparam="-notimestamp"
=====================================
debian/patches/17-gcc9-ftbfs-925869.patch
=====================================
@@ -0,0 +1,24 @@
+Description: Address FTBFS with GCC 9
+Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925869
+Author: tony mancill <tmancill at debian.org>
+
+--- a/src/c/src/cli.c
++++ b/src/c/src/cli.c
+@@ -549,14 +549,14 @@
+ if (argc > 2) {
+ if(strncmp("cmd:",argv[2],4)==0){
+ size_t cmdlen = strlen(argv[2]);
+- if (cmdlen > sizeof(cmd)) {
++ if (cmdlen >= sizeof(cmd)) {
+ fprintf(stderr,
+ "Command length %zu exceeds max length of %zu\n",
+ cmdlen,
+- sizeof(cmd));
++ sizeof(cmd)-1);
+ return 2;
+ }
+- strncpy(cmd, argv[2]+4, sizeof(cmd));
++ strncpy(cmd, argv[2]+4, sizeof(cmd)-1);
+ batchMode=1;
+ fprintf(stderr,"Batch mode: %s\n",cmd);
+ }else{
=====================================
debian/patches/series
=====================================
@@ -12,3 +12,4 @@
14-ftbfs-with-gcc-8.patch
15-javadoc-doclet.patch
16-ZOOKEEPER-1392.patch
+17-gcc9-ftbfs-925869.patch
View it on GitLab: https://salsa.debian.org/java-team/zookeeper/compare/58f8c1bf32252ab8b4b6d637cec37ca5ab9d8552...60d34d2d9a14d115aeb94615e77f55429c21e45b
--
View it on GitLab: https://salsa.debian.org/java-team/zookeeper/compare/58f8c1bf32252ab8b4b6d637cec37ca5ab9d8552...60d34d2d9a14d115aeb94615e77f55429c21e45b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20190817/152e7ed4/attachment.html>
More information about the pkg-java-commits
mailing list