diff options
| -rw-r--r-- | ChangeLog.rss | 25 | ||||
| -rw-r--r-- | ChangeLog.txt | 13 | ||||
| -rw-r--r-- | FILELIST.TXT | 98 | ||||
| -rwxr-xr-x | recompress.sh | 1 | ||||
| -rw-r--r-- | source/kde/kde/build/plasma-workspace | 2 | ||||
| -rw-r--r-- | source/kde/kde/patch/plasma-workspace.patch | 2 | ||||
| -rw-r--r-- | source/kde/kde/patch/plasma-workspace/update-qml-files.patch | 278 | ||||
| -rwxr-xr-x | source/n/NetworkManager/NetworkManager.SlackBuild | 2 | ||||
| -rw-r--r-- | source/n/NetworkManager/conf.d/00-dhcp-client.conf | 19 | ||||
| -rw-r--r-- | source/n/NetworkManager/patches/9cc2591fe871b29ce9a743dfb2cd189cb1580bde.dhcpcd.graceful.exit.patch | 119 | ||||
| -rwxr-xr-x | source/n/dhcpcd/dhcpcd.SlackBuild | 11 |
11 files changed, 493 insertions, 77 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss index e919a679e..4eec9bc71 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,10 +11,31 @@ <description>Tracking Slackware development in git.</description> <language>en-us</language> <id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id> - <pubDate>Fri, 17 Sep 2021 04:17:57 GMT</pubDate> - <lastBuildDate>Fri, 17 Sep 2021 15:59:43 GMT</lastBuildDate> + <pubDate>Fri, 17 Sep 2021 17:22:57 GMT</pubDate> + <lastBuildDate>Sat, 18 Sep 2021 06:59:47 GMT</lastBuildDate> <generator>maintain_current_git.sh v 1.12</generator> <item> + <title>Fri, 17 Sep 2021 17:22:57 GMT</title> + <pubDate>Fri, 17 Sep 2021 17:22:57 GMT</pubDate> + <link>https://git.slackware.nl/current/tag/?h=20210917172257</link> + <guid isPermaLink="false">20210917172257</guid> + <description> + <![CDATA[<pre> +kde/plasma-workspace-5.22.5-x86_64-2.txz: Rebuilt. + Patched to fix USB storage devices detected only once per session. + Thanks to ctrlaltca. +n/NetworkManager-1.32.10-x86_64-4.txz: Rebuilt. + Patched to shut down dhcpcd gracefully, and restored dhcpcd as the default + client when using NetworkManager on Slackware. In this case I'll swim + upstream if it means better security. Who knows what your DHCP server might + attempt when it comes to public WiFi? :-) + Thanks to Roy Marples and marav. +n/gnupg2-2.2.31-x86_64-1.txz: Upgraded. +xap/pidgin-2.14.7-x86_64-1.txz: Upgraded. + </pre>]]> + </description> + </item> + <item> <title>Fri, 17 Sep 2021 04:17:57 GMT</title> <pubDate>Fri, 17 Sep 2021 04:17:57 GMT</pubDate> <link>https://git.slackware.nl/current/tag/?h=20210917041757</link> diff --git a/ChangeLog.txt b/ChangeLog.txt index 95015eea5..52274cace 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,16 @@ +Fri Sep 17 17:22:57 UTC 2021 +kde/plasma-workspace-5.22.5-x86_64-2.txz: Rebuilt. + Patched to fix USB storage devices detected only once per session. + Thanks to ctrlaltca. +n/NetworkManager-1.32.10-x86_64-4.txz: Rebuilt. + Patched to shut down dhcpcd gracefully, and restored dhcpcd as the default + client when using NetworkManager on Slackware. In this case I'll swim + upstream if it means better security. Who knows what your DHCP server might + attempt when it comes to public WiFi? :-) + Thanks to Roy Marples and marav. +n/gnupg2-2.2.31-x86_64-1.txz: Upgraded. +xap/pidgin-2.14.7-x86_64-1.txz: Upgraded. ++--------------------------+ Fri Sep 17 04:17:57 UTC 2021 a/cryptsetup-2.4.1-x86_64-1.txz: Upgraded. a/sysvinit-scripts-15.0-noarch-5.txz: Rebuilt. diff --git a/FILELIST.TXT b/FILELIST.TXT index 118485832..9a67c8fca 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Fri Sep 17 04:24:01 UTC 2021 +Fri Sep 17 17:25:56 UTC 2021 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 2021-09-17 04:17 . +drwxr-xr-x 12 root root 4096 2021-09-17 17:22 . -rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2 -rw-r--r-- 1 root root 15590 2021-08-07 23:14 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1083160 2021-09-16 18:37 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2021-09-16 18:37 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1083286 2021-09-17 04:24 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2021-09-17 04:24 ./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 1648478 2021-09-17 04:17 ./ChangeLog.txt +-rw-r--r-- 1 root root 1649119 2021-09-17 17:22 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2021-09-16 18:32 ./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 2021-09-16 18:32 ./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 1410026 2021-09-16 18:36 ./FILELIST.TXT +-rw-r--r-- 1 root root 1410167 2021-09-17 04:24 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 855097 2021-09-17 04:23 ./PACKAGES.TXT +-rw-r--r-- 1 root root 855097 2021-09-17 17:25 ./PACKAGES.TXT -rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT -rw-r--r-- 1 root root 3629 2021-09-16 18:15 ./README.initrd -rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT @@ -715,11 +715,11 @@ drwxr-xr-x 2 root root 4096 2012-09-20 18:06 ./patches -rw-r--r-- 1 root root 575 2012-09-20 18:06 ./patches/FILE_LIST -rw-r--r-- 1 root root 14 2012-09-20 18:06 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 224 2012-09-20 18:06 ./patches/PACKAGES.TXT -drwxr-xr-x 17 root root 4096 2021-09-17 04:23 ./slackware64 --rw-r--r-- 1 root root 334292 2021-09-17 04:23 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2021-09-17 04:23 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 414719 2021-09-17 04:22 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 4151741 2021-09-17 04:23 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 17 root root 4096 2021-09-17 17:25 ./slackware64 +-rw-r--r-- 1 root root 334292 2021-09-17 17:25 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2021-09-17 17:25 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 414719 2021-09-17 17:24 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 4152834 2021-09-17 17:25 ./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 2021-09-17 04:22 ./slackware64/a -rw-r--r-- 1 root root 327 2021-07-17 17:47 ./slackware64/a/aaa_base-15.0-x86_64-1.txt @@ -1606,7 +1606,7 @@ drwxr-xr-x 2 root root 4096 2021-09-16 18:35 ./slackware64/k -rw-r--r-- 1 root root 1170 2021-09-16 18:15 ./slackware64/k/maketag -rw-r--r-- 1 root root 1170 2021-09-16 18:15 ./slackware64/k/maketag.ez -rw-r--r-- 1 root root 18 2021-09-16 18:15 ./slackware64/k/tagfile -drwxr-xr-x 2 root root 77824 2021-09-16 02:58 ./slackware64/kde +drwxr-xr-x 2 root root 77824 2021-09-17 17:24 ./slackware64/kde -rw-r--r-- 1 root root 382 2021-09-02 16:50 ./slackware64/kde/akonadi-21.08.1-x86_64-1.txt -rw-r--r-- 1 root root 2528776 2021-09-02 16:50 ./slackware64/kde/akonadi-21.08.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-09-02 16:50 ./slackware64/kde/akonadi-21.08.1-x86_64-1.txz.asc @@ -2622,9 +2622,9 @@ drwxr-xr-x 2 root root 77824 2021-09-16 02:58 ./slackware64/kde -rw-r--r-- 1 root root 424 2021-09-06 17:59 ./slackware64/kde/plasma-wayland-protocols-1.4.0-x86_64-1.txt -rw-r--r-- 1 root root 37024 2021-09-06 17:59 ./slackware64/kde/plasma-wayland-protocols-1.4.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-09-06 17:59 ./slackware64/kde/plasma-wayland-protocols-1.4.0-x86_64-1.txz.asc --rw-r--r-- 1 root root 378 2021-08-31 19:01 ./slackware64/kde/plasma-workspace-5.22.5-x86_64-1.txt --rw-r--r-- 1 root root 9895768 2021-08-31 19:01 ./slackware64/kde/plasma-workspace-5.22.5-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-08-31 19:01 ./slackware64/kde/plasma-workspace-5.22.5-x86_64-1.txz.asc +-rw-r--r-- 1 root root 378 2021-09-17 06:43 ./slackware64/kde/plasma-workspace-5.22.5-x86_64-2.txt +-rw-r--r-- 1 root root 9895456 2021-09-17 06:43 ./slackware64/kde/plasma-workspace-5.22.5-x86_64-2.txz +-rw-r--r-- 1 root root 163 2021-09-17 06:43 ./slackware64/kde/plasma-workspace-5.22.5-x86_64-2.txz.asc -rw-r--r-- 1 root root 423 2021-08-31 19:03 ./slackware64/kde/plasma-workspace-wallpapers-5.22.5-x86_64-1.txt -rw-r--r-- 1 root root 51349772 2021-08-31 19:03 ./slackware64/kde/plasma-workspace-wallpapers-5.22.5-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-08-31 19:03 ./slackware64/kde/plasma-workspace-wallpapers-5.22.5-x86_64-1.txz.asc @@ -3817,13 +3817,13 @@ drwxr-xr-x 2 root root 73728 2021-09-17 04:22 ./slackware64/l -rw-r--r-- 1 root root 463 2021-05-15 18:01 ./slackware64/l/zstd-1.5.0-x86_64-1.txt -rw-r--r-- 1 root root 458040 2021-05-15 18:01 ./slackware64/l/zstd-1.5.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-05-15 18:01 ./slackware64/l/zstd-1.5.0-x86_64-1.txz.asc -drwxr-xr-x 2 root root 32768 2021-09-17 04:22 ./slackware64/n +drwxr-xr-x 2 root root 32768 2021-09-17 17:24 ./slackware64/n -rw-r--r-- 1 root root 357 2021-08-17 18:31 ./slackware64/n/ModemManager-1.16.10-x86_64-1.txt -rw-r--r-- 1 root root 1959924 2021-08-17 18:31 ./slackware64/n/ModemManager-1.16.10-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-08-17 18:31 ./slackware64/n/ModemManager-1.16.10-x86_64-1.txz.asc --rw-r--r-- 1 root root 602 2021-09-15 19:09 ./slackware64/n/NetworkManager-1.32.10-x86_64-3.txt --rw-r--r-- 1 root root 4054488 2021-09-15 19:09 ./slackware64/n/NetworkManager-1.32.10-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-09-15 19:09 ./slackware64/n/NetworkManager-1.32.10-x86_64-3.txz.asc +-rw-r--r-- 1 root root 602 2021-09-17 06:21 ./slackware64/n/NetworkManager-1.32.10-x86_64-4.txt +-rw-r--r-- 1 root root 4055188 2021-09-17 06:21 ./slackware64/n/NetworkManager-1.32.10-x86_64-4.txz +-rw-r--r-- 1 root root 163 2021-09-17 06:21 ./slackware64/n/NetworkManager-1.32.10-x86_64-4.txz.asc -rw-r--r-- 1 root root 613 2021-03-22 19:59 ./slackware64/n/alpine-2.24-x86_64-4.txt -rw-r--r-- 1 root root 2134820 2021-03-22 19:59 ./slackware64/n/alpine-2.24-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-03-22 19:59 ./slackware64/n/alpine-2.24-x86_64-4.txz.asc @@ -3911,9 +3911,9 @@ drwxr-xr-x 2 root root 32768 2021-09-17 04:22 ./slackware64/n -rw-r--r-- 1 root root 369 2021-02-13 12:02 ./slackware64/n/gnupg-1.4.23-x86_64-4.txt -rw-r--r-- 1 root root 1171720 2021-02-13 12:02 ./slackware64/n/gnupg-1.4.23-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-02-13 12:02 ./slackware64/n/gnupg-1.4.23-x86_64-4.txz.asc --rw-r--r-- 1 root root 598 2021-08-30 05:29 ./slackware64/n/gnupg2-2.2.30-x86_64-1.txt --rw-r--r-- 1 root root 2347448 2021-08-30 05:29 ./slackware64/n/gnupg2-2.2.30-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-08-30 05:29 ./slackware64/n/gnupg2-2.2.30-x86_64-1.txz.asc +-rw-r--r-- 1 root root 598 2021-09-17 17:08 ./slackware64/n/gnupg2-2.2.31-x86_64-1.txt +-rw-r--r-- 1 root root 2346664 2021-09-17 17:08 ./slackware64/n/gnupg2-2.2.31-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-09-17 17:08 ./slackware64/n/gnupg2-2.2.31-x86_64-1.txz.asc -rw-r--r-- 1 root root 492 2021-05-24 16:54 ./slackware64/n/gnutls-3.6.16-x86_64-1.txt -rw-r--r-- 1 root root 2694884 2021-05-24 16:54 ./slackware64/n/gnutls-3.6.16-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-05-24 16:54 ./slackware64/n/gnutls-3.6.16-x86_64-1.txz.asc @@ -5275,7 +5275,7 @@ drwxr-xr-x 2 root root 65536 2021-09-17 04:22 ./slackware64/x -rw-r--r-- 1 root root 213 2021-02-13 13:14 ./slackware64/x/xwud-1.0.5-x86_64-4.txt -rw-r--r-- 1 root root 25428 2021-02-13 13:14 ./slackware64/x/xwud-1.0.5-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-02-13 13:14 ./slackware64/x/xwud-1.0.5-x86_64-4.txz.asc -drwxr-xr-x 2 root root 16384 2021-09-17 04:22 ./slackware64/xap +drwxr-xr-x 2 root root 16384 2021-09-17 17:24 ./slackware64/xap -rw-r--r-- 1 root root 625 2021-04-18 18:11 ./slackware64/xap/MPlayer-20210418-x86_64-1.txt -rw-r--r-- 1 root root 2738724 2021-04-18 18:11 ./slackware64/xap/MPlayer-20210418-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-04-18 18:11 ./slackware64/xap/MPlayer-20210418-x86_64-1.txz.asc @@ -5364,9 +5364,9 @@ drwxr-xr-x 2 root root 16384 2021-09-17 04:22 ./slackware64/xap -rw-r--r-- 1 root root 479 2021-08-21 03:27 ./slackware64/xap/pavucontrol-5.0-x86_64-1.txt -rw-r--r-- 1 root root 170152 2021-08-21 03:27 ./slackware64/xap/pavucontrol-5.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-08-21 03:27 ./slackware64/xap/pavucontrol-5.0-x86_64-1.txz.asc --rw-r--r-- 1 root root 457 2021-07-09 18:16 ./slackware64/xap/pidgin-2.14.6-x86_64-1.txt --rw-r--r-- 1 root root 6055396 2021-07-09 18:16 ./slackware64/xap/pidgin-2.14.6-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-07-09 18:16 ./slackware64/xap/pidgin-2.14.6-x86_64-1.txz.asc +-rw-r--r-- 1 root root 457 2021-09-17 06:53 ./slackware64/xap/pidgin-2.14.7-x86_64-1.txt +-rw-r--r-- 1 root root 6078192 2021-09-17 06:53 ./slackware64/xap/pidgin-2.14.7-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-09-17 06:53 ./slackware64/xap/pidgin-2.14.7-x86_64-1.txz.asc -rw-r--r-- 1 root root 378 2021-02-13 13:40 ./slackware64/xap/rdesktop-1.9.0-x86_64-4.txt -rw-r--r-- 1 root root 205788 2021-02-13 13:40 ./slackware64/xap/rdesktop-1.9.0-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-02-13 13:40 ./slackware64/xap/rdesktop-1.9.0-x86_64-4.txz.asc @@ -5539,11 +5539,11 @@ drwxr-xr-x 2 root root 4096 2021-02-15 19:33 ./slackware64/y -rw-r--r-- 1 root root 1486956 2021-02-13 13:56 ./slackware64/y/nethack-3.6.6-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 13:56 ./slackware64/y/nethack-3.6.6-x86_64-3.txz.asc -rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile -drwxr-xr-x 18 root root 4096 2021-09-17 04:24 ./source --rw-r--r-- 1 root root 577843 2021-09-17 04:24 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2021-09-17 04:24 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 804136 2021-09-17 04:23 ./source/FILE_LIST --rw-r--r-- 1 root root 23208592 2021-09-17 04:23 ./source/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2021-09-17 17:25 ./source +-rw-r--r-- 1 root root 578065 2021-09-17 17:25 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2021-09-17 17:25 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 804389 2021-09-17 17:25 ./source/FILE_LIST +-rw-r--r-- 1 root root 23199275 2021-09-17 17:25 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT drwxr-xr-x 122 root root 4096 2021-09-10 18:43 ./source/a -rw-r--r-- 1 root root 1591 2021-04-06 18:09 ./source/a/FTBFSlog @@ -8130,7 +8130,7 @@ drwxr-xr-x 2 root root 16384 2021-06-08 19:05 ./source/kde/kde/build -rw-r--r-- 1 root root 2 2021-02-16 20:08 ./source/kde/kde/build/plasma-thunderbolt -rw-r--r-- 1 root root 2 2021-02-16 20:08 ./source/kde/kde/build/plasma-vault -rw-r--r-- 1 root root 2 2021-04-11 17:50 ./source/kde/kde/build/plasma-wayland-protocols --rw-r--r-- 1 root root 2 2021-08-31 18:50 ./source/kde/kde/build/plasma-workspace +-rw-r--r-- 1 root root 2 2021-09-17 06:40 ./source/kde/kde/build/plasma-workspace -rw-r--r-- 1 root root 2 2021-02-16 20:08 ./source/kde/kde/build/plasma-workspace-wallpapers -rw-r--r-- 1 root root 2 2021-02-16 20:08 ./source/kde/kde/build/plymouth-kcm -rw-r--r-- 1 root root 2 2021-02-16 20:08 ./source/kde/kde/build/polkit-kde-agent-1 @@ -8345,9 +8345,10 @@ drwxr-xr-x 2 root root 4096 2020-11-22 01:56 ./source/kde/kde/patch/plasm drwxr-xr-x 2 root root 4096 2021-08-16 04:38 ./source/kde/kde/patch/plasma-framework -rw-r--r-- 1 root root 198 2021-08-16 04:39 ./source/kde/kde/patch/plasma-framework.patch -rw-r--r-- 1 root root 1766 2021-08-16 04:38 ./source/kde/kde/patch/plasma-framework/837bb6975f6a0661d211107823b7587808fc3d4e.patch -drwxr-xr-x 2 root root 4096 2021-05-04 17:58 ./source/kde/kde/patch/plasma-workspace --rw-r--r-- 1 root root 289 2021-04-18 17:48 ./source/kde/kde/patch/plasma-workspace.patch +drwxr-xr-x 2 root root 4096 2021-09-17 06:39 ./source/kde/kde/patch/plasma-workspace +-rw-r--r-- 1 root root 507 2021-09-17 06:40 ./source/kde/kde/patch/plasma-workspace.patch -rw-r--r-- 1 root root 1160 2021-04-18 17:44 ./source/kde/kde/patch/plasma-workspace/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch +-rw-r--r-- 1 root root 12796 2021-09-17 06:39 ./source/kde/kde/patch/plasma-workspace/update-qml-files.patch drwxr-xr-x 2 root root 4096 2021-08-29 18:16 ./source/kde/kde/patch/sddm -rw-r--r-- 1 root root 1114 2021-08-29 16:37 ./source/kde/kde/patch/sddm.patch -rw-r--r-- 1 root root 578 2020-12-15 20:17 ./source/kde/kde/patch/sddm/sddm.do.not.source.HOME.xsession.diff @@ -11615,7 +11616,7 @@ drwxr-xr-x 2 root root 4096 2021-05-15 18:00 ./source/l/zstd -rw-r--r-- 1 root root 325 2018-12-30 04:38 ./source/l/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz -rw-r--r-- 1 root root 33 2018-11-08 01:06 ./source/l/zstd/zstd.url -rwxr-xr-x 1 root root 14547 2021-02-14 06:12 ./source/make_world.sh -drwxr-xr-x 156 root root 4096 2021-09-13 04:23 ./source/n +drwxr-xr-x 156 root root 4096 2021-09-17 06:20 ./source/n -rw-r--r-- 1 root root 1448 2021-01-17 00:09 ./source/n/FTBFSlog drwxr-xr-x 2 root root 4096 2021-08-17 18:30 ./source/n/ModemManager -rw-r--r-- 1 root root 2348164 2021-08-09 13:55 ./source/n/ModemManager/ModemManager-1.16.10.tar.xz @@ -11626,13 +11627,14 @@ drwxr-xr-x 2 root root 4096 2021-08-17 18:30 ./source/n/ModemManager drwxr-xr-x 4 root root 4096 2021-08-19 18:15 ./source/n/NetworkManager -rw-r--r-- 1 root root 189 2015-01-02 05:15 ./source/n/NetworkManager/10-org.freedesktop.NetworkManager.rules -rw-r--r-- 1 root root 5353296 2021-08-18 07:48 ./source/n/NetworkManager/NetworkManager-1.32.10.tar.xz --rwxr-xr-x 1 root root 7100 2021-09-15 18:36 ./source/n/NetworkManager/NetworkManager.SlackBuild +-rwxr-xr-x 1 root root 7100 2021-09-17 06:06 ./source/n/NetworkManager/NetworkManager.SlackBuild -rw-r--r-- 1 root root 139 2016-04-22 03:58 ./source/n/NetworkManager/NetworkManager.conf drwxr-xr-x 2 root root 4096 2016-03-25 04:54 ./source/n/NetworkManager/conf.d --rw-r--r-- 1 root root 1025 2021-09-15 19:08 ./source/n/NetworkManager/conf.d/00-dhcp-client.conf +-rw-r--r-- 1 root root 329 2021-09-17 06:12 ./source/n/NetworkManager/conf.d/00-dhcp-client.conf -rw-r--r-- 1 root root 23 2016-03-24 19:11 ./source/n/NetworkManager/conf.d/00-rc-manager.conf -rw-r--r-- 1 root root 568 2016-03-25 04:35 ./source/n/NetworkManager/doinst.sh.gz -drwxr-xr-x 2 root root 4096 2019-07-25 16:58 ./source/n/NetworkManager/patches +drwxr-xr-x 2 root root 4096 2021-09-17 06:06 ./source/n/NetworkManager/patches +-rw-r--r-- 1 root root 1751 2021-09-17 06:04 ./source/n/NetworkManager/patches/9cc2591fe871b29ce9a743dfb2cd189cb1580bde.dhcpcd.graceful.exit.patch.gz -rw-r--r-- 1 root root 2674 2017-05-25 19:37 ./source/n/NetworkManager/rc.networkmanager -rw-r--r-- 1 root root 1064 2018-02-27 06:13 ./source/n/NetworkManager/slack-desc drwxr-xr-x 2 root root 4096 2021-03-22 18:40 ./source/n/alpine @@ -11801,7 +11803,7 @@ drwxr-xr-x 3 root root 4096 2021-09-17 04:14 ./source/n/dhcpcd -rw-r--r-- 1 root root 256440 2020-12-28 13:00 ./source/n/dhcpcd/dhcpcd-9.4.0.tar.xz -rw-r--r-- 1 root root 96 2020-12-28 13:00 ./source/n/dhcpcd/dhcpcd-9.4.0.tar.xz.distinfo -rw-r--r-- 1 root root 669 2020-12-28 13:00 ./source/n/dhcpcd/dhcpcd-9.4.0.tar.xz.distinfo.asc --rwxr-xr-x 1 root root 5812 2021-09-17 04:13 ./source/n/dhcpcd/dhcpcd.SlackBuild +-rwxr-xr-x 1 root root 5449 2021-09-17 06:27 ./source/n/dhcpcd/dhcpcd.SlackBuild -rw-r--r-- 1 root root 42 2021-09-12 17:50 ./source/n/dhcpcd/dhcpcd.url -rw-r--r-- 1 root root 265 2009-07-24 16:30 ./source/n/dhcpcd/doinst.sh.gz drwxr-xr-x 2 root root 4096 2021-09-17 04:12 ./source/n/dhcpcd/patches @@ -11867,8 +11869,8 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/gnupg -rw-r--r-- 1 root root 2663136 2018-06-11 08:48 ./source/n/gnupg/gnupg-1.4.23.tar.xz -rwxr-xr-x 1 root root 3781 2021-02-13 05:32 ./source/n/gnupg/gnupg.SlackBuild -rw-r--r-- 1 root root 822 2018-02-27 06:13 ./source/n/gnupg/slack-desc.gnupg -drwxr-xr-x 2 root root 4096 2021-08-30 05:28 ./source/n/gnupg2 --rw-r--r-- 1 root root 5129971 2021-08-26 19:18 ./source/n/gnupg2/gnupg-2.2.30.tar.lz +drwxr-xr-x 2 root root 4096 2021-09-17 17:07 ./source/n/gnupg2 +-rw-r--r-- 1 root root 5129914 2021-09-16 09:55 ./source/n/gnupg2/gnupg-2.2.31.tar.lz -rwxr-xr-x 1 root root 4251 2021-06-11 16:46 ./source/n/gnupg2/gnupg2.SlackBuild -rw-r--r-- 1 root root 1052 2018-08-27 17:38 ./source/n/gnupg2/slack-desc drwxr-xr-x 2 root root 4096 2021-05-24 16:52 ./source/n/gnutls @@ -12015,10 +12017,10 @@ drwxr-xr-x 2 root root 4096 2021-08-02 17:57 ./source/n/libmbim -rw-r--r-- 1 root root 195 2021-07-27 09:54 ./source/n/libmbim/libmbim-1.26.0.tar.xz.asc -rwxr-xr-x 1 root root 4347 2021-06-04 17:50 ./source/n/libmbim/libmbim.SlackBuild -rw-r--r-- 1 root root 828 2018-02-27 06:13 ./source/n/libmbim/slack-desc -drwxr-xr-x 2 root root 4096 2021-08-21 03:28 ./source/n/libmilter --rwxr-xr-x 1 root root 3250 2021-08-21 03:28 ./source/n/libmilter/libmilter.SlackBuild --rw-r--r-- 1 root root 1604826 2021-08-17 07:30 ./source/n/libmilter/sendmail.8.17.1.tar.lz --rw-r--r-- 1 root root 400 2019-08-20 17:57 ./source/n/libmilter/site.config.m4 +drwxr-xr-x 2 root root 4096 2021-08-21 03:28 ./source/n/libmilter +-rwxr-xr-x 1 root root 3250 2021-08-21 03:28 ./source/n/libmilter/libmilter.SlackBuild +-rw-r--r-- 1 root root 1604826 2021-08-17 07:30 ./source/n/libmilter/sendmail.8.17.1.tar.lz +-rw-r--r-- 1 root root 400 2019-08-20 17:57 ./source/n/libmilter/site.config.m4 -rw-r--r-- 1 root root 830 2018-02-27 06:13 ./source/n/libmilter/slack-desc drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/libmnl -rw-r--r-- 1 root root 245548 2016-07-02 08:57 ./source/n/libmnl/libmnl-1.0.4.tar.xz @@ -14580,10 +14582,10 @@ drwxr-xr-x 2 root root 4096 2021-08-21 03:26 ./source/xap/pavucontrol -rw-r--r-- 1 root root 193451 2021-08-15 18:40 ./source/xap/pavucontrol/pavucontrol-5.0.tar.lz -rwxr-xr-x 1 root root 3343 2021-08-21 03:25 ./source/xap/pavucontrol/pavucontrol.SlackBuild -rw-r--r-- 1 root root 970 2021-08-21 03:26 ./source/xap/pavucontrol/slack-desc -drwxr-xr-x 2 root root 4096 2021-07-09 18:15 ./source/xap/pidgin +drwxr-xr-x 2 root root 4096 2021-09-17 06:51 ./source/xap/pidgin -rw-r--r-- 1 root root 172 2016-01-04 03:06 ./source/xap/pidgin/doinst.sh.gz -rw-r--r-- 1 root root 355 2012-05-02 03:59 ./source/xap/pidgin/fix-gmain_h-compile-error.diff.gz --rw-r--r-- 1 root root 6338781 2021-07-09 03:05 ./source/xap/pidgin/pidgin-2.14.6.tar.lz +-rw-r--r-- 1 root root 6385317 2021-09-17 02:48 ./source/xap/pidgin/pidgin-2.14.7.tar.lz -rw-r--r-- 1 root root 604129 2010-05-18 16:51 ./source/xap/pidgin/pidgin-encryption-3.1.tar.gz -rwxr-xr-x 1 root root 7564 2021-06-05 18:08 ./source/xap/pidgin/pidgin.SlackBuild -rw-r--r-- 1 root root 911 2021-04-30 17:42 ./source/xap/pidgin/slack-desc diff --git a/recompress.sh b/recompress.sh index 9af84e58c..d3b1dde20 100755 --- a/recompress.sh +++ b/recompress.sh @@ -515,6 +515,7 @@ gzip ./source/n/nn/nn_6.7.3-10.diff gzip ./source/n/nn/nn.badnntphost.diff gzip ./source/n/nn/m-x86_64.h gzip ./source/n/nn/NNTP +gzip ./source/n/NetworkManager/patches/9cc2591fe871b29ce9a743dfb2cd189cb1580bde.dhcpcd.graceful.exit.patch gzip ./source/n/NetworkManager/doinst.sh gzip ./source/n/netwatch/netwatch.phonemyself.diff gzip ./source/n/netwatch/netwatch.makefile.diff diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/plasma-workspace +++ b/source/kde/kde/build/plasma-workspace @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/patch/plasma-workspace.patch b/source/kde/kde/patch/plasma-workspace.patch index 975f72785..4a298cf17 100644 --- a/source/kde/kde/patch/plasma-workspace.patch +++ b/source/kde/kde/patch/plasma-workspace.patch @@ -1,3 +1,5 @@ # Set GTK_BACKEND=x11 in a wayland session # Works around missing window decorations and broken config file reading cat $CWD/patch/plasma-workspace/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +# Fix issue where USB storage devices are only detected once per session: +cat $CWD/patch/plasma-workspace/update-qml-files.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/plasma-workspace/update-qml-files.patch b/source/kde/kde/patch/plasma-workspace/update-qml-files.patch new file mode 100644 index 000000000..54aad06cc --- /dev/null +++ b/source/kde/kde/patch/plasma-workspace/update-qml-files.patch @@ -0,0 +1,278 @@ +diff -u -r plasma-workspace-5.22.5.orig/applets/devicenotifier/package/contents/ui/DeviceItem.qml plasma-workspace-5.22.5/applets/devicenotifier/package/contents/ui/DeviceItem.qml +--- plasma-workspace-5.22.5.orig/applets/devicenotifier/package/contents/ui/DeviceItem.qml 2021-08-31 06:52:18.000000000 -0500 ++++ plasma-workspace-5.22.5/applets/devicenotifier/package/contents/ui/DeviceItem.qml 2021-09-17 01:37:28.000000000 -0500 +@@ -1,24 +1,11 @@ + /* +- * Copyright 2011 Viranch Mehta <viranch.mehta@gmail.com> +- * Copyright 2012 Jacopo De Simoi <wilderkde@gmail.com> +- * Copyright 2016 Kai Uwe Broulik <kde@privat.broulik.de> +- * Copyright 2020 Nate Graham <nate@kde.org> +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU Library General Public License as +- * published by the Free Software Foundation; either version 2 or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this program; if not, write to the +- * Free Software Foundation, Inc., +- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +- */ ++ SPDX-FileCopyrightText: 2011 Viranch Mehta <viranch.mehta@gmail.com> ++ SPDX-FileCopyrightText: 2012 Jacopo De Simoi <wilderkde@gmail.com> ++ SPDX-FileCopyrightText: 2016 Kai Uwe Broulik <kde@privat.broulik.de> ++ SPDX-FileCopyrightText: 2020 Nate Graham <nate@kde.org> ++ ++ SPDX-License-Identifier: LGPL-2.0-or-later ++*/ + + import QtQuick 2.0 + import QtQuick.Controls 2.12 as QQC2 +@@ -44,7 +31,8 @@ + readonly property double totalSpace: sdSource.data[udi] && sdSource.data[udi]["Size"] ? sdSource.data[udi]["Size"] : -1.0 + property bool freeSpaceKnown: freeSpace > 0 && totalSpace > 0 + +- readonly property bool isRootVolume: sdSource.data[udi]["File Path"] ? sdSource.data[udi]["File Path"] == "/" : false ++ readonly property bool isRootVolume: sdSource.data[udi] && sdSource.data[udi]["File Path"] ? sdSource.data[udi]["File Path"] == "/" : false ++ readonly property bool isRemovable: sdSource.data[udi] && sdSource.data[udi]["Removable"] ? sdSource.data[udi]["Removable"] : false + + onOperationResultChanged: { + if (!popupIconTimer.running) { +@@ -73,6 +61,15 @@ + } + } + ++ Connections { ++ target: plasmoid.action("unmountAllDevices") ++ function onTriggered() { ++ if (model["Removable"] && isMounted) { ++ actionTriggered(); ++ } ++ } ++ } ++ + // this keeps the delegate around for 5 seconds after the device has been + // removed in case there was a message, such as "you can now safely remove this" + ListView.onRemove: { +@@ -123,7 +120,7 @@ + var operationName + var operation + var wasMounted = isMounted; +- if (!sdSource.data[udi].Removable || !isMounted) { ++ if (!isRemovable || !isMounted) { + service = hpSource.serviceForSource(udi); + operation = service.operationDescription('invokeAction'); + operation.predicate = "test-predicate-openinwindow.desktop"; +@@ -140,26 +137,23 @@ + + // When there's no better icon available, show a placeholder icon instead + // of nothing +- icon: sdSource.data[udi] == undefined ? "device-notifier" : sdSource.data[udi].Icon ++ icon: sdSource.data[udi] ? sdSource.data[udi].Icon : "device-notifier" + + iconEmblem: { +- if (sdSource.data[udi] != undefined) { +- if (deviceItem.hasMessage) { +- if (deviceItem.message.solidError === 0) { +- return "emblem-information" +- } else { +- return "emblem-error" +- } +- } else if (deviceItem.state == 0 && Emblems && Emblems[0]) { +- return Emblems[0] ++ if (deviceItem.hasMessage) { ++ if (deviceItem.message.solidError === 0) { ++ return "emblem-information" + } else { +- return "" ++ return "emblem-error" + } ++ } else if (deviceItem.state == 0 && Emblems && Emblems[0]) { ++ return Emblems[0] ++ } else { ++ return "" + } +- return "" + } + +- title: sdSource.data[udi] == undefined ? "" : sdSource.data[udi].Description ++ title: sdSource.data[udi] ? sdSource.data[udi].Description : "" + + subtitle: { + if (deviceItem.hasMessage) { +@@ -176,9 +170,9 @@ + } + return "" + } else if (deviceItem.state == 1) { +- return i18nc("Accessing is a less technical word for Mounting; translation should be short and mean \'Currently mounting this device\'", "Accessing...") ++ return i18nc("Accessing is a less technical word for Mounting; translation should be short and mean \'Currently mounting this device\'", "Accessing…") + } else { +- return i18nc("Removing is a less technical word for Unmounting; translation should be short and mean \'Currently unmounting this device\'", "Removing...") ++ return i18nc("Removing is a less technical word for Unmounting; translation should be short and mean \'Currently unmounting this device\'", "Removing…") + } + } + +@@ -196,15 +190,15 @@ + + defaultActionButtonAction: QQC2.Action { + icon.name: { +- if (!sdSource.data[udi].Removable) { +- return "document-open-folder" +- } else { ++ if (isRemovable) { + return isMounted ? "media-eject" : "document-open-folder" ++ } else { ++ return "document-open-folder" + } + } + text: { + // It's possible for the root volume to be on a removable disk +- if (!sdSource.data[udi].Removable || deviceItem.isRootVolume) { ++ if (!isRemovable || isRootVolume) { + return i18n("Open in File Manager") + } else { + var types = model["Device Types"]; +@@ -236,7 +230,7 @@ + if (modelData.predicate != "test-predicate-openinwindow.desktop") { + return true; + } +- return sdSource.data[udi].Removable && deviceItem.isMounted; ++ return deviceItem.isRemovable && deviceItem.isMounted; + } + onTriggered: { + var service = hpSource.serviceForSource(udi); +@@ -257,7 +251,7 @@ + icon.name: "media-mount" + + // Only show for unmounted removable devices +- enabled: sdSource.data[udi].Removable && !deviceItem.isMounted ++ enabled: deviceItem.isRemovable && !deviceItem.isMounted + + onTriggered: { + var service = sdSource.serviceForSource(udi); +diff -u -r plasma-workspace-5.22.5.orig/applets/devicenotifier/package/contents/ui/FullRepresentation.qml plasma-workspace-5.22.5/applets/devicenotifier/package/contents/ui/FullRepresentation.qml +--- plasma-workspace-5.22.5.orig/applets/devicenotifier/package/contents/ui/FullRepresentation.qml 2021-08-31 06:52:18.000000000 -0500 ++++ plasma-workspace-5.22.5/applets/devicenotifier/package/contents/ui/FullRepresentation.qml 2021-09-17 01:37:39.000000000 -0500 +@@ -1,26 +1,12 @@ + /* +- * Copyright 2011 Viranch Mehta <viranch.mehta@gmail.com> +- * Copyright 2012 Jacopo De Simoi <wilderkde@gmail.com> +- * Copyright 2014 David Edmundson <davidedmundson@kde.org> +- * Copyright 2014 Marco Martin <mart@kde.org> +- * Copyright 2020 Nate Graham <nate@kde.org> +- * +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU Library General Public License as +- * published by the Free Software Foundation; either version 2 or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this program; if not, write to the +- * Free Software Foundation, Inc., +- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +- */ ++ SPDX-FileCopyrightText: 2011 Viranch Mehta <viranch.mehta@gmail.com> ++ SPDX-FileCopyrightText: 2012 Jacopo De Simoi <wilderkde@gmail.com> ++ SPDX-FileCopyrightText: 2014 David Edmundson <davidedmundson@kde.org> ++ SPDX-FileCopyrightText: 2014 Marco Martin <mart@kde.org> ++ SPDX-FileCopyrightText: 2020 Nate Graham <nate@kde.org> ++ ++ SPDX-License-Identifier: LGPL-2.0-or-later ++*/ + + import QtQuick 2.2 + import QtQuick.Window 2.2 +@@ -149,7 +135,7 @@ + section { + property: "Type Description" + delegate: Item { +- height: childrenRect.height ++ height: Math.floor(childrenRect.height) + width: notifierDialog.width + PlasmaExtras.Heading { + level: 3 +diff -u -r plasma-workspace-5.22.5.orig/applets/devicenotifier/package/contents/ui/devicenotifier.qml plasma-workspace-5.22.5/applets/devicenotifier/package/contents/ui/devicenotifier.qml +--- plasma-workspace-5.22.5.orig/applets/devicenotifier/package/contents/ui/devicenotifier.qml 2021-08-31 06:52:18.000000000 -0500 ++++ plasma-workspace-5.22.5/applets/devicenotifier/package/contents/ui/devicenotifier.qml 2021-09-17 01:37:49.000000000 -0500 +@@ -1,24 +1,11 @@ + /* +- * Copyright 2011 Viranch Mehta <viranch.mehta@gmail.com> +- * Copyright 2012 Jacopo De Simoi <wilderkde@gmail.com> +- * Copyright 2014 David Edmundson <davidedmundson@kde.org> +- * Copyright 2016 Kai Uwe Broulik <kde@privat.broulik.de> +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU Library General Public License as +- * published by the Free Software Foundation; either version 2 or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this program; if not, write to the +- * Free Software Foundation, Inc., +- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +- */ ++ SPDX-FileCopyrightText: 2011 Viranch Mehta <viranch.mehta@gmail.com> ++ SPDX-FileCopyrightText: 2012 Jacopo De Simoi <wilderkde@gmail.com> ++ SPDX-FileCopyrightText: 2014 David Edmundson <davidedmundson@kde.org> ++ SPDX-FileCopyrightText: 2016 Kai Uwe Broulik <kde@privat.broulik.de> ++ ++ SPDX-License-Identifier: LGPL-2.0-or-later ++*/ + + import QtQuick 2.0 + import QtQuick.Layouts 1.1 +@@ -88,6 +75,7 @@ + onSourceAdded: { + disconnectSource(source); + connectSource(source); ++ sdSource.connectedSources = sources + } + onSourceRemoved: { + disconnectSource(source); +@@ -111,7 +99,6 @@ + PlasmaCore.DataSource { + id: sdSource + engine: "soliddevice" +- connectedSources: hpSource.sources + interval: 0 + property string last + onSourceAdded: { +@@ -235,6 +222,13 @@ + Plasmoid.status = PlasmaCore.Types.PassiveStatus; + } + ++ plasmoid.setAction("unmountAllDevices", i18n("Remove All"), "media-eject"); ++ plasmoid.action("unmountAllDevices").visible = Qt.binding(() => { ++ return devicenotifier.mountedRemovables > 1; ++ }); ++ ++ plasmoid.setActionSeparator("sep0"); ++ + plasmoid.setAction("showRemovableDevices", i18n("Removable Devices"), "drive-removable-media"); + devicenotifier.showRemovableDevicesAction = plasmoid.action("showRemovableDevices"); + devicenotifier.showRemovableDevicesAction.checkable = true; +@@ -264,7 +258,7 @@ + + if (devicenotifier.openAutomounterKcmAuthorized) { + plasmoid.removeAction("configure"); +- plasmoid.setAction("configure", i18nc("Open auto mounter kcm", "Configure Removable Devices..."), "configure") ++ plasmoid.setAction("configure", i18nc("Open auto mounter kcm", "Configure Removable Devices…"), "configure") + } + } + diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild index 3cfd061d4..c2fb7ed04 100755 --- a/source/n/NetworkManager/NetworkManager.SlackBuild +++ b/source/n/NetworkManager/NetworkManager.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=NetworkManager VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/n/NetworkManager/conf.d/00-dhcp-client.conf b/source/n/NetworkManager/conf.d/00-dhcp-client.conf index 53e30c85d..78518ac56 100644 --- a/source/n/NetworkManager/conf.d/00-dhcp-client.conf +++ b/source/n/NetworkManager/conf.d/00-dhcp-client.conf @@ -1,22 +1,11 @@ [main] # Choose a DHCP client below. Upstream recommends internal, but results may vary. # -# This is a simple DHCP client that is built into NetworkManager: -dhcp=internal +# dhcpcd is the DHCP client usually used by Slackware: +dhcp=dhcpcd # # dhclient is the ISC reference DHCP client, part of the dhcp package: #dhcp=dhclient # -# dhcpcd is the DHCP client usually used by Slackware. However, it is built -# with --enable-privsep, and a side-effect of this when used with -# NetworkManager is that the network will not return properly after a -# suspend/resume cycle. If you don't require this functionality, dhcpcd will -# work fine otherwise. If you do require it and don't want to use one of the -# other two options here, there are some workarounds. -# You may force NetworkManager to reload the network by killing dhcpcd: -# killall -9 dhcpcd -# Otherwise, you may rebuild the dhcpcd package without privilege separation -# using the following command in the dhcpcd source directory: -# PRIVSEP=no ./dhcpcd.SlackBuild -# The resulting dhcpcd package will work fine with NetworkManager. -#dhcp=dhcpcd +# This is a simple DHCP client that is built into NetworkManager: +#dhcp=internal diff --git a/source/n/NetworkManager/patches/9cc2591fe871b29ce9a743dfb2cd189cb1580bde.dhcpcd.graceful.exit.patch b/source/n/NetworkManager/patches/9cc2591fe871b29ce9a743dfb2cd189cb1580bde.dhcpcd.graceful.exit.patch new file mode 100644 index 000000000..72e33b75e --- /dev/null +++ b/source/n/NetworkManager/patches/9cc2591fe871b29ce9a743dfb2cd189cb1580bde.dhcpcd.graceful.exit.patch @@ -0,0 +1,119 @@ +From 9cc2591fe871b29ce9a743dfb2cd189cb1580bde Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@marples.name> +Date: Thu, 16 Sep 2021 20:36:49 +0100 +Subject: [PATCH] dhcpcd: stop dhcpcd using nm_dhcp_client_stop_pid rather than + killing + +NetworkManager can stop/start a DHCP client faster than dhcpcd can +gracefully exit. + +As such, refactor nm_dhcp_client_stop_pid so that a specific signal +can be sent which allows dhcpcd to gracefully stop on SIGTERM and +release on SIGALRM. +--- + src/core/dhcp/nm-dhcp-client.c | 6 +++--- + src/core/dhcp/nm-dhcp-client.h | 2 +- + src/core/dhcp/nm-dhcp-dhclient.c | 2 +- + src/core/dhcp/nm-dhcp-dhcpcd.c | 22 ++++------------------ + 4 files changed, 9 insertions(+), 23 deletions(-) + +diff --git a/src/core/dhcp/nm-dhcp-client.c b/src/core/dhcp/nm-dhcp-client.c +index f88c79c0be..727296d158 100644 +--- a/src/core/dhcp/nm-dhcp-client.c ++++ b/src/core/dhcp/nm-dhcp-client.c +@@ -429,14 +429,14 @@ watch_cleanup(NMDhcpClient *self) + } + + void +-nm_dhcp_client_stop_pid(pid_t pid, const char *iface) ++nm_dhcp_client_stop_pid(pid_t pid, const char *iface, int sig) + { + char *name = iface ? g_strdup_printf("dhcp-client-%s", iface) : NULL; + + g_return_if_fail(pid > 1); + + nm_utils_kill_child_sync(pid, +- SIGTERM, ++ sig, + LOGD_DHCP, + name ?: "dhcp-client", + NULL, +@@ -457,7 +457,7 @@ stop(NMDhcpClient *self, gboolean release) + if (priv->pid > 0) { + /* Clean up the watch handler since we're explicitly killing the daemon */ + watch_cleanup(self); +- nm_dhcp_client_stop_pid(priv->pid, priv->iface); ++ nm_dhcp_client_stop_pid(priv->pid, priv->iface, SIGTERM); + } + priv->pid = -1; + } +diff --git a/src/core/dhcp/nm-dhcp-client.h b/src/core/dhcp/nm-dhcp-client.h +index 2e7e021650..439b873dec 100644 +--- a/src/core/dhcp/nm-dhcp-client.h ++++ b/src/core/dhcp/nm-dhcp-client.h +@@ -197,7 +197,7 @@ void nm_dhcp_client_stop(NMDhcpClient *self, gboolean release); + /* Backend helpers for subclasses */ + void nm_dhcp_client_stop_existing(const char *pid_file, const char *binary_name); + +-void nm_dhcp_client_stop_pid(pid_t pid, const char *iface); ++void nm_dhcp_client_stop_pid(pid_t pid, const char *iface, int sig); + + void nm_dhcp_client_start_timeout(NMDhcpClient *self); + +diff --git a/src/core/dhcp/nm-dhcp-dhclient.c b/src/core/dhcp/nm-dhcp-dhclient.c +index 970a51f5dd..21fc857d26 100644 +--- a/src/core/dhcp/nm-dhcp-dhclient.c ++++ b/src/core/dhcp/nm-dhcp-dhclient.c +@@ -627,7 +627,7 @@ stop(NMDhcpClient *client, gboolean release) + + if (dhclient_start(client, NULL, TRUE, &rpid, 0, NULL)) { + /* Wait a few seconds for the release to happen */ +- nm_dhcp_client_stop_pid(rpid, nm_dhcp_client_get_iface(client)); ++ nm_dhcp_client_stop_pid(rpid, nm_dhcp_client_get_iface(client), SIGTERM); + } + } + } +diff --git a/src/core/dhcp/nm-dhcp-dhcpcd.c b/src/core/dhcp/nm-dhcp-dhcpcd.c +index 7522156bef..db694a2c11 100644 +--- a/src/core/dhcp/nm-dhcp-dhcpcd.c ++++ b/src/core/dhcp/nm-dhcp-dhcpcd.c +@@ -162,31 +162,17 @@ stop(NMDhcpClient *client, gboolean release) + { + NMDhcpDhcpcd *self = NM_DHCP_DHCPCD(client); + pid_t pid; +- int sig, errsv; ++ int sig; + + pid = nm_dhcp_client_get_pid(client); + if (pid > 1) { + sig = release ? SIGALRM : SIGTERM; + _LOGD("sending %s to dhcpcd pid %d", sig == SIGALRM ? "SIGALRM" : "SIGTERM", pid); + +- /* dhcpcd-9.x features privilege separation. +- * It's not our job to track all these processes so we rely on dhcpcd +- * to always cleanup after itself. +- * Because it also re-parents itself to PID 1, the process cannot be +- * reaped or waited for. +- * As such, just send the correct signal. +- */ +- if (kill(pid, sig) == -1) { +- errsv = errno; +- _LOGE("failed to kill dhcpcd %d:%s", errsv, strerror(errsv)); +- } +- +- /* When this function exits NM expects the PID to be -1. +- * This means we also need to stop watching the pid. +- * If we need to know the exit status then we need to refactor NM +- * to allow a non -1 to mean we're waiting to exit still. +- */ ++ /* We need to remove the watch before stopping the process */ + nm_dhcp_client_stop_watch_child(client, pid); ++ ++ nm_dhcp_client_stop_pid(pid, nm_dhcp_client_get_iface(client), sig); + } + } + +-- +GitLab + + diff --git a/source/n/dhcpcd/dhcpcd.SlackBuild b/source/n/dhcpcd/dhcpcd.SlackBuild index c4efe43d9..5bab0cb38 100755 --- a/source/n/dhcpcd/dhcpcd.SlackBuild +++ b/source/n/dhcpcd/dhcpcd.SlackBuild @@ -29,16 +29,7 @@ BUILD=${BUILD:-2} # By default, Slackware builds dhcpcd with privilege separation, which improves # security by ensuring that any security vulnerabilies such as buffer overflows # or shell metacharacter insertion would gain access to an unprivileged user -# (the dhcpcd user) rather than the root user. However, this creates issues -# when using dhcpcd with NetworkManager. With privilege separation enabled, -# the network won't return properly after suspend/resume. -# -# If you use dhcpcd with NetworkManager and this functionality is important to -# you, rebuild dhcpcd with this command: -# -# PRIVSEP=no ./dhcpcd.SlackBuild -# -# Then upgrade to the generated package. +# (the dhcpcd user) rather than the root user. PRIVSEP=${PRIVSEP:-yes} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} |