[Pkg-gnutls-commits] r1810 - in /packages/gnutls28/trunk/debian: changelog control patches/31_testsuite32bit.diff patches/series rules

Sun Jun 9 17:36:10 UTC 2013

Author: ametzler
Date: Sun Jun  9 17:36:09 2013
New Revision: 1810

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1810
Log:
Prepare (3.2.1
 
Bump nettle build-dep to >= 2.7.
Bump shlibs.
Disable 20_test-select.diff instead of ufuzzing the patch. - Let's check
whether it still fails on kfreebsd-i386.
[31_testsuite32bit.diff] Avoid comparing the expiration date to prevent
false positive error in 32-bit systems.

Added:
    packages/gnutls28/trunk/debian/patches/31_testsuite32bit.diff
Modified:
    packages/gnutls28/trunk/debian/changelog
    packages/gnutls28/trunk/debian/control
    packages/gnutls28/trunk/debian/patches/series
    packages/gnutls28/trunk/debian/rules

Modified: packages/gnutls28/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/changelog?rev=1810&op=diff
==============================================================================

--- packages/gnutls28/trunk/debian/changelog (original)
+++ packages/gnutls28/trunk/debian/changelog Sun Jun  9 17:36:09 2013
@@ -1,6 +1,13 @@
-gnutls28 (3.1.12-3) UNRELEASED; urgency=low
+gnutls28 (3.2.1-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * New upstream version.
+    + Bump nettle build-dep to >= 2.7.
+    + Bump shlibs.
+    + Disable 20_test-select.diff instead of ufuzzing the patch. - Let's check
+      whether it still fails on kfreebsd-i386.
+    + [31_testsuite32bit.diff] Avoid comparing the expiration date to prevent
+      false positive error in 32-bit systems.
 
  -- Andreas Metzler <ametzler at debian.org>  Sat, 08 Jun 2013 15:09:44 +0200
 

Modified: packages/gnutls28/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/control?rev=1810&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/control (original)
+++ packages/gnutls28/trunk/debian/control Sun Jun  9 17:36:09 2013
@@ -6,7 +6,7 @@
  Eric Dorland <eric at debian.org>,
  James Westby <jw+debian at jameswestby.net>,
  Simon Josefsson <simon at josefsson.org>
-Build-Depends: debhelper (>= 8.1.3), nettle-dev (>= 2.5), zlib1g-dev,
+Build-Depends: debhelper (>= 8.1.3), nettle-dev (>= 2.7), zlib1g-dev,
  cdbs (>= 0.4.93), gtk-doc-tools, texinfo (>= 4.8),
  libtasn1-6-dev (>= 3.1), autotools-dev, guile-1.8-dev, datefudge,
  libp11-kit-dev (>= 0.11), pkg-config, chrpath, libidn11-dev,

Added: packages/gnutls28/trunk/debian/patches/31_testsuite32bit.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/31_testsuite32bit.diff?rev=1810&op=file
==============================================================================
--- packages/gnutls28/trunk/debian/patches/31_testsuite32bit.diff (added)
+++ packages/gnutls28/trunk/debian/patches/31_testsuite32bit.diff Sun Jun  9 17:36:09 2013
@@ -1,0 +1,36 @@
+From b12040aeab5fbaf02677571db1d8bf1995bd5ee0 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav at gnutls.org>
+Date: Sun, 2 Jun 2013 12:10:06 +0200
+Subject: [PATCH] Avoid comparing the expiration date to prevent false
+ positive error in 32-bit systems.
+
+---
+ tests/cert-tests/pem-decoding |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding
+index fe769ec..f8c6372 100755
+--- a/tests/cert-tests/pem-decoding
++++ b/tests/cert-tests/pem-decoding
+@@ -61,7 +61,9 @@ if test "$rc" != "0"; then
+   exit $rc
+ fi
+ 
+-diff $srcdir/complex-cert.pem tmp-pem.pem
++cat $srcdir/complex-cert.pem |grep -v "Not After:" >tmp1
++cat $srcdir/tmp-pem.pem |grep -v "Not After:" >tmp2
++diff tmp1 tmp2
+ rc=$?
+ 
+ if test "$rc" != "0"; then
+@@ -69,6 +71,6 @@ if test "$rc" != "0"; then
+   exit $rc
+ fi
+ 
+-rm -f tmp-pem.pem
++rm -f tmp-pem.pem tmp1 tmp2
+ 
+ exit 0
+-- 
+1.7.10.4
+

Modified: packages/gnutls28/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/series?rev=1810&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/patches/series (original)
+++ packages/gnutls28/trunk/debian/patches/series Sun Jun  9 17:36:09 2013
@@ -1,3 +1,3 @@
 14_version_gettextcat.diff
-20_test-select.diff
 30_forcesystemlibopts.diff
+31_testsuite32bit.diff

Modified: packages/gnutls28/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/rules?rev=1810&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/rules (original)
+++ packages/gnutls28/trunk/debian/rules Sun Jun  9 17:36:09 2013
@@ -14,8 +14,8 @@
 	--with-packager-version="$(DEB_VERSION)" \
 	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 DEB_MAKE_CHECK_TARGET = check
-DEB_DH_MAKESHLIBS_ARGS_libgnutls28 := -V 'libgnutls28 (>= 3.1.11-0)'
-DEB_DH_MAKESHLIBS_ARGS_libgnutlsxx28 := -V 'libgnutlsxx28 (>= 3.1.11-0)'
+DEB_DH_MAKESHLIBS_ARGS_libgnutls28 := -V 'libgnutls28 (>= 3.2.1-0)'
+DEB_DH_MAKESHLIBS_ARGS_libgnutlsxx28 := -V 'libgnutlsxx28 (>= 3.2.1-0)'
 DEB_DH_MAKESHLIBS_ARGS_guile-gnutls := -Xguile/1.8/guile-gnutls-v-2.so
 DEB_COMPRESS_EXCLUDE := gnutls.pdf
 


