[Pkg-gnutls-commits] r1593 - in /packages/gnutls28/trunk/debian: changelog patches/40_danetestfail.diff patches/series

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sat Nov 10 08:22:17 2012
New Revision: 1593

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1593
Log:
40_danetestfail.diff - Do not try to run dane test without dane support.

Added:
    packages/gnutls28/trunk/debian/patches/40_danetestfail.diff
Modified:
    packages/gnutls28/trunk/debian/changelog
    packages/gnutls28/trunk/debian/patches/series

Modified: packages/gnutls28/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/changelog?rev=1593&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/changelog (original)
+++ packages/gnutls28/trunk/debian/changelog Sat Nov 10 08:22:17 2012
@@ -1,11 +1,12 @@
-gnutls28 (3.1.4-1) UNRELEASED; urgency=low
+gnutls28 (3.1.4-1) experimental; urgency=low
 
   * New upstream release.
     + Drop 40_fixtypo.diff.
     + debian/copyright: update upstream author list.
     + New symbols added, bump shlibs.
-
- -- Andreas Metzler <ametzler at debian.org>  Sat, 13 Oct 2012 16:23:01 +0200
+  * 40_danetestfail.diff - Do not try to run dane test without dane support.
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat, 10 Nov 2012 09:21:41 +0100
 
 gnutls28 (3.1.3-1) experimental; urgency=low
 

Added: packages/gnutls28/trunk/debian/patches/40_danetestfail.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/40_danetestfail.diff?rev=1593&op=file
==============================================================================
--- packages/gnutls28/trunk/debian/patches/40_danetestfail.diff (added)
+++ packages/gnutls28/trunk/debian/patches/40_danetestfail.diff Sat Nov 10 08:22:17 2012
@@ -1,0 +1,42 @@
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes at flameeyes.eu>
+To: gnutls-devel at gnu.org
+Subject: [PATCH] build: only run the dane cert test if dane is enabled.
+Date: Fri,  9 Nov 2012 17:41:45 -0800
+Message-Id: <1352511705-442823-1-git-send-email-flameeyes at flameeyes.eu>
+List-Id: GnuTLS development discussions <gnutls-devel.gnu.org>
+
+This fixes a test failure when disabling dane support.
+
+--- gnutls28-3.1.4.orig/tests/cert-tests/Makefile.in
++++ gnutls28-3.1.4/tests/cert-tests/Makefile.in
+@@ -70,6 +70,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
++ at ENABLE_DANE_TRUE@am__append_1 = dane
+ subdir = tests/cert-tests
+ DIST_COMMON = $(dist_check_SCRIPTS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in
+@@ -1460,7 +1461,7 @@ EXTRA_DIST = ca-no-pathlen.pem no-ca-or-
+ 	funny-spacing.pem ca-certs.pem dane-test.rr cert-ecc256.pem
+ 
+ dist_check_SCRIPTS = pathlen aki template-test pem-decoding dane
+-TESTS = pathlen aki template-test pem-decoding dane
++TESTS = pathlen aki template-test pem-decoding $(am__append_1)
+ TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)
+ all: all-am
+ 
+--- gnutls28-3.1.4.orig/tests/cert-tests/Makefile.am
++++ gnutls28-3.1.4/tests/cert-tests/Makefile.am
+@@ -25,6 +25,10 @@ EXTRA_DIST = ca-no-pathlen.pem no-ca-or-
+ 
+ dist_check_SCRIPTS = pathlen aki template-test pem-decoding dane
+ 
+-TESTS = pathlen aki template-test pem-decoding dane
++TESTS = pathlen aki template-test pem-decoding
++
++if ENABLE_DANE
++TESTS += dane
++endif
+ 
+ TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)

Modified: packages/gnutls28/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/series?rev=1593&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/patches/series (original)
+++ packages/gnutls28/trunk/debian/patches/series Sat Nov 10 08:22:17 2012
@@ -1,3 +1,4 @@
 14_version_gettextcat.diff
 20_test-select.diff
 30_forcesystemlibopts.diff
+40_danetestfail.diff