diff options
Diffstat (limited to 'source/xap/xscreensaver/xscreensaver.SlackBuild')
| -rwxr-xr-x | source/xap/xscreensaver/xscreensaver.SlackBuild | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/source/xap/xscreensaver/xscreensaver.SlackBuild b/source/xap/xscreensaver/xscreensaver.SlackBuild index d5f262c12..7a2fbe021 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, 2019, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2016, 2018, 2019, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xscreensaver VERSION=${VERSION:-$(echo xscreensaver-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -75,9 +75,12 @@ if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then USE_PAM="--with-pam" unset USE_SHADOW else + ## NOTE: The patch below (and support for setgid shadow) is broken and + ## unmaintained. But the broken bits will be left as hints for anyone + ## down the line who might care. # 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 + #zcat $CWD/xscreensaver.setuid.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 unset USE_PAM USE_SHADOW="--with-shadow" fi @@ -85,12 +88,6 @@ fi # Add support for the electricsheep distributed screensaver: zcat $CWD/xscreensaver.electricsheep.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -# Remove a feature that pops up a nag screen claiming the version is old -# after one year. Just don't send in bug reports on an old version, OK folks? -# I hate to swim against upstream, but with all respect this feature is not -# helpful to distributions. -zcat $CWD/xscreensaver.no.expiration.date.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 - # Make the description of the xscreensaver settings be clearly for xscreensaver # as opposed to a generic "screensaver" settings zcat $CWD/clarify-desc-in-xfce-settings.patch.gz | patch -p1 --verbose || exit 1 @@ -127,8 +124,12 @@ if [ -z $USE_PAM ]; then chown root:shadow $PKG/usr/bin/xscreensaver chmod 2751 $PKG/usr/bin/xscreensaver else + ## Commenting out the chmod below, since as of v6.00 this binary is no longer + ## made setuid at installation. But if that changes, we'll go along with it + ## since jwz says it may be required to prevent OOM killer abuse from + ## unlocking the screen. # No special perms needed with PAM: - chmod 755 $PKG/usr/bin/xscreensaver + #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 |