[packages/systemd] Initial step in upgrade to 232:
arekm
arekm at pld-linux.org
Sat Nov 12 22:13:05 CET 2016
commit c75f826c12fbcc3ecf4bb5ce500da6f303b301b9
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Nov 12 22:10:08 2016 +0100
Initial step in upgrade to 232:
- upstream bootchart moved to separate package/repo
- upstream python bindings moved to separate package/repo
- upstream dropped consoled
TODO:
- finish files
- review changelog and NEWS again
- test it
- make python-systemd.spec and systemd-bootchart.spec
- check for missing dirs between latest dbus and this package
config-pld.patch | 10 +-
cryptsetup_generator_cmdline_parsing.patch | 22 ---
empty_notify_dos.patch | 95 -----------
journal-gatewayd-fdopen.patch | 25 ---
nss-in-rootlib.patch | 11 --
optional-tmp-on-tmpfs.patch | 8 +-
pld-boot_efi_mount.patch | 87 +---------
systemd.spec | 245 +++++++----------------------
target-pld.patch | 52 +++---
uids_gids.patch | 54 ++++---
10 files changed, 130 insertions(+), 479 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index f314ac3..44913e5 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -9,14 +9,12 @@
#
# Conditional build:
%bcond_without audit # audit support
-%bcond_without consoled # systemd-consoled (embedded terminal)
%bcond_without cryptsetup # cryptsetup support
%bcond_without microhttpd # use microhttpd for network journal access
%bcond_without pam # PAM authentication support
%bcond_without qrencode # QRencode support
%bcond_without selinux # SELinux support
%bcond_without efi # EFI boot support
-%bcond_without python3 # Python 3.x support
%bcond_with tests # "make check" (requires systemd already installed)
%ifnarch %{ix86} %{x8664} aarch64
@@ -27,13 +25,13 @@ Summary: A System and Service Manager
Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa
Name: systemd
# Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version: 221
-Release: 16
+Version: 232
+Release: 0.1
Epoch: 1
License: GPL v2+ (udev), LGPL v2.1+ (the rest)
Group: Base
Source0: https://github.com/systemd/systemd/archive/v%{version}.tar.gz
-# Source0-md5: 729ff21073e20dfb211e2155769bf33c
+# Source0-md5: 3e3a0b14050eff62e68be72142181730
Source1: %{name}-sysv-convert
Source2: %{name}_booted.c
Source3: network.service
@@ -70,16 +68,13 @@ Patch3: tmpfiles-not-fatal.patch
Patch4: udev-ploop-rules.patch
Patch5: udevadm-in-sbin.patch
Patch6: net-rename-revert.patch
-Patch7: nss-in-rootlib.patch
+
Patch8: proc-hidepid.patch
Patch9: %{name}-configfs.patch
Patch10: pld-boot_efi_mount.patch
Patch11: optional-tmp-on-tmpfs.patch
Patch12: uids_gids.patch
Patch13: sysctl.patch
-Patch14: journal-gatewayd-fdopen.patch
-Patch15: empty_notify_dos.patch
-Patch16: cryptsetup_generator_cmdline_parsing.patch
URL: http://www.freedesktop.org/wiki/Software/systemd
BuildRequires: acl-devel
%{?with_audit:BuildRequires: audit-libs-devel}
@@ -101,13 +96,11 @@ BuildRequires: kmod-devel >= 15
BuildRequires: libapparmor-devel
BuildRequires: libblkid-devel >= 2.24
BuildRequires: libcap-devel
-%{?with_consoled:BuildRequires: libdrm-devel >= 2.4}
-%{?with_consoled:BuildRequires: libevdev-devel >= 1.2}
BuildRequires: libgcrypt-devel >= 1.4.5
#BuildRequires: libidn-devel
#BuildRequires: liblzma-devel
%{?with_microhttpd:BuildRequires: libmicrohttpd-devel >= 0.9.33}
-BuildRequires: libmount-devel >= 2.20
+BuildRequires: libmount-devel >= 2.28.2-2
BuildRequires: libseccomp-devel >= 1.0.0
%{?with_selinux:BuildRequires: libselinux-devel >= 2.1.9}
BuildRequires: libtool >= 2:2.2
@@ -119,20 +112,12 @@ BuildRequires: pkgconfig >= 0.9.0
BuildRequires: python-devel
BuildRequires: python-lxml
BuildRequires: python-modules
-%if %{with python3}
-BuildRequires: python3-devel
-BuildRequires: python3-lxml
-BuildRequires: python3-modules
-BuildRequires: rpm-build >= 5.4.15-28
-%endif
%{?with_qrencode:BuildRequires: qrencode-devel}
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.628
BuildRequires: sed >= 4.0
%{?with_tests:BuildRequires: systemd}
-%{?with_consoled:BuildRequires: unifont-source}
BuildRequires: usbutils >= 0.82
-%{?with_consoled:BuildRequires: xorg-lib-libxkbcommon-devel >= 0.5}
BuildRequires: xz-devel
BuildRequires: zlib-devel
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
@@ -159,13 +144,13 @@ Requires: rc-scripts >= 0.4.5.3-7
Requires: setup >= 2.8.0-2
Requires: udev-core = %{epoch}:%{version}-%{release}
Requires: udev-libs = %{epoch}:%{version}-%{release}
-Requires: util-linux >= 2.26
+Requires: util-linux >= 2.28.2-2
Requires: uname(release) >= 3.0
Suggests: uname(release) >= 3.8
Suggests: fsck >= 2.25.0
Suggests: service(klogd)
Suggests: service(syslog)
-Provides: group(systemd-bus-proxy)
+Provides: group(systemd-coredump)
Provides: group(systemd-journal)
Provides: group(systemd-journal-remote)
Provides: group(systemd-journal-upload)
@@ -173,7 +158,6 @@ Provides: group(systemd-network)
Provides: group(systemd-resolve)
Provides: group(systemd-timesync)
Provides: udev-acl = %{epoch}:%{version}-%{release}
-Provides: user(systemd-bus-proxy)
Provides: user(systemd-journal-remote)
Provides: user(systemd-journal-upload)
Provides: user(systemd-network)
@@ -347,18 +331,6 @@ zarządcy systemu i usług systemd.
Ten pakiet zawiera ogólną konfigurację, ustawienia można nadpisać
poprzez katalog %{_sysconfdir}/systemd/system.
-%package consoled
-Summary: Terminal support for systemd
-Summary(pl.UTF-8): Obsługa terminala dla systemd
-Group: Base
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description consoled
-Terminal support for systemd.
-
-%description consoled -l pl.UTF-8
-Obsługa terminala dla systemd.
-
%package journal-gateway
Summary: Gateway for serving journal events over the network using HTTP
Summary(pl.UTF-8): Bramka do serwowania zdarzeń dziennika po sieci poprzez HTTP
@@ -494,32 +466,6 @@ Header files for systemd libraries.
%description devel -l pl.UTF-8
Pliki nagłówkowe bibliotek systemd.
-%package -n python-systemd
-Summary: Systemd Python 2.x bindings
-Summary(pl.UTF-8): Wiązania do Systemd dla Pythona 2.x
-Group: Development/Languages/Python
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: python
-
-%description -n python-systemd
-Systemd Python 2.x bindings.
-
-%description -n python-systemd -l pl.UTF-8
-Wiązania do Systemd dla Pythona 2.x.
-
-%package -n python3-systemd
-Summary: Systemd Python 3.x bindings
-Summary(pl.UTF-8): Wiązania do Systemd dla Pythona 3.x
-Group: Development/Languages/Python
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: python3
-
-%description -n python3-systemd
-Systemd Python 3.x bindings.
-
-%description -n python-systemd -l pl.UTF-8
-Wiązania do Systemd dla Pythona 3.x.
-
%package -n bash-completion-systemd
Summary: bash-completion for systemd
Summary(pl.UTF-8): Bashowe dopełnianie składni dla systemd
@@ -668,16 +614,13 @@ Uzupełnianie parametrów w zsh dla poleceń udev.
%patch5 -p1
# rejected upstream (do not disable!)
%patch6 -p1
-%patch7 -p1
+
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
cp -p %{SOURCE2} src/systemd_booted.c
@@ -689,8 +632,6 @@ cp -p %{SOURCE2} src/systemd_booted.c
%{__autoheader}
%{__automake}
-for PYTHON in %{__python} %{?with_python3:%{__python3}}; do
-
%configure \
QUOTAON=/sbin/quotaon \
QUOTACHECK=/sbin/quotacheck \
@@ -699,9 +640,9 @@ for PYTHON in %{__python} %{?with_python3:%{__python3}}; do
KMOD=/sbin/kmod \
KEXEC=/sbin/kexec \
PYTHON="$PYTHON" \
- PYTHON_BINARY="$PYTHON" \
+ PYTHON_BINARY="%{__python}" \
%if "%{?configure_cache}" == "1"
- --cache-file=%{?configure_cache_file}%{!?configure_cache_file:configure}-$(basename $PYTHON).cache \
+ --cache-file=%{?configure_cache_file}%{!?configure_cache_file:configure}.cache \
%endif
%{?debug:--enable-debug} \
%{__enable_disable audit} \
@@ -712,12 +653,11 @@ for PYTHON in %{__python} %{?with_python3:%{__python3}}; do
%{__enable_disable microhttpd} \
%{__enable_disable qrencode} \
--disable-silent-rules \
- --enable-compat-libs \
--enable-lz4 \
--enable-split-usr \
- %{?with_consoled:--enable-terminal} \
--with-kbd-loadkeys=/usr/bin/loadkeys \
--with-kbd-setfont=/bin/setfont \
+ --with-ntp-servers='0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org' \
--with-rc-local-script-path-start=/etc/rc.d/rc.local \
--with-rc-local-script-path-stop=/sbin/halt.local \
--with-rootprefix="" \
@@ -725,15 +665,8 @@ for PYTHON in %{__python} %{?with_python3:%{__python3}}; do
--with-sysvinit-path=/etc/rc.d/init.d \
--with-sysvrcnd-path=/etc/rc.d
-%{__make} clean-python
-
%{__make}
-python_libs=.libs/$(basename $PYTHON)
-mkdir -p $python_libs
-cp -a .libs/{_daemon,_journal,_reader,id128,login}.so $python_libs
-done
-
./libtool --mode=link --tag=CC %{__cc} %{rpmcppflags} %{rpmcflags} -o systemd_booted %{rpmldflags} src/systemd_booted.c -L. -lsystemd-daemon
%{?with_tests:%{__make} check}
@@ -886,23 +819,7 @@ install -d $RPM_BUILD_ROOT/var/log
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
%{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_systemd.la \
- $RPM_BUILD_ROOT/%{_lib}/libnss_myhostname.la \
- $RPM_BUILD_ROOT%{_libdir}/*.la
-
-%if %{with python3}
-%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/systemd/*.la
-
-# install Python2 files, binaries built and saved earlier
-install -d $RPM_BUILD_ROOT%{py_sitedir}/systemd
-cp -a $RPM_BUILD_ROOT%{py3_sitedir}/systemd/*.py $RPM_BUILD_ROOT%{py_sitedir}/systemd
-install -p .libs/python2/*.so $RPM_BUILD_ROOT%{py_sitedir}/systemd
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-%else
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/systemd/*.la
-%endif
-%py_postclean
-
+ $RPM_BUILD_ROOT/%{_lib}/*.la
%find_lang %{name}
@@ -911,8 +828,6 @@ rm -rf $RPM_BUILD_ROOT
%pre
%groupadd -g 288 systemd-journal
-%groupadd -g 315 systemd-bus-proxy
-%useradd -u 315 -g 315 -d /var/log/journal -s /bin/false -c "Systemd Bus Proxy" systemd-bus-proxy
%groupadd -g 316 systemd-network
%useradd -u 316 -g 316 -d /var/log/journal -s /bin/false -c "Systemd Network Management" systemd-network
%groupadd -g 317 systemd-resolve
@@ -923,6 +838,7 @@ rm -rf $RPM_BUILD_ROOT
%useradd -u 319 -g 319 -d /var/log/journal -s /bin/false -c "Systemd Journal Remote" systemd-journal-remote
%groupadd -g 320 systemd-journal-upload
%useradd -u 320 -g 320 -d /var/log/journal -s /bin/false -c "Systemd Journal Upload" systemd-journal-upload
+%groupadd -g 333 systemd-coredump
%post
/bin/systemd-machine-id-setup || :
@@ -1134,7 +1050,6 @@ fi
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/locale.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/machine-info
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vconsole.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/bootchart.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/coredump.conf
%if %{with microhttpd}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/journal-remote.conf
@@ -1178,9 +1093,12 @@ fi
%attr(755,root,root) %{_bindir}/systemd-cgtop
%attr(755,root,root) %{_bindir}/systemd-delta
%attr(755,root,root) %{_bindir}/systemd-detect-virt
+%attr(755,root,root) %{_bindir}/systemd-mount
%attr(755,root,root) %{_bindir}/systemd-nspawn
%attr(755,root,root) %{_bindir}/systemd-path
+%attr(755,root,root) %{_bindir}/systemd-resolve
%attr(755,root,root) %{_bindir}/systemd-run
+%attr(755,root,root) %{_bindir}/systemd-socket-activate
%attr(755,root,root) %{_bindir}/systemd-stdio-bridge
%attr(755,root,root) %{_bindir}/systemd-sysv-convert
%attr(755,root,root) %{_bindir}/timedatectl
@@ -1188,11 +1106,8 @@ fi
%attr(755,root,root) /lib/systemd/pld-clean-tmp
%attr(755,root,root) /lib/systemd/pld-storage-init
%attr(755,root,root) /lib/systemd/systemd-ac-power
-%attr(755,root,root) /lib/systemd/systemd-activate
%attr(755,root,root) /lib/systemd/systemd-backlight
%attr(755,root,root) /lib/systemd/systemd-binfmt
-%attr(755,root,root) /lib/systemd/systemd-bootchart
-%attr(755,root,root) /lib/systemd/systemd-bus-proxyd
%attr(755,root,root) /lib/systemd/systemd-cgroups-agent
%attr(755,root,root) /lib/systemd/systemd-coredump
%{?with_cryptsetup:%attr(755,root,root) /lib/systemd/systemd-cryptsetup}
@@ -1211,14 +1126,12 @@ fi
%attr(755,root,root) /lib/systemd/systemd-localed
%attr(755,root,root) /lib/systemd/systemd-logind
%attr(755,root,root) /lib/systemd/systemd-machined
-%attr(755,root,root) /lib/systemd/systemd-machine-id-commit
%attr(755,root,root) /lib/systemd/systemd-modules-load
%attr(755,root,root) /lib/systemd/systemd-pull
%attr(755,root,root) /lib/systemd/systemd-quotacheck
%attr(755,root,root) /lib/systemd/systemd-random-seed
%attr(755,root,root) /lib/systemd/systemd-remount-fs
%attr(755,root,root) /lib/systemd/systemd-reply-password
-%attr(755,root,root) /lib/systemd/systemd-resolve-host
%attr(755,root,root) /lib/systemd/systemd-rfkill
%attr(755,root,root) /lib/systemd/systemd-shutdown
%attr(755,root,root) /lib/systemd/systemd-sleep
@@ -1234,7 +1147,6 @@ fi
%attr(755,root,root) /lib/systemd/systemd
%{?with_cryptsetup:%attr(755,root,root) /lib/systemd/system-generators/systemd-cryptsetup-generator}
%attr(755,root,root) /lib/systemd/system-generators/systemd-debug-generator
-%attr(755,root,root) /lib/systemd/system-generators/systemd-efi-boot-generator
%attr(755,root,root) /lib/systemd/system-generators/systemd-fstab-generator
%attr(755,root,root) /lib/systemd/system-generators/systemd-getty-generator
%attr(755,root,root) /lib/systemd/system-generators/systemd-gpt-auto-generator
@@ -1271,11 +1183,13 @@ fi
%{_libexecdir}/systemd/catalog/systemd.catalog
%lang(be) %{_libexecdir}/systemd/catalog/systemd.be.catalog
%lang(be) %{_libexecdir}/systemd/catalog/systemd.be at latin.catalog
+%lang(bg) %{_libexecdir}/systemd/catalog/systemd.bg.catalog
%lang(fr) %{_libexecdir}/systemd/catalog/systemd.fr.catalog
%lang(it) %{_libexecdir}/systemd/catalog/systemd.it.catalog
%lang(pl) %{_libexecdir}/systemd/catalog/systemd.pl.catalog
%lang(pt_BR) %{_libexecdir}/systemd/catalog/systemd.pt_BR.catalog
%lang(ru) %{_libexecdir}/systemd/catalog/systemd.ru.catalog
+%lang(zh_CN) %{_libexecdir}/systemd/catalog/systemd.zh_CN.catalog
%lang(zh_TW) %{_libexecdir}/systemd/catalog/systemd.zh_TW.catalog
%dir %{_libexecdir}/sysusers.d
%{_libexecdir}/sysusers.d/basic.conf
@@ -1285,6 +1199,7 @@ fi
%endif
%{_libexecdir}/tmpfiles.d/etc.conf
%{_libexecdir}/tmpfiles.d/home.conf
+%{_libexecdir}/tmpfiles.d/journal-nocow.conf
%{_libexecdir}/tmpfiles.d/legacy.conf
%{_libexecdir}/tmpfiles.d/systemd.conf
%{_libexecdir}/tmpfiles.d/systemd-nologin.conf
@@ -1328,7 +1243,6 @@ fi
%{_mandir}/man1/machinectl.1*
%{_mandir}/man1/systemd.1*
%{_mandir}/man1/systemd-ask-password.1*
-%{_mandir}/man1/systemd-bootchart.1*
%{_mandir}/man1/systemd-cat.1*
%{_mandir}/man1/systemd-cgls.1*
%{_mandir}/man1/systemd-cgtop.1*
@@ -1338,23 +1252,25 @@ fi
%{_mandir}/man1/systemd-firstboot.1*
%{_mandir}/man1/systemd-firstboot.service.1*
%{_mandir}/man1/systemd-inhibit.1*
-%{_mandir}/man1/systemd-machine-id-commit.1*
%{_mandir}/man1/systemd-machine-id-setup.1*
+%{_mandir}/man1/systemd-mount.1*
%{_mandir}/man1/systemd-notify.1*
%{_mandir}/man1/systemd-nspawn.1*
%{_mandir}/man1/systemd-path.1*
+%{_mandir}/man1/systemd-resolve.1*
%{_mandir}/man1/systemd-run.1*
+%{_mandir}/man1/systemd-socket-activate.1*
%{_mandir}/man1/systemd-tty-ask-password-agent.1*
%{_mandir}/man1/timedatectl.1*
%{_mandir}/man5/binfmt.d.5*
-%{_mandir}/man5/bootchart.conf.5*
-%{_mandir}/man5/bootchart.conf.d.5*
%{_mandir}/man5/coredump.conf.5*
%{_mandir}/man5/coredump.conf.d.5*
%{_mandir}/man5/hostname.5*
%if %{with microhttpd}
%{_mandir}/man5/journal-remote.conf.5*
%{_mandir}/man5/journal-remote.conf.d.5*
+%{_mandir}/man5/journal-upload.conf.5.*
+%{_mandir}/man5/journal-upload.conf.d.5*
%endif
%{_mandir}/man5/journald.conf.5*
%{_mandir}/man5/journald.conf.d.5*
@@ -1393,14 +1309,12 @@ fi
%{_mandir}/man8/libnss_mymachines.so.2.8*
%{_mandir}/man8/nss-myhostname.8*
%{_mandir}/man8/nss-mymachines.8*
-%{_mandir}/man8/systemd-activate.8*
%{_mandir}/man8/systemd-backlight.8*
%{_mandir}/man8/systemd-binfmt.8*
%{_mandir}/man8/systemd-coredump.8*
%{?with_cryptsetup:%{_mandir}/man8/systemd-cryptsetup-generator.8*}
%{_mandir}/man8/systemd-debug-generator.8*
%{_mandir}/man8/systemd-fsck.8*
-%{_mandir}/man8/systemd-efi-boot-generator.8*
%{_mandir}/man8/systemd-gpt-auto-generator.8*
%{_mandir}/man8/systemd-fstab-generator.8*
%{_mandir}/man8/systemd-getty-generator.8*
@@ -1408,6 +1322,7 @@ fi
%{_mandir}/man8/systemd-hibernate-resume.8*
%{_mandir}/man8/systemd-hibernate-resume at .service.8*
%{_mandir}/man8/systemd-hostnamed.8*
+%{_mandir}/man8/systemd-importd.8*
%{_mandir}/man8/systemd-initctl.8*
%{_mandir}/man8/systemd-journald-dev-log.socket.8*
%{_mandir}/man8/systemd-journald.8*
@@ -1424,7 +1339,7 @@ fi
%{_mandir}/man8/systemd-random-seed.8*
%{_mandir}/man8/systemd-remount-fs.8*
%{_mandir}/man8/systemd-rfkill.8*
-%{_mandir}/man8/systemd-rfkill at .service.8*
+%{_mandir}/man8/systemd-rfkill.service.8*
%{_mandir}/man8/systemd-shutdown.8*
%{_mandir}/man8/systemd-sleep.8*
%{_mandir}/man8/systemd-socket-proxyd.8*
@@ -1505,14 +1420,10 @@ fi
%{_libexecdir}/systemd/user/sockets.target
%{_libexecdir}/systemd/user/sound.target
%{_libexecdir}/systemd/user/timers.target
-%{_libexecdir}/systemd/user/systemd-bus-proxyd.service
-%{_libexecdir}/systemd/user/systemd-bus-proxyd.socket
%{_libexecdir}/systemd/user/systemd-exit.service
%dir %{_libexecdir}/systemd/user-generators
-%{_libexecdir}/systemd/user-generators/systemd-dbus1-generator
%dir /lib/systemd/pld-helpers.d
%dir /lib/systemd/system-generators
-%attr(755,root,root) /lib/systemd/system-generators/systemd-dbus1-generator
%dir /lib/systemd/system-preset
/lib/systemd/system-preset/90-systemd.preset
%dir /lib/systemd/system-sleep
@@ -1525,6 +1436,9 @@ fi
%{_mandir}/man8/systemd-tmpfiles.8*
%{_npkgconfigdir}/systemd.pc
+%{systemdunitdir}/dev-hugepages.mount
+%{systemdunitdir}/dev-mqueue.mount
+%{systemdunitdir}/initrd-root-device.target
%{systemdunitdir}/org.freedesktop.hostname1.busname
%{systemdunitdir}/org.freedesktop.import1.busname
%{systemdunitdir}/org.freedesktop.locale1.busname
@@ -1535,12 +1449,15 @@ fi
%{systemdunitdir}/org.freedesktop.systemd1.busname
%{systemdunitdir}/org.freedesktop.timedate1.busname
%{systemdunitdir}/proc-sys-fs-binfmt_misc.automount
-%{systemdunitdir}/dev-hugepages.mount
-%{systemdunitdir}/dev-mqueue.mount
%{systemdunitdir}/proc-sys-fs-binfmt_misc.mount
+%{systemdunitdir}/sockets.target.wants/systemd-coredump.socket
%{systemdunitdir}/sys-fs-fuse-connections.mount
%{systemdunitdir}/sys-kernel-config.mount
%{systemdunitdir}/sys-kernel-debug.mount
+%{systemdunitdir}/systemd-coredump at .service
+%{systemdunitdir}/systemd-coredump.socket
+%{systemdunitdir}/systemd-exit.service
+%{systemdunitdir}/systemd-rfkill.socket
%{systemdunitdir}/tmp.mount
%{systemdunitdir}/var-lib-machines.mount
%{systemdunitdir}/var-lock.mount
@@ -1550,7 +1467,6 @@ fi
%{systemdunitdir}/allowlogin.service
%{systemdunitdir}/autovt at .service
%{systemdunitdir}/console-getty.service
-%{systemdunitdir}/console-shell.service
%{systemdunitdir}/console.service
%{systemdunitdir}/container-getty at .service
%{systemdunitdir}/cpusets.service
@@ -1590,8 +1506,6 @@ fi
%{systemdunitdir}/systemd-ask-password-wall.service
%{systemdunitdir}/systemd-backlight at .service
%{systemdunitdir}/systemd-binfmt.service
-%{systemdunitdir}/systemd-bootchart.service
-%{systemdunitdir}/systemd-bus-proxyd.service
%{systemdunitdir}/systemd-firstboot.service
%{systemdunitdir}/systemd-fsck-root.service
%{systemdunitdir}/systemd-fsck at .service
@@ -1621,7 +1535,7 @@ fi
%{systemdunitdir}/systemd-random-seed.service
%{systemdunitdir}/systemd-reboot.service
%{systemdunitdir}/systemd-remount-fs.service
-%{systemdunitdir}/systemd-rfkill at .service
+%{systemdunitdir}/systemd-rfkill.service
%{systemdunitdir}/systemd-suspend.service
%{systemdunitdir}/systemd-sysctl.service
%{systemdunitdir}/systemd-sysusers.service
@@ -1639,13 +1553,11 @@ fi
%{systemdunitdir}/systemd-user-sessions.service
%{systemdunitdir}/systemd-vconsole-setup.service
%{systemdunitdir}/user at .service
-%{systemdunitdir}/-.slice
%{systemdunitdir}/machine.slice
%{systemdunitdir}/system.slice
%{systemdunitdir}/user.slice
%exclude %{systemdunitdir}/rc-inetd.service
%{systemdunitdir}/syslog.socket
-%{systemdunitdir}/systemd-bus-proxyd.socket
%{systemdunitdir}/systemd-initctl.socket
%{systemdunitdir}/systemd-journal-remote.socket
%{systemdunitdir}/systemd-journald-audit.socket
@@ -1661,6 +1573,7 @@ fi
%{systemdunitdir}/ctrl-alt-del.target
%{systemdunitdir}/default.target
%{systemdunitdir}/emergency.target
+%{systemdunitdir}/exit.target
%{systemdunitdir}/final.target
%{systemdunitdir}/getty.target
%{systemdunitdir}/graphical.target
@@ -1790,17 +1703,17 @@ fi
%{systemdunitdir}/sysinit.target.wants/systemd-udev-trigger.service
%{systemdunitdir}/sysinit.target.wants/systemd-update-done.service
%{systemdunitdir}/sysinit.target.wants/systemd-update-utmp.service
-%{systemdunitdir}/sysinit.target.wants/systemd-vconsole-setup.service
%{systemdunitdir}/timers.target.wants/systemd-tmpfiles-clean.timer
+%{systemduserunitdir}/graphical-session-pre.target
+%{systemduserunitdir}/graphical-session.target
%{_mandir}/man8/systemd-ask-password-console.path.8*
%{_mandir}/man8/systemd-ask-password-console.service.8*
%{_mandir}/man8/systemd-ask-password-wall.path.8*
%{_mandir}/man8/systemd-ask-password-wall.service.8*
%{_mandir}/man8/systemd-backlight at .service.8*
%{_mandir}/man8/systemd-binfmt.service.8*
-%{_mandir}/man8/systemd-bus-proxyd.8*
-%{_mandir}/man8/systemd-bus-proxyd.socket.8
-%{_mandir}/man8/systemd-bus-proxyd at .service.8*
+%{_mandir}/man8/systemd-coredump.socket.8*
+%{_mandir}/man8/systemd-coredump at .service.8*
%{?with_cryptsetup:%{_mandir}/man8/systemd-cryptsetup.8*}
%{?with_cryptsetup:%{_mandir}/man8/systemd-cryptsetup at .service.8*}
%{_mandir}/man8/systemd-fsck-root.service.8*
@@ -1813,6 +1726,8 @@ fi
%{_mandir}/man8/systemd-initctl.socket.8*
%{_mandir}/man8/systemd-journald.service.8*
%{_mandir}/man8/systemd-journald.socket.8*
+%{_mandir}/man8/systemd-importd.service.8*
+%{_mandir}/man8/systemd-journald-audit.socket.8*
%{_mandir}/man8/systemd-kexec.service.8*
%{_mandir}/man8/systemd-localed.service.8*
%{_mandir}/man8/systemd-logind.service.8*
@@ -1823,6 +1738,7 @@ fi
%{_mandir}/man8/systemd-random-seed.service.8*
%{_mandir}/man8/systemd-reboot.service.8*
%{_mandir}/man8/systemd-remount-fs.service.8*
+%{_mandir}/man8/systemd-rfkill.socket.8*
%{_mandir}/man8/systemd-suspend.service.8*
%{_mandir}/man8/systemd-sysctl.service.8*
%{_mandir}/man8/systemd-timedated.service.8*
@@ -1838,16 +1754,6 @@ fi
%{_mandir}/man8/systemd-user-sessions.service.8*
%{_mandir}/man8/systemd-vconsole-setup.service.8*
-%if %{with consoled}
-%files consoled
-%defattr(644,root,root,755)
-%attr(755,root,root) /lib/systemd/systemd-consoled
-%{_libexecdir}/systemd/user/systemd-consoled.service
-%dir %{_libexecdir}/systemd/user/default.target.wants
-%{_libexecdir}/systemd/user/default.target.wants/systemd-consoled.service
-%{_datadir}/systemd/unifont-glyph-array.bin
-%endif
-
%if %{with microhttpd}
%files journal-gateway
%defattr(644,root,root,755)
@@ -1866,6 +1772,7 @@ fi
%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service
/lib/systemd/network/80-container-host0.network
/lib/systemd/network/80-container-ve.network
+/lib/systemd/network/80-container-vz.network
%{systemdunitdir}/dbus-org.freedesktop.network1.service
%{systemdunitdir}/systemd-networkd-wait-online.service
%{systemdunitdir}/systemd-networkd.service
@@ -1875,6 +1782,8 @@ fi
%attr(755,root,root) /lib/systemd/systemd-networkd
%attr(755,root,root) /lib/systemd/systemd-networkd-wait-online
%{_mandir}/man1/networkctl.1*
+%{_mandir}/man5/networkd.conf.5*
+%{_mandir}/man5/networkd.conf.d.5*
%{_mandir}/man8/systemd-networkd-wait-online.8*
%{_mandir}/man8/systemd-networkd-wait-online.service.8*
%{_mandir}/man8/systemd-networkd.8*
@@ -1905,60 +1814,25 @@ fi
%files libs
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnss_mymachines.so.2
-%attr(755,root,root) %{_libdir}/libnss_resolve.so.2
%attr(755,root,root) /%{_lib}/libnss_myhostname.so.2
+%attr(755,root,root) /%{_lib}/libnss_mymachines.so.2
+%attr(755,root,root) /%{_lib}/libnss_resolve.so.2
+%attr(755,root,root) /%{_lib}/libnss_systemd.so.2
%attr(755,root,root) /%{_lib}/libsystemd.so.*.*.*
%attr(755,root,root) %ghost /%{_lib}/libsystemd.so.0
-%attr(755,root,root) /%{_lib}/libsystemd-daemon.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libsystemd-daemon.so.0
-%attr(755,root,root) /%{_lib}/libsystemd-id128.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libsystemd-id128.so.0
-%attr(755,root,root) /%{_lib}/libsystemd-journal.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libsystemd-journal.so.0
-%attr(755,root,root) /%{_lib}/libsystemd-login.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libsystemd-login.so.0
+%{_mandir}/man8/libnss_resolve.so.2.8*
+%{_mandir}/man8/libnss_systemd.so.2.8*
+%{_mandir}/man8/nss-resolve.8*
+%{_mandir}/man8/nss-systemd.8.gz
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsystemd.so
-%attr(755,root,root) %{_libdir}/libsystemd-daemon.so
-%attr(755,root,root) %{_libdir}/libsystemd-id128.so
-%attr(755,root,root) %{_libdir}/libsystemd-journal.so
-%attr(755,root,root) %{_libdir}/libsystemd-login.so
+%attr(755,root,root) /%{_lib}/libsystemd.so
%{_includedir}/%{name}
%{_pkgconfigdir}/libsystemd.pc
-%{_pkgconfigdir}/libsystemd-daemon.pc
-%{_pkgconfigdir}/libsystemd-id128.pc
-%{_pkgconfigdir}/libsystemd-journal.pc
-%{_pkgconfigdir}/libsystemd-login.pc
%{_mandir}/man3/SD_*.3*
%{_mandir}/man3/sd*.3*
-%files -n python-systemd
-%defattr(644,root,root,755)
-%dir %{py_sitedir}/systemd
-%{py_sitedir}/systemd/*.py[co]
-%attr(755,root,root) %{py_sitedir}/systemd/_daemon.so
-%attr(755,root,root) %{py_sitedir}/systemd/_journal.so
-%attr(755,root,root) %{py_sitedir}/systemd/_reader.so
-%attr(755,root,root) %{py_sitedir}/systemd/id128.so
-%attr(755,root,root) %{py_sitedir}/systemd/login.so
-
-%if %{with python3}
-%files -n python3-systemd
-%defattr(644,root,root,755)
-%dir %{py3_sitedir}/systemd
-%{py3_sitedir}/systemd/*.py
-%dir %{py3_sitedir}/systemd/__pycache__
-%{py3_sitedir}/systemd/__pycache__/*.py[co]
-%attr(755,root,root) %{py3_sitedir}/systemd/_daemon.so
-%attr(755,root,root) %{py3_sitedir}/systemd/_journal.so
-%attr(755,root,root) %{py3_sitedir}/systemd/_reader.so
-%attr(755,root,root) %{py3_sitedir}/systemd/id128.so
-%attr(755,root,root) %{py3_sitedir}/systemd/login.so
-%endif
-
%files -n bash-completion-systemd
%defattr(644,root,root,755)
%{_datadir}/bash-completion/completions/bootctl
@@ -1970,6 +1844,7 @@ fi
%{_datadir}/bash-completion/completions/localectl
%{_datadir}/bash-completion/completions/loginctl
%{_datadir}/bash-completion/completions/machinectl
+%{_datadir}/bash-completion/completions/networkctl
%{_datadir}/bash-completion/completions/systemctl
%{_datadir}/bash-completion/completions/systemd-analyze
%{_datadir}/bash-completion/completions/systemd-cat
@@ -1978,12 +1853,15 @@ fi
%{_datadir}/bash-completion/completions/systemd-delta
%{_datadir}/bash-completion/completions/systemd-detect-virt
%{_datadir}/bash-completion/completions/systemd-nspawn
+%{_datadir}/bash-completion/completions/systemd-path
+%{_datadir}/bash-completion/completions/systemd-resolve
%{_datadir}/bash-completion/completions/systemd-run
%{_datadir}/bash-completion/completions/timedatectl
%files -n zsh-completion-systemd
%defattr(644,root,root,755)
%{_datadir}/zsh/site-functions/_bootctl
+%{_datadir}/zsh/site-functions/_busctl
%{_datadir}/zsh/site-functions/_coredumpctl
%{_datadir}/zsh/site-functions/_hostnamectl
%{_datadir}/zsh/site-functions/_journalctl
@@ -2001,6 +1879,7 @@ fi
%{_datadir}/zsh/site-functions/_systemd-delta
%{_datadir}/zsh/site-functions/_systemd-inhibit
%{_datadir}/zsh/site-functions/_systemd-nspawn
+%{_datadir}/zsh/site-functions/_systemd-resolve
%{_datadir}/zsh/site-functions/_systemd-run
%{_datadir}/zsh/site-functions/_systemd-tmpfiles
%{_datadir}/zsh/site-functions/_timedatectl
@@ -2028,8 +1907,6 @@ fi
%attr(755,root,root) /lib/udev/udevd
-%attr(755,root,root) /lib/udev/accelerometer
-
/lib/udev/hwdb.d/20-acpi-vendor.hwdb
/lib/udev/hwdb.d/20-bluetooth-vendor-product.hwdb
/lib/udev/hwdb.d/20-net-ifname.hwdb
@@ -2069,7 +1946,6 @@ fi
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/udev.conf
# rules below are NOT supposed to be changed by users
-/lib/udev/rules.d/42-usb-hid-pm.rules
/lib/udev/rules.d/50-udev-default.rules
/lib/udev/rules.d/60-block.rules
/lib/udev/rules.d/60-cdrom_id.rules
@@ -2081,7 +1957,6 @@ fi
/lib/udev/rules.d/60-persistent-storage-tape.rules
/lib/udev/rules.d/60-persistent-v4l.rules
/lib/udev/rules.d/60-serial.rules
-/lib/udev/rules.d/61-accelerometer.rules
/lib/udev/rules.d/64-btrfs.rules
/lib/udev/rules.d/70-mouse.rules
/lib/udev/rules.d/70-power-switch.rules
@@ -2107,7 +1982,7 @@ fi
%files -n udev-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libudev.so
+%attr(755,root,root) /%{_lib}/libudev.so
%{_includedir}/libudev.h
%{_pkgconfigdir}/libudev.pc
%{_npkgconfigdir}/udev.pc
diff --git a/config-pld.patch b/config-pld.patch
index ccfb08e..849fce5 100644
--- a/config-pld.patch
+++ b/config-pld.patch
@@ -17,12 +17,4 @@ diff -dur systemd-218.orig/tmpfiles.d/legacy.conf systemd-218/tmpfiles.d/legacy.
# /run/lock/lockdev is used to serialize access to tty devices via
# LCK..xxx style lock files, For more information see:
-@@ -24,7 +24,7 @@
- # On modern systems a BSD file lock is a better choice if
- # serialization is needed on those devices.
-
--d /run/lock/lockdev 0775 root lock -
-+# d /run/lock/lockdev 0775 root lock -
-
- # /forcefsck, /fastboot and /forcequotecheck are deprecated in favor of the
- # kernel command line options 'fsck.mode=force', 'fsck.mode=skip' and
+
diff --git a/cryptsetup_generator_cmdline_parsing.patch b/cryptsetup_generator_cmdline_parsing.patch
deleted file mode 100644
index 816c4ad..0000000
--- a/cryptsetup_generator_cmdline_parsing.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From c802a7306bdc3e82378a87acd9402bbabe9f6b28 Mon Sep 17 00:00:00 2001
-From: Jan Janssen <medhefgo at web.de>
-Date: Thu, 10 Sep 2015 10:23:49 +0200
-Subject: [PATCH] cryptsetup-generator: Properly check return code
-
----
- src/cryptsetup/cryptsetup-generator.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
-index 6fad8ad..ab91afe 100644
---- a/src/cryptsetup/cryptsetup-generator.c
-+++ b/src/cryptsetup/cryptsetup-generator.c
-@@ -330,7 +330,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
- free(d->keyfile);
- d->keyfile = uuid_value;
- uuid_value = NULL;
-- } else if (free_and_strdup(&arg_default_keyfile, value))
-+ } else if (free_and_strdup(&arg_default_keyfile, value) < 0)
- return log_oom();
-
- } else if (STR_IN_SET(key, "luks.name", "rd.luks.name") && value) {
diff --git a/empty_notify_dos.patch b/empty_notify_dos.patch
deleted file mode 100644
index afbbbc0..0000000
--- a/empty_notify_dos.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff -dur -x '*~' systemd-221.orig/src/core/manager.c systemd-221/src/core/manager.c
---- systemd-221.orig/src/core/manager.c 2015-06-17 20:28:29.557344895 +0200
-+++ systemd-221/src/core/manager.c 2016-10-01 11:33:10.138847360 +0200
-@@ -1478,13 +1478,12 @@
- return n;
- }
-
--static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, char *buf, size_t n, FDSet *fds) {
-+static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, char *buf, FDSet *fds) {
- _cleanup_strv_free_ char **tags = NULL;
-
- assert(m);
- assert(u);
- assert(buf);
-- assert(n > 0);
-
- tags = strv_split(buf, "\n\r");
- if (!tags) {
-@@ -1494,8 +1493,14 @@
-
- if (UNIT_VTABLE(u)->notify_message)
- UNIT_VTABLE(u)->notify_message(u, pid, tags, fds);
-- else
-- log_unit_debug(u, "Got notification message for unit. Ignoring.");
-+ else if (_unlikely_(log_get_max_level() >= LOG_DEBUG)) {
-+ _cleanup_free_ char *x = NULL, *y = NULL;
-+
-+ x = cescape(buf);
-+ if (x)
-+ y = ellipsize(x, 20, 90);
-+ log_unit_debug(u, "Got notification message \"%s\", ignoring.", strnull(y));
-+ }
- }
-
- static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t revents, void *userdata) {
-@@ -1538,10 +1543,13 @@
-
- n = recvmsg(m->notify_fd, &msghdr, MSG_DONTWAIT|MSG_CMSG_CLOEXEC);
- if (n < 0) {
-- if (errno == EAGAIN || errno == EINTR)
-- break;
--
-- return -errno;
-+ if (!IN_SET(errno, EAGAIN, EINTR))
-+ log_error("Failed to receive notification message: %m");
-+ /* It's not an option to return an error here since it
-+ * would disable the notification handler entirely. Services
-+ * wouldn't be able to send the WATCHDOG message for
-+ * example... */
-+ return 0;
- }
-
- CMSG_FOREACH(cmsg, &msghdr) {
-@@ -1564,7 +1572,8 @@
- r = fdset_new_array(&fds, fd_array, n_fds);
- if (r < 0) {
- close_many(fd_array, n_fds);
-- return log_oom();
-+ log_oom();
-+ return 0;
- }
- }
-
-@@ -1578,25 +1587,27 @@
- continue;
- }
-
-+ /* The message should be a string. Here we make sure it's NUL-terminated,
-+ * but only the part until first NUL will be used anyway. */
- buf[n] = 0;
-
- /* Notify every unit that might be interested, but try
- * to avoid notifying the same one multiple times. */
- u1 = manager_get_unit_by_pid(m, ucred->pid);
- if (u1) {
-- manager_invoke_notify_message(m, u1, ucred->pid, buf, n, fds);
-+ manager_invoke_notify_message(m, u1, ucred->pid, buf, fds);
- found = true;
- }
-
- u2 = hashmap_get(m->watch_pids1, LONG_TO_PTR(ucred->pid));
- if (u2 && u2 != u1) {
-- manager_invoke_notify_message(m, u2, ucred->pid, buf, n, fds);
-+ manager_invoke_notify_message(m, u2, ucred->pid, buf, fds);
- found = true;
- }
-
- u3 = hashmap_get(m->watch_pids2, LONG_TO_PTR(ucred->pid));
- if (u3 && u3 != u2 && u3 != u1) {
-- manager_invoke_notify_message(m, u3, ucred->pid, buf, n, fds);
-+ manager_invoke_notify_message(m, u3, ucred->pid, buf, fds);
- found = true;
- }
-
-Only in systemd-221/src/core: manager.c.orig
diff --git a/journal-gatewayd-fdopen.patch b/journal-gatewayd-fdopen.patch
deleted file mode 100644
index a752f04..0000000
--- a/journal-gatewayd-fdopen.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9e19c04f3a4e03e37dc89b63c1ae9b0a7c611810 Mon Sep 17 00:00:00 2001
-From: Daniel Mack <daniel at zonque.org>
-Date: Tue, 7 Jul 2015 17:21:03 -0400
-Subject: [PATCH] journal-gatewayd: fix tmpfile logic
-
-"rw" is not a valid mode string for f*open(). This got broken in
-cc02a7b33049 ("journal-gatewayd: factor out opening of temp
-file").
----
- src/journal-remote/journal-gatewayd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
-index d9450ae..9a09f40 100644
---- a/src/journal-remote/journal-gatewayd.c
-+++ b/src/journal-remote/journal-gatewayd.c
-@@ -132,7 +132,7 @@ static int request_meta_ensure_tmp(RequestMeta *m) {
- if (fd < 0)
- return fd;
-
-- m->tmp = fdopen(fd, "rw");
-+ m->tmp = fdopen(fd, "w+");
- if (!m->tmp) {
- safe_close(fd);
- return -errno;
diff --git a/nss-in-rootlib.patch b/nss-in-rootlib.patch
deleted file mode 100644
index 0559e5a..0000000
--- a/nss-in-rootlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- systemd-197/Makefile.am.orig 2013-01-11 17:08:54.878788792 +0100
-+++ systemd-197/Makefile.am 2013-01-11 17:10:25.442120239 +0100
-@@ -3589,7 +3589,7 @@
- -shared \
- -shrext .so.2
-
--lib_LTLIBRARIES += \
-+rootlib_LTLIBRARIES = \
- libnss_myhostname.la
- endif
-
diff --git a/optional-tmp-on-tmpfs.patch b/optional-tmp-on-tmpfs.patch
index afda353..9f0eee0 100644
--- a/optional-tmp-on-tmpfs.patch
+++ b/optional-tmp-on-tmpfs.patch
@@ -1,9 +1,9 @@
---- systemd-208/units/tmp.mount~ 2013-08-13 22:02:52.833756462 +0200
-+++ systemd-208/units/tmp.mount 2014-02-27 18:48:29.799737745 +0100
-@@ -18,3 +18,6 @@
+--- a/units/tmp.mount.m4~ 2016-11-03 18:16:42.000000000 +0100
++++ b/units/tmp.mount.m4 2016-11-12 20:03:29.998410581 +0100
+@@ -20,3 +20,6 @@ What=tmpfs
Where=/tmp
Type=tmpfs
- Options=mode=1777,strictatime
+ Options=mode=1777,strictatime,nosuid,nodev
+
+[Install]
+WantedBy=local-fs.target
diff --git a/pld-boot_efi_mount.patch b/pld-boot_efi_mount.patch
index 0077d0c..bf9801b 100644
--- a/pld-boot_efi_mount.patch
+++ b/pld-boot_efi_mount.patch
@@ -1,82 +1,11 @@
-diff -dur -x '*~' -x '*.orig' -x '*.rej' systemd-218.orig/src/efi-boot-generator/efi-boot-generator.c systemd-218/src/efi-boot-generator/efi-boot-generator.c
---- systemd-218.orig/src/efi-boot-generator/efi-boot-generator.c 2014-12-05 01:26:51.000000000 +0100
-+++ systemd-218/src/efi-boot-generator/efi-boot-generator.c 2015-04-02 15:45:18.000000000 +0200
-@@ -69,15 +69,15 @@
- return EXIT_SUCCESS;
+--- a/src/gpt-auto-generator/gpt-auto-generator.c~ 2016-11-03 18:16:42.000000000 +0100
++++ b/src/gpt-auto-generator/gpt-auto-generator.c 2016-11-12 20:01:04.784509883 +0100
+@@ -466,7 +466,7 @@ static int add_boot(const char *what) {
}
-- r = path_is_mount_point("/boot", AT_SYMLINK_FOLLOW);
-+ r = path_is_mount_point("/boot/efi", AT_SYMLINK_FOLLOW);
- if (r > 0) {
-- log_debug("/boot is already a mount point, exiting.");
-+ log_debug("/boot/efi is already a mount point, exiting.");
- return EXIT_SUCCESS;
- }
- if (r == -ENOENT)
-- log_debug("/boot does not exist, continuing.");
-- else if (dir_is_empty("/boot") <= 0) {
-- log_debug("/boot already populated, exiting.");
-+ log_debug("/boot/efi does not exist, continuing.");
-+ else if (dir_is_empty("/boot/efi") <= 0) {
-+ log_debug("/boot/efi already populated, exiting.");
- return EXIT_SUCCESS;
- }
-
-@@ -84,7 +84,7 @@
- return EXIT_FAILURE;
- }
+ /* If /efi exists we'll use that. Otherwise we'll use /boot, as that's usually the better choice */
+- esp = access("/efi/", F_OK) >= 0 ? "/efi" : "/boot";
++ esp = access("/efi/", F_OK) >= 0 ? "/efi" : "/boot/efi";
-- name = strjoina(arg_dest, "/boot.mount");
-+ name = strjoina(arg_dest, "/boot-efi.mount");
- f = fopen(name, "wxe");
- if (!f) {
- log_error_errno(errno, "Failed to create mount unit file %s: %m", name);
-@@ -105,7 +105,7 @@
- "Description=EFI System Partition\n"
- "Documentation=man:systemd-efi-boot-generator(8)\n");
-
-- r = generator_write_fsck_deps(f, arg_dest, what, "/boot", "vfat");
-+ r = generator_write_fsck_deps(f, arg_dest, what, "/boot/efi", "vfat");
- if (r < 0)
- return EXIT_FAILURE;
-
-@@ -113,7 +113,7 @@
- "\n"
- "[Mount]\n"
- "What=%s\n"
-- "Where=/boot\n"
-+ "Where=/boot/efi\n"
- "Type=vfat\n"
- "Options=umask=0077,noauto\n",
- what);
-@@ -124,7 +124,7 @@
- return EXIT_FAILURE;
- }
-
-- name = strjoina(arg_dest, "/boot.automount");
-+ name = strjoina(arg_dest, "/boot-efi.automount");
- fclose(f);
- f = fopen(name, "wxe");
- if (!f) {
-@@ -136,7 +136,7 @@
- "[Unit]\n"
- "Description=EFI System Partition Automount\n\n"
- "[Automount]\n"
-- "Where=/boot\n"
-+ "Where=/boot/efi\n"
- "TimeoutIdleSec=120\n", f);
-
- fflush(f);
-@@ -144,10 +144,10 @@
- return EXIT_FAILURE;
- }
-
-- name = strjoina(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/boot.automount");
-+ name = strjoina(arg_dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/boot-efi.automount");
- mkdir_parents(name, 0755);
-
-- if (symlink("../boot.automount", name) < 0) {
-+ if (symlink("../boot-efi.automount", name) < 0) {
- log_error_errno(errno, "Failed to create symlink %s: %m", name);
- return EXIT_FAILURE;
- }
+ /* We create an .automount which is not overridden by the .mount from the fstab generator. */
+ if (fstab_is_mount_point(esp)) {
diff --git a/target-pld.patch b/target-pld.patch
index ca3ba69..ed56122 100644
--- a/target-pld.patch
+++ b/target-pld.patch
@@ -49,6 +49,14 @@ diff -dur -x '*~' -x '*.orig' systemd-208.orig/Makefile.am systemd-208/Makefile.
diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/core/hostname-setup.c systemd-208/src/core/hostname-setup.c
--- systemd-208.orig/src/core/hostname-setup.c 2013-08-13 22:02:46.000000000 +0200
+++ systemd-208/src/core/hostname-setup.c 2014-01-09 15:15:41.000000000 +0100
+@@ -23,6 +23,7 @@
+
+ #include "alloc-util.h"
+ #include "fileio.h"
++#include "fd-util.h"
+ #include "hostname-setup.h"
+ #include "hostname-util.h"
+ #include "log.h"
@@ -53,13 +53,84 @@
return 0;
}
@@ -86,7 +94,7 @@ diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/core/hostname-setup.c systemd
+ goto finish;
+ }
+
-+ hostname_cleanup(k, false);
++ hostname_cleanup(k);
+
+ if (isempty(k)) {
+ free(k);
@@ -162,29 +170,27 @@ diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/core/locale-setup.c systemd-2
add = NULL;
for (i = 0; i < _VARIABLE_MAX; i++) {
char *s;
-diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/timedate/timedated.c systemd-208/src/timedate/timedated.c
---- systemd-208.orig/src/timedate/timedated.c 2013-08-13 22:02:47.000000000 +0200
-+++ systemd-208/src/timedate/timedated.c 2014-01-09 15:15:41.000000000 +0100
-@@ -183,9 +183,19 @@
- c->zone = strdup(e);
- if (!c->zone)
- return log_oom();
-+ goto have_timezone;
- }
- }
+--- a/src/basic/time-util.c~ 2016-11-03 18:16:42.000000000 +0100
++++ b/src/basic/time-util.c 2016-11-12 19:54:28.457197174 +0100
+@@ -1290,8 +1290,16 @@ int get_timezone(char **tz) {
+ e = path_startswith(t, "/usr/share/zoneinfo/");
+ if (!e)
+ e = path_startswith(t, "../usr/share/zoneinfo/");
+- if (!e)
+- return -EINVAL;
++ if (!e) {
++ r = parse_env_file("/etc/sysconfig/timezone", NEWLINE,
++ "TIMEZONE", &e,
++ NULL);
++ if (r < 0) {
++ if (r != -ENOENT)
++ log_warning("Failed to read /etc/sysconfig/timezone: %s", strerror(-r));
++ return -EINVAL;
++ }
++ }
-+ r = parse_env_file("/etc/sysconfig/timezone", NEWLINE,
-+ "TIMEZONE", &c->zone,
-+ NULL);
-+ if (r < 0) {
-+ if (r != -ENOENT)
-+ log_warning("Failed to read /etc/sysconfig/timezone: %s", strerror(-r));
-+ }
-+
-+have_timezone:
- if (isempty(c->zone)) {
- free(c->zone);
- c->zone = NULL;
+ if (!timezone_is_valid(e))
+ return -EINVAL;
diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/vconsole/vconsole-setup.c systemd-208/src/vconsole/vconsole-setup.c
--- systemd-208.orig/src/vconsole/vconsole-setup.c 2013-08-13 22:02:47.000000000 +0200
+++ systemd-208/src/vconsole/vconsole-setup.c 2014-01-09 15:17:49.000000000 +0100
diff --git a/uids_gids.patch b/uids_gids.patch
index a837d5f..d4fa709 100644
--- a/uids_gids.patch
+++ b/uids_gids.patch
@@ -1,7 +1,6 @@
-diff -dur systemd-218.orig/sysusers.d/basic.conf.in systemd-218/sysusers.d/basic.conf.in
---- systemd-218.orig/sysusers.d/basic.conf.in 2014-12-05 01:26:51.000000000 +0100
-+++ systemd-218/sysusers.d/basic.conf.in 2015-04-20 08:47:12.000000000 +0200
-@@ -12,26 +12,26 @@
+--- a/sysusers.d/basic.conf.in~ 2016-11-03 18:16:42.000000000 +0100
++++ b/sysusers.d/basic.conf.in 2016-11-12 20:05:11.934482095 +0100
+@@ -12,25 +12,25 @@ u root 0 "Super User" /root
u nobody 65534 "Nobody" -
# Administrator group: can *see* more than normal users
@@ -10,16 +9,14 @@ diff -dur systemd-218.orig/sysusers.d/basic.conf.in systemd-218/sysusers.d/basic
# Administrator group: can *do* more than normal users
-g wheel - - -
-+g wheel 10 - -
++g wheel 10 - -
# Access to certain kernel and userspace facilities
-g kmem - - -
--g lock - - -
+g kmem 9 - -
-+#g lock - - -
g tty @TTY_GID@ - -
-g utmp - - -
-+g utmp 22 - -
++g utmp 22 - -
# Hardware access groups
-g audio - - -
@@ -30,41 +27,41 @@ diff -dur systemd-218.orig/sysusers.d/basic.conf.in systemd-218/sysusers.d/basic
-g lp - - -
-g tape - - -
-g video - - -
-+g audio 23 - -
-+g cdrom 27 - -
-+g dialout 16 - -
++g audio 23 - -
++g cdrom 27 - -
++g dialout 16 - -
+g disk 6 - -
-+g input 182 - -
++g input 182 - -
+g lp 7 - -
-+g tape 68 - -
-+g video 24 - -
++g tape 68 - -
++g video 24 - -
# Default group for normal users
-g users - - -
-+g users 1000 - -
-diff -dur systemd-218.orig/sysusers.d/systemd-remote.conf systemd-218/sysusers.d/systemd-remote.conf
---- systemd-218.orig/sysusers.d/systemd-remote.conf 2014-12-05 01:26:51.000000000 +0100
-+++ systemd-218/sysusers.d/systemd-remote.conf 2015-04-20 08:48:22.000000000 +0200
-@@ -5,6 +5,6 @@
- # the Free Software Foundation; either version 2.1 of the License, or
++g users 1000 - -
+--- a/sysusers.d/systemd-remote.conf.m4~ 2016-11-03 18:16:42.000000000 +0100
++++ b/sysusers.d/systemd-remote.conf.m4 2016-11-12 20:07:22.838061991 +0100
+@@ -6,9 +6,9 @@
# (at your option) any later version.
+ m4_ifdef(`HAVE_MICROHTTPD',
-u systemd-journal-gateway - "systemd Journal Gateway"
-u systemd-journal-remote - "systemd Journal Remote"
--u systemd-journal-upload - "systemd Journal Upload"
+u systemd-journal-gateway 287 "systemd Journal Gateway"
+u systemd-journal-remote 319 "systemd Journal Remote"
+ )m4_dnl
+ m4_ifdef(`HAVE_LIBCURL',
+-u systemd-journal-upload - "systemd Journal Upload"
+u systemd-journal-upload 320 "systemd Journal Upload"
---- systemd-220/sysusers.d/systemd.conf.m4~ 2014-12-05 01:26:51.000000000 +0100
-+++ systemd-220/sysusers.d/systemd.conf.m4 2015-05-25 17:34:30.699429304 +0200
-@@ -5,14 +5,14 @@
+ )m4_dnl
+--- a/sysusers.d/systemd.conf.m4~ 2016-11-03 18:16:42.000000000 +0100
++++ b/sysusers.d/systemd.conf.m4 2016-11-12 20:08:23.103080854 +0100
+@@ -5,16 +5,16 @@
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
-g systemd-journal - -
+g systemd-journal 288 -
--u systemd-bus-proxy - "systemd Bus Proxy"
-+u systemd-bus-proxy 315 "systemd Bus Proxy"
m4_ifdef(`ENABLE_NETWORKD',
-u systemd-network - "systemd Network Management"
+u systemd-network 316 "systemd Network Management"
@@ -77,3 +74,8 @@ diff -dur systemd-218.orig/sysusers.d/systemd-remote.conf systemd-218/sysusers.d
-u systemd-timesync - "systemd Time Synchronization"
+u systemd-timesync 318 "systemd Time Synchronization"
)m4_dnl
+ m4_ifdef(`ENABLE_COREDUMP',
+-u systemd-coredump - "systemd Core Dumper"
++u systemd-coredump 333 "systemd Core Dumper"
+ )m4_dnl
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/c75f826c12fbcc3ecf4bb5ce500da6f303b301b9
More information about the pld-cvs-commit
mailing list