5 files changed, 34 insertions, 14 deletions
diff --git a/source/n/cifs-utils/cifs-utils.SlackBuild b/source/n/cifs-utils/cifs-utils.SlackBuild
index 58a2c8a4e..dbf860edf 100755
--- a/source/n/cifs-utils/cifs-utils.SlackBuild
+++ b/source/n/cifs-utils/cifs-utils.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=cifs-utils
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -90,6 +90,13 @@ find . \
 
 autoreconf -vif
 
+# Choose correct options depending on whether PAM is installed:
+if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
+  PAM_OPTIONS="--enable-pam --with-pamdir=/lib${LIBDIRSUFFIX}/security"
+else
+  PAM_OPTIONS=""
+fi
+
 # Configure:
 CFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -97,6 +104,7 @@ CFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
+  $PAM_OPTIONS \
   --build=$ARCH-slackware-linux || exit 1
 
 # Build and install:
diff --git a/source/n/fetchmail/fetchmail.SlackBuild b/source/n/fetchmail/fetchmail.SlackBuild
index c60bcad93..81a0fb70d 100755
--- a/source/n/fetchmail/fetchmail.SlackBuild
+++ b/source/n/fetchmail/fetchmail.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2016, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2016, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=fetchmail
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -64,14 +64,12 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf fetchmail-$VERSION
-tar xvf $CWD/fetchmail-$VERSION.tar.xz || exit 1
+tar xvf $CWD/fetchmail-$VERSION.tar.?z || exit 1
 cd fetchmail-$VERSION || exit 1
 
 # Patch for OpenSSL 1.1.1 compatibility:
 zcat $CWD/fetchmail.openssl111.diff.gz | patch -p1 --verbose || exit 1
 
-# this is the sloppiest source tarball ever
-# [NOTE: *was*...  the new maintainers are much better]
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -79,12 +77,16 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
+export PYTHON=python3
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
   --enable-nls \
   --with-ssl \
+  --with-kerberos5 \
+  --with-gssapi \
   --program-prefix="" \
   --program-suffix="" \
   --build=$ARCH-slackware-linux
@@ -116,4 +118,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/fetchmail-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/n/pinentry/pinentry.SlackBuild b/source/n/pinentry/pinentry.SlackBuild
index e2bd5722b..421b3d070 100755
--- a/source/n/pinentry/pinentry.SlackBuild
+++ b/source/n/pinentry/pinentry.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=pinentry
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild
index c7e364d4f..8c09f50cf 100755
--- a/source/n/samba/samba.SlackBuild
+++ b/source/n/samba/samba.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=samba
 VERSION=${VERSION:-$(echo samba-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 if [ -e $CWD/machine.conf ]; then
   . $CWD/machine.conf ]
@@ -102,7 +102,7 @@ find . \
 
 # Choose correct options depending on whether PAM is installed:
 if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
-  PAM_OPTIONS="--with-pam --with-pammodulesdir=/lib/security --with-system-mitkrb5 --with-experimental-mit-ad-dc"
+  PAM_OPTIONS="--with-pam --with-pammodulesdir=/lib${LIBDIRSUFFIX}/security --with-system-mitkrb5 --with-experimental-mit-ad-dc"
   unset SHADOW_OPTIONS
 else
   unset PAM_OPTIONS
diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
index 2e3181dd0..61b993f81 100755
--- a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
+++ b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Copyright 2004-2008 Eric Hameleers, Eindhoven, NL
-# Copyright 2008-2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008-2020  Patrick J. Volkerding, Sebeka, MN, USA
 #  Permission to use, copy, modify, and distribute this software for
 #  any purpose with or without fee is hereby granted, provided that
 #  the above copyright notice and this permission notice appear in all
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=wpa_supplicant
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 SRCVERSION=$(printf $VERSION | tr _ -)
 
@@ -103,12 +103,23 @@ make $NUMJOBS \
   BINDIR=/usr/sbin \
   LIBDIR=/usr/lib${LIBDIRSUFFIX} || exit 1
 
-# Build the Qt4 GUI client
+# Build the Qt5 GUI client
+
+
+
+#The following directory name is labelled qt4, but is compatible with qt5.
+#pushd wpa_gui-qt4 &&
+#qmake wpa_gui.pro &&
+#make &&
+#popd
+
+pushd wpa_gui-qt4
+qmake-qt5 wpa_gui.pro
 CFLAGS="$SLKCFLAGS" \
 make $NUMJOBS \
-  wpa_gui-qt4 \
   BINDIR=/usr/sbin \
   LIBDIR=/usr/lib${LIBDIRSUFFIX} || exit 1
+popd
 
 # Make sure man pages are built
 make -C doc/docbook man