security/cryptopp: Update to 8.7.0

Drop most of the SIMD logic. The cryptopp Makefile autodetects CPU
features regardless if CPUTYPE is set and it is not possible to disable
specific instruction sets. It is only possible to completely disable
assembly optimizations, which is recommended for package building unless
all consumer machines support the build machine's CPU instruction sets.

Since version 8.1, it is no longer necessary to export
-DCRYPTOPP_DISABLE_ASM to the pkgconfig file. Consumers will now
build without it defined if the SIMD option is disabled. Remove old
workarounds pertaining to this issue.
https://github.com/weidai11/cryptopp/issues/779

Bump PORTREVISION on consumers due to ABI incompatibility.

https://www.cryptopp.com/release870.html

4 files changed, 16 insertions, 42 deletions

diff --git a/security/cryptopp/Makefile b/security/cryptopp/Makefile
index 193bc797cf85..f9fa20a3d824 100644
--- a/security/cryptopp/Makefile
+++ b/security/cryptopp/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cryptopp
-PORTVERSION=	8.6.0
+PORTVERSION=	8.7.0
 CATEGORIES=	security
 MASTER_SITES=	http://www.cryptopp.com/
 DISTNAME=	cryptopp${PORTVERSION:S/.//g}
@@ -55,24 +55,8 @@ TOOLS_TEST_TARGET_OFF=	test
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSIMD}
-.  if ${ARCH} == i386 || ${ARCH} == amd64
-.    if !${MACHINE_CPU:Msse2}
-CXXFLAGS+=	-DCRYPTOPP_DISABLE_ASM -DCRYPTOPP_DISABLE_SSE2
-.    endif
-.    if !${MACHINE_CPU:Mssse3}
-CXXFLAGS+=	-DCRYPTOPP_DISABLE_SSSE3
-.    endif
-.    if !${MACHINE_CPU:Msse41}
-CXXFLAGS+=	-DCRYPTOPP_DISABLE_SSE4
-.    endif
-.  elif ${ARCH} == powerpc || ${ARCH:Mpowerpc64*}
-CXXFLAGS+=	-DCRYPTOPP_ALTIVEC_AVAILABLE
-.  endif
-.else
-CXXFLAGS+=	-DCRYPTOPP_DISABLE_ASM -DCRYPTOPP_DISABLE_SSE2 \
-		-DCRYPTOPP_DISABLE_SSSE3 -DCRYPTOPP_DISABLE_SSE4 \
-		-DCRYPTOPP_DISABLE_ALTIVEC
+.if !${PORT_OPTIONS:MSIMD}
+CXXFLAGS+=	-DCRYPTOPP_DISABLE_ASM
 .endif
 
 pre-configure-FULL_DEBUG-on:
diff --git a/security/cryptopp/distinfo b/security/cryptopp/distinfo
index 136fac92348f..012fe83214ff 100644
--- a/security/cryptopp/distinfo
+++ b/security/cryptopp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1645715486
-SHA256 (cryptopp860.zip) = 20aa413957d9c8ae353ee2f7747bd7ac392f933c60a53e3fd1e41cadbc48d193
-SIZE (cryptopp860.zip) = 9274149
+TIMESTAMP = 1663283275
+SHA256 (cryptopp870.zip) = d0d3a28fcb5a1f6ed66b3adf57ecfaed234a7e194e42be465c2ba70c744538dd
+SIZE (cryptopp870.zip) = 9277791
diff --git a/security/cryptopp/files/patch-GNUmakefile b/security/cryptopp/files/patch-GNUmakefile
index 1fc8ef2b3017..8ad66cac17b6 100644
--- a/security/cryptopp/files/patch-GNUmakefile
+++ b/security/cryptopp/files/patch-GNUmakefile
@@ -1,10 +1,9 @@
-We need to export the CRYPTOPP_DISABLE_ASM flag if cryptopp was not built
-with SIMD support. Certain functions prototypes are guarded by this
-flag and build failures will arise in other ports if not set appropriately.
+Masquerade as Linux to enable certain build options.
+Always use pthread even if feature detection is disabled.
 
