Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (9c5a9926258e4fe1920e6a3d48343d7d95396c50)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (9c5a9926258e4fe1920e6a3d48343d7d95396c50)
  • Date: Mon, 23 May 2022 16:03:48 +0000

GIT changes to master grimoire by Florian Franzmann <bwlf AT bandrate.org>:

ChangeLog
| 9 +
MESON_CONFIGURE
| 2
accounts
| 6
audio-drivers/pulseaudio/DEPENDS
| 10 -
audio-drivers/pulseaudio/HISTORY
| 4
crypto/encfs/DEPENDS
| 2
crypto/encfs/HISTORY
| 3
crypto/openssh/DEPENDS
| 6
crypto/openssh/HISTORY
| 3
crypto/openssh/INSTALL
| 8 +
crypto/openssh/systemd/sshd.conf
| 1
crypto/openssh/systemd/sshd.service
| 14 +
crypto/openssh/systemd/sshdgenkeys.service
| 15 +
crypto/openssl/BUILD
| 4
crypto/openssl/HISTORY
| 3
crypto/sshfs-fuse/DEPENDS
| 9 -
crypto/sshfs-fuse/HISTORY
| 3
database/tdb/DETAILS
| 4
database/tdb/HISTORY
| 3
disk/gdisk/DETAILS
| 4
disk/gdisk/HISTORY
| 3
disk/grub2/BUILD
| 9 +
disk/grub2/DEPENDS
| 12 +
disk/grub2/HISTORY
| 7
disk/mdadm/DEPENDS
| 5
disk/mdadm/HISTORY
| 3
disk/mdadm/INSTALL
| 4
disk/mtools/DEPENDS
| 3
disk/mtools/DETAILS
| 1
disk/mtools/HISTORY
| 5
disk/mtools/INSTALL
| 8 +
disk/mtools/PRE_BUILD
| 4
disk/xfsprogs/DETAILS
| 4
disk/xfsprogs/HISTORY
| 3
doc/itstool/DEPENDS
| 2
doc/itstool/HISTORY
| 3
freedesktop.gpg
|binary
gnome2-libs/gsettings-desktop-schemas/DEPENDS
| 2
gnome2-libs/gsettings-desktop-schemas/DETAILS
| 6
gnome2-libs/gsettings-desktop-schemas/HISTORY
| 4
groups
| 7
kernels/dracut/DEPENDS
| 1
kernels/dracut/HISTORY
| 4
kernels/dracut/PROVIDES
| 1
kernels/linux/DEPENDS
| 6
kernels/linux/HISTORY
| 3
kernels/linux/INSTALL
| 6
libs/inih/DEPENDS
| 3
libs/inih/DETAILS
| 4
libs/inih/HISTORY
| 3
libs/libxml2/HISTORY
| 3
libs/libxml2/PRE_SUB_DEPENDS
| 2
libs/libxml2/SUB_DEPENDS
| 2
smgl/linux-initramfs/HISTORY
| 3
smgl/linux-initramfs/PROVIDES
| 1
smgl/openrc/CONFLICTS
| 3
smgl/openrc/HISTORY
| 4
smgl/openrc/PROVIDES
| 2
smgl/systemd/BUILD
| 79 ++++++----
smgl/systemd/CONFIGURE
| 12 -
smgl/systemd/CONFLICTS
| 5
smgl/systemd/DEPENDS
| 53 +++++-
smgl/systemd/DETAILS
| 21 --
smgl/systemd/FINAL
| 24 +++
smgl/systemd/HISTORY
| 8 +
smgl/systemd/INSTALL
| 7
smgl/systemd/PREPARE
| 1
smgl/systemd/PRE_BUILD
| 10 +
smgl/systemd/PROVIDES
| 1
smgl/systemd/UP_TRIGGERS
| 3
utils/dbus/DEPENDS
| 5
utils/dbus/HISTORY
| 7
utils/dbus/INSTALL
| 6
utils/dbus/Xsession.d/20dbus_xdg-runtime
| 24 +++
utils/dbus/Xsession.d/75dbus_dbus-launch
| 22 ++
utils/dbus/Xsession.d/95dbus_update-activation-env
| 17 ++
utils/psmisc/DETAILS
| 4
utils/psmisc/HISTORY
| 3
utils/smartmontools/DETAILS
| 2
utils/smartmontools/HISTORY
| 4
utils/smartmontools/smartmontools.gpg
|binary
x11/lightdm/BUILD
| 7
x11/lightdm/DEPENDS
| 21 +-
x11/lightdm/HISTORY
| 4
x11/xcb/DEPENDS
| 1
x11/xcb/HISTORY
| 3
xorg-app/xdm/0001-Use-dbus-launcher-to-start-xsession.patch
| 37 ++++
xorg-app/xdm/0001-use-X-s-default-authentication-mechanism-instead-of-.patch
| 22 --
xorg-app/xdm/BUILD
| 2
xorg-app/xdm/DEPENDS
| 12 +
xorg-app/xdm/HISTORY
| 14 +
xorg-app/xdm/PRE_BUILD
| 8 -
xorg-app/xdm/pam.d/xdm
| 23 ++
xorg-app/xdm/patches/0001-Source-Xsession.d-files.patch
| 29 +++
xorg/xserver/BUILD
| 1
xorg/xserver/HISTORY
| 3
96 files changed, 626 insertions(+), 138 deletions(-)

New commits:
commit 9c5a9926258e4fe1920e6a3d48343d7d95396c50
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

smgl/systemd: version 250.4

commit 061c805a3d60b941b4ced407529e8f803036e32c
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

smgl/systemd: remove PRE_BUILD

commit 8da1408cef50b833fe20dfed124beeab87bdf91b
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

xorg-app/xdm: launch dbus session if available

commit faa6cfb6b94dc5c510d62eed5b88fa513513339f
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

crypto/sshfs-fuse: depend on docutils

commit 2421cffb2a57a729b384b1be5a805e58355aef9a
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

x11/lightdm: add missing dependencies

commit a94d6266569c6b1378006657794636155b92789a
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

x11/lightdm: remove dependency on qt4

commit 97f6f96aff42b5a134a73f596bf6a95820be088e
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

doc/itstools: depend on python3

commit 4fd7f0824f2174dc3fb0f72da17120538b8fdb2c
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

libs/libxml2: fix PYTHON subdependency

commit a51325a135c9e31009174482d57811aecc72e1d1
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

xorg-app/xdm: Add suggested dependency on gsettings-desktop-schemas

commit 6b751c2ce0aa8ba4245839a48af7eba7d0bd1bd0
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

gnome2-libs/gsettings-desktop-schemas: version 42.0

commit 10400bad23bd82df9e6f164e7b897a82a5f9a076
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

gnome2-libs/gsettings-desktop-schemas: use MESON_DEPENDS

commit cbc816effb4fd3d8b06034e2ee48e0ee0cdccb04
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

xorg-app/xdm: Add support for Xsession.d

commit bbb55c387e4369afa4806a1f21a395b2837e3eaa
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

utils/dbus: Add scripts for setting up user session

commit 3f75aab175cfd72c0d14eca19a1d1209b8d54c05
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

audio-drivers/pulseaudio: use MESON_DEPENDS

commit ec5d57b6aa38646649d32b01ee0094ded3029a99
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

audio-drivers/pulseaudio: depend on single-precision fftw

commit ec85e8ad80d10164e6cbcd941e4a48c2a1a415a1
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

audio-drivers/pulseaudio: add dependency on libsndfile

commit cc664a3e0ec36336c851264f8e34f960d79ee868
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

database/tdb: version 1.4.6

commit 4be13381aa4d7ca328c9b512e2f3e8932e6fe015
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

MESON_CONFIGURE: sort build options

commit db955eabc689f74d8b98abe59ac5c1f44932d2c6
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

crypto/encfs: remove dependency on SYSTEM-LOGGER

commit 6b06143e4e4ba00cf5ab70a5c1459147ccc3c5cf
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

xorg-app/xdm: add pam config

commit 531439626e32170d271ae42db05983937d565259
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

xorg-app/xdm: replace patch with config option

commit 67835473458763540bbfc14a5d760a1cd129ea95
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

disk/mtools: disable staged install

commit 4465f4b8a2851c32eff4b1ee1f3dcc3f42aef6ed
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

disk/mtools: add missing dependencies

commit d09e7a27fed7a677a0579a73a5701ba322936158
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

disk/mtools: install config file

commit 2b2596fb853233d96212225414801983ede1d6fc
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

x11/xcb: add dependency on imake

commit f037c7deb72e6040d50f2cc334b1d668304a9a32
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

crypto/openssl: build manpages in BUILD

commit 393f3082a311315beb68775841862e9617015ad3
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

crypto/openssh: add systemd support

commit e7bdd892256c4e204dc4b47838ab4ba7be086180
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

disk/grub2: add optional dependency on LZMA

commit 2cf761671c37b20056754db45a7523f64fe07133
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

disk/grub2: filter breaking flags

commit 15c77d180efdbd8ccbad1f6ba5697cc30a49c50b
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

disk/mdadm: optionally install systemd services

commit 66e4fd76f8a3be957e8f4d9034d45e92f40058e9
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

utils/psmisc: version 23.5

commit fe5b728fc60b44cd442316ea58551fca1eb2fd06
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

accounts, groups: add systemd accounts

commit 8fe81c6d42430cfdd2132bac77f8e09aa110c489
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

kernels/linux: add suggested dependency on linux-firmware

commit 265fa65ea6b94c19963e1f5677d28f8b003148b2
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

xorg/xserver: relax CFLAGS to avoid build error

