[csw-devel] SF.net SVN: gar:[21136] csw/mgar/pkg/gnutls/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sat May 18 00:02:21 CEST 2013
Revision: 21136
http://gar.svn.sourceforge.net/gar/?rev=21136&view=rev
Author: chninkel
Date: 2013-05-17 22:02:15 +0000 (Fri, 17 May 2013)
Log Message:
-----------
gnutls/trunk: updated to 2.12.23
Modified Paths:
--------------
csw/mgar/pkg/gnutls/trunk/Makefile
csw/mgar/pkg/gnutls/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/gnutls/trunk/files/0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch
csw/mgar/pkg/gnutls/trunk/files/0003-correctly-handle-the-null-key-case.patch
Modified: csw/mgar/pkg/gnutls/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnutls/trunk/Makefile 2013-05-17 14:57:32 UTC (rev 21135)
+++ csw/mgar/pkg/gnutls/trunk/Makefile 2013-05-17 22:02:15 UTC (rev 21136)
@@ -1,5 +1,5 @@
NAME = gnutls
-VERSION = 2.10.4
+VERSION = 2.12.23
GARTYPE = v2
DESCRIPTION = GNU Transport Layer Security libraries and tools
@@ -10,9 +10,15 @@
endef
MASTER_SITES = $(GNU_MIRROR)
-MASTER_SITES += http://alpha.gnu.org/gnu/gnutls/
+MASTER_SITES += ftp://ftp.gnutls.org/gcrypt/gnutls/v2.12/
DISTFILES = $(NAME)-$(VERSION).tar.bz2
-PATCHFILES += 0001-Do-not-strip-norunpath.patch
+#PATCHFILES += 0001-Do-not-strip-norunpath.patch
+PATCHFILES += 0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch
+# certtool uses fprintf to print the keyid but when
+# the key id is null it segfaults under Solaris
+# (where it prints (null) under Linux)
+# This patchs fixes this (and is taken from gnutls3)
+PATCHFILES += 0003-correctly-handle-the-null-key-case.patch
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
@@ -37,12 +43,12 @@
PACKAGES += CSWlibgnutls26
CATALOGNAME_CSWlibgnutls = libgnutls26
SPKG_DESC_CSWlibgnutls26 = GNU Transport Layer Security libraries and tools providing libgnutls*.so.26
-PKGFILES_CSWlibgnutls26 = $(call baseisadirs,$(libdir),libgnutls.*\.so\.26(\.\d+)*)
+PKGFILES_CSWlibgnutls26 = $(PKGFILES_RT)
RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWgcrypt
RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWggettextrt
RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWgpgerr
RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibtasn1-3
-RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibgnutls26 += CSWlibz1
PACKAGES += CSWlibgnutls-dev
CATALOGNAME_CSWlibgnutls-dev = libgnutls_dev
@@ -61,8 +67,11 @@
BUILD_DEP_PKGS += CSWreadline
BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS_CSWlibgnutls26)
-BUILD_DEP_PKGS += CSWlibtasn1devel
+BUILD_DEP_PKGS += CSWlibtasn1-dev
+GARCOMPILER = GNU
+GARFLAVOR = DBG
+
# We don't need it and if defined the test breaks
LD_OPTIONS =
Modified: csw/mgar/pkg/gnutls/trunk/checksums
===================================================================
--- csw/mgar/pkg/gnutls/trunk/checksums 2013-05-17 14:57:32 UTC (rev 21135)
+++ csw/mgar/pkg/gnutls/trunk/checksums 2013-05-17 22:02:15 UTC (rev 21136)
@@ -1 +1 @@
-4e1517084018a8b1fdc96daabea40528 gnutls-2.10.4.tar.bz2
+f3c1d34bd5f113395c4be0d5dfc2b7fe gnutls-2.12.23.tar.bz2
Added: csw/mgar/pkg/gnutls/trunk/files/0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/gnutls/trunk/files/0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch (rev 0)
+++ csw/mgar/pkg/gnutls/trunk/files/0002-Use-AF_UNIX-instead-of-AF_LOCAL-on-Solaris.patch 2013-05-17 22:02:15 UTC (rev 21136)
@@ -0,0 +1,31 @@
+From 43971c3e07d4303fa74191facb7c8d07600076f3 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Wed, 15 May 2013 22:56:42 +0200
+Subject: [PATCH] Use AF_UNIX instead of AF_LOCAL on Solaris
+
+---
+ lib/nettle/egd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/nettle/egd.c b/lib/nettle/egd.c
+index b1886d4..690df8c 100644
+--- a/lib/nettle/egd.c
++++ b/lib/nettle/egd.c
+@@ -141,12 +141,12 @@ _rndegd_connect_socket (void)
+ }
+
+ memset (&addr, 0, sizeof addr);
+- addr.sun_family = AF_LOCAL;
++ addr.sun_family = AF_UNIX;
+ strcpy (addr.sun_path, name);
+ addr_len = (offsetof (struct sockaddr_un, sun_path)
+ + strlen (addr.sun_path));
+
+- fd = socket (AF_LOCAL, SOCK_STREAM, 0);
++ fd = socket (AF_UNIX, SOCK_STREAM, 0);
+ if (fd == -1)
+ {
+ _gnutls_debug_log ("can't create unix domain socket: %s\n",
+--
+1.8.1.4
+
Added: csw/mgar/pkg/gnutls/trunk/files/0003-correctly-handle-the-null-key-case.patch
===================================================================
--- csw/mgar/pkg/gnutls/trunk/files/0003-correctly-handle-the-null-key-case.patch (rev 0)
+++ csw/mgar/pkg/gnutls/trunk/files/0003-correctly-handle-the-null-key-case.patch 2013-05-17 22:02:15 UTC (rev 21136)
@@ -0,0 +1,26 @@
+From 3e21ed4cad3df8d433c568cee1f040a7d076b6c3 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Fri, 17 May 2013 23:13:48 +0200
+Subject: [PATCH] correctly handle the null key case
+
+---
+ src/certtool.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/certtool.c b/src/certtool.c
+index 832ca53..a4b97da 100644
+--- a/src/certtool.c
++++ b/src/certtool.c
+@@ -2626,7 +2626,8 @@ print_bag_data (gnutls_pkcs12_bag_t bag)
+ result = gnutls_pkcs12_bag_get_key_id (bag, i, &id);
+ if (result < 0)
+ error (EXIT_FAILURE, 0, "get_key_id: %s", gnutls_strerror (type));
+- fprintf (outfile, "\tKey ID: %s\n", raw_to_string (id.data, id.size));
++ if (id.size > 0)
++ fprintf (outfile, "\tKey ID: %s\n", raw_to_string (id.data, id.size));
+
+ result = gnutls_pkcs12_bag_get_data (bag, i, &cdata);
+ if (result < 0)
+--
+1.8.1.4
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list