diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gnutls-1-fixes.patch | 28 | ||||
| -rw-r--r-- | src/gnutls.mk | 2 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch index 965056c..039f94e 100644 --- a/src/gnutls-1-fixes.patch +++ b/src/gnutls-1-fixes.patch @@ -3,7 +3,7 @@ See index.html for further information. Contains ad hoc patches for cross building. -From de80b70d5d0e687d9c07f5ca270bb2ceb93d4dfa Mon Sep 17 00:00:00 2001 +From 887091de2615a1c4dc366240c6b196a0f26210cf Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Fri, 28 Oct 2011 09:23:41 +0200 Subject: [PATCH 1/6] add missing static library linking @@ -25,14 +25,14 @@ index c45f8f3..57d0dbb 100644 1.7.10.4 -From 69da51d8c6b8720503a8b6220baf6a653d3e77b0 Mon Sep 17 00:00:00 2001 +From 8473646fd0cd2727fc807dd82ebdd720d2bfc2ae Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 24 Nov 2011 15:06:06 +0100 Subject: [PATCH 2/6] disable doc and test (mingw-cross-env specific) diff --git a/Makefile.am b/Makefile.am -index 74208b1..c46e900 100644 +index c4a4bfa..78943a7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests @@ -48,7 +48,7 @@ index 74208b1..c46e900 100644 1.7.10.4 -From 50868df9034b6e8ad459363edaca1436794e7212 Mon Sep 17 00:00:00 2001 +From ca3da89b7439af0d3e27db03c8a8a5c4675b6eab Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Tue, 3 Apr 2012 13:58:42 +0200 Subject: [PATCH 3/6] Revert "make dist will also make lzip compressed @@ -57,10 +57,10 @@ Subject: [PATCH 3/6] Revert "make dist will also make lzip compressed This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f. diff --git a/configure.ac b/configure.ac -index 8d337ee..8c0a76e 100644 +index a9fe3c1..c5c0fa4 100644 --- a/configure.ac +++ b/configure.ac -@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.1.3], [bug-gnutls@gnu.org]) +@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.1.5], [bug-gnutls@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) @@ -73,7 +73,7 @@ index 8d337ee..8c0a76e 100644 1.7.10.4 -From 613dff6244621ad8eef5afdf38edc16f90a275a4 Mon Sep 17 00:00:00 2001 +From 9938080f06e10dc1159344599fb5fb64e024b4a5 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Wed, 6 Jun 2012 09:57:24 +0200 Subject: [PATCH 4/6] AM_PROG_AR for automake 1.12 compatibility @@ -82,7 +82,7 @@ Taken from http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html diff --git a/configure.ac b/configure.ac -index 8c0a76e..14e6da2 100644 +index c5c0fa4..c6cb8d3 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,7 @@ dnl Checks for programs. @@ -97,17 +97,17 @@ index 8c0a76e..14e6da2 100644 1.7.10.4 -From 37a6a85032d3ef7bb4ec05c106da01b2354778f4 Mon Sep 17 00:00:00 2001 +From f4e75cb77ca027fc4433f095e82690521262c485 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 16 Aug 2012 11:13:47 +0200 Subject: [PATCH 5/6] allow automake warnings not to be errors diff --git a/configure.ac b/configure.ac -index 14e6da2..0e427ce 100644 +index c6cb8d3..9e03936 100644 --- a/configure.ac +++ b/configure.ac -@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.1.3], [bug-gnutls@gnu.org]) +@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.1.5], [bug-gnutls@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) @@ -120,14 +120,14 @@ index 14e6da2..0e427ce 100644 1.7.10.4 -From a1907c3679fc845ac5b241d25c86fb1106f63f84 Mon Sep 17 00:00:00 2001 +From 70c8cd64f1b4b3cf6d02d3d3f833bf5181db4fe4 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 20 Sep 2012 12:59:19 +0200 Subject: [PATCH 6/6] add missing libs to Libs.private diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in -index 57d0dbb..02a6ef7 100644 +index 57d0dbb..b94179a 100644 --- a/lib/gnutls.pc.in +++ b/lib/gnutls.pc.in @@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system @@ -135,7 +135,7 @@ index 57d0dbb..02a6ef7 100644 Version: @VERSION@ Libs: -L${libdir} -lgnutls -Libs.private: @LTLIBNETTLE@ @LIBS@ -+Libs.private: @LTLIBNETTLE@ @LIBS@ -lcrypt32 -lws2_32 ++Libs.private: @LTLIBNETTLE@ @LIBS@ -liconv -lcrypt32 -lws2_32 @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} -- diff --git a/src/gnutls.mk b/src/gnutls.mk index 049dff4..b496fbb 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -2,7 +2,7 @@ # See index.html for further information. PKG := gnutls -$(PKG)_CHECKSUM := d3531761f2754e81f72428d482c0689f0a5e064f +$(PKG)_CHECKSUM := 93efeab75cad6f656eae1123c10e3692db727bd5 $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnu.org/gnu/gnutls/$($(PKG)_FILE) |