summaryrefslogtreecommitdiffstats
path: root/source/a
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-05-18 15:19:38 +0000
committer Eric Hameleers <alien@slackware.com>2023-05-18 18:33:34 +0200
commit5bf641e356ac1ccb9dc7b509daa5e800b5f23b13 (patch)
tree26cad23249e438027beed6d0cffe307db5e9970b /source/a
parent39de96c1694c51da0724ef99b869c8203895dfc9 (diff)
downloadcurrent-5bf641e356ac1ccb9dc7b509daa5e800b5f23b13.tar.gz
current-5bf641e356ac1ccb9dc7b509daa5e800b5f23b13.tar.xz
Thu May 18 15:19:38 UTC 202320230518151938
a/elogind-252.9-x86_64-1.txz: Upgraded. x/mesa-23.1.0-x86_64-1.txz: Upgraded. x/setxkbmap-1.3.4-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a')
-rw-r--r--source/a/elogind/doinst.sh1
-rwxr-xr-xsource/a/elogind/elogind.SlackBuild16
2 files changed, 3 insertions, 14 deletions
diff --git a/source/a/elogind/doinst.sh b/source/a/elogind/doinst.sh
index 3f15bbd8d..c4cee4321 100644
--- a/source/a/elogind/doinst.sh
+++ b/source/a/elogind/doinst.sh
@@ -28,6 +28,7 @@ preserve_perms() {
# Preserve permissions while moving into place:
preserve_perms etc/rc.d/rc.elogind.new
config etc/elogind/logind.conf.new
+config etc/elogind/sleep.conf.new
if pgrep -f elogind-daemon | grep -q 'elogind-daemon'; then
echo "Reloading elogind-daemon..."
diff --git a/source/a/elogind/elogind.SlackBuild b/source/a/elogind/elogind.SlackBuild
index 2f8f042c4..ab540b576 100755
--- a/source/a/elogind/elogind.SlackBuild
+++ b/source/a/elogind/elogind.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 2016, 2017, 2020 Eric Hameleers, Eindhoven, NL
-# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2020, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -89,19 +89,6 @@ find . \
# Our nobody user has UIDNumber 99, not 65534:
sed -e "s/65534/99/g" -i $(grep -lr 65534 .)
-# Launch elogind when called via DBus and make sure its rundir exists
-# (in Slackware, /run is mounted as a tmpfs):
-sed -i src/login/org.freedesktop.login1.service.in \
- -e "s,/bin/false,/lib${LIBDIRSUFFIX}/elogind,"
-
-# Merge a pull request for an upstream fix:
-zcat $CWD/elogind-polkit.patch.gz | patch -p1 --verbose || exit 1
-
-# Thanks to Widya Walesa:
-# Slackware still using cgroup v1 or legacy mode. Check the outcome of:
-# [ $(stat -fc %T /sys/fs/cgroup/) = "cgroup2fs" ] && echo "unified" \
-# || ( [ -e /sys/fs/cgroup/unified/ ] && echo "hybrid" || echo "legacy")
-
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
@@ -145,6 +132,7 @@ ln -sf /bin/loginctl $PKG/usr/bin/loginctl
# Make sure we do not overwrite the user's customizations:
mv -i $PKG/etc/elogind/logind.conf{,.new}
+mv -i $PKG/etc/elogind/sleep.conf{,.new}
# 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