update freetds, gnutls, libgpg_error

This commit is contained in:
Mark Brand 2015-12-13 10:05:13 +01:00
parent 62906f9c9d
commit 546676a245
4 changed files with 46 additions and 18 deletions

View File

@ -3,8 +3,8 @@
PKG := freetds
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.95.73
$(PKG)_CHECKSUM := ae84e2e78043c6b81addac085945de8553d505fc85f3d4f87f50717d3c3c05bc
$(PKG)_VERSION := 0.95.75
$(PKG)_CHECKSUM := 23cbac96805730f7760256631561f65f88aab3cd4b6d1f5dae53721c79a02f81
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE)

View File

@ -3,32 +3,32 @@ See index.html for further information.
Contains ad hoc patches for cross building.
From 239dc102017197025ef37cda8fa26b3750f18fb9 Mon Sep 17 00:00:00 2001
From: MXE
From a769aa5f4edb5a4a7b6dc36d5d9a889f2249a48f Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 4 Feb 2013 16:11:12 +0100
Subject: [PATCH 1/2] add missing private lib to pc file
Subject: [PATCH 1/3] add missing private lib to pc file
diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
index a25fcdf..3860c68 100644
index f1a4157..9b1ed59 100644
--- a/lib/gnutls.pc.in
+++ b/lib/gnutls.pc.in
@@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system
URL: http://www.gnutls.org/
Version: @VERSION@
Libs: -L${libdir} -lgnutls
-Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
+Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -lcrypt32
-Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
+Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -lcrypt32
@GNUTLS_REQUIRES_PRIVATE@
Cflags: -I${includedir}
--
2.3.2 (Apple Git-55)
2.5.0
From 02e79ee0c18ff148e315c223675370ad11673bf6 Mon Sep 17 00:00:00 2001
From: MXE
From 8afb001057028f6a3c671406c8914540c3b9b6e6 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 24 Nov 2014 08:56:48 +0100
Subject: [PATCH 2/2] windows build fix: ws2tcpip.h supplies inet_ntop
Subject: [PATCH 2/3] windows build fix: ws2tcpip.h supplies inet_ntop
Follow-up to 492c2b937ab66134d0b37499a6f3a747e19bc31a
@ -37,7 +37,7 @@ Signed-off-by: Mark Brand <mabrand@mabrand.nl>
taken from: http://lists.gnutls.org/pipermail/gnutls-devel/2014-November/007250.html
diff --git a/lib/x509/output.c b/lib/x509/output.c
index e82fe84..2e62418 100644
index b126c30..a97d445 100644
--- a/lib/x509/output.c
+++ b/lib/x509/output.c
@@ -34,7 +34,11 @@
@ -54,5 +54,33 @@ index e82fe84..2e62418 100644
#define addf _gnutls_buffer_append_printf
--
2.3.2 (Apple Git-55)
2.5.0
From 46316cbe2097bfebc0681819ae11df4b77a1315d Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Tue, 24 Nov 2015 12:54:32 +0100
Subject: [PATCH 3/3] tools: don't call endservent in windows
diff --git a/src/socket.c b/src/socket.c
index 8991089..be8a4a1 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -33,8 +33,11 @@
#include <stdlib.h>
#include <unistd.h>
#ifndef _WIN32
-#include <arpa/inet.h>
-#include <signal.h>
+# include <arpa/inet.h>
+# include <signal.h>
+#else
+# undef endservent
+# define endservent()
#endif
#include <socket.h>
#include <c-ctype.h>
--
2.5.0

View File

@ -2,8 +2,8 @@
# See index.html for further information.
PKG := gnutls
$(PKG)_VERSION := 3.4.5
$(PKG)_CHECKSUM := af88b8e0460728d034ff3f454f7851a09b7f0959a93531b6f8d35658ef0f7aae
$(PKG)_VERSION := 3.4.7
$(PKG)_CHECKSUM := c1be9e4b30295d7b5f96fa332c6a908e6fa2254377b67811301fca92eb882e5a
$(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION)
$(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.4/$($(PKG)_FILE)

View File

@ -3,8 +3,8 @@
PKG := libgpg_error
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.20
$(PKG)_CHECKSUM := 3266895ce3419a7fb093e63e95e2ee3056c481a9bc0d6df694cfd26f74e72522
$(PKG)_VERSION := 1.21
$(PKG)_CHECKSUM := b7dbdb3cad63a740e9f0c632a1da32d4afdb694ec86c8625c98ea0691713b84d
$(PKG)_SUBDIR := libgpg-error-$($(PKG)_VERSION)
$(PKG)_FILE := libgpg-error-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://mirrors.dotsrc.org/gcrypt/libgpg-error/$($(PKG)_FILE)