rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

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

Browse Source 
- Own %{_libexecdir}/modules-load.d (again)
  This was incorrectly dropped during the split of the SUSE specific
  configurations.

- Drop a Conflicts: in systemd-coredump
  It not needed anymore since the mini variant of systemd-coredump is
  not built anymore.

- Import commit b54f5d7a8b41898ce98f43cd1a6cc92c0071806d
  5def29d24 coredump: only install coredump.conf when ENABLED_COREDUMP=true
  9133e2d6e dhcp6: make sure we have enough space for the DHCP6 option header (bsc#1113632 CVE-2018-15688)
  ebc3fa418 dhcp6: split assert_return() to be more debuggable when hit
  51eefb6ac chown-recursive: let's rework the recursive logic to use O_PATH (bsc#1113666 CVE-2018-15687)
  e1e1aa237 core: skip unit deserialization and move to the next one when unit_deserialize() fails
  1c726c87d core: when deserializing state always use read_line(…, LONG_LINE_MAX, …) (bsc#1113665 CVE-2018-15686)
  4cd7d11ac core: don't create Requires for workdir if "missing ok" (bsc#1113083)

- Make systemd-coredump sub-package optional
  and don't build the mini variant.

- Drop duplicated %{?mini} suffix for systemd-{container,coredump} subpackages
  "-mini" is already part of the name of the main package so there's
  no need to append it again for those sub packages. It's only needed
  when the name of a subpackage is completely redefined, IOW when '-n'
  option is used with the %package directive.

- Dont ship /usr/sbin/resolvconf symlink for now
  It conflicts with the bin shipped by openresolv and provides
  limited compat only.

OBS-URL: https://build.opensuse.org/request/show/646424
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1044
This commit is contained in:
Franck Bui 2018-11-05 14:11:51 +00:00 committed by Git OBS Bridge
parent b8bad3faec
commit 7fe8f43b74
6 changed files with 179 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
systemd-mini.changes
View File

@ -1,3 +1,57 @@
-------------------------------------------------------------------
Mon Nov 5 13:10:54 UTC 2018 - Franck Bui <fbui@suse.com>
- Own %{_libexecdir}/modules-load.d (again)
This was incorrectly dropped during the split of the SUSE specific
configurations.
-------------------------------------------------------------------
Fri Nov 2 14:17:34 UTC 2018 - Franck Bui <fbui@suse.com>
- Drop a Conflicts: in systemd-coredump
It not needed anymore since the mini variant of systemd-coredump is
not built anymore.
-------------------------------------------------------------------
Fri Nov 2 13:54:36 UTC 2018 - Franck Bui <fbui@suse.com>
- Import commit b54f5d7a8b41898ce98f43cd1a6cc92c0071806d
5def29d24 coredump: only install coredump.conf when ENABLED_COREDUMP=true
9133e2d6e dhcp6: make sure we have enough space for the DHCP6 option header (bsc#1113632 CVE-2018-15688)
ebc3fa418 dhcp6: split assert_return() to be more debuggable when hit
51eefb6ac chown-recursive: let's rework the recursive logic to use O_PATH (bsc#1113666 CVE-2018-15687)
e1e1aa237 core: skip unit deserialization and move to the next one when unit_deserialize() fails
1c726c87d core: when deserializing state always use read_line(…, LONG_LINE_MAX, …) (bsc#1113665 CVE-2018-15686)
4cd7d11ac core: don't create Requires for workdir if "missing ok" (bsc#1113083)
-------------------------------------------------------------------
Fri Nov 2 13:51:46 UTC 2018 - Franck Bui <fbui@suse.com>
- Make systemd-coredump sub-package optional
and don't build the mini variant.
-------------------------------------------------------------------
Fri Nov 2 12:02:18 UTC 2018 - Franck Bui <fbui@suse.com>
- Drop duplicated %{?mini} suffix for systemd-{container,coredump} subpackages
"-mini" is already part of the name of the main package so there's
no need to append it again for those sub packages. It's only needed
when the name of a subpackage is completely redefined, IOW when '-n'
option is used with the %package directive.
-------------------------------------------------------------------
Fri Nov 2 11:08:27 UTC 2018 - Franck Bui <fbui@suse.com>
- Dont ship /usr/sbin/resolvconf symlink for now
It conflicts with the bin shipped by openresolv and provides
limited compat only.
-------------------------------------------------------------------
Wed Oct 24 10:07:36 UTC 2018 - Franck Bui <fbui@suse.com>

53
systemd-mini.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -26,10 +26,11 @@
##### 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.73.g6d8584e7e
%define suse_version +suse.81.gb54f5d7a8
%bcond_with gnuefi
%if 0%{?bootstrap}
%bcond_with coredump
%bcond_with sysvcompat
%bcond_with machined
%bcond_with importd
@ -37,6 +38,7 @@
%bcond_with resolved
%bcond_with journal_remote
%else
%bcond_without coredump
%bcond_without sysvcompat
%bcond_without machined
%bcond_without importd
@ -293,23 +295,22 @@ Conflicts: libudev-devel
This package contains the development files for the library libudev, a
dynamic library, which provides access to udev device information.
%package coredump%{mini}
%if %{with coredump}
%package coredump
Summary: Systemd tools for coredump management
License: LGPL-2.1-or-later
Group: System/Base
Requires: %{name} = %{version}-%{release}
%systemd_requires
Provides: systemd:%{_bindir}/coredumpctl
%if 0%{?bootstrap}
Conflicts: systemd-coredump
%endif
%description coredump%{mini}
%description coredump
Systemd tools to store and manage coredumps.
This package contains systemd-coredump, coredumpctl.
%endif
%package container%{?mini}
%package container
Summary: Systemd tools for container management
License: LGPL-2.1-or-later
Group: System/Base
@ -320,7 +321,7 @@ Provides: systemd:%{_bindir}/systemd-nspawn
Conflicts: systemd-container
%endif
%description container%{?mini}
%description container
Systemd tools to spawn and manage containers and virtual machines.
This package contains systemd-nspawn, machinectl, systemd-machined,
@ -455,6 +456,9 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
-Dhtml=false \
-Dmyhostname=false \
%endif
%if %{without coredump}
-Dcoredump=false \
%endif
%if %{without networkd}
-Dnetworkd=false \
%endif
@ -485,6 +489,14 @@ mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib}
rm %{buildroot}%{_libdir}/libnss_systemd.so*
%endif
# Don't ship resolvconf symlink for now as it conflicts with the
# binary shipped by openresolv and provides limited compatibility
# only
%if %{with resolved}
rm %{buildroot}%{_sbindir}/resolvconf
rm %{buildroot}%{_mandir}/man1/resolvconf.1*
%endif
# FIXME: these symlinks should die.
mkdir -p %{buildroot}/{sbin,lib,bin}
ln -sf %{_bindir}/udevadm %{buildroot}/sbin/udevadm
@ -794,7 +806,7 @@ systemctl daemon-reload || :
%postun -n libudev%{?mini}1 -p /sbin/ldconfig
%postun -n libsystemd0%{?mini} -p /sbin/ldconfig
%post container%{?mini}
%post container
%tmpfiles_create systemd-nspawn.conf
if [ $1 -gt 1 ]; then
# Convert /var/lib/machines subvolume to make it suitable for
@ -880,7 +892,6 @@ fi
%{_bindir}/networkctl
%endif
%if %{with resolved}
%{_sbindir}/resolvconf
%{_bindir}/resolvectl
%endif
%{_bindir}/systemctl
@ -921,6 +932,11 @@ fi
%dir %{_prefix}/lib/systemd
%dir %{_unitdir}
%{_userunitdir}
%if %{with coredump}
%exclude %{_prefix}/lib/systemd/systemd-coredump
%exclude %{_unitdir}/systemd-coredump*
%exclude %{_unitdir}/sockets.target.wants/systemd-coredump.socket
%endif
%if %{with journal_remote}
%exclude %{_unitdir}/systemd-journal-gatewayd.*
%exclude %{_unitdir}/systemd-journal-remote.*
@ -929,14 +945,11 @@ fi
%exclude %{_prefix}/lib/systemd/systemd-journal-remote
%exclude %{_prefix}/lib/systemd/systemd-journal-upload
%endif
%exclude %{_prefix}/lib/systemd/systemd-coredump
%exclude %{_prefix}/lib/systemd/systemd-udevd
%exclude %{_unitdir}/systemd-udev*.*
%exclude %{_unitdir}/*.target.wants/systemd-udev*.*
%exclude %{_unitdir}/initrd-udevadm-cleanup-db.service
%exclude %{_unitdir}/systemd-nspawn@.service
%exclude %{_unitdir}/systemd-coredump*
%exclude %{_unitdir}/sockets.target.wants/systemd-coredump.socket
%if %{with machined}
%exclude %{_prefix}/lib/systemd/systemd-machined
%exclude %{_unitdir}/systemd-machined.service
@ -1000,6 +1013,7 @@ fi
%endif
%dir %{_sysconfdir}/modules-load.d
%{_libexecdir}/modules-load.d
%{_sysusersdir}/
%dir %{_sysconfdir}/tmpfiles.d
@ -1116,9 +1130,6 @@ fi
%if ! 0%{?bootstrap}
%{_mandir}/man1/[a-rt-z]*ctl.1*
%if %{with resolved}
%{_mandir}/man1/resolvconf.1*
%endif
%{_mandir}/man1/systemc*.1*
%{_mandir}/man1/systemd*.1*
%{_mandir}/man5/[a-tv-z]*
@ -1131,9 +1142,11 @@ fi
%{_mandir}/man8/systemd-journald*
%{_mandir}/man8/systemd-u[ps]*
%{_mandir}/man8/30-systemd-environment-d-generator.*
%if %{with coredump}
%exclude %{_mandir}/man1/coredumpctl*
%exclude %{_mandir}/man5/coredump.conf*
%exclude %{_mandir}/man8/systemd-coredump*
%endif
%exclude %{_mandir}/man*/*nspawn*
%if %{with machined}
%exclude %{_mandir}/man*/machinectl*
@ -1271,7 +1284,8 @@ fi
%{_mandir}/man3/*udev*.3*
%endif
%files coredump%{?mini}
%if %{with coredump}
%files coredump
%defattr(-,root,root)
%{_bindir}/coredumpctl
%{_prefix}/lib/systemd/systemd-coredump
@ -1285,8 +1299,9 @@ fi
%{_mandir}/man5/coredump.conf*
%{_mandir}/man8/systemd-coredump*
%endif
%endif
%files container%{?mini}
%files container
%defattr(-,root,root)
%{_bindir}/systemd-nspawn
%{_unitdir}/systemd-nspawn@.service

3
systemd-v239+suse.73.g6d8584e7e.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8e60a885d0a50caf764b64ef62bd53b26ba9911b1fe074e8c9a76afd1add8255
size 4854648

3
systemd-v239+suse.81.gb54f5d7a8.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:60693bd3616d9b98495a2ab9a29b1fd5fca5c0ae5968a8c2d7e722faa15af772
size 4854516

54
systemd.changes
View File

@ -1,3 +1,57 @@
-------------------------------------------------------------------
Mon Nov 5 13:10:54 UTC 2018 - Franck Bui <fbui@suse.com>
- Own %{_libexecdir}/modules-load.d (again)
This was incorrectly dropped during the split of the SUSE specific
configurations.
-------------------------------------------------------------------
Fri Nov 2 14:17:34 UTC 2018 - Franck Bui <fbui@suse.com>
- Drop a Conflicts: in systemd-coredump
It not needed anymore since the mini variant of systemd-coredump is
not built anymore.
-------------------------------------------------------------------
Fri Nov 2 13:54:36 UTC 2018 - Franck Bui <fbui@suse.com>
- Import commit b54f5d7a8b41898ce98f43cd1a6cc92c0071806d
5def29d24 coredump: only install coredump.conf when ENABLED_COREDUMP=true
9133e2d6e dhcp6: make sure we have enough space for the DHCP6 option header (bsc#1113632 CVE-2018-15688)
ebc3fa418 dhcp6: split assert_return() to be more debuggable when hit
51eefb6ac chown-recursive: let's rework the recursive logic to use O_PATH (bsc#1113666 CVE-2018-15687)
e1e1aa237 core: skip unit deserialization and move to the next one when unit_deserialize() fails
1c726c87d core: when deserializing state always use read_line(…, LONG_LINE_MAX, …) (bsc#1113665 CVE-2018-15686)
4cd7d11ac core: don't create Requires for workdir if "missing ok" (bsc#1113083)
-------------------------------------------------------------------
Fri Nov 2 13:51:46 UTC 2018 - Franck Bui <fbui@suse.com>
- Make systemd-coredump sub-package optional
and don't build the mini variant.
-------------------------------------------------------------------
Fri Nov 2 12:02:18 UTC 2018 - Franck Bui <fbui@suse.com>
- Drop duplicated %{?mini} suffix for systemd-{container,coredump} subpackages
"-mini" is already part of the name of the main package so there's
no need to append it again for those sub packages. It's only needed
when the name of a subpackage is completely redefined, IOW when '-n'
option is used with the %package directive.
-------------------------------------------------------------------
Fri Nov 2 11:08:27 UTC 2018 - Franck Bui <fbui@suse.com>
- Dont ship /usr/sbin/resolvconf symlink for now
It conflicts with the bin shipped by openresolv and provides
limited compat only.
-------------------------------------------------------------------
Wed Oct 24 10:07:36 UTC 2018 - Franck Bui <fbui@suse.com>

53
systemd.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -24,10 +24,11 @@
%define bootstrap 0
%define mini %nil
%define min_kernel_version 4.5
%define suse_version +suse.73.g6d8584e7e
%define suse_version +suse.81.gb54f5d7a8
%bcond_with gnuefi
%if 0%{?bootstrap}
%bcond_with coredump
%bcond_with sysvcompat
%bcond_with machined
%bcond_with importd
@ -35,6 +36,7 @@
%bcond_with resolved
%bcond_with journal_remote
%else
%bcond_without coredump
%bcond_without sysvcompat
%bcond_without machined
%bcond_without importd
@ -291,23 +293,22 @@ Conflicts: libudev-devel
This package contains the development files for the library libudev, a
dynamic library, which provides access to udev device information.
%package coredump%{mini}
%if %{with coredump}
%package coredump
Summary: Systemd tools for coredump management
License: LGPL-2.1-or-later
Group: System/Base
Requires: %{name} = %{version}-%{release}
%systemd_requires
Provides: systemd:%{_bindir}/coredumpctl
%if 0%{?bootstrap}
Conflicts: systemd-coredump
%endif
%description coredump%{mini}
%description coredump
Systemd tools to store and manage coredumps.
This package contains systemd-coredump, coredumpctl.
%endif
%package container%{?mini}
%package container
Summary: Systemd tools for container management
License: LGPL-2.1-or-later
Group: System/Base
@ -318,7 +319,7 @@ Provides: systemd:%{_bindir}/systemd-nspawn
Conflicts: systemd-container
%endif
%description container%{?mini}
%description container
Systemd tools to spawn and manage containers and virtual machines.
This package contains systemd-nspawn, machinectl, systemd-machined,
@ -453,6 +454,9 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
-Dhtml=false \
-Dmyhostname=false \
%endif
%if %{without coredump}
-Dcoredump=false \
%endif
%if %{without networkd}
-Dnetworkd=false \
%endif
@ -483,6 +487,14 @@ mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib}
rm %{buildroot}%{_libdir}/libnss_systemd.so*
%endif
# Don't ship resolvconf symlink for now as it conflicts with the
# binary shipped by openresolv and provides limited compatibility
# only
%if %{with resolved}
rm %{buildroot}%{_sbindir}/resolvconf
rm %{buildroot}%{_mandir}/man1/resolvconf.1*
%endif
# FIXME: these symlinks should die.
mkdir -p %{buildroot}/{sbin,lib,bin}
ln -sf %{_bindir}/udevadm %{buildroot}/sbin/udevadm
@ -792,7 +804,7 @@ systemctl daemon-reload || :
%postun -n libudev%{?mini}1 -p /sbin/ldconfig
%postun -n libsystemd0%{?mini} -p /sbin/ldconfig
%post container%{?mini}
%post container
%tmpfiles_create systemd-nspawn.conf
if [ $1 -gt 1 ]; then
# Convert /var/lib/machines subvolume to make it suitable for
@ -878,7 +890,6 @@ fi
%{_bindir}/networkctl
%endif
%if %{with resolved}
%{_sbindir}/resolvconf
%{_bindir}/resolvectl
%endif
%{_bindir}/systemctl
@ -919,6 +930,11 @@ fi
%dir %{_prefix}/lib/systemd
%dir %{_unitdir}
%{_userunitdir}
%if %{with coredump}
%exclude %{_prefix}/lib/systemd/systemd-coredump
%exclude %{_unitdir}/systemd-coredump*
%exclude %{_unitdir}/sockets.target.wants/systemd-coredump.socket
%endif
%if %{with journal_remote}
%exclude %{_unitdir}/systemd-journal-gatewayd.*
%exclude %{_unitdir}/systemd-journal-remote.*
@ -927,14 +943,11 @@ fi
%exclude %{_prefix}/lib/systemd/systemd-journal-remote
%exclude %{_prefix}/lib/systemd/systemd-journal-upload
%endif
%exclude %{_prefix}/lib/systemd/systemd-coredump
%exclude %{_prefix}/lib/systemd/systemd-udevd
%exclude %{_unitdir}/systemd-udev*.*
%exclude %{_unitdir}/*.target.wants/systemd-udev*.*
%exclude %{_unitdir}/initrd-udevadm-cleanup-db.service
%exclude %{_unitdir}/systemd-nspawn@.service
%exclude %{_unitdir}/systemd-coredump*
%exclude %{_unitdir}/sockets.target.wants/systemd-coredump.socket
%if %{with machined}
%exclude %{_prefix}/lib/systemd/systemd-machined
%exclude %{_unitdir}/systemd-machined.service
@ -998,6 +1011,7 @@ fi
%endif
%dir %{_sysconfdir}/modules-load.d
%{_libexecdir}/modules-load.d
%{_sysusersdir}/
%dir %{_sysconfdir}/tmpfiles.d
@ -1114,9 +1128,6 @@ fi
%if ! 0%{?bootstrap}
%{_mandir}/man1/[a-rt-z]*ctl.1*
%if %{with resolved}
%{_mandir}/man1/resolvconf.1*
%endif
%{_mandir}/man1/systemc*.1*
%{_mandir}/man1/systemd*.1*
%{_mandir}/man5/[a-tv-z]*
@ -1129,9 +1140,11 @@ fi
%{_mandir}/man8/systemd-journald*
%{_mandir}/man8/systemd-u[ps]*
%{_mandir}/man8/30-systemd-environment-d-generator.*
%if %{with coredump}
%exclude %{_mandir}/man1/coredumpctl*
%exclude %{_mandir}/man5/coredump.conf*
%exclude %{_mandir}/man8/systemd-coredump*
%endif
%exclude %{_mandir}/man*/*nspawn*
%if %{with machined}
%exclude %{_mandir}/man*/machinectl*
@ -1269,7 +1282,8 @@ fi
%{_mandir}/man3/*udev*.3*
%endif
%files coredump%{?mini}
%if %{with coredump}
%files coredump
%defattr(-,root,root)
%{_bindir}/coredumpctl
%{_prefix}/lib/systemd/systemd-coredump
@ -1283,8 +1297,9 @@ fi
%{_mandir}/man5/coredump.conf*
%{_mandir}/man8/systemd-coredump*
%endif
%endif
%files container%{?mini}
%files container
%defattr(-,root,root)
%{_bindir}/systemd-nspawn
%{_unitdir}/systemd-nspawn@.service