Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 security-libs/cracklib/BUILD     |   13 ++++++++++++-
 security-libs/cracklib/DEPENDS   |    8 ++++----
 security-libs/cracklib/HISTORY   |    6 ++++++
 security-libs/cracklib/INSTALL   |    3 ---
 security-libs/cracklib/PRE_BUILD |    4 +++-
 5 files changed, 25 insertions(+), 9 deletions(-)

New commits:
commit 7b86e1ad93eccecdf9ffeb2b2cf9686cc724a15d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    cracklib: Fix build with python3

commit bb81ef02eaa1c57aab6dc061681806ddf07ff70d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    cracklib: remove autotools, not needed anymore

commit 2d65e90129867e2344409e2777ceeea367945803
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    cracklib: Patch libtool for non-glibc systems
    
    There's no ldconfig with musl libc.

commit c5581d9029aa21a7db68da13590fd4efce64e64d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    cracklib: Move unpacking of wordlist to PRE_BUILD

diff --git a/security-libs/cracklib/BUILD b/security-libs/cracklib/BUILD
index c1bdc24..d26b217 100755
--- a/security-libs/cracklib/BUILD
+++ b/security-libs/cracklib/BUILD
@@ -1,4 +1,15 @@
+if is_depends_enabled "$SPELL" python3; then
+  # Fix build failure with Python 3.9.5, and possibly other versions
+  pyinc=("$INSTALL_ROOT"/usr/include/python3.*/Python.h)
+  CFLAGS+=" -I${pyinc%/Python.h}"
+fi &&
 # --datadir=... defines dictionary directory for cracklib;
 # dictionary files ARE platform-dependent so it must not be /usr/shared
 OPTS="$OPTS --datadir=$INSTALL_ROOT/usr/lib" &&
-default_build
+default_build &&
+# no ldconfig for musl
+case "$HOST" in
+  (*-musl)
+    sed -i -e '/^finish_cmds=/{s/=.*/=/}' libtool
+    ;;
+esac
diff --git a/security-libs/cracklib/DEPENDS b/security-libs/cracklib/DEPENDS
index c3d319d..3a476d6 100755
--- a/security-libs/cracklib/DEPENDS
+++ b/security-libs/cracklib/DEPENDS
@@ -1,6 +1,6 @@
-depends  autoconf  &&
-depends  automake  &&
-depends  libtool   &&
 depends  smgl-fhs  &&
 depends  zlib      &&
-optional_depends  PYTHON '--with-python' '--without-python' 'Python support'
+optional_depends python3 \
+                '--with-python PYTHON=python3' \
+                '--without-python' \
+                'Python support'
diff --git a/security-libs/cracklib/HISTORY b/security-libs/cracklib/HISTORY
index 3af3e17..fdbcede 100644
--- a/security-libs/cracklib/HISTORY
+++ b/security-libs/cracklib/HISTORY
@@ -1,3 +1,9 @@
+2021-05-16 Ismael Luceno <ismael AT sourcemage.org>
+       * DEPENDS: removed autotools, not needed anymore
+       * INSTALL, PRE_BUILD: moved unpacking of wordlist to PRE_BUILD
+       * PRE_BUILD: added patching of libtool for non-glibc systems
+       * BUILD, DEPENDS: fixed build with python3
+
 2019-08-26 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.9.7
          SECURITY_PATCH++ fix CVE-2016-6318
diff --git a/security-libs/cracklib/INSTALL b/security-libs/cracklib/INSTALL
index 795825b..2df99e0 100755
--- a/security-libs/cracklib/INSTALL
+++ b/security-libs/cracklib/INSTALL
@@ -1,8 +1,5 @@
 default_install &&
 
-# decompress cracklib's own wordlist file here
-gzip -cd $SOURCE_CACHE/$SOURCE2 > ${SOURCE2%.gz} &&
-
 message "${MESSAGE_COLOR}Cracklib dictionary database is being 
created...${DEFAULT_COLOR}" &&
 ./util/create-cracklib-dict $ALLWORDS ${SOURCE2%.gz}  &&
 
diff --git a/security-libs/cracklib/PRE_BUILD 
b/security-libs/cracklib/PRE_BUILD
index 3aa2d0d..9e646fb 100755
--- a/security-libs/cracklib/PRE_BUILD
+++ b/security-libs/cracklib/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build          &&
 # the next instruction checks the file but doesn't decompress it
-unpack_file 2              
+unpack_file 2 &&
+# decompress cracklib's own wordlist file
+gzip -cd "$SOURCE_CACHE/$SOURCE2" > "$SOURCE_DIRECTORY/${SOURCE2%.gz}"