summaryrefslogtreecommitdiffstats
path: root/source/a/cryptsetup/cryptsetup.SlackBuild
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-07-29 23:17:22 +0000
committer Eric Hameleers <alien@slackware.com>2019-07-30 08:59:48 +0200
commitaf4fda568788c131ce0a660dc40f621e2bbec3e1 (patch)
treeb16fee5c2b9d93c898f85f11206dc3a68da5390c /source/a/cryptsetup/cryptsetup.SlackBuild
parent110278b262dbdbd27af3dc1e21c4e072462208c4 (diff)
downloadcurrent-af4fda568788c131ce0a660dc40f621e2bbec3e1.tar.gz
current-af4fda568788c131ce0a660dc40f621e2bbec3e1.tar.xz
Mon Jul 29 23:17:22 UTC 201920190729231722
a/aaa_elflibs-15.0-x86_64-10.txz: Rebuilt. Upgraded: libglib-2.0.so.0.6000.6, libgmodule-2.0.so.0.6000.6, libgobject-2.0.so.0.6000.6, libgthread-2.0.so.0.6000.6, liblber-2.4.so.2.10.11, libldap-2.4.so.2.10.11. Added: libargon2.so.1, libjson-c.so.4.0.0. a/cryptsetup-2.1.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. Thanks to Robby Workman. a/efibootmgr-20190528_d9eb7f1-x86_64-1.txz: Upgraded. Even though efibootmgr-17 will compile against efivar from git, it's probably best to take this from git as well to keep things closely synced. a/efivar-20190618_272b216-x86_64-1.txz: Upgraded. Switch to git to fix "efibootmgr -v" failing with a parse error. a/elilo-3.16-x86_64-10.txz: Rebuilt. eliloconfig: If /boot/initrd.gz exists, install the generic kernel and initrd. Otherwise, install the huge kernel. a/lvm2-2.03.05-x86_64-1.txz: Upgraded. Back to lvm2-2.03.x (cryptsetup needs it). Hopefully there's been enough time for most of the bugs to have been ironed out. l/argon2-20190702-x86_64-3.txz: Rebuilt. Fix shared library permissions. l/aspell-0.60.7-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_57-x86_64-1.txz: Upgraded. l/python-docutils-0.15.1-x86_64-1.txz: Upgraded. n/ipset-7.3-x86_64-1.txz: Upgraded. xap/geeqie-1.5-x86_64-1.txz: Upgraded. xfce/garcon-0.6.4-x86_64-1.txz: Upgraded. xfce/thunar-volman-0.9.4-x86_64-1.txz: Upgraded. xfce/tumbler-0.2.6-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/cryptsetup/cryptsetup.SlackBuild')
-rwxr-xr-xsource/a/cryptsetup/cryptsetup.SlackBuild25
1 files changed, 15 insertions, 10 deletions
diff --git a/source/a/cryptsetup/cryptsetup.SlackBuild b/source/a/cryptsetup/cryptsetup.SlackBuild
index 318417aa8..4e9d550b3 100755
--- a/source/a/cryptsetup/cryptsetup.SlackBuild
+++ b/source/a/cryptsetup/cryptsetup.SlackBuild
@@ -36,7 +36,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=cryptsetup
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -95,6 +95,7 @@ CFLAGS="$SLKCFLAGS" \
--localstatedir=/var \
--sysconfdir=/etc \
--enable-cryptsetup-reencrypt \
+ --enable-libargon2 \
--mandir=/usr/man \
--docdir=/usr/doc/cryptsetup-$VERSION \
--build=$ARCH-slackware-linux || exit 1
@@ -102,15 +103,19 @@ CFLAGS="$SLKCFLAGS" \
make || exit 1
make DESTDIR=$PKG install || exit 1
-# Move the shared library to $PKG/lib${LIBDIRSUFFIX}:
-mkdir -p $PKG/lib${LIBDIRSUFFIX}
-( cd $PKG/usr/lib${LIBDIRSUFFIX}
- for file in lib*.so.?.* ; do
- mv $file ../../lib${LIBDIRSUFFIX}
- ln -sf ../../lib${LIBDIRSUFFIX}/$file .
- done
- cp -a lib*.so.? ../../lib${LIBDIRSUFFIX}
-)
+# __DISABLED__
+# If libargon2 and libjson-c are both under /usr, there's very little reason to
+# move this. This continues a trend generally going on with Linux based OSes to
+# ignore weird /usr-is-a-separate-partition corner cases.
+## Move the shared library to $PKG/lib${LIBDIRSUFFIX}:
+#mkdir -p $PKG/lib${LIBDIRSUFFIX}
+#( cd $PKG/usr/lib${LIBDIRSUFFIX}
+# for file in lib*.so.*.* ; do
+# mv $file ../../lib${LIBDIRSUFFIX}
+# ln -sf ../../lib${LIBDIRSUFFIX}/$file .
+# done
+# cp -a lib*.so.? ../../lib${LIBDIRSUFFIX}
+#)
# Don't ship .la files:
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la