diff options
Diffstat (limited to 'libre/systemd')
5 files changed, 55 insertions, 104 deletions
diff --git a/libre/systemd/0001-Use-Arch-Linux-device-access-groups.patch b/libre/systemd/0001-Use-Arch-Linux-device-access-groups.patch index 6449c017d..6f7dd4a18 100644 --- a/libre/systemd/0001-Use-Arch-Linux-device-access-groups.patch +++ b/libre/systemd/0001-Use-Arch-Linux-device-access-groups.patch @@ -2,9 +2,6 @@ From f7d07e298c819a81eab965efbdbf53a2ce67fc0e Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steffens@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 @@ -141,3 +138,39 @@ index 8cc1a7cad2..21bb6d8948 100644 g video {{VIDEO_GID }} - - # Default group for normal users +From 14de5ced41edc9fa8e380330c03adc89ef257fbc Mon Sep 17 00:00:00 2001 +From: Christian Hesse <mail@eworm.de> +Date: Mon, 27 Dec 2021 23:32:42 +0100 +Subject: [PATCH] generate tmpfiles.d/legacy.conf +--- + tmpfiles.d/legacy.conf.in | 3 --- + tmpfiles.d/meson.build | 2 +- + 2 files changed, 1 insertion(+), 4 deletions(-) + +diff --git a/tmpfiles.d/legacy.conf.in b/tmpfiles.d/legacy.conf.in +index 4f2c0d7c43..62e2ae0986 100644 +--- a/tmpfiles.d/legacy.conf.in ++++ b/tmpfiles.d/legacy.conf.in +@@ -12,9 +12,6 @@ + + d /run/lock 0755 root root - + L /var/lock - - - - ../run/lock +-{% if CREATE_LOG_DIRS %} +-L /var/log/README - - - - ../..{{DOC_DIR}}/README.logs +-{% endif %} + + # /run/lock/subsys is used for serializing SysV service execution, and + # hence without use on SysV-less systems. +diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build +index b8d3919025..000bd0bd22 100644 +--- a/tmpfiles.d/meson.build ++++ b/tmpfiles.d/meson.build +@@ -27,7 +27,7 @@ foreach pair : files + endforeach + + in_files = [['etc.conf', ''], +- ['legacy.conf', 'HAVE_SYSV_COMPAT'], ++ ['legacy.conf', ''], + ['static-nodes-permissions.conf', ''], + ['systemd.conf', ''], + ['var.conf', ''], diff --git a/libre/systemd/0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch b/libre/systemd/0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch deleted file mode 100644 index 57b9e4dfc..000000000 --- a/libre/systemd/0003-PARTIAL-REVERT-commit-tree-wide-replace-strverscmp-and-str_verscmp-with-strverscmp_improved.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 9021729667e019defea0d4c1bdf563d629d7d837 Mon Sep 17 00:00:00 2001 -From: Ernesto Castellotti <mail@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; - diff --git a/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch b/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch index a8b0ff5ce..2a5130243 100644 --- a/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch +++ b/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch @@ -14,15 +14,15 @@ diff --git a/man/os-release.xml b/man/os-release.xml index 1c069275c8..272258b4e1 100644 --- a/man/os-release.xml +++ b/man/os-release.xml -@@ -123,7 +123,7 @@ +@@ -148,7 +148,7 @@ <listitem><para>A lower-case string (no spaces or other characters outside of 0–9, a–z, ".", "_" and "-") identifying the operating system, excluding any version information and suitable for processing by scripts or usage in generated filenames. If not set, a default of -- <literal>ID=linux</literal> may be used.</para> -+ <literal>ID=gnu-linux</literal> may be used.</para> +- <literal>ID=linux</literal> may be used. Note that even though this string may not include ++ <literal>ID=gnu-linux</literal> may be used. Note that even though this string may not include + characters that require shell quoting, quoting may nevertheless be used.</para> <para>Examples: <literal>ID=fedora</literal>, <literal>ID=debian</literal>.</para></listitem> - </varlistentry> -- 2.18.0 diff --git a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch index 7fd0cafac..f8e04763c 100644 --- a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch +++ b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch @@ -241,11 +241,11 @@ diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in index 9963322fc9..4b71a4ab8f 100644 --- a/man/custom-entities.ent.in +++ b/man/custom-entities.ent.in -@@ -12,5 +12,4 @@ - <!ENTITY DEBUGTTY "{{DEBUGTTY}}"> - <!ENTITY RC_LOCAL_PATH "{{RC_LOCAL_PATH}}"> +@@ -15,5 +15,4 @@ <!ENTITY HIGH_RLIMIT_NOFILE "{{HIGH_RLIMIT_NOFILE}}"> --<!ENTITY fedora_latest_version "34"> + <!ENTITY DEFAULT_DNSSEC_MODE "{{DEFAULT_DNSSEC_MODE_STR}}"> + <!ENTITY DEFAULT_DNS_OVER_TLS_MODE "{{DEFAULT_DNS_OVER_TLS_MODE_STR}}"> +-<!ENTITY fedora_latest_version "35"> -<!ENTITY fedora_cloud_release "1.2"> +<!ENTITY blag_latest_version "140"> diff --git a/man/machinectl.xml b/man/machinectl.xml diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index efcb329ec..ea8643d54 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -11,10 +11,10 @@ pkgname+=('systemd-common' 'systemd-udev') # We split Arch's systemd-libs into systemd-$X, for the following $X: _systemd_libs=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve') pkgname+=("${_systemd_libs[@]/#/systemd-}") -_tag='f223664ddf5cad0db04732985ee58006bc3916e4' # git rev-parse v${_tag_name} -_tag_name=249.7 +_tag='9c8279cdd5d0bc256b8cc0ced2312e27e069a214' # git rev-parse v${_tag_name} +_tag_name=250 pkgver="${_tag_name/-/}" -pkgrel=2 +pkgrel=4 pkgrel+=.parabola1 arch=('x86_64') arch+=('i686' 'armv7h' 'ppc64le') @@ -34,7 +34,6 @@ validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering < 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' @@ -62,8 +61,7 @@ source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed" '0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch') sha512sums=('SKIP' 'SKIP' - '10f3b477527ec263cc6465c84d94416e356435930edc9e26844a0fd4f71e87a27fa0f91ce24b43a22cacdd2ead5e760e9d607369bc537a8da8d34021302a89a1' - '34541f1967536524329867f9f341f8d9250d9d771c60dc3e6a22ccb82fc01f103cfd3f9903329777591ccbecd2446622a5d6b3804fa0411482b85c70593ee8ad' + 'cc0c2ffb5f7c3a7176cd68f3dddd85ca000dcc4cdf3044746a20147234adb6811800fd28a4713faa6a59bf8c02be9fd43c2d6aa6695fd1dbf03ae773a91d090c' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' '5479c8ef963ff247381392907c13308b4ae3a9383c867bd4c8a318b159f23acdb4be5f4ddae0dab4665f4927d3f30166077b1d3aaa2cde6bf53d023b7abb939c' 'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6' @@ -85,12 +83,17 @@ sha512sums=('SKIP' 'e963859d9958e527802f118a5ac5f2051343a2ee987f60cae256fc4e8c71f5fe16439375a5d1caf0338f1156775ad087eaab9e8bf9d18633e62ea4d32e713e7f' '8466d1945d72a7605e3a9c3402ddb8c67272506ffba89a35f3e7787e03d0e8895b6d52d9390899381b6763da00e49703953794696366b6c510e037c67aff96ac' '1c93f6641d537290786137138db1ff8e23de754ce7dc20aaed458e13763f29cdddf699eeb9bb2cdaa244495ae1611784dcde7ef32846d2c4043d691ca682ea23' - 'fd12a2c799521b3d3a64665b3320af52a8f3c76cdc58df7faf0d0a6096418fb5f96fbb67433b18cd308770bc8f47f657d5a309a93488201c4dd5355c2fb345a7' + 'f24191e6331b58dc4f1c1b7b28b854ba94c6de53b2dc97e5721c208abe7543efab4b8519013bdb02ebeb5058dd5c56a8318bf99a972772de188b40861c88e349' 'c6a8a56c54415a266dcb57cc24fd91d085ca7298aca6b522e626f41ed216b13c9695ff4d209f7e60d24fb5e65e40ef5151c8d95db6950eda8a4150d28fcd56be' - '1719a1e6d388a2f3052c981677f91c505e8799d2717b4608c28104d871e2ab943504bd7f930c34350ed81a4f95f8811151d911bbe785980edd6b2c803552f14e' + 'a5c099a29005f5cac20c3673d29f8c17fbb4480c4d49c5c97b373636882413db1252d9794eb995774f27f6b41ec17c85a277709b35c6f016e1cd9806160b90d0' '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839') _backports=( + # chrattr-util: return EOPNOTSUPP from chrattr_full if no other failure was observed + '7c3b51c469140cdbc1b7e9a232af3f250fea3884' + + # manager: always close idle pipe when sending ready notification + '9c1b17c3dc1541df02118ee3aaf6dd5dd540cdc2' ) _reverts=( @@ -115,10 +118,6 @@ prepare() { # 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 - # apply FSDG patches local _patch for _patch in "$srcdir"/????-FSDG-*.patch; do @@ -291,9 +290,6 @@ package_systemd() { 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 |