required changes to apply on top of osresearch/gpg2 for gpg2 to actually work, tools and libs updated to latest versions

boards/x230/x230.config

@@ -6,7 +6,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config
 CONFIG_CRYPTSETUP=y
 CONFIG_FLASHROM=y
 CONFIG_FLASHTOOLS=y
-CONFIG_GPG=y
+CONFIG_GPG2=y
 CONFIG_KEXEC=y
 CONFIG_UTIL_LINUX=y
 CONFIG_LVM2=y

initrd/.gnupg/gpg-agent.conf

@@ -0,0 +1 @@
+scdaemon-program /bin/scdaemon

modules/gpg2

@@ -1,10 +1,10 @@
 modules-$(CONFIG_GPG2) += gpg2
 
-gpg2_version := 2.2.4
+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 := 401a3e64780fdfa6d7670de0880aa5c9d589b3db7a7098979d7606cec546f2ec
+gpg2_hash := 799dd37a86a1448732e339bd20440f4f5ee6e69755f6fd7a73ee8af30840c915
 
 # For reproducibility reasons we have to override the exec_prefix
 # and datarootdir on the configure line so that the Makefiles will

modules/libgcrypt

@@ -1,9 +1,9 @@
 modules-$(CONFIG_GPG2) += libgcrypt
-libgcrypt_version := 1.8.2
+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 := c8064cae7558144b13ef0eb87093412380efa16c4ee30ad12ecb54886a524c07
+libgcrypt_hash := 66ec90be036747602f2b48f98312361a9180c97c68a690a5f376fa0f67d0af7c
 
 libgcrypt_configure := ./configure \
 	$(CROSS_TOOLS) \

modules/libgpg-error

@@ -1,9 +1,9 @@
 modules-$(CONFIG_GPG2) += libgpg-error
-libgpg-error_version := 1.27
+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 := 4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2
+libgpg-error_hash := c345c5e73cc2332f8d50db84a2280abfb1d8f6d4f1858b9daa30404db44540ca
 
 libgpg-error_configure := ./configure \
 	$(CROSS_TOOLS) \

modules/npth

@@ -1,9 +1,9 @@
 modules-$(CONFIG_GPG2) += npth
-npth_version := 1.5
+npth_version := 1.6
 npth_dir := npth-$(npth_version)
 npth_tar := npth-$(npth_version).tar.bz2
 npth_url := https://gnupg.org/ftp/gcrypt/npth/$(npth_tar)
-npth_hash := 294a690c1f537b92ed829d867bee537e46be93fbd60b16c04630fbbfcd9db3c2
+npth_hash := 1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1
 
 npth_configure := ./configure \
 	$(CROSS_TOOLS) \

modules/pinentry

@@ -22,6 +22,7 @@ pinentry_configure := ./configure \
 	--disable-pinentry-qt5 \
 	--disable-pinentry-fltk \
 	--disable-pinentry-emacs \
+	--disable-fallback-curses \
 	--with-libgpg-error-prefix="$(INSTALL)" \
 	--with-libassuan-prefix="$(INSTALL)" \