commit 292428483719386088c106a323a87668937d4c6e
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

utils/smartmontools: version 7.3

commit 82cd2c8750a4ebfaf97a69c3a8ddac0765d9c691
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

libs/inih: version 55

commit 2dd8f82c863ce3cd5a1c48721817610d3620b172
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

disk/xfsprogs: version 5.16.0

commit a5ce51edfc9350a0ea7e0e36e06db96d6abfe6bf
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

disk/gdisk: version 1.0.9

commit 6750af9caaf85f8812aa0c61360617682c7ee5a6
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

utils/dbus: add optional dependency on systemd

commit a8920514b1a0f4f642de60dd4d182fbed72bdeff
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

kernels/linux: add dracut support

commit 183e08eb6c0a93d32193176a5deef324cfc4bdfb
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

kernels/dracut: provide INITRAMFS

commit ba541741cbbc64f14e52c89d132da8f371efc403
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

smgl/linux-initramfs: provide INITRAMFS

commit 12f76e98145f5c91157fd29bd45fc3a83f302c73
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

kernels/dracut: add dependency on kmod

commit 92f8658b3ad80c777f89ff6025ee2b45fb0a78ac
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

freedesktop.gpg: add signing key

commit a552608287aad9dbe744b0091acde434a9612af1
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

smgl/openrc: add PROVIDES and CONFLICTS

commit f25c300a8cf8aa22ef2968f8fecdab499b52ca78
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

disk/grub2: add dependency on efibootmgr

diff --git a/ChangeLog b/ChangeLog
index 23aa4a0..45af277 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-05-22 Florian Franzmann <bwlf AT bandrate.org>
+ * MESON_CONFIGURE: sort build options by usefulness
+
+2022-05-20 Florian Franzmann <bwlf AT bandrate.org>
+ * accounts, groups: add missing accounts for systemd
+
2022-05-18 Ismael Luceno <ismael AT sourcemage.org>
* devel/qbe: new spell, QBE Compiler Backend

@@ -7,6 +13,9 @@
2022-05-15 Treeve Jelbert <treeve AT sourcemage.org>
* KDE5_FUNCTIONS: tweaks for qt6

+2022-05-15 Florian Franzmann <bwlf AT bandrate.org>
+ * freedesktop.gpg: add signing key
+
2022-05-13 Treeve Jelbert <treeve AT sourcemage.org>
* crypto/libxcrypt: added, modern replacement for glibc''s libcrypt

diff --git a/MESON_CONFIGURE b/MESON_CONFIGURE
index ccb9dcd..1977f14 100755
--- a/MESON_CONFIGURE
+++ b/MESON_CONFIGURE
@@ -1,3 +1,3 @@
-config_query_list MESON_BUILD_TYPE 'which build type?' plain debug
debugoptimized release minsize
+config_query_list MESON_BUILD_TYPE 'which build type?' release minsize
plain debugoptimized debug
#config_query_option MESON_TESTS 'build tests?' n "-DBUILD_TESTING=1"
"-DBUILD_TESTING=0"

diff --git a/accounts b/accounts
index 52a490b..1953a1a 100755
--- a/accounts
+++ b/accounts
@@ -122,4 +122,10 @@ consul-template:218:218
vault:219:219
boundary:220:220
seatd:221:221
+systemd-journal:222:222
+systemd-network:223:223
+systemd-resolve:224:224
+systemd-coredump:225:225
+systemd-oom:226:226
+systemd-timesync:227:227
nobody:65534:65534
diff --git a/audio-drivers/pulseaudio/DEPENDS
b/audio-drivers/pulseaudio/DEPENDS
index 8554fbd..4a11637a 100755
--- a/audio-drivers/pulseaudio/DEPENDS
+++ b/audio-drivers/pulseaudio/DEPENDS
@@ -1,6 +1,8 @@
-depends meson &&
-depends cmake &&
-depends check &&
+. "$GRIMOIRE"/MESON_DEPENDS &&
+
+depends cmake &&
+depends check &&
+depends libsndfile &&

if [[ "$PULSE_DB" == 'gdbm' ]]; then
depends gdbm "database=gdbm"
@@ -105,7 +107,7 @@ optional_depends doxygen \
"doxygen=false man=false" \
"for doxygen-generated documentation" &&

-optional_depends fftw \
+optional_depends -sub SINGLE fftw \
'fftw=enabled' \
'fftw=disabled' \
'build equalizer' &&
diff --git a/audio-drivers/pulseaudio/HISTORY
b/audio-drivers/pulseaudio/HISTORY
index ed92950..e79396d 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,3 +1,7 @@
+2022-05-22 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS: add dependency on libsndfile, depend on fftw with
+ single-precision floats, use MESON_DEPENDS
+
2021-08-21 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS, BUILD, DEPENDS, SUB_DEPENDS, CONFIGURE: version 15.0

diff --git a/crypto/encfs/DEPENDS b/crypto/encfs/DEPENDS
index 78db003..0e72c8d 100755
--- a/crypto/encfs/DEPENDS
+++ b/crypto/encfs/DEPENDS
@@ -1,6 +1,6 @@
source $GRIMOIRE/CMAKE_DEPENDS &&
depends fuse &&
depends SSL &&
-depends SYSTEM-LOGGER &&
+
optional_depends GETTEXT ' -DENABLE_NLS=1' ' -DENABLE_NLS=0' 'NLS support' &&
optional_depends tinyxml ' -DUSE_INTERNAL_TINYXML=0' '' 'use external
TinyXML'
diff --git a/crypto/encfs/HISTORY b/crypto/encfs/HISTORY
index 112d103..55d7db7 100644
--- a/crypto/encfs/HISTORY
+++ b/crypto/encfs/HISTORY
@@ -1,3 +1,6 @@
+2022-05-22 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS: remove dependency on SYSTEM-LOGGER
+
2019-10-05 Florian Franzmann <bwlf AT bandrate.org>
* BUILD, CONFIGURE, DEPENDS, DETAILS: use CMAKE_*

diff --git a/crypto/openssh/DEPENDS b/crypto/openssh/DEPENDS
index 77ea40f..e43ba46 100755
--- a/crypto/openssh/DEPENDS
+++ b/crypto/openssh/DEPENDS
@@ -30,7 +30,13 @@ if [ "${OPENSSH_LPK}" == "y" ]; then
"--without-ldap" \
"to support sshd checking LDAP for public keys"
fi &&
+
optional_depends "shadow" \
"--with-shadow" \
"--without-shadow" \
"use shadow for password management"
+
+suggest_depends "systemd" \
+ "" \
+ "" \
+ "to install a systemd service"
diff --git a/crypto/openssh/HISTORY b/crypto/openssh/HISTORY
index 190c936..98eddf0 100644
--- a/crypto/openssh/HISTORY
+++ b/crypto/openssh/HISTORY
@@ -1,3 +1,6 @@
+2022-05-21 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS, INSTALL, systemd: add support for systemd
+
2022-04-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 9.0p1

diff --git a/crypto/openssh/INSTALL b/crypto/openssh/INSTALL
new file mode 100755
index 0000000..35da037
--- /dev/null
+++ b/crypto/openssh/INSTALL
@@ -0,0 +1,8 @@
+default_install &&
+
+if spell_installed systemd; then
+ install -m 644 -o root -g root "$SPELL_DIRECTORY/systemd/"*.service
"$INSTALL_ROOT/lib/systemd/system/" &&
+ install -m 644 -o root -g root "$SPELL_DIRECTORY/systemd/sshd.conf"
"$INSTALL_ROOT/usr/lib/tmpfiles.d/" &&
+
+ systemctl daemon-reload
+fi
diff --git a/crypto/openssh/systemd/sshd.conf
b/crypto/openssh/systemd/sshd.conf
new file mode 100644
index 0000000..ca2a393
--- /dev/null
+++ b/crypto/openssh/systemd/sshd.conf
@@ -0,0 +1 @@
+d /var/empty 0755 root root
diff --git a/crypto/openssh/systemd/sshd.service
b/crypto/openssh/systemd/sshd.service
new file mode 100644
index 0000000..99b09b6
--- /dev/null
+++ b/crypto/openssh/systemd/sshd.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=OpenSSH Daemon
+Wants=sshdgenkeys.service
+After=sshdgenkeys.service
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/sshd -D
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/crypto/openssh/systemd/sshdgenkeys.service
b/crypto/openssh/systemd/sshdgenkeys.service
new file mode 100644
index 0000000..cfb9f6a
--- /dev/null
+++ b/crypto/openssh/systemd/sshdgenkeys.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=SSH Key Generation
+ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key
+ConditionPathExists=|!/etc/ssh/ssh_host_ed25519_key.pub
+ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
+ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
+
+[Service]
+ExecStart=/usr/bin/ssh-keygen -A
+Type=oneshot
+RemainAfterExit=yes
diff --git a/crypto/openssl/BUILD b/crypto/openssl/BUILD
index 4ce1b14..634680e 100755
--- a/crypto/openssl/BUILD
+++ b/crypto/openssl/BUILD
@@ -23,7 +23,9 @@ fi &&
sedit "s/^CFLAG=/CFLAG=$CFLAGS /" Makefile &&
sedit "s/chmod 644\(.*pkgconfig\)/chmod 755\1/" Makefile &&

