diff -Nru libvirt-2.1.0/debian/changelog libvirt-2.1.0/debian/changelog --- libvirt-2.1.0/debian/changelog 2016-11-16 15:02:43.000000000 +0100 +++ libvirt-2.1.0/debian/changelog 2016-11-17 12:37:41.000000000 +0100 @@ -1,3 +1,10 @@ +libvirt (2.1.0-1ubuntu13) zesty; urgency=medium + + * drop d/p/ubuntu/fix-ftbfs-for-gnutls-3-5-6.patch as the offending change + in gnutls has been reverted (LP: #1641615) + + -- Christian Ehrhardt Thu, 17 Nov 2016 08:43:10 +0100 + libvirt (2.1.0-1ubuntu12) zesty; urgency=medium * d/p/ubuntu/fix-ftbfs-for-gnutls-3-5-6.patch fix FTBFS due to changes in diff -Nru libvirt-2.1.0/debian/patches/series libvirt-2.1.0/debian/patches/series --- libvirt-2.1.0/debian/patches/series 2016-11-16 15:02:42.000000000 +0100 +++ libvirt-2.1.0/debian/patches/series 2016-11-17 08:44:07.000000000 +0100 @@ -61,4 +61,3 @@ ubuntu/apparmor-fix-name-resolution.patch ubuntu/apparmor-fix-debug-threads.patch ubuntu/apparmor-fix-other-seclabels.patch -ubuntu/fix-ftbfs-for-gnutls-3-5-6.patch diff -Nru libvirt-2.1.0/debian/patches/ubuntu/fix-ftbfs-for-gnutls-3-5-6.patch libvirt-2.1.0/debian/patches/ubuntu/fix-ftbfs-for-gnutls-3-5-6.patch --- libvirt-2.1.0/debian/patches/ubuntu/fix-ftbfs-for-gnutls-3-5-6.patch 2016-11-16 15:02:42.000000000 +0100 +++ libvirt-2.1.0/debian/patches/ubuntu/fix-ftbfs-for-gnutls-3-5-6.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ ---- a/tests/virnettlssessiontest.c -+++ b/tests/virnettlssessiontest.c -@@ -374,6 +374,33 @@ - DO_SESS_TEST(cacertreq.filename, servercertalt2req.filename, clientcertreq.filename, - false, false, "wiki.libvirt.org", NULL); - -+#if GNUTLS_VERSION_NUMBER >= 0x030506 -+ const char *const wildcards1[] = { -+ "CN=dogfood,C=UK", -+ NULL, -+ }; -+ const char *const wildcards2[] = { -+ "CN=libvirt,C=UK", -+ NULL, -+ }; -+ const char *const wildcards3[] = { -+ "CN=dogfood,C=UK", -+ "CN=libvirt,C=UK", -+ NULL, -+ }; -+ const char *const wildcards4[] = { -+ "CN=libvirtstuff,C=UK", -+ NULL, -+ }; -+ const char *const wildcards5[] = { -+ "CN=libvirt*,C=UK", -+ NULL, -+ }; -+ const char *const wildcards6[] = { -+ "CN=*virt*,C=UK", -+ NULL, -+ }; -+#else - const char *const wildcards1[] = { - "C=UK,CN=dogfood", - NULL, -@@ -399,6 +426,7 @@ - "C=UK,CN=*virt*", - NULL, - }; -+#endif /* GNUTLS_VERSION_NUMBER >= 0x030506 */ - - DO_SESS_TEST(cacertreq.filename, servercertreq.filename, clientcertreq.filename, - true, false, "libvirt.org", wildcards1);