From 080d842693cad0a16989c9db0cce4ca17fdff320 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 20 Sep 2021 11:22:13 +0200 Subject: gnupg2: update and all deps --- package/gnupg2/Makefile | 11 +++-- package/gnupg2/patches/patch-Makefile_in | 23 --------- package/libassuan/Makefile | 4 +- package/libgcrypt/Makefile | 5 +- package/libgcrypt/patches/patch-cipher_Makefile_am | 11 +++++ package/libgcrypt/patches/patch-cipher_Makefile_in | 11 +++++ package/libgpg-error/Makefile | 4 +- ...gression-on-arm64-due-to-invalid-use-of-v.patch | 56 ---------------------- package/libgpg-error/patches/patch-configure | 31 ------------ .../libgpg-error/patches/patch-src_gen-lock-obj_sh | 11 +++++ package/libksba/Makefile | 4 +- package/pinentry/Makefile | 26 ++++++++++ 12 files changed, 75 insertions(+), 122 deletions(-) delete mode 100644 package/gnupg2/patches/patch-Makefile_in create mode 100644 package/libgcrypt/patches/patch-cipher_Makefile_am create mode 100644 package/libgcrypt/patches/patch-cipher_Makefile_in delete mode 100644 package/libgpg-error/patches/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch delete mode 100644 package/libgpg-error/patches/patch-configure create mode 100644 package/libgpg-error/patches/patch-src_gen-lock-obj_sh create mode 100644 package/pinentry/Makefile diff --git a/package/gnupg2/Makefile b/package/gnupg2/Makefile index de1b8f03b..b0ffa5f49 100644 --- a/package/gnupg2/Makefile +++ b/package/gnupg2/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gnupg2 -PKG_VERSION:= 2.2.7 +PKG_VERSION:= 2.3.2 PKG_RELEASE:= 1 -PKG_HASH:= d95b361ee6ef7eff86af40c8c72bf9313736ac9f7010d6604d78bf83818e976e +PKG_HASH:= e1d953e0e296072fca284215103ef168885eaac596c4660c5039a36a83e3041b PKG_DESCR:= gnu privacy guard (modern) PKG_SECTION:= app/crypto PKG_DEPENDS:= libreadline libncurses libgcrypt libgpg-error libassuan -PKG_DEPENDS+= libksba npth +PKG_DEPENDS+= libksba npth pinentry PKG_BUILDDEP:= readline ncurses libgcrypt libgpg-error libassuan PKG_BUILDDEP+= libksba npth PKG_NEEDS:= iconv @@ -35,7 +35,9 @@ CONFIGURE_ARGS+= --disable-dirmngr \ --disable-exec \ --disable-ldap \ --disable-rpath \ - --disable-regex + --disable-regex \ + --disable-tests \ + --disable-doc gpgv2-install: $(INSTALL_DIR) $(IDIR_GPGV2)/usr/bin @@ -45,6 +47,7 @@ gpgv2-install: gnupg2-install: $(INSTALL_DIR) $(IDIR_GNUPG2)/usr/bin/ $(INSTALL_BIN) $(WRKBUILD)/g10/gpg $(IDIR_GNUPG2)/usr/bin/ + $(INSTALL_BIN) $(WRKBUILD)/agent/gpg-agent $(IDIR_GNUPG2)/usr/bin/ # we need root privileges for secure memory (locked pages) chmod u+s $(IDIR_GNUPG2)/usr/bin/gpg diff --git a/package/gnupg2/patches/patch-Makefile_in b/package/gnupg2/patches/patch-Makefile_in deleted file mode 100644 index 54361aff9..000000000 --- a/package/gnupg2/patches/patch-Makefile_in +++ /dev/null @@ -1,23 +0,0 @@ ---- gnupg-2.2.0.orig/Makefile.in 2017-08-28 11:21:34.000000000 +0200 -+++ gnupg-2.2.0/Makefile.in 2017-09-06 19:20:04.560251562 +0200 -@@ -220,8 +220,7 @@ am__define_uniq_tagged_files = \ - ETAGS = etags - CTAGS = ctags - CSCOPE = cscope --DIST_SUBDIRS = m4 common kbx g10 sm agent scd g13 dirmngr tools po doc \ -- tests -+DIST_SUBDIRS = m4 common kbx g10 agent scd g13 dirmngr tools - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) -@@ -492,8 +491,8 @@ DISTCLEANFILES = g10defs.h - @BUILD_DOC_FALSE@doc = - @BUILD_DOC_TRUE@doc = doc - SUBDIRS = m4 common kbx \ -- ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \ -- tools po ${doc} tests -+ ${gpg} ${agent} ${scd} ${g13} ${dirmngr} \ -+ tools - - dist_doc_DATA = README - gen_start_date = 2011-12-01T06:00:00 diff --git a/package/libassuan/Makefile b/package/libassuan/Makefile index bb4249565..b46b31ad2 100644 --- a/package/libassuan/Makefile +++ b/package/libassuan/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libassuan -PKG_VERSION:= 2.5.1 +PKG_VERSION:= 2.5.5 PKG_RELEASE:= 1 -PKG_HASH:= 47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449 +PKG_HASH:= 8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4 PKG_DESCR:= implementation of assuan protocol PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgpg-error diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index 7d9bd2de9..622eee62e 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libgcrypt -PKG_VERSION:= 1.8.2 +PKG_VERSION:= 1.9.4 PKG_RELEASE:= 1 -PKG_HASH:= c8064cae7558144b13ef0eb87093412380efa16c4ee30ad12ecb54886a524c07 +PKG_HASH:= ea849c83a72454e3ed4267697e8ca03390aee972ab421e7df69dfe42b65caaf7 PKG_DESCR:= crypto library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgpg-error @@ -22,6 +22,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBGCRYPT,libgcrypt,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) CONFIGURE_ARGS+= --disable-asm \ + --disable-doc \ --with-gpg-error-prefix="$(STAGING_TARGET_DIR)/usr" libgcrypt-install: diff --git a/package/libgcrypt/patches/patch-cipher_Makefile_am b/package/libgcrypt/patches/patch-cipher_Makefile_am new file mode 100644 index 000000000..ce89bc118 --- /dev/null +++ b/package/libgcrypt/patches/patch-cipher_Makefile_am @@ -0,0 +1,11 @@ +--- libgcrypt-1.9.4.orig/cipher/Makefile.am 2021-08-22 13:55:28.000000000 +0200 ++++ libgcrypt-1.9.4/cipher/Makefile.am 2021-09-20 10:05:44.047879135 +0200 +@@ -146,7 +146,7 @@ gost-sb.h: gost-s-box + + gost-s-box: gost-s-box.c + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ +- $(CPPFLAGS_FOR_BUILD)-o $@ $(srcdir)/gost-s-box.c ++ $(CPPFLAGS_FOR_BUILD) -o $@ $(srcdir)/gost-s-box.c + + + if ENABLE_O_FLAG_MUNGING diff --git a/package/libgcrypt/patches/patch-cipher_Makefile_in b/package/libgcrypt/patches/patch-cipher_Makefile_in new file mode 100644 index 000000000..1f5d7f272 --- /dev/null +++ b/package/libgcrypt/patches/patch-cipher_Makefile_in @@ -0,0 +1,11 @@ +--- libgcrypt-1.9.4.orig/cipher/Makefile.in 2021-08-22 18:00:24.000000000 +0200 ++++ libgcrypt-1.9.4/cipher/Makefile.in 2021-09-20 10:06:00.483879720 +0200 +@@ -1370,7 +1370,7 @@ gost-sb.h: gost-s-box + + gost-s-box: gost-s-box.c + $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ +- $(CPPFLAGS_FOR_BUILD)-o $@ $(srcdir)/gost-s-box.c ++ $(CPPFLAGS_FOR_BUILD) -o $@ $(srcdir)/gost-s-box.c + + # We need to lower the optimization for this module. + tiger.o: $(srcdir)/tiger.c Makefile diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index 418efe7c5..4c43978b9 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libgpg-error -PKG_VERSION:= 1.28 +PKG_VERSION:= 1.42 PKG_RELEASE:= 1 -PKG_HASH:= 3edb957744905412f30de3e25da18682cbe509541e18cd3b8f9df695a075da49 +PKG_HASH:= fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23 PKG_DESCR:= helper library for common error codes and descriptions PKG_SECTION:= libs/misc PKG_URL:= http://www.gnupg.org/ diff --git a/package/libgpg-error/patches/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch b/package/libgpg-error/patches/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch deleted file mode 100644 index 3abf3ab49..000000000 --- a/package/libgpg-error/patches/0001-core-Fix-regression-on-arm64-due-to-invalid-use-of-v.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 791177de023574223eddf7288eb7c5a0721ac623 Mon Sep 17 00:00:00 2001 -From: Werner Koch -Date: Sun, 18 Mar 2018 17:39:43 +0100 -Subject: [PATCH] core: Fix regression on arm64 due to invalid use of va_list. - -* src/logging.c (_gpgrt_log_printhex): Provide a dummy arg instead of -NULL. --- - -Fix -Suggested-by: Jakub Wilk - -Signed-off-by: Werner Koch ---- - src/logging.c | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/src/logging.c b/src/logging.c -index 1a4f620..d01f974 100644 ---- a/src/logging.c -+++ b/src/logging.c -@@ -1090,9 +1090,10 @@ _gpgrt_log_flush (void) - - - /* Print a hexdump of (BUFFER,LENGTH). With FMT passed as NULL print -- * just the raw dump, with FMT being an empty string, print a trailing -- * linefeed, otherwise print an entire debug line with the expanded -- * FMT followed by a possible wrapped hexdump and a final LF. */ -+ * just the raw dump (in this case ARG_PTR is not used), with FMT -+ * being an empty string, print a trailing linefeed, otherwise print -+ * an entire debug line with the expanded FMT followed by a possible -+ * wrapped hexdump and a final LF. */ - void - _gpgrt_logv_printhex (const void *buffer, size_t length, - const char *fmt, va_list arg_ptr) -@@ -1150,7 +1151,16 @@ _gpgrt_log_printhex (const void *buffer, size_t length, - va_end (arg_ptr); - } - else -- _gpgrt_logv_printhex (buffer, length, NULL, NULL); -+ { -+ /* va_list is not necessary a pointer and thus we can't use NULL -+ * because that would conflict with platforms using a straight -+ * struct for it (e.g. arm64). We use a dummy variable instead; -+ * the static is a simple way zero it out so to not get -+ * complains about uninitialized use. */ -+ static va_list dummy_argptr; -+ -+ _gpgrt_logv_printhex (buffer, length, NULL, dummy_argptr); -+ } - } - - --- -2.16.2 - diff --git a/package/libgpg-error/patches/patch-configure b/package/libgpg-error/patches/patch-configure deleted file mode 100644 index ef5027984..000000000 --- a/package/libgpg-error/patches/patch-configure +++ /dev/null @@ -1,31 +0,0 @@ ---- libgpg-error-1.12.orig/configure 2013-06-24 06:42:28.000000000 +0200 -+++ libgpg-error-1.12/configure 2015-11-08 11:40:16.360212436 +0100 -@@ -670,6 +670,7 @@ MSGFMT - GETTEXT_MACRO_VERSION - USE_NLS - CC_FOR_BUILD -+CFLAGS_FOR_BUILD - RC - OTOOL64 - OTOOL -@@ -814,7 +815,8 @@ LDFLAGS - LIBS - CPPFLAGS - CPP --CC_FOR_BUILD' -+CC_FOR_BUILD -+CFLAGS_FOR_BUILD' - - - # Initialize some variables set by options. -@@ -12259,8 +12261,10 @@ CFLAGS=$lt_save_CFLAGS - $as_echo_n "checking for cc for build... " >&6; } - if test "$cross_compiling" = "yes"; then - CC_FOR_BUILD="${CC_FOR_BUILD-cc}" -+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD}" - else - CC_FOR_BUILD="${CC_FOR_BUILD-$CC}" -+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-$CFLAGS}" - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5 - $as_echo "$CC_FOR_BUILD" >&6; } diff --git a/package/libgpg-error/patches/patch-src_gen-lock-obj_sh b/package/libgpg-error/patches/patch-src_gen-lock-obj_sh new file mode 100644 index 000000000..04961a5ff --- /dev/null +++ b/package/libgpg-error/patches/patch-src_gen-lock-obj_sh @@ -0,0 +1,11 @@ +--- libgpg-error-1.42.orig/src/gen-lock-obj.sh 2021-03-04 11:05:29.000000000 +0100 ++++ libgpg-error-1.42/src/gen-lock-obj.sh 2021-09-17 16:43:42.304505465 +0200 +@@ -38,7 +38,7 @@ + # AWK=gawk ./gen-lock-obj.sh + # + +-if test -n `echo -n`; then ++if test -n "`echo -n`"; then + ECHO_C='\c' + ECHO_N='' + else diff --git a/package/libksba/Makefile b/package/libksba/Makefile index c2c474bdc..0f95fb5d7 100644 --- a/package/libksba/Makefile +++ b/package/libksba/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libksba -PKG_VERSION:= 1.3.5 +PKG_VERSION:= 1.6.0 PKG_RELEASE:= 1 -PKG_HASH:= 41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340 +PKG_HASH:= dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b PKG_DESCR:= working with X.509 certificates PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgpg-error diff --git a/package/pinentry/Makefile b/package/pinentry/Makefile new file mode 100644 index 000000000..90deed445 --- /dev/null +++ b/package/pinentry/Makefile @@ -0,0 +1,26 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= pinentry +PKG_VERSION:= 1.2.0 +PKG_RELEASE:= 1 +PKG_HASH:= e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 +PKG_DESCR:= pinentry application +PKG_SECTION:= app/crypto +PKG_URL:= https://www.gnupg.org +PKG_SITES:= https://www.gnupg.org/ftp/gcrypt/pinentry/ + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,PINENTRY,pinentry,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +pinentry-install: + $(INSTALL_DIR) $(IDIR_PINENTRY)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/pinentry \ + $(IDIR_PINENTRY)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk -- cgit v1.2.3