-make && {
+make &&
+make build_man_docs &&
+{

local OLD_SPELL_VERSION=""
spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 05e7da4..e2a0b39 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,6 @@
+2022-05-21 Florian Franzmann <bwlf AT bandrate.org>
+ * BUILD: build manpages in BUILD instead of INSTALL
+
2022-05-06 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 3.0.3, SECURITY_PATCH++, fixes CVE-2022-1473,
CVE-2022-1434, CVE-2022-1343, CVE-2022-1292
diff --git a/crypto/sshfs-fuse/DEPENDS b/crypto/sshfs-fuse/DEPENDS
index d64b137..c2593c0 100755
--- a/crypto/sshfs-fuse/DEPENDS
+++ b/crypto/sshfs-fuse/DEPENDS
@@ -1,5 +1,6 @@
-depends meson &&
-depends fuse3 &&
-depends glib2 &&
+. "$GRIMOIRE"/MESON_DEPENDS
+depends fuse3 &&
+depends glib2 &&
depends pkgconfig &&
-depends openssh
+depends openssh &&
+depends docutils
diff --git a/crypto/sshfs-fuse/HISTORY b/crypto/sshfs-fuse/HISTORY
index 5ea9a72..b26f038 100644
--- a/crypto/sshfs-fuse/HISTORY
+++ b/crypto/sshfs-fuse/HISTORY
@@ -1,3 +1,6 @@
+2022-05-22 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS: add dependency on docutils, use MESON_DEPENDS
+
2021-06-08 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 3.7.2

diff --git a/database/tdb/DETAILS b/database/tdb/DETAILS
index cf299b1..6253fe5 100755
--- a/database/tdb/DETAILS
+++ b/database/tdb/DETAILS
@@ -1,9 +1,9 @@
SPELL=tdb
- VERSION=1.4.5
+ VERSION=1.4.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://samba.org/ftp/$SPELL/$SOURCE
SOURCE_URL[1]=ftp://ftp.samba.org/pub/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:373b2ce5b2c68fbc28b7679f0e7531115b91ddc6a68b27acada39b995f66b508b19f24d712fc4388654199abd69857e53ebd435d1ed47e3a69ba85ff667fed56
+
SOURCE_HASH=sha512:8af549867fdf2e0daf073c26933ae0d475ea64efaca23d3d7b0eb20839376e817f4c0a0ba2504f60f9e27a2b35d3b6ae7c329d88a5c2c0408e98ad9dfde84712
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=GPL
WEB_SITE=https://tdb.samba.org/
diff --git a/database/tdb/HISTORY b/database/tdb/HISTORY
index f47601e..a42adc7 100644
--- a/database/tdb/HISTORY
+++ b/database/tdb/HISTORY
@@ -1,3 +1,6 @@
+2022-05-22 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 1.4.6
+
2022-01-28 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: update to 1.4.5 (needed for samba 4.15)

diff --git a/disk/gdisk/DETAILS b/disk/gdisk/DETAILS
index 47747d8..fcfbaa7 100755
--- a/disk/gdisk/DETAILS
+++ b/disk/gdisk/DETAILS
@@ -1,7 +1,7 @@
SPELL=gdisk
SPELLX=gptfdisk
- VERSION=1.0.8
-
SOURCE_HASH=sha512:0818a238e57cf6de893da7c161e8aaf2d30ad917a47750de09967ce1d83d1ab6666fa043465abaffdc293d058acc3fa87f8bc93a4b03c7c5d9a9ceb8f5b07331
+ VERSION=1.0.9
+
SOURCE_HASH=sha512:c2489ac7e196cb53b9fdb18d0e421571eca43c366de8922c5c7f550aadf192558e7af69b181c30747d6cf607c1670126223465eaa5e231cc589402d94a4e97a2
SECURITY_PATCH=1
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/disk/gdisk/HISTORY b/disk/gdisk/HISTORY
index b17a34a..e71a01e 100644
--- a/disk/gdisk/HISTORY
+++ b/disk/gdisk/HISTORY
@@ -1,3 +1,6 @@
+2022-05-18 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 1.0.9
+
2021-10-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.8

diff --git a/disk/grub2/BUILD b/disk/grub2/BUILD
index cdcba2c..391d6cd 100755
--- a/disk/grub2/BUILD
+++ b/disk/grub2/BUILD
@@ -10,5 +10,12 @@ LDFLAGS=${LDFLAGS%-s} &&
LDFLAGS=${LDFLAGS//-Wl,-fuse-ld=gold/} &&
LDFLAGS+=" -Wl,-fuse-ld=bfd" &&

-disable_pic force &&
+# let the build system handle stack protector
+OPTS+=" --enable-stack-protector" &&
+disable_stack_protector &&
+
+disable_fortify_source &&
+disable_cf_protection &&
+disable_pic force &&
+
default_build
diff --git a/disk/grub2/DEPENDS b/disk/grub2/DEPENDS
index b71b4cb..dbab71a 100755
--- a/disk/grub2/DEPENDS
+++ b/disk/grub2/DEPENDS
@@ -8,6 +8,11 @@ if [[ "${GRUB2_RELEASE}" != "stable" ]]; then
depends autoconf
fi &&

+optional_depends LZMA \
+ '--enable-lzma' \
+ '--disable-lzma' \
+ 'for liblzma integration' &&
+
optional_depends lvm \
'--enable-device-mapper' \
'--disable-device-mapper' \
@@ -23,4 +28,9 @@ optional_depends unifont '' '' 'for the default font
(needed for gfxterm)' &&
optional_depends sdl \
'--enable-grub-emu-sdl' \
'--disable-grub-emu-sdl' \
- 'To build and install the grub-emu debugging utility with
SDL support'
+ 'To build and install the grub-emu debugging utility with
SDL support' &&
+
+suggest_depends efibootmgr \
+ '' \
+ '' \
+ 'for booting via EFI'
diff --git a/disk/grub2/HISTORY b/disk/grub2/HISTORY
index d4891bb..8214c7c 100644
--- a/disk/grub2/HISTORY
+++ b/disk/grub2/HISTORY
@@ -1,3 +1,10 @@
+2022-05-21 Florian Franzmann <bwlf AT bandrate.org>
+ * BUILD: filter breaking CFLAGS and CPPFLAGS
+ * DEPENDS: add optional dependency on LZMA
+
+2022-05-14 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS: add suggested dependency on efibootmgr
+
2021-06-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.06

diff --git a/disk/mdadm/DEPENDS b/disk/mdadm/DEPENDS
index b691337..b431bb0 100755
--- a/disk/mdadm/DEPENDS
+++ b/disk/mdadm/DEPENDS
@@ -1 +1,4 @@
-depends groff
+depends gcc &&
+depends groff &&
+
+suggest_depends systemd '' '' 'install systemd services'
diff --git a/disk/mdadm/HISTORY b/disk/mdadm/HISTORY
index db3d9ff..bd566f8 100644
--- a/disk/mdadm/HISTORY
+++ b/disk/mdadm/HISTORY
@@ -1,3 +1,6 @@
+2022-05-20 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS, INSTALL: optionally install systemd services
+
2021-05-27 Florian Franzmann <bwlf AT bandrate.org>
* BUILD: disable fortify source to prevent build error, build mdmon
here
instead of in INSTALL
diff --git a/disk/mdadm/INSTALL b/disk/mdadm/INSTALL
index b4b7c5d..f0f41df 100755
--- a/disk/mdadm/INSTALL
+++ b/disk/mdadm/INSTALL
@@ -1,3 +1,7 @@
default_install &&

+if is_depends_enabled $SPELL systemd; then
+ make DESTDIR="$INSTALL_ROOT" install-systemd
+fi &&
+
install -m 755 mdadm.static "${INSTALL_ROOT}/sbin/mdadm.static"
diff --git a/disk/mtools/DEPENDS b/disk/mtools/DEPENDS
index 760ba7c..ac5bfad 100755
--- a/disk/mtools/DEPENDS
+++ b/disk/mtools/DEPENDS
@@ -5,4 +5,7 @@ case "$HOST" in
LIBS+=' -liconv'
;;
esac &&
+
+depends gcc &&
+depends bash &&
depends texinfo
diff --git a/disk/mtools/DETAILS b/disk/mtools/DETAILS
index f9dc207..b27310d 100755
--- a/disk/mtools/DETAILS
+++ b/disk/mtools/DETAILS
@@ -1,4 +1,5 @@
SPELL=mtools
+ STAGED_INSTALL=off
VERSION=4.0.39
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=$SOURCE.sig
diff --git a/disk/mtools/HISTORY b/disk/mtools/HISTORY
index b9430d8..5fb5c78 100644
--- a/disk/mtools/HISTORY
+++ b/disk/mtools/HISTORY
@@ -1,3 +1,8 @@
+2022-05-21 Florian Franzmann <bwlf AT bandrate.org>
+ * INSTALL: disable parallel install, install config file
+ * DEPENDS: add missing dependencies
+ * DETAILS: disable staged install to prevent error during installation
+
2022-04-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0.39

diff --git a/disk/mtools/INSTALL b/disk/mtools/INSTALL
new file mode 100755
index 0000000..561005a
--- /dev/null
+++ b/disk/mtools/INSTALL
@@ -0,0 +1,8 @@
+make_single &&
+
+touch "$INSTALL_ROOT/usr/share/info/dir" &&
+default_install &&
+
+make_normal &&
+
+install -vDm 644 mtools.conf -t "$INSTALL_ROOT/etc/"
diff --git a/disk/mtools/PRE_BUILD b/disk/mtools/PRE_BUILD
new file mode 100755
index 0000000..2c514fb
--- /dev/null
+++ b/disk/mtools/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sed -e '/^SAMPLE FILE$/s:^:# :' -i mtools.conf
diff --git a/disk/xfsprogs/DETAILS b/disk/xfsprogs/DETAILS
index 5009fcc..42c6a87 100755
--- a/disk/xfsprogs/DETAILS
+++ b/disk/xfsprogs/DETAILS
@@ -1,9 +1,9 @@
SPELL=xfsprogs
- VERSION=5.14.1
+ VERSION=5.16.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/$SOURCE
-
SOURCE_HASH=sha512:5bb79fff45048bebee2fde85ec788658dd8dc8d5ddac222b1f74c6cd525e1239d920814e8e713f045e38398a785321bf0a7421ff1c690cd0be5dbb224f8dafea
+
SOURCE_HASH=sha512:949ddb42d37523d6494aa33d1f73757a6379ee661147b9bb84372bdc3ccf60cdf07580f5337b2f0aebdc5d9c2b7de37cc05d010a2b094d1119d900225fc5b711
LICENSE[0]=GPL

WEB_SITE=https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/
ENTERED=20020110
diff --git a/disk/xfsprogs/HISTORY b/disk/xfsprogs/HISTORY
index 3c9a2b0..bcc2a89 100644
--- a/disk/xfsprogs/HISTORY
+++ b/disk/xfsprogs/HISTORY
@@ -1,3 +1,6 @@
+2022-05-18 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 5.16.0
+
2021-12-26 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 5.14.1

diff --git a/doc/itstool/DEPENDS b/doc/itstool/DEPENDS
index fcbf607..4cf9c75 100755
--- a/doc/itstool/DEPENDS
+++ b/doc/itstool/DEPENDS
@@ -1,2 +1,2 @@
-depends PYTHON &&
+depends python3 &&
depends -sub PYTHON libxml2
diff --git a/doc/itstool/HISTORY b/doc/itstool/HISTORY
index 73b51f6..34f1d1c 100644
--- a/doc/itstool/HISTORY
+++ b/doc/itstool/HISTORY
@@ -1,3 +1,6 @@
+2022-05-22 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS: depend on python3
+
2021-09-25 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 2.0.7

diff --git a/freedesktop.gpg b/freedesktop.gpg
index 4adf3de..e6efe8c 100644
Binary files a/freedesktop.gpg and b/freedesktop.gpg differ
diff --git a/gnome2-libs/gsettings-desktop-schemas/DEPENDS
b/gnome2-libs/gsettings-desktop-schemas/DEPENDS
index 92d2424..c3d333b 100755
--- a/gnome2-libs/gsettings-desktop-schemas/DEPENDS
+++ b/gnome2-libs/gsettings-desktop-schemas/DEPENDS
@@ -1,2 +1,2 @@
-depends meson &&
+. "$GRIMOIRE"/MESON_DEPENDS
depends perl
diff --git a/gnome2-libs/gsettings-desktop-schemas/DETAILS
b/gnome2-libs/gsettings-desktop-schemas/DETAILS
index 2109b79..4cf5769 100755
--- a/gnome2-libs/gsettings-desktop-schemas/DETAILS
+++ b/gnome2-libs/gsettings-desktop-schemas/DETAILS
@@ -1,11 +1,11 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=gsettings-desktop-schemas
- VERSION=3.34.0
- BRANCH=$(echo $VERSION|cut -d . -f 1,2)
+ VERSION=42.0
+ BRANCH=$(echo $VERSION|cut -d . -f 1)
SOURCE=$SPELL-$VERSION.tar.xz
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:UPSTREAM_HASH"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:6cbe59facf77566ed93faabafc6b00ad03fb398a9a4686ba94a08b1c2d0df1d44bd673fb4d51340209a66ebc0aa32095615e7e63b78f4cc4c10d240a7b0a8fa1
+
SOURCE_HASH=sha512:db73988a6b38857d1aa6588ccac42099c57dcc187ef01776567cc7c28aff67dc06d6a8a067e0c69167d03cd865f0c1d58e75469a40f969084bb2537b088f8664
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.gnome.org/
LICENSE[0]=LGPL
diff --git a/gnome2-libs/gsettings-desktop-schemas/HISTORY
b/gnome2-libs/gsettings-desktop-schemas/HISTORY
index 934b2f1..1592638 100644
--- a/gnome2-libs/gsettings-desktop-schemas/HISTORY
+++ b/gnome2-libs/gsettings-desktop-schemas/HISTORY
@@ -1,3 +1,7 @@
+2022-05-22 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS: use MESON_DEPENDS
+ * DETAILS: version 42.0
+
2020-01-01 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 3.34.0
* DEPENDS, CONFIGURE, DETAILS: switch to meson
diff --git a/groups b/groups
index 6a77186..9d3feb1 100755
--- a/groups
+++ b/groups
@@ -148,5 +148,12 @@ consul-template:218:
vault:219:
boundary:220:
seatd:221:
+systemd-journal:222:
+systemd-network:223:
+systemd-resolve:224:
+systemd-coredump:225:
+systemd-oom:226:
+systemd-timesync:227:
+render:228:
users:1000:
nogroup:65534:
diff --git a/kernels/dracut/DEPENDS b/kernels/dracut/DEPENDS
new file mode 100755
index 0000000..460c3b6
--- /dev/null
+++ b/kernels/dracut/DEPENDS
@@ -0,0 +1 @@
+depends kmod
diff --git a/kernels/dracut/HISTORY b/kernels/dracut/HISTORY
index 2463a8e..d80baff 100644
--- a/kernels/dracut/HISTORY
+++ b/kernels/dracut/HISTORY
@@ -1,3 +1,7 @@
+2022-05-15 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS: depend on kmod
+ * PROVIDES: provide INITRAMFS
+
2022-03-29 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS, PRE_BUILD,
patches/0001-Wrap-__GLIBC_PREREQ-usage-with-__GLIBC__.patch:
diff --git a/kernels/dracut/PROVIDES b/kernels/dracut/PROVIDES
new file mode 100755
index 0000000..26bc8dd
--- /dev/null
+++ b/kernels/dracut/PROVIDES
@@ -0,0 +1 @@
+INITRAMFS
diff --git a/kernels/linux/DEPENDS b/kernels/linux/DEPENDS
index ad7a069..c721c4e 100755
--- a/kernels/linux/DEPENDS
+++ b/kernels/linux/DEPENDS
@@ -16,6 +16,8 @@ if [[ "$(get_kernel_config CONFIG_UNWINDER_ORC)" == "y" ]];
then
depends elfutils
fi
fi &&
-optional_depends linux-initramfs '' '' 'for making initramfs images' &&
+optional_depends INITRAMFS '' '' 'for making initramfs images' &&
optional_depends mtools '' '' 'for make bzdisk' &&
-optional_depends lzop '' '' 'for LZO kernel image'
+optional_depends lzop '' '' 'for LZO kernel image' &&
+
+suggest_depends linux-firmware '' '' 'install firmware required by some
kernel modules'
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index ce343e9..2fed1ca 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -3,6 +3,9 @@
* info/patches/maintenance_patches_5/patch-5.17.9: added
* info/patches/maintenance_patches_5/patch-5.17.7: removed

+2022-05-20 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS: add suggested dependency on linux-firmware
+
2022-05-13 Pavel Vinogradov <public AT sourcemage.org>
* latest.defaults: latest_maintenance_patches_5=patch-5.17.7
* info/patches/maintenance_patches_5/patch-5.17.7: added
diff --git a/kernels/linux/INSTALL b/kernels/linux/INSTALL
index d63ee41..5a7f057 100755
--- a/kernels/linux/INSTALL
+++ b/kernels/linux/INSTALL
@@ -71,6 +71,12 @@ if [[ -z "$INTERNAL_ISO_VAR" ]] ; then
message "${MESSAGE_COLOR}Creating and linking
initrd.img${DEFAULT_COLOR}" &&
mkinitrd --force --ignore-missing -o
"${INSTALL_ROOT}"/boot/initrd.img-${VERSION} ${VERSION} &&
ln -sf initrd.img-${VERSION} "${INSTALL_ROOT}"/boot/initrd.img
+ fi &&
+ if is_depends_enabled $SPELL dracut
+ then
+ message "${MESSAGE_COLOR}Creating and linking
initrd.img${DEFAULT_COLOR}" &&
+ dracut --force "${INSTALL_ROOT}"/boot/initrd.img-${VERSION}
${VERSION} &&
+ ln -sf initrd.img-${VERSION} "${INSTALL_ROOT}"/boot/initrd.img
fi
fi &&
ln -sfn `basename ${LINUX_SOURCE_DIRECTORY}` ${BUILD_DIRECTORY}/linux
diff --git a/libs/inih/DEPENDS b/libs/inih/DEPENDS
index 1188343..88a5b0f 100755
--- a/libs/inih/DEPENDS
+++ b/libs/inih/DEPENDS
@@ -1,2 +1,3 @@
-depends meson &&
+. "$GRIMOIRE"/MESON_DEPENDS &&
+
depends gcc
diff --git a/libs/inih/DETAILS b/libs/inih/DETAILS
index f3e7507..3ee2e1a 100755
--- a/libs/inih/DETAILS
+++ b/libs/inih/DETAILS
@@ -1,9 +1,9 @@
source "$GRIMOIRE/MESON_FUNCTIONS"
SPELL=inih
- VERSION=53
+ VERSION=55
SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]=https://github.com/benhoyt/${SPELL}/archive/r${VERSION}.tar.gz
-
SOURCE_HASH=sha512:99bc40c294b521e9973184bfb30d60c129735991f33b387b3d023827a34672b0489eadf91e38895ea725168dbc7b27bb02c1975debe7573b4b209d0e947b2100
+
SOURCE_HASH=sha512:bcbef361a4400da017dbed811ad21672b58512d2b2b537cc0058cdeca709dd0d5a9def4045ce1c1972873c3d3d35182123337e4388676f6f0d16e8dbff967b0f
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-r${VERSION}"
WEB_SITE="https://github.com/benhoyt/inih";
LICENSE[0]=BSD
diff --git a/libs/inih/HISTORY b/libs/inih/HISTORY
index 2e2af97..c7cae87 100644
--- a/libs/inih/HISTORY
+++ b/libs/inih/HISTORY
@@ -1,3 +1,6 @@
+2022-05-18 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS, DEPENDS: version 55
+
2021-02-13 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 53

diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index a690b51..535370e 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,6 @@
+2022-05-22 Florian Franzmann <bwlf AT bandrate.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: fix PYTHON sub dependency
+
2022-05-06 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 2.9.14, SECURITY_PATCH++, fixes CVE-2022-29824

diff --git a/libs/libxml2/PRE_SUB_DEPENDS b/libs/libxml2/PRE_SUB_DEPENDS
index f7fa8d7..6a32568 100755
--- a/libs/libxml2/PRE_SUB_DEPENDS
+++ b/libs/libxml2/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- PYTHON) is_depends_enabled $SPELL python || is_depends_enabled $SPELL
python3;;
+ PYTHON) is_depends_enabled $SPELL python3;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
return 1;;
esac
diff --git a/libs/libxml2/SUB_DEPENDS b/libs/libxml2/SUB_DEPENDS
index a8511d1..3bd1fdf 100755
--- a/libs/libxml2/SUB_DEPENDS
+++ b/libs/libxml2/SUB_DEPENDS
@@ -1,6 +1,6 @@
case $THIS_SUB_DEPENDS in
PYTHON) message "python bindings requested, forcing them" &&
- depends PYTHON "--with-python";;
+ depends python3 "--with-python";;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" &&
return 1;;
esac
diff --git a/smgl/linux-initramfs/HISTORY b/smgl/linux-initramfs/HISTORY
index 46559d3..5247ea2 100644
--- a/smgl/linux-initramfs/HISTORY
+++ b/smgl/linux-initramfs/HISTORY
@@ -1,3 +1,6 @@
+2022-05-15 Florian Franzmann <bwlf AT bandrate.org>
+ * PROVIDES: provide INITRAMFS
+
2021-06-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.9
* installkernel: added support for broader range of kernels
diff --git a/smgl/linux-initramfs/PROVIDES b/smgl/linux-initramfs/PROVIDES
new file mode 100755
index 0000000..26bc8dd
--- /dev/null
+++ b/smgl/linux-initramfs/PROVIDES
@@ -0,0 +1 @@
+INITRAMFS
diff --git a/smgl/openrc/CONFLICTS b/smgl/openrc/CONFLICTS
new file mode 100755
index 0000000..a3d06f2
--- /dev/null
+++ b/smgl/openrc/CONFLICTS
@@ -0,0 +1,3 @@
+#conflicts simpleinit-msb &&
+conflicts initng &&
+conflicts upstart
diff --git a/smgl/openrc/HISTORY b/smgl/openrc/HISTORY
index a3c136f..7926a06 100644
--- a/smgl/openrc/HISTORY
+++ b/smgl/openrc/HISTORY
@@ -1,3 +1,7 @@
+2022-05-15 Florian Franzmann <bwlf AT bandrate.org>
+ * CONFLICTS: add conflicts with other init-system spells
+ * PROVIDES: provide INIT and LOGIN-DAEMON
+
2019-02-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.41.1
spell created
diff --git a/smgl/openrc/PROVIDES b/smgl/openrc/PROVIDES
new file mode 100755
index 0000000..35a94f8
--- /dev/null
+++ b/smgl/openrc/PROVIDES
@@ -0,0 +1,2 @@
+INIT
+LOGIN-DAEMON
diff --git a/smgl/systemd/BUILD b/smgl/systemd/BUILD
index ea11514..bce3805 100755
--- a/smgl/systemd/BUILD
+++ b/smgl/systemd/BUILD
@@ -1,25 +1,54 @@
-if [[ "$SYSTEMD_GIT" == "y" ]]
-then
- ./autogen.sh --prefix=${INSTALL_ROOT}/ \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --infodir=${INSTALL_ROOT}/usr/share/info \
- --includedir=${INSTALL_ROOT}/usr/include \
- --localedir=${INSTALL_ROOT}/usr/share/locale \
- --with-rootdir=${INSTALL_ROOT}/ \
- --with-distro=other \
- $OPTS
-else
- ./configure --prefix=${INSTALL_ROOT}/ \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --infodir=${INSTALL_ROOT}/usr/share/info \
- --includedir=${INSTALL_ROOT}/usr/include \
- --localedir=${INSTALL_ROOT}/usr/share/locale \
- --with-distro=other \
- --with-rootdir=${INSTALL_ROOT}/ \
- $OPTS
-fi
-make
+OPTS+=" blkid=true" &&
+OPTS+=" default-dnssec=no" &&
+OPTS+=" firstboot=false" &&
+OPTS+=" install-tests=false" &&
+OPTS+=" ldconfig=false" &&
+OPTS+=" man=auto" &&
+OPTS+=" sysusers=false" &&
+OPTS+=" rpmmacrosdir=no" &&
+OPTS+=" b_lto=false" &&
+OPTS+=" homed=false" &&
+OPTS+=" userdb=false" &&
+OPTS+=" mode=release" &&
+OPTS+=" bpf-framework=false" &&
+OPTS+=" pamconfdir=${INSTALL_ROOT}/etc/pam.d" &&
+OPTS+=" docdir=${INSTALL_ROOT}/usr/share/doc/systemd-${VERSION}"
+
+OPTS+=" $SYSTEMD_BINFMT" &&
+OPTS+=" $SYSTEMD_ACL" &&
+OPTS+=" $SYSTEMD_HOSTNAMED" &&
+OPTS+=" $SYSTEMD_TIMEDATED" &&
+OPTS+=" $SYSTEMD_LOCALED" &&
+
+create_group audio &&
+create_group cdrom &&
+create_group dialout &&
+create_group disk &&
+create_group input &&
+create_group kmem &&
+create_group kvm &&
+create_group lp &&
+create_group render &&
+create_group tape &&
+create_group tty &&
+create_group video &&
+
+create_group systemd-journal &&
+create_account systemd-journal &&
+
+create_group systemd-network &&
+create_account systemd-network &&
+
+create_group systemd-resolve &&
+create_account systemd-resolve &&
+
+create_group systemd-coredump &&
+create_account systemd-coredump &&
+
+create_group systemd-oom &&
+create_account systemd-oom &&
+
+create_group systemd-timesync &&
+create_account systemd-timesync &&
+
+default_build
diff --git a/smgl/systemd/CONFIGURE b/smgl/systemd/CONFIGURE
index 751c3cb..211d3af 100755
--- a/smgl/systemd/CONFIGURE
+++ b/smgl/systemd/CONFIGURE
@@ -1,5 +1,7 @@
-config_query_option SYSTEMD_BINFMT "Enable binfmt tool?" y "--enable-binfmt"
"--disable-binfmt" &&
-config_query_option SYSTEMD_ACL "Enable ACL support?" y "--enable-acl"
"--disable-acl" &&
-config_query_option SYSTEMD_HOSTNAMED "Enable hostname daemon?" y
"--enable-hostnamed" "--disable-hostnamed" &&
-config_query_option SYSTEMD_TIMEDATED "Enable timedate daemon?" y
"--enable-timedated" "--disable-timedated" &&
-config_query_option SYSTEMD_LOCALED "Enable locale daemon?" y
"--enable-localed" "--disable-localed"
+. "${GRIMOIRE}"/MESON_CONFIGURE &&
+
+config_query_option SYSTEMD_BINFMT "Enable the binfmt tool?" y
"binfmt=true" "binfmt=false" &&
+config_query_option SYSTEMD_ACL "Enable ACL support?" y "acl=true"
"acl=false" &&
+config_query_option SYSTEMD_HOSTNAMED "Enable hostname daemon?" y
"hostnamed=true" "hostnamed=false" &&
+config_query_option SYSTEMD_TIMEDATED "Enable timedate daemon?" y
"timedated=true" "timedated=false" &&
+config_query_option SYSTEMD_LOCALED "Enable locale daemon?" y
"localed=true" "localed=false"
diff --git a/smgl/systemd/CONFLICTS b/smgl/systemd/CONFLICTS
index a3d06f2..da8a343 100755
--- a/smgl/systemd/CONFLICTS
+++ b/smgl/systemd/CONFLICTS
@@ -1,3 +1,4 @@
#conflicts simpleinit-msb &&
-conflicts initng &&
-conflicts upstart
+conflicts initng &&
+conflicts upstart &&
+conflicts eudev
diff --git a/smgl/systemd/DEPENDS b/smgl/systemd/DEPENDS
index 4c163a4..0ac3ff0 100755
--- a/smgl/systemd/DEPENDS
+++ b/smgl/systemd/DEPENDS
@@ -1,16 +1,43 @@
-runtime_depends util-linux &&
+. "${GRIMOIRE}"/MESON_DEPENDS &&

