Mon Dec 27 23:06:00 UTC 202120211227230600

The --enable-systemd-logind change to xorg-server that caused resume from
suspend regressions (and others) has been reverted, and in retrospect it was
a bad idea to take it at that point, but it had appeared as if it wouldn't
cause problems in the case where Xorg was running as root. Oh well, lesson
learned. But the build script has been enhanced to make it easy to build
rootless versions of the xorg-server packages. Just do this:
  ROOTLESSX=YES ./x11.SlackBuild xserver xorg-server
Depending on your GPU, this could work for your use case with no problems.
Also, I've gone ahead and taken a couple of shared library version bumps since
the projects (opencv and poppler) have decent track records as far as not
introducing regressions, and if there are any, we've got time to test and fix.
I'm still avoiding some things that aren't as trusted in that regard, and will
likely continue to do so. :-)
ap/cups-filters-1.28.10-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
kde/ark-21.12.0-x86_64-2.txz:  Rebuilt.
  Applied upstream patches:
  [PATCH] Fix extraction "Dolphin Actions" not abiding "Open destination
  folder after extracting" setting.
  [PATCH] Do not highlight file after compression.
  Thanks to ctrlaltca.
kde/calligra-3.2.1-x86_64-15.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
kde/cantor-21.12.0-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
kde/digikam-7.4.0-x86_64-2.txz:  Rebuilt.
  Recompiled against opencv-4.5.5.
kde/kfilemetadata-5.89.0-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
kde/kile-2.9.93-x86_64-15.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
kde/kitinerary-21.12.0-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
kde/krita-5.0.0-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
kde/okular-21.12.0-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
l/gegl-0.4.34-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
l/gst-plugins-bad-free-1.18.5-x86_64-3.txz:  Rebuilt.
  Recompiled against opencv-4.5.5.
l/imagemagick-7.1.0_19-x86_64-1.txz:  Upgraded.
l/mlt-7.4.0-x86_64-1.txz:  Upgraded.
l/opencv-4.5.5-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
l/poppler-21.12.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
n/fetchmail-6.4.26-x86_64-1.txz:  Upgraded.
n/tin-2.6.1-x86_64-1.txz:  Upgraded.
x/ibus-anthy-1.5.14-x86_64-1.txz:  Upgraded.
x/xorg-server-1.20.14-x86_64-2.txz:  Rebuilt.
  Recompiled using these options:
  --enable-suid-wrapper --enable-install-setuid --disable-systemd-logind.
x/xorg-server-xephyr-1.20.14-x86_64-2.txz:  Rebuilt.
x/xorg-server-xnest-1.20.14-x86_64-2.txz:  Rebuilt.
x/xorg-server-xvfb-1.20.14-x86_64-2.txz:  Rebuilt.
xap/geeqie-1.6-x86_64-4.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
xap/gimp-2.10.30-x86_64-2.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
xfce/tumbler-4.16.0-x86_64-4.txz:  Rebuilt.
  Recompiled against poppler-21.12.0.
extra/rust-for-mozilla/rust-1.54.0-x86_64-3.txz:  Added.
  This is an alternate version of Rust that may be useful for compiling
  software from Mozilla since using the very latest Rust often won't
  compile, or produces an unstable build.

3 files changed, 37 insertions, 11 deletions

diff --git a/source/x/x11/build/xorg-server b/source/x/x11/build/xorg-server
index d00491fd7..0cfbf0888 100644
--- a/source/x/x11/build/xorg-server
+++ b/source/x/x11/build/xorg-server
@@ -1 +1 @@
-1
+2
diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server
index c1a5c2e3b..e4458a728 100644
--- a/source/x/x11/configure/xorg-server
+++ b/source/x/x11/configure/xorg-server
@@ -1,6 +1,34 @@
 # Build Wayland X Server (currently built as standalone):
 BUILD_XWAYLAND=NO
 
