From 18478e23673a5c6fc1b8fa2a7779386fe374b9a4 Mon Sep 17 00:00:00 2001
From: Treeve Jelbert
Date: Sat, 24 Feb 2018 17:50:40 +0100
Subject: cryptopp: => 6.1.0 SECURITY FIX

---
 crypto/cryptopp/BUILD     |  1 +
 crypto/cryptopp/DEPENDS   |  1 -
 crypto/cryptopp/DETAILS   | 18 +++++++++---------
 crypto/cryptopp/HISTORY   |  7 +++++++
 crypto/cryptopp/INSTALL   |  6 +-----
 crypto/cryptopp/PRE_BUILD |  7 ++-----
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/crypto/cryptopp/BUILD b/crypto/cryptopp/BUILD
index c0ab33736a..2ae04396b6 100755
--- a/crypto/cryptopp/BUILD
+++ b/crypto/cryptopp/BUILD
@@ -1 +1,2 @@
+cd $SOURCE_DIRECTORY &&
 make libcryptopp.a libcryptopp.so
diff --git a/crypto/cryptopp/DEPENDS b/crypto/cryptopp/DEPENDS
index da6d38b3a1..f148724504 100755
--- a/crypto/cryptopp/DEPENDS
+++ b/crypto/cryptopp/DEPENDS
@@ -1,2 +1 @@
-depends unzip &&
 depends -sub CXX gcc
diff --git a/crypto/cryptopp/DETAILS b/crypto/cryptopp/DETAILS
index fcc0db26ae..395e2ae585 100755
--- a/crypto/cryptopp/DETAILS
+++ b/crypto/cryptopp/DETAILS
@@ -1,14 +1,14 @@
            SPELL=cryptopp
-         VERSION=565
-        VERSIONX=`echo ${VERSION} | sed -r "s:([0-9])([0-9]):\1.\2.:"`
-  SECURITY_PATCH=1
-     SOURCE_HASH=sha512:f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7
-          SOURCE=$SPELL$VERSION.zip
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL$VERSION"
-   SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
-   SOURCE_URL[1]=http://www.cryptopp.com/$SOURCE
+          SPELLX=CRYPTOPP
+         VERSION=6.1.0
+        VERSIONX=`echo ${VERSION} | sed -r "s/\./\_/g"`
+     SOURCE_HASH=sha512:4bc02fef33f1859a07434a4752c2575afd781056e9a91eed99a13cebe2c91d66cbc7173e34d362da63dad6d38f9594ff291accd27e111232996ccd536bba0f39
+  SECURITY_PATCH=2
+          SOURCE="${SPELLX}_${VERSIONX}.tar.gz"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}-${SPELLX}_${VERSIONX}"
+   SOURCE_URL[0]=https://github.com/weidai11/cryptopp/archive/$SOURCE
       LICENSE[0]=BSD
-        WEB_SITE=http://cryptopp.com
+        WEB_SITE=https://cryptopp.com
             DOCS="Install.txt License.txt Readme.txt"
          ENTERED=20040730
         KEYWORDS="crypto"
diff --git a/crypto/cryptopp/HISTORY b/crypto/cryptopp/HISTORY
index a69fa6c64a..755dcb244f 100644
--- a/crypto/cryptopp/HISTORY
+++ b/crypto/cryptopp/HISTORY
@@ -1,3 +1,10 @@
+2018-02-24 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 6.1.0
+	  now at github
+	  SECURITY_PATCH++ fix CVE-2016-9939 CVE-2017-9434
+	* DEPENDS: delete unzip
+	* BUILD INSTALL PRE_BUILD: tweak
+
 2016-11-05 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 5.6.5; SECURITY_PATCH=1; quoting paths;
 	  updated DOCS
diff --git a/crypto/cryptopp/INSTALL b/crypto/cryptopp/INSTALL
index 6518b6d2d4..5c6bc295f3 100755
--- a/crypto/cryptopp/INSTALL
+++ b/crypto/cryptopp/INSTALL
@@ -1,6 +1,2 @@
-install -vm 755 -d "${INSTALL_ROOT}/usr/include/cryptopp" &&
-install -vm 644 *.h "${INSTALL_ROOT}/usr/include/cryptopp" &&
-
-cp -v -d libcryptopp.* "${INSTALL_ROOT}/usr/lib/" &&
-
+make install &&
 sed "s:%%VERSION%%:${VERSIONX}:" "${SPELL_DIRECTORY}/files/libcrypto++.pc.in" > "${INSTALL_ROOT}/usr/lib/pkgconfig/libcrypto++.pc"
diff --git a/crypto/cryptopp/PRE_BUILD b/crypto/cryptopp/PRE_BUILD
index da8b4ff073..6f466a6b95 100755
--- a/crypto/cryptopp/PRE_BUILD
+++ b/crypto/cryptopp/PRE_BUILD
@@ -1,6 +1,3 @@
-mk_source_dir         &&
+default_pre_build &&
 cd $SOURCE_DIRECTORY  &&
-
-unpack_file &&
-
-sedit "s:-march=native::" GNUmakefile
+sed -i '/PREFIX/s|/local||' GNUmakefile
-- 
cgit v1.2.3