-depends DEVICE-MANAGER &&
-depends dbus &&
-depends intltool &&
-depends libcap &&
+depends util-linux &&

-optional_depends gtk+2 "--enable-gtk" "--disable-gtk" "Enable GTK tools" &&
-optional_depends linux-pam "--enable-pam" "--disable-pam" "Enable PAM
support" &&
-optional_depends cryptsetup "--enable-libcryptsetup"
"--disable-libcryptsetup" "Enable cryptsetup tools" &&
-optional_depends libselinux "--enable-selinux" "--disable-selinux" "Enable
SELINUX support" &&
-optional_depends audit "--enable-audit" "--disable-audit" "Enable audit
support" &&
+depends dbus &&
+depends intltool &&
+depends libcap &&
+depends python3 &&
+depends pkgconfig &&
+depends gperf &&
+depends gcc &&
+depends AWK &&
+depends sed &&
+depends grep &&
+depends tzdata &&
+depends jinja2 &&

-#the following don't have --configure options but are listed in the README
-optional_depends libnotify "" "" "Enable use of libnotify" &&
-optional_depends tcp_wrappers "--enable-tcpwrap" "--disable-tcpwrap" "Enable
use of tcpwrappers"
+
+optional_depends libseccomp "seccomp=true" "seccomp=false" "for seccomp
support" &&
+optional_depends kmod "kmod=true" "kmod=false" "support for
loadable modules" &&
+optional_depends linux-pam "pam=true" "pam=false" "for PAM support"
&&
+optional_depends cryptsetup "libcryptsetup=true" "libcryptsetup=false" "for
signed Verity images support" &&
+optional_depends audit "audit=true" "audit=false" "for libaudit
support" &&
+optional_depends acl "acl=true" "acl=false" "for libacl
support" &&
+optional_depends libselinux "selinux=true" "selinux=false" "for selinux
support" &&
+optional_depends LZMA "xz=true" "xz=false" "for
xz-compression support" &&
+optional_depends lz4 "lz4=true" "lz4=false" "for
lz4-compression support" &&
+optional_depends zstd "zstd=true" "zstd=false" "for
zstd-compression support" &&
+optional_depends libgcrypt "gcrypt=true" "gcrypt=false" "for gcrypt
support" &&
+optional_depends libqrencode "qrencode=true" "qrencode=false" "for qrencode
support" &&
+optional_depends libmicrohttpd "microhttpd=true" "microhttpd=false" "for
microhttpd support" &&
+optional_depends libidn "libidn=true" "libidn=false" "for libidn
support" &&
+optional_depends libidn2 "libidn2=true" "libidn2=false" "for libidn2
support" &&
+optional_depends elfutils "elfutils=true" "elfutils=false" "for elfutils
support" &&
+optional_depends policykit "polkit=true" "polkit=false" "for polkit
support" &&
+suggest_depends dracut "" "" "for dracut
support" &&
+suggest_depends lxml "" "" "for building
indices" &&
+optional_depends gnu-efi "gnu-efi=true" "gnu-efi=false" "support for
sd-boot" &&
+suggest_depends libxslt "" "" "to build
documentation" &&
+suggest_depends docbook-xsl "" "" "to build
documentation" &&
+optional_depends p11-kit "p11kit=true" "p11kit=false" "support for
p11-kit" &&
+optional_depends gnutls "gnutls=true" "gnutls=false" "support for
dns-over-tls" &&
+optional_depends openssl "openssl=true" "openssl=false" "support for
openssl"
diff --git a/smgl/systemd/DETAILS b/smgl/systemd/DETAILS
index a647ce0..164895e 100755
--- a/smgl/systemd/DETAILS
+++ b/smgl/systemd/DETAILS
@@ -1,18 +1,11 @@
+. "${GRIMOIRE}"/MESON_FUNCTIONS
+
SPELL=systemd
-if [[ $SYSTEMD_GIT == y ]]
-then
- VERSION=git
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_IGNORE=volatile
- SOURCE_URL[0]=git://anongit.freedesktop.org/systemd
- FORCE_DOWNLOAD=1
-else
- VERSION=37
- SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_HASH=sha512:c21a36860e4aa7fd7e97b53e033f436abb8237841dfe8bc20c95feb3e03a92b4270342f3102c518a80629f2a86750f6b0818c1df32cf43343368fc6ff524940f
-
SOURCE_URL[0]=http://www.freedesktop.org/software/${SPELL}/${SPELL}-${VERSION}.tar.bz2
-fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ VERSION=250.4
+ SOURCE=$SPELL-$VERSION.tar.gz
+
SOURCE_HASH=sha512:307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0
+
SOURCE_URL[0]=https://github.com/systemd/systemd-stable/archive/refs/tags/v${VERSION}.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-stable-$VERSION
WEB_SITE=http://www.freedesktop.org/wiki/Software/systemd
ENTERED=20110406
LICENSE[0]=GPL
diff --git a/smgl/systemd/FINAL b/smgl/systemd/FINAL
new file mode 100644
index 0000000..4bb47f4
--- /dev/null
+++ b/smgl/systemd/FINAL
@@ -0,0 +1,24 @@
+create_group audio
+create_group cdrom
+create_group dialout
+create_group disk
+create_group input
+create_group kmem
+create_group kvm
+create_group lp
+create_group render
+create_group tape
+create_group tty
+create_group video
+
+create_group systemd-journal
+create_account systemd-journal
+
+create_group systemd-network
+create_account systemd-network
+
+create_group systemd-resolve
+create_account systemd-resolve
+
+create_group systemd-coredump
+create_account systemd-coredump
diff --git a/smgl/systemd/HISTORY b/smgl/systemd/HISTORY
index 30272b4..17d1270 100644
--- a/smgl/systemd/HISTORY
+++ b/smgl/systemd/HISTORY
@@ -1,3 +1,11 @@
+2022-05-15 Florian Franzmann <bwlf AT bandrate.org>
+ * PRE_BUILD: remove PRE_BUILD that only reimplemented the default
+ * DETAILS, DEPENDS, BUILD, CONFIGURE: version 250.4
+ * BUILD, PREPARE, DETAILS, CONFIGURE: remove support for scm version
+ * FINAL: create users and groups
+ * PRE_BUILD, patches: add bugfixes from the blfs project
+ * UP_TRIGGERS: perform check_self on dbus instead of cast_self
+
2018-12-23 Pavel Vinogradov <public AT sourcemage.org>
* PROVIDES: added LOGIN-DAEMON

