pool/systemd
SHA256
2
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 700167 from home:fbui:systemd:openSUSE-Factory

Browse Source 
- Upgrade to v242 (commit 071c380dcc434dca2a0c8b6de0519cc9e816c6d6)
  See https://github.com/openSUSE/systemd/blob/SUSE/v242/NEWS for
  details.

- Drop "BuildRequires:  -post-build-checks" from the specfile (bsc#1130230)
  The syntax of this directive is obsolete and should be replaced by
  "#!BuildIgnore: post-build-checks".
  However there's no good reasons to disable these SUSE extra checks,
  so let's re-enable them and fix the few errors it detected.

OBS-URL: https://build.opensuse.org/request/show/700167
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1059
This commit is contained in:
Franck Bui 2019-05-02 14:58:57 +00:00 committed by Git OBS Bridge
parent a47f4d3c79
commit 957a8497e0
8 changed files with 120 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0001-logind-keep-backward-compatibility-with-UserTasksMax.patch
View File

@ -1,4 +1,4 @@
From 819616fabe327d4baf587337f427c24588192af5 Mon Sep 17 00:00:00 2001
From ce59acc7743f1897a335449b718f9ede33add394 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Tue, 6 Nov 2018 11:51:26 +0100
Subject: [PATCH] logind: keep backward compatibility with UserTasksMax= in
@ -23,17 +23,17 @@ The main advantages to use a generator are:
Expect this generator to be dropped in the future.
---
meson.build | 8 ++++
src/login/compat-tasks-max-generator.c | 66 ++++++++++++++++++++++++++
src/login/logind-user.c | 43 +++++++++++++++--
3 files changed, 112 insertions(+), 5 deletions(-)
meson.build | 8 +++
src/login/compat-tasks-max-generator.c | 68 ++++++++++++++++++++++++++
src/login/logind-user.c | 43 ++++++++++++++--
3 files changed, 114 insertions(+), 5 deletions(-)
create mode 100644 src/login/compat-tasks-max-generator.c
diff --git a/meson.build b/meson.build
index eacadc1505..7c00470fff 100644
index dc6e970095..d834108f24 100644
--- a/meson.build
+++ b/meson.build
@@ -1866,6 +1866,14 @@ if conf.get('ENABLE_LOGIND') == 1
@@ -1885,6 +1885,14 @@ if conf.get('ENABLE_LOGIND') == 1
endif
endif
@ -50,11 +50,13 @@ index eacadc1505..7c00470fff 100644
include_directories : includes,
diff --git a/src/login/compat-tasks-max-generator.c b/src/login/compat-tasks-max-generator.c
new file mode 100644
index 0000000000..404ca5f237
index 0000000000..964d0596fb
--- /dev/null
+++ b/src/login/compat-tasks-max-generator.c
@@ -0,0 +1,66 @@
@@ -0,0 +1,68 @@
+#include <stdint.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "alloc-util.h"
+#include "dropin.h"
@ -121,10 +123,10 @@ index 0000000000..404ca5f237
+ return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+}
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index ae27bfb662..bbcac62783 100644
index 045b6f0e17..1c19d6512b 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -843,17 +843,50 @@ int config_parse_compat_user_tasks_max(
@@ -847,17 +847,50 @@ int config_parse_compat_user_tasks_max(
void *data,
void *userdata) {
@ -181,5 +183,5 @@ index ae27bfb662..bbcac62783 100644
return 0;
}
--
2.20.1
2.21.0

51
debug-only-remove-new-policies.patch Normal file
View File

@ -0,0 +1,51 @@
diff --git a/src/login/org.freedesktop.login1.policy b/src/login/org.freedesktop.login1.policy
index 6dc79aa32a..398fb7bc21 100644
--- a/src/login/org.freedesktop.login1.policy
+++ b/src/login/org.freedesktop.login1.policy
@@ -337,17 +337,6 @@
</defaults>
</action>
- <action id="org.freedesktop.login1.set-reboot-parameter">
- <description gettext-domain="systemd">Set the reboot "reason" in the kernel</description>
- <message gettext-domain="systemd">Authentication is required to set the reboot "reason" in the kernel.</message>
- <defaults>
- <allow_any>auth_admin_keep</allow_any>
- <allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>yes</allow_active>
- </defaults>
- <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.reboot</annotate>
- </action>
-
<action id="org.freedesktop.login1.set-reboot-to-firmware-setup">
<description gettext-domain="systemd">Indicate to the firmware to boot to setup interface</description>
<message gettext-domain="systemd">Authentication is required to indicate to the firmware to boot to setup interface.</message>
@@ -359,28 +348,6 @@
<annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.reboot</annotate>
</action>
- <action id="org.freedesktop.login1.set-reboot-to-boot-loader-menu">
- <description gettext-domain="systemd">Indicate to the boot loader to boot to the boot loader menu</description>
- <message gettext-domain="systemd">Authentication is required to indicate to the boot loader to boot to the boot loader menu.</message>
- <defaults>
- <allow_any>auth_admin_keep</allow_any>
- <allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>yes</allow_active>
- </defaults>
- <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.reboot</annotate>
- </action>
-
- <action id="org.freedesktop.login1.set-reboot-to-boot-loader-entry">
- <description gettext-domain="systemd">Indicate to the boot loader to boot a specific entry</description>
- <message gettext-domain="systemd">Authentication is required to indicate to the boot loader to boot into a specific boot loader entry.</message>
- <defaults>
- <allow_any>auth_admin_keep</allow_any>
- <allow_inactive>auth_admin_keep</allow_inactive>
- <allow_active>yes</allow_active>
- </defaults>
- <annotate key="org.freedesktop.policykit.imply">org.freedesktop.login1.reboot</annotate>
- </action>
-
<action id="org.freedesktop.login1.set-wall-message">
<description gettext-domain="systemd">Set a wall message</description>
<message gettext-domain="systemd">Authentication is required to set a wall message</message>

19
systemd-mini.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Thu May 2 13:12:23 UTC 2019 - Franck Bui <fbui@suse.com>
- Upgrade to v242 (commit 071c380dcc434dca2a0c8b6de0519cc9e816c6d6)
See https://github.com/openSUSE/systemd/blob/SUSE/v242/NEWS for
details.
-------------------------------------------------------------------
Wed Apr 24 07:23:44 UTC 2019 - Franck Bui <fbui@suse.com>
- Drop "BuildRequires: -post-build-checks" from the specfile (bsc#1130230)
The syntax of this directive is obsolete and should be replaced by
"#!BuildIgnore: post-build-checks".
However there's no good reasons to disable these SUSE extra checks,
so let's re-enable them and fix the few errors it detected.
-------------------------------------------------------------------
Fri Apr 12 14:13:54 UTC 2019 - Franck Bui <fbui@suse.com>

13
systemd-mini.spec
View File

@ -26,7 +26,7 @@
##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! #####
%define mini -mini
%define min_kernel_version 4.5
%define suse_version +suse.46.g4e6e66ea9
%define suse_version +suse.56.g071c380dcc
%bcond_with gnuefi
%if 0%{?bootstrap}
@ -53,14 +53,13 @@
Name: systemd-mini
Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 241
Version: 242
Release: 0
Summary: A System and Session Manager
License: LGPL-2.1-or-later
Group: System/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if ! 0%{?bootstrap}
BuildRequires: -post-build-checks
BuildRequires: docbook-xsl-stylesheets
BuildRequires: kbd
BuildRequires: libapparmor-devel
@ -167,6 +166,7 @@ Source200: scripts-udev-convert-lib-udev-path.sh
# merged by upstream.
Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch
Patch3: debug-only-remove-new-policies.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -606,6 +606,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
# Make sure directories in /var exist
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/coredump
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/catalog
# Create ghost databases
touch %{buildroot}%{_localstatedir}/lib/systemd/catalog/database
touch %{buildroot}%{_sysconfdir}/udev/hwdb.bin
@ -942,6 +943,7 @@ fi
%{_bindir}/systemd-cat
%dir %{_prefix}/lib/kernel
%dir %{_prefix}/lib/kernel/install.d
%{_prefix}/lib/kernel/install.d/00-entry-directory.install
%{_prefix}/lib/kernel/install.d/50-depmod.install
%{_prefix}/lib/kernel/install.d/90-loaderentry.install
%dir %{_prefix}/lib/systemd
@ -1090,11 +1092,9 @@ fi
%{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf
%{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf
%if %{with networkd}
%{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
%endif
%if %{with resolved}
%{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf
%endif
@ -1142,6 +1142,7 @@ fi
%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
%if %{with networkd}
%dir %{_datadir}/polkit-1/rules.d
%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules
%endif
%if %{with resolved}
@ -1263,7 +1264,7 @@ fi
%{_prefix}/lib/udev/scripts/
%dir %{_sysconfdir}/udev/
%dir %{_sysconfdir}/udev/rules.d/
%ghost %{_sysconfdir}/udev/hwdb.bin
%ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin
%config(noreplace) %{_sysconfdir}/udev/udev.conf
%if ! 0%{?bootstrap}
%{_mandir}/man5/udev*

3
systemd-v241+suse.46.g4e6e66ea9.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5f2a3be6a40ed5994348c6db064051f09470bdfd0f0be6012b01209f26ccf3ee
size 5192692

3
systemd-v242+suse.56.g071c380dcc.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:25e46b15e7c13e0c8492a3593b74257f8586a1124bf094b1c6de12ee2c4a735b
size 5322252

19
systemd.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Thu May 2 13:12:23 UTC 2019 - Franck Bui <fbui@suse.com>
- Upgrade to v242 (commit 071c380dcc434dca2a0c8b6de0519cc9e816c6d6)
See https://github.com/openSUSE/systemd/blob/SUSE/v242/NEWS for
details.
-------------------------------------------------------------------
Wed Apr 24 07:23:44 UTC 2019 - Franck Bui <fbui@suse.com>
- Drop "BuildRequires: -post-build-checks" from the specfile (bsc#1130230)
The syntax of this directive is obsolete and should be replaced by
"#!BuildIgnore: post-build-checks".
However there's no good reasons to disable these SUSE extra checks,
so let's re-enable them and fix the few errors it detected.
-------------------------------------------------------------------
Fri Apr 12 14:13:54 UTC 2019 - Franck Bui <fbui@suse.com>

13
systemd.spec
View File

@ -24,7 +24,7 @@
%define bootstrap 0
%define mini %nil
%define min_kernel_version 4.5
%define suse_version +suse.46.g4e6e66ea9
%define suse_version +suse.56.g071c380dcc
%bcond_with gnuefi
%if 0%{?bootstrap}
@ -51,14 +51,13 @@
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 241
Version: 242
Release: 0
Summary: A System and Session Manager
License: LGPL-2.1-or-later
Group: System/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if ! 0%{?bootstrap}
BuildRequires: -post-build-checks
BuildRequires: docbook-xsl-stylesheets
BuildRequires: kbd
BuildRequires: libapparmor-devel
@ -165,6 +164,7 @@ Source200: scripts-udev-convert-lib-udev-path.sh
# merged by upstream.
Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch
Patch3: debug-only-remove-new-policies.patch
%description
Systemd is a system and service manager, compatible with SysV and LSB
@ -604,6 +604,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
# Make sure directories in /var exist
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/coredump
mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/catalog
# Create ghost databases
touch %{buildroot}%{_localstatedir}/lib/systemd/catalog/database
touch %{buildroot}%{_sysconfdir}/udev/hwdb.bin
@ -940,6 +941,7 @@ fi
%{_bindir}/systemd-cat
%dir %{_prefix}/lib/kernel
%dir %{_prefix}/lib/kernel/install.d
%{_prefix}/lib/kernel/install.d/00-entry-directory.install
%{_prefix}/lib/kernel/install.d/50-depmod.install
%{_prefix}/lib/kernel/install.d/90-loaderentry.install
%dir %{_prefix}/lib/systemd
@ -1088,11 +1090,9 @@ fi
%{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf
%{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf
%if %{with networkd}
%{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
%endif
%if %{with resolved}
%{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf
%endif
@ -1140,6 +1140,7 @@ fi
%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy
%if %{with networkd}
%dir %{_datadir}/polkit-1/rules.d
%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules
%endif
%if %{with resolved}
@ -1261,7 +1262,7 @@ fi
%{_prefix}/lib/udev/scripts/
%dir %{_sysconfdir}/udev/
%dir %{_sysconfdir}/udev/rules.d/
%ghost %{_sysconfdir}/udev/hwdb.bin
%ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin
%config(noreplace) %{_sysconfdir}/udev/udev.conf
%if ! 0%{?bootstrap}
%{_mandir}/man5/udev*