- merged DEVEL-systemd-240 branch

diff --git a/pld-sysv-network.patch b/pld-sysv-network.patch
index d61ff1585606a22f8c034903aaaebac60b3b680a..e2eb088ca172193dc1ad80ae3711b766b936f40d 100644 (file)
--- a/pld-sysv-network.patch
+++ b/pld-sysv-network.patch
@@ -1,6 +1,5 @@
-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
+--- systemd-240/man/systemd.special.xml.orig   2019-01-13 09:31:46.448992299 +0100
++++ systemd-240/man/systemd.special.xml        2019-01-13 09:48:30.415647502 +0100
 @@ -940,6 +940,10 @@
              <varname>After=</varname> for this target unit to all SysV
              init script service units with an LSB header referring to

diff --git a/proc-hidepid.patch b/proc-hidepid.patch
index 8503b0c542bb2dedccd52ad0ac677cf70c230c12..a73d842959bf611572e3bf0140cdd3fac8bf224c 100644 (file)
--- a/proc-hidepid.patch
+++ b/proc-hidepid.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- systemd-240/units/systemd-logind.service.in.orig   2019-01-13 10:40:04.142278844 +0100
++++ systemd-240/units/systemd-logind.service.in        2019-01-13 10:41:12.495611397 +0100
+@@ -41,3 +41,7 @@
  # Increase the default a bit in order to allow many simultaneous logins since
  # we keep one fd open per session.
  LimitNOFILE=@HIGH_RLIMIT_NOFILE@

diff --git a/systemd.spec b/systemd.spec
index 388030ead59d49f0d5f4b00953ba5678d26d92e6..47b2d73055fb8f58165d7c55fe1bad1ca8f5c2d8 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -33,6 +33,7 @@ Release:      1
 Epoch:         1
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
+#Source0Download: https://github.com/systemd/systemd/releases
 Source0:       https://github.com/systemd/systemd/archive/v%{version}/%{name}-%{version}.tar.gz
 # Source0-md5: c5953c24c850b44fcf714326e567dc37
 Source1:       %{name}-sysv-convert
@@ -75,7 +76,7 @@ Patch12:      uids_gids.patch
 Patch13:       sysctl.patch
 Patch14:       pld-pam-%{name}-user.patch
 Patch15:       %{name}-seccomp_disable_on_i386.patch
-URL:           http://www.freedesktop.org/wiki/Software/systemd
+URL:           https://www.freedesktop.org/wiki/Software/systemd/
 BuildRequires: acl-devel
 %{?with_audit:BuildRequires:   audit-libs-devel}
 BuildRequires: binutils >= 3:2.22.52.0.1-2
@@ -110,9 +111,9 @@ BuildRequires:      libseccomp-devel >= 2.3.1
 %{?with_selinux:BuildRequires: libselinux-devel >= 2.6}
 BuildRequires: libtool >= 2:2.2
 BuildRequires: libxslt-progs
-BuildRequires: lz4-devel >= r125
+BuildRequires: lz4-devel >= 1:1.3.0
 BuildRequires: m4
-BuildRequires: meson >= 0.44
+BuildRequires: meson >= 0.46
 %{?with_pam:BuildRequires:     pam-devel >= 1.1.2}
 BuildRequires: pcre2-8-devel
 BuildRequires: pkgconfig >= 0.9.0
@@ -487,6 +488,7 @@ Group:              Libraries
 Requires:      libgcrypt >= 1.4.5
 Requires:      libseccomp >= 2.3.1
 %{?with_selinux:Requires:      libselinux >= 2.6}
+Requires:      lz4-libs >= 1:1.3.0
 Obsoletes:     nss_myhostname
 
 %description libs
