From ee1ed3688beb1141b2a6cf73b0374eb6084fc70a Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 2 Mar 2012 22:27:33 +0100 Subject: update package gnutls --- src/gnutls-1-fixes.patch | 40 +++++++++++++++++++++++++++++++++------- src/gnutls.mk | 4 ++-- 2 files changed, 35 insertions(+), 9 deletions(-) --- src/gnutls-1-fixes.patch | 40 +++++++++++++++++++++++++++++++++------- src/gnutls.mk | 4 ++-- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch index c54197f..b8915a1 100644 --- a/src/gnutls-1-fixes.patch +++ b/src/gnutls-1-fixes.patch @@ -3,10 +3,10 @@ See doc/index.html for further information. Contains ad hoc patches for cross building. -From 81a760cf478becfaae88f6a8b2482c1ba1d2e18c Mon Sep 17 00:00:00 2001 +From 19d2c3dbe60872e57b6e897f8a6f66c8b11ca103 Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Fri, 28 Oct 2011 09:23:41 +0200 -Subject: [PATCH 1/2] add missing static library linking +Subject: [PATCH 1/3] add missing static library linking diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in @@ -22,17 +22,17 @@ index c45f8f3..57d0dbb 100644 @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} -- -1.7.9 +1.7.9.2 -From 1991251f013c43bbe3315a567c01d7c071b67192 Mon Sep 17 00:00:00 2001 +From 02fe82f7e712f6be7dd7305501551ac2661ca540 Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Thu, 24 Nov 2011 15:06:06 +0100 -Subject: [PATCH 2/2] disable doc and test (mingw-cross-env specific) +Subject: [PATCH 2/3] disable doc and test (mingw-cross-env specific) diff --git a/Makefile.am b/Makefile.am -index dd4bf17..10cb436 100644 +index 0afe4bd..da7436a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests @@ -45,5 +45,31 @@ index dd4bf17..10cb436 100644 if HAVE_GUILE SUBDIRS += guile -- -1.7.9 +1.7.9.2 + + +From 5f28dc1975988edd7a9527a9e587341cd4cc3101 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Fri, 2 Mar 2012 21:39:39 +0100 +Subject: [PATCH 3/3] no fchmod() for MinGW32 + +taken from +http://lists.gnu.org/archive/html/gnutls-devel/2012-03/msg00005.html + +diff --git a/src/libopts/makeshell.c b/src/libopts/makeshell.c +index 1730c81..45d170b 100644 +--- a/src/libopts/makeshell.c ++++ b/src/libopts/makeshell.c +@@ -164,7 +164,9 @@ optionParseShell(tOptions * pOpts) + printf(SHOW_PROG_ENV, pOpts->pzPROGNAME); + + fflush(stdout); ++#ifndef __MINGW32__ + fchmod(STDOUT_FILENO, 0755); ++#endif + fclose(stdout); + if (ferror(stdout)) { + fputs(zOutputFail, stderr); +-- +1.7.9.2 diff --git a/src/gnutls.mk b/src/gnutls.mk index 0c2113b..5697c72 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -3,8 +3,8 @@ # GnuTLS PKG := gnutls -$(PKG)_VERSION := 3.0.13 -$(PKG)_CHECKSUM := 8271de0f76ee4a35c238309ed4fb8a94bd1ac53b +$(PKG)_VERSION := 3.0.15 +$(PKG)_CHECKSUM := 337ba115ebf2c4bde78e3d182a3bf253400f2f2f $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_WEBSITE := http://www.gnu.org/software/gnutls/ -- cgit v0.12