From 775dea27582900bd469983a6405aeb503bdec073 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sun, 24 Sep 2023 06:51:34 +0000
Subject: [PATCH] crypto++, bump version (#9515)

---
 ...o++-8.6.0.recipe => crypto++-8.8.0.recipe} |  5 ++-
 ...8.6.0.patchset => crypto++-8.8.0.patchset} | 42 +++++--------------
 2 files changed, 13 insertions(+), 34 deletions(-)
 rename dev-libs/crypto++/{crypto++-8.6.0.recipe => crypto++-8.8.0.recipe} (94%)
 rename dev-libs/crypto++/patches/{crypto++-8.6.0.patchset => crypto++-8.8.0.patchset} (59%)

diff --git a/dev-libs/crypto++/crypto++-8.6.0.recipe b/dev-libs/crypto++/crypto++-8.8.0.recipe
similarity index 94%
rename from dev-libs/crypto++/crypto++-8.6.0.recipe
rename to dev-libs/crypto++/crypto++-8.8.0.recipe
index 2e71577d7..62848e1ab 100644
--- a/dev-libs/crypto++/crypto++-8.6.0.recipe
+++ b/dev-libs/crypto++/crypto++-8.8.0.recipe
@@ -19,9 +19,9 @@ COPYRIGHT="2015-2019 Wei Dai"
 LICENSE="Boost v1.0"
 REVISION="1"
 SOURCE_URI="https://github.com/weidai11/cryptopp/archive/CRYPTOPP_${portVersion//./_}.tar.gz"
-CHECKSUM_SHA256="9304625f4767a13e0a5f26d0f019d78cf9375604a33e5391c3bf2e81399dfeb8"
-PATCHES="crypto++-$portVersion.patchset"
+CHECKSUM_SHA256="f8b8f632533b279ee297694e651e9204824bba6022ce66e60ebebb08b551fe7a"
 SOURCE_DIR="cryptopp-CRYPTOPP_${portVersion//./_}"
+PATCHES="crypto++-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -81,6 +81,7 @@ INSTALL()
 
 	packageEntries devel $developDir
 
+	# remove binary and testdata, only needed for running TEST()
 	rm -rf "$binDir" "$dataDir/cryptopp"
 }
 
diff --git a/dev-libs/crypto++/patches/crypto++-8.6.0.patchset b/dev-libs/crypto++/patches/crypto++-8.8.0.patchset
similarity index 59%
rename from dev-libs/crypto++/patches/crypto++-8.6.0.patchset
rename to dev-libs/crypto++/patches/crypto++-8.8.0.patchset
index 04f8e1702..7e43fffe6 100644
--- a/dev-libs/crypto++/patches/crypto++-8.6.0.patchset
+++ b/dev-libs/crypto++/patches/crypto++-8.8.0.patchset
@@ -1,14 +1,14 @@
-From 4b527c220bc3afc441cb14920d589d2d36d0d366 Mon Sep 17 00:00:00 2001
+From 03e8f52590826ab2de9fe31538cfe692d8d4b0e9 Mon Sep 17 00:00:00 2001
 From: kikadf <kikadf.01@gmail.com>
 Date: Fri, 31 May 2019 16:04:29 +0200
-Subject: crypto++: add Haiku patchset
+Subject: add Haiku patchset
 
 
 diff --git a/GNUmakefile b/GNUmakefile
-index 6f63071..dac3861 100644
+index b1f4af0..06e2de9 100644
 --- a/GNUmakefile
 +++ b/GNUmakefile
-@@ -79,6 +79,7 @@ IS_DARWIN := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "Darwin")
+@@ -78,6 +78,7 @@ IS_DARWIN := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "Darwin")
  IS_NETBSD := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "NetBSD")
  IS_AIX := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "aix")
  IS_SUN := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c -E "SunOS|Solaris")
@@ -16,7 +16,7 @@ index 6f63071..dac3861 100644
  
  SUN_COMPILER := $(shell $(CXX) -V 2>&1 | $(GREP) -i -c -E 'CC: (Sun|Studio)')
  GCC_COMPILER := $(shell $(CXX) --version 2>/dev/null | $(GREP) -v -E '(llvm|clang)' | $(GREP) -i -c -E '(gcc|g\+\+)')
-@@ -88,7 +89,7 @@ INTEL_COMPILER := $(shell $(CXX) --version 2>/dev/null | $(GREP) -i -c '\(icc\)'
+@@ -87,7 +88,7 @@ INTEL_COMPILER := $(shell $(CXX) --version 2>/dev/null | $(GREP) -i -c '\(icc\)'
  
  # Enable shared object versioning for Linux and Solaris
  HAS_SOLIB_VERSION ?= 0
@@ -25,42 +25,20 @@ index 6f63071..dac3861 100644
    HAS_SOLIB_VERSION := 1
  endif
  
-@@ -1125,7 +1126,7 @@ ifeq ($(HAS_SOLIB_VERSION),1)
+@@ -1144,7 +1145,7 @@ ifeq ($(HAS_SOLIB_VERSION),1)
  # Different patchlevels and minors are compatible since 6.1
  SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR)
  # Linux uses -Wl,-soname
 -ifneq ($(IS_LINUX)$(IS_HURD),00)
-+ifneq ($(IS_LINUX)$(IS_HURD)$(IS_HAIKU),000)
++ifneq ($(IS_LINUX)$(IS_HURD)$(IS_SUN)$(IS_HAIKU),0000)
  # Linux uses full version suffix for shared library
  SOLIB_VERSION_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH)
  SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
 -- 
-2.30.2
+2.37.3
 
 
-From de813189dc0ff734523d9c8c19701ec79ceb88c8 Mon Sep 17 00:00:00 2001
-From: kikadf <kikadf.01@gmail.com>
-Date: Sat, 1 Jun 2019 09:38:34 +0200
-Subject: crypto++: Fix linking of lib
-
-
-diff --git a/GNUmakefile b/GNUmakefile
-index dac3861..ab96c61 100644
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -1413,6 +1413,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.30.2
-
-
-From 225e0880448624bf1c500b29d4027ea350ceaa0c Mon Sep 17 00:00:00 2001
+From 2846485f5cbc97808f788c77749595535d69cf04 Mon Sep 17 00:00:00 2001
 From: kikadf <kikadf.01@gmail.com>
 Date: Fri, 7 Jun 2019 15:00:26 +0200
 Subject: Haiku fix 2 config.h
@@ -80,5 +58,5 @@ index 107e445..c54d4c9 100644
  #endif
  
 -- 
-2.30.2
+2.37.3