git: 4c0895d82f4a - main - security/cryptopp: Update to 8.6.0

From: Jason E. Hale <jhale_at_FreeBSD.org>
Date: Fri, 25 Feb 2022 02:04:46 UTC
The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4c0895d82f4aff32859b4138c7eab0595bb9f903

commit 4c0895d82f4aff32859b4138c7eab0595bb9f903
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2022-02-24 16:15:03 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2022-02-25 01:37:46 +0000

    security/cryptopp: Update to 8.6.0
    
    Changes:        https://www.cryptopp.com/release860.html
    
    Security:       7695b0af-958f-11ec-9aa3-4ccc6adda413
---
 security/cryptopp/Makefile            |   3 +-
 security/cryptopp/distinfo            |   6 +-
 security/cryptopp/files/patch-cpu.cpp | 111 ----------------------------------
 security/cryptopp/pkg-plist           |   1 +
 4 files changed, 5 insertions(+), 116 deletions(-)

diff --git a/security/cryptopp/Makefile b/security/cryptopp/Makefile
index 489dc524d2b7..a3cb967767d7 100644
--- a/security/cryptopp/Makefile
+++ b/security/cryptopp/Makefile
@@ -1,8 +1,7 @@
 # Created by: George Reid <greid@ukug.uk.freebsd.org>
 
 PORTNAME=	cryptopp
