Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2019-03-13 09:08:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd" Wed Mar 13 09:08:15 2019 rev:293 rq:683889 version:241 Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2019-02-20 14:09:08.714983072 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new.28833/systemd-mini.changes 2019-03-13 09:08:34.923427909 +0100 @@ -1,0 +2,38 @@ +Mon Mar 11 12:58:19 UTC 2019 - Franck Bui <[email protected]> + +- Stop installing macros.systemd + + There're no points in installing this file if we remove it right + after. + +------------------------------------------------------------------- +Mon Mar 11 10:48:54 UTC 2019 - Franck Bui <[email protected]> + +- Make sure systemd-network.rules take precedence over our polkit-default-privs (bsc#1125438) + +------------------------------------------------------------------- +Thu Mar 7 14:27:59 UTC 2019 - Franck Bui <[email protected]> + +- Include the SUSE version along with the major version of systemd + + $ systemctl --version + systemd 241 (+suse.42.g15a1b4d58) + + Note that the SUSE version format maybe subject to change and as + such scripts should not try to parse it. + +------------------------------------------------------------------- +Wed Mar 6 14:59:22 UTC 2019 - Franck Bui <[email protected]> + +- systemd-mini: explicitly disable some of the systemd components + + For some reasons, some build requirements get pulled in for the mini + variant now, enabling some parts of the code that were expected to + be turned OFF. + +------------------------------------------------------------------- +Tue Mar 5 17:51:02 UTC 2019 - Franck Bui <[email protected]> + +- Upgrade to v241 (commit 15a1b4d58f1d2bc9c21c7cbab6fe63b58e48bda1) + +------------------------------------------------------------------- systemd.changes: same change Old: ---- systemd-v239+suse.205.ga1d86af7e.tar.xz New: ---- systemd-v241+suse.42.g15a1b4d58.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.nFZKdr/_old 2019-03-13 09:08:37.003427694 +0100 +++ /var/tmp/diff_new_pack.nFZKdr/_new 2019-03-13 09:08:37.007427694 +0100 @@ -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.205.ga1d86af7e +%define suse_version +suse.42.g15a1b4d58 %bcond_with gnuefi %if 0%{?bootstrap} @@ -53,7 +53,7 @@ Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 239 +Version: 241 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -434,12 +434,13 @@ # keep split-usr until all packages have moved their systemd rules to /usr %meson \ + -Dversion-tag=%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ -Dsplit-usr=true \ -Dsplit-bin=true \ -Dpamlibdir=/%{_lib}/security \ - -Drpmmacrosdir=%{_prefix}/lib/rpm/macros.d \ + -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ -Ddefault-hierarchy=hybrid \ -Ddefault-kill-user-processes=false \ @@ -456,20 +457,29 @@ %if 0%{?bootstrap} -Dman=false \ -Dhtml=false \ - -Dmyhostname=false \ + -Dnss-myhostname=false \ %endif %if %{without coredump} -Dcoredump=false \ %endif +%if %{without gnuefi} + -Dgnu-efi=false \ +%endif +%if %{without importd} + -Dimportd=false \ +%endif +%if %{without journal_remote} + -Dremote=false \ +%endif +%if %{without machined} + -Dmachined=false \ +%endif %if %{without networkd} -Dnetworkd=false \ %endif %if %{without resolved} -Dresolve=false \ %endif -%if %{without machined} - -Dmachined=false \ -%endif %if %{without sysvcompat} -Dsysvinit-path= \ -Dsysvrcnd-path= \ @@ -535,8 +545,7 @@ rm -rf %{buildroot}/etc/systemd/system/*.target.wants rm -f %{buildroot}/etc/systemd/system/default.target -# Overwrite /etc/pam.d/systemd-user shipped by upstream with one -# customized for openSUSE distros. +# Replace /etc/pam.d/systemd-user shipped by upstream with the openSUSE one. install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ # Remove tmp.mount from the unit search path as /tmp doesn't use tmpfs @@ -552,6 +561,13 @@ # aaa_base (in procps for now) rm -f %{buildroot}%{_sysctldir}/50-default.conf +# Make sure systemd-network polkit rules file starts with a suitable +# number prefix so it takes precedence over our polkit-default-privs. +%if %{with networkd} +mv %{buildroot}%{_datadir}/polkit-1/rules.d/systemd-networkd.rules \ + %{buildroot}%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules +%endif + # since v207 /etc/sysctl.conf is no longer parsed (commit # 04bf3c1a60d82791), however backward compatibility is provided by # /usr/lib/sysctl.d/99-sysctl.conf. @@ -645,9 +661,6 @@ %fdupes -s %{buildroot}%{_mandir} -# packaged in systemd-rpm-macros -rm -f %{buildroot}/%{_prefix}/lib/rpm/macros.d/macros.systemd - # Make sure to disable all services by default. The Suse branding # presets package takes care of defining the right policies. rm -f %{buildroot}%{_presetdir}/*.preset @@ -901,6 +914,7 @@ %{_bindir}/systemd-delta %{_bindir}/systemd-escape %{_bindir}/systemd-firstboot +%{_bindir}/systemd-id128 %{_bindir}/systemd-path %{_bindir}/systemd-sysusers %{_bindir}/systemd-mount @@ -1048,11 +1062,16 @@ %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh %config(noreplace) %{_sysconfdir}/pam.d/systemd-user -%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf -%config(noreplace) %{_sysconfdir}/systemd/system.conf -%config(noreplace) %{_sysconfdir}/systemd/logind.conf + %config(noreplace) %{_sysconfdir}/systemd/journald.conf +%config(noreplace) %{_sysconfdir}/systemd/logind.conf +%config(noreplace) %{_sysconfdir}/systemd/sleep.conf +%config(noreplace) %{_sysconfdir}/systemd/system.conf +%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf +%if %{with networkd} +%config(noreplace) %{_sysconfdir}/systemd/networkd.conf +%endif %if %{with resolved} %config(noreplace) %{_sysconfdir}/systemd/resolved.conf %endif @@ -1121,7 +1140,7 @@ %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy %if %{with networkd} -%{_datadir}/polkit-1/rules.d/systemd-networkd.rules +%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules %endif %if %{with resolved} %{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy @@ -1228,7 +1247,6 @@ %{_prefix}/lib/udev/ata_id %{_prefix}/lib/udev/path_id_compat %{_prefix}/lib/udev/cdrom_id -%{_prefix}/lib/udev/collect %{_prefix}/lib/udev/mtd_probe %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.nFZKdr/_old 2019-03-13 09:08:37.027427691 +0100 +++ /var/tmp/diff_new_pack.nFZKdr/_new 2019-03-13 09:08:37.027427691 +0100 @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.205.ga1d86af7e +%define suse_version +suse.42.g15a1b4d58 %bcond_with gnuefi %if 0%{?bootstrap} @@ -51,7 +51,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 239 +Version: 241 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -432,12 +432,13 @@ # keep split-usr until all packages have moved their systemd rules to /usr %meson \ + -Dversion-tag=%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ -Dsplit-usr=true \ -Dsplit-bin=true \ -Dpamlibdir=/%{_lib}/security \ - -Drpmmacrosdir=%{_prefix}/lib/rpm/macros.d \ + -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ -Ddefault-hierarchy=hybrid \ -Ddefault-kill-user-processes=false \ @@ -454,20 +455,29 @@ %if 0%{?bootstrap} -Dman=false \ -Dhtml=false \ - -Dmyhostname=false \ + -Dnss-myhostname=false \ %endif %if %{without coredump} -Dcoredump=false \ %endif +%if %{without gnuefi} + -Dgnu-efi=false \ +%endif +%if %{without importd} + -Dimportd=false \ +%endif +%if %{without journal_remote} + -Dremote=false \ +%endif +%if %{without machined} + -Dmachined=false \ +%endif %if %{without networkd} -Dnetworkd=false \ %endif %if %{without resolved} -Dresolve=false \ %endif -%if %{without machined} - -Dmachined=false \ -%endif %if %{without sysvcompat} -Dsysvinit-path= \ -Dsysvrcnd-path= \ @@ -533,8 +543,7 @@ rm -rf %{buildroot}/etc/systemd/system/*.target.wants rm -f %{buildroot}/etc/systemd/system/default.target -# Overwrite /etc/pam.d/systemd-user shipped by upstream with one -# customized for openSUSE distros. +# Replace /etc/pam.d/systemd-user shipped by upstream with the openSUSE one. install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ # Remove tmp.mount from the unit search path as /tmp doesn't use tmpfs @@ -550,6 +559,13 @@ # aaa_base (in procps for now) rm -f %{buildroot}%{_sysctldir}/50-default.conf +# Make sure systemd-network polkit rules file starts with a suitable +# number prefix so it takes precedence over our polkit-default-privs. +%if %{with networkd} +mv %{buildroot}%{_datadir}/polkit-1/rules.d/systemd-networkd.rules \ + %{buildroot}%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules +%endif + # since v207 /etc/sysctl.conf is no longer parsed (commit # 04bf3c1a60d82791), however backward compatibility is provided by # /usr/lib/sysctl.d/99-sysctl.conf. @@ -643,9 +659,6 @@ %fdupes -s %{buildroot}%{_mandir} -# packaged in systemd-rpm-macros -rm -f %{buildroot}/%{_prefix}/lib/rpm/macros.d/macros.systemd - # Make sure to disable all services by default. The Suse branding # presets package takes care of defining the right policies. rm -f %{buildroot}%{_presetdir}/*.preset @@ -899,6 +912,7 @@ %{_bindir}/systemd-delta %{_bindir}/systemd-escape %{_bindir}/systemd-firstboot +%{_bindir}/systemd-id128 %{_bindir}/systemd-path %{_bindir}/systemd-sysusers %{_bindir}/systemd-mount @@ -1046,11 +1060,16 @@ %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh %config(noreplace) %{_sysconfdir}/pam.d/systemd-user -%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf -%config(noreplace) %{_sysconfdir}/systemd/system.conf -%config(noreplace) %{_sysconfdir}/systemd/logind.conf + %config(noreplace) %{_sysconfdir}/systemd/journald.conf +%config(noreplace) %{_sysconfdir}/systemd/logind.conf +%config(noreplace) %{_sysconfdir}/systemd/sleep.conf +%config(noreplace) %{_sysconfdir}/systemd/system.conf +%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf +%if %{with networkd} +%config(noreplace) %{_sysconfdir}/systemd/networkd.conf +%endif %if %{with resolved} %config(noreplace) %{_sysconfdir}/systemd/resolved.conf %endif @@ -1119,7 +1138,7 @@ %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy %if %{with networkd} -%{_datadir}/polkit-1/rules.d/systemd-networkd.rules +%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules %endif %if %{with resolved} %{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy @@ -1226,7 +1245,6 @@ %{_prefix}/lib/udev/ata_id %{_prefix}/lib/udev/path_id_compat %{_prefix}/lib/udev/cdrom_id -%{_prefix}/lib/udev/collect %{_prefix}/lib/udev/mtd_probe %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id ++++++ 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch ++++++ --- /var/tmp/diff_new_pack.nFZKdr/_old 2019-03-13 09:08:37.047427689 +0100 +++ /var/tmp/diff_new_pack.nFZKdr/_new 2019-03-13 09:08:37.047427689 +0100 @@ -1,4 +1,4 @@ -From d3acd5b49a6a321dc3b1512416132b8724b2fd20 Mon Sep 17 00:00:00 2001 +From 819616fabe327d4baf587337f427c24588192af5 Mon Sep 17 00:00:00 2001 From: Franck Bui <[email protected]> Date: Tue, 6 Nov 2018 11:51:26 +0100 Subject: [PATCH] logind: keep backward compatibility with UserTasksMax= in @@ -30,27 +30,27 @@ create mode 100644 src/login/compat-tasks-max-generator.c diff --git a/meson.build b/meson.build -index 5c7c165ba..7e3e8ca16 100644 +index eacadc1505..7c00470fff 100644 --- a/meson.build +++ b/meson.build -@@ -1701,6 +1701,14 @@ if conf.get('ENABLE_LOGIND') == 1 +@@ -1866,6 +1866,14 @@ if conf.get('ENABLE_LOGIND') == 1 + endif endif - endif -+executable('logind-compat-tasks-max-generator', -+ 'src/login/compat-tasks-max-generator.c', -+ include_directories : includes, -+ link_with : [libshared, liblogind_core], -+ install_rpath : rootlibexecdir, -+ install : true, -+ install_dir : systemgeneratordir) -+ - executable('systemd-user-runtime-dir', - user_runtime_dir_sources, - include_directories : includes, ++ executable('logind-compat-tasks-max-generator', ++ 'src/login/compat-tasks-max-generator.c', ++ include_directories : includes, ++ link_with : [libshared, liblogind_core], ++ install_rpath : rootlibexecdir, ++ install : true, ++ install_dir : systemgeneratordir) ++ + executable('systemd-user-runtime-dir', + user_runtime_dir_sources, + 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 000000000..404ca5f23 +index 0000000000..404ca5f237 --- /dev/null +++ b/src/login/compat-tasks-max-generator.c @@ -0,0 +1,66 @@ @@ -121,10 +121,10 @@ + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; +} diff --git a/src/login/logind-user.c b/src/login/logind-user.c -index 66f5c896d..fe58b0398 100644 +index ae27bfb662..bbcac62783 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c -@@ -743,17 +743,50 @@ int config_parse_compat_user_tasks_max( +@@ -843,17 +843,50 @@ int config_parse_compat_user_tasks_max( void *data, void *userdata) { @@ -181,5 +181,5 @@ return 0; } -- -2.19.0 +2.20.1 ++++++ 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch ++++++ --- /var/tmp/diff_new_pack.nFZKdr/_old 2019-03-13 09:08:37.055427688 +0100 +++ /var/tmp/diff_new_pack.nFZKdr/_new 2019-03-13 09:08:37.055427688 +0100 @@ -1,7 +1,7 @@ -From a482b51673d4344faf76a0460a69d7f273b36e47 Mon Sep 17 00:00:00 2001 +From 86aa208e639b119007332718aa4f453af2a061d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <[email protected]> Date: Fri, 11 Mar 2016 17:06:17 -0500 -Subject: [PATCH 1/1] resolved: create /etc/resolv.conf symlink at runtime +Subject: [PATCH] resolved: create /etc/resolv.conf symlink at runtime If the symlink doesn't exists, and we are being started, let's create it to provie name resolution. @@ -12,19 +12,17 @@ don't touch it in that case either. https://bugzilla.redhat.com/show_bug.cgi?id=1313085 - -[fbui: fixes boo#1024897] --- src/resolve/resolved.c | 4 ++++ tmpfiles.d/etc.conf.m4 | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c -index a4cda0b5e..68bca8077 100644 +index f4efddf8e5..3386e3bf67 100644 --- a/src/resolve/resolved.c +++ b/src/resolve/resolved.c -@@ -71,6 +71,10 @@ int main(int argc, char *argv[]) { - /* Drop privileges, but only if we have been started as root. If we are not running as root we assume all +@@ -45,6 +45,10 @@ static int run(int argc, char *argv[]) { + /* Drop privileges, but only if we have been started as root. If we are not running as root we assume most * privileges are already dropped. */ if (getuid() == 0) { + r = symlink("../run/systemd/resolve/resolv.conf", "/etc/resolv.conf"); @@ -35,7 +33,7 @@ /* Drop privileges, but keep three caps. Note that we drop those too, later on (see below) */ r = drop_privileges(uid, gid, diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 -index df8d42101..928105ea8 100644 +index df8d42101c..928105ea8d 100644 --- a/tmpfiles.d/etc.conf.m4 +++ b/tmpfiles.d/etc.conf.m4 @@ -13,9 +13,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts @@ -49,5 +47,5 @@ m4_ifdef(`HAVE_PAM', C /etc/pam.d - - - - -- -2.16.2 +2.19.2 ++++++ systemd-v239+suse.205.ga1d86af7e.tar.xz -> systemd-v241+suse.42.g15a1b4d58.tar.xz ++++++ ++++ 278680 lines of diff (skipped)
