mirror of https://git.wownero.com/dsc/mxe.git
gnutls nettle: update
libgsasl and nettle no longer conflict over memxor, so the workaround is removed.
This commit is contained in:
parent
281429d730
commit
6a00fc305a
|
@ -1,7 +1,7 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
From 9b8bd267588f9c7e15b50bf6f7754837deb8b301 Mon Sep 17 00:00:00 2001
|
||||
From dfe54cbfbcff8b46285819ed38ddb5757d27a716 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Tue, 3 Apr 2012 13:58:42 +0200
|
||||
Subject: [PATCH 1/5] Revert "make dist will also make lzip compressed tarball"
|
||||
|
@ -9,7 +9,7 @@ Subject: [PATCH 1/5] Revert "make dist will also make lzip compressed tarball"
|
|||
This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f.
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3e5b79d..99f3636 100644
|
||||
index 3f7ec24..ef9fd77 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux])
|
||||
|
@ -22,10 +22,10 @@ index 3e5b79d..99f3636 100644
|
|||
AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
--
|
||||
2.1.2
|
||||
2.1.4
|
||||
|
||||
|
||||
From da0afaf172601c7bc434f35a4d02c13811fcaee7 Mon Sep 17 00:00:00 2001
|
||||
From 5dc32c442c74e905a3d5199e658c77b6de44cde1 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Wed, 6 Jun 2012 09:57:24 +0200
|
||||
Subject: [PATCH 2/5] AM_PROG_AR for automake 1.12 compatibility
|
||||
|
@ -34,7 +34,7 @@ Taken from
|
|||
http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 99f3636..8c1b4fd 100644
|
||||
index ef9fd77..7c3436a 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -42,6 +42,7 @@ ggl_EARLY
|
||||
|
@ -46,10 +46,10 @@ index 99f3636..8c1b4fd 100644
|
|||
AC_PROG_YACC
|
||||
AC_PROG_SED
|
||||
--
|
||||
2.1.2
|
||||
2.1.4
|
||||
|
||||
|
||||
From 4a98dd8e1a9c6d2d1f1e190f94582ab259435c84 Mon Sep 17 00:00:00 2001
|
||||
From ab7fa52f69829b65e693723fade982cf372d5f27 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Mon, 4 Feb 2013 16:11:12 +0100
|
||||
Subject: [PATCH 3/5] add missing private lib to pc file
|
||||
|
@ -68,17 +68,17 @@ index a25fcdf..3860c68 100644
|
|||
@GNUTLS_REQUIRES_PRIVATE@
|
||||
Cflags: -I${includedir}
|
||||
--
|
||||
2.1.2
|
||||
2.1.4
|
||||
|
||||
|
||||
From 57ffca60a0d61c4b58e27f6ee7f9b2770b0011b6 Mon Sep 17 00:00:00 2001
|
||||
From a4ef8a481bee4ddd1102138d2e304595c5eb1828 Mon Sep 17 00:00:00 2001
|
||||
From: Tony Theodore <tonyt@logyst.com>
|
||||
Date: Wed, 6 Feb 2013 08:43:43 +0100
|
||||
Subject: [PATCH 4/5] relax automake version check
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 8c1b4fd..efa13e8 100644
|
||||
index 7c3436a..406db3a 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux])
|
||||
|
@ -91,10 +91,10 @@ index 8c1b4fd..efa13e8 100644
|
|||
AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
--
|
||||
2.1.2
|
||||
2.1.4
|
||||
|
||||
|
||||
From e6872f0073970fabe4cc267feebb8bad98756f72 Mon Sep 17 00:00:00 2001
|
||||
From 2314330147f966d2dcd192b73dff822533ccab4e Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Mon, 24 Nov 2014 08:56:48 +0100
|
||||
Subject: [PATCH 5/5] windows build fix: ws2tcpip.h supplies inet_ntop
|
||||
|
@ -106,11 +106,11 @@ 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 bf01834..1ec18de 100644
|
||||
index 5cef68c..96ad795 100644
|
||||
--- a/lib/x509/output.c
|
||||
+++ b/lib/x509/output.c
|
||||
@@ -32,7 +32,11 @@
|
||||
#include <extras/randomart.h>
|
||||
@@ -34,7 +34,11 @@
|
||||
#include <gnutls-idna.h>
|
||||
|
||||
#ifdef HAVE_INET_NTOP
|
||||
-# include <arpa/inet.h>
|
||||
|
@ -123,5 +123,5 @@ index bf01834..1ec18de 100644
|
|||
|
||||
#define addf _gnutls_buffer_append_printf
|
||||
--
|
||||
2.1.2
|
||||
2.1.4
|
||||
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
# See index.html for further information.
|
||||
|
||||
PKG := gnutls
|
||||
$(PKG)_VERSION := 3.3.15
|
||||
$(PKG)_CHECKSUM := d7f66b0aeaf48ff8621cc1913230635ef672f0a4
|
||||
$(PKG)_VERSION := 3.4.2
|
||||
$(PKG)_CHECKSUM := f29b4d763aee89c860aa5c54574778537239da08
|
||||
$(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz
|
||||
$(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.3/$($(PKG)_FILE)
|
||||
$(PKG)_URL_2 := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3//$($(PKG)_FILE)
|
||||
$(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.4/$($(PKG)_FILE)
|
||||
$(PKG)_URL_2 := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4//$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc gettext gmp libgnurx nettle zlib
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
$(WGET) -q -O- ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/ | \
|
||||
$(WGET) -q -O- ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/ | \
|
||||
$(SED) -n 's,.*gnutls-\([1-9]\+\.[0-9]\+.[0-9]\+\)\..*,\1,p' | \
|
||||
$(SORT) -V | \
|
||||
tail -1
|
||||
|
@ -19,7 +19,6 @@ endef
|
|||
|
||||
define $(PKG)_BUILD
|
||||
$(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.am'
|
||||
rm '$(1)/ltmain.sh'
|
||||
cd '$(1)' && autoreconf -fi -I m4 -I gl/m4 -I src/libopts/m4
|
||||
# skip the run test for libregex support since we are cross compiling
|
||||
$(SED) -i 's/libopts_cv_with_libregex=no/libopts_cv_with_libregex=yes/g;' '$(1)/configure'
|
||||
|
|
|
@ -1,37 +0,0 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 1f0955db1bf81de15e1dd04f1fe29f73ef3983c8 Mon Sep 17 00:00:00 2001
|
||||
From: MXE
|
||||
Date: Mon, 7 Nov 2011 18:01:56 +0100
|
||||
Subject: [PATCH] use memxor from nettle
|
||||
|
||||
|
||||
diff --git a/gl/memxor.c b/gl/memxor.c
|
||||
index 7fec454..d9b62cd 100644
|
||||
--- a/gl/memxor.c
|
||||
+++ b/gl/memxor.c
|
||||
@@ -22,7 +22,7 @@
|
||||
#include "memxor.h"
|
||||
|
||||
void *
|
||||
-memxor (void *restrict dest, const void *restrict src, size_t n)
|
||||
+gsasl_memxor (void *restrict dest, const void *restrict src, size_t n)
|
||||
{
|
||||
char const *s = src;
|
||||
char *d = dest;
|
||||
diff --git a/libgsasl.pc.in b/libgsasl.pc.in
|
||||
index b0c477d..d8d8ccc 100644
|
||||
--- a/libgsasl.pc.in
|
||||
+++ b/libgsasl.pc.in
|
||||
@@ -16,4 +16,5 @@ URL: http://www.gnu.org/software/gsasl/
|
||||
Version: @VERSION@
|
||||
Libs: -L${libdir} -lgsasl
|
||||
Libs.private: @LTLIBGCRYPT@ @LTLIBIDN@ @LTLIBNTLM@
|
||||
+Requires: nettle
|
||||
Cflags: -I${includedir}
|
||||
--
|
||||
1.7.7
|
||||
|
|
@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 08fd5dfdd3d88154cf06cb0759a732790c47b4f7
|
|||
$(PKG)_SUBDIR := libgsasl-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := libgsasl-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_URL := http://ftp.gnu.org/gnu/gsasl/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc libiconv libidn libntlm libgcrypt nettle
|
||||
$(PKG)_DEPS := gcc libiconv libidn libntlm libgcrypt
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
$(WGET) -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gsasl.git;a=tags' | \
|
||||
|
@ -24,8 +24,7 @@ define $(PKG)_BUILD
|
|||
--with-libgcrypt \
|
||||
--with-libiconv-prefix='$(PREFIX)/$(TARGET)' \
|
||||
--with-libidn-prefix='$(PREFIX)/$(TARGET)' \
|
||||
--with-libntlm-prefix='$(PREFIX)/$(TARGET)' \
|
||||
LIBS="`$(TARGET)-pkg-config --libs-only-l nettle`"
|
||||
--with-libntlm-prefix='$(PREFIX)/$(TARGET)'
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
|
||||
|
||||
'$(TARGET)-gcc' \
|
||||
|
|
|
@ -0,0 +1,54 @@
|
|||
This file is part of MXE.
|
||||
See index.html for further information.
|
||||
|
||||
From 29cb19fb27ec834473d638fb13a947e0e004116d Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Sun, 12 Apr 2015 10:07:58 +0200
|
||||
Subject: [PATCH] Revert "Include private dependencies automatically in
|
||||
pkg-config for non-shared builds"
|
||||
|
||||
This reverts commit c8b1d2fafff16c57ec50d413c999796ec2085413.
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5a16151..e6cd467 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -803,10 +803,8 @@ fi
|
||||
|
||||
if test "x$enable_shared" = xyes ; then
|
||||
IF_SHARED=''
|
||||
- IF_NOT_SHARED='#'
|
||||
else
|
||||
IF_SHARED='#'
|
||||
- IF_NOT_SHARED=''
|
||||
fi
|
||||
|
||||
# Documentation tools
|
||||
@@ -840,7 +838,6 @@ fi
|
||||
AC_SUBST(IF_HOGWEED)
|
||||
AC_SUBST(IF_STATIC)
|
||||
AC_SUBST(IF_SHARED)
|
||||
-AC_SUBST(IF_NOT_SHARED)
|
||||
AC_SUBST(IF_DOCUMENTATION)
|
||||
AC_SUBST(IF_DLL)
|
||||
AC_SUBST(IF_MINI_GMP)
|
||||
diff --git a/hogweed.pc.in b/hogweed.pc.in
|
||||
index 97fb9d4..839f7d0 100644
|
||||
--- a/hogweed.pc.in
|
||||
+++ b/hogweed.pc.in
|
||||
@@ -11,9 +11,8 @@ Name: Hogweed
|
||||
Description: Nettle low-level cryptographic library (public-key algorithms)
|
||||
URL: http://www.lysator.liu.se/~nisse/nettle
|
||||
Version: @PACKAGE_VERSION@
|
||||
-Requires: @IF_NOT_SHARED@ nettle
|
||||
-Requires.private: @IF_SHARED@ nettle
|
||||
-Libs: -L${libdir} -lhogweed @IF_NOT_SHARED@ @LIBS@
|
||||
-Libs.private: @IF_SHARED@ @LIBS@
|
||||
+Requires.private: nettle
|
||||
+Libs: -L${libdir} -lhogweed
|
||||
+Libs.private: @LIBS@
|
||||
Cflags: -I${includedir}
|
||||
|
||||
--
|
||||
2.1.4
|
||||
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
PKG := nettle
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 2.7
|
||||
$(PKG)_CHECKSUM := e17de3678b987841e88a724b7d2f6856d97ab139
|
||||
$(PKG)_VERSION := 3.1
|
||||
$(PKG)_CHECKSUM := 57ad2aff231ba625c35f77b2bf80d29dfb136ce1
|
||||
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_URL := http://www.lysator.liu.se/~nisse/archive/$($(PKG)_FILE)
|
||||
|
|
Loading…
Reference in New Issue