@@ -1089,7 +1091,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc docs/{BOOT_LOADER_SPECIFICATION.md,DISTRO_PORTING.md,ENVIRONMENT.md,TRANSIENT-SETTINGS.md,UIDS-GIDS.md} NEWS README TODO
+%doc docs/{AUTOMATIC_BOOT_ASSESSMENT,BLOCK_DEVICE_LOCKING,BOOT_LOADER_INTERFACE,BOOT_LOADER_SPECIFICATION,DISTRO_PORTING,ENVIRONMENT,PREDICTABLE_INTERFACE_NAMES,TRANSIENT-SETTINGS,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
@@ -1371,8 +1373,6 @@ 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*
@@ -1398,8 +1398,6 @@ fi
 %{_mandir}/man8/systemd-backlight.8*
 %{_mandir}/man8/systemd-binfmt.8*
 %{?with_efi:%{_mandir}/man8/systemd-bless-boot-generator.8*}
-%{?with_efi:%{_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*
@@ -1814,6 +1812,8 @@ fi
 %dir %{systemduserunitdir}/sockets.target.wants
 %{systemduserunitdir}/graphical-session-pre.target
 %{systemduserunitdir}/graphical-session.target
+%{_mandir}/man5/user@.service.5*
+%{_mandir}/man5/user-runtime-dir@.service.5*
 %{_mandir}/man8/30-systemd-environment-d-generator.8*
 %{_mandir}/man8/systemd-environment-d-generator.8*
 %{_mandir}/man8/systemd-ask-password-console.path.8*
@@ -1822,6 +1822,8 @@ fi
 %{_mandir}/man8/systemd-ask-password-wall.service.8*
 %{_mandir}/man8/systemd-backlight@.service.8*
 %{_mandir}/man8/systemd-binfmt.service.8*
+%{?with_efi:%{_mandir}/man8/systemd-bless-boot.service.8*}
+%{_mandir}/man8/systemd-boot-check-no-failures.service.8*
 %{_mandir}/man8/systemd-coredump.socket.8*
 %{_mandir}/man8/systemd-coredump@.service.8*
 %{?with_cryptsetup:%{_mandir}/man8/systemd-cryptsetup.8*}

diff --git a/target-pld.patch b/target-pld.patch
index 6ef7e08466d0d318a287f508df2614e561005117..af7f8f3c2367250255f147e52d15f760c37295ab 100644 (file)
--- a/target-pld.patch
+++ b/target-pld.patch
@@ -8,8 +8,8 @@
 +int read_etc_hostname_distro(const char *path, char **ret);
  int read_etc_hostname_stream(FILE *f, char **ret);
  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
+--- systemd-240/src/basic/hostname-util.c.orig 2018-12-21 19:53:33.000000000 +0100
++++ systemd-240/src/basic/hostname-util.c      2019-01-13 11:11:40.715590524 +0100
 @@ -8,6 +8,7 @@
  #include <unistd.h>
  
@@ -53,9 +53,8 @@
  
          f = fopen(path, "re");
          if (!f)
-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
+--- systemd-240/src/core/locale-setup.c.orig   2019-01-13 09:27:36.718995151 +0100
++++ systemd-240/src/core/locale-setup.c        2019-01-13 09:29:37.548993771 +0100
 @@ -21,6 +21,7 @@
          int r;
  
@@ -80,8 +79,8 @@ diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/core/locale-setup.c systemd-2
          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
+--- systemd-240/src/basic/time-util.c.orig     2019-01-13 09:27:36.718995151 +0100
++++ systemd-240/src/basic/time-util.c  2019-01-13 09:31:12.275659356 +0100
 @@ -14,6 +14,7 @@
  #include <unistd.h>
  
@@ -105,16 +104,15 @@ diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/core/locale-setup.c systemd-2
 +                                log_warning_errno(r, "Failed to read /etc/sysconfig/timezone: %m");
 +                        return -EINVAL;
 +                }
-+        }
++      }
  
          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
-+++ systemd-208/src/vconsole/vconsole-setup.c  2014-01-09 15:17:49.000000000 +0100
+--- systemd-240.orig/src/vconsole/vconsole-setup.c     2013-08-13 22:02:47.000000000 +0200
++++ systemd-240/src/vconsole/vconsole-setup.c  2014-01-09 15:17:49.000000000 +0100
 @@ -284,6 +284,17 @@ int main(int argc, char **argv) {
          if (r < 0 && r != -ENOENT)
-                 log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r));
+                 log_warning_errno(r, "Failed to read /etc/vconsole.conf: %m");
  
 +        if (r <= 0) {
 +                int r1 = parse_env_file(NULL, "/etc/sysconfig/console", NEWLINE,
@@ -124,7 +122,7 @@ diff -dur -x '*~' -x '*.orig' systemd-208.orig/src/vconsole/vconsole-setup.c sys
 +                                "KEYTABLE", &vc_keymap,
 +                                NULL);
 +                if (r1 < 0 && r1 != -ENOENT)
-+                        log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r1));
++                        log_warning_errno(r1, "Failed to read /etc/sysconfig/console: %m");
 +        } 
 +
          /* Let the kernel command line override /etc/vconsole.conf */

diff --git a/udevadm-in-sbin.patch b/udevadm-in-sbin.patch
index 6fd3593b420b12e49f48f52157e02e3c1bbed3b6..db0ac12e7d3d6f707818a5dab7806f03a2599e17 100644 (file)
--- a/udevadm-in-sbin.patch
+++ b/udevadm-in-sbin.patch
@@ -1,6 +1,6 @@
---- systemd-235/meson.build~   2017-10-06 10:18:04.000000000 +0200
-+++ systemd-235/meson.build    2017-10-21 15:12:47.202404998 +0200
-@@ -200,6 +201,7 @@ substs.set('includedir',
+--- systemd-240/meson.build.orig       2018-12-21 19:53:33.000000000 +0100
++++ systemd-240/meson.build    2019-01-13 10:00:36.555639211 +0100
+@@ -243,6 +243,7 @@
  substs.set('pkgsysconfdir',                                   pkgsysconfdir)
  substs.set('bindir',                                          bindir)
  substs.set('rootbindir',                                      rootbindir)