[Pkg-gnutls-commits] r1090 - in /packages/gnutls26/branches/branch2.11.x/debian: changelog patches/17_ignoretestsuitteerrors.diff

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sun Jun 19 06:54:14 2011
New Revision: 1090

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1090
Log:
New upstream version 2.12.7, update 17_ignoretestsuitteerrors.diff.

Modified:
    packages/gnutls26/branches/branch2.11.x/debian/changelog
    packages/gnutls26/branches/branch2.11.x/debian/patches/17_ignoretestsuitteerrors.diff

Modified: packages/gnutls26/branches/branch2.11.x/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/changelog?rev=1090&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/changelog (original)
+++ packages/gnutls26/branches/branch2.11.x/debian/changelog Sun Jun 19 06:54:14 2011
@@ -1,3 +1,10 @@
+gnutls26 (2.12.7-1) experimental; urgency=low
+
+  * New upstream version.
+  * Update 17_ignoretestsuitteerrors.diff.
+
+ -- Andreas Metzler <ametzler at debian.org>  Sun, 19 Jun 2011 08:49:01 +0200
+
 gnutls26 (2.12.6.1-1) experimental; urgency=low
 
   * New upstream version.

Modified: packages/gnutls26/branches/branch2.11.x/debian/patches/17_ignoretestsuitteerrors.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/patches/17_ignoretestsuitteerrors.diff?rev=1090&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/patches/17_ignoretestsuitteerrors.diff (original)
+++ packages/gnutls26/branches/branch2.11.x/debian/patches/17_ignoretestsuitteerrors.diff Sun Jun 19 06:54:14 2011
@@ -1,35 +1,27 @@
 Description: Ignore two testsuite errors
 Author: Andreas Metzler <ametzler at debian.org>
 Forwarded: https://lists.gnu.org/archive/html/gnutls-devel/2011-06/msg00009.html
-Last-Update: 2011-06-05
+Last-Update: 2011-06-19
 
---- gnutls26-2.12.6.1.orig/tests/dsa/testdsa
-+++ gnutls26-2.12.6.1/tests/dsa/testdsa
-@@ -117,9 +117,10 @@ trap "kill $PID" 1 15 2
- # give the server a chance to initialize
+--- gnutls26-2.12.7.orig/tests/dsa/testdsa
++++ gnutls26-2.12.7/tests/dsa/testdsa
+@@ -118,7 +118,8 @@ trap "kill $PID" 1 15 2
  sleep 2
  
--$CLI $DEBUG -p $PORT 127.0.0.1 --insecure </dev/null >/dev/null 2>&1 && \
+ $CLI $DEBUG -p $PORT 127.0.0.1 --insecure </dev/null >/dev/null 2>&1 && \
 -  fail "Succeeded connection to a server with DSA 2048 key and TLS 1.0. Should have failed!"
--
-+if $CLI $DEBUG -p $PORT 127.0.0.1 --insecure </dev/null >/dev/null 2>&1 ; then
-+	echo fail "Succeeded connection to a server with DSA 2048 key and TLS 1.0. Should have failed!" 1>&2
-+	echo error ignored 1>&2
-+fi
++  echo fail "Succeeded connection to a server with DSA 2048 key and TLS 1.0. Should have failed!" && \
++  echo error ignored 1>&2
+ 
  kill $PID
  wait
- 
-@@ -149,9 +150,10 @@ trap "kill $PID" 1 15 2
- # give the server a chance to initialize
+@@ -150,7 +151,8 @@ trap "kill $PID" 1 15 2
  sleep 2
  
--$CLI $DEBUG -p $PORT 127.0.0.1 --insecure </dev/null >/dev/null 2>&1 && \
--  fail "Succeeded connection to a server with DSA 2048 key and TLS 1.0. Should have failed!"
--
-+if $CLI $DEBUG -p $PORT 127.0.0.1 --insecure </dev/null >/dev/null 2>&1 ; then 
-+	echo fail "Succeeded connection to a server with DSA 3072 key and TLS 1.0. Should have failed!" 1>&2
-+	echo error ignored 1>&2
-+fi
+ $CLI $DEBUG -p $PORT 127.0.0.1 --insecure </dev/null >/dev/null 2>&1 && \
+-  fail "Succeeded connection to a server with DSA 3072 key and TLS 1.0. Should have failed!"
++  echo fail "Succeeded connection to a server with DSA 3072 key and TLS 1.0. Should have failed!" && \
++  echo error ignored 1>&2
+ 
  kill $PID
  wait
-