Date: Thursday, July 8, 2021 @ 13:00:23 Author: eworm Revision: 419079
archrelease: copy trunk to testing-x86_64 Added: systemd/repos/testing-x86_64/0001-Use-Arch-Linux-device-access-groups.patch (from rev 419078, systemd/trunk/0001-Use-Arch-Linux-device-access-groups.patch) systemd/repos/testing-x86_64/0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch (from rev 419078, systemd/trunk/0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch) systemd/repos/testing-x86_64/20-systemd-sysusers.hook (from rev 419078, systemd/trunk/20-systemd-sysusers.hook) systemd/repos/testing-x86_64/30-systemd-binfmt.hook (from rev 419078, systemd/trunk/30-systemd-binfmt.hook) systemd/repos/testing-x86_64/30-systemd-catalog.hook (from rev 419078, systemd/trunk/30-systemd-catalog.hook) systemd/repos/testing-x86_64/30-systemd-daemon-reload.hook (from rev 419078, systemd/trunk/30-systemd-daemon-reload.hook) systemd/repos/testing-x86_64/30-systemd-hwdb.hook (from rev 419078, systemd/trunk/30-systemd-hwdb.hook) systemd/repos/testing-x86_64/30-systemd-sysctl.hook (from rev 419078, systemd/trunk/30-systemd-sysctl.hook) systemd/repos/testing-x86_64/30-systemd-tmpfiles.hook (from rev 419078, systemd/trunk/30-systemd-tmpfiles.hook) systemd/repos/testing-x86_64/30-systemd-udev-reload.hook (from rev 419078, systemd/trunk/30-systemd-udev-reload.hook) systemd/repos/testing-x86_64/30-systemd-update.hook (from rev 419078, systemd/trunk/30-systemd-update.hook) systemd/repos/testing-x86_64/PKGBUILD (from rev 419078, systemd/trunk/PKGBUILD) systemd/repos/testing-x86_64/arch.conf (from rev 419078, systemd/trunk/arch.conf) systemd/repos/testing-x86_64/initcpio-hook-udev (from rev 419078, systemd/trunk/initcpio-hook-udev) systemd/repos/testing-x86_64/initcpio-install-systemd (from rev 419078, systemd/trunk/initcpio-install-systemd) systemd/repos/testing-x86_64/initcpio-install-udev (from rev 419078, systemd/trunk/initcpio-install-udev) systemd/repos/testing-x86_64/loader.conf (from rev 419078, systemd/trunk/loader.conf) systemd/repos/testing-x86_64/splash-arch.bmp (from rev 419078, systemd/trunk/splash-arch.bmp) systemd/repos/testing-x86_64/systemd-hook (from rev 419078, systemd/trunk/systemd-hook) systemd/repos/testing-x86_64/systemd-user.pam (from rev 419078, systemd/trunk/systemd-user.pam) systemd/repos/testing-x86_64/systemd.install (from rev 419078, systemd/trunk/systemd.install) Deleted: systemd/repos/testing-x86_64/0001-Use-Arch-Linux-device-access-groups.patch systemd/repos/testing-x86_64/0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch systemd/repos/testing-x86_64/20-systemd-sysusers.hook systemd/repos/testing-x86_64/30-systemd-binfmt.hook systemd/repos/testing-x86_64/30-systemd-catalog.hook systemd/repos/testing-x86_64/30-systemd-daemon-reload.hook systemd/repos/testing-x86_64/30-systemd-hwdb.hook systemd/repos/testing-x86_64/30-systemd-sysctl.hook systemd/repos/testing-x86_64/30-systemd-tmpfiles.hook systemd/repos/testing-x86_64/30-systemd-udev-reload.hook systemd/repos/testing-x86_64/30-systemd-update.hook systemd/repos/testing-x86_64/PKGBUILD systemd/repos/testing-x86_64/arch.conf systemd/repos/testing-x86_64/initcpio-hook-udev systemd/repos/testing-x86_64/initcpio-install-systemd systemd/repos/testing-x86_64/initcpio-install-udev systemd/repos/testing-x86_64/loader.conf systemd/repos/testing-x86_64/splash-arch.bmp systemd/repos/testing-x86_64/systemd-hook systemd/repos/testing-x86_64/systemd-user.pam systemd/repos/testing-x86_64/systemd.install --------------------------------------------------------------------------------------------------------+ 0001-Use-Arch-Linux-device-access-groups.patch | 286 ++-- 0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch | 156 +- 20-systemd-sysusers.hook | 20 30-systemd-binfmt.hook | 20 30-systemd-catalog.hook | 22 30-systemd-daemon-reload.hook | 22 30-systemd-hwdb.hook | 22 30-systemd-sysctl.hook | 20 30-systemd-tmpfiles.hook | 20 30-systemd-udev-reload.hook | 22 30-systemd-update.hook | 22 PKGBUILD | 576 +++++----- arch.conf | 14 initcpio-hook-udev | 44 initcpio-install-systemd | 384 +++--- initcpio-install-udev | 58 - loader.conf | 2 systemd-hook | 92 - systemd-user.pam | 10 systemd.install | 122 +- 20 files changed, 971 insertions(+), 963 deletions(-) Deleted: 0001-Use-Arch-Linux-device-access-groups.patch =================================================================== --- 0001-Use-Arch-Linux-device-access-groups.patch 2021-07-08 13:00:12 UTC (rev 419078) +++ 0001-Use-Arch-Linux-device-access-groups.patch 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,143 +0,0 @@ -From f7d07e298c819a81eab965efbdbf53a2ce67fc0e Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> -Date: Tue, 6 Mar 2018 23:39:47 +0100 -Subject: [PATCH] Use Arch Linux' device access groups -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - - cdrom → optical - dialout → uucp - tape → storage ---- - meson.build | 6 +++--- - meson_options.txt | 12 ++++++------ - rules.d/50-udev-default.rules.in | 14 +++++++------- - sysusers.d/basic.conf.in | 6 +++--- - 4 files changed, 19 insertions(+), 19 deletions(-) - -diff --git a/meson.build b/meson.build -index 32e5413a62..f781e06fed 100644 ---- a/meson.build -+++ b/meson.build -@@ -796,19 +796,19 @@ conf.set_quoted('NOBODY_GROUP_NAME', nobody_group) - static_ugids = [] - foreach option : ['adm-gid', - 'audio-gid', -- 'cdrom-gid', -- 'dialout-gid', - 'disk-gid', - 'input-gid', - 'kmem-gid', - 'kvm-gid', - 'lp-gid', -+ 'optical-gid', - 'render-gid', - 'sgx-gid', -- 'tape-gid', -+ 'storage-gid', - 'tty-gid', - 'users-gid', - 'utmp-gid', -+ 'uucp-gid', - 'video-gid', - 'wheel-gid', - 'systemd-journal-gid', -diff --git a/meson_options.txt b/meson_options.txt -index 5048de755d..676e5e2e0d 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -235,10 +235,6 @@ option('adm-gid', type : 'integer', value : '-1', - description : 'soft-static allocation for the "adm" group') - option('audio-gid', type : 'integer', value : '-1', - description : 'soft-static allocation for the "audio" group') --option('cdrom-gid', type : 'integer', value : '-1', -- description : 'soft-static allocation for the "cdrom" group') --option('dialout-gid', type : 'integer', value : '-1', -- description : 'soft-static allocation for the "dialout" group') - option('disk-gid', type : 'integer', value : '-1', - description : 'soft-static allocation for the "disk" group') - option('input-gid', type : 'integer', value : '-1', -@@ -249,18 +245,22 @@ option('kvm-gid', type : 'integer', value : '-1', - description : 'soft-static allocation for the "kvm" group') - option('lp-gid', type : 'integer', value : '-1', - description : 'soft-static allocation for the "lp" group') -+option('optical-gid', type : 'integer', value : '-1', -+ description : 'soft-static allocation for the "optical" group') - option('render-gid', type : 'integer', value : '-1', - description : 'soft-static allocation for the "render" group') - option('sgx-gid', type : 'integer', value : '-1', - description : 'soft-static allocation for the "sgx" group') --option('tape-gid', type : 'integer', value : '-1', -- description : 'soft-static allocation for the "tape" group') -+option('storage-gid', type : 'integer', value : '-1', -+ description : 'soft-static allocation for the "storage" group') - option('tty-gid', type : 'integer', value : 5, - description : 'the numeric GID of the "tty" group') - option('users-gid', type : 'integer', value : '-1', - description : 'soft-static allocation for the "users" group') - option('utmp-gid', type : 'integer', value : '-1', - description : 'soft-static allocation for the "utmp" group') -+option('uucp-gid', type : 'integer', value : '-1', -+ description : 'soft-static allocation for the "uucp" group') - option('video-gid', type : 'integer', value : '-1', - description : 'soft-static allocation for the "video" group') - option('wheel-gid', type : 'integer', value : '-1', -diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in -index 18a3cf46bf..f3c440fd89 100644 ---- a/rules.d/50-udev-default.rules.in -+++ b/rules.d/50-udev-default.rules.in -@@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620" - SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620" - SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620" - SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" --KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" -+KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp" - - SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" - -@@ -67,13 +67,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp" - SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp" - - SUBSYSTEM=="block", GROUP="disk" --SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="cdrom" --SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom" --KERNEL=="sch[0-9]*", GROUP="cdrom" --KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" --KERNEL=="pktcdvd", GROUP="cdrom" -+SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="optical" -+SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical" -+KERNEL=="sch[0-9]*", GROUP="optical" -+KERNEL=="pktcdvd[0-9]*", GROUP="optical" -+KERNEL=="pktcdvd", GROUP="optical" - --SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape" -+SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage" - SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk" - KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk" - KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control" -diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in -index 8cc1a7cad2..21bb6d8948 100644 ---- a/sysusers.d/basic.conf.in -+++ b/sysusers.d/basic.conf.in -@@ -22,17 +22,17 @@ g utmp {{UTMP_GID }} - - - - # Physical and virtual hardware access groups - g audio {{AUDIO_GID }} - - --g cdrom {{CDROM_GID }} - - --g dialout {{DIALOUT_GID}} - - - g disk {{DISK_GID }} - - - g input {{INPUT_GID }} - - - g kmem {{KMEM_GID }} - - - g kvm {{KVM_GID }} - - - g lp {{LP_GID }} - - -+g optical {{OPTICAL_GID}} - - - g render {{RENDER_GID }} - - - g sgx {{SGX_GID }} - - --g tape {{TAPE_GID }} - - -+g storage {{STORAGE_GID}} - - - g tty {{TTY_GID }} - - -+g uucp {{UUCP_GID }} - - - g video {{VIDEO_GID }} - - - - # Default group for normal users Copied: systemd/repos/testing-x86_64/0001-Use-Arch-Linux-device-access-groups.patch (from rev 419078, systemd/trunk/0001-Use-Arch-Linux-device-access-groups.patch) =================================================================== --- 0001-Use-Arch-Linux-device-access-groups.patch (rev 0) +++ 0001-Use-Arch-Linux-device-access-groups.patch 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,143 @@ +From f7d07e298c819a81eab965efbdbf53a2ce67fc0e Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Tue, 6 Mar 2018 23:39:47 +0100 +Subject: [PATCH] Use Arch Linux' device access groups +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + + cdrom → optical + dialout → uucp + tape → storage +--- + meson.build | 6 +++--- + meson_options.txt | 12 ++++++------ + rules.d/50-udev-default.rules.in | 14 +++++++------- + sysusers.d/basic.conf.in | 6 +++--- + 4 files changed, 19 insertions(+), 19 deletions(-) + +diff --git a/meson.build b/meson.build +index 32e5413a62..f781e06fed 100644 +--- a/meson.build ++++ b/meson.build +@@ -796,19 +796,19 @@ conf.set_quoted('NOBODY_GROUP_NAME', nobody_group) + static_ugids = [] + foreach option : ['adm-gid', + 'audio-gid', +- 'cdrom-gid', +- 'dialout-gid', + 'disk-gid', + 'input-gid', + 'kmem-gid', + 'kvm-gid', + 'lp-gid', ++ 'optical-gid', + 'render-gid', + 'sgx-gid', +- 'tape-gid', ++ 'storage-gid', + 'tty-gid', + 'users-gid', + 'utmp-gid', ++ 'uucp-gid', + 'video-gid', + 'wheel-gid', + 'systemd-journal-gid', +diff --git a/meson_options.txt b/meson_options.txt +index 5048de755d..676e5e2e0d 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -235,10 +235,6 @@ option('adm-gid', type : 'integer', value : '-1', + description : 'soft-static allocation for the "adm" group') + option('audio-gid', type : 'integer', value : '-1', + description : 'soft-static allocation for the "audio" group') +-option('cdrom-gid', type : 'integer', value : '-1', +- description : 'soft-static allocation for the "cdrom" group') +-option('dialout-gid', type : 'integer', value : '-1', +- description : 'soft-static allocation for the "dialout" group') + option('disk-gid', type : 'integer', value : '-1', + description : 'soft-static allocation for the "disk" group') + option('input-gid', type : 'integer', value : '-1', +@@ -249,18 +245,22 @@ option('kvm-gid', type : 'integer', value : '-1', + description : 'soft-static allocation for the "kvm" group') + option('lp-gid', type : 'integer', value : '-1', + description : 'soft-static allocation for the "lp" group') ++option('optical-gid', type : 'integer', value : '-1', ++ description : 'soft-static allocation for the "optical" group') + option('render-gid', type : 'integer', value : '-1', + description : 'soft-static allocation for the "render" group') + option('sgx-gid', type : 'integer', value : '-1', + description : 'soft-static allocation for the "sgx" group') +-option('tape-gid', type : 'integer', value : '-1', +- description : 'soft-static allocation for the "tape" group') ++option('storage-gid', type : 'integer', value : '-1', ++ description : 'soft-static allocation for the "storage" group') + option('tty-gid', type : 'integer', value : 5, + description : 'the numeric GID of the "tty" group') + option('users-gid', type : 'integer', value : '-1', + description : 'soft-static allocation for the "users" group') + option('utmp-gid', type : 'integer', value : '-1', + description : 'soft-static allocation for the "utmp" group') ++option('uucp-gid', type : 'integer', value : '-1', ++ description : 'soft-static allocation for the "uucp" group') + option('video-gid', type : 'integer', value : '-1', + description : 'soft-static allocation for the "video" group') + option('wheel-gid', type : 'integer', value : '-1', +diff --git a/rules.d/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in +index 18a3cf46bf..f3c440fd89 100644 +--- a/rules.d/50-udev-default.rules.in ++++ b/rules.d/50-udev-default.rules.in +@@ -22,7 +22,7 @@ SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620" + SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620" + SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620" + SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" +-KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" ++KERNEL=="tty[A-Z]*[0-9]|ttymxc[0-9]*|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="uucp" + + SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" + +@@ -67,13 +67,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp" + SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:0701??:*", GROUP="lp" + + SUBSYSTEM=="block", GROUP="disk" +-SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="cdrom" +-SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom" +-KERNEL=="sch[0-9]*", GROUP="cdrom" +-KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" +-KERNEL=="pktcdvd", GROUP="cdrom" ++SUBSYSTEM=="block", KERNEL=="sr[0-9]*", GROUP="optical" ++SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical" ++KERNEL=="sch[0-9]*", GROUP="optical" ++KERNEL=="pktcdvd[0-9]*", GROUP="optical" ++KERNEL=="pktcdvd", GROUP="optical" + +-SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape" ++SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage" + SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk" + KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk" + KERNEL=="loop-control", GROUP="disk", OPTIONS+="static_node=loop-control" +diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in +index 8cc1a7cad2..21bb6d8948 100644 +--- a/sysusers.d/basic.conf.in ++++ b/sysusers.d/basic.conf.in +@@ -22,17 +22,17 @@ g utmp {{UTMP_GID }} - - + + # Physical and virtual hardware access groups + g audio {{AUDIO_GID }} - - +-g cdrom {{CDROM_GID }} - - +-g dialout {{DIALOUT_GID}} - - + g disk {{DISK_GID }} - - + g input {{INPUT_GID }} - - + g kmem {{KMEM_GID }} - - + g kvm {{KVM_GID }} - - + g lp {{LP_GID }} - - ++g optical {{OPTICAL_GID}} - - + g render {{RENDER_GID }} - - + g sgx {{SGX_GID }} - - +-g tape {{TAPE_GID }} - - ++g storage {{STORAGE_GID}} - - + g tty {{TTY_GID }} - - ++g uucp {{UUCP_GID }} - - + g video {{VIDEO_GID }} - - + + # Default group for normal users Deleted: 0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch =================================================================== --- 0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch 2021-07-08 13:00:12 UTC (rev 419078) +++ 0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,78 +0,0 @@ -From 9021729667e019defea0d4c1bdf563d629d7d837 Mon Sep 17 00:00:00 2001 -From: Ernesto Castellotti <m...@ernestocastellotti.it> -Date: Sat, 10 Apr 2021 18:59:14 +0200 -Subject: [PATCH] PARTIAL REVERT commit tree-wide: replace strverscmp() and - str_verscmp() with strverscmp_improved - -This is a workaround for the issue https://github.com/systemd/systemd/issues/19191 ---- - src/boot/efi/boot.c | 49 ++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 48 insertions(+), 1 deletion(-) - -diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c -index 35248db009bf..75c7e2c61d19 100644 ---- a/src/boot/efi/boot.c -+++ b/src/boot/efi/boot.c -@@ -914,6 +914,53 @@ static VOID config_entry_free(ConfigEntry *entry) { - FreePool(entry); - } - -+static BOOLEAN is_digit(CHAR16 c) { -+ return (c >= '0') && (c <= '9'); -+} -+static UINTN c_order(CHAR16 c) { -+ if (c == '\0') -+ return 0; -+ if (is_digit(c)) -+ return 0; -+ else if ((c >= 'a') && (c <= 'z')) -+ return c; -+ else -+ return c + 0x10000; -+} -+static INTN str_verscmp(CHAR16 *s1, CHAR16 *s2) { -+ CHAR16 *os1 = s1; -+ CHAR16 *os2 = s2; -+ while (*s1 || *s2) { -+ INTN first; -+ while ((*s1 && !is_digit(*s1)) || (*s2 && !is_digit(*s2))) { -+ INTN order; -+ order = c_order(*s1) - c_order(*s2); -+ if (order != 0) -+ return order; -+ s1++; -+ s2++; -+ } -+ while (*s1 == '0') -+ s1++; -+ while (*s2 == '0') -+ s2++; -+ first = 0; -+ while (is_digit(*s1) && is_digit(*s2)) { -+ if (first == 0) -+ first = *s1 - *s2; -+ s1++; -+ s2++; -+ } -+ if (is_digit(*s1)) -+ return 1; -+ if (is_digit(*s2)) -+ return -1; -+ if (first != 0) -+ return first; -+ } -+ return StrCmp(os1, os2); -+} -+ - static CHAR8 *line_get_key_value( - CHAR8 *content, - CHAR8 *sep, -@@ -1478,7 +1525,7 @@ static INTN config_entry_compare(ConfigEntry *a, ConfigEntry *b) { - if (a->tries_left == 0 && b->tries_left != 0) - return -1; - -- r = strverscmp_improved(a->id, b->id); -+ r = str_verscmp(a->id, b->id); - if (r != 0) - return r; - Copied: systemd/repos/testing-x86_64/0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch (from rev 419078, systemd/trunk/0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch) =================================================================== --- 0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch (rev 0) +++ 0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,78 @@ +From 9021729667e019defea0d4c1bdf563d629d7d837 Mon Sep 17 00:00:00 2001 +From: Ernesto Castellotti <m...@ernestocastellotti.it> +Date: Sat, 10 Apr 2021 18:59:14 +0200 +Subject: [PATCH] PARTIAL REVERT commit tree-wide: replace strverscmp() and + str_verscmp() with strverscmp_improved + +This is a workaround for the issue https://github.com/systemd/systemd/issues/19191 +--- + src/boot/efi/boot.c | 49 ++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 48 insertions(+), 1 deletion(-) + +diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c +index 35248db009bf..75c7e2c61d19 100644 +--- a/src/boot/efi/boot.c ++++ b/src/boot/efi/boot.c +@@ -914,6 +914,53 @@ static VOID config_entry_free(ConfigEntry *entry) { + FreePool(entry); + } + ++static BOOLEAN is_digit(CHAR16 c) { ++ return (c >= '0') && (c <= '9'); ++} ++static UINTN c_order(CHAR16 c) { ++ if (c == '\0') ++ return 0; ++ if (is_digit(c)) ++ return 0; ++ else if ((c >= 'a') && (c <= 'z')) ++ return c; ++ else ++ return c + 0x10000; ++} ++static INTN str_verscmp(CHAR16 *s1, CHAR16 *s2) { ++ CHAR16 *os1 = s1; ++ CHAR16 *os2 = s2; ++ while (*s1 || *s2) { ++ INTN first; ++ while ((*s1 && !is_digit(*s1)) || (*s2 && !is_digit(*s2))) { ++ INTN order; ++ order = c_order(*s1) - c_order(*s2); ++ if (order != 0) ++ return order; ++ s1++; ++ s2++; ++ } ++ while (*s1 == '0') ++ s1++; ++ while (*s2 == '0') ++ s2++; ++ first = 0; ++ while (is_digit(*s1) && is_digit(*s2)) { ++ if (first == 0) ++ first = *s1 - *s2; ++ s1++; ++ s2++; ++ } ++ if (is_digit(*s1)) ++ return 1; ++ if (is_digit(*s2)) ++ return -1; ++ if (first != 0) ++ return first; ++ } ++ return StrCmp(os1, os2); ++} ++ + static CHAR8 *line_get_key_value( + CHAR8 *content, + CHAR8 *sep, +@@ -1478,7 +1525,7 @@ static INTN config_entry_compare(ConfigEntry *a, ConfigEntry *b) { + if (a->tries_left == 0 && b->tries_left != 0) + return -1; + +- r = strverscmp_improved(a->id, b->id); ++ r = str_verscmp(a->id, b->id); + if (r != 0) + return r; + Deleted: 20-systemd-sysusers.hook =================================================================== --- 20-systemd-sysusers.hook 2021-07-08 13:00:12 UTC (rev 419078) +++ 20-systemd-sysusers.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,10 +0,0 @@ -[Trigger] -Type = Path -Operation = Install -Operation = Upgrade -Target = usr/lib/sysusers.d/*.conf - -[Action] -Description = Creating system user accounts... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/systemd-hook sysusers Copied: systemd/repos/testing-x86_64/20-systemd-sysusers.hook (from rev 419078, systemd/trunk/20-systemd-sysusers.hook) =================================================================== --- 20-systemd-sysusers.hook (rev 0) +++ 20-systemd-sysusers.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,10 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Target = usr/lib/sysusers.d/*.conf + +[Action] +Description = Creating system user accounts... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook sysusers Deleted: 30-systemd-binfmt.hook =================================================================== --- 30-systemd-binfmt.hook 2021-07-08 13:00:12 UTC (rev 419078) +++ 30-systemd-binfmt.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,10 +0,0 @@ -[Trigger] -Type = Path -Operation = Install -Operation = Upgrade -Target = usr/lib/binfmt.d/*.conf - -[Action] -Description = Registering binary formats... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/systemd-hook binfmt Copied: systemd/repos/testing-x86_64/30-systemd-binfmt.hook (from rev 419078, systemd/trunk/30-systemd-binfmt.hook) =================================================================== --- 30-systemd-binfmt.hook (rev 0) +++ 30-systemd-binfmt.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,10 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Target = usr/lib/binfmt.d/*.conf + +[Action] +Description = Registering binary formats... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook binfmt Deleted: 30-systemd-catalog.hook =================================================================== --- 30-systemd-catalog.hook 2021-07-08 13:00:12 UTC (rev 419078) +++ 30-systemd-catalog.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,11 +0,0 @@ -[Trigger] -Type = Path -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/systemd/catalog/* - -[Action] -Description = Updating journal message catalog... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/systemd-hook catalog Copied: systemd/repos/testing-x86_64/30-systemd-catalog.hook (from rev 419078, systemd/trunk/30-systemd-catalog.hook) =================================================================== --- 30-systemd-catalog.hook (rev 0) +++ 30-systemd-catalog.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,11 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/systemd/catalog/* + +[Action] +Description = Updating journal message catalog... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook catalog Deleted: 30-systemd-daemon-reload.hook =================================================================== --- 30-systemd-daemon-reload.hook 2021-07-08 13:00:12 UTC (rev 419078) +++ 30-systemd-daemon-reload.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,11 +0,0 @@ -[Trigger] -Type = Path -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/systemd/system/* - -[Action] -Description = Reloading system manager configuration... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload Copied: systemd/repos/testing-x86_64/30-systemd-daemon-reload.hook (from rev 419078, systemd/trunk/30-systemd-daemon-reload.hook) =================================================================== --- 30-systemd-daemon-reload.hook (rev 0) +++ 30-systemd-daemon-reload.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,11 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/systemd/system/* + +[Action] +Description = Reloading system manager configuration... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook daemon-reload Deleted: 30-systemd-hwdb.hook =================================================================== --- 30-systemd-hwdb.hook 2021-07-08 13:00:12 UTC (rev 419078) +++ 30-systemd-hwdb.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,11 +0,0 @@ -[Trigger] -Type = Path -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/udev/hwdb.d/* - -[Action] -Description = Updating udev hardware database... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/systemd-hook hwdb Copied: systemd/repos/testing-x86_64/30-systemd-hwdb.hook (from rev 419078, systemd/trunk/30-systemd-hwdb.hook) =================================================================== --- 30-systemd-hwdb.hook (rev 0) +++ 30-systemd-hwdb.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,11 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/udev/hwdb.d/* + +[Action] +Description = Updating udev hardware database... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook hwdb Deleted: 30-systemd-sysctl.hook =================================================================== --- 30-systemd-sysctl.hook 2021-07-08 13:00:12 UTC (rev 419078) +++ 30-systemd-sysctl.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,10 +0,0 @@ -[Trigger] -Type = Path -Operation = Install -Operation = Upgrade -Target = usr/lib/sysctl.d/*.conf - -[Action] -Description = Applying kernel sysctl settings... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/systemd-hook sysctl Copied: systemd/repos/testing-x86_64/30-systemd-sysctl.hook (from rev 419078, systemd/trunk/30-systemd-sysctl.hook) =================================================================== --- 30-systemd-sysctl.hook (rev 0) +++ 30-systemd-sysctl.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,10 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Target = usr/lib/sysctl.d/*.conf + +[Action] +Description = Applying kernel sysctl settings... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook sysctl Deleted: 30-systemd-tmpfiles.hook =================================================================== --- 30-systemd-tmpfiles.hook 2021-07-08 13:00:12 UTC (rev 419078) +++ 30-systemd-tmpfiles.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,10 +0,0 @@ -[Trigger] -Type = Path -Operation = Install -Operation = Upgrade -Target = usr/lib/tmpfiles.d/*.conf - -[Action] -Description = Creating temporary files... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/systemd-hook tmpfiles Copied: systemd/repos/testing-x86_64/30-systemd-tmpfiles.hook (from rev 419078, systemd/trunk/30-systemd-tmpfiles.hook) =================================================================== --- 30-systemd-tmpfiles.hook (rev 0) +++ 30-systemd-tmpfiles.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,10 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Target = usr/lib/tmpfiles.d/*.conf + +[Action] +Description = Creating temporary files... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook tmpfiles Deleted: 30-systemd-udev-reload.hook =================================================================== --- 30-systemd-udev-reload.hook 2021-07-08 13:00:12 UTC (rev 419078) +++ 30-systemd-udev-reload.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,11 +0,0 @@ -[Trigger] -Type = Path -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/udev/rules.d/* - -[Action] -Description = Reloading device manager configuration... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/systemd-hook udev-reload Copied: systemd/repos/testing-x86_64/30-systemd-udev-reload.hook (from rev 419078, systemd/trunk/30-systemd-udev-reload.hook) =================================================================== --- 30-systemd-udev-reload.hook (rev 0) +++ 30-systemd-udev-reload.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,11 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/udev/rules.d/* + +[Action] +Description = Reloading device manager configuration... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook udev-reload Deleted: 30-systemd-update.hook =================================================================== --- 30-systemd-update.hook 2021-07-08 13:00:12 UTC (rev 419078) +++ 30-systemd-update.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,11 +0,0 @@ -[Trigger] -Type = Path -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/ - -[Action] -Description = Arming ConditionNeedsUpdate... -When = PostTransaction -Exec = /usr/share/libalpm/scripts/systemd-hook update Copied: systemd/repos/testing-x86_64/30-systemd-update.hook (from rev 419078, systemd/trunk/30-systemd-update.hook) =================================================================== --- 30-systemd-update.hook (rev 0) +++ 30-systemd-update.hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,11 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/ + +[Action] +Description = Arming ConditionNeedsUpdate... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/systemd-hook update Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-07-08 13:00:12 UTC (rev 419078) +++ PKGBUILD 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,284 +0,0 @@ -# Maintainer: Christian Hesse <m...@eworm.de> -# Maintainer: Dave Reisner <dreis...@archlinux.org> -# Maintainer: Tom Gundersen <t...@jklm.no> - -pkgbase=systemd -pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat') -_tag='b134c9cc4b02eddca2ea098324369018123fdf15' # git rev-parse v${_tag_name} -_tag_name=249 -pkgver="${_tag_name/-/}" -pkgrel=1 -arch=('x86_64') -url='https://www.github.com/systemd/systemd' -makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' - 'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt' - 'libmicrohttpd' 'libxcrypt' 'libxslt' 'util-linux' 'linux-api-headers' - 'python-jinja' 'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git' - 'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon' - 'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync') -options=('strip') -validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lenn...@poettering.net> - 'A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E' # Luca Boccassi <luca.bocca...@gmail.com> - '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbys...@in.waw.pl> -source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed" - "git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed" - '0001-Use-Arch-Linux-device-access-groups.patch' - '0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch' - 'initcpio-hook-udev' - 'initcpio-install-systemd' - 'initcpio-install-udev' - 'arch.conf' - 'loader.conf' - 'splash-arch.bmp' - 'systemd-user.pam' - 'systemd-hook' - '20-systemd-sysusers.hook' - '30-systemd-binfmt.hook' - '30-systemd-catalog.hook' - '30-systemd-daemon-reload.hook' - '30-systemd-hwdb.hook' - '30-systemd-sysctl.hook' - '30-systemd-tmpfiles.hook' - '30-systemd-udev-reload.hook' - '30-systemd-update.hook') -sha512sums=('SKIP' - 'SKIP' - '10f3b477527ec263cc6465c84d94416e356435930edc9e26844a0fd4f71e87a27fa0f91ce24b43a22cacdd2ead5e760e9d607369bc537a8da8d34021302a89a1' - '34541f1967536524329867f9f341f8d9250d9d771c60dc3e6a22ccb82fc01f103cfd3f9903329777591ccbecd2446622a5d6b3804fa0411482b85c70593ee8ad' - 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' - 'f599e1a35cba2c4e83e37c2299fac23ae128d8f68081283e71e1729384975dee1c4b677787f31a17890aeb98c8d2fc90405a202644290708ef9c027315022b17' - 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a' - '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' - 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' - '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75' - 'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19' - '217a9dc3f9d8cd0c9fee54f777396f5a270c2e8a30c572ce5f635165adadcec275af0dae1456019cedb9cc93b7cef0862e5070aeb99a19e496625200e8dfac93' - '299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5' - '0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7' - '2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc' - '63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254' - 'a1661ab946c6cd7d3c6251a2a9fd68afe231db58ce33c92c42594aedb5629be8f299ba08a34713327b373a3badd1554a150343d8d3e5dfb102999c281bd49154' - '9426829605bbb9e65002437e02ed54e35c20fdf94706770a3dc1049da634147906d6b98bf7f5e7516c84068396a12c6feaf72f92b51bdf19715e0f64620319de' - 'da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc' - 'a50d202a9c2e91a4450b45c227b295e1840cc99a5e545715d69c8af789ea3dd95a03a30f050d52855cabdc9183d4688c1b534eaa755ebe93616f9d192a855ee3' - '825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97') - -_backports=( -) - -_reverts=( -) - -prepare() { - cd "$pkgbase-stable" - - # add upstream repository for cherry-picking - git remote add -f upstream ../systemd - - local _c - for _c in "${_backports[@]}"; do - git log --oneline -1 "${_c}" - git cherry-pick -n "${_c}" - done - for _c in "${_reverts[@]}"; do - git log --oneline -1 "${_c}" - git revert -n "${_c}" - done - - # Replace cdrom/dialout/tape groups with optical/uucp/storage - patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch - - # https://bugs.archlinux.org/task/70264 - # https://github.com/systemd/systemd/issues/19191 - patch -Np1 -i ../0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch -} - -build() { - local _timeservers=({0..3}.arch.pool.ntp.org) - local _nameservers=( - # We use these public name services, ordered by their - # privacy policy (hopefully): - # * Cloudflare (https://1.1.1.1/) - # * Quad9 without filtering (https://www.quad9.net/) - # * Google (https://developers.google.com/speed/public-dns/) - 1.1.1.1 - 9.9.9.10 - 8.8.8.8 - 2606:4700:4700::1111 - 2620:fe::10 - 2001:4860:4860::8888 - ) - - local _meson_options=( - -Dversion-tag="${pkgver}-${pkgrel}-arch" - -Dmode=release - - -Dgnu-efi=true - -Dima=false - -Dlibidn2=true - -Dlz4=true - -Dman=true - - # We disable DNSSEC by default, it still causes trouble: - # https://github.com/systemd/systemd/issues/10579 - - -Ddbuspolicydir=/usr/share/dbus-1/system.d - -Ddefault-dnssec=no - -Ddefault-hierarchy=unified - -Ddefault-kill-user-processes=false - -Ddefault-locale=C - -Dlocalegen-path=/usr/bin/locale-gen - -Ddns-over-tls=openssl - -Dfallback-hostname='archlinux' - -Dnologin-path=/usr/bin/nologin - -Dntp-servers="${_timeservers[*]}" - -Ddns-servers="${_nameservers[*]}" - -Drpmmacrosdir=no - -Dsysvinit-path= - -Dsysvrcnd-path= - ) - - arch-meson "$pkgbase-stable" build "${_meson_options[@]}" - - ninja -C build -} - -check() { - meson test -C build -} - -package_systemd() { - pkgdesc='system and service manager' - license=('GPL2' 'LGPL2.1') - depends=('acl' 'libacl.so' 'bash' 'cryptsetup' 'libcryptsetup.so' 'dbus' - 'iptables' 'kbd' 'kmod' 'libkmod.so' 'hwids' 'libcap' 'libcap.so' - 'libgcrypt' 'libxcrypt' 'libcrypt.so' 'systemd-libs' 'libidn2' 'lz4' 'pam' - 'libelf' 'libseccomp' 'libseccomp.so' 'util-linux' 'libblkid.so' - 'libmount.so' 'xz' 'pcre2' 'audit' 'libaudit.so' 'libp11-kit' - 'libp11-kit.so' 'openssl') - provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver") - replaces=('nss-myhostname' 'systemd-tools' 'udev') - conflicts=('nss-myhostname' 'systemd-tools' 'udev') - optdepends=('libmicrohttpd: remote journald capabilities' - 'quota-tools: kernel-level quota management' - 'systemd-sysvcompat: symlink package to provide sysvinit binaries' - 'polkit: allow administration as unprivileged user' - 'curl: machinectl pull-tar and pull-raw' - 'libfido2: unlocking LUKS2 volumes with FIDO2 token' - 'tpm2-tss: unlocking LUKS2 volumes with TPM2') - backup=(etc/pam.d/systemd-user - etc/systemd/coredump.conf - etc/systemd/homed.conf - etc/systemd/journald.conf - etc/systemd/journal-remote.conf - etc/systemd/journal-upload.conf - etc/systemd/logind.conf - etc/systemd/networkd.conf - etc/systemd/oomd.conf - etc/systemd/pstore.conf - etc/systemd/resolved.conf - etc/systemd/sleep.conf - etc/systemd/system.conf - etc/systemd/timesyncd.conf - etc/systemd/user.conf - etc/udev/udev.conf) - install=systemd.install - - DESTDIR="$pkgdir" meson install -C build - - # we'll create this on installation - rmdir "$pkgdir"/var/log/journal/remote - - # runtime libraries shipped with systemd-libs - install -d -m0755 systemd-libs - mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* systemd-libs - - # manpages shipped with systemd-sysvcompat - rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 - - # executable (symlinks) shipped with systemd-sysvcompat - rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,shutdown} - - # files shipped with systemd-resolvconf - rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1} - - # avoid a potential conflict with [core]/filesystem - rm "$pkgdir"/usr/share/factory/etc/{issue,nsswitch.conf} - sed -i -e '/^C \/etc\/nsswitch\.conf/d' \ - -e '/^C \/etc\/issue/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf - - # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat - install -m0644 $pkgbase-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d - - # ship default policy to leave services disabled - echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset - - # add mkinitcpio hooks - install -D -m0644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd - install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev - install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev - - # The group 'systemd-journal' is allocated dynamically and may have varying - # gid on different systems. Let's install with gid 0 (root), systemd-tmpfiles - # will fix the permissions for us. (see /usr/lib/tmpfiles.d/systemd.conf) - install -d -o root -g root -m 2755 "$pkgdir"/var/log/journal - - # match directory owner/group and mode from [extra]/polkit - install -d -o root -g 102 -m 0750 "$pkgdir"/usr/share/polkit-1/rules.d - - # add example bootctl configuration - install -D -m0644 arch.conf "$pkgdir"/usr/share/systemd/bootctl/arch.conf - install -D -m0644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf - install -D -m0644 splash-arch.bmp "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp - - # pacman hooks - install -D -m0755 systemd-hook "$pkgdir"/usr/share/libalpm/scripts/systemd-hook - install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *.hook - - # overwrite the systemd-user PAM configuration with our own - install -D -m0644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user -} - -package_systemd-libs() { - pkgdesc='systemd client libraries' - depends=('glibc' 'libcap' 'libgcrypt' 'libp11-kit' 'lz4' 'xz' 'zstd') - license=('LGPL2.1') - provides=('libsystemd' 'libsystemd.so' 'libudev.so') - conflicts=('libsystemd') - replaces=('libsystemd') - - install -d -m0755 "$pkgdir"/usr - mv systemd-libs "$pkgdir"/usr/lib -} - -package_systemd-resolvconf() { - pkgdesc='systemd resolvconf replacement (for use with systemd-resolved)' - license=('LGPL2.1') - depends=('systemd') - provides=('openresolv' 'resolvconf') - conflicts=('openresolv') - - install -d -m0755 "$pkgdir"/usr/bin - ln -s resolvectl "$pkgdir"/usr/bin/resolvconf - - install -d -m0755 "$pkgdir"/usr/share/man/man1 - ln -s resolvectl.1.gz "$pkgdir"/usr/share/man/man1/resolvconf.1.gz -} - -package_systemd-sysvcompat() { - pkgdesc='sysvinit compat for systemd' - license=('GPL2') - conflicts=('sysvinit') - depends=('systemd') - - install -D -m0644 -t "$pkgdir"/usr/share/man/man8 \ - build/man/{halt,poweroff,reboot,shutdown}.8 - - install -d -m0755 "$pkgdir"/usr/bin - ln -s ../lib/systemd/systemd "$pkgdir"/usr/bin/init - for tool in halt poweroff reboot shutdown; do - ln -s systemctl "$pkgdir"/usr/bin/$tool - done -} - -# vim:ft=sh syn=sh et sw=2: Copied: systemd/repos/testing-x86_64/PKGBUILD (from rev 419078, systemd/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,292 @@ +# Maintainer: Christian Hesse <m...@eworm.de> +# Maintainer: Dave Reisner <dreis...@archlinux.org> +# Maintainer: Tom Gundersen <t...@jklm.no> + +pkgbase=systemd +pkgname=('systemd' 'systemd-libs' 'systemd-resolvconf' 'systemd-sysvcompat') +_tag='b134c9cc4b02eddca2ea098324369018123fdf15' # git rev-parse v${_tag_name} +_tag_name=249 +pkgver="${_tag_name/-/}" +pkgrel=2 +arch=('x86_64') +url='https://www.github.com/systemd/systemd' +makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' + 'intltool' 'iptables' 'kmod' 'libcap' 'libidn2' 'libgcrypt' + 'libmicrohttpd' 'libxcrypt' 'libxslt' 'util-linux' 'linux-api-headers' + 'python-jinja' 'python-lxml' 'quota-tools' 'shadow' 'gnu-efi-libs' 'git' + 'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon' + 'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync') +options=('strip') +validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lenn...@poettering.net> + 'A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E' # Luca Boccassi <luca.bocca...@gmail.com> + '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbys...@in.waw.pl> +source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed" + "git+https://github.com/systemd/systemd#tag=v${_tag_name%.*}?signed" + '0001-Use-Arch-Linux-device-access-groups.patch' + '0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch' + 'initcpio-hook-udev' + 'initcpio-install-systemd' + 'initcpio-install-udev' + 'arch.conf' + 'loader.conf' + 'splash-arch.bmp' + 'systemd-user.pam' + 'systemd-hook' + '20-systemd-sysusers.hook' + '30-systemd-binfmt.hook' + '30-systemd-catalog.hook' + '30-systemd-daemon-reload.hook' + '30-systemd-hwdb.hook' + '30-systemd-sysctl.hook' + '30-systemd-tmpfiles.hook' + '30-systemd-udev-reload.hook' + '30-systemd-update.hook') +sha512sums=('SKIP' + 'SKIP' + '10f3b477527ec263cc6465c84d94416e356435930edc9e26844a0fd4f71e87a27fa0f91ce24b43a22cacdd2ead5e760e9d607369bc537a8da8d34021302a89a1' + '34541f1967536524329867f9f341f8d9250d9d771c60dc3e6a22ccb82fc01f103cfd3f9903329777591ccbecd2446622a5d6b3804fa0411482b85c70593ee8ad' + 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' + 'f599e1a35cba2c4e83e37c2299fac23ae128d8f68081283e71e1729384975dee1c4b677787f31a17890aeb98c8d2fc90405a202644290708ef9c027315022b17' + 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a' + '61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648' + 'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5' + '5a1d78b5170da5abe3d18fdf9f2c3a4d78f15ba7d1ee9ec2708c4c9c2e28973469bc19386f70b3cf32ffafbe4fcc4303e5ebbd6d5187a1df3314ae0965b25e75' + 'b90c99d768dc2a4f020ba854edf45ccf1b86a09d2f66e475de21fe589ff7e32c33ef4aa0876d7f1864491488fd7edb2682fc0d68e83a6d4890a0778dc2d6fe19' + '217a9dc3f9d8cd0c9fee54f777396f5a270c2e8a30c572ce5f635165adadcec275af0dae1456019cedb9cc93b7cef0862e5070aeb99a19e496625200e8dfac93' + '299dcc7094ce53474521356647bdd2fb069731c08d14a872a425412fcd72da840727a23664b12d95465bf313e8e8297da31259508d1c62cc2dcea596160e21c5' + '0d6bc3d928cfafe4e4e0bc04dbb95c5d2b078573e4f9e0576e7f53a8fab08a7077202f575d74a3960248c4904b5f7f0661bf17dbe163c524ab51dd30e3cb80f7' + '2b50b25e8680878f7974fa9d519df7e141ca11c4bfe84a92a5d01bb193f034b1726ea05b3c0030bad1fbda8dbb78bf1dc7b73859053581b55ba813c39b27d9dc' + '63e55b3acd14bc54320b6f2310b43398651ad4e262d4f4a0135e05d34a993e56ed673cc46e57f15b418371df5c4cef6f54486db96325e4abb1d33fb1a3946254' + 'a1661ab946c6cd7d3c6251a2a9fd68afe231db58ce33c92c42594aedb5629be8f299ba08a34713327b373a3badd1554a150343d8d3e5dfb102999c281bd49154' + '9426829605bbb9e65002437e02ed54e35c20fdf94706770a3dc1049da634147906d6b98bf7f5e7516c84068396a12c6feaf72f92b51bdf19715e0f64620319de' + 'da7a97d5d3701c70dd5388b0440da39006ee4991ce174777931fea2aa8c90846a622b2b911f02ae4d5fffb92680d9a7e211c308f0f99c04896278e2ee0d9a4dc' + 'a50d202a9c2e91a4450b45c227b295e1840cc99a5e545715d69c8af789ea3dd95a03a30f050d52855cabdc9183d4688c1b534eaa755ebe93616f9d192a855ee3' + '825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97') + +_backports=( +) + +_reverts=( +) + +prepare() { + cd "$pkgbase-stable" + + # add upstream repository for cherry-picking + git remote add -f upstream ../systemd + + local _c + for _c in "${_backports[@]}"; do + git log --oneline -1 "${_c}" + git cherry-pick -n "${_c}" + done + for _c in "${_reverts[@]}"; do + git log --oneline -1 "${_c}" + git revert -n "${_c}" + done + + # Replace cdrom/dialout/tape groups with optical/uucp/storage + patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch + + # https://bugs.archlinux.org/task/70264 + # https://github.com/systemd/systemd/issues/19191 + patch -Np1 -i ../0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch +} + +build() { + local _timeservers=({0..3}.arch.pool.ntp.org) + local _nameservers=( + # We use these public name services, ordered by their + # privacy policy (hopefully): + # * Cloudflare (https://1.1.1.1/) + # * Quad9 without filtering (https://www.quad9.net/) + # * Google (https://developers.google.com/speed/public-dns/) + 1.1.1.1 + 9.9.9.10 + 8.8.8.8 + 2606:4700:4700::1111 + 2620:fe::10 + 2001:4860:4860::8888 + ) + + local _meson_options=( + # internal version comparison is incompatible with pacman: + # 249~rc1 < 249 < 249.1 < 249rc + -Dversion-tag="${_tag_name/-/\~}-${pkgrel}-arch" + -Dmode=release + + -Dgnu-efi=true + -Dima=false + -Dlibidn2=true + -Dlz4=true + -Dman=true + + # We disable DNSSEC by default, it still causes trouble: + # https://github.com/systemd/systemd/issues/10579 + + -Ddbuspolicydir=/usr/share/dbus-1/system.d + -Ddefault-dnssec=no + -Ddefault-hierarchy=unified + -Ddefault-kill-user-processes=false + -Ddefault-locale=C + -Dlocalegen-path=/usr/bin/locale-gen + -Ddns-over-tls=openssl + -Dfallback-hostname='archlinux' + -Dnologin-path=/usr/bin/nologin + -Dntp-servers="${_timeservers[*]}" + -Ddns-servers="${_nameservers[*]}" + -Drpmmacrosdir=no + -Dsysvinit-path= + -Dsysvrcnd-path= + + -Dsbat-distro='arch' + -Dsbat-distro-summary='Arch Linux' + -Dsbat-distro-pkgname="${pkgname}" + -Dsbat-distro-version="${pkgver}" + -Dsbat-distro-url="https://archlinux.org/packages/core/x86_64/${pkgname}/" + ) + + arch-meson "$pkgbase-stable" build "${_meson_options[@]}" + + ninja -C build +} + +check() { + meson test -C build +} + +package_systemd() { + pkgdesc='system and service manager' + license=('GPL2' 'LGPL2.1') + depends=('acl' 'libacl.so' 'bash' 'cryptsetup' 'libcryptsetup.so' 'dbus' + 'iptables' 'kbd' 'kmod' 'libkmod.so' 'hwids' 'libcap' 'libcap.so' + 'libgcrypt' 'libxcrypt' 'libcrypt.so' 'systemd-libs' 'libidn2' 'lz4' 'pam' + 'libelf' 'libseccomp' 'libseccomp.so' 'util-linux' 'libblkid.so' + 'libmount.so' 'xz' 'pcre2' 'audit' 'libaudit.so' 'libp11-kit' + 'libp11-kit.so' 'openssl') + provides=('nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver") + replaces=('nss-myhostname' 'systemd-tools' 'udev') + conflicts=('nss-myhostname' 'systemd-tools' 'udev') + optdepends=('libmicrohttpd: remote journald capabilities' + 'quota-tools: kernel-level quota management' + 'systemd-sysvcompat: symlink package to provide sysvinit binaries' + 'polkit: allow administration as unprivileged user' + 'curl: machinectl pull-tar and pull-raw' + 'libfido2: unlocking LUKS2 volumes with FIDO2 token' + 'tpm2-tss: unlocking LUKS2 volumes with TPM2') + backup=(etc/pam.d/systemd-user + etc/systemd/coredump.conf + etc/systemd/homed.conf + etc/systemd/journald.conf + etc/systemd/journal-remote.conf + etc/systemd/journal-upload.conf + etc/systemd/logind.conf + etc/systemd/networkd.conf + etc/systemd/oomd.conf + etc/systemd/pstore.conf + etc/systemd/resolved.conf + etc/systemd/sleep.conf + etc/systemd/system.conf + etc/systemd/timesyncd.conf + etc/systemd/user.conf + etc/udev/udev.conf) + install=systemd.install + + DESTDIR="$pkgdir" meson install -C build + + # we'll create this on installation + rmdir "$pkgdir"/var/log/journal/remote + + # runtime libraries shipped with systemd-libs + install -d -m0755 systemd-libs + mv "$pkgdir"/usr/lib/lib{nss,systemd,udev}*.so* systemd-libs + + # manpages shipped with systemd-sysvcompat + rm "$pkgdir"/usr/share/man/man8/{halt,poweroff,reboot,shutdown}.8 + + # executable (symlinks) shipped with systemd-sysvcompat + rm "$pkgdir"/usr/bin/{halt,init,poweroff,reboot,shutdown} + + # files shipped with systemd-resolvconf + rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1} + + # avoid a potential conflict with [core]/filesystem + rm "$pkgdir"/usr/share/factory/etc/{issue,nsswitch.conf} + sed -i -e '/^C \/etc\/nsswitch\.conf/d' \ + -e '/^C \/etc\/issue/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf + + # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat + install -m0644 $pkgbase-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d + + # ship default policy to leave services disabled + echo 'disable *' >"$pkgdir"/usr/lib/systemd/system-preset/99-default.preset + + # add mkinitcpio hooks + install -D -m0644 initcpio-install-systemd "$pkgdir"/usr/lib/initcpio/install/systemd + install -D -m0644 initcpio-install-udev "$pkgdir"/usr/lib/initcpio/install/udev + install -D -m0644 initcpio-hook-udev "$pkgdir"/usr/lib/initcpio/hooks/udev + + # The group 'systemd-journal' is allocated dynamically and may have varying + # gid on different systems. Let's install with gid 0 (root), systemd-tmpfiles + # will fix the permissions for us. (see /usr/lib/tmpfiles.d/systemd.conf) + install -d -o root -g root -m 2755 "$pkgdir"/var/log/journal + + # match directory owner/group and mode from [extra]/polkit + install -d -o root -g 102 -m 0750 "$pkgdir"/usr/share/polkit-1/rules.d + + # add example bootctl configuration + install -D -m0644 arch.conf "$pkgdir"/usr/share/systemd/bootctl/arch.conf + install -D -m0644 loader.conf "$pkgdir"/usr/share/systemd/bootctl/loader.conf + install -D -m0644 splash-arch.bmp "$pkgdir"/usr/share/systemd/bootctl/splash-arch.bmp + + # pacman hooks + install -D -m0755 systemd-hook "$pkgdir"/usr/share/libalpm/scripts/systemd-hook + install -D -m0644 -t "$pkgdir"/usr/share/libalpm/hooks *.hook + + # overwrite the systemd-user PAM configuration with our own + install -D -m0644 systemd-user.pam "$pkgdir"/etc/pam.d/systemd-user +} + +package_systemd-libs() { + pkgdesc='systemd client libraries' + depends=('glibc' 'libcap' 'libgcrypt' 'libp11-kit' 'lz4' 'xz' 'zstd') + license=('LGPL2.1') + provides=('libsystemd' 'libsystemd.so' 'libudev.so') + conflicts=('libsystemd') + replaces=('libsystemd') + + install -d -m0755 "$pkgdir"/usr + mv systemd-libs "$pkgdir"/usr/lib +} + +package_systemd-resolvconf() { + pkgdesc='systemd resolvconf replacement (for use with systemd-resolved)' + license=('LGPL2.1') + depends=('systemd') + provides=('openresolv' 'resolvconf') + conflicts=('openresolv') + + install -d -m0755 "$pkgdir"/usr/bin + ln -s resolvectl "$pkgdir"/usr/bin/resolvconf + + install -d -m0755 "$pkgdir"/usr/share/man/man1 + ln -s resolvectl.1.gz "$pkgdir"/usr/share/man/man1/resolvconf.1.gz +} + +package_systemd-sysvcompat() { + pkgdesc='sysvinit compat for systemd' + license=('GPL2') + conflicts=('sysvinit') + depends=('systemd') + + install -D -m0644 -t "$pkgdir"/usr/share/man/man8 \ + build/man/{halt,poweroff,reboot,shutdown}.8 + + install -d -m0755 "$pkgdir"/usr/bin + ln -s ../lib/systemd/systemd "$pkgdir"/usr/bin/init + for tool in halt poweroff reboot shutdown; do + ln -s systemctl "$pkgdir"/usr/bin/$tool + done +} + +# vim:ft=sh syn=sh et sw=2: Deleted: arch.conf =================================================================== --- arch.conf 2021-07-08 13:00:12 UTC (rev 419078) +++ arch.conf 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,7 +0,0 @@ -## This is just an example config file. -## Please edit the paths and kernel parameters according to your system. - -title Arch Linux -linux /vmlinuz-linux -initrd /initramfs-linux.img -options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap Copied: systemd/repos/testing-x86_64/arch.conf (from rev 419078, systemd/trunk/arch.conf) =================================================================== --- arch.conf (rev 0) +++ arch.conf 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,7 @@ +## This is just an example config file. +## Please edit the paths and kernel parameters according to your system. + +title Arch Linux +linux /vmlinuz-linux +initrd /initramfs-linux.img +options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap Deleted: initcpio-hook-udev =================================================================== --- initcpio-hook-udev 2021-07-08 13:00:12 UTC (rev 419078) +++ initcpio-hook-udev 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,22 +0,0 @@ -#!/usr/bin/ash - -run_earlyhook() { - kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf - systemd-tmpfiles --prefix=/dev --create --boot - /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never - udevd_running=1 -} - -run_hook() { - msg ":: Triggering uevents..." - udevadm trigger --action=add --type=subsystems - udevadm trigger --action=add --type=devices - udevadm settle -} - -run_cleanuphook() { - udevadm control --exit - udevadm info --cleanup-db -} - -# vim: set ft=sh ts=4 sw=4 et: Copied: systemd/repos/testing-x86_64/initcpio-hook-udev (from rev 419078, systemd/trunk/initcpio-hook-udev) =================================================================== --- initcpio-hook-udev (rev 0) +++ initcpio-hook-udev 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,22 @@ +#!/usr/bin/ash + +run_earlyhook() { + kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf + systemd-tmpfiles --prefix=/dev --create --boot + /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never + udevd_running=1 +} + +run_hook() { + msg ":: Triggering uevents..." + udevadm trigger --action=add --type=subsystems + udevadm trigger --action=add --type=devices + udevadm settle +} + +run_cleanuphook() { + udevadm control --exit + udevadm info --cleanup-db +} + +# vim: set ft=sh ts=4 sw=4 et: Deleted: initcpio-install-systemd =================================================================== --- initcpio-install-systemd 2021-07-08 13:00:12 UTC (rev 419078) +++ initcpio-install-systemd 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,192 +0,0 @@ -#!/bin/bash - -add_udev_rule() { - # Add an udev rules file to the initcpio image. Dependencies on binaries - # will be discovered and added. - # $1: path to rules file (or name of rules file) - - local rules="$1" rule= key= value= binary= - - if [[ ${rules:0:1} != '/' ]]; then - rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1") - fi - if [[ -z $rules ]]; then - # complain about not found rules - return 1 - fi - - add_file "$rules" /usr/lib/udev/rules.d/"${rules##*/}" - - while IFS=, read -ra rule; do - # skip empty lines, comments - [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue - - for pair in "${rule[@]}"; do - IFS=' =' read -r key value <<< "$pair" - case $key in - RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD}) - # strip quotes - binary=${value//[\"\']/} - # just take the first word as the binary name - binary=${binary%% *} - [[ ${binary:0:1} == '$' ]] && continue - if [[ ${binary:0:1} != '/' ]]; then - binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary") - fi - add_binary "$binary" - ;; - esac - done - done <"$rules" -} - -add_systemd_unit() { - # Add a systemd unit file to the initcpio image. Hard dependencies on binaries - # and other unit files will be discovered and added. - # $1: path to rules file (or name of rules file) - - local unit= rule= entry= key= value= binary= dep= - - unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1") - if [[ -z $unit ]]; then - # complain about not found unit file - return 1 - fi - - add_file "$unit" - - while IFS='=' read -r key values; do - read -ra values <<< "$values" - - case $key in - Requires|OnFailure) - # only add hard dependencies (not Wants) - map add_systemd_unit "${values[@]}" - ;; - Exec*) - # do not add binaries unless they are required, - # strip special executable prefixes - case ${values[0]} in - -*) ;; - !!*) add_binary "${values[0]#!!}" ;; - *) add_binary "${values[0]#[@!:+]}" ;; - esac - ;; - esac - - done <"$unit" - - # preserve reverse soft dependency - for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do - if [[ -L $dep ]]; then - add_symlink "$dep" - fi - done - - # add hard dependencies - if [[ -d $unit.requires ]]; then - for dep in "$unit".requires/*; do - add_systemd_unit ${dep##*/} - done - fi -} - -add_systemd_drop_in() { - local unit=$1 dropin_name=$2 - - mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d" - cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf" -} - -build() { - local rules unit - - add_binary /usr/bin/kmod /usr/bin/modprobe - add_binary /usr/bin/mount - add_binary /usr/bin/sulogin - add_binary /usr/bin/umount - add_binary /usr/lib/systemd/systemd /init - - map add_binary \ - /usr/bin/journalctl \ - /usr/bin/systemd-tmpfiles \ - /usr/lib/systemd/systemd-hibernate-resume \ - /usr/lib/systemd/systemd-shutdown \ - /usr/lib/systemd/systemd-sulogin-shell \ - /usr/lib/systemd/system-generators/systemd-fstab-generator \ - /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \ - /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator - - # udev rules and systemd units - map add_udev_rule "$rules" \ - 50-udev-default.rules \ - 60-persistent-storage.rules \ - 64-btrfs.rules \ - 80-drivers.rules \ - 99-systemd.rules - - map add_systemd_unit \ - initrd-cleanup.service \ - initrd-fs.target \ - initrd-parse-etc.service \ - initrd-root-fs.target \ - initrd-root-device.target \ - initrd-switch-root.service \ - initrd-switch-root.target \ - initrd-udevadm-cleanup-db.service \ - initrd.target \ - kmod-static-nodes.service \ - local-fs.target \ - local-fs-pre.target \ - paths.target \ - reboot.target \ - slices.target \ - sockets.target \ - swap.target \ - systemd-fsck@.service \ - systemd-hibernate-resume@.service \ - systemd-journald.service \ - systemd-journald-audit.socket \ - systemd-journald-dev-log.socket \ - systemd-modules-load.service \ - systemd-tmpfiles-setup-dev.service \ - systemd-udev-trigger.service \ - systemd-udevd-control.socket \ - systemd-udevd-kernel.socket \ - systemd-udevd.service \ - timers.target \ - rescue.target \ - emergency.target - - add_symlink "/usr/lib/systemd/system/default.target" "initrd.target" - add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target" - - add_binary "$(readlink -f /usr/lib/libnss_files.so)" - printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \ - 'passwd: files' \ - 'group: files' \ - 'shadow: files' - - echo "root:x:0:0:root:/root:/bin/sh" >"$BUILDROOT/etc/passwd" - echo 'root:*:::::::' >"$BUILDROOT/etc/shadow" - getent group root audio disk input kmem kvm lp optical render sgx storage tty uucp video | awk -F: ' { print $1 ":x:" $3 ":" }' >"$BUILDROOT/etc/group" - - add_dir "/etc/modules-load.d" - ( - . "$_f_config" - set -f - printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf" - ) -} - -help() { - cat <<HELPEOF -This will install a basic systemd setup in your initramfs, and is meant to -replace the 'base', 'usr', 'udev' and 'resume' hooks. Other hooks with runtime -components will need to be ported, and will not work as intended. You also may -wish to still include the 'base' hook (before this hook) to ensure that a -rescue shell exists on your initramfs. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: Copied: systemd/repos/testing-x86_64/initcpio-install-systemd (from rev 419078, systemd/trunk/initcpio-install-systemd) =================================================================== --- initcpio-install-systemd (rev 0) +++ initcpio-install-systemd 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,192 @@ +#!/bin/bash + +add_udev_rule() { + # Add an udev rules file to the initcpio image. Dependencies on binaries + # will be discovered and added. + # $1: path to rules file (or name of rules file) + + local rules="$1" rule= key= value= binary= + + if [[ ${rules:0:1} != '/' ]]; then + rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1") + fi + if [[ -z $rules ]]; then + # complain about not found rules + return 1 + fi + + add_file "$rules" /usr/lib/udev/rules.d/"${rules##*/}" + + while IFS=, read -ra rule; do + # skip empty lines, comments + [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue + + for pair in "${rule[@]}"; do + IFS=' =' read -r key value <<< "$pair" + case $key in + RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD}) + # strip quotes + binary=${value//[\"\']/} + # just take the first word as the binary name + binary=${binary%% *} + [[ ${binary:0:1} == '$' ]] && continue + if [[ ${binary:0:1} != '/' ]]; then + binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary") + fi + add_binary "$binary" + ;; + esac + done + done <"$rules" +} + +add_systemd_unit() { + # Add a systemd unit file to the initcpio image. Hard dependencies on binaries + # and other unit files will be discovered and added. + # $1: path to rules file (or name of rules file) + + local unit= rule= entry= key= value= binary= dep= + + unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1") + if [[ -z $unit ]]; then + # complain about not found unit file + return 1 + fi + + add_file "$unit" + + while IFS='=' read -r key values; do + read -ra values <<< "$values" + + case $key in + Requires|OnFailure) + # only add hard dependencies (not Wants) + map add_systemd_unit "${values[@]}" + ;; + Exec*) + # do not add binaries unless they are required, + # strip special executable prefixes + case ${values[0]} in + -*) ;; + !!*) add_binary "${values[0]#!!}" ;; + *) add_binary "${values[0]#[@!:+]}" ;; + esac + ;; + esac + + done <"$unit" + + # preserve reverse soft dependency + for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do + if [[ -L $dep ]]; then + add_symlink "$dep" + fi + done + + # add hard dependencies + if [[ -d $unit.requires ]]; then + for dep in "$unit".requires/*; do + add_systemd_unit ${dep##*/} + done + fi +} + +add_systemd_drop_in() { + local unit=$1 dropin_name=$2 + + mkdir -p "$BUILDROOT/etc/systemd/system/$unit.d" + cat >"$BUILDROOT/etc/systemd/system/$unit.d/$2.conf" +} + +build() { + local rules unit + + add_binary /usr/bin/kmod /usr/bin/modprobe + add_binary /usr/bin/mount + add_binary /usr/bin/sulogin + add_binary /usr/bin/umount + add_binary /usr/lib/systemd/systemd /init + + map add_binary \ + /usr/bin/journalctl \ + /usr/bin/systemd-tmpfiles \ + /usr/lib/systemd/systemd-hibernate-resume \ + /usr/lib/systemd/systemd-shutdown \ + /usr/lib/systemd/systemd-sulogin-shell \ + /usr/lib/systemd/system-generators/systemd-fstab-generator \ + /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \ + /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator + + # udev rules and systemd units + map add_udev_rule "$rules" \ + 50-udev-default.rules \ + 60-persistent-storage.rules \ + 64-btrfs.rules \ + 80-drivers.rules \ + 99-systemd.rules + + map add_systemd_unit \ + initrd-cleanup.service \ + initrd-fs.target \ + initrd-parse-etc.service \ + initrd-root-fs.target \ + initrd-root-device.target \ + initrd-switch-root.service \ + initrd-switch-root.target \ + initrd-udevadm-cleanup-db.service \ + initrd.target \ + kmod-static-nodes.service \ + local-fs.target \ + local-fs-pre.target \ + paths.target \ + reboot.target \ + slices.target \ + sockets.target \ + swap.target \ + systemd-fsck@.service \ + systemd-hibernate-resume@.service \ + systemd-journald.service \ + systemd-journald-audit.socket \ + systemd-journald-dev-log.socket \ + systemd-modules-load.service \ + systemd-tmpfiles-setup-dev.service \ + systemd-udev-trigger.service \ + systemd-udevd-control.socket \ + systemd-udevd-kernel.socket \ + systemd-udevd.service \ + timers.target \ + rescue.target \ + emergency.target + + add_symlink "/usr/lib/systemd/system/default.target" "initrd.target" + add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target" + + add_binary "$(readlink -f /usr/lib/libnss_files.so)" + printf '%s\n' >"$BUILDROOT/etc/nsswitch.conf" \ + 'passwd: files' \ + 'group: files' \ + 'shadow: files' + + echo "root:x:0:0:root:/root:/bin/sh" >"$BUILDROOT/etc/passwd" + echo 'root:*:::::::' >"$BUILDROOT/etc/shadow" + getent group root audio disk input kmem kvm lp optical render sgx storage tty uucp video | awk -F: ' { print $1 ":x:" $3 ":" }' >"$BUILDROOT/etc/group" + + add_dir "/etc/modules-load.d" + ( + . "$_f_config" + set -f + printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf" + ) +} + +help() { + cat <<HELPEOF +This will install a basic systemd setup in your initramfs, and is meant to +replace the 'base', 'usr', 'udev' and 'resume' hooks. Other hooks with runtime +components will need to be ported, and will not work as intended. You also may +wish to still include the 'base' hook (before this hook) to ensure that a +rescue shell exists on your initramfs. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: Deleted: initcpio-install-udev =================================================================== --- initcpio-install-udev 2021-07-08 13:00:12 UTC (rev 419078) +++ initcpio-install-udev 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,29 +0,0 @@ -#!/bin/bash - -build() { - local rules tool - - add_binary /usr/lib/systemd/systemd-udevd - add_binary /usr/bin/udevadm - add_binary /usr/bin/systemd-tmpfiles - - for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do - add_file "/usr/lib/udev/rules.d/$rules" - done - for tool in ata_id scsi_id; do - add_file "/usr/lib/udev/$tool" - done - - add_runscript -} - -help() { - cat <<HELPEOF -This hook adds the udev daemon to the initramfs, allowing for dynamic loading -of modules and reliable detection of the root device via tags (e.g. UUID or -LABEL). Do not remove this hook unless you are using the systemd hook, or you -know what you're doing. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: Copied: systemd/repos/testing-x86_64/initcpio-install-udev (from rev 419078, systemd/trunk/initcpio-install-udev) =================================================================== --- initcpio-install-udev (rev 0) +++ initcpio-install-udev 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,29 @@ +#!/bin/bash + +build() { + local rules tool + + add_binary /usr/lib/systemd/systemd-udevd + add_binary /usr/bin/udevadm + add_binary /usr/bin/systemd-tmpfiles + + for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do + add_file "/usr/lib/udev/rules.d/$rules" + done + for tool in ata_id scsi_id; do + add_file "/usr/lib/udev/$tool" + done + + add_runscript +} + +help() { + cat <<HELPEOF +This hook adds the udev daemon to the initramfs, allowing for dynamic loading +of modules and reliable detection of the root device via tags (e.g. UUID or +LABEL). Do not remove this hook unless you are using the systemd hook, or you +know what you're doing. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: Deleted: loader.conf =================================================================== --- loader.conf 2021-07-08 13:00:12 UTC (rev 419078) +++ loader.conf 2021-07-08 13:00:23 UTC (rev 419079) @@ -1 +0,0 @@ -default arch Copied: systemd/repos/testing-x86_64/loader.conf (from rev 419078, systemd/trunk/loader.conf) =================================================================== --- loader.conf (rev 0) +++ loader.conf 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1 @@ +default arch Deleted: splash-arch.bmp =================================================================== (Binary files differ) Copied: systemd/repos/testing-x86_64/splash-arch.bmp (from rev 419078, systemd/trunk/splash-arch.bmp) =================================================================== (Binary files differ) Deleted: systemd-hook =================================================================== --- systemd-hook 2021-07-08 13:00:12 UTC (rev 419078) +++ systemd-hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,46 +0,0 @@ -#!/bin/sh -e - -is_chrooted() { - if systemd-detect-virt --chroot; then - echo >&2 " Skipped: Running in chroot." - exit 0 - fi -} - -systemd_live() { - is_chrooted - if [ ! -d /run/systemd/system ]; then - echo >&2 " Skipped: Current root is not booted." - exit 0 - fi -} - -udevd_live() { - is_chrooted - if [ ! -d /run/udev ]; then - echo >&2 " Skipped: Device manager is not running." - exit 0 - fi -} - -op="$1"; shift - -case "$op" in - catalog) /usr/bin/journalctl --update-catalog ;; - hwdb) /usr/bin/systemd-hwdb --usr update ;; - update) touch -c /usr ;; - sysusers) /usr/bin/systemd-sysusers ;; - tmpfiles) /usr/bin/systemd-tmpfiles --create ;; - - daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;; - udev-reload) udevd_live; /usr/bin/udevadm control --reload ;; - binfmt) systemd_live; /usr/lib/systemd/systemd-binfmt ;; - sysctl) systemd_live; /usr/lib/systemd/systemd-sysctl ;; - - # For use by other packages - reload) systemd_live; /usr/bin/systemctl try-reload-or-restart "$@" ;; - - *) echo >&2 " Invalid operation '$op'"; exit 1 ;; -esac - -exit 0 Copied: systemd/repos/testing-x86_64/systemd-hook (from rev 419078, systemd/trunk/systemd-hook) =================================================================== --- systemd-hook (rev 0) +++ systemd-hook 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,46 @@ +#!/bin/sh -e + +is_chrooted() { + if systemd-detect-virt --chroot; then + echo >&2 " Skipped: Running in chroot." + exit 0 + fi +} + +systemd_live() { + is_chrooted + if [ ! -d /run/systemd/system ]; then + echo >&2 " Skipped: Current root is not booted." + exit 0 + fi +} + +udevd_live() { + is_chrooted + if [ ! -d /run/udev ]; then + echo >&2 " Skipped: Device manager is not running." + exit 0 + fi +} + +op="$1"; shift + +case "$op" in + catalog) /usr/bin/journalctl --update-catalog ;; + hwdb) /usr/bin/systemd-hwdb --usr update ;; + update) touch -c /usr ;; + sysusers) /usr/bin/systemd-sysusers ;; + tmpfiles) /usr/bin/systemd-tmpfiles --create ;; + + daemon-reload) systemd_live; /usr/bin/systemctl daemon-reload ;; + udev-reload) udevd_live; /usr/bin/udevadm control --reload ;; + binfmt) systemd_live; /usr/lib/systemd/systemd-binfmt ;; + sysctl) systemd_live; /usr/lib/systemd/systemd-sysctl ;; + + # For use by other packages + reload) systemd_live; /usr/bin/systemctl try-reload-or-restart "$@" ;; + + *) echo >&2 " Invalid operation '$op'"; exit 1 ;; +esac + +exit 0 Deleted: systemd-user.pam =================================================================== --- systemd-user.pam 2021-07-08 13:00:12 UTC (rev 419078) +++ systemd-user.pam 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,5 +0,0 @@ -# Used by systemd --user instances. - -account include system-login -session required pam_loginuid.so -session include system-login Copied: systemd/repos/testing-x86_64/systemd-user.pam (from rev 419078, systemd/trunk/systemd-user.pam) =================================================================== --- systemd-user.pam (rev 0) +++ systemd-user.pam 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,5 @@ +# Used by systemd --user instances. + +account include system-login +session required pam_loginuid.so +session include system-login Deleted: systemd.install =================================================================== --- systemd.install 2021-07-08 13:00:12 UTC (rev 419078) +++ systemd.install 2021-07-08 13:00:23 UTC (rev 419079) @@ -1,61 +0,0 @@ -#!/bin/bash - -sd_booted() { - [[ -d run/systemd/system && ! -L run/systemd/system ]] -} - -add_journal_acls() { - # ignore errors, since the filesystem might not support ACLs - setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null - : -} - -post_common() { - systemd-sysusers - journalctl --update-catalog -} - -_242_0_2_changes() { - if [[ -L var/lib/systemd/timesync ]]; then - rm var/lib/systemd/timesync - if [[ -d var/lib/private/systemd/timesync ]]; then - mv var/lib/{private/,}systemd/timesync - fi - fi -} - -post_install() { - systemd-machine-id-setup - - post_common "$@" - - add_journal_acls - - # enable some services by default, but don't track them - systemctl enable \ - getty@tty1.service \ - remote-fs.target - - echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your" - echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat" - - # group 'systemd-journal-remote' is created by systemd-sysusers - mkdir -m2755 var/log/journal/remote - chgrp systemd-journal-remote var/log/journal/remote -} - -post_upgrade() { - post_common "$@" - - local v upgrades=( - 242.0-2 - ) - - for v in "${upgrades[@]}"; do - if [[ $(vercmp "$v" "$2") -eq 1 ]]; then - "_${v//[.-]/_}_changes" - fi - done -} - -# vim:set ts=2 sw=2 et: Copied: systemd/repos/testing-x86_64/systemd.install (from rev 419078, systemd/trunk/systemd.install) =================================================================== --- systemd.install (rev 0) +++ systemd.install 2021-07-08 13:00:23 UTC (rev 419079) @@ -0,0 +1,61 @@ +#!/bin/bash + +sd_booted() { + [[ -d run/systemd/system && ! -L run/systemd/system ]] +} + +add_journal_acls() { + # ignore errors, since the filesystem might not support ACLs + setfacl -Rnm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx var/log/journal/ 2>/dev/null + : +} + +post_common() { + systemd-sysusers + journalctl --update-catalog +} + +_242_0_2_changes() { + if [[ -L var/lib/systemd/timesync ]]; then + rm var/lib/systemd/timesync + if [[ -d var/lib/private/systemd/timesync ]]; then + mv var/lib/{private/,}systemd/timesync + fi + fi +} + +post_install() { + systemd-machine-id-setup + + post_common "$@" + + add_journal_acls + + # enable some services by default, but don't track them + systemctl enable \ + getty@tty1.service \ + remote-fs.target + + echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your" + echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat" + + # group 'systemd-journal-remote' is created by systemd-sysusers + mkdir -m2755 var/log/journal/remote + chgrp systemd-journal-remote var/log/journal/remote +} + +post_upgrade() { + post_common "$@" + + local v upgrades=( + 242.0-2 + ) + + for v in "${upgrades[@]}"; do + if [[ $(vercmp "$v" "$2") -eq 1 ]]; then + "_${v//[.-]/_}_changes" + fi + done +} + +# vim:set ts=2 sw=2 et: