From 6087aff6cae8d8d4c46ce086cb7b70a5af412d2b Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sat, 15 Feb 2020 22:57:25 +0000
Subject: Sat Feb 15 22:57:25 UTC 2020

a/libcgroup-0.41-x86_64-6.txz:  Rebuilt.
ap/mariadb-10.4.12-x86_64-2.txz:  Rebuilt.
d/Cython-0.29.15-x86_64-1.txz:  Upgraded.
d/cmake-3.16.4-x86_64-2.txz:  Rebuilt.
  Recompiled against qt5-5.13.2.
d/doxygen-1.8.17-x86_64-2.txz:  Rebuilt.
  Recompiled against qt5-5.13.2.
l/ConsoleKit2-1.2.1-x86_64-3.txz:  Rebuilt.
l/gnome-keyring-3.34.0-x86_64-2.txz:  Rebuilt.
l/imagemagick-7.0.9_23-x86_64-1.txz:  Upgraded.
l/polkit-0.116-x86_64-2.txz:  Rebuilt.
l/python-future-0.18.2-x86_64-1.txz:  Added.
  This is needed by fetchmailconf and will probably see additional use as
  projects jump off of the sinking Python 2 ship.
l/v4l-utils-1.18.0-x86_64-2.txz:  Rebuilt.
  Recompiled against qt5-5.13.2.
n/cifs-utils-6.10-x86_64-3.txz:  Rebuilt.
n/fetchmail-6.4.2-x86_64-1.txz:  Upgraded.
n/pinentry-1.1.0-x86_64-3.txz:  Rebuilt.
  Recompiled against qt5-5.13.2.
n/samba-4.11.6-x86_64-2.txz:  Rebuilt.
n/wpa_supplicant-2.9-x86_64-2.txz:  Rebuilt.
  Recompiled against qt5-5.13.2.
xap/xpdf-4.02-x86_64-3.txz:  Rebuilt.
  Recompiled against qt5-5.13.2.
testing/packages/PAM/ConsoleKit2-1.2.1-x86_64-3_pam.txz:  Rebuilt.
  Put the pam security modules in /lib${LIBDIRSUFFIX}/security.
  Remove .la files in /lib${LIBDIRSUFFIX}/security.
testing/packages/PAM/cifs-utils-6.10-x86_64-3_pam.txz:  Rebuilt.
  Put the pam security modules in /lib${LIBDIRSUFFIX}/security.
testing/packages/PAM/gnome-keyring-3.34.0-x86_64-2_pam.txz:  Rebuilt.
  Put the pam security modules in /lib${LIBDIRSUFFIX}/security.
  Remove .la files in /lib${LIBDIRSUFFIX}/security.
testing/packages/PAM/libcgroup-0.41-x86_64-6_pam.txz:  Rebuilt.
  Put the pam security modules in /lib${LIBDIRSUFFIX}/security.
  Remove .la files in /lib${LIBDIRSUFFIX}/security.
testing/packages/PAM/libpwquality-1.4.2-x86_64-2_pam.txz:  Rebuilt.
  Put the pam security modules in /lib${LIBDIRSUFFIX}/security.
  Remove .la files in /lib${LIBDIRSUFFIX}/security.
testing/packages/PAM/mariadb-10.4.12-x86_64-2_pam.txz:  Rebuilt.
  Put the pam security modules in /lib${LIBDIRSUFFIX}/security.
testing/packages/PAM/pam-1.3.1-x86_64-2_pam.txz:  Rebuilt.
  Put the pam security modules in /lib${LIBDIRSUFFIX}/security to support
  multilib. Thanks to GazL.
testing/packages/PAM/polkit-0.116-x86_64-2_pam.txz:  Rebuilt.
  Rebuilt using --with-pam-module-dir=/lib${LIBDIRSUFFIX}/security.
testing/packages/PAM/samba-4.11.6-x86_64-2_pam.txz:  Rebuilt.
  Put the pam security modules in /lib${LIBDIRSUFFIX}/security.
---
 testing/source/PAM/a/pam/pam.SlackBuild | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'testing/source/PAM/a/pam/pam.SlackBuild')

diff --git a/testing/source/PAM/a/pam/pam.SlackBuild b/testing/source/PAM/a/pam/pam.SlackBuild
index ccd19e304..41a321079 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
-- 
cgit v1.2.3-65-gdbad