From 7217661e3a4a324852982ab3e61ea319c068be4e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 28 Oct 2023 21:44:47 +0200 Subject: [PATCH] package/cryptopp: bump to version 8.9.0 - Drop patch (already in version) - Update hash of License.txt (minor updates with: https://github.com/weidai11/cryptopp/commit/bc2c8423a1d8a193dcf1e5706c124587f9491b7f https://github.com/weidai11/cryptopp/commit/b418f93483562f1b59d0ba963dcdcc16b6a6a793 https://github.com/weidai11/cryptopp/commit/2bce06d5dbd3f53ebfcff44eef467667e44d8839) https://www.cryptopp.com/release890.html https://www.cryptopp.com/release880.html https://www.cryptopp.com/release870.html Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...e-add-missing-shared-library-symlink.patch | 62 ------------------- package/cryptopp/cryptopp.hash | 6 +- package/cryptopp/cryptopp.mk | 2 +- 3 files changed, 4 insertions(+), 66 deletions(-) delete mode 100644 package/cryptopp/0001-GNUmakefile-add-missing-shared-library-symlink.patch diff --git a/package/cryptopp/0001-GNUmakefile-add-missing-shared-library-symlink.patch b/package/cryptopp/0001-GNUmakefile-add-missing-shared-library-symlink.patch deleted file mode 100644 index 5f87414d53..0000000000 --- a/package/cryptopp/0001-GNUmakefile-add-missing-shared-library-symlink.patch +++ /dev/null @@ -1,62 +0,0 @@ -From e4c2e3bc8174f24cf63923619f5d06d85b84ae1d Mon Sep 17 00:00:00 2001 -From: Kamel Bouhara -Date: Fri, 7 Jan 2022 22:59:23 +0100 -Subject: [PATCH] GNUmakefile: add missing shared library symlink - -The GNUmakefile install-lib target currently installs the following -symlink: - - libcryptopp.so -> libcryptopp.so.8.6.0 - -However, it does not create the following symlink: - - libcryptopp.so.8 -> libcryptopp.so.8.6.0 - -This symlink is necessary at runtime because libcryptopp.so.8 is the -SONAME of the cryptopp library, and therefore this is what the dynamic -loader will search when starting a program that is linked against -cryptopp. - -For native compilation, the 'ldconfig' invocation that immediately -follows will create that symlink, so everything works. - -For cross-compilation however, ldconfig can't be used, and therefore -LDCONFIG is passed as /bin/true, and therefore it doesn't create the -symlink. So instead, create it directly inside the GNUmakefile, -without relying on ldconfig. - -Upstream: https://github.com/weidai11/cryptopp/pull/1101 -Signed-off-by: Kamel Bouhara -Signed-off-by: Thomas Petazzoni ---- - GNUmakefile | 1 + - GNUmakefile-cross | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/GNUmakefile b/GNUmakefile -index 23273edb..3b55e420 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -1412,6 +1412,7 @@ ifneq ($(wildcard libcryptopp.so$(SOLIB_VERSION_SUFFIX)),) - $(CHMOD) u=rwx,go=rx $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) - ifeq ($(HAS_SOLIB_VERSION),1) - -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so -+ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) - $(LDCONF) $(DESTDIR)$(LIBDIR) - endif - endif -diff --git a/GNUmakefile-cross b/GNUmakefile-cross -index 9847f04b..a2b87e4a 100644 ---- a/GNUmakefile-cross -+++ b/GNUmakefile-cross -@@ -856,6 +856,7 @@ ifneq ($(wildcard libcryptopp.so$(SOLIB_VERSION_SUFFIX)),) - $(CHMOD) u=rwx,go=rx $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) - ifeq ($(HAS_SOLIB_VERSION),1) - -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so -+ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) - $(LDCONF) $(DESTDIR)$(LIBDIR) - endif - endif --- -2.33.1 - diff --git a/package/cryptopp/cryptopp.hash b/package/cryptopp/cryptopp.hash index 9a113b8f04..a7bc578da4 100644 --- a/package/cryptopp/cryptopp.hash +++ b/package/cryptopp/cryptopp.hash @@ -1,5 +1,5 @@ -# Hash from: https://www.cryptopp.com/release860.html: -sha512 e7773f5e4a7dc7e8e735b1702524bee56ba38e5211544c9c9778bc51ed8dc7b376c17f2e406410043b636312336f26f76dc963f298872f8c13933e88c232fc03 cryptopp860.zip +# Hash from: https://www.cryptopp.com/release890.html: +sha512 903970c4c0312272e93bae0cc3477be66b273dd38c9329fda9f7157ec44e247a3bc16b9d2b4ad625f258af0eaf2dc2c4210d4d14829b455f180983859a5c4b41 cryptopp890.zip # Hash for license file: -sha256 e668af8c73a38a66a1e8951d14ec24e7582fee5254dd6c3dae488a416d105d5f License.txt +sha256 78e4010b682cb94187fe0b57e50116d0ba271ef81104d1ddb35c80c3d81e3169 License.txt diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index 87d6fba237..a538f8c17d 100644 --- a/package/cryptopp/cryptopp.mk +++ b/package/cryptopp/cryptopp.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRYPTOPP_VERSION = 8.6.0 +CRYPTOPP_VERSION = 8.9.0 CRYPTOPP_SOURCE = cryptopp$(subst .,,$(CRYPTOPP_VERSION)).zip CRYPTOPP_SITE = https://cryptopp.com CRYPTOPP_LICENSE = BSL-1.0, BSD-3-Clause (CRYPTOGAMS), Public domain (ChaCha SSE2 and AVX)