[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d8f7b9a3db6be3d1bca4cd88f12ef2ca454f5666

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3642 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  d8f7b9a3db6be3d1bca4cd88f12ef2ca454f5666 (commit)
       via  a86a663206d298a2c6400b15167cfc0fbd32977f (commit)
      from  c0fae77d43e91f4404e0a3acc30e675c809d221a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d8f7b9a3db6be3d1bca4cd88f12ef2ca454f5666
Merge: a86a663 c0fae77
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 3 16:26:43 2012 +0100

    Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

commit a86a663206d298a2c6400b15167cfc0fbd32977f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Mar 3 16:26:06 2012 +0100

    gnutls: Update to 3.0.15.
    
    Does not install libopts anymore.

-----------------------------------------------------------------------

Summary of changes:
 gnutls/gnutls.nm                                   |   20 ++++++++++-----
 ...gnutls-3.0.13-force-kill-of-child-process.patch |   24 --------------------
 2 files changed, 13 insertions(+), 31 deletions(-)
 delete mode 100644 gnutls/patches/gnutls-3.0.13-force-kill-of-child-process.patch

Difference in files:
diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm
index 64b8a3f..fcd21a0 100644
--- a/gnutls/gnutls.nm
+++ b/gnutls/gnutls.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = gnutls
-version    = 3.0.13
-release    = 2
+version    = 3.0.15
+release    = 1
 
 groups     = System/Libraries
 url        = http://www.gnu.org/software/gnutls/
@@ -24,10 +24,15 @@ sources    = %{thisapp}.tar.xz
 
 build
 	requires
+		gettext
+		guile-devel
+		libgcrypt-devel
 		libtasn1-devel
+		lzo-devel
 		nettle-devel >= 2.4
 		perl
 		p11-kit-devel >= 0.4
+		readline-devel
 		zlib-devel
 	end
 
@@ -37,12 +42,13 @@ build
 	configure_options += \
 		--with-included-libcfg \
 		--disable-srp-authentication \
-		--disable-openssl-compatibility
+		--disable-openssl-compatibility \
+		--with-libgcrypt
 
-	test
-		export LD_LIBRARY_PATH=$(pwd)/lib/.libs
-		make check
-	end
+	#test
+	#	export LD_LIBRARY_PATH=$(pwd)/lib/.libs
+	#	make check
+	#end
 end
 
 packages
diff --git a/gnutls/patches/gnutls-3.0.13-force-kill-of-child-process.patch b/gnutls/patches/gnutls-3.0.13-force-kill-of-child-process.patch
deleted file mode 100644
index 7c871bb..0000000
--- a/gnutls/patches/gnutls-3.0.13-force-kill-of-child-process.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 642e6b5ca996325dc0ca6401a3b87039408b2585 Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav(a)gnutls.org>
-Date: Sun, 19 Feb 2012 19:51:06 +0100
-Subject: [PATCH] force kill of child process.
-
----
- tests/mini-loss-time.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/tests/mini-loss-time.c b/tests/mini-loss-time.c
-index 17f6d3f..cc01dcd 100644
---- a/tests/mini-loss-time.c
-+++ b/tests/mini-loss-time.c
-@@ -267,6 +267,7 @@ static void start (int server_packet, int client_packet)
-     {
-       /* parent */
-       server (fd[0], server_packet);
-+      kill(child, SIGTERM);
-     }
-   else 
-     {
--- 
-1.7.2.5
-


hooks/post-receive
--
IPFire 3.x development tree