3 files changed, 25 insertions, 32 deletions
diff --git a/python/python3-passlib/README b/python/python3-passlib/README
index aea3d612fd..b3975f2763 100644
--- a/python/python3-passlib/README
+++ b/python/python3-passlib/README
@@ -4,3 +4,5 @@ as well as a framework for managing existing password hashes. It's
 designed to be useful for a wide range of tasks, from verifying
 a hash found in /etc/shadow, to providing full-strength password
 hashing for multi-user applications.
+
+INFO: Switched to https://github.com/notypecheck/passlib fork
diff --git a/python/python3-passlib/python3-passlib.SlackBuild b/python/python3-passlib/python3-passlib.SlackBuild
index cd1cfc1746..8fdc033493 100644
--- a/python/python3-passlib/python3-passlib.SlackBuild
+++ b/python/python3-passlib/python3-passlib.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for python3-passlib
 
-# Copyright 2023  fourtysixandtwo <fourtysixandtwo@sliderr.net>
+# Copyright 2023-2025  fourtysixandtwo <fourtysixandtwo@sliderr.net>
 # Copyright 2015-2017, 2020 Brenton Earl <brent@exitstatusone.com>
 # All rights reserved.
 #
@@ -23,11 +23,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20251017 46and2: Updating to libpass fork as passlib is unmaintained and has
+#  issues with python3-bcrypt>=5.0. Thanks to Jonathan Chapman for the heads
+#  up and also contributing the fix to libpass.
+#  https://github.com/notypecheck/passlib/pull/21
+#  (libpass is the pypi project name)
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=python3-passlib
-SRCNAM=${PRGNAM#python3-*}
-VERSION=${VERSION:-1.7.4}
+SRCNAM=libpass
+VERSION=${VERSION:-1.9.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -49,23 +55,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-elif [ "$ARCH" = "aarch64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -75,19 +64,21 @@ rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+find . ! -type l    -a \
+  \(     -perm /111 -a ! -perm 755 -a -exec chmod -f 755 {} + \) -o \
+  \(   ! -perm /111 -a ! -perm 644 -a -exec chmod -f 644 {} + \)
+
+PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
+export PYTHONPATH=/opt/python$PYVER/site-packages
 
-python3 setup.py install --root=$PKG
+python3 -m build --no-isolation
+python3 -m installer -d "$PKG" dist/*.whl
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README LICENSE PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md README.md LICENSE PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/python3-passlib/python3-passlib.info b/python/python3-passlib/python3-passlib.info
index 64e8e25b44..46b039e88a 100644
--- a/python/python3-passlib/python3-passlib.info
+++ b/python/python3-passlib/python3-passlib.info
@@ -1,10 +1,10 @@
 PRGNAM="python3-passlib"
-VERSION="1.7.4"
-HOMEPAGE="https://pypi.org/project/passlib/"
-DOWNLOAD="https://files.pythonhosted.org/packages/source/p/passlib/passlib-1.7.4.tar.gz"
-MD5SUM="3a229cbd00dfb33e99885b43325e0591"
+VERSION="1.9.3"
+HOMEPAGE="https://github.com/notypecheck/passlib"
+DOWNLOAD="https://files.pythonhosted.org/packages/source/l/libpass/libpass-1.9.3.tar.gz"
+MD5SUM="adb10a034901fe710584ce9e2a1d9da8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="python3-hatchling"
 MAINTAINER="fourtysixandtwo"
 EMAIL="fourtysixandtwo@sliderr.net"