From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 3 Mar 2012 17:30:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/strongswan'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0eb4bf22db721e9e745b1c04001a207d70021009;hp=f59c3c0483649711d289e08648c08883ac06b176;p=people%2Famarx%2Fipfire-3.x.git

Merge remote-tracking branch 'stevee/strongswan'
---

diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm
index 64b8a3f5c..fcd21a01b 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 7c871bb78..000000000
--- 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@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
-
diff --git a/hdparm/hdparm.nm b/hdparm/hdparm.nm
index 43948098f..aac269c33 100644
--- a/hdparm/hdparm.nm
+++ b/hdparm/hdparm.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = hdparm
-version    = 9.38
-release    = 2
+version    = 9.39
+release    = 1
 
 groups     = Applications/Hardware
 url        = http://sourceforge.net/projects/hdparm/
diff --git a/libpng/libpng.nm b/libpng/libpng.nm
index 752ba696b..55268a8a4 100644
--- a/libpng/libpng.nm
+++ b/libpng/libpng.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = libpng
-version    = 1.5.7
+version    = 1.5.9
 release    = 1
 
 groups     = System/Libraries
@@ -13,10 +13,10 @@ license    = zlib
 summary    = A library of functions for manipulating PNG image format files.
 
 description
-	The libpng package contains a library of functions for creating and \
-	manipulating PNG (Portable Network Graphics) image format files. \
-	PNG is a bit-mapped graphics format similar to the GIF format. PNG \
-	was created to replace the GIF format, since GIF uses a patented \
+	The libpng package contains a library of functions for creating and
+	manipulating PNG (Portable Network Graphics) image format files.
+	PNG is a bit-mapped graphics format similar to the GIF format. PNG
+	was created to replace the GIF format, since GIF uses a patented
 	data compression algorithm.
 end