diff --git a/smgl/systemd/INSTALL b/smgl/systemd/INSTALL
index 0fd61f7..790ca6a 100755
--- a/smgl/systemd/INSTALL
+++ b/smgl/systemd/INSTALL
@@ -1,4 +1,9 @@
default_install &&
if ! [ -f ${INSTALL_ROOT}/etc/vconsole.conf ]; then
echo "FONT=default8x16" > ${INSTALL_ROOT}/etc/vconsole.conf
-fi
+fi &&
+
+ln -sfn ../modules "$INSTALL_ROOT/etc/modules-load.d/modules.conf" &&
+
+systemd-machine-id-setup --root="$INSTALL_ROOT" --print &&
+systemctl preset-all
diff --git a/smgl/systemd/PREPARE b/smgl/systemd/PREPARE
deleted file mode 100755
index 52ae65b..0000000
--- a/smgl/systemd/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query SYSTEMD_GIT "Use git version?" n
diff --git a/smgl/systemd/PRE_BUILD b/smgl/systemd/PRE_BUILD
index 92c592c..e1f3b1b 100755
--- a/smgl/systemd/PRE_BUILD
+++ b/smgl/systemd/PRE_BUILD
@@ -1,2 +1,8 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY}
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+
+# as per https://linuxfromscratch.org/blfs/view/systemd/general/systemd.html
+# remove two unneeded groups from udev rules:
+sed -i -e 's/GROUP="render"/GROUP="video"/' \
+ -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in
diff --git a/smgl/systemd/PROVIDES b/smgl/systemd/PROVIDES
index 35a94f8..116d411 100755
--- a/smgl/systemd/PROVIDES
+++ b/smgl/systemd/PROVIDES
@@ -1,2 +1,3 @@
INIT
LOGIN-DAEMON
+DEVICE-MANAGER
diff --git a/smgl/systemd/UP_TRIGGERS b/smgl/systemd/UP_TRIGGERS
index 332f4d0..a88e848 100755
--- a/smgl/systemd/UP_TRIGGERS
+++ b/smgl/systemd/UP_TRIGGERS
@@ -1,5 +1,4 @@
# only force a rebuild on these if it's a fresh install
if ! spell_ok systemd ; then
- up_trigger udev cast_self
- up_trigger dbus cast_self
+ up_trigger dbus check_self
fi
diff --git a/utils/dbus/DEPENDS b/utils/dbus/DEPENDS
index 0839473..d627f0c 100755
--- a/utils/dbus/DEPENDS
+++ b/utils/dbus/DEPENDS
@@ -11,6 +11,11 @@ if is_depends_enabled dbus libx11; then
depends libice
fi &&

