From ed81ac8ddaafd71f8b94096a87aae978c25c65c8 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 19 Apr 2024 19:36:17 +0000 Subject: Fri Apr 19 19:36:17 UTC 2024 a/elogind-252.23-x86_64-3.txz: Rebuilt. All right, it's time to stop the bleeding (edge). This has been verified as the last working version of elogind, so we'll revert for now while moving the newer sources into /testing. We didn't actually *need* the 255 branch for libgudev (I was mistakenly under that impression), so this will be fine for now. We'll keep an eye on upstream and move forward when things settle down. d/vala-0.56.17-x86_64-1.txz: Upgraded. l/gdk-pixbuf2-2.42.11-x86_64-1.txz: Upgraded. l/gtk4-4.14.3-x86_64-1.txz: Upgraded. l/polkit-124-x86_64-2.txz: Rebuilt. Recompiled against elogind-252.23. l/python-sphinx-7.3.7-x86_64-1.txz: Upgraded. n/NetworkManager-1.46.0-x86_64-2.txz: Rebuilt. Build with meson instead of autotools, since setting session_tracking to elogind is ignored with autotools, and is set to consolekit instead. While this didn't seem to make a difference in practice, better to get this right now and rule it out as part of the issue. Thanks to marav and LuckyCyborg for the options hints. x/xdg-desktop-portal-1.18.4-x86_64-1.txz: Upgraded. xap/freerdp-2.11.6-x86_64-1.txz: Upgraded. This release is a security release and addresses multiple issues: [Low] OutOfBound Read in zgfx_decompress_segment. [Moderate] Integer overflow & OutOfBound Write in clear_decompress_residual_data. [Low] integer underflow in nsc_rle_decode. [Low] OutOfBound Read in planar_skip_plane_rle. [Low] OutOfBound Read in ncrush_decompress. [Low] OutOfBound Read in interleaved_decompress. For more information, see: https://www.cve.org/CVERecord?id=CVE-2024-32041 https://www.cve.org/CVERecord?id=CVE-2024-32039 https://www.cve.org/CVERecord?id=CVE-2024-32040 https://www.cve.org/CVERecord?id=CVE-2024-32458 https://www.cve.org/CVERecord?id=CVE-2024-32459 https://www.cve.org/CVERecord?id=CVE-2024-32460 (* Security fix *) --- source/a/elogind/11-prefer-deep-suspend.patch | 8 ------ source/a/elogind/doinst.sh | 1 - source/a/elogind/elogind.SlackBuild | 36 ++++++++++++--------------- 3 files changed, 16 insertions(+), 29 deletions(-) delete mode 100644 source/a/elogind/11-prefer-deep-suspend.patch (limited to 'source/a') diff --git a/source/a/elogind/11-prefer-deep-suspend.patch b/source/a/elogind/11-prefer-deep-suspend.patch deleted file mode 100644 index c3d3d23b5..000000000 --- a/source/a/elogind/11-prefer-deep-suspend.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- ./src/sleep/10-elogind.conf.orig 2024-04-16 02:21:44.000000000 -0500 -+++ ./src/sleep/10-elogind.conf 2024-04-16 13:32:01.046025234 -0500 -@@ -19,4 +19,4 @@ - #HandleNvidiaSleep=no - #HibernateByUsing= - #SuspendByUsing= --#SuspendMode=s2idle deep -+SuspendMode=deep s2idle diff --git a/source/a/elogind/doinst.sh b/source/a/elogind/doinst.sh index e39e2aee3..e529fda15 100644 --- a/source/a/elogind/doinst.sh +++ b/source/a/elogind/doinst.sh @@ -29,7 +29,6 @@ preserve_perms() { preserve_perms etc/rc.d/rc.elogind.new config etc/elogind/logind.conf.new config etc/elogind/sleep.conf.new -config etc/elogind/sleep.conf.d/10-elogind.conf.new config etc/pam.d/elogind-user.new # Reload elogind-daemon: diff --git a/source/a/elogind/elogind.SlackBuild b/source/a/elogind/elogind.SlackBuild index 1cf9c09ee..ead080f8e 100755 --- a/source/a/elogind/elogind.SlackBuild +++ b/source/a/elogind/elogind.SlackBuild @@ -25,7 +25,7 @@ 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:-1} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -98,33 +98,30 @@ find . \ # but sed will still happily scribble all over everything. cat $CWD/elogind.nobody.nogroup.99.99.diff | patch -p1 --verbose || exit 1 -# Don't prefer s2idle, as it doesn't seem to work: -cat $CWD/11-prefer-deep-suspend.patch | patch -p1 --verbose || exit 1 - # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" mkdir meson-build cd meson-build -meson \ - --buildtype=release \ - --prefix=/usr \ - --libdir=/lib${LIBDIRSUFFIX} \ - --libexecdir=/lib${LIBDIRSUFFIX}/elogind \ - -Dpkgconfiglibdir=/usr/lib${LIBDIRSUFFIX}/pkgconfig \ - -Dpamlibdir=/lib${LIBDIRSUFFIX}/security \ +meson setup \ + --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=enabled \ - -Dhtml=disabled \ + -Dman=true \ + -Dhtml=false \ -Dbashcompletiondir="/usr/share/bash-completion/completions" \ -Dnobody-user=nobody \ -Dnobody-group=nogroup \ - -Dpam=enabled \ + -Dpam=true \ + -Dpamlibdir="/lib${LIBDIRSUFFIX}/security" \ -Dpamconfdir="/etc/pam.d" \ - -Dacl=enabled \ + -Dacl=true \ -Dsmack=false \ -Dutmp=true \ -Ddefault-hierarchy=legacy \ @@ -139,15 +136,14 @@ meson \ DESTDIR=$PKG $NINJA install || exit 1 cd .. -# Create symlinks for elogind binaries to /bin/: -mkdir -p $PKG/bin -ln -sf /usr/bin/elogind-inhibit $PKG/bin/elogind-inhibit -ln -sf /usr/bin/loginctl $PKG/bin/loginctl +# 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} -mv -i $PKG/etc/elogind/sleep.conf.d/10-elogind.conf{,.new} mv -i $PKG/etc/pam.d/elogind-user{,.new} # Strip binaries: -- cgit v1.2.3-80-g2a13