[crux-commits] ports/contrib (refs/remotes/origin/3.6): crypto++: 8.2.0 -> 8.4.0

crux at crux.nu crux at crux.nu
Sat Apr 10 19:06:04 UTC 2021


commit 8044d165792a90afd734527a06d91a9388488d03
Author: Danny Rawlins <contact at romster.me>
Date:   Sat Jan 9 17:02:40 2021 +1100

    crypto++: 8.2.0 -> 8.4.0

diff --git a/crypto++/.footprint b/crypto++/.footprint
index 9f6127625..8c3008ac7 100644
--- a/crypto++/.footprint
+++ b/crypto++/.footprint
@@ -8,6 +8,7 @@ drwxr-xr-x	root/root	usr/include/cryptopp/
 -rw-r--r--	root/root	usr/include/cryptopp/aes_armv4.h
 -rw-r--r--	root/root	usr/include/cryptopp/algebra.h
 -rw-r--r--	root/root	usr/include/cryptopp/algparam.h
+-rw-r--r--	root/root	usr/include/cryptopp/allocate.h
 -rw-r--r--	root/root	usr/include/cryptopp/arc4.h
 -rw-r--r--	root/root	usr/include/cryptopp/argnames.h
 -rw-r--r--	root/root	usr/include/cryptopp/aria.h
@@ -31,6 +32,16 @@ drwxr-xr-x	root/root	usr/include/cryptopp/
 -rw-r--r--	root/root	usr/include/cryptopp/channels.h
 -rw-r--r--	root/root	usr/include/cryptopp/cmac.h
 -rw-r--r--	root/root	usr/include/cryptopp/config.h
+-rw-r--r--	root/root	usr/include/cryptopp/config_align.h
+-rw-r--r--	root/root	usr/include/cryptopp/config_asm.h
+-rw-r--r--	root/root	usr/include/cryptopp/config_cpu.h
+-rw-r--r--	root/root	usr/include/cryptopp/config_cxx.h
+-rw-r--r--	root/root	usr/include/cryptopp/config_dll.h
+-rw-r--r--	root/root	usr/include/cryptopp/config_int.h
+-rw-r--r--	root/root	usr/include/cryptopp/config_misc.h
+-rw-r--r--	root/root	usr/include/cryptopp/config_ns.h
+-rw-r--r--	root/root	usr/include/cryptopp/config_os.h
+-rw-r--r--	root/root	usr/include/cryptopp/config_ver.h
 -rw-r--r--	root/root	usr/include/cryptopp/cpu.h
 -rw-r--r--	root/root	usr/include/cryptopp/crc.h
 -rw-r--r--	root/root	usr/include/cryptopp/cryptlib.h
@@ -135,12 +146,16 @@ drwxr-xr-x	root/root	usr/include/cryptopp/
 -rw-r--r--	root/root	usr/include/cryptopp/scrypt.h
 -rw-r--r--	root/root	usr/include/cryptopp/seal.h
 -rw-r--r--	root/root	usr/include/cryptopp/secblock.h
+-rw-r--r--	root/root	usr/include/cryptopp/secblockfwd.h
 -rw-r--r--	root/root	usr/include/cryptopp/seckey.h
 -rw-r--r--	root/root	usr/include/cryptopp/seed.h
 -rw-r--r--	root/root	usr/include/cryptopp/serpent.h
 -rw-r--r--	root/root	usr/include/cryptopp/serpentp.h
 -rw-r--r--	root/root	usr/include/cryptopp/sha.h
+-rw-r--r--	root/root	usr/include/cryptopp/sha1_armv4.h
+-rw-r--r--	root/root	usr/include/cryptopp/sha256_armv4.h
 -rw-r--r--	root/root	usr/include/cryptopp/sha3.h
+-rw-r--r--	root/root	usr/include/cryptopp/sha512_armv4.h
 -rw-r--r--	root/root	usr/include/cryptopp/shacal2.h
 -rw-r--r--	root/root	usr/include/cryptopp/shake.h
 -rw-r--r--	root/root	usr/include/cryptopp/shark.h
@@ -173,10 +188,13 @@ drwxr-xr-x	root/root	usr/include/cryptopp/
 -rw-r--r--	root/root	usr/include/cryptopp/xed25519.h
 -rw-r--r--	root/root	usr/include/cryptopp/xtr.h
 -rw-r--r--	root/root	usr/include/cryptopp/xtrcrypt.h
+-rw-r--r--	root/root	usr/include/cryptopp/xts.h
 -rw-r--r--	root/root	usr/include/cryptopp/zdeflate.h
 -rw-r--r--	root/root	usr/include/cryptopp/zinflate.h
 -rw-r--r--	root/root	usr/include/cryptopp/zlib.h
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libcryptopp.so
+lrwxrwxrwx	root/root	usr/lib/libcryptopp.so -> libcryptopp.so.8.4.0
+lrwxrwxrwx	root/root	usr/lib/libcryptopp.so.8 -> libcryptopp.so.8.4.0
+-rwxr-xr-x	root/root	usr/lib/libcryptopp.so.8.4.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/libcrypto++.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/libcryptopp.pc
diff --git a/crypto++/Pkgfile b/crypto++/Pkgfile
index aa03d48ee..30b1ba6be 100644
--- a/crypto++/Pkgfile
+++ b/crypto++/Pkgfile
@@ -3,29 +3,11 @@
 # Maintainer: Danny Rawlins, crux at romster dot me
 
 name=crypto++
-version=8.2.0
+version=8.4.0
 release=1
-source=(https://github.com/weidai11/cryptopp/archive/CRYPTOPP_${version//./_}/$name-$version.tar.gz
-	libcrypto++.pc.in)
+source=(https://www.cryptopp.com/${name//++/pp}${version//./}.zip)
 
 build() {
-	cd ${name//++/pp}-CRYPTOPP_${version//./_}
-	sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
-	export CXXFLAGS="$CXXFLAGS -DNDEBUG -fPIC"
-
-	# http://www.openwall.com/lists/oss-security/2016/09/19/6
-	echo "#define CRYPTOPP_UNUSED(x) ((void)(x))" >> config.h
-	sed -i -e 's|assert[[:space:]]*(|CRYPTOPP_UNUSED(|g' *.h *.cpp
-
-	make -f GNUmakefile
-	make libcryptopp.so
-
-	install -d $PKG/usr/{lib/pkgconfig,include/cryptopp}
-	install -m 0644 *.h $PKG/usr/include/cryptopp/
-	install -m 0644 libcryptopp.so $PKG/usr/lib/libcryptopp.so
-
-	sed -e "s/@VERSION@/$version/g" \
-		$SRC/libcrypto++.pc.in > libcrypto++.pc
-
-	install -m 0644 libcrypto++.pc $PKG/usr/lib/pkgconfig/libcrypto++.pc
+	make CXXFLAGS="$CXXFLAGS -DNDEBUG -fPIC" -f GNUmakefile dynamic libcryptopp.pc
+	make DESTDIR="$PKG" PREFIX="/usr" install-lib
 }
diff --git a/crypto++/libcrypto++.pc.in b/crypto++/libcrypto++.pc.in
deleted file mode 100644
index dc67d4ad4..000000000
--- a/crypto++/libcrypto++.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=/usr
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: libcrypto++- at VERSION@
-Description: Class library of cryptographic schemes
-Version: @VERSION@
-Libs: -L${libdir} -lcryptopp
-Cflags: -I${includedir} 


More information about the crux-commits mailing list