diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2021-02-19 23:06:16 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2021-02-19 23:06:16 (GMT) |
| commit | f1a761c5c37c394ab06221ebe1b65488dbf79ca7 (patch) | |
| tree | 17d9585ef4149211f8eaa8e71e742af63441dcf2 | |
| parent | 0ba1caeface6659fa2a7f69064cc353b045d0387 (diff) | |
| download | mxe-f1a761c5c37c394ab06221ebe1b65488dbf79ca7.zip mxe-f1a761c5c37c394ab06221ebe1b65488dbf79ca7.tar.gz mxe-f1a761c5c37c394ab06221ebe1b65488dbf79ca7.tar.bz2 | |
update: libgcrypt, nettle
| -rw-r--r-- | src/libgcrypt-1-fixes.patch | 33 | ||||
| -rw-r--r-- | src/libgcrypt.mk | 4 | ||||
| -rw-r--r-- | src/nettle.mk | 4 |
3 files changed, 7 insertions, 34 deletions
diff --git a/src/libgcrypt-1-fixes.patch b/src/libgcrypt-1-fixes.patch index 75c6f96..80a41be 100644 --- a/src/libgcrypt-1-fixes.patch +++ b/src/libgcrypt-1-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Thu, 4 Dec 2014 15:07:43 +1100 -Subject: [PATCH 1/3] fix for mingw cross building +Subject: [PATCH 1/2] fix for mingw cross building Taken from: https://aur.archlinux.org/packages/mingw-w64-libgcrypt/ @@ -58,36 +58,9 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Saikrishna Arcot <saiarcot895@gmail.com> -Date: Fri, 12 Jun 2015 14:53:55 -0700 -Subject: [PATCH 2/3] Don't call git to determine the revision. - - -diff --git a/configure.ac b/configure.ac -index 1111111..2222222 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -38,13 +38,10 @@ m4_define(mym4_version_micro, [6]) - # processing is done by autoconf and not during the configure run. - m4_define(mym4_version, - [mym4_version_major.mym4_version_minor.mym4_version_micro]) --m4_define([mym4_revision], -- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r'])) -+m4_define([mym4_revision], [4091]) - m4_define([mym4_revision_dec], - m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))])) --m4_define([mym4_betastring], -- m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\ -- awk -F- '$3!=0{print"-beta"$3}'])) -+m4_define([mym4_betastring], []) - m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) - m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" <rjones@redhat.com> Date: Sun, 28 Jun 2015 17:17:25 +0200 -Subject: [PATCH 3/3] configure.ac: no serial-tests if automake < 1.12 +Subject: [PATCH 2/2] configure.ac: no serial-tests if automake < 1.12 Earlier versions of automake complain if they get a configuration parameter which they don't understand. The error is: @@ -103,7 +76,7 @@ diff --git a/configure.ac b/configure.ac index 1111111..2222222 100644 --- a/configure.ac +++ b/configure.ac -@@ -71,7 +71,24 @@ VERSION=$PACKAGE_VERSION +@@ -76,7 +76,24 @@ NEED_GPG_ERROR_VERSION=1.27 AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR([src/libgcrypt.vers]) diff --git a/src/libgcrypt.mk b/src/libgcrypt.mk index cdb1b6f..e54d299 100644 --- a/src/libgcrypt.mk +++ b/src/libgcrypt.mk @@ -3,8 +3,8 @@ PKG := libgcrypt $(PKG)_WEBSITE := https://directory.fsf.org/wiki/Libgcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.7 -$(PKG)_CHECKSUM := 03b70f028299561b7034b8966d7dd77ef16ed139c43440925fe8782561974748 +$(PKG)_VERSION := 1.9.2 +$(PKG)_CHECKSUM := b2c10d091513b271e47177274607b1ffba3d95b188bbfa8797f948aec9053c5a $(PKG)_SUBDIR := libgcrypt-$($(PKG)_VERSION) $(PKG)_FILE := libgcrypt-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://gnupg.org/ftp/gcrypt/libgcrypt/$($(PKG)_FILE) diff --git a/src/nettle.mk b/src/nettle.mk index dc53177..750613f 100644 --- a/src/nettle.mk +++ b/src/nettle.mk @@ -3,8 +3,8 @@ PKG := nettle $(PKG)_WEBSITE := https://www.lysator.liu.se/~nisse/nettle/ $(PKG)_IGNORE := -$(PKG)_VERSION := 3.7 -$(PKG)_CHECKSUM := f001f64eb444bf13dd91bceccbc20acbc60c4311d6e2b20878452eb9a9cec75a +$(PKG)_VERSION := 3.7.1 +$(PKG)_CHECKSUM := 156621427c7b00a75ff9b34b770b95d34f80ef7a55c3407de94b16cbf436c42e $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://www.lysator.liu.se/~nisse/archive/$($(PKG)_FILE) |