diff -Nru cfengine3-3.9.1/debian/changelog cfengine3-3.9.1/debian/changelog --- cfengine3-3.9.1/debian/changelog 2017-05-18 07:14:45.000000000 -0500 +++ cfengine3-3.9.1/debian/changelog 2017-07-16 10:45:26.000000000 -0500 @@ -1,3 +1,11 @@ +cfengine3 (3.9.1-4.2ubuntu1) artful; urgency=medium + + * Merge from Debian Sid (LP: #1704655). Remaining changes: + - Add 0011_disable_hanging_testcase.patch to disable hanging testcase + tls_generic_test. + + -- Simon Quigley Sun, 16 Jul 2017 10:45:26 -0500 + cfengine3 (3.9.1-4.2) unstable; urgency=medium * fix masterdir configuration (closes: 852675) @@ -6,6 +14,17 @@ -- Christoph Martin Thu, 18 May 2017 14:14:45 +0200 +cfengine3 (3.9.1-4.1ubuntu1) zesty; urgency=medium + + * d/patches: Dropped patch for building with ssl 1.1 + Zesty is still on 1.0.2g, so the patch causes build failures. + * d/control: Changed build-dep on ssl from 1.1 to 1.0.2g + * d/patches: Disable hanging testcase tls_generic_test + The testcase is also disabled in Debian as part of the ssl 1.1 patch. + Issue reported upstream: https://tracker.mender.io/browse/CFE-2584 + + -- Lars Tangvald Thu, 16 Feb 2017 13:39:18 +0100 + cfengine3 (3.9.1-4.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru cfengine3-3.9.1/debian/control cfengine3-3.9.1/debian/control --- cfengine3-3.9.1/debian/control 2017-05-18 07:14:45.000000000 -0500 +++ cfengine3-3.9.1/debian/control 2017-07-16 10:43:15.000000000 -0500 @@ -1,7 +1,8 @@ Source: cfengine3 Section: admin Priority: optional -Maintainer: Antonio Radici +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Antonio Radici Build-Depends: debhelper (>= 7.0.50), autotools-dev, libssl1.0-dev | libssl-dev (<< 1.1), flex, bison, libpcre3-dev, dh-autoreconf, libvirt-dev, libacl1-dev, liblmdb-dev, default-libmysqlclient-dev, libxml2-dev, quilt, libpam0g-dev diff -Nru cfengine3-3.9.1/debian/patches/0011_disable_hanging_testcase.patch cfengine3-3.9.1/debian/patches/0011_disable_hanging_testcase.patch --- cfengine3-3.9.1/debian/patches/0011_disable_hanging_testcase.patch 1969-12-31 18:00:00.000000000 -0600 +++ cfengine3-3.9.1/debian/patches/0011_disable_hanging_testcase.patch 2017-07-16 10:44:02.000000000 -0500 @@ -0,0 +1,30 @@ +Description: Disables hanging test tls_generic_test + The test case hangs both during the build and when run manually. + It is also disabled in Debian Stretch packaging as part of the patch + to make it build with SSL 1.1 +Author: Lars Tangvald +Bug: https://tracker.mender.io/browse/CFE-2584 +Forwarded: not-needed +Last-Update: 2017-02-14 + +--- cfengine3-3.9.1.orig/tests/unit/Makefile.am ++++ cfengine3-3.9.1/tests/unit/Makefile.am +@@ -394,18 +394,6 @@ mon_load_test_LDADD = ../../libpromises/ + mon_processes_test_SOURCES = mon_processes_test.c ../../cf-monitord/mon.h ../../cf-monitord/mon_processes.c + mon_processes_test_LDADD = ../../libpromises/libpromises.la libtest.la + +-# tls_generic_test uses stub functions interposition which does not work (yet) +-# under OS X. Another way of stubbing functions from libpromises is needed. +-if !XNU +-check_PROGRAMS += tls_generic_test +-tls_generic_test_SOURCES = tls_generic_test.c +-tls_generic_test_LDADD = libtest.la \ +- ../../libutils/libutils.la \ +- ../../libpromises/libpromises.la \ +- ../../libcfnet/libcfnet.la \ +- ../../cf-serverd/libcf-serverd.la +-endif +- + version_test_SOURCES = version_test.c + + hash_test_SOURCES = hash_test.c diff -Nru cfengine3-3.9.1/debian/patches/series cfengine3-3.9.1/debian/patches/series --- cfengine3-3.9.1/debian/patches/series 2017-05-18 07:14:45.000000000 -0500 +++ cfengine3-3.9.1/debian/patches/series 2017-07-16 10:45:15.000000000 -0500 @@ -7,3 +7,4 @@ 0009_disable_spelling_errors.patch 0010_disable_date_annotation.patch #0011_build_with_openssl_1.1.patch +0011_disable_hanging_testcase.patch