libgcrypt: update to 1.8.3

Signed-off-by: W. Michael Petullo <redacted>

diff --git a/libs/libgcrypt/Makefile b/libs/libgcrypt/Makefile
index 6f52546f482e0f94d41ae5a214a06abe4851a167..87ce0c83e728a61aac9e51718b2b7ddf0a3306d8 100644 (file)
--- a/libs/libgcrypt/Makefile
+++ b/libs/libgcrypt/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libgcrypt
-PKG_VERSION:=1.6.6
-PKG_RELEASE:=2
+PKG_VERSION:=1.8.3
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/
-PKG_HASH:=f9461b4619bb78b273a88d468915750d418e89a3ea3b641bab0563a9af4b04d0
+PKG_HASH:=66ec90be036747602f2b48f98312361a9180c97c68a690a5f376fa0f67d0af7c
 PKG_LICENSE:=LGPL-2.1+ GPL-2.0+
 PKG_LICENSE_FILES:=COPYING
 
@@ -47,6 +47,7 @@ CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
        --disable-asm \
+       --disable-doc \
        --with-gpg-error-prefix="$(STAGING_DIR)/usr"
 
 TARGET_CFLAGS += $(FPIC)

diff --git a/libs/libgcrypt/patches/001-no_docs_tests.patch b/libs/libgcrypt/patches/001-no_docs_tests.patch
deleted file mode 100644 (file)
index b5aeacc..0000000
--- a/libs/libgcrypt/patches/001-no_docs_tests.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -u --recursive libgcrypt-1.6.1-vanilla/Makefile.am libgcrypt-1.6.1/Makefile.am
---- libgcrypt-1.6.1-vanilla/Makefile.am        2014-07-18 00:31:21.020329371 -0400
-+++ libgcrypt-1.6.1/Makefile.am        2014-07-18 00:31:49.076314616 -0400
-@@ -25,8 +25,8 @@
- # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
- GITLOG_TO_CHANGELOG=gitlog-to-changelog
- 
--DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
--SUBDIRS =         compat mpi cipher random src doc tests
-+DIST_SUBDIRS = m4 compat mpi cipher random src
-+SUBDIRS =         compat mpi cipher random src
- 
- EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES                   \
-              ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011    \
-diff -u --recursive libgcrypt-1.6.1-vanilla/Makefile.in libgcrypt-1.6.1/Makefile.in
---- libgcrypt-1.6.1-vanilla/Makefile.in        2014-07-18 00:31:21.020329371 -0400
-+++ libgcrypt-1.6.1/Makefile.in        2014-07-18 00:31:54.974311498 -0400
-@@ -331,8 +331,8 @@
- 
- # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
- GITLOG_TO_CHANGELOG = gitlog-to-changelog
--DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
--SUBDIRS = compat mpi cipher random src doc tests
-+DIST_SUBDIRS = m4 compat mpi cipher random src
-+SUBDIRS = compat mpi cipher random src
- EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES                   \
-              ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011    \
-              m4/ChangeLog-2011 cipher/ChangeLog-2011 src/ChangeLog-2011    \

diff --git a/libs/libgcrypt/patches/002-Add-configure-option-enable-build-timestamp.patch b/libs/libgcrypt/patches/002-Add-configure-option-enable-build-timestamp.patch
deleted file mode 100644 (file)
index 49c3991..0000000
--- a/libs/libgcrypt/patches/002-Add-configure-option-enable-build-timestamp.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a785cc3db0c4e8eb8ebbf784b833a40d2c42ec3e Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Tue, 25 Aug 2015 21:11:05 +0200
-Subject: [PATCH] Add configure option --enable-build-timestamp.
-
-* configure.ac (BUILD_TIMESTAMP): Set to "<none>" by default.
---
-
-This is based on
-libgpg-error commit d620005fd1a655d591fccb44639e22ea445e4554
-but changed to be disabled by default.  Check there for some
-background.
-
-Signed-off-by: Werner Koch <wk@gnupg.org>
----
- configure.ac | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 48e217947287..2acfa3630cac 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2272,7 +2272,16 @@ changequote([,])dnl
- BUILD_FILEVERSION="${BUILD_FILEVERSION}mym4_revision_dec"
- AC_SUBST(BUILD_FILEVERSION)
- 
--BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
-+AC_ARG_ENABLE([build-timestamp],
-+  AC_HELP_STRING([--enable-build-timestamp],
-+                 [set an explicit build timestamp for reproducibility.
-+                  (default is the current time in ISO-8601 format)]),
-+     [if test "$enableval" = "yes"; then
-+        BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
-+      else
-+        BUILD_TIMESTAMP="$enableval"
-+      fi],
-+     [BUILD_TIMESTAMP="<none>"])
- AC_SUBST(BUILD_TIMESTAMP)
- AC_DEFINE_UNQUOTED(BUILD_TIMESTAMP, "$BUILD_TIMESTAMP",
-                    [The time this package was configured for a build])
--- 
-2.15.1
-