summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2019-05-09 16:01:35 +0200
committer Eric Hameleers <alien@slackware.com>2019-05-09 16:01:35 +0200
commit885fae025d7557d732eda411f6b7eaf43d3abc53 (patch)
tree4cbc40a1501fa14e7aa1746a30f08dd3e10edfe7
parent69943897d83f3e147c57039b087059b01727a0f3 (diff)
downloadktown-885fae025d7557d732eda411f6b7eaf43d3abc53.tar.gz
ktown-885fae025d7557d732eda411f6b7eaf43d3abc53.tar.xz
Deps: Update cryfs and its dependency cryptopp
-rw-r--r--deps/cryfs/.url2
-rwxr-xr-xdeps/cryfs/cryfs.SlackBuild13
-rw-r--r--deps/cryptopp/.url2
-rwxr-xr-xdeps/cryptopp/cryptopp.SlackBuild23
-rw-r--r--deps/cryptopp/cryptopp.pc15
5 files changed, 20 insertions, 35 deletions
diff --git a/deps/cryfs/.url b/deps/cryfs/.url
index 002fe91..4654f9c 100644
--- a/deps/cryfs/.url
+++ b/deps/cryfs/.url
@@ -1 +1 @@
-https://github.com/cryfs/cryfs/releases/download/0.9.9/cryfs-0.9.9.tar.xz
+https://github.com/cryfs/cryfs/releases/download/0.10.1/cryfs-0.10.1.tar.xz
diff --git a/deps/cryfs/cryfs.SlackBuild b/deps/cryfs/cryfs.SlackBuild
index 0c8a195..4bcc2d2 100755
--- a/deps/cryfs/cryfs.SlackBuild
+++ b/deps/cryfs/cryfs.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2018 Eric Hameleers, Eindhoven, NL
+# Copyright 2018, 2019 Eric Hameleers, Eindhoven, NL
# Copyright 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
@@ -27,8 +27,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=cryfs
-VERSION=${VERSION:-0.9.9}
-BUILD=${BUILD:-6}
+VERSION=${VERSION:-0.10.1}
+BUILD=${BUILD:-1}
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -92,6 +92,8 @@ find . \
-exec chmod 644 {} \;
# Configure and compile:
+export LDFLAGS="$SLKLDFLAGS -lboost_thread -lboost_program_options -lboost_filesystem -lboost_chrono -lcryptopp -lfuse"
+
mkdir -p build
cd build
cmake \
@@ -102,8 +104,11 @@ cd build
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_MANDIR=/usr/man \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DBUILD_TESTING=OFF \
+ -DBUILD_SHARED_LIBS=ON \
+ -DBUILD_TESTING=OFF \
+ -DBoost_INCLUDE_DIRS=/usr/include/boost \
+ -DBoost_USE_STATIC_LIBS=OFF \
-DBoost_USE_STATIC_LIBS=off \
-DCRYFS_UPDATE_CHECKS=OFF \
..
diff --git a/deps/cryptopp/.url b/deps/cryptopp/.url
index 3a7d5c8..1bc3357 100644
--- a/deps/cryptopp/.url
+++ b/deps/cryptopp/.url
@@ -1 +1 @@
-https://www.cryptopp.com/cryptopp700.zip
+https://www.cryptopp.com/cryptopp820.zip
diff --git a/deps/cryptopp/cryptopp.SlackBuild b/deps/cryptopp/cryptopp.SlackBuild
index 97a4fd7..bfd1a62 100755
--- a/deps/cryptopp/cryptopp.SlackBuild
+++ b/deps/cryptopp/cryptopp.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2014, 2018 Eric Hameleers, Eindhoven, NL
+# Copyright 2014, 2018, 2019 Eric Hameleers, Eindhoven, NL
# Copyright 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
@@ -27,7 +27,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=cryptopp
-VERSION=${VERSION:-7.0.0}
+VERSION=${VERSION:-8.2.0}
SRCVER=$(echo $VERSION | tr -d '.')
BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
@@ -86,9 +86,6 @@ mkdir -p ${PKGNAM}-${VERSION}
unzip -a ${CWD}/${PKGNAM}${SRCVER}.zip -d ${PKGNAM}-${VERSION} || exit 1
cd ${PKGNAM}-${VERSION} || exit 1
-## Do not mess up the CXXFLAGS:
-#cat $CWD/patches/cryptopp_slkcflags.patch | patch -p1 --verbose || exit 1
-
# Fix bogus permissions:
chown -R root:root .
find . \
@@ -101,16 +98,14 @@ find . \
sed -i -e "s,(PREFIX)/lib,(PREFIX)/lib${LIBDIRSUFFIX},g" GNUmakefile
# Compile and install:
-make dynamic $NUMJOBS \
+make all dynamic libcryptopp.pc $NUMJOBS \
CXXFLAGS="${SLKCFLAGS} -DNDEBUG" LDFLAGS="${LDFLAGS}"
-make install PREFIX=$PKG/usr
-
-# Install a pkg-config file:
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig
-cat $CWD/${PKGNAM}.pc | sed \
- -e "s,@LIBDIRSUFFIX@,${LIBDIRSUFFIX},g" \
- -e "s,@VERSION@,${VERSION},g" \
- > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/cryptopp.pc
+make install-lib PREFIX=$PKG/usr
+
+# Fix the installed pkg-config file:
+sed \
+ -i $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/libcryptopp.pc \
+ -e "s,/usr/local,/usr,g"
# Add documentation:
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
diff --git a/deps/cryptopp/cryptopp.pc b/deps/cryptopp/cryptopp.pc
deleted file mode 100644
index 14dca21..0000000
--- a/deps/cryptopp/cryptopp.pc
+++ /dev/null
@@ -1,15 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/lib@LIBDIRSUFFIX@
-includedir=${prefix}/include/cryptopp
-
-Name: Crypto++
-Description: A free C++ class library of cryptographic schemes
-Version: @VERSION@
-URL: http://www.cryptopp.com
-Requires:
-Conflicts:
-Libs: -L${libdir} -lcryptopp
-Libs.private:
-Cflags: -I${includedir}
-