WiP : staging gpg stack version bump (2.4.0 -> 2.4.2) and some other …

…changes

otherwise yubiky don't work

(And having weird issues on qemu tests vs hardware here...)
Have librem key nitrokey pro nitrokey storage and nitrokey 3 mini... And only Nitrokey storage works once in a while otherwise
can't set config #1, error -32

lsusb sees all proper devices, but gpg --card-status fails on all but storage

modules/gpg2

@@ -1,10 +1,10 @@
 modules-$(CONFIG_GPG2) += gpg2
 
-gpg2_version := 2.4.0
+gpg2_version := 2.4.2
 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 := 1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483
+gpg2_hash := 97eb47df8ae5a3ff744f868005a090da5ab45cb48ee9836dbf5ee739a4e5cf49
 
 # For reproducibility reasons we have to override the exec_prefix
 # and datarootdir on the configure line so that the Makefiles will
@@ -18,7 +18,7 @@ gpg2_configure := \
 	CPPFLAGS="-I$(INSTALL)/include/libusb-1.0" \
 	--host $(MUSL_ARCH)-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)" \
@@ -29,13 +29,11 @@ gpg2_configure := \
 	--enable-ccid-driver \
 	--disable-tofu \
 	--disable-rpath \
-        --disable-regex \
-        --disable-doc \
+    --disable-doc \
 	--disable-bzip2 \
 	--disable-exec \
 	--disable-photo-viewers \
 	--disable-ldap \
-	--disable-regex \
 	--disable-nls \
 	--disable-all-tests \
 	--disable-wks-tools \

modules/libassuan

@@ -1,20 +1,19 @@
 modules-$(CONFIG_GPG2) += libassuan
 
-libassuan_version := 2.5.5
+libassuan_version := 2.5.6
 libassuan_dir := libassuan-$(libassuan_version)
 libassuan_tar := libassuan-$(libassuan_version).tar.bz2
 libassuan_url := https://gnupg.org/ftp/gcrypt/libassuan/$(libassuan_tar)
-libassuan_hash := 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4
+libassuan_hash := e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426
 
 libassuan_configure := \
-	CFLAGS="-Os" \
 	$(CROSS_TOOLS) \
 	./configure \
 	--host $(MUSL_ARCH)-linux-musl \
 	--prefix "/" \
 	--disable-static \
 	--disable-doc \
-	--with-gpg-error-prefix="$(INSTALL)" \
+	--with-libgpg-error-prefix="$(INSTALL)" \
 
 libassuan_target := $(MAKE_JOBS) \
 	DESTDIR="$(INSTALL)" \

modules/libgcrypt

@@ -1,19 +1,18 @@
 modules-$(CONFIG_GPG2) += libgcrypt
 
-libgcrypt_version := 1.10.1
+libgcrypt_version := 1.10.2
 libgcrypt_dir := libgcrypt-$(libgcrypt_version)
 libgcrypt_tar := libgcrypt-$(libgcrypt_version).tar.bz2
 libgcrypt_url := https://gnupg.org/ftp/gcrypt/libgcrypt/$(libgcrypt_tar)
-libgcrypt_hash := ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de
+libgcrypt_hash := 3b9c02a004b68c256add99701de00b383accccf37177e0d6c58289664cce0c03
 
 libgcrypt_configure := \
 	$(CROSS_TOOLS) \
-	CFLAGS="-Os"  \
 	./configure \
 	--host=$(MUSL_ARCH)-linux-musl \
 	--prefix "/" \
 	--disable-static \
-	--with-gpg-error-prefix="$(INSTALL)" \
+	--with-libgpg-error-prefix="$(INSTALL)" \
 	--disable-asm \
 	--disable-doc \
 

modules/libgpg-error

@@ -1,14 +1,13 @@
 modules-$(CONFIG_GPG2) += libgpg-error
 
-libgpg-error_version := 1.46
+libgpg-error_version := 1.47
 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 := b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d
+libgpg-error_hash := 9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb
 
 libgpg-error_configure := \
 	$(CROSS_TOOLS) \
-	CFLAGS="-Os"  \
 	./configure \
 	--prefix "/" \
 	--host=$(MUSL_ARCH)-linux-musl \

modules/libksba

@@ -1,19 +1,18 @@
 modules-$(CONFIG_GPG2) += libksba
 
-libksba_version := 1.6.3
+libksba_version := 1.6.4
 libksba_dir := libksba-$(libksba_version)
 libksba_tar := libksba-$(libksba_version).tar.bz2
 libksba_url := https://gnupg.org/ftp/gcrypt/libksba/$(libksba_tar)
-libksba_hash := 3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c
+libksba_hash := bbb43f032b9164d86c781ffe42213a83bf4f2fee91455edfa4654521b8b03b6b
 
 libksba_configure := \
 	$(CROSS_TOOLS) \
-	CFLAGS="-Os" \
 	./configure \
 	--host $(MUSL_ARCH)-linux-musl \
 	--prefix "/" \
 	--disable-static \
-	--with-gpg-error-prefix="$(INSTALL)" \
+	--with-libgpg-error-prefix="$(INSTALL)" \
 
 libksba_target := $(MAKE_JOBS) \
 	DESTDIR="$(INSTALL)" \

modules/libusb

@@ -10,13 +10,11 @@ libusb_url := https://github.com/libusb/libusb/releases/download/v$(libusb_versi
 libusb_hash := 7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b
 
 libusb_configure := \
-	CFLAGS="-Os" \
 	./configure \
 	$(CROSS_TOOLS)\
 	--host $(MUSL_ARCH)-elf-linux\
 	--prefix "/"\
 	--disable-udev\
-	--disable-tests\
 
 # Run one build to generate the executables with the pre-defined
 # exec_prefix and datarootdir, then a second make to install the binaries

modules/pinentry

@@ -15,7 +15,6 @@ pinentry_hash := 68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f5657
 # location.
 pinentry_configure := \
 	$(CROSS_TOOLS) \
-	CFLAGS="-Os" \
 	./configure \
 	--host $(MUSL_ARCH)-linux-musl \
 	--prefix "/" \
@@ -30,7 +29,7 @@ pinentry_configure := \
 	--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