summaryrefslogtreecommitdiff
path: root/libre/systemd
diff options
context:
space:
mode:
Diffstat (limited to 'libre/systemd')
-rw-r--r--libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch22
-rw-r--r--libre/systemd/PKGBUILD25
2 files changed, 26 insertions, 21 deletions
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 1f49c9ee9..62cd0131c 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
@@ -18,14 +18,14 @@ index cd9756662a..9ead6ea39b 100644
--- a/man/kernel-install.xml
+++ b/man/kernel-install.xml
@@ -88,7 +88,7 @@
- <replaceable>PRETTY_NAME</replaceable> parameter specified
- in <filename>/etc/os-release</filename> or
- <filename>/usr/lib/os-release</filename> (if the former is
-- missing), or "Linux
-+ missing), or "GNU/Linux
- <replaceable>KERNEL-VERSION</replaceable>", if unset. If
- the file <filename>initrd</filename> is found next to the
- <filename>linux</filename> file, the initrd will be added to
+ <filename>/boot/loader/entries/<replaceable>MACHINE-ID</replaceable>-<replaceable>KERNEL-VERSION</replaceable>.conf</filename>.
+ The title of the entry is the <replaceable>PRETTY_NAME</replaceable> parameter specified in
+ <filename>/etc/os-release</filename> or <filename>/usr/lib/os-release</filename> (if the former is
+- missing), or "Linux <replaceable>KERNEL-VERSION</replaceable>", if unset. If the file
++ missing), or "GNU/Linux <replaceable>KERNEL-VERSION</replaceable>", if unset. If the file
+ <filename>initrd</filename> is found next to the kernel image file, the initrd will be added to the
+ configuration.</para></listitem>
+ </itemizedlist>
diff --git a/man/os-release.xml b/man/os-release.xml
index a51edf3b8a..9ff4b7e8c2 100644
--- a/man/os-release.xml
@@ -56,14 +56,14 @@ diff --git a/src/core/main.c b/src/core/main.c
index 44dd8348be..9a4fc26425 100644
--- a/src/core/main.c
+++ b/src/core/main.c
-@@ -1234,11 +1234,11 @@ static int status_welcome(void) {
- return status_printf(NULL, false, false,
+@@ -1375,11 +1375,11 @@
+ return status_printf(NULL, 0,
"\nWelcome to \x1B[%sm%s\x1B[0m!\n",
isempty(ansi_color) ? "1" : ansi_color,
- isempty(pretty_name) ? "Linux" : pretty_name);
+ isempty(pretty_name) ? "GNU/Linux" : pretty_name);
else
- return status_printf(NULL, false, false,
+ return status_printf(NULL, 0,
"\nWelcome to %s!\n",
- isempty(pretty_name) ? "Linux" : pretty_name);
+ isempty(pretty_name) ? "GNU/Linux" : pretty_name);
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD
index b2d87a19b..43fb95245 100644
--- a/libre/systemd/PKGBUILD
+++ b/libre/systemd/PKGBUILD
@@ -11,10 +11,10 @@ pkgname+=('systemd-common' 'systemd-udev')
_libsystemd=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve')
pkgname+=("${_libsystemd[@]/#/systemd-}")
# Can be from either systemd or systemd-stable
-_commit='3bf819c4ca718a6bc4b3b871cf52a0d1b518967d'
-pkgver=239.370
-pkgrel=1
-pkgrel+=.par2
+_commit='f02b5472c6f0c41e5dc8dc2c84590866baf937ff'
+pkgver=240.34
+pkgrel=3
+pkgrel+=.parabola1
arch=('x86_64')
arch+=('i686' 'armv7h' 'ppc64le')
url='https://www.github.com/systemd/systemd'
@@ -24,7 +24,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
'python-lxml' 'quota-tools' 'shadow' 'git'
'meson' 'libseccomp' 'pcre2' 'audit' 'kexec-tools' 'libxkbcommon'
'bash-completion')
-makedepends_i686=('gnu-efi-libs')
+makedepends_i686=('gnu-efi-libs' 'pkgconf')
makedepends_x86_64=('gnu-efi-libs')
options=('strip')
validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering <lennart@poettering.net>
@@ -80,7 +80,7 @@ sha512sums=('SKIP'
'c4463fdd25e14a836ac3b874109861a55a0169c4206b6356b53974dd4621f645652087ebf4c738b18734a718fe7fd9ec6b700ce8dd9736525274eb16b10385e6'
'209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67'
'a40678af1cd677535fb71084f70a10b74e61592c48a7f3901d6b51429c0bae179208b4aebd6700871fdf334d67703c955f01a0cd5165571f53435783c457d568'
- 'ae00ccf95c8cf5b6051d7c316eed36a450939d40d0d2c62aaa0ba16eb6fe3a3b1d703ea73593ff2e73f2268d30fb3dce3810528b15c9259353c3a4c158b0cc38'
+ 'ff25035b5ed7b7b1720850573235159dee3d3aa5ca042cd5249094727f0e1d9dbf249d5612a1f2fefc20ed1618000277f2c3542ac513465764a98a3405455be2'
'fd0df3d365892d4d461a78bb0b728201e81c1269af07a38e134fadfc0ffb29aade7642142d128abcf88803b86494d7629ff5990359ef067feea3d476c7238a67'
'e9e884015a40dc796fd8cbd8f79b3b9eebc7e48a332b22d52104c21c492be9982b35b7dd30bc29f2c2d274707ffd043eda059659844a4cd50eb433b8a3f7648c'
'0d6b894149ec8d0612d1be1dee5daa1768345232e450435ddc750e36a8309dd96782a92f0220169c69103b1c4632af708e4a737cb7ba817944c92dcb61379a30'
@@ -88,6 +88,11 @@ sha512sums=('SKIP'
'28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839')
_backports=(
+ # https://github.com/systemd/systemd/issues/11259
+ '8ca9e92c742602b8bcd431001e6f5b78c28c184f'
+
+ # https://github.com/systemd/systemd/issues/11314
+ 'ee0b9e721a368742ac6fa9c3d9a33e45dc3203a2'
)
_reverts=(
@@ -157,18 +162,18 @@ build() {
-Dlz4=true
-Ddbuspolicydir=/usr/share/dbus-1/system.d
- # TODO(dreisner): consider changing this to unified
-Ddefault-hierarchy=hybrid
+ -Ddefault-locale=C
-Ddefault-kill-user-processes=false
-Dfallback-hostname='parabola'
- -Dntp-servers="${_timeservers[*]}"
-Ddns-servers="${_nameservers[*]}"
+ -Dntp-servers="${_timeservers[*]}"
-Drpmmacrosdir=no
-Dsysvinit-path=
-Dsysvrcnd-path=
)
if [ "$CARCH" != "armv7h" ]; then
- meson_options+=(-Dgnu-efi=true)
+ _meson_options+=(-Dgnu-efi=true)
fi
arch-meson "$pkgbase-stable" build "${_meson_options[@]}"
@@ -420,7 +425,7 @@ package_systemd-nss-resolve() {
}
package_systemd-resolvconf() {
- pkgdesc='systemd resolvconf replacement'
+ pkgdesc='systemd resolvconf replacement (for use with systemd-resolved)'
license=('LGPL2.1')
depends=('systemd')
provides=('openresolv' 'resolvconf')