Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 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 ++-----
 doc/htmldoc/BUILD         |    5 +++++
 doc/htmldoc/DETAILS       |    5 ++---
 doc/htmldoc/HISTORY       |    4 ++++
 9 files changed, 31 insertions(+), 23 deletions(-)

New commits:
commit 18478e23673a5c6fc1b8fa2a7779386fe374b9a4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    cryptopp: => 6.1.0 SECURITY FIX

commit b6433a02439345662185f802ac1fca15af2f3610
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    htmldoc: => 1.9.2

diff --git a/crypto/cryptopp/BUILD b/crypto/cryptopp/BUILD
index c0ab337..2ae0439 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 da6d38b..f148724 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 fcc0db2..395e2ae 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 a69fa6c..755dcb2 100644
--- a/crypto/cryptopp/HISTORY
+++ b/crypto/cryptopp/HISTORY
@@ -1,3 +1,10 @@
+2018-02-24 Treeve Jelbert <treeve AT 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 AT 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 6518b6d..5c6bc29 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 da8b4ff..6f466a6 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
diff --git a/doc/htmldoc/BUILD b/doc/htmldoc/BUILD
new file mode 100755
index 0000000..89dbc88
--- /dev/null
+++ b/doc/htmldoc/BUILD
@@ -0,0 +1,5 @@
+if ! is_depends_enabled $SPELL llvm;then
+  export CC=/usr/bin/gcc
+  export CXX=/usr/bin/c++
+fi
+default_build
diff --git a/doc/htmldoc/DETAILS b/doc/htmldoc/DETAILS
index 0e7377f..08101c0 100755
--- a/doc/htmldoc/DETAILS
+++ b/doc/htmldoc/DETAILS
@@ -1,10 +1,9 @@
            SPELL=htmldoc
-         VERSION=1.9
-     
SOURCE_HASH=sha512:1f3f07a5a590b053f64e097fb09334fd91b6ab56ef4864648579646ffb7b04ef542340a42ab2f454cbf2ae92f895b201e3558511f4c5e6ac3f3a0021dc5ef633
+         VERSION=1.9.2
+     
SOURCE_HASH=sha512:7f36f474650ba63e8dc5626e1be9599fd3ac0430f92adf8e003e156513f98d789b27c7acd14810fcbad00b5fbe8a4e44ca0537cce0b383b267b55448d5d0aa29
   SECURITY_PATCH=1
           SOURCE=$SPELL-$VERSION-source.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   
SOURCE_URL[0]=https://github.com/michaelrsweet/htmldoc/archive/v${VERSION}.tar.gz
         WEB_SITE=https://www.htmldoc.org/
          ENTERED=20041219
       LICENSE[0]=GPL
diff --git a/doc/htmldoc/HISTORY b/doc/htmldoc/HISTORY
index 2dc54c8..e6d7504 100644
--- a/doc/htmldoc/HISTORY
+++ b/doc/htmldoc/HISTORY
@@ -1,3 +1,7 @@
+2018-02-24 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.9.2
+       * BUILD: added, fix if not using clang
+
 2017-08-13 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.9