diff -Nru capnproto-0.7.0/debian/changelog capnproto-0.7.0/debian/changelog --- capnproto-0.7.0/debian/changelog 2020-04-01 14:12:03.000000000 +0000 +++ capnproto-0.7.0/debian/changelog 2020-07-06 18:52:29.000000000 +0000 @@ -1,14 +1,20 @@ -capnproto (0.7.0-6) focal; urgency=medium +capnproto (0.7.0-7) unstable; urgency=medium - * import ce4dd5a1, fixing build issue on s390x LP: #1870055 + * Disable failing test when interface is IPv6-only (Closes: #963855) + Thank you to Dominic Hargreaves for the bug report and instructions + for how to reproduce the bug. - -- Michał Sawicz Wed, 01 Apr 2020 16:12:03 +0200 + -- tony mancill Mon, 06 Jul 2020 11:52:29 -0700 -capnproto (0.7.0-5build1) focal; urgency=medium +capnproto (0.7.0-6) unstable; urgency=medium - * No-change rebuild for libgcc-s1 package name change. + * Apply patch for FTBFS on s390x (Closes: #955544) + Thank you to Michał Sawicz for the bug report and patch. + * Bump Standards-Version to 4.5.0 + * Specify debhelper compat 12 via debhelper-compat dependency + * Specify "Rules-Requires-Root: no" in debian/control - -- Matthias Klose Sat, 21 Mar 2020 13:26:40 +0100 + -- tony mancill Thu, 02 Apr 2020 21:15:54 -0700 capnproto (0.7.0-5) unstable; urgency=medium diff -Nru capnproto-0.7.0/debian/compat capnproto-0.7.0/debian/compat --- capnproto-0.7.0/debian/compat 2019-09-11 03:29:14.000000000 +0000 +++ capnproto-0.7.0/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -12 diff -Nru capnproto-0.7.0/debian/control capnproto-0.7.0/debian/control --- capnproto-0.7.0/debian/control 2019-09-11 03:29:14.000000000 +0000 +++ capnproto-0.7.0/debian/control 2020-07-06 18:52:29.000000000 +0000 @@ -3,12 +3,13 @@ Priority: optional Maintainer: Tom Lee Uploaders: tony mancill -Build-Depends: debhelper (>= 12), gcc (>= 4.7), python3-all, +Build-Depends: debhelper-compat (= 12), gcc (>= 4.7), python3-all, dpkg-dev (>= 1.16.1.1), docbook-xsl, docbook-xml, xsltproc, netbase, cmake -Standards-Version: 4.4.0 +Standards-Version: 4.5.0 Homepage: https://capnproto.org/ Vcs-Git: https://github.com/thomaslee/capnproto-debian Vcs-Browser: https://github.com/thomaslee/capnproto-debian +Rules-Requires-Root: no Package: libcapnp-0.7.0 Architecture: any diff -Nru capnproto-0.7.0/debian/patches/05_fix_uninitialized_enums.patch capnproto-0.7.0/debian/patches/05_fix_uninitialized_enums.patch --- capnproto-0.7.0/debian/patches/05_fix_uninitialized_enums.patch 2020-04-01 14:12:03.000000000 +0000 +++ capnproto-0.7.0/debian/patches/05_fix_uninitialized_enums.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -commit ce4dd5a1031ee741c676daaea89ae3d1b19f2bb2 -Author: David Renshaw -Date: Fri Nov 16 21:23:58 2018 -0500 - - initialize anonymous enums in isPlausiblyText() and isPlausiblyJson() - -diff --git a/src/capnp/compiler/capnp.c++ b/c++/src/capnp/compiler/capnp.c++ -index e39db556..8e8c459b 100644 ---- a/src/capnp/compiler/capnp.c++ -+++ b/src/capnp/compiler/capnp.c++ -@@ -1377,7 +1377,7 @@ private: - } - - Plausibility isPlausiblyText(kj::ArrayPtr prefix) { -- enum { PREAMBLE, COMMENT, BODY } state; -+ enum { PREAMBLE, COMMENT, BODY } state = PREAMBLE; - - for (char c: prefix.asChars()) { - switch (state) { -@@ -1427,7 +1427,7 @@ private: - } - - Plausibility isPlausiblyJson(kj::ArrayPtr prefix) { -- enum { PREAMBLE, COMMENT, BODY } state; -+ enum { PREAMBLE, COMMENT, BODY } state = PREAMBLE; - - for (char c: prefix.asChars()) { - switch (state) { diff -Nru capnproto-0.7.0/debian/patches/05_ftbfs_on_s390x.patch capnproto-0.7.0/debian/patches/05_ftbfs_on_s390x.patch --- capnproto-0.7.0/debian/patches/05_ftbfs_on_s390x.patch 1970-01-01 00:00:00.000000000 +0000 +++ capnproto-0.7.0/debian/patches/05_ftbfs_on_s390x.patch 2020-07-06 18:52:29.000000000 +0000 @@ -0,0 +1,31 @@ +Description: initialize anonymous enums in isPlausiblyText() and isPlausiblyJson() +Forwarded: not-needed +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=955544 +Source: https://patch-diff.githubusercontent.com/raw/capnproto/capnproto/pull/761.diff + +commit ce4dd5a1031ee741c676daaea89ae3d1b19f2bb2 +Author: David Renshaw +Date: Fri Nov 16 21:23:58 2018 -0500 + +diff --git a/src/capnp/compiler/capnp.c++ b/src/capnp/compiler/capnp.c++ +index e39db5561..8e8c459b2 100644 +--- a/src/capnp/compiler/capnp.c++ ++++ b/src/capnp/compiler/capnp.c++ +@@ -1377,7 +1377,7 @@ private: + } + + Plausibility isPlausiblyText(kj::ArrayPtr prefix) { +- enum { PREAMBLE, COMMENT, BODY } state; ++ enum { PREAMBLE, COMMENT, BODY } state = PREAMBLE; + + for (char c: prefix.asChars()) { + switch (state) { +@@ -1427,7 +1427,7 @@ private: + } + + Plausibility isPlausiblyJson(kj::ArrayPtr prefix) { +- enum { PREAMBLE, COMMENT, BODY } state; ++ enum { PREAMBLE, COMMENT, BODY } state = PREAMBLE; + + for (char c: prefix.asChars()) { + switch (state) { diff -Nru capnproto-0.7.0/debian/patches/06_tests_fail_with_ipv6.patch capnproto-0.7.0/debian/patches/06_tests_fail_with_ipv6.patch --- capnproto-0.7.0/debian/patches/06_tests_fail_with_ipv6.patch 1970-01-01 00:00:00.000000000 +0000 +++ capnproto-0.7.0/debian/patches/06_tests_fail_with_ipv6.patch 2020-07-06 18:52:29.000000000 +0000 @@ -0,0 +1,16 @@ +Description: disable failing test when non-loopback interface is IPv6-only +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=963855 + +Index: capnproto-0.7.0/src/kj/async-io-test.c++ +=================================================================== +--- capnproto-0.7.0.orig/src/kj/async-io-test.c++ ++++ capnproto-0.7.0/src/kj/async-io-test.c++ +@@ -123,7 +123,7 @@ TEST(AsyncIo, AddressParsing) { + // + // For some reason, Android and some various Linux distros do not support service names. + if (systemSupportsAddress("1.2.3.4", "http")) { +- EXPECT_EQ("1.2.3.4:80", tryParse(w, network, "1.2.3.4:http", 5678)); ++ //EXPECT_EQ("1.2.3.4:80", tryParse(w, network, "1.2.3.4:http", 5678)); + EXPECT_EQ("*:80", tryParse(w, network, "*:http", 5678)); + } else { + KJ_LOG(WARNING, "system does not support resolving service names on ipv4; skipping tests"); diff -Nru capnproto-0.7.0/debian/patches/series capnproto-0.7.0/debian/patches/series --- capnproto-0.7.0/debian/patches/series 2020-04-01 14:12:03.000000000 +0000 +++ capnproto-0.7.0/debian/patches/series 2020-07-06 18:52:29.000000000 +0000 @@ -2,4 +2,5 @@ 02_broken_kfreebsd_tests.patch 03_fixup_cmake.patch 04_fix_typos.patch -05_fix_uninitialized_enums.patch +05_ftbfs_on_s390x.patch +06_tests_fail_with_ipv6.patch