From 79267f6e54a1227ee4db836d4cf36c100ec8d5b7 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 11 Apr 2024 21:36:28 +0000 Subject: Thu Apr 11 21:36:28 UTC 2024 d/cmake-3.29.2-x86_64-1.txz: Upgraded. l/polkit-124-x86_64-1.txz: Upgraded. Thanks to marav for the patches. --- ChangeLog.rss | 17 ++++++- ChangeLog.txt | 5 ++ FILELIST.TXT | 70 +++++++++++++------------- source/d/cmake/cmake.url | 2 +- source/l/polkit/polkit-124-systemd-fixup.patch | 28 +++++++++++ source/l/polkit/polkit-124-systemd.patch | 50 ++++++++++++++++++ source/l/polkit/polkit.SlackBuild | 11 ++-- 7 files changed, 139 insertions(+), 44 deletions(-) create mode 100644 source/l/polkit/polkit-124-systemd-fixup.patch create mode 100644 source/l/polkit/polkit-124-systemd.patch diff --git a/ChangeLog.rss b/ChangeLog.rss index 2e0c8bd5b..3ce5418cc 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,22 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Thu, 11 Apr 2024 19:05:36 GMT - Thu, 11 Apr 2024 19:30:43 GMT + Thu, 11 Apr 2024 21:36:28 GMT + Thu, 11 Apr 2024 22:09:52 GMT maintain_current_git.sh v 1.17 + + Thu, 11 Apr 2024 21:36:28 GMT + Thu, 11 Apr 2024 21:36:28 GMT + https://git.slackware.nl/current/tag/?h=20240411213628 + 20240411213628 + + +d/cmake-3.29.2-x86_64-1.txz: Upgraded. +l/polkit-124-x86_64-1.txz: Upgraded. + Thanks to marav for the patches. + ]]> + + Thu, 11 Apr 2024 19:05:36 GMT Thu, 11 Apr 2024 19:05:36 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index 44d352777..57efc334a 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,8 @@ +Thu Apr 11 21:36:28 UTC 2024 +d/cmake-3.29.2-x86_64-1.txz: Upgraded. +l/polkit-124-x86_64-1.txz: Upgraded. + Thanks to marav for the patches. ++--------------------------+ Thu Apr 11 19:05:36 UTC 2024 a/elogind-255.4-x86_64-1.txz: Upgraded. a/libblockdev-3.1.1_1-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index a52ebc4fb..6a697ad91 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Thu Apr 11 19:11:06 UTC 2024 +Thu Apr 11 21:39:52 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-11 19:09 . +drwxr-xr-x 12 root root 4096 2024-04-11 21: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 1147328 2024-04-11 19:09 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-04-11 19:09 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1147260 2024-04-11 19:11 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-04-11 19:11 ./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 1041209 2024-04-11 19:05 ./ChangeLog.txt +-rw-r--r-- 1 root root 1041380 2024-04-11 21: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-10 18:58 ./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-10 18:58 ./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 1501868 2024-04-11 19:09 ./FILELIST.TXT +-rw-r--r-- 1 root root 1501785 2024-04-11 19:11 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 906318 2024-04-11 19:08 ./PACKAGES.TXT +-rw-r--r-- 1 root root 906318 2024-04-11 21:39 ./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-10 18:43 ./README.initrd -rw-r--r-- 1 root root 34114 2023-12-11 20:35 ./README_CRYPT.TXT @@ -683,11 +683,11 @@ 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-11 19:08 ./slackware64 --rw-r--r-- 1 root root 353611 2024-04-11 19:08 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-04-11 19:08 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 437955 2024-04-11 19:07 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 4613397 2024-04-11 19:07 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 17 root root 4096 2024-04-11 21:39 ./slackware64 +-rw-r--r-- 1 root root 353611 2024-04-11 21:39 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-04-11 21:39 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 437955 2024-04-11 21:38 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 4613597 2024-04-11 21:38 ./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-11 19:07 ./slackware64/a -rw-r--r-- 1 root root 327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt @@ -1337,7 +1337,7 @@ drwxr-xr-x 2 root root 20480 2024-04-05 20:12 ./slackware64/ap -rw-r--r-- 1 root root 506 2022-05-15 17:09 ./slackware64/ap/zsh-5.9-x86_64-1.txt -rw-r--r-- 1 root root 3156392 2022-05-15 17:09 ./slackware64/ap/zsh-5.9-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-05-15 17:09 ./slackware64/ap/zsh-5.9-x86_64-1.txz.asc -drwxr-xr-x 2 root root 20480 2024-04-10 19:12 ./slackware64/d +drwxr-xr-x 2 root root 20480 2024-04-11 21:38 ./slackware64/d -rw-r--r-- 1 root root 360 2024-03-30 21:20 ./slackware64/d/Cython-3.0.10-x86_64-1.txt -rw-r--r-- 1 root root 4305292 2024-03-30 21:20 ./slackware64/d/Cython-3.0.10-x86_64-1.txz -rw-r--r-- 1 root root 195 2024-03-30 21:20 ./slackware64/d/Cython-3.0.10-x86_64-1.txz.asc @@ -1374,9 +1374,9 @@ drwxr-xr-x 2 root root 20480 2024-04-10 19:12 ./slackware64/d -rw-r--r-- 1 root root 663 2024-01-03 20:11 ./slackware64/d/clisp-2.50_20230718_669249717-x86_64-1.txt -rw-r--r-- 1 root root 3131064 2024-01-03 20:11 ./slackware64/d/clisp-2.50_20230718_669249717-x86_64-1.txz -rw-r--r-- 1 root root 163 2024-01-03 20:11 ./slackware64/d/clisp-2.50_20230718_669249717-x86_64-1.txz.asc --rw-r--r-- 1 root root 379 2024-04-04 17:25 ./slackware64/d/cmake-3.29.1-x86_64-1.txt --rw-r--r-- 1 root root 10080276 2024-04-04 17:25 ./slackware64/d/cmake-3.29.1-x86_64-1.txz --rw-r--r-- 1 root root 195 2024-04-04 17:25 ./slackware64/d/cmake-3.29.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 379 2024-04-11 20:52 ./slackware64/d/cmake-3.29.2-x86_64-1.txt +-rw-r--r-- 1 root root 10072668 2024-04-11 20:52 ./slackware64/d/cmake-3.29.2-x86_64-1.txz +-rw-r--r-- 1 root root 195 2024-04-11 20:52 ./slackware64/d/cmake-3.29.2-x86_64-1.txz.asc -rw-r--r-- 1 root root 332 2021-02-13 09:13 ./slackware64/d/cscope-15.9-x86_64-3.txt -rw-r--r-- 1 root root 143136 2021-02-13 09:13 ./slackware64/d/cscope-15.9-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 09:13 ./slackware64/d/cscope-15.9-x86_64-3.txz.asc @@ -2780,7 +2780,7 @@ drwxr-xr-x 2 root root 86016 2024-04-04 19:11 ./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-11 19:07 ./slackware64/l +drwxr-xr-x 2 root root 102400 2024-04-11 21:38 ./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 @@ -3733,9 +3733,9 @@ drwxr-xr-x 2 root root 102400 2024-04-11 19:07 ./slackware64/l -rw-r--r-- 1 root root 552 2024-03-13 19:31 ./slackware64/l/pipewire-1.0.4-x86_64-1.txt -rw-r--r-- 1 root root 2274292 2024-03-13 19:31 ./slackware64/l/pipewire-1.0.4-x86_64-1.txz -rw-r--r-- 1 root root 195 2024-03-13 19:31 ./slackware64/l/pipewire-1.0.4-x86_64-1.txz.asc --rw-r--r-- 1 root root 450 2024-03-23 18:28 ./slackware64/l/polkit-123-x86_64-2.txt --rw-r--r-- 1 root root 181336 2024-03-23 18:28 ./slackware64/l/polkit-123-x86_64-2.txz --rw-r--r-- 1 root root 195 2024-03-23 18:28 ./slackware64/l/polkit-123-x86_64-2.txz.asc +-rw-r--r-- 1 root root 450 2024-04-11 19:23 ./slackware64/l/polkit-124-x86_64-1.txt +-rw-r--r-- 1 root root 187192 2024-04-11 19:23 ./slackware64/l/polkit-124-x86_64-1.txz +-rw-r--r-- 1 root root 195 2024-04-11 19:23 ./slackware64/l/polkit-124-x86_64-1.txz.asc -rw-r--r-- 1 root root 367 2021-02-13 07:37 ./slackware64/l/polkit-gnome-0.105-x86_64-4.txt -rw-r--r-- 1 root root 67536 2021-02-13 07:37 ./slackware64/l/polkit-gnome-0.105-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-02-13 07:37 ./slackware64/l/polkit-gnome-0.105-x86_64-4.txz.asc @@ -5774,11 +5774,11 @@ 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-11 19:11 ./source --rw-r--r-- 1 root root 616032 2024-04-11 19:11 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-04-11 19:11 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 859084 2024-04-11 19:10 ./source/FILE_LIST --rw-r--r-- 1 root root 28493396 2024-04-11 19:10 ./source/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2024-04-11 21:39 ./source +-rw-r--r-- 1 root root 616178 2024-04-11 21:39 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-04-11 21:39 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 859264 2024-04-11 21:39 ./source/FILE_LIST +-rw-r--r-- 1 root root 28498118 2024-04-11 21:39 ./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-11 19:00 ./source/a -rw-r--r-- 1 root root 339 2023-09-28 19:06 ./source/a/FTBFSlog @@ -7594,10 +7594,10 @@ drwxr-xr-x 2 root root 4096 2024-01-03 20:09 ./source/d/clisp -rw-r--r-- 1 root root 666366 2021-06-13 15:38 ./source/d/clisp/libffcall-2.4.tar.lz -rw-r--r-- 1 root root 1116 2018-02-27 06:13 ./source/d/clisp/slack-desc -rwxr-xr-x 1 root root 1890 2020-07-09 18:37 ./source/d/clisp/source.download -drwxr-xr-x 2 root root 4096 2024-04-04 17:20 ./source/d/cmake --rw-r--r-- 1 root root 7526808 2024-04-03 17:56 ./source/d/cmake/cmake-3.29.1.tar.lz +drwxr-xr-x 2 root root 4096 2024-04-11 20:46 ./source/d/cmake +-rw-r--r-- 1 root root 7525621 2024-04-11 18:04 ./source/d/cmake/cmake-3.29.2.tar.lz -rwxr-xr-x 1 root root 4157 2022-04-30 19:32 ./source/d/cmake/cmake.SlackBuild --rw-r--r-- 1 root root 121 2024-04-04 17:19 ./source/d/cmake/cmake.url +-rw-r--r-- 1 root root 121 2024-04-11 20:45 ./source/d/cmake/cmake.url -rw-r--r-- 1 root root 832 2018-11-29 19:16 ./source/d/cmake/slack-desc drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/d/cscope -rw-r--r-- 1 root root 406801 2018-07-24 18:39 ./source/d/cscope/cscope-15.9.tar.lz @@ -11750,7 +11750,7 @@ drwxr-xr-x 2 root root 4096 2024-03-13 19:31 ./source/l/pipewire -rw-r--r-- 1 root root 268 2022-01-03 20:11 ./source/l/pipewire/pipewire.desktop.sample -rw-r--r-- 1 root root 49 2020-09-29 01:53 ./source/l/pipewire/pipewire.url -rw-r--r-- 1 root root 1038 2020-11-01 20:04 ./source/l/pipewire/slack-desc -drwxr-xr-x 2 root root 4096 2023-07-30 18:05 ./source/l/polkit +drwxr-xr-x 2 root root 4096 2024-04-11 19:20 ./source/l/polkit drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/l/polkit-gnome -rw-r--r-- 1 root root 310876 2011-10-27 13:27 ./source/l/polkit-gnome/polkit-gnome-0.105.tar.xz -rw-r--r-- 1 root root 4581 2011-02-25 05:43 ./source/l/polkit-gnome/polkit-gnome-authentication-agent-1.desktop @@ -11764,8 +11764,10 @@ drwxr-xr-x 2 root root 4096 2022-09-06 18:27 ./source/l/polkit-qt-1 -rw-r--r-- 1 root root 921 2020-11-01 20:04 ./source/l/polkit-qt-1/slack-desc -rw-r--r-- 1 root root 479 2023-01-31 22:57 ./source/l/polkit/doinst.sh.gz -rw-r--r-- 1 root root 292 2015-01-02 05:35 ./source/l/polkit/dont-set-wheel-group-as-admin.diff.gz --rw-r--r-- 1 root root 666280 2023-07-30 18:05 ./source/l/polkit/polkit-123.tar.lz --rwxr-xr-x 1 root root 5668 2024-03-23 18:28 ./source/l/polkit/polkit.SlackBuild +-rw-r--r-- 1 root root 1571 2024-04-11 19:19 ./source/l/polkit/polkit-124-systemd-fixup.patch +-rw-r--r-- 1 root root 2483 2024-04-11 19:19 ./source/l/polkit/polkit-124-systemd.patch +-rw-r--r-- 1 root root 671281 2024-04-11 19:16 ./source/l/polkit/polkit-124.tar.lz +-rwxr-xr-x 1 root root 5528 2024-04-11 19:22 ./source/l/polkit/polkit.SlackBuild -rw-r--r-- 1 root root 903 2020-11-01 20:04 ./source/l/polkit/slack-desc drwxr-xr-x 2 root root 4096 2024-04-01 17:00 ./source/l/poppler drwxr-xr-x 2 root root 4096 2023-02-03 04:19 ./source/l/poppler-data @@ -15278,9 +15280,9 @@ drwxr-xr-x 2 root root 4096 2024-01-28 20:02 ./source/xap/audacious-plugi -rwxr-xr-x 1 root root 4551 2022-07-10 18:24 ./source/xap/audacious/audacious.SlackBuild -rwxr-xr-x 1 root root 4636 2020-03-22 18:08 ./source/xap/audacious/audacious.SlackBuild.meson -rw-r--r-- 1 root root 121 2010-04-09 21:15 ./source/xap/audacious/doinst.sh.gz --rw-r--r-- 1 root root 1049 2022-07-10 18:24 ./source/xap/audacious/slack-desc -drwxr-xr-x 2 root root 4096 2022-10-09 20:10 ./source/xap/blackbox --rw-r--r-- 1 root root 175764 2009-09-03 11:39 ./source/xap/blackbox/bbkeys-0.9.1.tar.lz +-rw-r--r-- 1 root root 1049 2022-07-10 18:24 ./source/xap/audacious/slack-desc +drwxr-xr-x 2 root root 4096 2022-10-09 20:10 ./source/xap/blackbox +-rw-r--r-- 1 root root 175764 2009-09-03 11:39 ./source/xap/blackbox/bbkeys-0.9.1.tar.lz -rw-r--r-- 1 root root 566397 2021-05-12 06:07 ./source/xap/blackbox/blackbox-0.77.tar.lz -rwxr-xr-x 1 root root 7113 2022-10-09 20:11 ./source/xap/blackbox/blackbox.SlackBuild -rw-r--r-- 1 root root 194 2022-10-09 20:10 ./source/xap/blackbox/blackbox.ctime.diff.gz diff --git a/source/d/cmake/cmake.url b/source/d/cmake/cmake.url index a3dbc5c2f..a77cfe13f 100644 --- a/source/d/cmake/cmake.url +++ b/source/d/cmake/cmake.url @@ -1,2 +1,2 @@ https://github.com/Kitware/CMake/releases -https://github.com/Kitware/CMake/releases/download/v3.29.1/cmake-3.29.1.tar.gz +https://github.com/Kitware/CMake/releases/download/v3.29.2/cmake-3.29.2.tar.gz diff --git a/source/l/polkit/polkit-124-systemd-fixup.patch b/source/l/polkit/polkit-124-systemd-fixup.patch new file mode 100644 index 000000000..a4dd7eafc --- /dev/null +++ b/source/l/polkit/polkit-124-systemd-fixup.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/922458 +https://github.com/polkit-org/polkit/pull/417/files#r1458416421 +--- a/meson.build ++++ b/meson.build +@@ -212,14 +212,17 @@ if enable_logind + config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep)) + + # systemd unit / service files +- systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') + systemd_systemdsystemunitdir = get_option('systemdsystemunitdir') +- if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login' +- # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used +- systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') +- endif ++ if session_tracking == 'libsystemd-login' ++ systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') + +- systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') ++ if systemd_systemdsystemunitdir == '' ++ # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used ++ systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') ++ endif ++ ++ systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') ++ endif + endif + config_h.set('HAVE_LIBSYSTEMD', enable_logind) + diff --git a/source/l/polkit/polkit-124-systemd.patch b/source/l/polkit/polkit-124-systemd.patch new file mode 100644 index 000000000..e9b10e99e --- /dev/null +++ b/source/l/polkit/polkit-124-systemd.patch @@ -0,0 +1,50 @@ +https://github.com/polkit-org/polkit/pull/417 + +From 69d6b94d590b4dd1fbbac22b4f4d449f46ef61aa Mon Sep 17 00:00:00 2001 +From: Luca Boccassi +Date: Thu, 18 Jan 2024 15:07:32 +0000 +Subject: [PATCH] meson: fix build failure when -Dsystemdsystemunitdir is + specified + +When 'systemdsystemunitdir' is specified as an option the systemd_dep +variable is not defined, but the sysusers.d directory lookup uses it, +causing a build failure: + +dh_auto_configure -- \ + -Dexamples=false \ + -Dintrospection=true \ + -Dman=true \ + -Dsystemdsystemunitdir=/usr/lib/systemd/system \ + -Dtests=true \ + -Dgtk_doc=true -Dsession_tracking=libsystemd-login + cd obj-x86_64-linux-gnu && DEB_PYTHON_INSTALL_LAYOUT=deb LC_ALL=C.UTF-8 meson setup .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu -Dpython.bytecompile=-1 -Dexamples=false -Dintrospection=true -Dman=true -Dsystemdsystemunitdir=/usr/lib/systemd/system -Dtests=true -Dgtk_doc=true -Dsession_tracking=libsystemd-login +The Meson build system +Version: 1.3.1 +Source dir: /builds/bluca/polkit/debian/output/source_dir +Build dir: /builds/bluca/polkit/debian/output/source_dir/obj-x86_64-linux-gnu +Build type: native build +Project name: polkit +Project version: 124 + +<...> + +Run-time dependency libsystemd found: YES 255 +Checking for function "sd_uid_get_display" with dependency libsystemd: YES +Checking for function "sd_pidfd_get_session" with dependency libsystemd: YES +../meson.build:222:37: ERROR: Unknown variable "systemd_dep". + +Follow-up for 24f1e0af3f7bd17e220cb96201f3c654e737ad34 +--- a/meson.build ++++ b/meson.build +@@ -212,9 +212,9 @@ if enable_logind + config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep)) + + # systemd unit / service files ++ systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') + systemd_systemdsystemunitdir = get_option('systemdsystemunitdir') + if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login' +- systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') + # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used + systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') + endif + diff --git a/source/l/polkit/polkit.SlackBuild b/source/l/polkit/polkit.SlackBuild index 293a05dcd..1c41e4036 100755 --- a/source/l/polkit/polkit.SlackBuild +++ b/source/l/polkit/polkit.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=polkit VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -82,12 +82,8 @@ find . \ zcat $CWD/dont-set-wheel-group-as-admin.diff.gz | patch -p1 --verbose || exit 1 -# If we get here and don't have a polkitd user/group, add one. -# Otherwise a few directories in the package will have wrong permissions. -if ! grep -q "^polkitd:" /etc/passwd ; then - groupadd -fg 87 polkitd - useradd -c "PolicyKit daemon owner" -d /var/lib/polkit -u 87 -g polkitd -s /bin/false polkitd -fi +cat $CWD/polkit-124-systemd.patch | patch -p1 --verbose || exit 1 +cat $CWD/polkit-124-systemd-fixup.patch | patch -p1 --verbose || exit 1 # Configure, build, and install: export CFLAGS="$SLKCFLAGS" @@ -111,6 +107,7 @@ meson setup \ -Dsystemdsystemunitdir=/usr/lib/systemd/user \ -Dauthfw=pam \ -Dpam_module_dir=/lib${LIBDIRSUFFIX}/security \ + -Dpam_prefix=/etc/pam.d \ -Dman=true \ -Djs_engine=duktape \ .. || exit 1 -- cgit v1.2.3-65-gdbad