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/l/polkit | |
| 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/l/polkit')
| -rw-r--r-- | source/l/polkit/doinst.sh | 3 | ||||
| -rwxr-xr-x | source/l/polkit/polkit.SlackBuild | 17 |
2 files changed, 19 insertions, 1 deletions
diff --git a/source/l/polkit/doinst.sh b/source/l/polkit/doinst.sh index 887bb792..ebcfef74 100644 --- a/source/l/polkit/doinst.sh +++ b/source/l/polkit/doinst.sh @@ -11,6 +11,9 @@ config() { } config etc/polkit-1/rules.d/20-plugdev-group-mount-override.rules.new config etc/polkit-1/rules.d/10-org.freedesktop.NetworkManager.rules.new +if [ -r etc/pam.d/polkit-1.new ]; then + config etc/pam.d/polkit-1.new +fi # Make sure the polkitd user and group exist: if ! grep -q "^polkitd:" etc/passwd ; then diff --git a/source/l/polkit/polkit.SlackBuild b/source/l/polkit/polkit.SlackBuild index 6de6b565..a9a21576 100755 --- a/source/l/polkit/polkit.SlackBuild +++ b/source/l/polkit/polkit.SlackBuild @@ -89,6 +89,15 @@ if ! grep -q "^polkitd:" /etc/passwd ; then useradd -c "PolicyKit daemon owner" -d /var/lib/polkit -u 87 -g polkitd -s /bin/false polkitd fi +# Choose correct options depending on whether PAM is installed: +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + PAM_OPTIONS="--with-authfw=pam --with-pam-module-dir=/lib/security" + unset SHADOW_OPTIONS +else + unset PAM_OPTIONS + SHADOW_OPTIONS="--with-authfw=shadow" +fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -105,7 +114,8 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-introspection \ --enable-libsystemd-login=no \ --enable-libelogind=no \ - --with-authfw=shadow \ + $PAM_OPTIONS \ + $SHADOW_OPTIONS \ --enable-verbose-mode \ --with-os-type=Slackware \ --build=$ARCH-slackware-linux || exit 1 @@ -125,6 +135,11 @@ mkdir -p $PKG/var/lib/polkit cat $CWD/10-org.freedesktop.NetworkManager.rules > $PKG/etc/polkit-1/rules.d/10-org.freedesktop.NetworkManager.rules.new cat $CWD/20-plugdev-group-mount-override.rules > $PKG/etc/polkit-1/rules.d/20-plugdev-group-mount-override.rules.new +if [ ! -z "$PAM_OPTIONS" ]; then + # Make the PAM file .new: + mv $PKG/etc/pam.d/polkit-1 $PKG/etc/pam.d/polkit-1.new +fi + # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null |