+# Build rootless X packages. This is not the default in Slackware and is
+# unlikely to be any time soon, as --enable-systemd-logind seems to really
+# require systemd and does not function 100% with all graphics chipsets.
+# In particular, resuming from suspend may not work with (at least) Radeon
+# chipsets, and NVIDIA chipsets using proprietary drivers. Also, while
+# rootless X works from "startx", it is unsupported by most login managers
+# which will continue to start X as root.
+#
+# Feel free to try it out, though. To build rootless X packages, start the
+# build like this:
+#
+# ROOTLESSX=YES ./x11.SlackBuild xserver xorg-server
+#
+if [ "$ROOTLESSX" = "YES" ]; then
+  ROOTLESS_OPTIONS="--enable-suid-wrapper --disable-install-setuid --enable-systemd-logind"
+else
+  # Here we are building the traditional setuid root X. Technically we could
+  # dispense with the Xorg.wrap wrapper and just have the actual Xorg binary
+  # in /usr/bin, but we've always had the wrapper anyway and it should not
+  # cause any problems. Besides, it might be possible with this configuration
+  # to remove the setuid permissions from /usr/libexec/Xorg and then add the
+  # user to required groups such as input to run rootless as well, though it
+  # may bring its own security issues since other users who are members of
+  # these groups could monitor the devices. It's not recommended to try to
+  # run X rootless in this way, but we're going to keep the option open for now.
+  ROOTLESS_OPTIONS="--enable-suid-wrapper --enable-install-setuid --disable-systemd-logind"
+fi
+
 # Servers to build:
 if [ "$BUILD_XWAYLAND" = "NO" ]; then
   XWAYLAND_OPTION="--disable-xwayland"
@@ -14,12 +42,7 @@ BUILD_SERVERS="--enable-xorg \
   --enable-glamor \
   --enable-kdrive \
   --enable-xephyr \
-  $XWAYLAND_OPTION \
-  --enable-config-udev \
-  --disable-config-hal \
-  --enable-systemd-logind"
-
-#MESA_VERSION=${MESA_VERSION:-7.5}	# unused in 1.7+
+  $XWAYLAND_OPTION "
 
 # Default font paths to be used by the X server:
 DEF_FONTPATH="/usr/share/fonts/misc,/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/CID,/usr/share/fonts/75dpi/:unscaled,/usr/share/fonts/100dpi/:unscaled,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/cyrillic"
@@ -37,7 +60,6 @@ CFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --disable-static \
   --with-pic \
-  --enable-suid-wrapper \
   --with-int10=x86emu \
   --with-default-font-path="${DEF_FONTPATH}" \
   --with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
@@ -45,14 +67,14 @@ CFLAGS="$SLKCFLAGS" \
   --with-os-vendor="Slackware Linux Project" \
   --with-xkb-path=/etc/X11/xkb \
   --with-xkb-output=/var/lib/xkb \
+  --enable-config-udev \
+  --disable-config-hal \
   $BUILD_SERVERS \
+  $ROOTLESS_OPTIONS \
   --build=$ARCH-slackware-linux
 
-#  --with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri
-
 if [ "$ARCH" = "x86_64" ]; then
   # To prevent the error "No rule to make target `-ldl'"
   sed -i -e 's#-ldl##' hw/xfree86/Makefile
   sed -i -e 's#-lm#-lm -ldl#' hw/xfree86/Makefile
 fi
-
diff --git a/source/x/x11/makepkg/xorg-server b/source/x/x11/makepkg/xorg-server
index 1f5faf3c4..f395855d5 100644
--- a/source/x/x11/makepkg/xorg-server
+++ b/source/x/x11/makepkg/xorg-server
@@ -1,3 +1,7 @@
+# Add _rootless tag to the $BUILD if making rootless X packages:
+if [ "$ROOTLESSX" = "YES" ]; then
+  BUILD="${BUILD}_rootless"
+fi
 
 rm -r ${SLACK_X_BUILD_DIR}/package-xorg-server-xnest
 mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xnest/usr/bin