12 files changed, 19 insertions, 9 deletions
diff --git a/testing/packages/PAM/ConsoleKit2-1.2.1-x86_64-2_pam.txt b/testing/packages/PAM/ConsoleKit2-1.2.1-x86_64-3_pam.txt
index ef6a179a..ef6a179a 100644
--- a/testing/packages/PAM/ConsoleKit2-1.2.1-x86_64-2_pam.txt
+++ b/testing/packages/PAM/ConsoleKit2-1.2.1-x86_64-3_pam.txt
diff --git a/testing/packages/PAM/cifs-utils-6.10-x86_64-2_pam.txt b/testing/packages/PAM/cifs-utils-6.10-x86_64-3_pam.txt
index cdd5c072..cdd5c072 100644
--- a/testing/packages/PAM/cifs-utils-6.10-x86_64-2_pam.txt
+++ b/testing/packages/PAM/cifs-utils-6.10-x86_64-3_pam.txt
diff --git a/testing/packages/PAM/gnome-keyring-3.34.0-x86_64-1_pam.txt b/testing/packages/PAM/gnome-keyring-3.34.0-x86_64-2_pam.txt
index 030f0c90..030f0c90 100644
--- a/testing/packages/PAM/gnome-keyring-3.34.0-x86_64-1_pam.txt
+++ b/testing/packages/PAM/gnome-keyring-3.34.0-x86_64-2_pam.txt
diff --git a/testing/packages/PAM/libcgroup-0.41-x86_64-5_pam.txt b/testing/packages/PAM/libcgroup-0.41-x86_64-6_pam.txt
index 23b5774d..23b5774d 100644
--- a/testing/packages/PAM/libcgroup-0.41-x86_64-5_pam.txt
+++ b/testing/packages/PAM/libcgroup-0.41-x86_64-6_pam.txt
diff --git a/testing/packages/PAM/libpwquality-1.4.2-x86_64-1_pam.txt b/testing/packages/PAM/libpwquality-1.4.2-x86_64-2_pam.txt
index f1146549..f1146549 100644
--- a/testing/packages/PAM/libpwquality-1.4.2-x86_64-1_pam.txt
+++ b/testing/packages/PAM/libpwquality-1.4.2-x86_64-2_pam.txt
diff --git a/testing/packages/PAM/mariadb-10.4.12-x86_64-1_pam.txt b/testing/packages/PAM/mariadb-10.4.12-x86_64-2_pam.txt
index d4500582..d4500582 100644
--- a/testing/packages/PAM/mariadb-10.4.12-x86_64-1_pam.txt
+++ b/testing/packages/PAM/mariadb-10.4.12-x86_64-2_pam.txt
diff --git a/testing/packages/PAM/pam-1.3.1-x86_64-1_pam.txt b/testing/packages/PAM/pam-1.3.1-x86_64-2_pam.txt
index eeab9203..eeab9203 100644
--- a/testing/packages/PAM/pam-1.3.1-x86_64-1_pam.txt
+++ b/testing/packages/PAM/pam-1.3.1-x86_64-2_pam.txt
diff --git a/testing/packages/PAM/polkit-0.116-x86_64-1_pam.txt b/testing/packages/PAM/polkit-0.116-x86_64-2_pam.txt
index 3fab4403..3fab4403 100644
--- a/testing/packages/PAM/polkit-0.116-x86_64-1_pam.txt
+++ b/testing/packages/PAM/polkit-0.116-x86_64-2_pam.txt
diff --git a/testing/packages/PAM/samba-4.11.6-x86_64-1_pam.txt b/testing/packages/PAM/samba-4.11.6-x86_64-2_pam.txt
index e1800f15..e1800f15 100644
--- a/testing/packages/PAM/samba-4.11.6-x86_64-1_pam.txt
+++ b/testing/packages/PAM/samba-4.11.6-x86_64-2_pam.txt
diff --git a/testing/source/PAM/a/libpwquality/libpwquality.SlackBuild b/testing/source/PAM/a/libpwquality/libpwquality.SlackBuild
index ac1555a6..c4104585 100755
--- a/testing/source/PAM/a/libpwquality/libpwquality.SlackBuild
+++ b/testing/source/PAM/a/libpwquality/libpwquality.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libpwquality
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -100,7 +100,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --disable-static \
-  --with-securedir=/lib/security \
+  --with-securedir=/lib${LIBDIRSUFFIX}/security \
   --with-python-binary=python3 \
   --build=$ARCH-slackware-linux || exit 1
 make $NUMJOBS || make || exit 1
@@ -109,6 +109,9 @@ make install DESTDIR=$PKG || exit 1
 # Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
+# The ones in /lib${LIBDIRSUFFIX}/security can also go:
+rm -f $PKG/lib${LIBDIRSUFFIX}/security/*.la
+
 mv $PKG/etc/security/pwquality.conf $PKG/etc/security/pwquality.conf.new
 
 # Strip binaries:
diff --git a/testing/source/PAM/a/pam/pam.SlackBuild b/testing/source/PAM/a/pam/pam.SlackBuild
index ccd19e30..41a32107 100755
--- a/testing/source/PAM/a/pam/pam.SlackBuild
+++ b/testing/source/PAM/a/pam/pam.SlackBuild
@@ -27,7 +27,7 @@ SRCNAM=Linux-PAM
 PKGNAM=pam
 PAMRHVER=${PAMRHVER:-$(echo pam-redhat-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -123,8 +123,6 @@ zcat $CWD/patches/pam.etc.environment.better.comments.diff.gz | patch -p1 --verb
 
 autoreconf -ivf || exit 1
 
-# Using --enable-securedir=/lib/security/ because some downstream software
-# (last I checked) assumes this, so /lib64/security/ was a problem...
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -132,7 +130,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --includedir=/usr/include/security \
-  --enable-securedir=/lib/security \
+  --enable-securedir=/lib${LIBDIRSUFFIX}/security \
   --datarootdir=/usr/share \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -157,11 +155,11 @@ make install DESTDIR=$PKG || exit 1
 # Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
-# The ones in /lib/security can also go:
-rm -f $PKG/lib/security/*.la
+# The ones in /lib${LIBDIRSUFFIX}/security can also go:
+rm -f $PKG/lib${LIBDIRSUFFIX}/security/*.la
 
 # Add extra symlinks added by pam.spec:
-( cd $PKG/lib/security
+( cd $PKG/lib${LIBDIRSUFFIX}/security
   for type in acct auth passwd session ; do
     ln -sf pam_unix.so pam_unix_${type}.so
   done
diff --git a/testing/source/PAM/buildlist-fix-lib-security-location b/testing/source/PAM/buildlist-fix-lib-security-location
new file mode 100644
index 00000000..4b49d382
--- /dev/null
+++ b/testing/source/PAM/buildlist-fix-lib-security-location
@@ -0,0 +1,9 @@
+a/pam/pam.SlackBuild
+a/libpwquality/libpwquality.SlackBuild
+source/a/libcgroup/libcgroup.SlackBuild
+source/l/polkit/polkit.SlackBuild
+source/l/ConsoleKit2/ConsoleKit2.SlackBuild
+source/l/gnome-keyring/gnome-keyring.SlackBuild
+source/n/cifs-utils/cifs-utils.SlackBuild
+source/ap/mariadb/mariadb.SlackBuild
+source/n/samba/samba.SlackBuild