diff options
Diffstat (limited to 'libre/systemd')
7 files changed, 229 insertions, 155 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 3abb448bf..6449c017d 100644 --- a/libre/systemd/0001-Use-Arch-Linux-device-access-groups.patch +++ b/libre/systemd/0001-Use-Arch-Linux-device-access-groups.patch @@ -1,4 +1,4 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +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 @@ -10,12 +10,81 @@ Content-Transfer-Encoding: 8bit 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 +++--- - 2 files changed, 10 insertions(+), 10 deletions(-) + 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 edfa8bb107..35b8d4ba41 100644 +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" @@ -27,7 +96,7 @@ index edfa8bb107..35b8d4ba41 100644 SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640" -@@ -62,13 +62,13 @@ KERNEL=="irlpt[0-9]*", GROUP="lp" +@@ -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" @@ -48,25 +117,27 @@ index edfa8bb107..35b8d4ba41 100644 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 4be0bd869e..cc3721b58a 100644 +index 8cc1a7cad2..21bb6d8948 100644 --- a/sysusers.d/basic.conf.in +++ b/sysusers.d/basic.conf.in -@@ -24,15 +24,15 @@ g utmp - - - +@@ -22,17 +22,17 @@ g utmp {{UTMP_GID }} - - - # Hardware access groups - g audio - - - --g cdrom - - - --g dialout - - - - g disk - - - - g input - - - - g kvm - - - - g lp - - - -+g optical - - - - g render - - - - g sgx - - - --g tape - - - -+g storage - - - -+g uucp - - - - g video - - - + # 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 diff --git a/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch b/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch index 2be19da05..5192e05c0 100644 --- a/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch +++ b/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch @@ -30,15 +30,15 @@ diff --git a/man/os-release.xml b/man/os-release.xml index 5a5e318f75..1afaa679c9 100644 --- a/man/os-release.xml +++ b/man/os-release.xml -@@ -184,7 +184,7 @@ - suitable for presentation to the user. May or may not contain - a release code name or OS version of some kind, as suitable. - If not set, defaults to -- <literal>PRETTY_NAME="Linux"</literal>. Example: -+ <literal>PRETTY_NAME="GNU/Linux"</literal>. Example: - <literal>PRETTY_NAME="Fedora 17 (Beefy - Miracle)"</literal>.</para></listitem> - </varlistentry> +@@ -153,7 +153,7 @@ + + <listitem><para>A pretty operating system name in a format suitable for presentation to the + user. May or may not contain a release code name or OS version of some kind, as suitable. If not +- set, a default of <literal>PRETTY_NAME="Linux"</literal> may be used</para> ++ set, a default of <literal>PRETTY_NAME="GNU/Linux"</literal> may be used</para> + + <para>Example: <literal>PRETTY_NAME="Fedora 17 (Beefy Miracle)"</literal>.</para></listitem> + </varlistentry> diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index 4d81026084..f18bd92289 100644 --- a/src/analyze/analyze.c diff --git a/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch b/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch index 401d284fd..0d129516a 100644 --- a/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch +++ b/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch @@ -13,15 +13,15 @@ diff --git a/man/os-release.xml b/man/os-release.xml index 9ff4b7e8c2..1c069275c8 100644 --- a/man/os-release.xml +++ b/man/os-release.xml -@@ -98,7 +98,7 @@ - <listitem><para>A string identifying the operating system, - without a version component, and suitable for presentation to - the user. If not set, defaults to -- <literal>NAME=Linux</literal>. Example: -+ <literal>NAME=GNU/Linux</literal>. Example: - <literal>NAME=Fedora</literal> or <literal>NAME="Debian - GNU/Linux"</literal>.</para></listitem> - </varlistentry> +@@ -110,7 +110,7 @@ + <term><varname>NAME=</varname></term> + + <listitem><para>A string identifying the operating system, without a version component, and +- suitable for presentation to the user. If not set, a default of <literal>NAME=Linux</literal> may ++ suitable for presentation to the user. If not set, a default of <literal>NAME=GNU/Linux</literal> may + be used.</para> + + <para>Examples: <literal>NAME=Fedora</literal>, <literal>NAME="Debian GNU/Linux"</literal>. diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c index 9e77e314ff..3d0c3aafd7 100644 --- a/src/journal-remote/journal-gatewayd.c 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 58e157b21..a8b0ff5ce 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 -@@ -122,7 +122,7 @@ - the operating system, excluding any version information and - suitable for processing by scripts or usage in generated - filenames. If not set, defaults to -- <literal>ID=linux</literal>. Example: -+ <literal>ID=gnu-linux</literal>. Example: - <literal>ID=fedora</literal> or - <literal>ID=debian</literal>.</para></listitem> - </varlistentry> +@@ -123,7 +123,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> + + <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 d14058763..7fd0cafac 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 @@ -12,96 +12,86 @@ diff --git a/man/os-release.xml b/man/os-release.xml index 272258b4e1..6cea40cb99 100644 --- a/man/os-release.xml +++ b/man/os-release.xml -@@ -99,7 +99,7 @@ - without a version component, and suitable for presentation to - the user. If not set, defaults to - <literal>NAME=GNU/Linux</literal>. Example: -- <literal>NAME=Fedora</literal> or <literal>NAME="Debian -+ <literal>NAME=BLAG</literal> or <literal>NAME="gNewSense - GNU/Linux"</literal>.</para></listitem> - </varlistentry> - -@@ -110,8 +110,8 @@ - version, excluding any OS name information, possibly including - a release code name, and suitable for presentation to the - user. This field is optional. Example: -- <literal>VERSION=17</literal> or <literal>VERSION="17 (Beefy -- Miracle)"</literal>.</para></listitem> -+ <literal>VERSION=210k</literal> or <literal>VERSION="210k -+ (Spartakus)"</literal>.</para></listitem> - </varlistentry> - - <varlistentry> -@@ -123,8 +123,8 @@ - suitable for processing by scripts or usage in generated - filenames. If not set, defaults to - <literal>ID=gnu-linux</literal>. Example: -- <literal>ID=fedora</literal> or -- <literal>ID=debian</literal>.</para></listitem> -+ <literal>ID=blag</literal> or -+ <literal>ID=gnewsense</literal>.</para></listitem> - </varlistentry> - - <varlistentry> -@@ -145,9 +145,9 @@ - should be listed in order of how closely the local operating - system relates to the listed ones, starting with the closest. - This field is optional. Example: for an operating system with -- <literal>ID=centos</literal>, an assignment of -+ <literal>ID=blag</literal>, an assignment of - <literal>ID_LIKE="rhel fedora"</literal> would be appropriate. -- For an operating system with <literal>ID=ubuntu</literal>, an -+ For an operating system with <literal>ID=gnewsense</literal>, an - assignment of <literal>ID_LIKE=debian</literal> is - appropriate.</para></listitem> - </varlistentry> -@@ -176,8 +176,8 @@ - identifying the operating system version, excluding any OS - name information or release code name, and suitable for - processing by scripts or usage in generated filenames. This -- field is optional. Example: <literal>VERSION_ID=17</literal> -- or <literal>VERSION_ID=11.04</literal>.</para></listitem> -+ field is optional. Example: <literal>VERSION_ID=210k</literal> -+ or <literal>VERSION_ID=7.0</literal>.</para></listitem> - </varlistentry> - - <varlistentry> -@@ -188,8 +188,8 @@ - a release code name or OS version of some kind, as suitable. - If not set, defaults to - <literal>PRETTY_NAME="GNU/Linux"</literal>. Example: -- <literal>PRETTY_NAME="Fedora 17 (Beefy -- Miracle)"</literal>.</para></listitem> -+ <literal>PRETTY_NAME="BLAG 210k -+ (Spartakus)"</literal>.</para></listitem> - </varlistentry> - - <varlistentry> -@@ -212,7 +212,7 @@ - <ulink url="http://scap.nist.gov/specifications/cpe/">Common - Platform Enumeration Specification</ulink> as proposed by the - NIST. This field is optional. Example: -- <literal>CPE_NAME="cpe:/o:fedoraproject:fedora:17"</literal> -+ <literal>CPE_NAME="cpe:/o:blagblagblag:blag:210k"</literal> - </para></listitem> - </varlistentry> - -@@ -247,8 +247,8 @@ - one URL shall be listed in each setting. If multiple resources - need to be referenced, it is recommended to provide an online - landing page linking all available resources. Examples: -- <literal>HOME_URL="https://fedoraproject.org/"</literal> and -- <literal>BUG_REPORT_URL="https://bugzilla.redhat.com/"</literal></para></listitem> -+ <literal>HOME_URL="https://www.blagblagblag.org/"</literal> and -+ <literal>BUG_REPORT_URL="https://blag.fsf.org/"</literal></para></listitem> - </varlistentry> - - <varlistentry> -@@ -350,25 +350,19 @@ - <refsect1> - <title>Example</title> +@@ -113,7 +113,7 @@ + suitable for presentation to the user. If not set, a default of <literal>NAME=Linux</literal> may + be used.</para> + +- <para>Examples: <literal>NAME=Fedora</literal>, <literal>NAME="Debian GNU/Linux"</literal>. ++ <para>Examples: <literal>NAME=BLAG</literal>, <literal>NAME="gNewSense"</literal>. + </para></listitem> + </varlistentry> + +@@ -125,7 +125,7 @@ + processing by scripts or usage in generated filenames. If not set, a default of + <literal>ID=linux</literal> may be used.</para> + +- <para>Examples: <literal>ID=fedora</literal>, <literal>ID=debian</literal>.</para></listitem> ++ <para>Examples: <literal>ID=blag</literal>, <literal>ID=gnewsense</literal>.</para></listitem> + </varlistentry> + + <varlistentry> +@@ -142,9 +142,9 @@ + closely the local operating system relates to the listed ones, starting with the closest. This + field is optional.</para> + +- <para>Examples: for an operating system with <literal>ID=centos</literal>, an assignment of ++ <para>Examples: for an operating system with <literal>ID=blag</literal>, an assignment of + <literal>ID_LIKE="rhel fedora"</literal> would be appropriate. For an operating system with +- <literal>ID=ubuntu</literal>, an assignment of <literal>ID_LIKE=debian</literal> is appropriate. ++ <literal>ID=gnewsense</literal>, an assignment of <literal>ID_LIKE=gnewsense</literal> is appropriate. + </para></listitem> + </varlistentry> + +@@ -155,7 +155,7 @@ + user. May or may not contain a release code name or OS version of some kind, as suitable. If not + set, a default of <literal>PRETTY_NAME="Linux"</literal> may be used</para> + +- <para>Example: <literal>PRETTY_NAME="Fedora 17 (Beefy Miracle)"</literal>.</para></listitem> ++ <para>Example: <literal>PRETTY_NAME="BLAG 210k (Spartakus)"</literal>.</para></listitem> + </varlistentry> + + <varlistentry> +@@ -165,7 +165,7 @@ + url="http://scap.nist.gov/specifications/cpe/">Common Platform Enumeration Specification</ulink> as + proposed by the NIST. This field is optional.</para> + +- <para>Example: <literal>CPE_NAME="cpe:/o:fedoraproject:fedora:17"</literal></para></listitem> ++ <para>Example: <literal>CPE_NAME="cpe:/o:blagblagblag:blag:210k"</literal></para></listitem> + </varlistentry> + + <varlistentry> +@@ -208,7 +208,7 @@ + information, possibly including a release code name, and suitable for presentation to the + user. This field is optional.</para> -- <programlisting>NAME=Fedora +- <para>Examples: <literal>VERSION=17</literal>, <literal>VERSION="17 (Beefy Miracle)"</literal>. ++ <para>Examples: <literal>VERSION=210k</literal>, <literal>VERSION="210k (Spartakus)"</literal>. + </para></listitem> + </varlistentry> + +@@ -220,7 +220,7 @@ + or release code name, and suitable for processing by scripts or usage in generated filenames. This + field is optional.</para> + +- <para>Examples: <literal>VERSION_ID=17</literal>, <literal>VERSION_ID=11.04</literal>. ++ <para>Examples: <literal>VERSION_ID=210k</literal>, <literal>VERSION_ID=7.0</literal>. + </para></listitem> + </varlistentry> + +@@ -316,7 +316,7 @@ + need to be referenced, it is recommended to provide an online landing page linking all available + resources.</para> + +- <para>Examples: <literal>HOME_URL="https://fedoraproject.org/"</literal>, ++ <para>Examples: <literal>HOME_URL="https://www.blagblagblag.org/"</literal>, + <literal>BUG_REPORT_URL="https://bugzilla.redhat.com/"</literal>.</para></listitem> + </varlistentry> + +@@ -415,25 +415,19 @@ + <example> + <title><filename>os-release</filename> file for Fedora Workstation</title> + +- <programlisting>NAME=Fedora -VERSION="32 (Workstation Edition)" -ID=fedora -VERSION_ID=32 @@ -120,7 +110,7 @@ index 272258b4e1..6cea40cb99 100644 -PRIVACY_POLICY_URL="https://fedoraproject.org/wiki/Legal:PrivacyPolicy" -VARIANT="Workstation Edition" -VARIANT_ID=workstation</programlisting> -+ <programlisting>NAME=Parabola ++ <programlisting>NAME=Parabola +VERSION="rolling-release" +ID=parabola +ID_LIKE=arch @@ -133,9 +123,9 @@ index 272258b4e1..6cea40cb99 100644 +DOCUMENTATION_URL="https://wiki.parabola.nu/" +SUPPORT_URL="https://labs.parabola.nu/projects/parabola-community-forum/boards" +BUG_REPORT_URL="https://labs.parabola.nu/"</programlisting> - </refsect1> + </example> - <refsect1> + <example> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 588924ee61..34ff6a7e96 100644 --- a/man/systemd-nspawn.xml @@ -251,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 -@@ -11,5 +11,4 @@ - <!ENTITY KILL_USER_PROCESSES @KILL_USER_PROCESSES_YES_NO@> - <!ENTITY DEBUGTTY @DEBUGTTY@> - <!ENTITY RC_LOCAL_PATH @RC_LOCAL_PATH@> --<!ENTITY fedora_latest_version "33"> +@@ -12,5 +12,4 @@ + <!ENTITY DEBUGTTY "{{DEBUGTTY}}"> + <!ENTITY RC_LOCAL_PATH "{{RC_LOCAL_PATH}}"> + <!ENTITY HIGH_RLIMIT_NOFILE "{{HIGH_RLIMIT_NOFILE}}"> +-<!ENTITY fedora_latest_version "34"> -<!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 95c6a1d0a..c0f240a1d 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='fd9ad7d3bc35a3633b99edac14ff2a4fb10599b7' # git rev-parse v${_tag_name} -_tag_name=248.3 +_tag='b134c9cc4b02eddca2ea098324369018123fdf15' # git rev-parse v${_tag_name} +_tag_name=249 pkgver="${_tag_name/-/}" -pkgrel=2 +pkgrel=3 pkgrel+=.parabola1 arch=('x86_64') arch+=('i686' 'armv7h' 'ppc64le') @@ -22,13 +22,14 @@ 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-lxml' 'quota-tools' 'shadow' 'git' + 'python-jinja' 'python-lxml' 'quota-tools' 'shadow' 'git' 'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon' 'bash-completion' 'p11-kit' 'systemd' 'libfido2' 'tpm2-tss' 'rsync') makedepends_i686=('gnu-efi-libs' 'pkgconf') makedepends_x86_64=('gnu-efi-libs') options=('strip') validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net> + 'A9EA9081724FFAE0484C35A1A81CEA22BC8C7E2E' # Luca Boccassi <luca.boccassi@gmail.com> '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek@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" @@ -61,7 +62,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' - '882e486b6d88c8bafc50088845e41a49686e98981967f72ca1fb4ef07a01767400632f4b648fd31857d2a2a24a8fd65bcc2a8983284dd4fff2380732741d4c41' + '10f3b477527ec263cc6465c84d94416e356435930edc9e26844a0fd4f71e87a27fa0f91ce24b43a22cacdd2ead5e760e9d607369bc537a8da8d34021302a89a1' '34541f1967536524329867f9f341f8d9250d9d771c60dc3e6a22ccb82fc01f103cfd3f9903329777591ccbecd2446622a5d6b3804fa0411482b85c70593ee8ad' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' 'f599e1a35cba2c4e83e37c2299fac23ae128d8f68081283e71e1729384975dee1c4b677787f31a17890aeb98c8d2fc90405a202644290708ef9c027315022b17' @@ -82,11 +83,11 @@ sha512sums=('SKIP' '5aa475f37d35752a95e73417c38c4d3bc4d15d5f1052e95d75b4c4144b74c79af94da1d1e954be536339f9829a1ceb3a1bc5c6adceb187df7a8e5f5a83e4a850' '825b9dd0167c072ba62cabe0677e7cd20f2b4b850328022540f122689d8b25315005fa98ce867cf6e7460b2b26df16b88bb3b5c9ebf721746dce4e2271af7b97' 'e963859d9958e527802f118a5ac5f2051343a2ee987f60cae256fc4e8c71f5fe16439375a5d1caf0338f1156775ad087eaab9e8bf9d18633e62ea4d32e713e7f' - '3536a497e4d6cfae76296be7bf903c7645d6a85f96f57256196282f91d3845876d74ca121efeb81df8d524ec3c53f614157a90d213a5d3c4bb14958be701fff9' - 'fd0df3d365892d4d461a78bb0b728201e81c1269af07a38e134fadfc0ffb29aade7642142d128abcf88803b86494d7629ff5990359ef067feea3d476c7238a67' - 'e9e884015a40dc796fd8cbd8f79b3b9eebc7e48a332b22d52104c21c492be9982b35b7dd30bc29f2c2d274707ffd043eda059659844a4cd50eb433b8a3f7648c' + '8466d1945d72a7605e3a9c3402ddb8c67272506ffba89a35f3e7787e03d0e8895b6d52d9390899381b6763da00e49703953794696366b6c510e037c67aff96ac' + '1c93f6641d537290786137138db1ff8e23de754ce7dc20aaed458e13763f29cdddf699eeb9bb2cdaa244495ae1611784dcde7ef32846d2c4043d691ca682ea23' + 'fd12a2c799521b3d3a64665b3320af52a8f3c76cdc58df7faf0d0a6096418fb5f96fbb67433b18cd308770bc8f47f657d5a309a93488201c4dd5355c2fb345a7' 'c6a8a56c54415a266dcb57cc24fd91d085ca7298aca6b522e626f41ed216b13c9695ff4d209f7e60d24fb5e65e40ef5151c8d95db6950eda8a4150d28fcd56be' - '34acbb7c47b5ccd14adb6982b734cd718d478e3caf3b7f4e15795c3ba39f3c3f03b0a3f8f5a0c29b4342cd923f892daf55dd22598392900946ea8d185c706c78' + '1719a1e6d388a2f3052c981677f91c505e8799d2717b4608c28104d871e2ab943504bd7f930c34350ed81a4f95f8811151d911bbe785980edd6b2c803552f14e' '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839') _backports=( @@ -148,7 +149,9 @@ build() { fi local _meson_options=( - -Dversion-tag="${pkgver}-${pkgrel}-parabola" + # internal version comparison is incompatible with pacman: + # 249~rc1 < 249 < 249.1 < 249rc + -Dversion-tag="${_tag_name/-/\~}-${pkgrel}-parabola" -Dmode=release -Dima=false @@ -173,6 +176,12 @@ build() { -Drpmmacrosdir=no -Dsysvinit-path= -Dsysvrcnd-path= + + -Dsbat-distro='parabola' + -Dsbat-distro-summary='Parabola GNU/Linux-libre' + -Dsbat-distro-pkgname="${pkgname}" + -Dsbat-distro-version="${pkgver}" + -Dsbat-distro-url="https://www.parabola.nu/packages/libre/${CARCH}/${pkgname}/" ) if [ "$CARCH" != "armv7h" ]; then _meson_options+=(-Dgnu-efi=true) diff --git a/libre/systemd/systemd.install b/libre/systemd/systemd.install index bbc7efd83..cece9d2de 100644 --- a/libre/systemd/systemd.install +++ b/libre/systemd/systemd.install @@ -47,6 +47,10 @@ post_install() { post_upgrade() { post_common "$@" + if sd_booted; then + systemctl --system daemon-reexec + fi + local v upgrades=( 242.0-2 ) |