From a919bc1d5ce629d58af0d15b042bb7b7854216e9 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sun, 24 Feb 2019 23:21:32 +0100 Subject: [PATCH] up to 241 --- meson-debug.patch | 40 ------- net-rename-revert.patch | 75 +++++++------ pld-sysv-network.patch | 20 ++-- proc-hidepid.patch | 6 +- systemd-struct-statx-in-glibc.patch | 106 ------------------ ...hanges-type-of-drift_freq-to-int64_t.patch | 41 ------- systemd.spec | 38 ++++--- target-pld.patch | 52 ++++++--- udevadm-in-sbin.patch | 4 +- 9 files changed, 116 insertions(+), 266 deletions(-) delete mode 100644 meson-debug.patch delete mode 100644 systemd-struct-statx-in-glibc.patch delete mode 100644 systemd-timesync-changes-type-of-drift_freq-to-int64_t.patch diff --git a/meson-debug.patch b/meson-debug.patch deleted file mode 100644 index 19db590..0000000 --- a/meson-debug.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8f6b442a78d0b485f044742ad90b2e8271b4e68e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Sun, 19 Aug 2018 19:11:30 +0200 -Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra - -Meson added -Doptimization and -Ddebug options, which obviously causes -a conflict with our -Ddebug options. Let's rename it. - -Fixes #9883. ---- - meson.build | 2 +- - meson_options.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index f79ac4b12e7..2209c935ad6 100644 ---- a/meson.build -+++ b/meson.build -@@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty')) - - enable_debug_hashmap = false - enable_debug_mmap_cache = false --foreach name : get_option('debug') -+foreach name : get_option('debug-extra') - if name == 'hashmap' - enable_debug_hashmap = true - elif name == 'mmap-cache' -diff --git a/meson_options.txt b/meson_options.txt -index e3140c8c110..7b1f61bf464 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh', - description : 'path to debug shell binary') - option('debug-tty', type : 'string', value : '/dev/tty9', - description : 'specify the tty device for debug shell') --option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], -+option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], - description : 'enable extra debugging') - option('memory-accounting-default', type : 'boolean', - description : 'enable MemoryAccounting= by default') diff --git a/net-rename-revert.patch b/net-rename-revert.patch index 6446261..e8bf17b 100644 --- a/net-rename-revert.patch +++ b/net-rename-revert.patch @@ -5,52 +5,59 @@ Subject: Revert "udev: network device renaming - immediately give up if the This reverts commit 97595710b77aa162ca5e20da57d0a1ed7355eaad. -Since we are keeping the old persistent network interface naming for -now, and make the new naming scheme [1] explictly opt-in [2], re-apply -this old hack to make the renaming less likely to fail. - -[1] http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames/ -[2] d5051f7666e25ecf2b32c7076ce18c1de969d01b +We need to keep supporting systems with 75-persistent-net-generator.rules +generated names for a while after switching to net.ifnames. Re-apply this old +hack to make the renaming less likely to fail. --- - src/udev/udev-event.c | 41 ++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 38 insertions(+), 3 deletions(-) + src/udev/udev-event.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 46 insertions(+), 5 deletions(-) diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c -index bc115f1..a673f51 100644 +index 07b7365..f67b295 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c -@@ -769,18 +769,53 @@ static int rename_netif(struct udev_event *event) { +@@ -680,6 +680,7 @@ static int rename_netif(UdevEvent *event) { + const char *action, *oldname; char name[IFNAMSIZ]; - const char *oldname; - int r; + int ifindex, r; + int loop; - oldname = udev_device_get_sysname(dev); + if (!event->name) + return 0; /* No new name is requested. */ +@@ -705,17 +706,57 @@ static int rename_netif(UdevEvent *event) { + return log_device_error_errno(dev, r, "Failed to get ifindex: %m"); strscpy(name, IFNAMSIZ, event->name); - - r = rtnl_set_link_name(&event->rtnl, udev_device_get_ifindex(dev), name); ++ + r = rtnl_set_link_name(&event->rtnl, ifindex, name); +- if (r < 0) +- return log_device_error_errno(dev, r, "Failed to rename network interface %i from '%s' to '%s': %m", ifindex, oldname, name); + if (r >= 0) { -+ log_debug("renamed network interface %s to %s\n", oldname, name); -+ goto out; ++ r = device_rename(dev, event->name); ++ if (r < 0) ++ return log_warning_errno(r, "Network interface %i is renamed from '%s' to '%s', but could not update sd_device object: %m", ifindex, oldname, name); ++ ++ log_device_debug(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, oldname, name); ++ ++ return 1; + } + + /* keep trying if the destination interface name already exists */ + if (r != -EEXIST) + goto out; -+ + +- r = device_rename(dev, event->name); + /* free our own name, another process may wait for us */ -+ snprintf(name, IFNAMSIZ, "rename%u", udev_device_get_ifindex(dev)); -+ r = rtnl_set_link_name(&event->rtnl, udev_device_get_ifindex(dev), name); ++ snprintf(name, IFNAMSIZ, "rename%u", ifindex); ++ r = rtnl_set_link_name(&event->rtnl, ifindex, name); if (r < 0) -- return log_error_errno(r, "Error changing net interface name '%s' to '%s': %m", oldname, name); -+ goto out; +- return log_warning_errno(r, "Network interface %i is renamed from '%s' to '%s', but could not update sd_device object: %m", ifindex, oldname, name); ++ goto out; -- log_debug("renamed network interface '%s' to '%s'", oldname, name); + /* log temporary name */ -+ log_debug("renamed network interface %s to %s\n", oldname, name); + log_device_debug(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, oldname, name); -- return 0; +- return 1; + /* wait a maximum of 90 seconds for our target to become available */ + strscpy(name, IFNAMSIZ, event->name); + loop = 90 * 20; @@ -59,20 +66,24 @@ index bc115f1..a673f51 100644 + + nanosleep(&duration, NULL); + -+ r = rtnl_set_link_name(&event->rtnl, udev_device_get_ifindex(dev), name); ++ r = rtnl_set_link_name(&event->rtnl, ifindex, name); + if (r >= 0) { -+ log_debug("renamed network interface %s to %s\n", oldname, name); -+ break; ++ r = device_rename(dev, event->name); ++ if (r < 0) ++ return log_warning_errno(r, "Network interface %i is renamed from '%s' to '%s', but could not update sd_device object: %m", ifindex, oldname, name); ++ ++ log_device_debug(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, oldname, name); ++ ++ return 1; + } + if (r != -EEXIST) -+ break; ++ goto out; + } + +out: + if (r < 0) -+ log_error("error changing net interface name '%s' to '%s': %s", -+ oldname, name, strerror(-r)); ++ return log_device_error_errno(dev, r, "Failed to rename network interface %i from '%s' to '%s': %m", ifindex, oldname, name); + return r; } - void udev_event_execute_rules(struct udev_event *event, + static int update_devnode(UdevEvent *event) { diff --git a/pld-sysv-network.patch b/pld-sysv-network.patch index ea55505..d61ff15 100644 --- a/pld-sysv-network.patch +++ b/pld-sysv-network.patch @@ -1,17 +1,17 @@ diff -dur -x '*.orig' systemd-218.orig/man/systemd.special.xml systemd-218/man/systemd.special.xml --- systemd-218.orig/man/systemd.special.xml 2014-12-05 01:26:51.000000000 +0100 +++ systemd-218/man/systemd.special.xml 2015-04-03 15:01:42.000000000 +0200 -@@ -910,6 +910,10 @@ - After= for this target unit to all SysV - init script service units with an LSB header referring to - the $portmap facility. +@@ -940,6 +940,10 @@ + After= for this target unit to all SysV + init script service units with an LSB header referring to + the $portmap facility. + -+ PLD specific: also scripts with -+ . /etc/sysconfig/network -+ source line get the dependency. - - - ++ PLD specific: also scripts with ++ . /etc/sysconfig/network ++ source line get the dependency. + + + diff -dur -x '*.orig' systemd-218.orig/src/sysv-generator/sysv-generator.c systemd-218/src/sysv-generator/sysv-generator.c --- systemd-218.orig/src/sysv-generator/sysv-generator.c 2014-12-05 01:26:51.000000000 +0100 +++ systemd-218/src/sysv-generator/sysv-generator.c 2015-04-03 15:02:21.000000000 +0200 diff --git a/proc-hidepid.patch b/proc-hidepid.patch index 6a0fad2..8503b0c 100644 --- a/proc-hidepid.patch +++ b/proc-hidepid.patch @@ -1,9 +1,9 @@ --- systemd-198/units/systemd-logind.service.in~ 2012-07-19 12:46:25.831148364 +0200 +++ systemd-198/units/systemd-logind.service.in 2013-03-24 16:39:38.798689883 +0100 @@ -21,3 +21,7 @@ - # Increase the default a bit in order to allow many simultaneous - # logins since we keep one fd open per session. - LimitNOFILE=16384 + # Increase the default a bit in order to allow many simultaneous logins since + # we keep one fd open per session. + LimitNOFILE=@HIGH_RLIMIT_NOFILE@ + +# Run as group 'proc' to ensure access to /proc when +# it is mounted with hidepid=1|2 option diff --git a/systemd-struct-statx-in-glibc.patch b/systemd-struct-statx-in-glibc.patch deleted file mode 100644 index c3216d5..0000000 --- a/systemd-struct-statx-in-glibc.patch +++ /dev/null @@ -1,106 +0,0 @@ -[Fedora 0001-build-sys-Detect-whether-struct-statx-is-defined-in-.patch] -From 75720bff62a84896e9a0654afc7cf9408cf89a38 Mon Sep 17 00:00:00 2001 -From: Filipe Brandenburger -Date: Sun, 15 Jul 2018 22:43:35 -0700 -Subject: [PATCH] build-sys: Detect whether struct statx is defined in - sys/stat.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Starting with glibc 2.27.9000-36.fc29, include file sys/stat.h will have a -definition for struct statx, in which case include file linux/stat.h should be -avoided, in order to prevent a duplicate definition. - - In file included from ../src/basic/missing.h:18, - from ../src/basic/util.h:28, - from ../src/basic/hashmap.h:10, - from ../src/shared/bus-util.h:12, - from ../src/libsystemd/sd-bus/bus-creds.c:11: - /usr/include/linux/stat.h:99:8: error: redefinition of ‘struct statx’ - struct statx { - ^~~~~ - In file included from /usr/include/sys/stat.h:446, - from ../src/basic/util.h:19, - from ../src/basic/hashmap.h:10, - from ../src/shared/bus-util.h:12, - from ../src/libsystemd/sd-bus/bus-creds.c:11: - /usr/include/bits/statx.h:36:8: note: originally defined here - struct statx - ^~~~~ - -Extend our meson.build to look for struct statx when only sys/stat.h is -included and, in that case, do not include linux/stat.h anymore. - -Tested that systemd builds correctly when using a glibc version that includes a -definition for struct statx. - -glibc Fedora RPM update: -https://src.fedoraproject.org/rpms/glibc/c/28cb5d31fc1e5887912283c889689c47076278ae - -glibc upstream commit: -https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=fd70af45528d59a00eb3190ef6706cb299488fcd ---- - meson.build | 5 +++++ - src/basic/missing.h | 5 ++++- - src/basic/xattr-util.c | 1 - - 3 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index dd904c7148..68423bdfa5 100644 ---- a/meson.build -+++ b/meson.build -@@ -425,6 +425,7 @@ decl_headers = ''' - #include - ''' - # FIXME: key_serial_t is only defined in keyutils.h, this is bound to fail -+# FIXME: these should use -D_GNU_SOURCE, since that is defined at build time - - foreach decl : ['char16_t', - 'char32_t', -@@ -439,6 +440,10 @@ foreach decl : ['char16_t', - conf.set10('HAVE_' + decl.underscorify().to_upper(), have) - endforeach - -+conf.set10('HAVE_STRUCT_STATX_IN_SYS_STAT_H', cc.sizeof('struct statx', prefix : ''' -+#include -+''', args : '-D_GNU_SOURCE') > 0) -+ - foreach decl : [['IFLA_INET6_ADDR_GEN_MODE', 'linux/if_link.h'], - ['IN6_ADDR_GEN_MODE_STABLE_PRIVACY', 'linux/if_link.h'], - ['IFLA_VRF_TABLE', 'linux/if_link.h'], -diff --git a/src/basic/missing.h b/src/basic/missing.h -index 71a07d0574..14ad3d4914 100644 ---- a/src/basic/missing.h -+++ b/src/basic/missing.h -@@ -15,7 +15,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -25,6 +24,10 @@ - #include - #include - -+#if !HAVE_STRUCT_STATX_IN_SYS_STAT_H -+#include -+#endif -+ - #if HAVE_AUDIT - #include - #endif -diff --git a/src/basic/xattr-util.c b/src/basic/xattr-util.c -index c5c55ea846..0ee0979837 100644 ---- a/src/basic/xattr-util.c -+++ b/src/basic/xattr-util.c -@@ -2,7 +2,6 @@ - - #include - #include --#include - #include - #include - #include diff --git a/systemd-timesync-changes-type-of-drift_freq-to-int64_t.patch b/systemd-timesync-changes-type-of-drift_freq-to-int64_t.patch deleted file mode 100644 index a45c57b..0000000 --- a/systemd-timesync-changes-type-of-drift_freq-to-int64_t.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Yu Watanabe -Date: Sat, 23 Jun 2018 09:41:55 +0900 -Subject: timesync: changes type of drift_freq to int64_t - -drift_freq is used for storing timex.freq, and is a 64bit integer. -To support x32 ABI, this changes the type of drift_freq to int64_t. - -Fixes #9387. - -(cherry picked from commit 75ca1621db4647a4d62d7873cd6715e28fe0f9fa) ---- - src/timesync/timesyncd-manager.c | 2 +- - src/timesync/timesyncd-manager.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c -index 2b731af..404a2b1 100644 ---- a/src/timesync/timesyncd-manager.c -+++ b/src/timesync/timesyncd-manager.c -@@ -604,7 +604,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re - m->dest_time = *recv_time; - m->spike = spike; - -- log_debug("interval/delta/delay/jitter/drift " USEC_FMT "s/%+.3fs/%.3fs/%.3fs/%+"PRI_TIMEX"ppm%s", -+ log_debug("interval/delta/delay/jitter/drift " USEC_FMT "s/%+.3fs/%.3fs/%.3fs/%+"PRIi64"ppm%s", - m->poll_interval_usec / USEC_PER_SEC, offset, delay, m->samples_jitter, m->drift_freq / 65536, - spike ? " (ignored)" : ""); - -diff --git a/src/timesync/timesyncd-manager.h b/src/timesync/timesyncd-manager.h -index d8d97cc..1834741 100644 ---- a/src/timesync/timesyncd-manager.h -+++ b/src/timesync/timesyncd-manager.h -@@ -79,7 +79,7 @@ struct Manager { - /* last change */ - bool jumped; - bool sync; -- long drift_freq; -+ int64_t drift_freq; - - /* watch for time changes */ - sd_event_source *event_clock_watch; diff --git a/systemd.spec b/systemd.spec index 81fe971..b09fca0 100644 --- a/systemd.spec +++ b/systemd.spec @@ -28,13 +28,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: 239 -Release: 5 +Version: 241 +Release: 1 Epoch: 1 License: GPL v2+ (udev), LGPL v2.1+ (the rest) Group: Base Source0: https://github.com/systemd/systemd/archive/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 6137e3f50390391cf34521d071a1a078 +# Source0-md5: c5953c24c850b44fcf714326e567dc37 Source1: %{name}-sysv-convert Source2: %{name}_booted.c Source3: network.service @@ -67,7 +67,6 @@ Patch3: tmpfiles-not-fatal.patch Patch4: udev-ploop-rules.patch Patch5: udevadm-in-sbin.patch Patch6: net-rename-revert.patch -Patch7: %{name}-struct-statx-in-glibc.patch Patch8: proc-hidepid.patch Patch9: %{name}-configfs.patch Patch10: pld-boot_efi_mount.patch @@ -76,8 +75,6 @@ Patch12: uids_gids.patch Patch13: sysctl.patch Patch14: pld-pam-%{name}-user.patch Patch15: %{name}-seccomp_disable_on_i386.patch -Patch16: meson-debug.patch -Patch17: %{name}-timesync-changes-type-of-drift_freq-to-int64_t.patch URL: http://www.freedesktop.org/wiki/Software/systemd BuildRequires: acl-devel %{?with_audit:BuildRequires: audit-libs-devel} @@ -662,7 +659,6 @@ 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 @@ -671,8 +667,6 @@ Uzupełnianie parametrów w zsh dla poleceń udev. %patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch16 -p1 -%patch17 -p1 cp -p %{SOURCE2} src/systemd_booted.c @@ -1095,7 +1089,7 @@ fi %files -f %{name}.lang %defattr(644,root,root,755) -%doc doc/{BOOT_LOADER_SPECIFICATION.md,DISTRO_PORTING,ENVIRONMENT.md,TRANSIENT-SETTINGS.md,UIDS-GIDS.md} NEWS README TODO +%doc docs/{BOOT_LOADER_SPECIFICATION.md,DISTRO_PORTING.md,ENVIRONMENT.md,TRANSIENT-SETTINGS.md,UIDS-GIDS.md} NEWS README TODO %{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf @@ -1119,6 +1113,7 @@ fi %endif %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/journald.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/logind.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/sleep.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/user.conf @@ -1156,6 +1151,7 @@ fi %attr(755,root,root) %{_bindir}/systemd-cat %attr(755,root,root) %{_bindir}/systemd-delta %attr(755,root,root) %{_bindir}/systemd-detect-virt +%attr(755,root,root) %{_bindir}/systemd-id128 %attr(755,root,root) %{_bindir}/systemd-mount %attr(755,root,root) %{_bindir}/systemd-nspawn %attr(755,root,root) %{_bindir}/systemd-path @@ -1173,6 +1169,8 @@ fi %attr(755,root,root) /lib/systemd/systemd-ac-power %attr(755,root,root) /lib/systemd/systemd-backlight %attr(755,root,root) /lib/systemd/systemd-binfmt +%attr(755,root,root) /lib/systemd/systemd-bless-boot +%attr(755,root,root) /lib/systemd/systemd-boot-check-no-failures %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} @@ -1183,6 +1181,7 @@ fi %attr(755,root,root) /lib/systemd/systemd-hibernate-resume %attr(755,root,root) /lib/systemd/systemd-hostnamed %attr(755,root,root) /lib/systemd/systemd-import +%attr(755,root,root) /lib/systemd/systemd-import-fs %attr(755,root,root) /lib/systemd/systemd-importd %attr(755,root,root) /lib/systemd/systemd-initctl %attr(755,root,root) /lib/systemd/systemd-journald @@ -1219,11 +1218,13 @@ fi %attr(755,root,root) /lib/systemd/systemd-volatile-root %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-bless-boot-generator %attr(755,root,root) /lib/systemd/system-generators/systemd-debug-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 %attr(755,root,root) /lib/systemd/system-generators/systemd-hibernate-resume-generator +%attr(755,root,root) /lib/systemd/system-generators/systemd-run-generator %attr(755,root,root) /lib/systemd/system-generators/systemd-system-update-generator %attr(755,root,root) /lib/systemd/system-generators/systemd-sysv-generator %attr(755,root,root) /lib/systemd/system-generators/systemd-veritysetup-generator @@ -1326,6 +1327,7 @@ fi %{_mandir}/man1/systemd-escape.1* %{_mandir}/man1/systemd-firstboot.1* %{_mandir}/man1/systemd-firstboot.service.1* +%{_mandir}/man1/systemd-id128.1* %{_mandir}/man1/systemd-inhibit.1* %{_mandir}/man1/systemd-machine-id-setup.1* %{_mandir}/man1/systemd-mount.1* @@ -1369,6 +1371,8 @@ fi %{_mandir}/man5/sysusers.d.5* %{_mandir}/man5/timesyncd.conf.5* %{_mandir}/man5/timesyncd.conf.d.5* +%{_mandir}/man5/user-runtime-dir@.service.5* +%{_mandir}/man5/user@.service.5* %{_mandir}/man5/user.conf.d.5* %{_mandir}/man5/vconsole.conf.5* %{_mandir}/man7/bootup.7* @@ -1393,6 +1397,9 @@ fi %{_mandir}/man8/nss-mymachines.8* %{_mandir}/man8/systemd-backlight.8* %{_mandir}/man8/systemd-binfmt.8* +%{_mandir}/man8/systemd-bless-boot-generator.8* +%{_mandir}/man8/systemd-bless-boot.service.8* +%{_mandir}/man8/systemd-boot-check-no-failures.service.8* %{_mandir}/man8/systemd-coredump.8* %{?with_cryptsetup:%{_mandir}/man8/systemd-cryptsetup-generator.8*} %{_mandir}/man8/systemd-debug-generator.8* @@ -1427,6 +1434,7 @@ fi %{_mandir}/man8/systemd-remount-fs.8* %{_mandir}/man8/systemd-rfkill.8* %{_mandir}/man8/systemd-rfkill.service.8* +%{_mandir}/man8/systemd-run-generator.8* %{_mandir}/man8/systemd-shutdown.8* %{_mandir}/man8/systemd-sleep.8* %{_mandir}/man8/systemd-socket-proxyd.8* @@ -1600,6 +1608,8 @@ fi %{systemdunitdir}/systemd-ask-password-wall.service %{systemdunitdir}/systemd-backlight@.service %{systemdunitdir}/systemd-binfmt.service +%{systemdunitdir}/systemd-bless-boot.service +%{systemdunitdir}/systemd-boot-check-no-failures.service %{systemdunitdir}/systemd-firstboot.service %{systemdunitdir}/systemd-fsck-root.service %{systemdunitdir}/systemd-fsck@.service @@ -1667,6 +1677,7 @@ fi %{systemdunitdir}/systemd-udevd-kernel.socket %{systemdunitdir}/basic.target %{systemdunitdir}/bluetooth.target +%{systemdunitdir}/boot-complete.target %{?with_cryptsetup:%{systemdunitdir}/cryptsetup-pre.target} %{?with_cryptsetup:%{systemdunitdir}/cryptsetup.target} %{systemdunitdir}/ctrl-alt-del.target @@ -1878,6 +1889,7 @@ fi %files networkd %defattr(644,root,root,755) %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/networkd.conf %dir %{_sysconfdir}/systemd/network %dir %{_sysconfdir}/systemd/system/network-online.target.wants %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service @@ -1902,8 +1914,8 @@ fi %files portabled %defattr(644,root,root,755) -%doc doc/PORTABLE_SERVICES.md -%attr(755,root,root) /lib/systemd/portablectl +%doc docs/PORTABLE_SERVICES.md +%attr(755,root,root) /bin/portablectl %attr(755,root,root) /lib/systemd/systemd-portabled %{systemdunitdir}/dbus-org.freedesktop.portable1.service %{systemdunitdir}/systemd-portabled.service @@ -2040,8 +2052,6 @@ fi %{_prefix}/lib/udev -%attr(755,root,root) /lib/udev/collect - %attr(755,root,root) /lib/udev/net_helper %attr(755,root,root) /lib/udev/ata_id diff --git a/target-pld.patch b/target-pld.patch index e90a617..6ef7e08 100644 --- a/target-pld.patch +++ b/target-pld.patch @@ -10,6 +10,14 @@ int read_etc_hostname(const char *path, char **ret); --- systemd-238/src/basic/hostname-util.c~ 2018-03-05 23:16:37.000000000 +0100 +++ systemd-238/src/basic/hostname-util.c 2018-05-15 13:21:08.392017315 +0200 +@@ -8,6 +8,7 @@ + #include + + #include "alloc-util.h" ++#include "env-file.h" + #include "fd-util.h" + #include "fileio.h" + #include "hostname-util.h" @@ -290,13 +290,33 @@ int read_etc_hostname_stream(FILE *f, ch } } @@ -48,16 +56,16 @@ diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/core/locale-setup.c systemd-208/src/core/locale-setup.c --- systemd-208.orig/src/core/locale-setup.c 2013-10-01 00:17:21.000000000 +0200 +++ systemd-208/src/core/locale-setup.c 2014-01-09 15:15:41.000000000 +0100 -@@ -76,6 +76,7 @@ +@@ -21,6 +21,7 @@ + int r; - if (detect_container() <= 0) { - r = parse_env_file(NULL, "/proc/cmdline", WHITESPACE, -+ "LANG", &variables[VARIABLE_LANG], - "locale.LANG", &variables[VARIABLE_LANG], - "locale.LANGUAGE", &variables[VARIABLE_LANGUAGE], - "locale.LC_CTYPE", &variables[VARIABLE_LC_CTYPE], -@@ -120,6 +121,15 @@ - log_warning("Failed to read /etc/locale.conf: %s", strerror(-r)); + r = proc_cmdline_get_key_many(PROC_CMDLINE_STRIP_RD_PREFIX, ++ "LANG", &variables[VARIABLE_LANG], + "locale.LANG", &variables[VARIABLE_LANG], + "locale.LANGUAGE", &variables[VARIABLE_LANGUAGE], + "locale.LC_CTYPE", &variables[VARIABLE_LC_CTYPE], +@@ -59,6 +60,15 @@ + log_warning_errno(r, "Failed to read /etc/locale.conf: %m"); } + if (r <= 0 && @@ -66,18 +74,26 @@ diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/core/locale-setup.c systemd-2 + NULL)) < 0) { + + if (r != -ENOENT) -+ log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r)); ++ log_warning_errno(r, "Failed to read /etc/sysconfig/i18n: %m"); + } + - add = NULL; - for (i = 0; i < _VARIABLE_MAX; i++) { + for (i = 0; i < _VARIABLE_LC_MAX; i++) { char *s; + --- 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/"); +@@ -14,6 +14,7 @@ + #include + + #include "alloc-util.h" ++#include "env-file.h" + #include "fd-util.h" + #include "fileio.h" + #include "fs-util.h" +@@ -1385,8 +1385,16 @@ + return r; /* returns EINVAL if not a symlink */ + + e = PATH_STARTSWITH_SET(t, "/usr/share/zoneinfo/", "../usr/share/zoneinfo/"); - if (!e) - return -EINVAL; + if (!e) { @@ -86,12 +102,12 @@ diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/core/locale-setup.c systemd-2 + NULL); + if (r < 0) { + if (r != -ENOENT) -+ log_warning("Failed to read /etc/sysconfig/timezone: %s", strerror(-r)); ++ log_warning_errno(r, "Failed to read /etc/sysconfig/timezone: %m"); + return -EINVAL; + } + } - if (!timezone_is_valid(e)) + if (!timezone_is_valid(e, LOG_DEBUG)) 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 diff --git a/udevadm-in-sbin.patch b/udevadm-in-sbin.patch index 8902fab..6fd3593 100644 --- a/udevadm-in-sbin.patch +++ b/udevadm-in-sbin.patch @@ -8,13 +8,13 @@ substs.set('rootlibexecdir', rootlibexecdir) substs.set('systemunitdir', systemunitdir) substs.set('userunitdir', userunitdir) -@@ -2164,7 +2166,7 @@ exe = executable('udevadm', +@@ -2667,7 +2668,7 @@ libblkid], install_rpath : udev_rpath, install : true, - install_dir : rootbindir) + install_dir : rootsbindir) - public_programs += [exe] + public_programs += exe executable('systemd-shutdown', --- systemd-183/units/systemd-udev-trigger.service.in~ 2012-05-21 15:14:51.642981269 +0200 -- 2.44.0