diff --git a/ChangeLog.rss b/ChangeLog.rss
index 518cc2c1a..21cc4def5 100644
--- a/ChangeLog.rss
+++ b/ChangeLog.rss
@@ -11,9 +11,35 @@
Tracking Slackware development in git.
en-us
urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f
- Sun, 21 Apr 2024 21:41:34 GMT
- Sun, 21 Apr 2024 21:59:48 GMT
+ Mon, 22 Apr 2024 19:36:38 GMT
+ Mon, 22 Apr 2024 20:00:37 GMT
maintain_current_git.sh v 1.17
+ -
+ Mon, 22 Apr 2024 19:36:38 GMT
+ Mon, 22 Apr 2024 19:36:38 GMT
+ https://git.slackware.nl/current/tag/?h=20240422193638
+ 20240422193638
+
+
+a/elogind-255.4_r2-x86_64-2.txz: Rebuilt.
+ OK, this is looking good enough to return to the main tree now.
+ Thanks to hamkg, ctrlaltca, and rizitis for helping to debug the sleep issues
+ with upstream, and to Sven Eden for the upstream fixes. I've changed the
+ default sleep mode from s2idle to deep as s2idle still locks up most of the
+ systems I've tried it on. Eventually we'll probably have to swallow this pill
+ though (more notes on that in the SlackBuild).
+ It didn't seem like recompiling polkit again was necessary, but correct me if
+ I'm wrong about that.
+l/imagemagick-7.1.1_31-x86_64-1.txz: Upgraded.
+l/python-hatchling-1.24.2-x86_64-1.txz: Upgraded.
+l/vte-0.76.1-x86_64-1.txz: Upgraded.
+l/wireplumber-0.5.2-x86_64-1.txz: Upgraded.
+xap/freerdp-2.11.7-x86_64-1.txz: Upgraded.
+ This release eliminates a bunch of issues detected during oss-fuzz runs.
+ (* Security fix *)
+ ]]>
+
+
-
Sun, 21 Apr 2024 21:41:34 GMT
Sun, 21 Apr 2024 21:41:34 GMT
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 450d187dc..ef702240b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,21 @@
+Mon Apr 22 19:36:38 UTC 2024
+a/elogind-255.4_r2-x86_64-2.txz: Rebuilt.
+ OK, this is looking good enough to return to the main tree now.
+ Thanks to hamkg, ctrlaltca, and rizitis for helping to debug the sleep issues
+ with upstream, and to Sven Eden for the upstream fixes. I've changed the
+ default sleep mode from s2idle to deep as s2idle still locks up most of the
+ systems I've tried it on. Eventually we'll probably have to swallow this pill
+ though (more notes on that in the SlackBuild).
+ It didn't seem like recompiling polkit again was necessary, but correct me if
+ I'm wrong about that.
+l/imagemagick-7.1.1_31-x86_64-1.txz: Upgraded.
+l/python-hatchling-1.24.2-x86_64-1.txz: Upgraded.
+l/vte-0.76.1-x86_64-1.txz: Upgraded.
+l/wireplumber-0.5.2-x86_64-1.txz: Upgraded.
+xap/freerdp-2.11.7-x86_64-1.txz: Upgraded.
+ This release eliminates a bunch of issues detected during oss-fuzz runs.
+ (* Security fix *)
++--------------------------+
Sun Apr 21 21:41:34 UTC 2024
a/etc-15.1-x86_64-11.txz: Rebuilt.
Populate missing /etc/gshadow entries. Thanks to opty.
diff --git a/FILELIST.TXT b/FILELIST.TXT
index 9e5c5164f..39502e486 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,20 +1,20 @@
-Sun Apr 21 21:44:53 UTC 2024
+Mon Apr 22 19:41:06 UTC 2024
Here is the file list for this directory. If you are using a
mirror site and find missing or extra files in the disk
subdirectories, please have the archive administrator refresh
the mirror.
-drwxr-xr-x 12 root root 4096 2024-04-21 21:41 .
+drwxr-xr-x 12 root root 4096 2024-04-22 19:36 .
-rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0
-rw-r--r-- 1 root root 16617 2022-02-02 23:27 ./CHANGES_AND_HINTS.TXT
--rw-r--r-- 1 root root 1148939 2024-04-20 00:14 ./CHECKSUMS.md5
--rw-r--r-- 1 root root 195 2024-04-20 00:14 ./CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 1148939 2024-04-21 21:45 ./CHECKSUMS.md5
+-rw-r--r-- 1 root root 195 2024-04-21 21:45 ./CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING
-rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3
-rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT
-rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT
--rw-r--r-- 1 root root 1051829 2024-04-21 21:41 ./ChangeLog.txt
+-rw-r--r-- 1 root root 1052784 2024-04-22 19:36 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
drwxr-xr-x 2 root root 4096 2024-04-17 20:10 ./EFI/BOOT
-rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi
@@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2024-04-17 20:10 ./EFI/BOOT
-rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh
-rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg
-rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg
--rw-r--r-- 1 root root 1503950 2024-04-20 00:13 ./FILELIST.TXT
+-rw-r--r-- 1 root root 1503950 2024-04-21 21:44 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
--rw-r--r-- 1 root root 907049 2024-04-21 21:44 ./PACKAGES.TXT
+-rw-r--r-- 1 root root 907051 2024-04-22 19:40 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT
-rw-r--r-- 1 root root 3629 2024-04-17 20:01 ./README.initrd
-rw-r--r-- 1 root root 34114 2023-12-11 20:35 ./README_CRYPT.TXT
@@ -683,13 +683,13 @@ drwxr-xr-x 2 root root 4096 2022-02-03 07:02 ./patches
-rw-r--r-- 1 root root 575 2022-02-03 07:02 ./patches/FILE_LIST
-rw-r--r-- 1 root root 14 2022-02-03 07:02 ./patches/MANIFEST.bz2
-rw-r--r-- 1 root root 224 2022-02-03 07:02 ./patches/PACKAGES.TXT
-drwxr-xr-x 17 root root 4096 2024-04-21 21:44 ./slackware64
--rw-r--r-- 1 root root 353828 2024-04-21 21:44 ./slackware64/CHECKSUMS.md5
--rw-r--r-- 1 root root 195 2024-04-21 21:44 ./slackware64/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 438217 2024-04-21 21:43 ./slackware64/FILE_LIST
--rw-r--r-- 1 root root 4622641 2024-04-21 21:43 ./slackware64/MANIFEST.bz2
+drwxr-xr-x 17 root root 4096 2024-04-22 19:40 ./slackware64
+-rw-r--r-- 1 root root 353834 2024-04-22 19:40 ./slackware64/CHECKSUMS.md5
+-rw-r--r-- 1 root root 195 2024-04-22 19:40 ./slackware64/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 438223 2024-04-22 19:39 ./slackware64/FILE_LIST
+-rw-r--r-- 1 root root 4616111 2024-04-22 19:40 ./slackware64/MANIFEST.bz2
lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
-drwxr-xr-x 2 root root 32768 2024-04-21 21:43 ./slackware64/a
+drwxr-xr-x 2 root root 32768 2024-04-22 19:39 ./slackware64/a
-rw-r--r-- 1 root root 327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt
-rw-r--r-- 1 root root 10720 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz
-rw-r--r-- 1 root root 163 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz.asc
@@ -768,9 +768,9 @@ drwxr-xr-x 2 root root 32768 2024-04-21 21:43 ./slackware64/a
-rw-r--r-- 1 root root 445 2023-05-25 00:04 ./slackware64/a/elilo-3.16-x86_64-16.txt
-rw-r--r-- 1 root root 153504 2023-05-25 00:04 ./slackware64/a/elilo-3.16-x86_64-16.txz
-rw-r--r-- 1 root root 163 2023-05-25 00:04 ./slackware64/a/elilo-3.16-x86_64-16.txz.asc
--rw-r--r-- 1 root root 260 2024-04-19 19:19 ./slackware64/a/elogind-252.23-x86_64-3.txt
--rw-r--r-- 1 root root 1192116 2024-04-19 19:19 ./slackware64/a/elogind-252.23-x86_64-3.txz
--rw-r--r-- 1 root root 195 2024-04-19 19:19 ./slackware64/a/elogind-252.23-x86_64-3.txz.asc
+-rw-r--r-- 1 root root 260 2024-04-22 19:19 ./slackware64/a/elogind-255.4_r2-x86_64-2.txt
+-rw-r--r-- 1 root root 1230628 2024-04-22 19:19 ./slackware64/a/elogind-255.4_r2-x86_64-2.txz
+-rw-r--r-- 1 root root 195 2024-04-22 19:19 ./slackware64/a/elogind-255.4_r2-x86_64-2.txz.asc
-rw-r--r-- 1 root root 375 2021-09-25 18:44 ./slackware64/a/elvis-2.2_0-x86_64-8.txt
-rw-r--r-- 1 root root 712424 2021-09-25 18:44 ./slackware64/a/elvis-2.2_0-x86_64-8.txz
-rw-r--r-- 1 root root 163 2021-09-25 18:44 ./slackware64/a/elvis-2.2_0-x86_64-8.txz.asc
@@ -2783,7 +2783,7 @@ drwxr-xr-x 2 root root 86016 2024-04-16 22:00 ./slackware64/kde
-rw-r--r-- 1 root root 517 2024-02-15 21:47 ./slackware64/kde/zanshin-23.08.5-x86_64-1.txt
-rw-r--r-- 1 root root 686104 2024-02-15 21:47 ./slackware64/kde/zanshin-23.08.5-x86_64-1.txz
-rw-r--r-- 1 root root 163 2024-02-15 21:47 ./slackware64/kde/zanshin-23.08.5-x86_64-1.txz.asc
-drwxr-xr-x 2 root root 102400 2024-04-21 21:43 ./slackware64/l
+drwxr-xr-x 2 root root 102400 2024-04-22 19:39 ./slackware64/l
-rw-r--r-- 1 root root 329 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txt
-rw-r--r-- 1 root root 928144 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txz
-rw-r--r-- 1 root root 163 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txz.asc
@@ -3186,9 +3186,9 @@ drwxr-xr-x 2 root root 102400 2024-04-21 21:43 ./slackware64/l
-rw-r--r-- 1 root root 473 2021-02-13 06:52 ./slackware64/l/id3lib-3.8.3-x86_64-4.txt
-rw-r--r-- 1 root root 161400 2021-02-13 06:52 ./slackware64/l/id3lib-3.8.3-x86_64-4.txz
-rw-r--r-- 1 root root 163 2021-02-13 06:52 ./slackware64/l/id3lib-3.8.3-x86_64-4.txz.asc
--rw-r--r-- 1 root root 537 2024-02-26 19:03 ./slackware64/l/imagemagick-7.1.1_29-x86_64-1.txt
--rw-r--r-- 1 root root 8416504 2024-02-26 19:03 ./slackware64/l/imagemagick-7.1.1_29-x86_64-1.txz
--rw-r--r-- 1 root root 163 2024-02-26 19:03 ./slackware64/l/imagemagick-7.1.1_29-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 537 2024-04-22 19:04 ./slackware64/l/imagemagick-7.1.1_31-x86_64-1.txt
+-rw-r--r-- 1 root root 8589256 2024-04-22 19:04 ./slackware64/l/imagemagick-7.1.1_31-x86_64-1.txz
+-rw-r--r-- 1 root root 195 2024-04-22 19:04 ./slackware64/l/imagemagick-7.1.1_31-x86_64-1.txz.asc
-rw-r--r-- 1 root root 399 2023-10-05 20:06 ./slackware64/l/immer-0.8.1-x86_64-1.txt
-rw-r--r-- 1 root root 67400 2023-10-05 20:06 ./slackware64/l/immer-0.8.1-x86_64-1.txz
-rw-r--r-- 1 root root 163 2023-10-05 20:06 ./slackware64/l/immer-0.8.1-x86_64-1.txz.asc
@@ -3844,9 +3844,9 @@ drwxr-xr-x 2 root root 102400 2024-04-21 21:43 ./slackware64/l
-rw-r--r-- 1 root root 316 2024-03-29 04:28 ./slackware64/l/python-glad2-2.0.6-x86_64-2.txt
-rw-r--r-- 1 root root 471200 2024-03-29 04:28 ./slackware64/l/python-glad2-2.0.6-x86_64-2.txz
-rw-r--r-- 1 root root 195 2024-03-29 04:28 ./slackware64/l/python-glad2-2.0.6-x86_64-2.txz.asc
--rw-r--r-- 1 root root 355 2024-04-18 17:22 ./slackware64/l/python-hatchling-1.24.1-x86_64-1.txt
--rw-r--r-- 1 root root 158208 2024-04-18 17:22 ./slackware64/l/python-hatchling-1.24.1-x86_64-1.txz
--rw-r--r-- 1 root root 195 2024-04-18 17:22 ./slackware64/l/python-hatchling-1.24.1-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 355 2024-04-22 19:01 ./slackware64/l/python-hatchling-1.24.2-x86_64-1.txt
+-rw-r--r-- 1 root root 158428 2024-04-22 19:01 ./slackware64/l/python-hatchling-1.24.2-x86_64-1.txz
+-rw-r--r-- 1 root root 195 2024-04-22 19:01 ./slackware64/l/python-hatchling-1.24.2-x86_64-1.txz.asc
-rw-r--r-- 1 root root 381 2024-03-29 04:28 ./slackware64/l/python-html5lib-1.1-x86_64-2.txt
-rw-r--r-- 1 root root 239216 2024-03-29 04:28 ./slackware64/l/python-html5lib-1.1-x86_64-2.txz
-rw-r--r-- 1 root root 195 2024-03-29 04:28 ./slackware64/l/python-html5lib-1.1-x86_64-2.txz.asc
@@ -4079,15 +4079,15 @@ drwxr-xr-x 2 root root 102400 2024-04-21 21:43 ./slackware64/l
-rw-r--r-- 1 root root 577 2023-10-28 22:01 ./slackware64/l/vid.stab-1.1.1-x86_64-1.txt
-rw-r--r-- 1 root root 49028 2023-10-28 22:01 ./slackware64/l/vid.stab-1.1.1-x86_64-1.txz
-rw-r--r-- 1 root root 163 2023-10-28 22:01 ./slackware64/l/vid.stab-1.1.1-x86_64-1.txz.asc
--rw-r--r-- 1 root root 255 2024-03-19 22:26 ./slackware64/l/vte-0.76.0-x86_64-1.txt
--rw-r--r-- 1 root root 469544 2024-03-19 22:26 ./slackware64/l/vte-0.76.0-x86_64-1.txz
--rw-r--r-- 1 root root 195 2024-03-19 22:26 ./slackware64/l/vte-0.76.0-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 255 2024-04-22 19:08 ./slackware64/l/vte-0.76.1-x86_64-1.txt
+-rw-r--r-- 1 root root 460516 2024-04-22 19:08 ./slackware64/l/vte-0.76.1-x86_64-1.txz
+-rw-r--r-- 1 root root 195 2024-04-22 19:08 ./slackware64/l/vte-0.76.1-x86_64-1.txz.asc
-rw-r--r-- 1 root root 507 2024-03-01 19:00 ./slackware64/l/wavpack-5.7.0-x86_64-1.txt
-rw-r--r-- 1 root root 197464 2024-03-01 19:00 ./slackware64/l/wavpack-5.7.0-x86_64-1.txz
-rw-r--r-- 1 root root 163 2024-03-01 19:00 ./slackware64/l/wavpack-5.7.0-x86_64-1.txz.asc
--rw-r--r-- 1 root root 492 2024-03-31 18:09 ./slackware64/l/wireplumber-0.5.1-x86_64-1.txt
--rw-r--r-- 1 root root 430676 2024-03-31 18:09 ./slackware64/l/wireplumber-0.5.1-x86_64-1.txz
--rw-r--r-- 1 root root 195 2024-03-31 18:09 ./slackware64/l/wireplumber-0.5.1-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 492 2024-04-22 19:09 ./slackware64/l/wireplumber-0.5.2-x86_64-1.txt
+-rw-r--r-- 1 root root 432288 2024-04-22 19:09 ./slackware64/l/wireplumber-0.5.2-x86_64-1.txz
+-rw-r--r-- 1 root root 195 2024-04-22 19:09 ./slackware64/l/wireplumber-0.5.2-x86_64-1.txz.asc
-rw-r--r-- 1 root root 257 2023-11-15 21:58 ./slackware64/l/woff2-20231106_0f4d304-x86_64-1.txt
-rw-r--r-- 1 root root 52124 2023-11-15 21:58 ./slackware64/l/woff2-20231106_0f4d304-x86_64-1.txz
-rw-r--r-- 1 root root 163 2023-11-15 21:58 ./slackware64/l/woff2-20231106_0f4d304-x86_64-1.txz.asc
@@ -5510,7 +5510,7 @@ drwxr-xr-x 2 root root 65536 2024-04-19 19:39 ./slackware64/x
-rw-r--r-- 1 root root 213 2022-07-11 18:36 ./slackware64/x/xwud-1.0.6-x86_64-1.txt
-rw-r--r-- 1 root root 25896 2022-07-11 18:36 ./slackware64/x/xwud-1.0.6-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-07-11 18:36 ./slackware64/x/xwud-1.0.6-x86_64-1.txz.asc
-drwxr-xr-x 2 root root 16384 2024-04-19 19:39 ./slackware64/xap
+drwxr-xr-x 2 root root 16384 2024-04-22 19:39 ./slackware64/xap
-rw-r--r-- 1 root root 625 2024-04-03 19:29 ./slackware64/xap/MPlayer-20240403-x86_64-1.txt
-rw-r--r-- 1 root root 2706516 2024-04-03 19:29 ./slackware64/xap/MPlayer-20240403-x86_64-1.txz
-rw-r--r-- 1 root root 195 2024-04-03 19:29 ./slackware64/xap/MPlayer-20240403-x86_64-1.txz.asc
@@ -5544,9 +5544,9 @@ drwxr-xr-x 2 root root 16384 2024-04-19 19:39 ./slackware64/xap
-rw-r--r-- 1 root root 229 2022-01-17 21:13 ./slackware64/xap/fluxbox-1.3.7-x86_64-6.txt
-rw-r--r-- 1 root root 746904 2022-01-17 21:13 ./slackware64/xap/fluxbox-1.3.7-x86_64-6.txz
-rw-r--r-- 1 root root 163 2022-01-17 21:13 ./slackware64/xap/fluxbox-1.3.7-x86_64-6.txz.asc
--rw-r--r-- 1 root root 278 2024-04-19 17:14 ./slackware64/xap/freerdp-2.11.6-x86_64-1.txt
--rw-r--r-- 1 root root 1675252 2024-04-19 17:14 ./slackware64/xap/freerdp-2.11.6-x86_64-1.txz
--rw-r--r-- 1 root root 195 2024-04-19 17:14 ./slackware64/xap/freerdp-2.11.6-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 278 2024-04-22 18:58 ./slackware64/xap/freerdp-2.11.7-x86_64-1.txt
+-rw-r--r-- 1 root root 1674608 2024-04-22 18:58 ./slackware64/xap/freerdp-2.11.7-x86_64-1.txz
+-rw-r--r-- 1 root root 195 2024-04-22 18:58 ./slackware64/xap/freerdp-2.11.7-x86_64-1.txz.asc
-rw-r--r-- 1 root root 411 2022-11-04 18:08 ./slackware64/xap/fvwm-2.7.0-x86_64-1.txt
-rw-r--r-- 1 root root 2458460 2022-11-04 18:08 ./slackware64/xap/fvwm-2.7.0-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-11-04 18:08 ./slackware64/xap/fvwm-2.7.0-x86_64-1.txz.asc
@@ -5777,13 +5777,13 @@ drwxr-xr-x 2 root root 4096 2023-03-08 20:34 ./slackware64/y
-rw-r--r-- 1 root root 1491108 2023-02-19 18:31 ./slackware64/y/nethack-3.6.7-x86_64-1.txz
-rw-r--r-- 1 root root 163 2023-02-19 18:31 ./slackware64/y/nethack-3.6.7-x86_64-1.txz.asc
-rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile
-drwxr-xr-x 18 root root 4096 2024-04-21 21:44 ./source
--rw-r--r-- 1 root root 616685 2024-04-21 21:44 ./source/CHECKSUMS.md5
--rw-r--r-- 1 root root 195 2024-04-21 21:44 ./source/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 859937 2024-04-21 21:44 ./source/FILE_LIST
--rw-r--r-- 1 root root 28573657 2024-04-21 21:44 ./source/MANIFEST.bz2
+drwxr-xr-x 18 root root 4096 2024-04-22 19:41 ./source
+-rw-r--r-- 1 root root 617024 2024-04-22 19:41 ./source/CHECKSUMS.md5
+-rw-r--r-- 1 root root 195 2024-04-22 19:41 ./source/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 860341 2024-04-22 19:40 ./source/FILE_LIST
+-rw-r--r-- 1 root root 28587315 2024-04-22 19:40 ./source/MANIFEST.bz2
-rw-r--r-- 1 root root 828 2022-02-02 04:43 ./source/README.TXT
-drwxr-xr-x 123 root root 4096 2024-04-21 18:16 ./source/a
+drwxr-xr-x 123 root root 4096 2024-04-22 19:19 ./source/a
-rw-r--r-- 1 root root 339 2023-09-28 19:06 ./source/a/FTBFSlog
drwxr-xr-x 2 root root 4096 2022-02-15 18:15 ./source/a/aaa_base
-rw-r--r-- 1 root root 11041 2022-02-15 04:49 ./source/a/aaa_base/_aaa_base.tar.gz
@@ -6028,11 +6028,15 @@ drwxr-xr-x 2 root root 4096 2023-03-20 17:03 ./source/a/elilo
-rw-r--r-- 1 root root 7978 2023-05-25 00:04 ./source/a/elilo/eliloconfig
-rw-r--r-- 1 root root 105 2013-10-06 07:42 ./source/a/elilo/setup.ll.eliloconfig
-rw-r--r-- 1 root root 897 2018-02-27 06:13 ./source/a/elilo/slack-desc
-drwxr-xr-x 2 root root 4096 2024-03-14 19:33 ./source/a/elogind
+drwxr-xr-x 2 root root 4096 2024-04-22 18:32 ./source/a/elogind
-rw-r--r-- 1 root root 227 2020-06-08 19:25 ./source/a/elogind/10-enable-elogind-power.rules.gz
--rw-r--r-- 1 root root 502 2024-03-14 19:33 ./source/a/elogind/doinst.sh.gz
--rw-r--r-- 1 root root 1330215 2024-03-10 08:24 ./source/a/elogind/elogind-252.23.tar.lz
--rwxr-xr-x 1 root root 6990 2024-04-19 19:18 ./source/a/elogind/elogind.SlackBuild
+-rw-r--r-- 1 root root 271 2024-04-16 18:32 ./source/a/elogind/11-prefer-deep-suspend.patch
+-rw-r--r-- 1 root root 549 2024-04-22 18:32 ./source/a/elogind/12-default-deep-suspend.patch
+-rw-r--r-- 1 root root 1900 2024-04-22 18:09 ./source/a/elogind/5d16d94aa9a5e3afe5b51f591497149630763b24.patch
+-rw-r--r-- 1 root root 5586 2024-04-22 18:09 ./source/a/elogind/ce3616c8864e56bf7efb233242f20197108a9dba.patch
+-rw-r--r-- 1 root root 511 2024-04-16 18:36 ./source/a/elogind/doinst.sh.gz
+-rw-r--r-- 1 root root 1432454 2024-04-16 07:21 ./source/a/elogind/elogind-255.4_r2.tar.lz
+-rwxr-xr-x 1 root root 8488 2024-04-22 18:32 ./source/a/elogind/elogind.SlackBuild
-rw-r--r-- 1 root root 10401 2024-03-12 18:23 ./source/a/elogind/elogind.nobody.nogroup.99.99.diff
-rw-r--r-- 1 root root 35 2020-09-28 21:24 ./source/a/elogind/elogind.url
-rw-r--r-- 1 root root 1615 2020-09-28 21:29 ./source/a/elogind/rc.elogind
@@ -10807,9 +10811,9 @@ drwxr-xr-x 2 root root 4096 2018-01-05 18:45 ./source/l/id3lib/patches
-rw-r--r-- 1 root root 629 2017-09-11 16:30 ./source/l/id3lib/patches/id3lib.utf8_writing.patch.gz
-rw-r--r-- 1 root root 517 2017-09-11 16:30 ./source/l/id3lib/patches/id3lib.vbr_stack_smash.patch.gz
-rw-r--r-- 1 root root 927 2018-02-27 06:12 ./source/l/id3lib/slack-desc
-drwxr-xr-x 2 root root 4096 2024-02-26 19:02 ./source/l/imagemagick
--rw-r--r-- 1 root root 10586420 2024-02-25 14:14 ./source/l/imagemagick/ImageMagick-7.1.1-29.tar.lz
--rw-r--r-- 1 root root 833 2024-02-25 15:11 ./source/l/imagemagick/ImageMagick-7.1.1-29.tar.lz.asc
+drwxr-xr-x 2 root root 4096 2024-04-22 19:02 ./source/l/imagemagick
+-rw-r--r-- 1 root root 10739191 2024-04-21 13:53 ./source/l/imagemagick/ImageMagick-7.1.1-31.tar.lz
+-rw-r--r-- 1 root root 833 2024-04-21 15:07 ./source/l/imagemagick/ImageMagick-7.1.1-31.tar.lz.asc
-rw-r--r-- 1 root root 309 2016-05-17 04:08 ./source/l/imagemagick/doinst.sh.gz
-rwxr-xr-x 1 root root 7403 2023-12-31 19:58 ./source/l/imagemagick/imagemagick.SlackBuild
-rw-r--r-- 1 root root 81 2022-11-08 20:07 ./source/l/imagemagick/imagemagick.url
@@ -11958,8 +11962,8 @@ drwxr-xr-x 2 root root 4096 2024-03-29 03:06 ./source/l/python-glad2
-rw-r--r-- 1 root root 31 2024-01-24 21:16 ./source/l/python-glad2/glad2.url
-rwxr-xr-x 1 root root 3094 2024-03-29 03:06 ./source/l/python-glad2/python-glad2.SlackBuild
-rw-r--r-- 1 root root 776 2022-11-17 18:47 ./source/l/python-glad2/slack-desc
-drwxr-xr-x 2 root root 4096 2024-04-18 17:22 ./source/l/python-hatchling
--rw-r--r-- 1 root root 63920 2024-04-18 03:22 ./source/l/python-hatchling/hatchling-1.24.1.tar.gz
+drwxr-xr-x 2 root root 4096 2024-04-22 19:01 ./source/l/python-hatchling
+-rw-r--r-- 1 root root 63973 2024-04-22 02:21 ./source/l/python-hatchling/hatchling-1.24.2.tar.gz
-rw-r--r-- 1 root root 35 2024-01-24 20:36 ./source/l/python-hatchling/hatchling.url
-rwxr-xr-x 1 root root 3123 2024-04-05 17:26 ./source/l/python-hatchling/python-hatchling.SlackBuild
-rw-r--r-- 1 root root 819 2024-02-04 18:45 ./source/l/python-hatchling/slack-desc
@@ -12425,9 +12429,9 @@ drwxr-xr-x 2 root root 4096 2023-10-28 21:11 ./source/l/vid.stab
-rw-r--r-- 1 root root 63932 2022-05-30 15:49 ./source/l/vid.stab/vid.stab-1.1.1.tar.lz
-rwxr-xr-- 1 root root 4134 2022-09-06 18:27 ./source/l/vid.stab/vid.stab.SlackBuild
-rw-r--r-- 1 root root 41 2023-10-28 21:09 ./source/l/vid.stab/vid.stab.url
-drwxr-xr-x 2 root root 4096 2024-03-19 22:22 ./source/l/vte
+drwxr-xr-x 2 root root 4096 2024-04-22 19:07 ./source/l/vte
-rw-r--r-- 1 root root 706 2018-02-27 06:12 ./source/l/vte/slack-desc
--rw-r--r-- 1 root root 956648 2024-03-18 16:04 ./source/l/vte/vte-0.76.0.tar.xz
+-rw-r--r-- 1 root root 499185 2024-04-17 19:42 ./source/l/vte/vte-0.76.1.tar.lz
-rwxr-xr-x 1 root root 4494 2023-12-15 20:28 ./source/l/vte/vte.SlackBuild
-rw-r--r-- 1 root root 35 2021-12-05 20:20 ./source/l/vte/vte.url
drwxr-xr-x 2 root root 4096 2024-03-01 19:00 ./source/l/wavpack
@@ -12435,10 +12439,10 @@ drwxr-xr-x 2 root root 4096 2024-03-01 19:00 ./source/l/wavpack
-rw-r--r-- 1 root root 814324 2024-03-01 05:19 ./source/l/wavpack/wavpack-5.7.0.tar.xz
-rwxr-xr-x 1 root root 4273 2022-11-21 20:13 ./source/l/wavpack/wavpack.SlackBuild
-rw-r--r-- 1 root root 109 2024-03-01 19:00 ./source/l/wavpack/wavpack.url
-drwxr-xr-x 2 root root 4096 2024-03-31 18:08 ./source/l/wireplumber
+drwxr-xr-x 2 root root 4096 2024-04-22 19:09 ./source/l/wireplumber
-rw-r--r-- 1 root root 138 2024-02-11 20:05 ./source/l/wireplumber/doinst.sh.gz
-rw-r--r-- 1 root root 983 2024-02-10 19:56 ./source/l/wireplumber/slack-desc
--rw-r--r-- 1 root root 384621 2024-03-30 14:50 ./source/l/wireplumber/wireplumber-0.5.1.tar.lz
+-rw-r--r-- 1 root root 385884 2024-04-22 14:19 ./source/l/wireplumber/wireplumber-0.5.2.tar.lz
-rwxr-xr-x 1 root root 4621 2024-03-19 18:37 ./source/l/wireplumber/wireplumber.SlackBuild
-rw-r--r-- 1 root root 250 2023-04-13 18:07 ./source/l/wireplumber/wireplumber.desktop.sample
-rw-r--r-- 1 root root 52 2024-02-10 19:44 ./source/l/wireplumber/wireplumber.url
@@ -15275,11 +15279,11 @@ drwxr-xr-x 2 root root 4096 2024-04-03 17:36 ./source/xap/MPlayer
-rwxr-xr-- 1 root root 13728 2024-04-03 19:27 ./source/xap/MPlayer/MPlayer.SlackBuild
-rw-r--r-- 1 root root 219 2015-03-09 20:07 ./source/xap/MPlayer/include-samba-4.0.patch.gz
-rw-r--r-- 1 root root 292 2024-01-30 20:10 ./source/xap/MPlayer/po_charset.patch.gz
--rw-r--r-- 1 root root 1081 2018-08-20 04:29 ./source/xap/MPlayer/slack-desc
-drwxr-xr-x 2 root root 4096 2024-03-13 18:40 ./source/xap/NetworkManager-openvpn
--rw-r--r-- 1 root root 701652 2022-11-15 11:50 ./source/xap/NetworkManager-openvpn/NetworkManager-openvpn-1.10.2.tar.xz
--rwxr-xr-x 1 root root 4402 2024-03-13 18:40 ./source/xap/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild
--rw-r--r-- 1 root root 1027 2020-05-04 01:23 ./source/xap/NetworkManager-openvpn/slack-desc
+-rw-r--r-- 1 root root 1081 2018-08-20 04:29 ./source/xap/MPlayer/slack-desc
+drwxr-xr-x 2 root root 4096 2024-03-13 18:40 ./source/xap/NetworkManager-openvpn
+-rw-r--r-- 1 root root 701652 2022-11-15 11:50 ./source/xap/NetworkManager-openvpn/NetworkManager-openvpn-1.10.2.tar.xz
+-rwxr-xr-x 1 root root 4402 2024-03-13 18:40 ./source/xap/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild
+-rw-r--r-- 1 root root 1027 2020-05-04 01:23 ./source/xap/NetworkManager-openvpn/slack-desc
drwxr-xr-x 2 root root 4096 2023-05-01 18:12 ./source/xap/audacious
drwxr-xr-x 2 root root 4096 2024-01-28 20:02 ./source/xap/audacious-plugins
-rw-r--r-- 1 root root 1379774 2023-04-29 21:08 ./source/xap/audacious-plugins/audacious-plugins-4.3.1.tar.lz
@@ -15345,8 +15349,8 @@ drwxr-xr-x 2 root root 4096 2022-01-17 21:09 ./source/xap/fluxbox
-rw-r--r-- 1 root root 323 2012-08-09 04:35 ./source/xap/fluxbox/fluxbox.startfluxbox.dbus.diff.gz
-rw-r--r-- 1 root root 684 2018-02-27 06:13 ./source/xap/fluxbox/slack-desc
-rw-r--r-- 1 root root 339 2012-08-08 19:16 ./source/xap/fluxbox/xinitrc.fluxbox.gz
-drwxr-xr-x 2 root root 4096 2024-04-19 17:14 ./source/xap/freerdp
--rw-r--r-- 1 root root 4760992 2024-04-17 12:33 ./source/xap/freerdp/freerdp-2.11.6.tar.lz
+drwxr-xr-x 2 root root 4096 2024-04-22 18:57 ./source/xap/freerdp
+-rw-r--r-- 1 root root 4761065 2024-04-22 09:29 ./source/xap/freerdp/freerdp-2.11.7.tar.lz
-rwxr-xr-x 1 root root 4644 2024-04-19 17:14 ./source/xap/freerdp/freerdp.SlackBuild
-rw-r--r-- 1 root root 34 2021-09-23 18:07 ./source/xap/freerdp/freerdp.url
-rw-r--r-- 1 root root 765 2021-09-23 18:18 ./source/xap/freerdp/slack-desc
@@ -15902,27 +15906,17 @@ drwxr-xr-x 2 root root 4096 2023-02-19 18:29 ./source/y/nethack
-rwxr-xr-x 1 root root 4972 2023-02-19 18:30 ./source/y/nethack/nethack.SlackBuild
-rw-r--r-- 1 root root 59 2023-02-19 18:28 ./source/y/nethack/nethack.url
-rw-r--r-- 1 root root 1031 2020-12-30 21:50 ./source/y/nethack/slack-desc
-drwxr-xr-x 4 root root 4096 2024-04-19 19:40 ./testing
--rw-r--r-- 1 root root 2422 2024-04-19 19:40 ./testing/CHECKSUMS.md5
--rw-r--r-- 1 root root 195 2024-04-19 19:40 ./testing/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 3091 2024-04-19 19:40 ./testing/FILE_LIST
--rw-r--r-- 1 root root 38813 2024-04-19 19:40 ./testing/MANIFEST.bz2
--rw-r--r-- 1 root root 652 2024-04-19 19:40 ./testing/PACKAGES.TXT
+drwxr-xr-x 4 root root 4096 2024-04-22 19:41 ./testing
+-rw-r--r-- 1 root root 1777 2024-04-22 19:41 ./testing/CHECKSUMS.md5
+-rw-r--r-- 1 root root 195 2024-04-22 19:41 ./testing/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 2245 2024-04-22 19:41 ./testing/FILE_LIST
+-rw-r--r-- 1 root root 30756 2024-04-22 19:41 ./testing/MANIFEST.bz2
+-rw-r--r-- 1 root root 652 2024-04-22 19:41 ./testing/PACKAGES.TXT
drwxr-xr-x 2 root root 4096 2024-02-12 20:44 ./testing/packages
-rw-r--r-- 1 root root 269 2024-01-02 19:49 ./testing/packages/grub-2.12-x86_64-2.txt
-rw-r--r-- 1 root root 10454116 2024-01-02 19:49 ./testing/packages/grub-2.12-x86_64-2.txz
-rw-r--r-- 1 root root 163 2024-01-02 19:49 ./testing/packages/grub-2.12-x86_64-2.txz.asc
-drwxr-xr-x 4 root root 4096 2024-04-19 19:17 ./testing/source
-drwxr-xr-x 2 root root 4096 2024-04-16 18:36 ./testing/source/elogind
--rw-r--r-- 1 root root 227 2020-06-08 19:25 ./testing/source/elogind/10-enable-elogind-power.rules.gz
--rw-r--r-- 1 root root 271 2024-04-16 18:32 ./testing/source/elogind/11-prefer-deep-suspend.patch
--rw-r--r-- 1 root root 511 2024-04-16 18:36 ./testing/source/elogind/doinst.sh.gz
--rw-r--r-- 1 root root 1432454 2024-04-16 07:21 ./testing/source/elogind/elogind-255.4_r2.tar.lz
--rwxr-xr-x 1 root root 7180 2024-04-19 17:08 ./testing/source/elogind/elogind.SlackBuild
--rw-r--r-- 1 root root 10401 2024-03-12 18:23 ./testing/source/elogind/elogind.nobody.nogroup.99.99.diff
--rw-r--r-- 1 root root 35 2020-09-28 21:24 ./testing/source/elogind/elogind.url
--rw-r--r-- 1 root root 1615 2020-09-28 21:29 ./testing/source/elogind/rc.elogind
--rw-r--r-- 1 root root 747 2020-11-01 20:04 ./testing/source/elogind/slack-desc
+drwxr-xr-x 3 root root 4096 2024-04-22 19:19 ./testing/source
drwxr-xr-x 2 root root 4096 2024-01-02 19:45 ./testing/source/grub
-rw-r--r-- 1 root root 1167 2023-12-21 19:26 ./testing/source/grub/0001-00_header-add-GRUB_COLOR_-variables.patch
-rw-r--r-- 1 root root 444 2024-01-02 19:45 ./testing/source/grub/0001-skip-new-and-orig-files-in-etc-grub.d.patch
diff --git a/recompress.sh b/recompress.sh
index 2c926e154..ec7856f58 100755
--- a/recompress.sh
+++ b/recompress.sh
@@ -1078,5 +1078,3 @@ gzip ./source/x/ibus/emoji-test.txt
gzip ./source/x/xcm/xcm.udev.rules.diff
gzip ./source/x/libva/doinst.sh
gzip ./testing/source/grub/doinst.sh
-gzip ./testing/source/elogind/10-enable-elogind-power.rules
-gzip ./testing/source/elogind/doinst.sh
diff --git a/testing/source/elogind/11-prefer-deep-suspend.patch b/source/a/elogind/11-prefer-deep-suspend.patch
similarity index 100%
rename from testing/source/elogind/11-prefer-deep-suspend.patch
rename to source/a/elogind/11-prefer-deep-suspend.patch
diff --git a/source/a/elogind/12-default-deep-suspend.patch b/source/a/elogind/12-default-deep-suspend.patch
new file mode 100644
index 000000000..25eb73dc6
--- /dev/null
+++ b/source/a/elogind/12-default-deep-suspend.patch
@@ -0,0 +1,11 @@
+--- ./src/shared/sleep-config.c.orig 2024-04-16 02:21:44.000000000 -0500
++++ ./src/shared/sleep-config.c 2024-04-22 13:31:58.033078814 -0500
+@@ -45,7 +45,7 @@
+ #if 0 /// elogind supports suspend modes (deep s2idle) so we need defaults, too
+ /* Not used by SLEEP_SUSPEND */
+ #else // 0
+- [SLEEP_SUSPEND] = STRV_MAKE("s2idle", "deep"),
++ [SLEEP_SUSPEND] = STRV_MAKE("deep", "s2idle"),
+ #endif // 0
+ [SLEEP_HIBERNATE] = STRV_MAKE("platform", "shutdown"),
+ [SLEEP_HYBRID_SLEEP] = STRV_MAKE("suspend"),
diff --git a/source/a/elogind/5d16d94aa9a5e3afe5b51f591497149630763b24.patch b/source/a/elogind/5d16d94aa9a5e3afe5b51f591497149630763b24.patch
new file mode 100644
index 000000000..fe7940fff
--- /dev/null
+++ b/source/a/elogind/5d16d94aa9a5e3afe5b51f591497149630763b24.patch
@@ -0,0 +1,39 @@
+From 5d16d94aa9a5e3afe5b51f591497149630763b24 Mon Sep 17 00:00:00 2001
+From: Sven Eden
+Date: Mon, 22 Apr 2024 08:31:30 +0200
+Subject: [PATCH] SIGCHLD handler: Check sleep_fork_action against NULL
+
+Signed-off-by: Sven Eden
+---
+ src/login/elogind.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/login/elogind.c b/src/login/elogind.c
+index e616b8088e..b47540352f 100644
+--- a/src/login/elogind.c
++++ b/src/login/elogind.c
+@@ -81,6 +81,7 @@ static int elogind_sigchld_handler(
+ sd_event_source* s,
+ const struct signalfd_siginfo* si,
+ void* userdata ) {
++ const HandleActionData* a;
+ Manager* m = userdata;
+ int r, status;
+
+@@ -97,13 +98,14 @@ static int elogind_sigchld_handler(
+
+ /* The sleep forker PID is always "the outer one", so wait for it second. */
+ if ( m->sleep_fork_pid > 0 ) {
++ a = m->sleep_fork_action;
+ waitpid(m->sleep_fork_pid, &status, WNOHANG | WUNTRACED);
+ log_debug_elogind( "sleep_fork PID %d waitpid() set status %d", m->sleep_fork_pid, status );
+ if ( WIFEXITED(status) || WIFSIGNALED(status) )
+ m->sleep_fork_pid = 0;
+ /* Tell people that they now may take a lock again */
+- if ( m->sleep_fork_action->sleep_operation != _SLEEP_OPERATION_INVALID ) {
+- (void) send_prepare_for( m, m->sleep_fork_action, false );
++ if ( a && a->sleep_operation != _SLEEP_OPERATION_INVALID ) {
++ (void) send_prepare_for( m, a, false );
+ m->sleep_fork_action = NULL; /* All done */
+ }
+ }
diff --git a/source/a/elogind/ce3616c8864e56bf7efb233242f20197108a9dba.patch b/source/a/elogind/ce3616c8864e56bf7efb233242f20197108a9dba.patch
new file mode 100644
index 000000000..3fcc03794
--- /dev/null
+++ b/source/a/elogind/ce3616c8864e56bf7efb233242f20197108a9dba.patch
@@ -0,0 +1,132 @@
+From ce3616c8864e56bf7efb233242f20197108a9dba Mon Sep 17 00:00:00 2001
+From: Sven Eden
+Date: Sun, 21 Apr 2024 17:07:25 +0200
+Subject: [PATCH] Send wakeup signal in SIGCHLD handler (#280)
+
+The forked out sleeper process fails to send the wakeup signal, as it
+does not share the dbus connection with elogind.
+
+Therefore elogind sends the signal itself once the sleeper has
+messaged elogind that it is done via the SIGCHLD signal.
+
+Bug: #280
+Signed-off-by: Sven Eden
+---
+ src/login/elogind.c | 19 +++++++++++++------
+ src/login/logind-dbus.c | 13 +++++--------
+ src/login/logind-dbus.h | 4 ++++
+ src/login/logind.h | 3 +++
+ 4 files changed, 25 insertions(+), 14 deletions(-)
+
+diff --git a/src/login/elogind.c b/src/login/elogind.c
+index 11000170a6..e616b8088e 100644
+--- a/src/login/elogind.c
++++ b/src/login/elogind.c
+@@ -25,6 +25,7 @@
+ #include "fd-util.h"
+ #include "fileio.h"
+ #include "fs-util.h"
++#include "logind-dbus.h"
+ #include "mount-setup.h"
+ #include "musl_missing.h"
+ #include "parse-util.h"
+@@ -100,6 +101,11 @@ static int elogind_sigchld_handler(
+ log_debug_elogind( "sleep_fork PID %d waitpid() set status %d", m->sleep_fork_pid, status );
+ if ( WIFEXITED(status) || WIFSIGNALED(status) )
+ m->sleep_fork_pid = 0;
++ /* Tell people that they now may take a lock again */
++ if ( m->sleep_fork_action->sleep_operation != _SLEEP_OPERATION_INVALID ) {
++ (void) send_prepare_for( m, m->sleep_fork_action, false );
++ m->sleep_fork_action = NULL; /* All done */
++ }
+ }
+ }
+
+@@ -416,12 +422,13 @@ void elogind_manager_free( Manager* m ) {
+ int elogind_manager_new( Manager* m ) {
+ int r = 0;
+
+- m->cgroups_agent_fd = -1;
+- m->pin_cgroupfs_fd = -1;
+- m->test_run_flags = 0;
+- m->do_interrupt = false;
+- m->sleep_fork_pid = 0;
+- m->tool_fork_pid = 0;
++ m->cgroups_agent_fd = -1;
++ m->pin_cgroupfs_fd = -1;
++ m->test_run_flags = 0;
++ m->do_interrupt = false;
++ m->sleep_fork_pid = 0;
++ m->tool_fork_pid = 0;
++ m->sleep_fork_action = NULL;
+
+ /* Init poweroff/suspend interruption */
+ m->allow_poweroff_interrupts = false;
+diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
+index 25df8d2cb9..b83dceae9b 100644
+--- a/src/login/logind-dbus.c
++++ b/src/login/logind-dbus.c
+@@ -1730,7 +1730,11 @@ int manager_set_lid_switch_ignore(Manager *m, usec_t until) {
+ return r;
+ }
+
++#if 0 /// elogind needs to call this from elogind.c
+ static int send_prepare_for(Manager *m, const HandleActionData *a, bool _active) {
++#else
++int send_prepare_for(Manager *m, const HandleActionData *a, bool _active) {
++#endif // 0
+ int k = 0, r, active = _active;
+
+ assert(m);
+@@ -1902,6 +1906,7 @@ static int elogind_execute_shutdown_or_sleep(
+ * from the shutdown/sleep routines. Doing this in the main thread would
+ * make it impossible to talk to ourselves.
+ */
++ m->sleep_fork_action = a; /* Remember this for the SIGCHLD handler */
+ forker = strjoina( "e-", handle_action_to_string( a->handle ) );
+ t = safe_fork( forker,
+ FORK_LOG|FORK_REOPEN_LOG|FORK_DEATHSIG_SIGTERM|FORK_CLOSE_ALL_FDS|FORK_REARRANGE_STDIO,
+@@ -1926,14 +1931,6 @@ static int elogind_execute_shutdown_or_sleep(
+ log_error_errno( r, "%s: shutdown_or_sleep failed: %m", program_invocation_short_name );
+ }
+
+- /* As elogind cannot rely on a systemd manager to call all
+- * sleeping processes to wake up, we have to tell them all
+- * by ourselves.
+- * Note: execute_shutdown_or_sleep() does not send the
+- * signal unless an error occurred. */
+- if ( a->sleep_operation != _SLEEP_OPERATION_INVALID )
+- (void) send_prepare_for( m, a, false );
+-
+ log_debug_elogind("Exiting from %s", program_invocation_short_name);
+
+ _exit( EXIT_SUCCESS );
+diff --git a/src/login/logind-dbus.h b/src/login/logind-dbus.h
+index c9d59231d4..aa8bdfeb23 100644
+--- a/src/login/logind-dbus.h
++++ b/src/login/logind-dbus.h
+@@ -9,6 +9,10 @@
+ #include "logind-user.h"
+ #include "logind.h"
+
++#if 1 /// elogind needs to call this from elogind.c
++int send_prepare_for(Manager *m, const HandleActionData *a, bool _active);
++#endif // 1
++
+ int manager_get_session_from_creds(Manager *m, sd_bus_message *message, const char *name, sd_bus_error *error, Session **ret);
+ int manager_get_user_from_creds(Manager *m, sd_bus_message *message, uid_t uid, sd_bus_error *error, User **ret);
+ int manager_get_seat_from_creds(Manager *m, sd_bus_message *message, const char *name, sd_bus_error *error, Seat **ret);
+diff --git a/src/login/logind.h b/src/login/logind.h
+index 20c73444ed..6eb40ddb6f 100644
+--- a/src/login/logind.h
++++ b/src/login/logind.h
+@@ -84,6 +84,9 @@ struct Manager {
+ /* elogind might spawn processes to suspend/hibernate, so we need their PIDs to end them properly */
+ pid_t sleep_fork_pid; /* for suspend/hibernate fork */
+ pid_t tool_fork_pid; /* for external tool fork */
++
++ /* To wake up sleeping consumers using the right operation, the manager must know what is going on. */
++ const HandleActionData *sleep_fork_action;
+ #endif // 0
+
+ Seat *seat0;
diff --git a/source/a/elogind/doinst.sh b/source/a/elogind/doinst.sh
index e529fda15..e39e2aee3 100644
--- a/source/a/elogind/doinst.sh
+++ b/source/a/elogind/doinst.sh
@@ -29,6 +29,7 @@ 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 ead080f8e..2f5199837 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:-3}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -98,30 +98,55 @@ find . \
# but sed will still happily scribble all over everything.
cat $CWD/elogind.nobody.nogroup.99.99.diff | patch -p1 --verbose || exit 1
+# OK, here's the scoop on s2idle. After doing some digging, it looks like both
+# Intel and AMD have stopped officially supporting S3 sleep (aka "deep") with
+# the latest generation of CPUs (although it "might work"). I've also seen a
+# few people say that S3 is "not secure"... which if you're worried that a
+# three letter agency might grab your sleeping laptop and extract the contents
+# of the RAM while keeping it powered up, well, maybe in that sense it isn't.
+# As far as s2idle, I have heard that it has the potential to be as much of a
+# low power mode as deep, but that depends on how low the IRQ rate gets. In
+# practice I have heard of s2idle draining a battery in half a day.
+#
+# Anyway, I tried s2deep here again (with the below sleep patches) and it still
+# locks up my machine (a fairly recent Thinkpad X1).
+#
+# S3 works and has the best power savings of all the partially-on modes.
+# Feel free to edit /etc/elogind/sleep.conf.d/10-elogind.conf if s2deep works
+# for you, but we'll continue to default to deep for now.
+#
+# Don't prefer s2idle, as it doesn't seem to work:
+cat $CWD/11-prefer-deep-suspend.patch | patch -p1 --verbose || exit 1
+cat $CWD/12-default-deep-suspend.patch | patch -p1 --verbose || exit 1
+
+# Upstream sleep fixes:
+cat $CWD/ce3616c8864e56bf7efb233242f20197108a9dba.patch | patch -p1 --verbose || exit 1
+cat $CWD/5d16d94aa9a5e3afe5b51f591497149630763b24.patch | patch -p1 --verbose || exit 1
+
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
mkdir meson-build
cd meson-build
meson setup \
- --buildtype release \
- --prefix /usr \
- --libdir /usr/lib${LIBDIRSUFFIX} \
- -Drootlibdir="/lib${LIBDIRSUFFIX}" \
- -Drootlibexecdir="/lib${LIBDIRSUFFIX}/elogind" \
+ --buildtype=release \
+ --prefix=/usr \
+ --libdir=/lib${LIBDIRSUFFIX} \
+ --libexecdir=/lib${LIBDIRSUFFIX}/elogind \
+ -Dpkgconfiglibdir=/usr/lib${LIBDIRSUFFIX}/pkgconfig \
+ -Dpamlibdir=/lib${LIBDIRSUFFIX}/security \
-Dudevrulesdir="/lib/udev/rules.d" \
-Ddocdir="/usr/doc/$PKGNAM-$VERSION" \
-Dhtmldir="/usr/doc/$PKGNAM-$VERSION/html" \
-Dmandir="/usr/man" \
- -Dman=true \
- -Dhtml=false \
+ -Dman=enabled \
+ -Dhtml=disabled \
-Dbashcompletiondir="/usr/share/bash-completion/completions" \
-Dnobody-user=nobody \
-Dnobody-group=nogroup \
- -Dpam=true \
- -Dpamlibdir="/lib${LIBDIRSUFFIX}/security" \
+ -Dpam=enabled \
-Dpamconfdir="/etc/pam.d" \
- -Dacl=true \
+ -Dacl=enabled \
-Dsmack=false \
-Dutmp=true \
-Ddefault-hierarchy=legacy \
@@ -136,14 +161,15 @@ meson setup \
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
+# 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
# 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:
diff --git a/testing/source/elogind/10-enable-elogind-power.rules b/testing/source/elogind/10-enable-elogind-power.rules
deleted file mode 100644
index db4992062..000000000
--- a/testing/source/elogind/10-enable-elogind-power.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-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;
- }
- }
-);
-
diff --git a/testing/source/elogind/doinst.sh b/testing/source/elogind/doinst.sh
deleted file mode 100644
index e39e2aee3..000000000
--- a/testing/source/elogind/doinst.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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
-config etc/elogind/sleep.conf.d/10-elogind.conf.new
-config etc/pam.d/elogind-user.new
-
-# Reload elogind-daemon:
-if pgrep -f elogind-daemon 1> /dev/null 2> /dev/null ; then
- pkill -HUP -f elogind-daemon
-fi
-
diff --git a/testing/source/elogind/elogind.SlackBuild b/testing/source/elogind/elogind.SlackBuild
deleted file mode 100755
index 494eddc53..000000000
--- a/testing/source/elogind/elogind.SlackBuild
+++ /dev/null
@@ -1,208 +0,0 @@
-#!/bin/bash
-
-# Copyright 2016, 2017, 2020 Eric Hameleers, Eindhoven, NL
-# Copyright 2020, 2023, 2024 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:-1}
-
-# 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 {} \+
-
-# Once upon a time we were encouraged to go against long-standing UNIX
-# traditions and use 99:99 for nobody:nogroup.
-# This may have been a bad idea.
-# But since to change this we'll have to dig through the system and make
-# sure that nothing hardcodes 99:99, we'll leave it as-is for now.
-# It's more than likely on the TODO list to change these back to
-# 65534:65534, however.
-# Meanwhile we'll at least change this from a sed to a patch.
-# Always hated sed in these situations because the underlying code can change
-# 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 setup \
- --buildtype=release \
- --prefix=/usr \
- --libdir=/lib${LIBDIRSUFFIX} \
- --libexecdir=/lib${LIBDIRSUFFIX}/elogind \
- -Dpkgconfiglibdir=/usr/lib${LIBDIRSUFFIX}/pkgconfig \
- -Dpamlibdir=/lib${LIBDIRSUFFIX}/security \
- -Dudevrulesdir="/lib/udev/rules.d" \
- -Ddocdir="/usr/doc/$PKGNAM-$VERSION" \
- -Dhtmldir="/usr/doc/$PKGNAM-$VERSION/html" \
- -Dmandir="/usr/man" \
- -Dman=enabled \
- -Dhtml=disabled \
- -Dbashcompletiondir="/usr/share/bash-completion/completions" \
- -Dnobody-user=nobody \
- -Dnobody-group=nogroup \
- -Dpam=enabled \
- -Dpamconfdir="/etc/pam.d" \
- -Dacl=enabled \
- -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 \
- -Dmode=release \
- .. || exit 1
- "${NINJA:=ninja}" $NUMJOBS || exit 1
- 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
-
-# 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:
-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
-zcat $CWD/10-enable-elogind-power.rules.gz > $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
-zcat $CWD/doinst.sh.gz > $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
diff --git a/testing/source/elogind/elogind.nobody.nogroup.99.99.diff b/testing/source/elogind/elogind.nobody.nogroup.99.99.diff
deleted file mode 100644
index e1930ef52..000000000
--- a/testing/source/elogind/elogind.nobody.nogroup.99.99.diff
+++ /dev/null
@@ -1,174 +0,0 @@
-diff -u -r --new-file elogind-252.23.orig/meson.build elogind-252.23/meson.build
---- elogind-252.23.orig/meson.build 2024-03-10 03:24:27.000000000 -0500
-+++ elogind-252.23/meson.build 2024-03-12 13:22:28.571004872 -0500
-@@ -1031,40 +1031,40 @@
- nobody_group = get_option('nobody-group')
-
- if not meson.is_cross_build()
-- getent_result = run_command('getent', 'passwd', '65534', check : false)
-+ getent_result = run_command('getent', 'passwd', '99', check : false)
- if getent_result.returncode() == 0
- name = getent_result.stdout().split(':')[0]
- if name != nobody_user
- warning('\n' +
-- 'The local user with the UID 65534 does not match the configured user name "@0@" of the nobody user (its name is @1@).\n'.format(nobody_user, name) +
-+ 'The local user with the UID 99 does not match the configured user name "@0@" of the nobody user (its name is @1@).\n'.format(nobody_user, name) +
- 'Your build will result in an user table setup that is incompatible with the local system.')
- endif
- endif
- id_result = run_command('id', '-u', nobody_user, check : false)
- if id_result.returncode() == 0
- id = id_result.stdout().strip().to_int()
-- if id != 65534
-+ if id != 99
- warning('\n' +
-- 'The local user with the configured user name "@0@" of the nobody user does not have UID 65534 (it has @1@).\n'.format(nobody_user, id) +
-+ 'The local user with the configured user name "@0@" of the nobody user does not have UID 99 (it has @1@).\n'.format(nobody_user, id) +
- 'Your build will result in an user table setup that is incompatible with the local system.')
- endif
- endif
-
-- getent_result = run_command('getent', 'group', '65534', check : false)
-+ getent_result = run_command('getent', 'group', '99', check : false)
- if getent_result.returncode() == 0
- name = getent_result.stdout().split(':')[0]
- if name != nobody_group
- warning('\n' +
-- 'The local group with the GID 65534 does not match the configured group name "@0@" of the nobody group (its name is @1@).\n'.format(nobody_group, name) +
-+ 'The local group with the GID 99 does not match the configured group name "@0@" of the nobody group (its name is @1@).\n'.format(nobody_group, name) +
- 'Your build will result in an group table setup that is incompatible with the local system.')
- endif
- endif
- id_result = run_command('id', '-g', nobody_group, check : false)
- if id_result.returncode() == 0
- id = id_result.stdout().strip().to_int()
-- if id != 65534
-+ if id != 99
- warning('\n' +
-- 'The local group with the configured group name "@0@" of the nobody group does not have GID 65534 (it has @1@).\n'.format(nobody_group, id) +
-+ 'The local group with the configured group name "@0@" of the nobody group does not have GID 99 (it has @1@).\n'.format(nobody_group, id) +
- 'Your build will result in an group table setup that is incompatible with the local system.')
- endif
- endif
-diff -u -r --new-file elogind-252.23.orig/meson_options.txt elogind-252.23/meson_options.txt
---- elogind-252.23.orig/meson_options.txt 2024-03-10 03:24:27.000000000 -0500
-+++ elogind-252.23/meson_options.txt 2024-03-12 13:22:28.571004872 -0500
-@@ -308,10 +308,10 @@
- option('wheel-group', type : 'boolean',
- description : 'the ACL for wheel group should be added')
- option('nobody-user', type : 'string',
-- description : 'The name of the nobody user (the one with UID 65534)',
-+ description : 'The name of the nobody user (the one with UID 99)',
- value : 'nobody')
- option('nobody-group', type : 'string',
-- description : 'The name of the nobody group (the one with GID 65534)',
-+ description : 'The name of the nobody group (the one with GID 99)',
- value : 'nobody')
- #if 0 /// UNNEEDED by elogind
- # option('adm-gid', type : 'integer', value : 0,
-diff -u -r --new-file elogind-252.23.orig/src/basic/user-util.c elogind-252.23/src/basic/user-util.c
---- elogind-252.23.orig/src/basic/user-util.c 2024-03-10 03:24:27.000000000 -0500
-+++ elogind-252.23/src/basic/user-util.c 2024-03-12 13:22:28.571004872 -0500
-@@ -178,7 +178,7 @@
- const char **shell,
- UserCredsFlags flags) {
-
-- /* We enforce some special rules for uid=0 and uid=65534: in order to avoid NSS lookups for root we hardcode
-+ /* We enforce some special rules for uid=0 and uid=99: in order to avoid NSS lookups for root we hardcode
- * their user record data. */
-
- if (STR_IN_SET(*username, "root", "0")) {
-@@ -198,7 +198,7 @@
- return 0;
- }
-
-- if (STR_IN_SET(*username, NOBODY_USER_NAME, "65534") &&
-+ if (STR_IN_SET(*username, NOBODY_USER_NAME, "99") &&
- synthesize_nobody()) {
- *username = NOBODY_USER_NAME;
-
-@@ -344,7 +344,7 @@
- return 0;
- }
-
-- if (STR_IN_SET(*groupname, NOBODY_GROUP_NAME, "65534") &&
-+ if (STR_IN_SET(*groupname, NOBODY_GROUP_NAME, "99") &&
- synthesize_nobody()) {
- *groupname = NOBODY_GROUP_NAME;
-
-@@ -940,7 +940,7 @@
- bool synthesize_nobody(void) {
- /* Returns true when we shall synthesize the "nobody" user (which we do by default). This can be turned off by
- * touching /etc/systemd/dont-synthesize-nobody in order to provide upgrade compatibility with legacy systems
-- * that used the "nobody" user name and group name for other UIDs/GIDs than 65534.
-+ * that used the "nobody" user name and group name for other UIDs/GIDs than 99.
- *
- * Note that we do not employ any kind of synchronization on the following caching variable. If the variable is
- * accessed in multi-threaded programs in the worst case it might happen that we initialize twice, but that
-diff -u -r --new-file elogind-252.23.orig/src/basic/user-util.h elogind-252.23/src/basic/user-util.h
---- elogind-252.23.orig/src/basic/user-util.h 2024-03-10 03:24:27.000000000 -0500
-+++ elogind-252.23/src/basic/user-util.h 2024-03-12 13:22:28.571004872 -0500
-@@ -78,8 +78,8 @@
- #define UID_INVALID ((uid_t) -1)
- #define GID_INVALID ((gid_t) -1)
-
--#define UID_NOBODY ((uid_t) 65534U)
--#define GID_NOBODY ((gid_t) 65534U)
-+#define UID_NOBODY ((uid_t) 99U)
-+#define GID_NOBODY ((gid_t) 99U)
-
- /* If REMOUNT_IDMAPPING_HOST_ROOT is set for remount_idmap() we'll include a mapping here that maps the host
- * root user accessing the idmapped mount to the this user ID on the backing fs. This is the last valid UID in
-diff -u -r --new-file elogind-252.23.orig/src/test/test-fs-util.c elogind-252.23/src/test/test-fs-util.c
---- elogind-252.23.orig/src/test/test-fs-util.c 2024-03-10 03:24:27.000000000 -0500
-+++ elogind-252.23/src/test/test-fs-util.c 2024-03-12 13:22:28.571004872 -0500
-@@ -591,8 +591,8 @@
- usec_t test_mtime;
- int r;
-
-- test_uid = geteuid() == 0 ? 65534 : getuid();
-- test_gid = geteuid() == 0 ? 65534 : getgid();
-+ test_uid = geteuid() == 0 ? 99 : getuid();
-+ test_gid = geteuid() == 0 ? 99 : getgid();
-
- test_mtime = usec_sub_unsigned(now(CLOCK_REALTIME), USEC_PER_WEEK);
-
-diff -u -r --new-file elogind-252.23.orig/src/test/test-user-util.c elogind-252.23/src/test/test-user-util.c
---- elogind-252.23.orig/src/test/test-user-util.c 2024-03-10 03:24:27.000000000 -0500
-+++ elogind-252.23/src/test/test-user-util.c 2024-03-12 13:22:28.571004872 -0500
-@@ -230,7 +230,7 @@
- assert_se(!valid_user_group_name("", VALID_USER_ALLOW_NUMERIC|VALID_USER_RELAX));
- assert_se(valid_user_group_name("0", VALID_USER_ALLOW_NUMERIC|VALID_USER_RELAX));
- assert_se(valid_user_group_name("1", VALID_USER_ALLOW_NUMERIC|VALID_USER_RELAX));
-- assert_se(valid_user_group_name("65534", VALID_USER_ALLOW_NUMERIC|VALID_USER_RELAX));
-+ assert_se(valid_user_group_name("99", VALID_USER_ALLOW_NUMERIC|VALID_USER_RELAX));
- assert_se(!valid_user_group_name("65535", VALID_USER_ALLOW_NUMERIC|VALID_USER_RELAX));
- assert_se(valid_user_group_name("65536", VALID_USER_ALLOW_NUMERIC|VALID_USER_RELAX));
- assert_se(!valid_user_group_name("-1", VALID_USER_ALLOW_NUMERIC|VALID_USER_RELAX));
-@@ -266,7 +266,7 @@
- assert_se(!valid_user_group_name("", VALID_USER_ALLOW_NUMERIC));
- assert_se(valid_user_group_name("0", VALID_USER_ALLOW_NUMERIC));
- assert_se(valid_user_group_name("1", VALID_USER_ALLOW_NUMERIC));
-- assert_se(valid_user_group_name("65534", VALID_USER_ALLOW_NUMERIC));
-+ assert_se(valid_user_group_name("99", VALID_USER_ALLOW_NUMERIC));
- assert_se(!valid_user_group_name("65535", VALID_USER_ALLOW_NUMERIC));
- assert_se(valid_user_group_name("65536", VALID_USER_ALLOW_NUMERIC));
- assert_se(!valid_user_group_name("-1", VALID_USER_ALLOW_NUMERIC));
-@@ -350,7 +350,7 @@
- test_get_user_creds_one("root", "root", 0, 0, "/root", DEFAULT_USER_SHELL);
- test_get_user_creds_one("0", "root", 0, 0, "/root", DEFAULT_USER_SHELL);
- test_get_user_creds_one(NOBODY_USER_NAME, NOBODY_USER_NAME, UID_NOBODY, GID_NOBODY, "/", NOLOGIN);
-- test_get_user_creds_one("65534", NOBODY_USER_NAME, UID_NOBODY, GID_NOBODY, "/", NOLOGIN);
-+ test_get_user_creds_one("99", NOBODY_USER_NAME, UID_NOBODY, GID_NOBODY, "/", NOLOGIN);
- }
-
- #if 0 /// UNNEEDED by elogind
-@@ -375,7 +375,7 @@
- test_get_group_creds_one("root", "root", 0);
- test_get_group_creds_one("0", "root", 0);
- test_get_group_creds_one(NOBODY_GROUP_NAME, NOBODY_GROUP_NAME, GID_NOBODY);
-- test_get_group_creds_one("65534", NOBODY_GROUP_NAME, GID_NOBODY);
-+ test_get_group_creds_one("99", NOBODY_GROUP_NAME, GID_NOBODY);
- }
-
- TEST(make_salt) {
diff --git a/testing/source/elogind/elogind.url b/testing/source/elogind/elogind.url
deleted file mode 100644
index b8940789e..000000000
--- a/testing/source/elogind/elogind.url
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/elogind/elogind
diff --git a/testing/source/elogind/rc.elogind b/testing/source/elogind/rc.elogind
deleted file mode 100644
index 62884784a..000000000
--- a/testing/source/elogind/rc.elogind
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/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 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
diff --git a/testing/source/elogind/slack-desc b/testing/source/elogind/slack-desc
deleted file mode 100644
index 507776d5f..000000000
--- a/testing/source/elogind/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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: