From 12f653dabd168f83c2daa5d71e7cfa819b228ae4295df859f6ed1040ec8d9228 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 17 Jan 2017 13:31:57 +0000 Subject: [PATCH] Accepting request 450969 from openSUSE:Factory Revert to version 228 - restage systemd with 13.2 update tests and autoyast to work out failures of 0115 and 0116 OBS-URL: https://build.opensuse.org/request/show/450969 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=245 --- baselibs.conf | 4 -- systemd-228.tar.xz | 3 ++ systemd-232.tar.xz | 3 -- systemd-mini-rpmlintrc | 1 - systemd-mini.changes | 94 ------------------------------------- systemd-mini.spec | 102 ++++++++++++++++------------------------- systemd-rpmlintrc | 1 - systemd.changes | 94 ------------------------------------- systemd.spec | 102 ++++++++++++++++------------------------- 9 files changed, 81 insertions(+), 323 deletions(-) create mode 100644 systemd-228.tar.xz delete mode 100644 systemd-232.tar.xz diff --git a/baselibs.conf b/baselibs.conf index 073ad0e1..9c73aa00 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,10 +1,6 @@ -# -# https://en.opensuse.org/openSUSE:Build_Service_baselibs.conf#Quickstart -# systemd supplements "packageand(systemd:pam-)" -/lib/systemd/system/ - -/usr/lib/systemd/libsystemd-shared.*\.so post "%{_sbindir}/pam-config -a --systemd || :" libsystemd0 libudev1 diff --git a/systemd-228.tar.xz b/systemd-228.tar.xz new file mode 100644 index 00000000..c8f3fdcf --- /dev/null +++ b/systemd-228.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:141d1609469579adeaf62d76e3527149c5a0140a54c8538f706b4eb97a447f8a +size 2866192 diff --git a/systemd-232.tar.xz b/systemd-232.tar.xz deleted file mode 100644 index 904a437e..00000000 --- a/systemd-232.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0f63b20f91eeed656a9d2bf9ad453cd7cfbb786663714b9b17886624f5ea69c -size 3211060 diff --git a/systemd-mini-rpmlintrc b/systemd-mini-rpmlintrc index 5b7980e5..a9e12af8 100644 --- a/systemd-mini-rpmlintrc +++ b/systemd-mini-rpmlintrc @@ -16,7 +16,6 @@ addFilter(".*devel-file-in-non-devel-package.*udev.pc.*") addFilter(".*libgudev-.*shlib-fixed-dependency.*") addFilter(".*suse-filelist-forbidden-systemd-userdirs.*") addFilter("libudev-mini.*shlib-policy-name-error.*") -addFilter("nss-systemd.*shlib-policy-name-error.*") addFilter("nss-myhostname.*shlib-policy-name-error.*") addFilter("nss-mymachines.*shlib-policy-name-error.*") addFilter("systemd-logger.*useless-provides sysvinit(syslog).*") diff --git a/systemd-mini.changes b/systemd-mini.changes index ac7b0364..ddcda174 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,97 +1,3 @@ -------------------------------------------------------------------- -Tue Jan 10 10:54:20 UTC 2017 - fbui@suse.com - -- Import commit 3edb876e3b80437a95502aa5d31d454606ea94bd - - 27b544224 core: make sure to not call device_is_bound_by_mounts() when dev is null (#5033) (bsc#1018399) - -------------------------------------------------------------------- -Fri Jan 6 08:27:03 UTC 2017 - fbui@suse.com - -- Use the %{resolved} build conditional for the nss-resolve subpackage - -------------------------------------------------------------------- -Thu Jan 5 17:46:44 UTC 2017 - fbui@suse.com - -- /usr/bin/systemd-resolve was missing from the filelist - -------------------------------------------------------------------- -Thu Jan 5 17:09:01 UTC 2017 - fbui@suse.com - -- Silent warnings emitted when udev socket units are restarted during package upgrade (bsc#1018214) - -------------------------------------------------------------------- -Mon Dec 19 13:49:48 UTC 2016 - fbui@suse.com - -- Upgrade to v232, commit de62e96da6a62ac61a7dea45cc558f5fa4342032 - - - a4dff165d nspawn: resolv.conf might not be created initially (#4799) - - b543fe907 nspawn: fix condition for mounting resolv.conf (#4622) - - 1aed89e55 core: make mount units from /proc/self/mountinfo possibly bind to a device (#4515) (boo#909418 bsc#912715 bsc#945340) - - bfb54ecdc coredumpctl: let gdb handle the SIGINT signal (#4901) (bsc#1012591) - -------------------------------------------------------------------- -Wed Dec 14 14:51:41 UTC 2016 - fbui@suse.com - -- Really include legacy kbd maps in kbd-model-map (bsc#1015515) - - Instead of fix-machines-subvol-for-rollbacks.sh... - -------------------------------------------------------------------- -Thu Dec 8 12:55:51 UTC 2016 - fbui@suse.com - -- Enable lz4 (which becomes the default) - - It's much faster than xz and thus should be more appropriate to - compress journals and coredumps. - - The LZ4 logic is now officially supported and no longer considered - experimental. - - The new frame api was released in v125. - -------------------------------------------------------------------- -Tue Dec 6 16:46:52 UTC 2016 - fbui@suse.com - -- Good by compatlibs support - - There's no longer need for enabling/disabling the support for the - compatlibs as it's been dropped from the source code. - -------------------------------------------------------------------- -Tue Nov 29 16:38:41 UTC 2016 - fbui@suse.com - -- Drop /usr/lib/systemd/libsystemd-shared-%{version}.so from the 32bit package - - This shared library is not for public use, and is neither API nor - ABI stable, but is likely to change with every new released - update. Only systemd binaries are supposed to link against it. - - This also prevents from the 32bit package to conflit with the 64bit - one if this lib was installed by both packages. - -------------------------------------------------------------------- -Tue Nov 22 15:02:08 UTC 2016 - fbui@suse.com - -- Upgrade to v232, commit c5c3445825981e2a5c3ed71214127d5b1b9de802: - - - Dropped backported commits which has been merged - - Forward-port Suse specific patches - - Added --disable-lto option to ./configure - - Added systemd-mount - - Removed in %file /usr/lib/systemd/user/*.socket: since - 798c486fbcdce3346cd86 units/systemd-bus-proxyd.socket has been - removed. - - Removed in %file %{_sysconfdir}/systemd/bootchart.conf - since commit 232c84b2d22f2d96982b3c bootchart is not part of systemd - anymore. - - Backward compat libs have been disabled since it's been dropped from - the source code. - - Added /usr/bin/systemd-socket-activate in %file - - Added --without-kill-user-processes ./configure option - - Bump libseccomp build require (>= 2.3.1) as described in README - - Specifiy version of libmount as required in the README - ------------------------------------------------------------------- Fri Nov 18 21:07:11 UTC 2016 - meissner@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 0ea7287b..800b5864 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1,7 +1,7 @@ # # spec file for package systemd-mini # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,12 +44,13 @@ %bcond_without gnuefi %endif %endif +%bcond_without compatlibs %bcond_with resolved %bcond_with parentpathid Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 232 +Version: 228 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -73,7 +74,7 @@ BuildRequires: gperf BuildRequires: intltool BuildRequires: libacl-devel BuildRequires: libcap-devel -BuildRequires: libmount-devel >= 2.27.1 +BuildRequires: libmount-devel BuildRequires: libsepol-devel BuildRequires: libtool BuildRequires: pam-config >= 0.79-5 @@ -82,9 +83,9 @@ BuildRequires: pam-devel # BR. Also this macro was introduced since version 12.4. BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros +BuildRequires: xz BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 -BuildRequires: pkgconfig(liblz4) >= 125 BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpcre) @@ -100,7 +101,7 @@ BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 %endif %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x -BuildRequires: pkgconfig(libseccomp) >= 2.3.1 +BuildRequires: pkgconfig(libseccomp) %endif %if %{with gnuefi} BuildRequires: gnu-efi @@ -301,18 +302,20 @@ Conflicts: otherproviders(syslog) %description logger This package marks the installation to not use syslog but only the journal. -%package -n nss-systemd -Summary: Plugin for local virtual host name resolution +%package -n nss-resolve +Summary: Plugin for local hostname resolution via systemd-resolved License: LGPL-2.1+ Group: System/Libraries +Requires: %{name} = %{version}-%{release} -%description -n nss-systemd -This package contains a plugin for the Name Service Switch (NSS), -which enables resolution of all dynamically allocated service -users. (See the DynamicUser= setting in unit files.) +%description -n nss-resolve +This package contains a plug-in module for the Name Service Switch +(NSS), which enables host name resolutions via the systemd-resolved(8) +local network name resolution service. It replaces the nss-dns plug-in +module that traditionally resolves hostnames via DNS. To activate this NSS module, you will need to include it in -/etc/nsswitch.conf, see nss-systemd(8) manpage for more details. +/etc/nsswitch.conf, see nss-resolve(8) manpage for more details. %package -n nss-myhostname Summary: Plugin for local system host name resolution @@ -330,23 +333,6 @@ To activate this NSS module, you will need to include it in /etc/nsswitch.conf, see nss-hostname(8) manpage for more details. %endif -%if %{with resolved} -%package -n nss-resolve -Summary: Plugin for local hostname resolution via systemd-resolved -License: LGPL-2.1+ -Group: System/Libraries -Requires: %{name} = %{version}-%{release} - -%description -n nss-resolve -This package contains a plug-in module for the Name Service Switch -(NSS), which enables host name resolutions via the systemd-resolved(8) -local network name resolution service. It replaces the nss-dns plug-in -module that traditionally resolves hostnames via DNS. - -To activate this NSS module, you will need to include it in -/etc/nsswitch.conf, see nss-resolve(8) manpage for more details. -%endif - %if %{with machined} %package -n nss-mymachines Summary: Plugin for local virtual host name resolution @@ -432,13 +418,14 @@ systemd_cryptsetup_LDFLAGS =\\\ %if 0%{?bootstrap} --disable-myhostname \ --disable-manpages \ +%endif +%if %{with compatlibs} + --enable-compat-libs \ %endif --enable-selinux \ --enable-split-usr \ --disable-static \ - --disable-lto \ --disable-tests \ - --without-kill-user-processes \ --with-rc-local-script-path-start=/etc/init.d/boot.local \ --with-rc-local-script-path-stop=/etc/init.d/halt.local \ --with-debug-shell=/bin/bash \ @@ -465,13 +452,10 @@ make %{?_smp_mflags} V=e %install %make_install -find %{buildroot} -type f -name '*.la' -delete # move to %{_lib} %if ! 0%{?bootstrap} mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} -%else -rm %{buildroot}%{_libdir}/libnss_systemd.so* %endif # FIXME: these symlinks should die. @@ -483,6 +467,7 @@ ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd install -m755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs rm -rf %{buildroot}%{_sysconfdir}/rpm +find %{buildroot} -type f -name '*.la' -delete mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated @@ -518,10 +503,6 @@ cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf sg EOF -# Remove .so file for the shared library, it's not supposed to be -# used. -rm %{buildroot}%{_libexecdir}/systemd/libsystemd-shared.so - # do not ship sysctl defaults in systemd package, will be part of # aaa_base (in procps for now) rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf @@ -637,7 +618,7 @@ fi # kbd-model-map.legacy is used to provide mapping for legacy keymaps, # which may still be used by yast. -cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map +cat %{S:13} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map %find_lang systemd @@ -785,13 +766,7 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %regenerate_initrd_post %insserv_cleanup systemctl daemon-reload || : -# On package update: the restart of the socket units will probably -# fail as the daemon is most likely running. It's not really an issue -# since we restart systemd-udevd right after and that will pull in the -# socket units again. We should be informed at that time if something -# really went wrong the first time we started the socket units. -%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket 2>/dev/null -%systemd_postun_with_restart systemd-udevd.service +%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket systemd-udevd.service %posttrans -n udev%{?mini} %regenerate_initrd_posttrans @@ -812,9 +787,6 @@ fi %post -n nss-myhostname -p /sbin/ldconfig %postun -n nss-myhostname -p /sbin/ldconfig - -%post -n nss-systemd -p /sbin/ldconfig -%postun -n nss-systemd -p /sbin/ldconfig %endif %if %{with resolved} @@ -877,7 +849,6 @@ fi %{_bindir}/systemd-firstboot %{_bindir}/systemd-path %{_bindir}/systemd-sysusers -%{_bindir}/systemd-mount %{_bindir}/systemd-notify %{_bindir}/systemd-run %{_bindir}/systemd-journalctl @@ -890,10 +861,6 @@ fi %{_bindir}/systemd-tmpfiles %{_bindir}/systemd-machine-id-setup %{_bindir}/systemd-nspawn -%if %{with resolved} -%{_bindir}/systemd-resolve -%endif -%{_bindir}/systemd-socket-activate %{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-detect-virt %{_bindir}/timedatectl @@ -930,10 +897,9 @@ fi %{_prefix}/lib/systemd/system/*.path %{_prefix}/lib/systemd/user/*.target %{_prefix}/lib/systemd/user/*.service +%{_prefix}/lib/systemd/user/*.socket %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd -%{_prefix}/lib/systemd/libsystemd-shared-%{version}.so -%{_prefix}/lib/systemd/resolv.conf %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %dir %{_prefix}/lib/systemd/catalog %{_prefix}/lib/systemd/catalog/systemd.catalog @@ -988,11 +954,11 @@ fi %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user %dir %{_sysconfdir}/xdg/systemd -%{_sysconfdir}/systemd/system/ctrl-alt-del.target %{_sysconfdir}/xdg/systemd/user %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh %config(noreplace) %{_sysconfdir}/pam.d/systemd-user +%config(noreplace) %{_sysconfdir}/systemd/bootchart.conf %config(noreplace) %{_sysconfdir}/systemd/coredump.conf %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/system.conf @@ -1126,6 +1092,16 @@ fi %{_libdir}/libsystemd.so %{_libdir}/pkgconfig/libsystemd.pc %{_includedir}/systemd/ +%if %{with compatlibs} +%{_libdir}/libsystemd-daemon.so +%{_libdir}/libsystemd-login.so +%{_libdir}/libsystemd-id128.so +%{_libdir}/libsystemd-journal.so +%{_libdir}/pkgconfig/libsystemd-daemon.pc +%{_libdir}/pkgconfig/libsystemd-login.pc +%{_libdir}/pkgconfig/libsystemd-id128.pc +%{_libdir}/pkgconfig/libsystemd-journal.pc +%endif %if ! 0%{?bootstrap} %{_mandir}/man3/SD*.3* %{_mandir}/man3/sd*.3* @@ -1205,6 +1181,12 @@ fi %files -n libsystemd0%{?mini} %defattr(-,root,root) %{_libdir}/libsystemd.so.* +%if %{with compatlibs} +%{_libdir}/libsystemd-daemon.so.* +%{_libdir}/libsystemd-login.so.* +%{_libdir}/libsystemd-id128.so.* +%{_libdir}/libsystemd-journal.so.* +%endif %files -n libudev%{?mini}1 %defattr(-,root,root) @@ -1232,12 +1214,6 @@ fi /%{_lib}/*nss_myhostname* %{_mandir}/man8/libnss_myhostname.* %{_mandir}/man8/nss-myhostname.* - -%files -n nss-systemd -%defattr(-, root, root) -%{_libdir}/libnss_systemd.so* -%{_mandir}/man8/libnss_systemd.so.* -%{_mandir}/man8/nss-systemd.* %endif %if %{with resolved} diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc index 5b7980e5..a9e12af8 100644 --- a/systemd-rpmlintrc +++ b/systemd-rpmlintrc @@ -16,7 +16,6 @@ addFilter(".*devel-file-in-non-devel-package.*udev.pc.*") addFilter(".*libgudev-.*shlib-fixed-dependency.*") addFilter(".*suse-filelist-forbidden-systemd-userdirs.*") addFilter("libudev-mini.*shlib-policy-name-error.*") -addFilter("nss-systemd.*shlib-policy-name-error.*") addFilter("nss-myhostname.*shlib-policy-name-error.*") addFilter("nss-mymachines.*shlib-policy-name-error.*") addFilter("systemd-logger.*useless-provides sysvinit(syslog).*") diff --git a/systemd.changes b/systemd.changes index ac7b0364..ddcda174 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,97 +1,3 @@ -------------------------------------------------------------------- -Tue Jan 10 10:54:20 UTC 2017 - fbui@suse.com - -- Import commit 3edb876e3b80437a95502aa5d31d454606ea94bd - - 27b544224 core: make sure to not call device_is_bound_by_mounts() when dev is null (#5033) (bsc#1018399) - -------------------------------------------------------------------- -Fri Jan 6 08:27:03 UTC 2017 - fbui@suse.com - -- Use the %{resolved} build conditional for the nss-resolve subpackage - -------------------------------------------------------------------- -Thu Jan 5 17:46:44 UTC 2017 - fbui@suse.com - -- /usr/bin/systemd-resolve was missing from the filelist - -------------------------------------------------------------------- -Thu Jan 5 17:09:01 UTC 2017 - fbui@suse.com - -- Silent warnings emitted when udev socket units are restarted during package upgrade (bsc#1018214) - -------------------------------------------------------------------- -Mon Dec 19 13:49:48 UTC 2016 - fbui@suse.com - -- Upgrade to v232, commit de62e96da6a62ac61a7dea45cc558f5fa4342032 - - - a4dff165d nspawn: resolv.conf might not be created initially (#4799) - - b543fe907 nspawn: fix condition for mounting resolv.conf (#4622) - - 1aed89e55 core: make mount units from /proc/self/mountinfo possibly bind to a device (#4515) (boo#909418 bsc#912715 bsc#945340) - - bfb54ecdc coredumpctl: let gdb handle the SIGINT signal (#4901) (bsc#1012591) - -------------------------------------------------------------------- -Wed Dec 14 14:51:41 UTC 2016 - fbui@suse.com - -- Really include legacy kbd maps in kbd-model-map (bsc#1015515) - - Instead of fix-machines-subvol-for-rollbacks.sh... - -------------------------------------------------------------------- -Thu Dec 8 12:55:51 UTC 2016 - fbui@suse.com - -- Enable lz4 (which becomes the default) - - It's much faster than xz and thus should be more appropriate to - compress journals and coredumps. - - The LZ4 logic is now officially supported and no longer considered - experimental. - - The new frame api was released in v125. - -------------------------------------------------------------------- -Tue Dec 6 16:46:52 UTC 2016 - fbui@suse.com - -- Good by compatlibs support - - There's no longer need for enabling/disabling the support for the - compatlibs as it's been dropped from the source code. - -------------------------------------------------------------------- -Tue Nov 29 16:38:41 UTC 2016 - fbui@suse.com - -- Drop /usr/lib/systemd/libsystemd-shared-%{version}.so from the 32bit package - - This shared library is not for public use, and is neither API nor - ABI stable, but is likely to change with every new released - update. Only systemd binaries are supposed to link against it. - - This also prevents from the 32bit package to conflit with the 64bit - one if this lib was installed by both packages. - -------------------------------------------------------------------- -Tue Nov 22 15:02:08 UTC 2016 - fbui@suse.com - -- Upgrade to v232, commit c5c3445825981e2a5c3ed71214127d5b1b9de802: - - - Dropped backported commits which has been merged - - Forward-port Suse specific patches - - Added --disable-lto option to ./configure - - Added systemd-mount - - Removed in %file /usr/lib/systemd/user/*.socket: since - 798c486fbcdce3346cd86 units/systemd-bus-proxyd.socket has been - removed. - - Removed in %file %{_sysconfdir}/systemd/bootchart.conf - since commit 232c84b2d22f2d96982b3c bootchart is not part of systemd - anymore. - - Backward compat libs have been disabled since it's been dropped from - the source code. - - Added /usr/bin/systemd-socket-activate in %file - - Added --without-kill-user-processes ./configure option - - Bump libseccomp build require (>= 2.3.1) as described in README - - Specifiy version of libmount as required in the README - ------------------------------------------------------------------- Fri Nov 18 21:07:11 UTC 2016 - meissner@suse.com diff --git a/systemd.spec b/systemd.spec index 5b84fd7a..2ad1f88d 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,7 +1,7 @@ # # spec file for package systemd # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,12 +42,13 @@ %bcond_without gnuefi %endif %endif +%bcond_without compatlibs %bcond_with resolved %bcond_with parentpathid Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 232 +Version: 228 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -71,7 +72,7 @@ BuildRequires: gperf BuildRequires: intltool BuildRequires: libacl-devel BuildRequires: libcap-devel -BuildRequires: libmount-devel >= 2.27.1 +BuildRequires: libmount-devel BuildRequires: libsepol-devel BuildRequires: libtool BuildRequires: pam-config >= 0.79-5 @@ -80,9 +81,9 @@ BuildRequires: pam-devel # BR. Also this macro was introduced since version 12.4. BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros +BuildRequires: xz BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 -BuildRequires: pkgconfig(liblz4) >= 125 BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpcre) @@ -98,7 +99,7 @@ BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 %endif %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x -BuildRequires: pkgconfig(libseccomp) >= 2.3.1 +BuildRequires: pkgconfig(libseccomp) %endif %if %{with gnuefi} BuildRequires: gnu-efi @@ -299,18 +300,20 @@ Conflicts: otherproviders(syslog) %description logger This package marks the installation to not use syslog but only the journal. -%package -n nss-systemd -Summary: Plugin for local virtual host name resolution +%package -n nss-resolve +Summary: Plugin for local hostname resolution via systemd-resolved License: LGPL-2.1+ Group: System/Libraries +Requires: %{name} = %{version}-%{release} -%description -n nss-systemd -This package contains a plugin for the Name Service Switch (NSS), -which enables resolution of all dynamically allocated service -users. (See the DynamicUser= setting in unit files.) +%description -n nss-resolve +This package contains a plug-in module for the Name Service Switch +(NSS), which enables host name resolutions via the systemd-resolved(8) +local network name resolution service. It replaces the nss-dns plug-in +module that traditionally resolves hostnames via DNS. To activate this NSS module, you will need to include it in -/etc/nsswitch.conf, see nss-systemd(8) manpage for more details. +/etc/nsswitch.conf, see nss-resolve(8) manpage for more details. %package -n nss-myhostname Summary: Plugin for local system host name resolution @@ -328,23 +331,6 @@ To activate this NSS module, you will need to include it in /etc/nsswitch.conf, see nss-hostname(8) manpage for more details. %endif -%if %{with resolved} -%package -n nss-resolve -Summary: Plugin for local hostname resolution via systemd-resolved -License: LGPL-2.1+ -Group: System/Libraries -Requires: %{name} = %{version}-%{release} - -%description -n nss-resolve -This package contains a plug-in module for the Name Service Switch -(NSS), which enables host name resolutions via the systemd-resolved(8) -local network name resolution service. It replaces the nss-dns plug-in -module that traditionally resolves hostnames via DNS. - -To activate this NSS module, you will need to include it in -/etc/nsswitch.conf, see nss-resolve(8) manpage for more details. -%endif - %if %{with machined} %package -n nss-mymachines Summary: Plugin for local virtual host name resolution @@ -430,13 +416,14 @@ systemd_cryptsetup_LDFLAGS =\\\ %if 0%{?bootstrap} --disable-myhostname \ --disable-manpages \ +%endif +%if %{with compatlibs} + --enable-compat-libs \ %endif --enable-selinux \ --enable-split-usr \ --disable-static \ - --disable-lto \ --disable-tests \ - --without-kill-user-processes \ --with-rc-local-script-path-start=/etc/init.d/boot.local \ --with-rc-local-script-path-stop=/etc/init.d/halt.local \ --with-debug-shell=/bin/bash \ @@ -463,13 +450,10 @@ make %{?_smp_mflags} V=e %install %make_install -find %{buildroot} -type f -name '*.la' -delete # move to %{_lib} %if ! 0%{?bootstrap} mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} -%else -rm %{buildroot}%{_libdir}/libnss_systemd.so* %endif # FIXME: these symlinks should die. @@ -481,6 +465,7 @@ ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd install -m755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs rm -rf %{buildroot}%{_sysconfdir}/rpm +find %{buildroot} -type f -name '*.la' -delete mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated @@ -516,10 +501,6 @@ cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf sg EOF -# Remove .so file for the shared library, it's not supposed to be -# used. -rm %{buildroot}%{_libexecdir}/systemd/libsystemd-shared.so - # do not ship sysctl defaults in systemd package, will be part of # aaa_base (in procps for now) rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf @@ -635,7 +616,7 @@ fi # kbd-model-map.legacy is used to provide mapping for legacy keymaps, # which may still be used by yast. -cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map +cat %{S:13} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map %find_lang systemd @@ -783,13 +764,7 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %regenerate_initrd_post %insserv_cleanup systemctl daemon-reload || : -# On package update: the restart of the socket units will probably -# fail as the daemon is most likely running. It's not really an issue -# since we restart systemd-udevd right after and that will pull in the -# socket units again. We should be informed at that time if something -# really went wrong the first time we started the socket units. -%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket 2>/dev/null -%systemd_postun_with_restart systemd-udevd.service +%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket systemd-udevd.service %posttrans -n udev%{?mini} %regenerate_initrd_posttrans @@ -810,9 +785,6 @@ fi %post -n nss-myhostname -p /sbin/ldconfig %postun -n nss-myhostname -p /sbin/ldconfig - -%post -n nss-systemd -p /sbin/ldconfig -%postun -n nss-systemd -p /sbin/ldconfig %endif %if %{with resolved} @@ -875,7 +847,6 @@ fi %{_bindir}/systemd-firstboot %{_bindir}/systemd-path %{_bindir}/systemd-sysusers -%{_bindir}/systemd-mount %{_bindir}/systemd-notify %{_bindir}/systemd-run %{_bindir}/systemd-journalctl @@ -888,10 +859,6 @@ fi %{_bindir}/systemd-tmpfiles %{_bindir}/systemd-machine-id-setup %{_bindir}/systemd-nspawn -%if %{with resolved} -%{_bindir}/systemd-resolve -%endif -%{_bindir}/systemd-socket-activate %{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-detect-virt %{_bindir}/timedatectl @@ -928,10 +895,9 @@ fi %{_prefix}/lib/systemd/system/*.path %{_prefix}/lib/systemd/user/*.target %{_prefix}/lib/systemd/user/*.service +%{_prefix}/lib/systemd/user/*.socket %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd -%{_prefix}/lib/systemd/libsystemd-shared-%{version}.so -%{_prefix}/lib/systemd/resolv.conf %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %dir %{_prefix}/lib/systemd/catalog %{_prefix}/lib/systemd/catalog/systemd.catalog @@ -986,11 +952,11 @@ fi %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user %dir %{_sysconfdir}/xdg/systemd -%{_sysconfdir}/systemd/system/ctrl-alt-del.target %{_sysconfdir}/xdg/systemd/user %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh %config(noreplace) %{_sysconfdir}/pam.d/systemd-user +%config(noreplace) %{_sysconfdir}/systemd/bootchart.conf %config(noreplace) %{_sysconfdir}/systemd/coredump.conf %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/system.conf @@ -1124,6 +1090,16 @@ fi %{_libdir}/libsystemd.so %{_libdir}/pkgconfig/libsystemd.pc %{_includedir}/systemd/ +%if %{with compatlibs} +%{_libdir}/libsystemd-daemon.so +%{_libdir}/libsystemd-login.so +%{_libdir}/libsystemd-id128.so +%{_libdir}/libsystemd-journal.so +%{_libdir}/pkgconfig/libsystemd-daemon.pc +%{_libdir}/pkgconfig/libsystemd-login.pc +%{_libdir}/pkgconfig/libsystemd-id128.pc +%{_libdir}/pkgconfig/libsystemd-journal.pc +%endif %if ! 0%{?bootstrap} %{_mandir}/man3/SD*.3* %{_mandir}/man3/sd*.3* @@ -1203,6 +1179,12 @@ fi %files -n libsystemd0%{?mini} %defattr(-,root,root) %{_libdir}/libsystemd.so.* +%if %{with compatlibs} +%{_libdir}/libsystemd-daemon.so.* +%{_libdir}/libsystemd-login.so.* +%{_libdir}/libsystemd-id128.so.* +%{_libdir}/libsystemd-journal.so.* +%endif %files -n libudev%{?mini}1 %defattr(-,root,root) @@ -1230,12 +1212,6 @@ fi /%{_lib}/*nss_myhostname* %{_mandir}/man8/libnss_myhostname.* %{_mandir}/man8/nss-myhostname.* - -%files -n nss-systemd -%defattr(-, root, root) -%{_libdir}/libnss_systemd.so* -%{_mandir}/man8/libnss_systemd.so.* -%{_mandir}/man8/nss-systemd.* %endif %if %{with resolved}