Control: tags 958012 + patch Control: tags 958012 + pending
Dear maintainer, I've prepared an NMU for ziproxy (versioned as 3.3.1-2.2) and uploaded it to DELAYED/15. Please feel free to tell me if I should delay it longer. Regards. diff -Nru ziproxy-3.3.1/debian/changelog ziproxy-3.3.1/debian/changelog --- ziproxy-3.3.1/debian/changelog 2016-06-27 22:06:07.000000000 +1200 +++ ziproxy-3.3.1/debian/changelog 2020-10-06 13:54:59.000000000 +1300 @@ -1,3 +1,10 @@ +ziproxy (3.3.1-2.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with gcc 10. (Closes: 958012) + + -- Michael Hudson-Doyle <mwhud...@debian.org> Tue, 06 Oct 2020 13:54:59 +1300 + ziproxy (3.3.1-2.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru ziproxy-3.3.1/debian/patches/04_gcc10.diff ziproxy-3.3.1/debian/patches/04_gcc10.diff --- ziproxy-3.3.1/debian/patches/04_gcc10.diff 1970-01-01 12:00:00.000000000 +1200 +++ ziproxy-3.3.1/debian/patches/04_gcc10.diff 2020-10-05 13:55:19.000000000 +1300 @@ -0,0 +1,26 @@ +Description: fix multiple defintions which causes an error with gcc 10 +Author: Michael Hudson-Doyle <michael.hud...@ubuntu.com> +Origin: vendor +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=958012 +Last-Update: 2020-10-05 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/tosmarking.c ++++ b/src/tosmarking.c +@@ -32,15 +32,11 @@ + #include "urltables.h" + #include "cttables.h" + #include "log.h" ++#include "cfgfile.h" + + /* private, local. those are not the same as the vars with the same name */ + int tosmarking_enabled; + SOCKET sock_child_out; +-int TOSFlagsDefault; +-int TOSFlagsDiff; +-const t_ut_urltable *tos_markasdiff_url; +-const t_ct_cttable *tos_maskasdiff_ct; +-ZP_DATASIZE_TYPE TOSMarkAsDiffSizeBT; + + int current_tos; + ZP_DATASIZE_TYPE tos_bytecount; /* counter used by TOSMarkAsDiffSizeBT */ diff -Nru ziproxy-3.3.1/debian/patches/series ziproxy-3.3.1/debian/patches/series --- ziproxy-3.3.1/debian/patches/series 2016-06-27 22:01:35.000000000 +1200 +++ ziproxy-3.3.1/debian/patches/series 2020-10-05 13:49:42.000000000 +1300 @@ -1,3 +1,4 @@ 01_ziproxyconf.diff 02_small_spelling.diff 03_giflib5.diff +04_gcc10.diff
