diff --git a/l/cracklib/cracklib-2.9.6.tar.gz.sha256 b/l/cracklib/cracklib-2.9.6.tar.gz.sha256 deleted file mode 100644 index fadba2ad..00000000 --- a/l/cracklib/cracklib-2.9.6.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -17cf76943de272fd579ed831a1fd85339b393f8d00bf9e0d17c91e972f583343 cracklib-2.9.6.tar.gz diff --git a/l/cracklib/cracklib-2.9.7.tar.gz.sha256 b/l/cracklib/cracklib-2.9.7.tar.gz.sha256 new file mode 100644 index 00000000..f9a0e70f --- /dev/null +++ b/l/cracklib/cracklib-2.9.7.tar.gz.sha256 @@ -0,0 +1 @@ +8b6fd202f3f1d8fa395d3b7a5d821227cfd8bb4a9a584a7ae30cf62cea6287dd cracklib-2.9.7.tar.gz diff --git a/l/cracklib/cracklib.SlackBuild b/l/cracklib/cracklib.SlackBuild index d0d6f0d7..16226c6f 100755 --- a/l/cracklib/cracklib.SlackBuild +++ b/l/cracklib/cracklib.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash # Build script for Slackware -# Copyright (C) 2017 Damien Goutte-Gattat +# Copyright (C) 2017,2019 Damien Goutte-Gattat # # Redistribution and use of this script, with or without modifications, # is permitted provided that the following conditions are met: @@ -27,9 +27,9 @@ # Source package infos NAMESRC=${NAMESRC:-cracklib} -VERSION=${VERSION:-2.9.6} +VERSION=${VERSION:-2.9.7} ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz} -WGET=${WGET:-https://github.com/cracklib/cracklib/releases/download/cracklib-$VERSION/$ARCHIVE} +WGET=${WGET:-https://github.com/cracklib/cracklib/releases/download/v$VERSION/$ARCHIVE} # Build infos NAMEPKG=${NAMEPKG:-cracklib} @@ -84,20 +84,42 @@ cd $TMP echo "Building $ARCHIVE..." tar xf $CWD/$ARCHIVE cd $NAME -CFLAGS=$CPUOPT \ -CXXFLAGS=$CPUOPT \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib$LIBDIRSUFFIX \ - --disable-static \ - --disable-dependency-tracking \ - --build=$ARCH-slackware-linux -make -j $JOBS -make install-strip DESTDIR=$PKG +mkdir build1 build2 +(cd build1 + CFLAGS=$CPUOPT \ + CXXFLAGS=$CPUOPT \ + ../configure \ + --prefix=/usr \ + --libdir=/usr/lib$LIBDIRSUFFIX \ + --disable-static \ + --disable-dependency-tracking \ + --build=$ARCH-slackware-linux + make -j $JOBS + make install-strip DESTDIR=$PKG -# Install dictionary -sh ./util/cracklib-format dicts/cracklib-small | \ - ./util/cracklib-packer $PKG/usr/share/cracklib/pw_dict + # Install dictionary + sh ../util/cracklib-format ../dicts/cracklib-small | \ + ./util/cracklib-packer $PKG/usr/share/cracklib/pw_dict +) + +# Now build the Python3. Unfortunately that requires some +# crude editing of the build system, which is otherwise +# unable to find the Python 3 headers. +(cd build2 + sed -i -e 's,python${PYTHON_VERSION}/Python.h,python${PYTHON_VERSION}m/Python.h,' ../configure + PYTHON=python3 \ + CFLAGS=$CPUOPT \ + CXXFLAGS=$CPUOPT \ + ../configure \ + --prefix=/usr \ + --libdir=/usr/lib$LIBDIRSUFFIX \ + --disable-static \ + --disable-dependency-tracking \ + --build=$ARCH-slackware-linux + sed -i -e 's,python3.7/Python.h,python3.7m/Python.h,' python/Makefile + make -j $JOBS + make -C python install DESTDIR=$PKG +) # Install the documentation mkdir -p $PKG/usr/doc/$NAME