diff options
Diffstat (limited to 'source')
19 files changed, 113 insertions, 32 deletions
diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild index d195f572..a16f6cfd 100755 --- a/source/ap/mariadb/mariadb.SlackBuild +++ b/source/ap/mariadb/mariadb.SlackBuild @@ -91,7 +91,7 @@ tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 cd ${PKGNAM}-$VERSION || exit 1 # Fix mysql_install_db if PAM is not installed: -if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.0 ]; then +if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then zcat $CWD/mysql_install_db.nopam.diff.gz | patch -p1 --verbose || exit 1 # Also no PAM plugin then: zcat $CWD/mysql.no.plugin_auth_pam.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/d/icecream/icecream.SlackBuild b/source/d/icecream/icecream.SlackBuild index 9d90f791..922984f8 100755 --- a/source/d/icecream/icecream.SlackBuild +++ b/source/d/icecream/icecream.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=icecream SRCNAM=icecc VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/k/kernel-configs/config-generic-5.4.17 b/source/k/kernel-configs/config-generic-5.4.18 index e979a2d9..e4ae754d 100644 --- a/source/k/kernel-configs/config-generic-5.4.17 +++ b/source/k/kernel-configs/config-generic-5.4.18 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.17 Kernel Configuration +# Linux/x86 5.4.18 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-5.4.17.x64 b/source/k/kernel-configs/config-generic-5.4.18.x64 index b49fa0e2..a16adf40 100644 --- a/source/k/kernel-configs/config-generic-5.4.17.x64 +++ b/source/k/kernel-configs/config-generic-5.4.18.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.17 Kernel Configuration +# Linux/x86 5.4.18 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-smp-5.4.17-smp b/source/k/kernel-configs/config-generic-smp-5.4.18-smp index 8eb9d8ff..97dd80d8 100644 --- a/source/k/kernel-configs/config-generic-smp-5.4.17-smp +++ b/source/k/kernel-configs/config-generic-smp-5.4.18-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.17 Kernel Configuration +# Linux/x86 5.4.18 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-5.4.17 b/source/k/kernel-configs/config-huge-5.4.18 index becdd890..003d2ea8 100644 --- a/source/k/kernel-configs/config-huge-5.4.17 +++ b/source/k/kernel-configs/config-huge-5.4.18 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.17 Kernel Configuration +# Linux/x86 5.4.18 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-5.4.17.x64 b/source/k/kernel-configs/config-huge-5.4.18.x64 index 16feaac2..b089fcfc 100644 --- a/source/k/kernel-configs/config-huge-5.4.17.x64 +++ b/source/k/kernel-configs/config-huge-5.4.18.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.17 Kernel Configuration +# Linux/x86 5.4.18 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-smp-5.4.17-smp b/source/k/kernel-configs/config-huge-smp-5.4.18-smp index 034c7c2b..83a1e147 100644 --- a/source/k/kernel-configs/config-huge-smp-5.4.17-smp +++ b/source/k/kernel-configs/config-huge-smp-5.4.18-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.17 Kernel Configuration +# Linux/x86 5.4.18 Kernel Configuration # # diff --git a/source/kde/doinst.sh/kde-workspace b/source/kde/doinst.sh/kde-workspace index 793bae74..5834cc55 100644 --- a/source/kde/doinst.sh/kde-workspace +++ b/source/kde/doinst.sh/kde-workspace @@ -13,9 +13,6 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -config etc/kde/kdm/backgroundrc.new -config etc/kde/kdm/kdmrc.new - if [ -x usr/bin/update-desktop-database ]; then usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1 fi @@ -24,3 +21,5 @@ if [ -x usr/bin/update-mime-database ]; then usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 fi +config etc/kde/kdm/backgroundrc.new +config etc/kde/kdm/kdmrc.new diff --git a/source/kde/kde.SlackBuild b/source/kde/kde.SlackBuild index 06ae53d3..0fa0beea 100755 --- a/source/kde/kde.SlackBuild +++ b/source/kde/kde.SlackBuild @@ -327,11 +327,6 @@ build_mod_pkg () { # Strip binaries: strip_binaries $PKG - # If there's any special post-install things to do, do them: - if [ -r $CWD/post-install/${PKGNAME}.post-install ]; then - . $CWD/post-install/${PKGNAME}.post-install - fi - # If this package requires some doinst.sh material, add it here: if [ -r $CWD/doinst.sh/${PKGNAME} ]; then mkdir -p $PKG/install @@ -340,6 +335,11 @@ build_mod_pkg () { >> $PKG/install/doinst.sh fi + # If there's any special post-install things to do, do them: + if [ -r $CWD/post-install/${PKGNAME}.post-install ]; then + . $CWD/post-install/${PKGNAME}.post-install + fi + # If this is a modular package, build it here: if [ -d $SLACK_KDE_BUILD_DIR/${kde_module}/package-$PKGNAME ]; then cd $PKG diff --git a/source/kde/post-install/kde-workspace.post-install b/source/kde/post-install/kde-workspace.post-install index 5cbabf50..f6e0c236 100644 --- a/source/kde/post-install/kde-workspace.post-install +++ b/source/kde/post-install/kde-workspace.post-install @@ -39,6 +39,15 @@ cat $CWD/post-install/kde-workspace/config/Xsession | sed -e "s#/lib#/lib${LIBDI # Add a .new suffix so we don't mangle an existing file: mv $PKG/usr/share/config/kdm/backgroundrc $PKG/usr/share/config/kdm/backgroundrc.new +# Add config file if PAM is installed: +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + mkdir -p $PKG/etc/pam.d + cp -a $CWD/post-install/kde-workspace/config/kde.pamd $PKG/etc/pam.d/kde.new + chown root:root $PKG/etc/pam.d/kde.new + chmod 644 $PKG/etc/pam.d/kde.new + echo "config etc/pam.d/kde.new" >> $PKG/install/doinst.sh +fi + # Move the KDM files someplace FHS compliant: mkdir -p $PKG/etc/kde mv $PKG/usr/share/config/kdm $PKG/etc/kde diff --git a/source/kde/post-install/kde-workspace/config/kde.pamd b/source/kde/post-install/kde-workspace/config/kde.pamd new file mode 100644 index 00000000..7acfd901 --- /dev/null +++ b/source/kde/post-install/kde-workspace/config/kde.pamd @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth include system-auth +auth include postlogin +account include system-auth +password include system-auth +session include system-auth +session required pam_loginuid.so +session optional pam_ck_connector.so nox11 +session include postlogin diff --git a/source/n/dovecot/dovecot.SlackBuild b/source/n/dovecot/dovecot.SlackBuild index 108bce37..b3e65db8 100755 --- a/source/n/dovecot/dovecot.SlackBuild +++ b/source/n/dovecot/dovecot.SlackBuild @@ -48,7 +48,6 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -88,7 +87,7 @@ exit 1 fi rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT +mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-ce-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 @@ -185,4 +184,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xap/xlockmore/doinst.sh b/source/xap/xlockmore/doinst.sh new file mode 100644 index 00000000..3c7968d9 --- /dev/null +++ b/source/xap/xlockmore/doinst.sh @@ -0,0 +1,14 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/pam.d/xlock.new diff --git a/source/xap/xlockmore/xlock.pam b/source/xap/xlockmore/xlock.pam new file mode 100644 index 00000000..fcb7a466 --- /dev/null +++ b/source/xap/xlockmore/xlock.pam @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/source/xap/xlockmore/xlockmore.SlackBuild b/source/xap/xlockmore/xlockmore.SlackBuild index 6e884cf6..25322d6c 100755 --- a/source/xap/xlockmore/xlockmore.SlackBuild +++ b/source/xap/xlockmore/xlockmore.SlackBuild @@ -85,10 +85,13 @@ mkdir -p $PKG/usr/doc/xlockmore-$VERSION cp -a README $PKG/usr/doc/xlockmore-$VERSION/README cp -a docs/* $PKG/usr/doc/xlockmore-$VERSION cp -a $CWD/l-bob.README $PKG/usr/doc/xlockmore-$VERSION -## Normal compile: -#./configure --prefix=/usr --without-opengl --without-mesagl \ -# --without-dtsaver --without-rplay --without-nas --disable-bomb -# Use MesaGL/OpenGL: + +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + USE_PAM="--enable-pam" +else + unset USE_PAM +fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -101,6 +104,7 @@ CXXFLAGS="$SLKCFLAGS" \ --without-motif \ --without-esound \ --without-gtk \ + $USE_PAM \ --enable-appdefaultdir=/etc/X11/app-defaults \ --build=$ARCH-slackware-linux || exit 1 @@ -123,6 +127,13 @@ cat $CWD/slack-desc > $PKG/install/slack-desc find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +if [ ! -z $USE_PAM ]; then + mkdir -p $PKG/etc/pam.d + cat $CWD/xlock.pam > $PKG/etc/pam.d/xlock.new + # Only used for PAM: + zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +fi + # Build the package: cd $PKG /sbin/makepkg -l y -c n $TMP/xlockmore-$VERSION-$ARCH-$BUILD.txz diff --git a/source/xap/xscreensaver/doinst.sh b/source/xap/xscreensaver/doinst.sh new file mode 100644 index 00000000..f2744d09 --- /dev/null +++ b/source/xap/xscreensaver/doinst.sh @@ -0,0 +1,15 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/pam.d/xscreensaver.new + diff --git a/source/xap/xscreensaver/xscreensaver.SlackBuild b/source/xap/xscreensaver/xscreensaver.SlackBuild index 5ecaa8e6..cb9c10cd 100755 --- a/source/xap/xscreensaver/xscreensaver.SlackBuild +++ b/source/xap/xscreensaver/xscreensaver.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2016, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2016, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -71,9 +71,16 @@ rm -rf xscreensaver-$VERSION tar xvf $CWD/xscreensaver-$VERSION.tar.?z || exit 1 cd xscreensaver-$VERSION -# Allow xscreensaver to work setgid shadow. I'd rather avoid requiring -# setuid root on this if at all possible... -zcat $CWD/xscreensaver.setuid.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + USE_PAM="--with-pam" + unset USE_SHADOW +else + # Allow xscreensaver to work setgid shadow. I'd rather avoid requiring + # setuid root on this if at all possible... + zcat $CWD/xscreensaver.setuid.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 + unset USE_PAM + USE_SHADOW="--with-shadow" +fi # Add support for the electricsheep distributed screensaver: zcat $CWD/xscreensaver.electricsheep.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 @@ -100,7 +107,9 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --with-x-app-defaults=/etc/X11/app-defaults \ --with-text-file=/usr/doc/netdate/COPYRIGHT \ - --with-shadow \ + $USE_SHADOW \ + $USE_PAM \ + --without-kerberos \ --with-jpeg \ --with-gl \ --build=$ARCH-slackware-linux || exit 1 @@ -109,9 +118,18 @@ CXXFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install_prefix=$PKG install-strip || exit 1 -# Needed for password unlock: -chown root:shadow $PKG/usr/bin/xscreensaver -chmod 2751 $PKG/usr/bin/xscreensaver +if [ -z $USE_PAM ]; then + # Needed for password unlock: + chown root:shadow $PKG/usr/bin/xscreensaver + chmod 2751 $PKG/usr/bin/xscreensaver +else + # No special perms needed with PAM: + chmod 755 $PKG/usr/bin/xscreensaver + mkdir -p $PKG/etc/pam.d + cat $CWD/xscreensaver.pam > $PKG/etc/pam.d/xscreensaver.new + mkdir -p $PKG/install + zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +fi # This is needed for the menus: mkdir -p $PKG/usr/share/pixmaps @@ -147,4 +165,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $TMP/xscreensaver-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/xap/xscreensaver/xscreensaver.pam b/source/xap/xscreensaver/xscreensaver.pam new file mode 100644 index 00000000..86f37b29 --- /dev/null +++ b/source/xap/xscreensaver/xscreensaver.pam @@ -0,0 +1,3 @@ +#%PAM-1.0 + + auth include system-auth |