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

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sat Apr  7 07:22:53 2012
New Revision: 1466

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1466
Log:
3.0.18-1: Bump shlibs, add 31_killchild.diff.

Added:
    packages/gnutls28/trunk/debian/patches/31_killchild.diff
Modified:
    packages/gnutls28/trunk/debian/changelog
    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=1466&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/changelog (original)
+++ packages/gnutls28/trunk/debian/changelog Sat Apr  7 07:22:53 2012
@@ -1,8 +1,11 @@
-gnutls28 (3.0.17-3) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Andreas Metzler <ametzler at debian.org>  Tue, 20 Mar 2012 19:31:25 +0100
+gnutls28 (3.0.18-1) experimental; urgency=low
+
+  * New upstream version.
+    + Bump shlibs.
+  * patches/31_killchild.diff: Revert upstream change which caused tee-ing a
+    build to hang.
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat, 07 Apr 2012 09:11:39 +0200
 
 gnutls28 (3.0.17-2) unstable; urgency=low
 

Added: packages/gnutls28/trunk/debian/patches/31_killchild.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/31_killchild.diff?rev=1466&op=file
==============================================================================
--- packages/gnutls28/trunk/debian/patches/31_killchild.diff (added)
+++ packages/gnutls28/trunk/debian/patches/31_killchild.diff Sat Apr  7 07:22:53 2012
@@ -1,0 +1,18 @@
+Description: kill child in test
+ revert upstream commit 4965c2fbfd3405e2dfe7f7d747d03185d155c2a1
+ with it "make check 2>&1 | tee /tmp/foo" never exits.
+Author: Andreas Metzler <ametzler at debian.org>
+Forwarded: http://mid.gmane.org/20120406174521.GA2792%40downhill.g.la
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2012-04-07
+
+--- gnutls28-3.0.18.orig/tests/mini-loss-time.c
++++ gnutls28-3.0.18/tests/mini-loss-time.c
+@@ -274,6 +274,7 @@ static void start (int server_packet, in
+       close(fd[1]);
+       server (fd[0], server_packet);
+       close(fd[0]);
++      kill(child, SIGTERM);
+     }
+   else 
+     {

Modified: packages/gnutls28/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/series?rev=1466&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/patches/series (original)
+++ packages/gnutls28/trunk/debian/patches/series Sat Apr  7 07:22:53 2012
@@ -2,3 +2,4 @@
 20_test-select.diff
 25_disabledtls_kFreeBSD.diff
 30_forcesystemlibopts.diff
+31_killchild.diff

Modified: packages/gnutls28/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/rules?rev=1466&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/rules (original)
+++ packages/gnutls28/trunk/debian/rules Sat Apr  7 07:22:53 2012
@@ -12,8 +12,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.0.16-0)'
-DEB_DH_MAKESHLIBS_ARGS_libgnutlsxx28 := -V 'libgnutlsxx28 (>= 3.0.16-0)'
+DEB_DH_MAKESHLIBS_ARGS_libgnutls28 := -V 'libgnutls28 (>= 3.0.18-0)'
+DEB_DH_MAKESHLIBS_ARGS_libgnutlsxx28 := -V 'libgnutlsxx28 (>= 3.0.18-0)'
 DEB_DH_MAKESHLIBS_ARGS_guile-gnutls := -Xguile/1.8/guile-gnutls-v-2.so
 DEB_COMPRESS_EXCLUDE := gnutls.pdf