+optional_depends systemd \
+ '--enable-systemd
--with-systemdsystemunitdi=$INSTALL_ROOT/etc/systemd/system
--with-systemduserunitdir=$INSTALL_ROOT/etc/systemd/user' \
+ '--disable-systemd' \
+ 'for systemd support' &&
+
optional_depends doxygen \
'--enable-doxygen-docs' \
'--disable-doxygen-docs' \
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index a104a10..e1054b0 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,10 @@
+2022-05-21 Florian Franzmann <bwlf AT bandrate.org>
+ * INSTALL, Xsession.d: install scripts from Debian for setting up the
+ user session
+
+2022-05-17 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS: add optional dependency on systemd
+
2022-03-01 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.14.0

diff --git a/utils/dbus/INSTALL b/utils/dbus/INSTALL
index c1015a6..cd83661 100755
--- a/utils/dbus/INSTALL
+++ b/utils/dbus/INSTALL
@@ -3,4 +3,8 @@ default_install &&
if is_depends_enabled $SPELL doxygen; then
mkdir -p "$INSTALL_ROOT/usr/share/doc/$SPELL" &&
cp -r "$SOURCE_DIRECTORY"/doc/api/* "$INSTALL_ROOT/usr/share/doc/$SPELL/"
-fi
+fi &&
+
+mkdir -p "$INSTALL_ROOT"/etc/X11/Xsession.d &&
+install -m644 -o root -g root "$SPELL_DIRECTORY"/Xsession.d/* \
+ "$INSTALL_ROOT"/etc/X11/Xsession.d/
diff --git a/utils/dbus/Xsession.d/20dbus_xdg-runtime
b/utils/dbus/Xsession.d/20dbus_xdg-runtime
new file mode 100644
index 0000000..c541727
--- /dev/null
+++ b/utils/dbus/Xsession.d/20dbus_xdg-runtime
@@ -0,0 +1,24 @@
+# vim:set ft=sh sw=2 sts=2 et:
+
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && [ -n "$XDG_RUNTIME_DIR" ] && \
+ [ "$XDG_RUNTIME_DIR" = "/run/user/`id -u`" ] && \
+ [ -S "$XDG_RUNTIME_DIR/bus" ]; then
+ # We are under systemd-logind or something remarkably similar, and
+ # a user-session socket has already been set up.
+ #
+ # Be nice to non-libdbus, non-sd-bus implementations by using
+ # that as the session bus address in the environment. The check for
+ # XDG_RUNTIME_DIR = "/run/user/`id -u`" is because we know that
+ # form of the address, from systemd-logind, doesn't need escaping,
+ # whereas arbitrary addresses might.
+ DBUS_SESSION_BUS_ADDRESS="unix:path=$XDG_RUNTIME_DIR/bus"
+ export DBUS_SESSION_BUS_ADDRESS
+fi
+
+if [ -x "/usr/bin/dbus-update-activation-environment" ]; then
+ # tell dbus-daemon --session (and systemd --user, if running)
+ # to put a minimal subset of the Xsession's environment in activated
+ # services' environments
+ dbus-update-activation-environment --verbose --systemd \
+ DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY
+fi
diff --git a/utils/dbus/Xsession.d/75dbus_dbus-launch
b/utils/dbus/Xsession.d/75dbus_dbus-launch
new file mode 100644
index 0000000..fcac6f4
--- /dev/null
+++ b/utils/dbus/Xsession.d/75dbus_dbus-launch
@@ -0,0 +1,22 @@
+# $Id:$
+# In order to activate the session bus at X session launch
+# simply place use-session-dbus into your /etc/X11/Xsession.options file
+#
+
+STARTDBUS=
+DBUSLAUNCH=/usr/bin/dbus-launch
+
+if has_option use-session-dbus; then
+ if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && [ -x "$DBUSLAUNCH" ]; then
+ STARTDBUS=yes
+ fi
+fi
+
+if [ -n "$STARTDBUS" ]; then
+ # Note that anything that is D-Bus-activated between here and
+ # 95dbus_update-activation-env will not have the complete environment
+ # set up by Xsession.d, unless the Xsession.d snippet that sets the
+ # environment variable also calls dbus-update-activation-environment.
+ # See <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815503>
+ eval $($DBUSLAUNCH --exit-with-session --sh-syntax)
+fi
diff --git a/utils/dbus/Xsession.d/95dbus_update-activation-env
b/utils/dbus/Xsession.d/95dbus_update-activation-env
new file mode 100644
index 0000000..1626e74
--- /dev/null
+++ b/utils/dbus/Xsession.d/95dbus_update-activation-env
@@ -0,0 +1,17 @@
+# vim:set ft=sh sw=2 sts=2 et:
+
+if [ -n "$DBUS_SESSION_BUS_ADDRESS" ] && \
+ [ -x "/usr/bin/dbus-update-activation-environment" ]; then
+ # subshell so we can unset environment variables
+ (
+ # unset login-session-specifics
+ unset XDG_SEAT
+ unset XDG_SESSION_ID
+ unset XDG_VTNR
+
+ # tell dbus-daemon --session (and systemd --user, if running)
+ # to put the Xsession's environment in activated services'
+ # environments
+ dbus-update-activation-environment --verbose --systemd --all
+ )
+fi
diff --git a/utils/psmisc/DETAILS b/utils/psmisc/DETAILS
index dfee168..75f50c0 100755
--- a/utils/psmisc/DETAILS
+++ b/utils/psmisc/DETAILS
@@ -1,6 +1,6 @@
SPELL=psmisc
- VERSION=23.3
-
SOURCE_HASH=sha512:791ffef78d87b092d653da98710b338017466a9e1e1935968b9f0194ccef8da941317aa0c39d821d46b20d95d6539ccf78e5ebb71ad1032ae62337a397180d58
+ VERSION=23.5
+
SOURCE_HASH=sha512:e908220350491a595ceaf96025a9aa14d832cacc8901545d0864152053fedaf9dc10f45fb2870aa2a00e4d9d8947243038357e14a82b04ab5d20c53e7f841a8d
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=https://sourceforge.net/projects/psmisc/files/psmisc/$SOURCE/download
diff --git a/utils/psmisc/HISTORY b/utils/psmisc/HISTORY
index ad05611d..9d9b03f 100644
--- a/utils/psmisc/HISTORY
+++ b/utils/psmisc/HISTORY
@@ -1,3 +1,6 @@
+2022-05-20 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 23.5
+
2019-12-16 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 23.3

diff --git a/utils/smartmontools/DETAILS b/utils/smartmontools/DETAILS
index c7109c6..a1fadae 100755
--- a/utils/smartmontools/DETAILS
+++ b/utils/smartmontools/DETAILS
@@ -1,5 +1,5 @@
SPELL=smartmontools
- VERSION=7.2
+ VERSION=7.3
SOURCE=${SPELL}-${VERSION}.tar.gz
# SOURCE_GPG="gurus.gpg:${SOURCE}.asc:WORKS_FOR_ME"

SOURCE_URL[0]=https://downloads.sourceforge.net/sourceforge/smartmontools/${SOURCE}
diff --git a/utils/smartmontools/HISTORY b/utils/smartmontools/HISTORY
index 1762826..8f86167 100644
--- a/utils/smartmontools/HISTORY
+++ b/utils/smartmontools/HISTORY
@@ -1,3 +1,7 @@
+2022-05-19 Florian Franzmann <bwlf AT bandrate.org>
+ * DETAILS: version 7.3
+ * smartmontools.gpg: add 0A30812EFF3AEFF5
+
2021-03-27 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 7.2

diff --git a/utils/smartmontools/smartmontools.gpg
b/utils/smartmontools/smartmontools.gpg
index 0b0ce44..4954456 100644
Binary files a/utils/smartmontools/smartmontools.gpg and
b/utils/smartmontools/smartmontools.gpg differ
diff --git a/x11/lightdm/BUILD b/x11/lightdm/BUILD
index d3fcd72..1343cad 100755
--- a/x11/lightdm/BUILD
+++ b/x11/lightdm/BUILD
@@ -1,16 +1,15 @@
create_account lightdm &&
+
OPTS+=" --disable-dependency-tracking" &&
OPTS+=" --disable-static" &&
OPTS+=" --disable-tests" &&
OPTS+=" --with-user-session=lightdm-xsession" &&
OPTS+=" --with-greeter-user=lightdm" &&
OPTS+=" --with-html-dir=${INSTALL_ROOT}/usr/share/doc/${SPELL}/html" &&
-if is_depends_enabled $SPELL qt4;then
- export PKG_CONFIG_PATH="$QT4DIR/lib/pkgconfig"
- export PATH+=":$QT4DIR/bin"
-fi &&
+
if is_depends_enabled $SPELL qtbase;then
export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
export PATH+=":$QT5DIR/bin"
fi &&
+
default_build
diff --git a/x11/lightdm/DEPENDS b/x11/lightdm/DEPENDS
index c0ee2c5..6aafae3 100755
--- a/x11/lightdm/DEPENDS
+++ b/x11/lightdm/DEPENDS
@@ -1,12 +1,17 @@
+depends gcc &&
+depends pkgconfig &&
depends glib2 &&
depends libgcrypt &&
depends linux-pam &&
depends libxklavier &&
depends libxml2 &&
+depends libxdmcp &&
depends itstool &&
+depends intltool &&
#depends libx11 &&
depends libxcb &&
depends perl &&
+depends yelp-tools &&

optional_depends audit \
'--enable-audit' \
@@ -25,16 +30,16 @@ optional_depends qtbase \
if is_depends_enabled $SPELL qtbase; then
depends -sub CXX gcc
fi &&
-optional_depends qt4 \
- '--enable-liblightdm-qt' \
- '--disable-liblightdm-qt' \
- 'enable LightDM client QT4 libraries' &&
-if is_depends_enabled $SPELL qt4; then
- depends -sub CXX gcc
-fi &&
+
optional_depends gtk-doc '--enable-gtk-doc' '--disable-gtk-doc' \
'to build documentation' &&
+
optional_depends gobject-introspection \
'--enable-introspection=yes' \
'--enable-introspection=no' \
- 'for introspection support'
+ 'for introspection support' &&
+
+optional_depends vala \
+ '--enable-vala=yes' \
+ '--enable-vala=no' \
+ 'for vala bindings'
diff --git a/x11/lightdm/HISTORY b/x11/lightdm/HISTORY
index 38e3105..546c2eb 100644
--- a/x11/lightdm/HISTORY
+++ b/x11/lightdm/HISTORY
@@ -1,3 +1,7 @@
+2022-05-22 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS, BUILD: remove optional dependency on qt4
+ * DEPENDS: add missing dependencies
+
2019-06-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.30.0
* BUILD: fix build
diff --git a/x11/xcb/DEPENDS b/x11/xcb/DEPENDS
index 28c71f64..7de5418 100755
--- a/x11/xcb/DEPENDS
+++ b/x11/xcb/DEPENDS
@@ -1 +1,2 @@
+depends imake &&
depends xorg-libs
diff --git a/x11/xcb/HISTORY b/x11/xcb/HISTORY
index 18d83cd..a96a90b 100644
--- a/x11/xcb/HISTORY
+++ b/x11/xcb/HISTORY
@@ -1,3 +1,6 @@
+2022-05-21 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS: add dependency on imake
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs

diff --git a/xorg-app/xdm/0001-Use-dbus-launcher-to-start-xsession.patch
b/xorg-app/xdm/0001-Use-dbus-launcher-to-start-xsession.patch
new file mode 100644
index 0000000..74b2ea7
--- /dev/null
+++ b/xorg-app/xdm/0001-Use-dbus-launcher-to-start-xsession.patch
@@ -0,0 +1,37 @@
+From db7616d6daa62a2299b09200bd3d0cba97d8db9d Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Mon, 23 May 2022 17:28:41 +0200
+Subject: [PATCH] Use dbus-launcher to start xsession
+
+---
+ config/Xsession.in | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/config/Xsession.in b/config/Xsession.in
+index c1d7d11..3868a91 100644
+--- a/config/Xsession.in
++++ b/config/Xsession.in
+@@ -57,16 +57,17 @@ fi
+
+ startup=$HOME/.xsession
+ resources=$HOME/.Xresources
++dbus_launch=/usr/bin/dbus-launch
+
+ if [ -s "$startup" ]; then
+ if [ -x "$startup" ]; then
+- exec "$startup"
++ exec "$dbus_launch" --exit-with-session "$startup"
+ else
+- exec /bin/sh "$startup"
++ exec "$dbus_launch" --exit-with-session /bin/sh "$startup"
+ fi
+ else
+ if [ -r "$resources" ]; then
+ BINDIR/xrdb -load "$resources"
+ fi
+- exec BINDIR/xsm
++ exec "$dbus_launch" --exit-with-session BINDIR/xsm
+ fi
+--
+2.36.1
+
diff --git
a/xorg-app/xdm/0001-use-X-s-default-authentication-mechanism-instead-of-.patch

b/xorg-app/xdm/0001-use-X-s-default-authentication-mechanism-instead-of-.patch
deleted file mode 100644
index 17d2d24..0000000
---
a/xorg-app/xdm/0001-use-X-s-default-authentication-mechanism-instead-of-.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f8e1ba94509391955b0bffffb11f2ec3bed55bf1 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Fri, 15 Mar 2013 20:34:51 +0100
-Subject: [PATCH] use X's default authentication mechanism instead of xdm's
- specific one
-
----
- config/xdm-config.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/config/xdm-config.cpp b/config/xdm-config.cpp
-index a685129..5203cce 100644
---- a/config/xdm-config.in
-+++ b/config/xdm-config.in
-@@ -37,3 +37,4 @@ DisplayManager*loginmoveInterval: 10
- ! SECURITY: do not listen for XDMCP or Chooser requests
- ! Comment out this line if you want to manage X terminals with xdm
- DisplayManager.requestPort: 0
-+DisplayManager*authName: MIT-MAGIC-COOKIE-1
---
-1.8.1.3
-
diff --git a/xorg-app/xdm/BUILD b/xorg-app/xdm/BUILD
index 1bda793..4d9e137 100755
--- a/xorg-app/xdm/BUILD
+++ b/xorg-app/xdm/BUILD
@@ -1,3 +1,5 @@
OPTS="$XDM_OPTS $OPTS --with-xdmconfigdir=\"$INSTALL_ROOT/etc/X11/xdm\"" &&
+OPTS+=" --disable-xdm-auth" &&
+OPTS+=" --disable-static" &&

default_build
diff --git a/xorg-app/xdm/DEPENDS b/xorg-app/xdm/DEPENDS
index 52d9e1e..8c4bf03 100755
--- a/xorg-app/xdm/DEPENDS
+++ b/xorg-app/xdm/DEPENDS
@@ -45,4 +45,14 @@ optional_depends libselinux \
suggest_depends xrdb \
"" \
"" \
- "for a customizable login window"
+ "for a customizable login window" &&
+
+suggest_depends gsettings-desktop-schemas \
+ "" \
+ "" \
+ "for gsettings support" &&
+
+suggest_depends dbus \
+ "" \
+ "" \
+ "for dbus support"
diff --git a/xorg-app/xdm/HISTORY b/xorg-app/xdm/HISTORY
index acbfeaf..1b74b8c 100644
--- a/xorg-app/xdm/HISTORY
+++ b/xorg-app/xdm/HISTORY
@@ -1,3 +1,17 @@
+2022-05-22 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS, PRE_BUILD, 0001-Use-dbus-launcher-to-start-xsession.patch:
+ launch dbus session if dbus is installed
+
+2022-05-21 Florian Franzmann <bwlf AT bandrate.org>
+ * 0001-use-X-s-default-authentication-mechanism-instead-of-.patch,
+ BUILD: disable xdm's authentication with config option instead of
+ patch
+ * pam.d/xdm: add pam config
+ * patches/0001-Source-Xsession.d-files.patch, PRE_BUILD: Source files
+ in /etc/X11/Xsession.d at session start
+ * DEPENDS: add suggested dependency on gsettings-desktop-schemas
+
+
2022-04-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.13

diff --git a/xorg-app/xdm/PRE_BUILD b/xorg-app/xdm/PRE_BUILD
index 2680a14..8208dd2 100755
--- a/xorg-app/xdm/PRE_BUILD
+++ b/xorg-app/xdm/PRE_BUILD
@@ -1,8 +1,12 @@
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&

-patch -p1 <
"${SPELL_DIRECTORY}/0001-use-X-s-default-authentication-mechanism-instead-of-.patch"
&&
-
if [[ $XDM_XCONSOLE == "n" ]]; then
patch -p1 < "$SPELL_DIRECTORY/0001-do-not-start-xconsole.patch"
+fi &&
+
+apply_patch_dir patches &&
+
+if is_depends_enabled $SPELL dbus; then
+ patch -p1 <
"$SPELL_DIRECTORY"/0001-Use-dbus-launcher-to-start-xsession.patch
fi
diff --git a/xorg-app/xdm/pam.d/xdm b/xorg-app/xdm/pam.d/xdm
new file mode 100644
index 0000000..cd17cf2
--- /dev/null
+++ b/xorg-app/xdm/pam.d/xdm
@@ -0,0 +1,23 @@
+#%PAM-1.0
+
+# Block login if they are disabled
+auth required pam_nologin.so
+
+# Load environment from /etc/environment and ~/.pam_environment
+auth required pam_env.so
+
+# Use /etc/passwd and /etc/shadow for passwords
+auth required pam_unix.so
+
+# Check account is active, change password if required
+account required pam_unix.so
+
+# Allow password to be changed
+password required pam_unix.so
+
+# integrate with systemd-logind
+session optional pam_systemd.so
+
+# Setup session
+session required pam_unix.so
+session required pam_limits.so
diff --git a/xorg-app/xdm/patches/0001-Source-Xsession.d-files.patch
b/xorg-app/xdm/patches/0001-Source-Xsession.d-files.patch
new file mode 100644
index 0000000..1509aec
--- /dev/null
+++ b/xorg-app/xdm/patches/0001-Source-Xsession.d-files.patch
@@ -0,0 +1,29 @@
+From a52db48fbf45620de1b18a937f387528f6abd44b Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sun, 22 May 2022 17:29:35 +0200
+Subject: [PATCH] Source Xsession.d files
+
+---
+ config/Xsession.in | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/config/Xsession.in b/config/Xsession.in
+index 42a8b7d..c1d7d11 100644
+--- a/config/Xsession.in
++++ b/config/Xsession.in
+@@ -49,6 +49,12 @@ esac
+
+ XCOMM The startup script is not intended to have arguments.
+
++if [ -d /etc/X11/Xsession.d ]; then
++ for i in /etc/X11/Xsession.d/*; do
++ . "$i"
++ done
++fi
++
+ startup=$HOME/.xsession
+ resources=$HOME/.Xresources
+
+--
+2.36.0
+
diff --git a/xorg/xserver/BUILD b/xorg/xserver/BUILD
index 055b272..948f7bc 100755
--- a/xorg/xserver/BUILD
+++ b/xorg/xserver/BUILD
@@ -1,4 +1,5 @@
#message CFLAGS=$CFLAGS
+CFLAGS+=" -Wno-error=array-bounds" &&
OPTS+=" xorg=$XSERVER_XORG \
xnest=$XSERVER_XNEST \
xvfb=$XSERVER_XVFB \
diff --git a/xorg/xserver/HISTORY b/xorg/xserver/HISTORY
index b1fcfc9..4a65a6c 100644
--- a/xorg/xserver/HISTORY
+++ b/xorg/xserver/HISTORY
@@ -1,3 +1,6 @@
+2022-05-20 Florian Franzmann <bwlf AT bandrate.org>
+ * BUILD: add -Wno-error=array-bounds to CFLAGS to avoid build error
+
2022-03-17 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: switched to MESON_DEPENDS




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (9c5a9926258e4fe1920e6a3d48343d7d95396c50), Florian Franzmann, 05/23/2022

Archive powered by MHonArc 2.6.24.

Top of Page