From 5cb45bbc9906aeef6e0d1f78eced0b00d31ad8b1 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Tue, 7 Jul 2020 17:03:48 -0500 Subject: [PATCH] Revert "upgrade gpg toolstack to latest versions" This reverts commit 972c25de7df9cf797fd211bc795fe057462a6432. This commit broke OEM factory reset functionality, so revert it until the issue can be properly diagnosed. Signed-off-by: Matt DeVillier --- modules/gpg2 | 13 ++++++++++--- modules/libassuan | 8 +++++--- modules/libgcrypt | 6 +++--- modules/libgpg-error | 5 +++-- modules/libksba | 4 +++- modules/npth | 4 +++- modules/pinentry | 3 +-- 7 files changed, 28 insertions(+), 15 deletions(-) diff --git a/modules/gpg2 b/modules/gpg2 index 060998992..318a4cd11 100644 --- a/modules/gpg2 +++ b/modules/gpg2 @@ -1,10 +1,10 @@ modules-$(CONFIG_GPG2) += gpg2 -gpg2_version := 2.2.20 +gpg2_version := 2.2.10 gpg2_dir := gnupg-$(gpg2_version) gpg2_tar := gnupg-$(gpg2_version).tar.bz2 gpg2_url := https://www.gnupg.org/ftp/gcrypt/gnupg/$(gpg2_tar) -gpg2_hash := 04a7c9d48b74c399168ee8270e548588ddbe52218c337703d7f06373d326ca30 +gpg2_hash := 799dd37a86a1448732e339bd20440f4f5ee6e69755f6fd7a73ee8af30840c915 # For reproducibility reasons we have to override the exec_prefix # and datarootdir on the configure line so that the Makefiles will @@ -16,7 +16,7 @@ gpg2_configure := ./configure \ CPPFLAGS="-I$(INSTALL)/include/libusb-1.0" \ --host x86_64-linux-musl \ --with-libusb="$(INSTALL)" \ - --with-gpg-error-prefix="$(INSTALL)" \ + --with-libgpg-error-prefix="$(INSTALL)" \ --with-libgcrypt-prefix="$(INSTALL)" \ --with-libassuan-prefix="$(INSTALL)" \ --with-ksba-prefix="$(INSTALL)" \ @@ -30,12 +30,19 @@ gpg2_configure := ./configure \ --disable-regex \ --disable-doc \ --disable-bzip2 \ + --disable-asm \ --disable-exec \ --disable-photo-viewers \ + --disable-keyserver-helpers \ --disable-ldap \ + --disable-hkp \ + --disable-finger \ + --disable-dns-srv \ + --disable-dns-cert \ --disable-regex \ --disable-nls \ --disable-all-tests \ + --disable-wks-server \ --disable-wks-tools \ --disable-gnutls \ --disable-dirmngr \ diff --git a/modules/libassuan b/modules/libassuan index 800993404..3c4e319aa 100644 --- a/modules/libassuan +++ b/modules/libassuan @@ -1,16 +1,18 @@ modules-$(CONFIG_GPG2) += libassuan -libassuan_version := 2.5.3 +libassuan_version := 2.5.1 libassuan_dir := libassuan-$(libassuan_version) libassuan_tar := libassuan-$(libassuan_version).tar.bz2 libassuan_url := https://gnupg.org/ftp/gcrypt/libassuan/$(libassuan_tar) -libassuan_hash := 91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702 +libassuan_hash := 47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449 libassuan_configure := ./configure \ $(CROSS_TOOLS) \ --host x86_64-linux-musl \ --prefix "/" \ --disable-static \ - --with-gpg-error-prefix="$(INSTALL)" \ + --disable-nls \ + --with-libgpg-error-prefix="$(INSTALL)" \ + --disable-asm \ libassuan_target := $(MAKE_JOBS) \ DESTDIR="$(INSTALL)" \ diff --git a/modules/libgcrypt b/modules/libgcrypt index 602995498..1ba82fceb 100644 --- a/modules/libgcrypt +++ b/modules/libgcrypt @@ -1,16 +1,16 @@ modules-$(CONFIG_GPG2) += libgcrypt -libgcrypt_version := 1.8.5 +libgcrypt_version := 1.8.3 libgcrypt_dir := libgcrypt-$(libgcrypt_version) libgcrypt_tar := libgcrypt-$(libgcrypt_version).tar.bz2 libgcrypt_url := https://gnupg.org/ftp/gcrypt/libgcrypt/$(libgcrypt_tar) -libgcrypt_hash := 3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3 +libgcrypt_hash := 66ec90be036747602f2b48f98312361a9180c97c68a690a5f376fa0f67d0af7c libgcrypt_configure := ./configure \ $(CROSS_TOOLS) \ --host=x86_64-linux-musl \ --prefix "/" \ --disable-static \ - --with-gpg-error-prefix="$(INSTALL)" \ + --with-libgpg-error-prefix="$(INSTALL)" \ --disable-asm \ libgcrypt_target := $(MAKE_JOBS) \ diff --git a/modules/libgpg-error b/modules/libgpg-error index 00bd06440..752e11aad 100644 --- a/modules/libgpg-error +++ b/modules/libgpg-error @@ -1,9 +1,9 @@ modules-$(CONFIG_GPG2) += libgpg-error -libgpg-error_version := 1.37 +libgpg-error_version := 1.32 libgpg-error_dir := libgpg-error-$(libgpg-error_version) libgpg-error_tar := libgpg-error-$(libgpg-error_version).tar.bz2 libgpg-error_url := https://gnupg.org/ftp/gcrypt/libgpg-error/$(libgpg-error_tar) -libgpg-error_hash := b32d6ff72a73cf79797f7f2d039e95e9c6f92f0c1450215410840ab62aea9763 +libgpg-error_hash := c345c5e73cc2332f8d50db84a2280abfb1d8f6d4f1858b9daa30404db44540ca libgpg-error_configure := ./configure \ $(CROSS_TOOLS) \ @@ -14,6 +14,7 @@ libgpg-error_configure := ./configure \ --disable-languages \ --disable-doc \ --disable-tests \ + --disable-asm \ libgpg-error_target := $(MAKE_JOBS) \ DESTDIR="$(INSTALL)" \ diff --git a/modules/libksba b/modules/libksba index 587280ed9..d35291338 100644 --- a/modules/libksba +++ b/modules/libksba @@ -10,7 +10,9 @@ libksba_configure := ./configure \ --host x86_64-linux-musl \ --prefix "/" \ --disable-static \ - --with-gpg-error-prefix="$(INSTALL)" \ + --disable-nls \ + --with-libgpg-error-prefix="$(INSTALL)" \ + --disable-asm \ libksba_target := $(MAKE_JOBS) \ DESTDIR="$(INSTALL)" \ diff --git a/modules/npth b/modules/npth index 2128e1d4a..e0f30c69e 100644 --- a/modules/npth +++ b/modules/npth @@ -10,7 +10,9 @@ npth_configure := ./configure \ --host x86_64-linux-musl \ --prefix "/" \ --disable-static \ - --with-gpg-error-prefix="$(INSTALL)" \ + --disable-nls \ + --with-libgpg-error-prefix="$(INSTALL)" \ + --disable-asm \ npth_target := $(MAKE_JOBS) \ DESTDIR="$(INSTALL)" \ diff --git a/modules/pinentry b/modules/pinentry index 54d40e119..c0e93d7fa 100644 --- a/modules/pinentry +++ b/modules/pinentry @@ -27,8 +27,7 @@ pinentry_configure := ./configure \ --disable-pinentry-fltk \ --disable-pinentry-emacs \ --disable-fallback-curses \ - --disable-pinentry-qt5 \ - --with-gpg-error-prefix="$(INSTALL)" \ + --with-libgpg-error-prefix="$(INSTALL)" \ --with-libassuan-prefix="$(INSTALL)" \ # Run one build to generate the executables with the pre-defined