From 6d40c7a496a53725f05ab36599b185ac9b3780bc Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Fri, 3 Apr 2020 11:10:50 -0500 Subject: systemd-245.4-2.parabola1: updating version --- ...homed-userdbd-repart-services-installable.patch | 171 +++++++++++++++++++++ libre/systemd/PKGBUILD | 12 +- 2 files changed, 178 insertions(+), 5 deletions(-) create mode 100644 libre/systemd/0002-make-homed-userdbd-repart-services-installable.patch (limited to 'libre/systemd') diff --git a/libre/systemd/0002-make-homed-userdbd-repart-services-installable.patch b/libre/systemd/0002-make-homed-userdbd-repart-services-installable.patch new file mode 100644 index 000000000..ef81b9cfe --- /dev/null +++ b/libre/systemd/0002-make-homed-userdbd-repart-services-installable.patch @@ -0,0 +1,171 @@ +From 7e1ed1f3b29162df25064b33dc55ac8cf432bb0b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Fri, 13 Mar 2020 18:33:44 +0100 +Subject: [PATCH 1/3] units: make systemd-repart.service installable + +This essentially adds another layer of configurability: +build disable, this, presence of configuration. The default is +set to enabled, because the service does nothing w/o config. +--- + presets/90-systemd.preset | 1 + + units/meson.build | 3 +-- + units/systemd-repart.service.in | 6 +++++- + 3 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset +index dc9d02f0b9..7406c92a5c 100644 +--- a/presets/90-systemd.preset ++++ b/presets/90-systemd.preset +@@ -19,6 +19,7 @@ enable getty@.service + enable systemd-timesyncd.service + enable systemd-networkd.service + enable systemd-resolved.service ++enable systemd-repart.service + + disable console-getty.service + disable debug-shell.service +diff --git a/units/meson.build b/units/meson.build +index ea91f0cc9e..9964eb79a4 100644 +--- a/units/meson.build ++++ b/units/meson.build +@@ -228,8 +228,7 @@ in_units = [ + 'multi-user.target.wants/'], + ['systemd-vconsole-setup.service', 'ENABLE_VCONSOLE'], + ['systemd-volatile-root.service', ''], +- ['systemd-repart.service', 'ENABLE_REPART', +- 'sysinit.target.wants/ initrd-root-fs.target.wants/'], ++ ['systemd-repart.service', 'ENABLE_REPART'], + ['user-runtime-dir@.service', ''], + ['user@.service', ''], + ] +diff --git a/units/systemd-repart.service.in b/units/systemd-repart.service.in +index 7ce6aefd29..41a9d82b93 100644 +--- a/units/systemd-repart.service.in ++++ b/units/systemd-repart.service.in +@@ -21,5 +21,9 @@ Type=oneshot + RemainAfterExit=yes + ExecStart=@rootbindir@/systemd-repart --dry-run=no + +-# The tool returns 77 if there's no GPT partition table pre-existing ++# The tool returns 77 if there's no existing GPT partition table + SuccessExitStatus=77 ++ ++[Install] ++WantedBy=sysinit.target ++WantedBy=initrd-root-fs.target +From 5ef9eda17fda06aaf81ab3f0ff6f87a80b860c94 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Fri, 13 Mar 2020 18:38:09 +0100 +Subject: [PATCH 2/3] units: make systemd-homed.service installable + +Fixes #15083. Users might want to disable homed if not used to save resources. +--- + presets/90-systemd.preset | 1 + + test/units/testsuite-46.service | 4 +++- + units/meson.build | 3 +-- + units/systemd-homed.service.in | 4 ++++ + 4 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset +index 7406c92a5c..53eb8a7806 100644 +--- a/presets/90-systemd.preset ++++ b/presets/90-systemd.preset +@@ -20,6 +20,7 @@ enable systemd-timesyncd.service + enable systemd-networkd.service + enable systemd-resolved.service + enable systemd-repart.service ++enable systemd-homed.service + + disable console-getty.service + disable debug-shell.service +diff --git a/units/meson.build b/units/meson.build +index 9964eb79a4..d8ee6df184 100644 +--- a/units/meson.build ++++ b/units/meson.build +@@ -201,8 +201,7 @@ in_units = [ + ['systemd-portabled.service', 'ENABLE_PORTABLED', + 'dbus-org.freedesktop.portable1.service'], + ['systemd-userdbd.service', 'ENABLE_USERDB'], +- ['systemd-homed.service', 'ENABLE_HOMED', +- 'multi-user.target.wants/ dbus-org.freedesktop.home1.service'], ++ ['systemd-homed.service', 'ENABLE_HOMED'], + ['systemd-quotacheck.service', 'ENABLE_QUOTACHECK'], + ['systemd-random-seed.service', 'ENABLE_RANDOMSEED', + 'sysinit.target.wants/'], +diff --git a/units/systemd-homed.service.in b/units/systemd-homed.service.in +index 7cf98e6fa6..8138f5125c 100644 +--- a/units/systemd-homed.service.in ++++ b/units/systemd-homed.service.in +@@ -34,3 +34,7 @@ SystemCallArchitectures=native + SystemCallErrorNumber=EPERM + SystemCallFilter=@system-service @mount + @SERVICE_WATCHDOG@ ++ ++[Install] ++WantedBy=multi-user.target ++Alias=dbus-org.freedesktop.home1.service +From ead7af30939e3f1903455c7e06bc7cfeef54d4a2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Fri, 13 Mar 2020 18:40:54 +0100 +Subject: [PATCH 3/3] units: make systemd-userdbd.{socket,service} installable + +It's lightweight and generally useful, so it should be enabled by default. But +users might want to disable it for whatever reason, and things should be fine +without it, so let's make it installable so it can be disabled if wanted. + +Fixes #15175. +--- + presets/90-systemd.preset | 1 + + units/meson.build | 3 +-- + units/systemd-userdbd.service.in | 3 +++ + units/systemd-userdbd.socket | 3 +++ + 4 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/presets/90-systemd.preset b/presets/90-systemd.preset +index 53eb8a7806..db61ef12d3 100644 +--- a/presets/90-systemd.preset ++++ b/presets/90-systemd.preset +@@ -21,6 +21,7 @@ enable systemd-networkd.service + enable systemd-resolved.service + enable systemd-repart.service + enable systemd-homed.service ++enable systemd-userdbd.socket + + disable console-getty.service + disable debug-shell.service +diff --git a/units/meson.build b/units/meson.build +index d8ee6df184..8ec9eb94e4 100644 +--- a/units/meson.build ++++ b/units/meson.build +@@ -139,8 +139,7 @@ units = [ + 'sysinit.target.wants/'], + ['systemd-udevd-kernel.socket', '', + 'sockets.target.wants/'], +- ['systemd-userdbd.socket', 'ENABLE_USERDB', +- 'sockets.target.wants/'], ++ ['systemd-userdbd.socket', 'ENABLE_USERDB'], + ['time-set.target', ''], + ['time-sync.target', ''], + ['timers.target', ''], +diff --git a/units/systemd-userdbd.service.in b/units/systemd-userdbd.service.in +index e30ed2109e..3b76705373 100644 +--- a/units/systemd-userdbd.service.in ++++ b/units/systemd-userdbd.service.in +@@ -39,3 +39,6 @@ SystemCallErrorNumber=EPERM + SystemCallFilter=@system-service + Type=notify + @SERVICE_WATCHDOG@ ++ ++[Install] ++Also=systemd-userdbd.socket +diff --git a/units/systemd-userdbd.socket b/units/systemd-userdbd.socket +index 1c749ea1d2..2b4bb7a87a 100644 +--- a/units/systemd-userdbd.socket ++++ b/units/systemd-userdbd.socket +@@ -17,3 +17,6 @@ Before=sockets.target + ListenStream=/run/systemd/userdb/io.systemd.Multiplexer + Symlinks=/run/systemd/userdb/io.systemd.NameServiceSwitch + SocketMode=0666 ++ ++[Install] ++WantedBy=sockets.target diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index fdd45cfd6..4461fd8bb 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -11,8 +11,8 @@ 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='f4d7fa4807ada3c1b7d6f67117eadbb014b67d2f' # git rev-parse v${pkgver} -pkgver=245.3 +_tag='5d6baa2d17edd3e355dc6f165876988ed52c0940' # git rev-parse v${pkgver} +pkgver=245.4 pkgrel=2 pkgrel+=.parabola1 arch=('x86_64') @@ -32,6 +32,7 @@ validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4' # Lennart Poettering < source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed" "git+https://github.com/systemd/systemd#tag=v${pkgver%.*}?signed" '0001-Use-Arch-Linux-device-access-groups.patch' + '0002-make-homed-userdbd-repart-services-installable.patch' 'initcpio-hook-udev' 'initcpio-install-systemd' 'initcpio-install-udev' @@ -60,6 +61,7 @@ source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed" sha512sums=('SKIP' 'SKIP' 'e38c7c422c82953f9c2476a5ab8009d614cbec839e4088bff5db7698ddc84e3d8ed64f32ed323f57b1913c5c9703546f794996cb415ed7cdda930b627962a3c4' + '85d11bbbb5c10016e4a67eec051315e2e292939844f260bf698018c5bd1c516c28444f635eb15832a23e26891c4beda14bacfa57fdeda45c00f1b653abe3b123' 'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73' '01de24951a05d38eca6b615a7645beb3677ca0e0f87638d133649f6dc14dcd2ea82594a60b793c31b14493a286d1d11a0d25617f54dbfa02be237652c8faa691' 'a25b28af2e8c516c3a2eec4e64b8c7f70c21f974af4a955a4a9d45fd3e3ff0d2a98b4419fe425d47152d5acae77d64e69d8d014a7209524b75a81b0edb10bf3a' @@ -89,9 +91,6 @@ sha512sums=('SKIP' _backports=( # systemd-resolved: use hostname for certificate validation in DoT 'eec394f10bbfcc3d2fc8504ad8ff5be44231abd5' - - # user-util: Allow names starting with a digit - '93c23c9297e48e594785e0bb9c51504aae5fbe3e' ) _reverts=( @@ -116,6 +115,9 @@ prepare() { # Replace cdrom/dialout/tape groups with optical/uucp/storage patch -Np1 -i ../0001-Use-Arch-Linux-device-access-groups.patch + # Make homed/userdbd/repart services installable (to allow uninstalling) + patch -Np1 -i ../0002-make-homed-userdbd-repart-services-installable.patch + # apply FSDG patches local _patch for _patch in "$srcdir"/????-FSDG-*.patch; do -- cgit v1.2.3