---- GNUmakefile.orig	2021-01-01 17:22:45 UTC
+--- GNUmakefile.orig	2022-08-07 19:52:03 UTC
 +++ GNUmakefile
-@@ -71,7 +71,7 @@ ifeq ($(SYSTEMX),)
+@@ -70,7 +70,7 @@ endif
    SYSTEMX := $(shell uname -s 2>/dev/null)
  endif
  
@@ -13,7 +12,7 @@ flag and build failures will arise in other ports if not set appropriately.
  IS_HURD := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c -E "GNU|Hurd")
  IS_MINGW := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "MinGW")
  IS_CYGWIN := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "Cygwin")
-@@ -795,7 +795,7 @@ endif
+@@ -848,7 +848,7 @@ endif
  
  # Use -pthread whenever it is available. See http://www.hpl.hp.com/techreports/2004/HPL-2004-209.pdf
  #   http://stackoverflow.com/questions/2127797/gcc-significance-of-pthread-flag-when-compiling
@@ -21,13 +20,4 @@ flag and build failures will arise in other ports if not set appropriately.
 +ifeq (1,1)
   ifeq ($(XLC_COMPILER),1)
    ifeq ($(findstring -qthreaded,$(CXXFLAGS)),)
-    TPROG = TestPrograms/test_pthreads.cxx
-@@ -1450,7 +1450,7 @@ libcryptopp.pc:
- 	@echo 'Version: 8.4' >> libcryptopp.pc
- 	@echo 'URL: https://cryptopp.com/' >> libcryptopp.pc
- 	@echo '' >> libcryptopp.pc
--	@echo 'Cflags: -I$${includedir}' >> libcryptopp.pc
-+	@echo 'Cflags: -I$${includedir} $(findstring -DCRYPTOPP_DISABLE_ASM,$(CXXFLAGS))' >> libcryptopp.pc
- 	@echo 'Libs: -L$${libdir} -lcryptopp' >> libcryptopp.pc
- 
- # This recipe prepares the distro files
+    TPROG = TestPrograms/test_pthreads.cpp
diff --git a/security/cryptopp/files/patch-misc.h b/security/cryptopp/files/patch-misc.h
index 165720d6bef7..7d923019af27 100644
--- a/security/cryptopp/files/patch-misc.h
+++ b/security/cryptopp/files/patch-misc.h
@@ -2,9 +2,9 @@ This fixes a warning triggered by testing an unsigned parameter
 against 0.  The patch solves this by creating a different template
 for signed case. (PR: 178827)
 
---- misc.h.orig	2021-01-01 17:03:59 UTC
+--- misc.h.orig	2022-08-07 19:52:03 UTC
 +++ misc.h
-@@ -700,8 +700,10 @@ inline bool SafeConvert(T1 from, T2 &to)
+@@ -720,8 +720,10 @@ inline bool SafeConvert(T1 from, T2 &to)
  /// \param value the value to convert
  /// \param base the base to use during the conversion
  /// \return the string representation of value in base.
@@ -16,7 +16,7 @@ for signed case. (PR: 178827)
  {
  	// Hack... set the high bit for uppercase.
  	const unsigned int HIGH_BIT = (1U << 31);
-@@ -712,12 +714,6 @@ std::string IntToString(T value, unsigned int base = 1
+@@ -732,12 +734,6 @@ std::string IntToString(T value, unsigned int base = 1
  	if (value == 0)
  		return "0";
  
@@ -29,7 +29,7 @@ for signed case. (PR: 178827)
  	std::string result;
  	while (value > 0)
  	{
-@@ -725,9 +721,28 @@ std::string IntToString(T value, unsigned int base = 1
+@@ -745,9 +741,28 @@ std::string IntToString(T value, unsigned int base = 1
  		result = char((digit < 10 ? '0' : (CH - 10)) + digit) + result;
  		value /= base;
  	}