From 66107457bf0b5d6ba2608eaa3468e88c0d1eab25 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 1 Oct 2022 22:57:24 +0200 Subject: [PATCH 1/4] crypto++: update to 8.7.0. --- .../crypto++/patches/musl-soname-links.patch | 22 ------------------- srcpkgs/crypto++/template | 10 +++++++-- 2 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 srcpkgs/crypto++/patches/musl-soname-links.patch diff --git a/srcpkgs/crypto++/patches/musl-soname-links.patch b/srcpkgs/crypto++/patches/musl-soname-links.patch deleted file mode 100644 index d4fdc719f694..000000000000 --- a/srcpkgs/crypto++/patches/musl-soname-links.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/GNUmakefile 2019-10-20 13:33:45.272028979 +0200 -+++ b/GNUmakefile 2019-10-20 13:33:45.272028979 +0200 -@@ -1256,7 +1256,7 @@ - $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) - ifeq ($(HAS_SOLIB_VERSION),1) - -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so -- $(LDCONF) $(DESTDIR)$(LIBDIR) -+ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) - endif - endif - ifneq ($(wildcard libcryptopp.pc),) ---- a/GNUmakefile-cross 2019-04-29 01:36:50.000000000 +0200 -+++ b/GNUmakefile-cross 2019-04-29 01:36:50.000000000 +0200 -@@ -732,7 +732,7 @@ - $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) - ifeq ($(HAS_SOLIB_VERSION),1) - -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so -- $(LDCONF) $(DESTDIR)$(LIBDIR) -+ -$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) - endif - endif - ifneq ($(wildcard libcryptopp.pc),) diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template index 7707a98c54ff..d9fd62aab62e 100644 --- a/srcpkgs/crypto++/template +++ b/srcpkgs/crypto++/template @@ -1,7 +1,7 @@ # Template file for 'crypto++' pkgname=crypto++ reverts="820_2" -version=8.3.0 +version=8.7.0 revision=1 wrksrc="${pkgname//+/p}-CRYPTOPP_${version//./_}" build_style=gnu-makefile @@ -12,7 +12,7 @@ maintainer="Orphaned " license="BSL-1.0" homepage="http://www.cryptopp.com/" distfiles="https://github.com/weidai11/cryptopp/archive/CRYPTOPP_${version//./_}.tar.gz" -checksum=63304c6f943f435a4e385273e15abb69cff3b85a44663150bf5a6069b84abd43 +checksum=8d6a4064b8e9f34cd3e838f5a12c40067ee7b95ee37d9173ec273cb0913e7ca2 CXXFLAGS="-DNDEBUG -fPIC" @@ -20,6 +20,12 @@ if [ "$XBPS_CROSS" ]; then make_build_args+=" -f GNUmakefile-cross" fi +case "$XBPS_TARGET_MACHINE" in +i686) + # gcm.cpp:566:13: error: the register '%xmm5' cannot be clobbered in 'asm' for the current target + CXXFLAGS+=" -DCRYPTOPP_DISABLE_SSE2" ;; +esac + post_install() { vlicense License.txt LICENSE } From 6f3a186c2f4fd59e5220904c7c3baed27a2b89d0 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 1 Oct 2022 22:59:00 +0200 Subject: [PATCH 2/4] cryfs: rebuild for crypto++-8.7.0 --- srcpkgs/cryfs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template index 1affee1d8f03..0349066cb88d 100644 --- a/srcpkgs/cryfs/template +++ b/srcpkgs/cryfs/template @@ -1,7 +1,7 @@ # Template file for 'cryfs' pkgname=cryfs version=0.11.2 -revision=1 +revision=2 create_wrksrc=yes build_style=cmake configure_args="-DCRYFS_UPDATE_CHECKS=off -DBoost_USE_STATIC_LIBS=OFF From b9243d6834e2c3f91b34163d4eb9d80a57362112 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 1 Oct 2022 22:59:00 +0200 Subject: [PATCH 3/4] codecrypt: rebuild for crypto++-8.7.0 --- srcpkgs/codecrypt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/codecrypt/template b/srcpkgs/codecrypt/template index cd326930709d..5755763313f1 100644 --- a/srcpkgs/codecrypt/template +++ b/srcpkgs/codecrypt/template @@ -1,7 +1,7 @@ # Template file for 'codecrypt' pkgname=codecrypt version=1.8 -revision=4 +revision=5 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="crypto++-devel fftw-devel gmp-devel" From 3ddff49a10a8e353ba9f3143303e8543e711673b Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sat, 1 Oct 2022 22:59:01 +0200 Subject: [PATCH 4/4] MEGAsdk: rebuild for crypto++-8.7.0 --- srcpkgs/MEGAsdk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template index e9cbeb70f5db..3f179bf80d9a 100644 --- a/srcpkgs/MEGAsdk/template +++ b/srcpkgs/MEGAsdk/template @@ -1,7 +1,7 @@ # Template file for 'MEGAsdk' pkgname=MEGAsdk version=3.7.3c -revision=2 +revision=3 wrksrc="sdk-${version}" build_style=gnu-configure configure_args="--enable-chat --disable-examples $(vopt_with libuv)"