elogind: cherry-pick from current 252.9
This commit is contained in:
eleksir
12
elogind/10-enable-elogind-power.rules
Normal file
12
elogind/10-enable-elogind-power.rules
Normal file
@@ -0,0 +1,12 @@
|
||||
polkit.addRule(
|
||||
function(action, subject) {
|
||||
if ( (action.id == "org.freedesktop.login1.reboot" ||
|
||||
action.id == "org.freedesktop.login1.reboot-multiple-sessions" ||
|
||||
action.id == "org.freedesktop.login1.power-off" ||
|
||||
action.id == "org.freedesktop.login1.power-off-multiple-sessions")
|
||||
&& subject.isInGroup("power") ) {
|
||||
return polkit.Result.YES;
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
37
elogind/doinst.sh
Normal file
37
elogind/doinst.sh
Normal file
@@ -0,0 +1,37 @@
|
||||
# Handle the incoming configuration files:
|
||||
config() {
|
||||
for infile in $1; do
|
||||
NEW="$infile"
|
||||
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...
|
||||
done
|
||||
}
|
||||
preserve_perms() {
|
||||
NEW="$1"
|
||||
OLD="$(dirname ${NEW})/$(basename ${NEW} .new)"
|
||||
if [ -e ${OLD} ]; then
|
||||
cp -a ${OLD} ${NEW}.incoming
|
||||
cat ${NEW} > ${NEW}.incoming
|
||||
mv ${NEW}.incoming ${NEW}
|
||||
fi
|
||||
config ${NEW}
|
||||
}
|
||||
|
||||
#
|
||||
# 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 1> /dev/null 2> /dev/null ; then
|
||||
echo "Reloading elogind-daemon..."
|
||||
pkill -HUP -f elogind-daemon
|
||||
fi
|
||||
|
||||
121
elogind/elogind-polkit.patch
Normal file
121
elogind/elogind-polkit.patch
Normal file
@@ -0,0 +1,121 @@
|
||||
Update org.freedesktop.login1.conf
|
||||
This mirrors an upstream change opening up all of logind's bus calls to
|
||||
unprivileged users via polkit.
|
||||
|
||||
See systemd/systemd#471.
|
||||
Closes #3.
|
||||
|
||||
diff -uar a/src/login/org.freedesktop.login1.conf b/src/login/org.freedesktop.login1.conf
|
||||
--- a/src/login/org.freedesktop.login1.conf
|
||||
+++ b/src/login/org.freedesktop.login1.conf
|
||||
@@ -90,6 +90,42 @@
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="LockSession"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="UnlockSession"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="LockSessions"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="UnlockSessions"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="KillSession"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="KillUser"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="TerminateSession"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="TerminateUser"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="TerminateSeat"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
send_member="PowerOff"/>
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
@@ -130,6 +166,10 @@
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
send_interface="org.freedesktop.login1.Manager"
|
||||
+ send_member="SetWallMessage"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Manager"
|
||||
send_member="AttachDevice"/>
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
@@ -138,6 +178,10 @@
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
send_interface="org.freedesktop.login1.Seat"
|
||||
+ send_member="Terminate"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Seat"
|
||||
send_member="ActivateSession"/>
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
@@ -154,14 +198,30 @@
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
send_interface="org.freedesktop.login1.Session"
|
||||
+ send_member="Terminate"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Session"
|
||||
send_member="Activate"/>
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
send_interface="org.freedesktop.login1.Session"
|
||||
+ send_member="Lock"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Session"
|
||||
+ send_member="Unlock"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Session"
|
||||
send_member="SetIdleHint"/>
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
send_interface="org.freedesktop.login1.Session"
|
||||
+ send_member="Kill"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.Session"
|
||||
send_member="TakeControl"/>
|
||||
|
||||
<allow send_destination="org.freedesktop.login1"
|
||||
@@ -180,6 +240,14 @@
|
||||
send_interface="org.freedesktop.login1.Session"
|
||||
send_member="PauseDeviceComplete"/>
|
||||
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.User"
|
||||
+ send_member="Terminate"/>
|
||||
+
|
||||
+ <allow send_destination="org.freedesktop.login1"
|
||||
+ send_interface="org.freedesktop.login1.User"
|
||||
+ send_member="Kill"/>
|
||||
+
|
||||
<allow receive_sender="org.freedesktop.login1"/>
|
||||
</policy>
|
||||
|
||||
193
elogind/elogind.SlackBuild
Executable file
193
elogind/elogind.SlackBuild
Executable file
@@ -0,0 +1,193 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright 2016, 2017, 2020 Eric Hameleers, Eindhoven, NL
|
||||
# Copyright 2020, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use of this script, with or without modification, is
|
||||
# permitted provided that the following conditions are met:
|
||||
#
|
||||
# 1. Redistributions of this script must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
||||
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||||
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
cd $(dirname $0) ; CWD=$(pwd)
|
||||
|
||||
PKGNAM=elogind
|
||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||
BUILD=${BUILD:-2}
|
||||
|
||||
# Automatically determine the architecture we're building on:
|
||||
if [ -z "$ARCH" ]; then
|
||||
case "$(uname -m)" in
|
||||
i?86) ARCH=i586 ;;
|
||||
arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
|
||||
# Unless $ARCH is already set, use uname -m for all other archs:
|
||||
*) ARCH=$(uname -m) ;;
|
||||
esac
|
||||
export ARCH
|
||||
fi
|
||||
|
||||
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
|
||||
# the name of the created package would be, and then exit. This information
|
||||
# could be useful to other scripts.
|
||||
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
|
||||
echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "}
|
||||
|
||||
if [ "$ARCH" = "i586" ]; then
|
||||
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "i686" ]; then
|
||||
SLKCFLAGS="-O2 -march=i686"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "s390" ]; then
|
||||
SLKCFLAGS="-O2"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "x86_64" ]; then
|
||||
SLKCFLAGS="-O2 -fPIC"
|
||||
LIBDIRSUFFIX="64"
|
||||
elif [ "$ARCH" = "armv7hl" ]; then
|
||||
SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
|
||||
LIBDIRSUFFIX=""
|
||||
else
|
||||
SLKCFLAGS="-O2"
|
||||
LIBDIRSUFFIX=""
|
||||
fi
|
||||
|
||||
TMP=${TMP:-/tmp}
|
||||
PKG=$TMP/package-$PKGNAM
|
||||
|
||||
rm -rf $PKG
|
||||
mkdir -p $TMP $PKG
|
||||
|
||||
cd $TMP
|
||||
rm -rf $PKGNAM-$VERSION
|
||||
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
|
||||
cd $PKGNAM-$VERSION || exit 1
|
||||
|
||||
chown -R root:root .
|
||||
find . \
|
||||
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
|
||||
-exec chmod 755 {} \+ -o \
|
||||
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
||||
-exec chmod 644 {} \+
|
||||
|
||||
# Our nobody user has UIDNumber 99, not 65534:
|
||||
sed -e "s/65534/99/g" -i $(grep -lr 65534 .)
|
||||
|
||||
# Configure, build, and install:
|
||||
export CFLAGS="$SLKCFLAGS"
|
||||
export CXXFLAGS="$SLKCFLAGS"
|
||||
mkdir meson-build
|
||||
cd meson-build
|
||||
meson \
|
||||
--buildtype release \
|
||||
--prefix /usr \
|
||||
--libdir /usr/lib${LIBDIRSUFFIX} \
|
||||
-Drootlibdir="/lib${LIBDIRSUFFIX}" \
|
||||
-Drootlibexecdir="/lib${LIBDIRSUFFIX}/elogind" \
|
||||
-Dudevrulesdir="/lib/udev/rules.d" \
|
||||
-Ddocdir="/usr/doc/$PKGNAM-$VERSION" \
|
||||
-Dhtmldir="/usr/doc/$PKGNAM-$VERSION/html" \
|
||||
-Dmandir="/usr/man" \
|
||||
-Dman=true \
|
||||
-Dhtml=false \
|
||||
-Dbashcompletiondir="/usr/share/bash-completion/completions" \
|
||||
-Dnobody-group=nogroup \
|
||||
-Dpam=true \
|
||||
-Dpamlibdir="/lib${LIBDIRSUFFIX}/security" \
|
||||
-Dpamconfdir="/etc/pam.d" \
|
||||
-Dacl=true \
|
||||
-Dsmack=false \
|
||||
-Dutmp=true \
|
||||
-Ddefault-hierarchy=legacy \
|
||||
-Dcgroup-controller=elogind \
|
||||
-Dhalt-path=/sbin/halt \
|
||||
-Dpoweroff-path=/sbin/poweroff \
|
||||
-Dreboot-path=/sbin/reboot \
|
||||
-Ddefault-kill-user-processes=false \
|
||||
.. || exit 1
|
||||
"${NINJA:=ninja}" $NUMJOBS || exit 1
|
||||
DESTDIR=$PKG $NINJA install || exit 1
|
||||
cd ..
|
||||
|
||||
# Create symlinks for elogind binaries to /usr/bin/:
|
||||
mkdir -p $PKG/usr/bin
|
||||
ln -sf /bin/elogind-inhibit $PKG/usr/bin/elogind-inhibit
|
||||
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
|
||||
|
||||
# Compress manual pages:
|
||||
find $PKG/usr/man -type f -exec gzip -9 {} \+
|
||||
for i in $( find $PKG/usr/man -type l ) ; do
|
||||
ln -s $( readlink $i ).gz $i.gz
|
||||
rm $i
|
||||
done
|
||||
|
||||
# Add an rc script:
|
||||
mkdir -p $PKG/etc/rc.d
|
||||
cat $CWD/rc.elogind \
|
||||
| sed -e "s/@LIBDIRSUFFIX@/${LIBDIRSUFFIX}/g" \
|
||||
> $PKG/etc/rc.d/rc.elogind.new
|
||||
chmod 755 $PKG/etc/rc.d/rc.elogind.new
|
||||
|
||||
# Create supported dirs in /etc/elogind/ (local config)
|
||||
mkdir -p $PKG/etc/elogind/logind.conf.d/ $PKG/etc/elogind/sleep.conf.d/
|
||||
|
||||
# Add login1 policy file that allows users in the 'power' group
|
||||
# to shutdown/reboot the computer:
|
||||
mkdir -p $PKG/usr/share/polkit-1/rules.d
|
||||
cat $CWD/10-enable-elogind-power.rules > \
|
||||
$PKG/usr/share/polkit-1/rules.d/10-enable-session-power.rules
|
||||
|
||||
# We don't need the hidden files to make inferior package managers keep dirs:
|
||||
find $PKG -type f -name ".keep_dir" -exec rm -f {} \;
|
||||
|
||||
# Add a documentation directory:
|
||||
mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
|
||||
cp -a \
|
||||
AUTHORS* ChangeLog CHANGES COPYING* LICENSE* NEWS* README* THANKS* TODO* \
|
||||
$PKG/usr/doc/${PKGNAM}-$VERSION
|
||||
|
||||
# If there's a ChangeLog, installing at least part of the recent history
|
||||
# is useful, but don't let it get totally out of control:
|
||||
if [ -r ChangeLog ]; then
|
||||
DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
|
||||
cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
|
||||
touch -r ChangeLog $DOCSDIR/ChangeLog
|
||||
fi
|
||||
|
||||
# If there's a CHANGES file, installing at least part of the recent history
|
||||
# is useful, but don't let it get totally out of control:
|
||||
if [ -r CHANGES ]; then
|
||||
DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
|
||||
cat CHANGES | head -n 1000 > $DOCSDIR/CHANGES
|
||||
touch -r CHANGES $DOCSDIR/CHANGES
|
||||
fi
|
||||
|
||||
mkdir -p $PKG/install
|
||||
cat $CWD/doinst.sh > $PKG/install/doinst.sh
|
||||
cat $CWD/slack-desc > $PKG/install/slack-desc
|
||||
|
||||
cd $PKG
|
||||
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
|
||||
1
elogind/elogind.url
Normal file
1
elogind/elogind.url
Normal file
@@ -0,0 +1 @@
|
||||
https://github.com/elogind/elogind
|
||||
65
elogind/rc.elogind
Normal file
65
elogind/rc.elogind
Normal file
@@ -0,0 +1,65 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# /etc/rc.d/rc.elogind
|
||||
# Initializes the elogind service on Slackware.
|
||||
# There is no need to explicitly start a daemon; this will be taken
|
||||
# care of automatically by dbus when that starts.
|
||||
#
|
||||
# Author:
|
||||
# Eric Hameleers <alien@slackware.com> 2016
|
||||
# Widya Walesa 2020
|
||||
#
|
||||
# Description:
|
||||
# We use elogind (standalone subset extracted from systemd) instead of
|
||||
# systemd itself; so we need to initialize a systemd-like state.
|
||||
#
|
||||
# Note:
|
||||
# Slackware has a tmpfs mounted on /run (see rc.S).
|
||||
#
|
||||
|
||||
start_elogind() {
|
||||
if [ -x /lib@LIBDIRSUFFIX@/elogind/elogind ]; then
|
||||
if [ ! -d /run/user ]; then
|
||||
mkdir -p /run/user
|
||||
fi
|
||||
if [ ! -d /run/systemd ]; then
|
||||
mkdir -p /run/elogind /sys/fs/cgroup/elogind
|
||||
( cd /run; rm -rf systemd; ln -sf elogind systemd; )
|
||||
( cd /sys/fs/cgroup; rm -rf systemd; ln -sf elogind systemd; )
|
||||
fi
|
||||
if pgrep -l -F /run/elogind.pid 2>/dev/null | grep -q elogind; then
|
||||
echo "Elogind is already running"
|
||||
else
|
||||
echo -n "Starting elogind: "
|
||||
rm -f /run/elogind.pid
|
||||
/lib@LIBDIRSUFFIX@/elogind/elogind --daemon
|
||||
echo "/lib@LIBDIRSUFFIX@/elogind/elogind --daemon"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
stop_elogind() {
|
||||
if pgrep -l -F /run/elogind.pid 2>/dev/null | grep -q elogind; then
|
||||
echo -n "Stopping elogind: "
|
||||
pkill -F /run/elogind.pid 2>/dev/null
|
||||
echo "DONE"
|
||||
else
|
||||
echo "Elogind is not running"
|
||||
fi
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
start_elogind
|
||||
;;
|
||||
stop)
|
||||
stop_elogind
|
||||
;;
|
||||
restart)
|
||||
stop_elogind
|
||||
sleep 1
|
||||
start_elogind
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 start|stop|restart"
|
||||
esac
|
||||
19
elogind/slack-desc
Normal file
19
elogind/slack-desc
Normal file
@@ -0,0 +1,19 @@
|
||||
# HOW TO EDIT THIS FILE:
|
||||
# The "handy ruler" below makes it easier to edit a package description.
|
||||
# Line up the first '|' above the ':' following the base package name, and
|
||||
# the '|' on the right side marks the last column you can put a character in.
|
||||
# You must make exactly 11 lines for the formatting to be correct. It's also
|
||||
# customary to leave one space after the ':' except on otherwise blank lines.
|
||||
|
||||
|-----handy-ruler------------------------------------------------------|
|
||||
elogind: elogind (logind extracted from systemd)
|
||||
elogind:
|
||||
elogind: elogind is the systemd project's logind, extracted to a standalone
|
||||
elogind: package.
|
||||
elogind:
|
||||
elogind: Homepage: https://github.com/elogind/elogind
|
||||
elogind:
|
||||
elogind:
|
||||
elogind:
|
||||
elogind:
|
||||
elogind:
|
||||
Reference in New Issue
Block a user