smgl/systemd: version 250.4

12 files changed, 156 insertions, 63 deletions

diff --git a/smgl/systemd/BUILD b/smgl/systemd/BUILD
index ea11514733..bce3805f25 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 751c3cb23d..211d3af537 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 a3d06f201e..da8a343892 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 4c163a4753..0ac3ff01aa 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 a647ce0df1..164895eee9 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 0000000000..4bb47f4894
--- /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 05b5f8ebdf..17d12701ce 100644
--- a/smgl/systemd/HISTORY
+++ b/smgl/systemd/HISTORY
@@ -1,5 +1,10 @@
 2022-05-15  Florian Franzmann  <bwlf@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@sourcemage.org>
 	* PROVIDES: added LOGIN-DAEMON
diff --git a/smgl/systemd/INSTALL b/smgl/systemd/INSTALL
index 0fd61f7fcc..790ca6a56a 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 52ae65bb0d..0000000000
--- 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
new file mode 100755
index 0000000000..e1f3b1bf64
--- /dev/null
+++ b/smgl/systemd/PRE_BUILD
@@ -0,0 +1,8 @@
+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 35a94f872d..116d411a90 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 332f4d07e6..a88e848b3a 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