diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2020-02-07 22:32:38 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2020-02-08 08:59:48 +0100 |
| commit | 080300e1e7dec7bb1a6297b5a4406e2c0be46048 (patch) | |
| tree | 4ca397920d9a177af9eb3ca6781e2c8498b3672d /source/ap/cups | |
| parent | 194ec853e8f20fd32d5a91eec74ff77383093f4e (diff) | |
| download | current-080300e1e7dec7bb1a6297b5a4406e2c0be46048.tar.gz | |
Fri Feb 7 22:32:38 UTC 202020200207223238
a/kernel-firmware-20200206_5351afe-noarch-1.txz: Upgraded.
ap/ghostscript-9.50-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
ap/gutenprint-5.3.3-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
ap/nano-4.8-x86_64-1.txz: Upgraded.
ap/screen-4.8.0-x86_64-1.txz: Upgraded.
ap/vim-8.2.0224-x86_64-1.txz: Upgraded.
d/cvs-1.11.23-x86_64-4.txz: Rebuilt.
Recompiled against krb5-1.17.1.
d/strace-5.5-x86_64-1.txz: Upgraded.
kde/kdelibs-4.14.38-x86_64-6.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/gtk+2-2.24.32-x86_64-3.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/gtk+3-3.24.13-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/libsoup-2.68.3-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/libssh-0.9.3-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/loudmouth-1.5.3-x86_64-4.txz: Rebuilt.
Recompiled against krb5-1.17.1.
l/neon-0.30.2-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
n/cifs-utils-6.10-x86_64-2.txz: Rebuilt.
Recompiled to build cifs.upcall.
n/curl-7.68.0-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
n/cyrus-sasl-2.1.27-x86_64-2.txz: Rebuilt.
Recompiled against krb5-1.17.1.
xap/vim-gvim-8.2.0224-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/ap/cups')
| -rwxr-xr-x | source/ap/cups/cups.SlackBuild | 19 | ||||
| -rw-r--r-- | source/ap/cups/doinst.sh | 3 |
2 files changed, 21 insertions, 1 deletions
diff --git a/source/ap/cups/cups.SlackBuild b/source/ap/cups/cups.SlackBuild index de09891b..60ff31fc 100755 --- a/source/ap/cups/cups.SlackBuild +++ b/source/ap/cups/cups.SlackBuild @@ -81,6 +81,15 @@ cd cups-$VERSION || exit 1 sed -i.orig -e 's#$exec_prefix/lib/cups#$libdir/cups#g' configure +# Choose correct options depending on whether PAM is installed: +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + PAM_OPTIONS="--enable-pam" + unset SHADOW_OPTIONS +else + unset PAM_OPTIONS + SHADOW_OPTIONS="--disable-pam" +fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -89,7 +98,8 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-gnutls=yes \ --enable-cdsassl=no \ --docdir=/usr/doc \ - --disable-pam \ + $PAM_OPTIONS \ + $SHADOW_OPTIONS \ --disable-avahi \ --disable-dnssd \ --build=$ARCH-slackware-linux || exit 1 @@ -97,6 +107,13 @@ CXXFLAGS="$SLKCFLAGS" \ make $NUMJOBS || exit 1 make BUILDROOT=$PKG install || exit 1 +if [ ! -z "$PAM_OPTIONS" ]; then + # Allow pam config files to be edited by root: + chmod 644 $PKG/etc/pam.d/* + # Make PAM file .new: + mv $PKG/etc/pam.d/cups $PKG/etc/pam.d/cups.new +fi + # Blacklist the usblp module just to make sure that it doesn't cause # any problems: mkdir -p $PKG/lib/modprobe.d diff --git a/source/ap/cups/doinst.sh b/source/ap/cups/doinst.sh index 6807cc3a..d0349bca 100644 --- a/source/ap/cups/doinst.sh +++ b/source/ap/cups/doinst.sh @@ -13,6 +13,9 @@ for file in etc/cups/*.new ; do config $file done config etc/dbus-1/system.d/cups.conf.new +if [ -r etc/pam.d/cups.new ]; then + config etc/pam.d/cups.new +fi # This file will just have to go. It appeared for a while during a -current # devel period and has never been part of a stable release. |