-PORTVERSION=	8.5.0
-PORTREVISION=	1
+PORTVERSION=	8.6.0
 CATEGORIES=	security
 MASTER_SITES=	http://www.cryptopp.com/
 DISTNAME=	cryptopp${PORTVERSION:S/.//g}
diff --git a/security/cryptopp/distinfo b/security/cryptopp/distinfo
index c46f65cf67ac..136fac92348f 100644
--- a/security/cryptopp/distinfo
+++ b/security/cryptopp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615647859
-SHA256 (cryptopp850.zip) = 95fc50d59488ebf61a735cce2b2ec2c2561fc682077c7b496273d65a1ed93d9e
-SIZE (cryptopp850.zip) = 9125575
+TIMESTAMP = 1645715486
+SHA256 (cryptopp860.zip) = 20aa413957d9c8ae353ee2f7747bd7ac392f933c60a53e3fd1e41cadbc48d193
+SIZE (cryptopp860.zip) = 9274149
diff --git a/security/cryptopp/files/patch-cpu.cpp b/security/cryptopp/files/patch-cpu.cpp
deleted file mode 100644
index a8e71a174d54..000000000000
--- a/security/cryptopp/files/patch-cpu.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
---- cpu.cpp.orig	2021-03-08 03:42:24 UTC
-+++ cpu.cpp
-@@ -1172,6 +1172,11 @@ inline bool CPU_QueryAltivec()
- 	unsigned int unused, arch;
- 	GetAppleMachineInfo(unused, unused, arch);
- 	return arch == AppleMachineInfo::PowerMac;
-+#elif defined(__FreeBSD__) && defined(PPC_FEATURE_HAS_ALTIVEC)
-+	unsigned long cpufeatures;
-+	if (elf_aux_info(AT_HWCAP, &cpufeatures, sizeof(cpufeatures))
-+		return false;
-+	else return cpufeatures & PPC_FEATURE_HAS_ALTIVEC;
- #endif
- 	return false;
- }
-@@ -1185,6 +1190,12 @@ inline bool CPU_QueryPower7()
- #elif defined(_AIX)
- 	if (__power_7_andup() != 0)
- 		return true;
-+
-+#elif defined(__FreeBSD__) && defined(PPC_FEATURE_ARCH_2_06)
-+	unsigned long cpufeatures;
-+	if (elf_aux_info(AT_HWCAP, &cpufeatures, sizeof(cpufeatures))
-+		return false;
-+	else return cpufeatures & PPC_FEATURE_ARCH_2_06;
- #endif
- 	return false;
- }
-@@ -1198,6 +1209,11 @@ inline bool CPU_QueryPower8()
- #elif defined(_AIX)
- 	if (__power_8_andup() != 0)
- 		return true;
-+#elif defined(__FreeBSD__) && defined(PPC_FEATURE2_ARCH_2_07)
-+	unsigned long cpufeatures;
-+	if (elf_aux_info(AT_HWCAP, &cpufeatures, sizeof(cpufeatures))
-+		return false;
-+	else return cpufeatures & PPC_FEATURE2_ARCH_2_07;
- #endif
- 	return false;
- }
-@@ -1211,6 +1227,11 @@ inline bool CPU_QueryPower9()
- #elif defined(_AIX)
- 	if (__power_9_andup() != 0)
- 		return true;
-+#elif defined(__FreeBSD__) && defined(PPC_FEATURE2_ARCH_3_00)
-+	unsigned long cpufeatures;
-+	if (elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures))
-+		return false;
-+	else return cpufeatures & PPC_FEATURE_ARCH2_3_00;
- #endif
- 	return false;
- }
-@@ -1225,6 +1246,11 @@ inline bool CPU_QueryAES()
- #elif defined(_AIX)
- 	if (__power_8_andup() != 0)
- 		return true;
-+#elif defined(__FreeBSD__) && defined(PPC_FEATURE2_HAS_VEC_CRYPTO)
-+	unsigned long cpufeatures;
-+	if (elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures))
-+		return false;
-+	else return cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO;
- #endif
- 	return false;
- }
-@@ -1239,6 +1265,11 @@ inline bool CPU_QueryPMULL()
- #elif defined(_AIX)
- 	if (__power_8_andup() != 0)
- 		return true;
-+#elif defined(__FreeBSD__) && defined(PPC_FEATURE2_HAS_VEC_CRYPTO)
-+	unsigned long cpufeatures;
-+	if (elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures))
-+		return false;
-+	else return cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO;
- #endif
- 	return false;
- }
-@@ -1253,6 +1284,11 @@ inline bool CPU_QuerySHA256()
- #elif defined(_AIX)
- 	if (__power_8_andup() != 0)
- 		return true;
-+#elif defined(__FreeBSD__) && defined(PPC_FEATURE2_HAS_VEC_CRYPTO)
-+	unsigned long cpufeatures;
-+	if (elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures))
-+		return false;
-+	else return cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO;
- #endif
- 	return false;
- }
-@@ -1266,6 +1302,11 @@ inline bool CPU_QuerySHA512()
- #elif defined(_AIX)
- 	if (__power_8_andup() != 0)
- 		return true;
-+#elif defined(__FreeBSD__) && defined(PPC_FEATURE2_HAS_VEC_CRYPTO)
-+	unsigned long cpufeatures;
-+	if (elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures))
-+		return false;
-+	else return cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO;
- #endif
- 	return false;
- }
-@@ -1280,6 +1321,11 @@ inline bool CPU_QueryDARN()
- #elif defined(_AIX)
- 	if (__power_9_andup() != 0)
- 		return true;
-+#elif defined(__FreeBSD__) && defined(PPC_FEATURE2_ARCH_3_00)
-+	unsigned long cpufeatures;
-+	if (elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures))
-+		return false;
-+	else return cpufeatures & PPC_FEATURE2_ARCH_3_00;
- #endif
- 	return false;
- }
diff --git a/security/cryptopp/pkg-plist b/security/cryptopp/pkg-plist
index 846df409789b..9b43a14d50b2 100644
--- a/security/cryptopp/pkg-plist
+++ b/security/cryptopp/pkg-plist
@@ -93,6 +93,7 @@ include/cryptopp/iterhash.h
 include/cryptopp/kalyna.h
 include/cryptopp/keccak.h
 include/cryptopp/lea.h
+include/cryptopp/lsh.h
 include/cryptopp/lubyrack.h
 include/cryptopp/luc.h
 include/cryptopp/mars.h