From 236f9b117cf3fcc7424bbe2d6f38dbc06d7663ca Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Fri, 30 Jun 2023 14:20:23 -0400 Subject: [PATCH] modules/gpg2: Bump version 2.4.0 -> 2.4.2 More pending work needed to fix fragility of buildsystem and fix nix build issues as well like: https://app.circleci.com/pipelines/github/mmlb/osresearch-heads/11/workflows/32cc883c-5074-4f28-94b8-a83a2ec44414/jobs/252 https://app.circleci.com/pipelines/github/mmlb/osresearch-heads/11/workflows/32cc883c-5074-4f28-94b8-a83a2ec44414/jobs/221 https://app.circleci.com/pipelines/github/tlaurion/heads/1781/workflows/ee402ead-6739-4549-88ae-105b695fb3cd https://app.circleci.com/pipelines/github/tlaurion/heads/1783/workflows/2b35826c-aff4-4f48-8809-4e66259f9aa4/jobs/25877/parallel-runs/0/steps/0-103 Signed-off-by: Thierry Laurion Signed-off-by: Manuel Mendez Signed-off-by: Thierry Laurion --- Makefile | 1 + modules/flashrom | 8 ++++++-- modules/gpg2 | 4 ++-- modules/libassuan | 6 +++--- modules/libgcrypt | 6 +++--- modules/libgpg-error | 4 ++-- modules/libksba | 6 +++--- modules/pinentry | 2 +- patches/{gpg2-2.4.0.patch => gpg2-2.4.2.patch} | 0 patches/{libassuan-2.5.5.patch => libassuan-2.5.6.patch} | 0 patches/{libgcrypt-1.8.3.patch => libgcrypt-1.10.2.patch} | 0 .../{libgpg-error-1.46.patch => libgpg-error-1.47.patch} | 0 patches/{libksba-1.6.3.patch => libksba-1.6.4.patch} | 0 13 files changed, 21 insertions(+), 16 deletions(-) rename patches/{gpg2-2.4.0.patch => gpg2-2.4.2.patch} (100%) rename patches/{libassuan-2.5.5.patch => libassuan-2.5.6.patch} (100%) rename patches/{libgcrypt-1.8.3.patch => libgcrypt-1.10.2.patch} (100%) rename patches/{libgpg-error-1.46.patch => libgpg-error-1.47.patch} (100%) rename patches/{libksba-1.6.3.patch => libksba-1.6.4.patch} (100%) diff --git a/Makefile b/Makefile index 4f113d9c..84f5af11 100644 --- a/Makefile +++ b/Makefile @@ -162,6 +162,7 @@ heads_cc := $(CROSS)gcc \ -fdebug-prefix-map=$(pwd)=heads \ -gno-record-gcc-switches \ -D__MUSL__ \ + --sysroot $(INSTALL) \ -isystem $(INSTALL)/include \ -L$(INSTALL)/lib \ diff --git a/modules/flashrom b/modules/flashrom index c7ce3e94..52db5ec6 100644 --- a/modules/flashrom +++ b/modules/flashrom @@ -27,10 +27,14 @@ ifeq "$(CONFIG_FLASHROM_AST1100)" "y" flashrom_cfg += CONFIG_AST1100=yes endif - - flashrom_target := \ $(MAKE_JOBS) \ + CFLAGS="-Os -I$(INSTALL)/include/pci" \ + DESTDIR="$(INSTALL)" \ + INSTALL="$(INSTALL)" \ + LDFLAGS="-L$(INSTALL)/lib" \ + LIBS_BASE="$(INSTALL)" \ + PREFIX="$(INSTALL)" \ $(CROSS_TOOLS) \ $(flashrom_cfg) \ flashrom diff --git a/modules/gpg2 b/modules/gpg2 index b121febc..fe340c4f 100644 --- a/modules/gpg2 +++ b/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 gpg2_depends := libgpg-error libgcrypt libksba libassuan npth libusb $(musl_dep) # For reproducibility reasons we have to override the exec_prefix diff --git a/modules/libassuan b/modules/libassuan index e641854f..7143534d 100644 --- a/modules/libassuan +++ b/modules/libassuan @@ -1,10 +1,10 @@ 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" \ @@ -14,7 +14,7 @@ libassuan_configure := \ --prefix "/" \ --disable-doc \ --disable-static \ - --with-gpg-error-prefix="$(INSTALL)" \ + --with-libgpg-error-prefix="$(INSTALL)" \ libassuan_target := $(MAKE_JOBS) \ DESTDIR="$(INSTALL)" \ diff --git a/modules/libgcrypt b/modules/libgcrypt index a3ece058..2b630c02 100644 --- a/modules/libgcrypt +++ b/modules/libgcrypt @@ -1,10 +1,10 @@ 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) \ @@ -14,7 +14,7 @@ libgcrypt_configure := \ --prefix "/" \ --disable-doc \ --disable-static \ - --with-gpg-error-prefix="$(INSTALL)" \ + --with-libgpg-error-prefix="$(INSTALL)" \ libgcrypt_target := $(MAKE_JOBS) \ DESTDIR="$(INSTALL)" \ diff --git a/modules/libgpg-error b/modules/libgpg-error index 0c855356..b24c9f74 100644 --- a/modules/libgpg-error +++ b/modules/libgpg-error @@ -1,10 +1,10 @@ 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) \ diff --git a/modules/libksba b/modules/libksba index 7230237a..99c22678 100644 --- a/modules/libksba +++ b/modules/libksba @@ -1,10 +1,10 @@ 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) \ @@ -13,7 +13,7 @@ libksba_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)" \ diff --git a/modules/pinentry b/modules/pinentry index 239c6b75..86ab96b6 100644 --- a/modules/pinentry +++ b/modules/pinentry @@ -29,8 +29,8 @@ pinentry_configure := \ --disable-pinentry-qt \ --disable-pinentry-qt5 \ --enable-pinentry-tty \ - --with-gpg-error-prefix="$(INSTALL)" \ --with-libassuan-prefix="$(INSTALL)" \ + --with-libgpg-error-prefix="$(INSTALL)" \ # Run one build to generate the executables with the pre-defined # exec_prefix and datarootdir, then a second make to install the binaries diff --git a/patches/gpg2-2.4.0.patch b/patches/gpg2-2.4.2.patch similarity index 100% rename from patches/gpg2-2.4.0.patch rename to patches/gpg2-2.4.2.patch diff --git a/patches/libassuan-2.5.5.patch b/patches/libassuan-2.5.6.patch similarity index 100% rename from patches/libassuan-2.5.5.patch rename to patches/libassuan-2.5.6.patch diff --git a/patches/libgcrypt-1.8.3.patch b/patches/libgcrypt-1.10.2.patch similarity index 100% rename from patches/libgcrypt-1.8.3.patch rename to patches/libgcrypt-1.10.2.patch diff --git a/patches/libgpg-error-1.46.patch b/patches/libgpg-error-1.47.patch similarity index 100% rename from patches/libgpg-error-1.46.patch rename to patches/libgpg-error-1.47.patch diff --git a/patches/libksba-1.6.3.patch b/patches/libksba-1.6.4.patch similarity index 100% rename from patches/libksba-1.6.3.patch rename to patches/libksba-1.6.4.patch