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/libgcrypt/Makefile | 5 +++-- package/libgcrypt/patches/patch-cipher_Makefile_am | 11 +++++++++++ package/libgcrypt/patches/patch-cipher_Makefile_in | 11 +++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 package/libgcrypt/patches/patch-cipher_Makefile_am create mode 100644 package/libgcrypt/patches/patch-cipher_Makefile_in (limited to 'package/libgcrypt') 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 -- cgit v1.2.3