Accepting request 313718 from home:elvigia:branches:Base:System

- remove patch sysctl-handle-boot-sysctl.conf-kernel_release.patch 
  from the filelist.

- libpcre, glib2 and libusb are not used by systemd, remove 
  from buildrequires.

- 1032-ata_id-unbotch-format-specifier.patch: fix udev ata_id 
  output.
- 0023-core-fix-reversed-dependency-check-in-unit_check_unn.patch
  fix StopWhenUnneeded=true in combination with a Requisite=
  dependency.
- 0031-install-fix-bad-memory-access.patch: Fix Bad memory access
-  0006-pam_systemd-Properly-check-kdbus-availability.patch: if
   kdbus is enabled (i.e boot with kdbus=1) DBUS_SESSION_BUS_ADDRESS
   must not be exported.
- spec: add a min_kernel_version macro to ensure the package
 conflicts with kernel versions in which systemd cannot run.

- sysctl-handle-boot-sysctl.conf-kernel_release.patch dropped,
  replaced by a tmpfiles.d snippet "current-kernel-sysctl.conf"
  (feature implemented in v220 just for our usecase)

- fix build when resolved is enabled 
- remove fsck -l test in spec file, systemd requires util-linux
  2.26 or later where this feature is already available.

- remove patch sysctl-handle-boot-sysctl.conf-kernel_release.patch 
  from the filelist.

- libpcre, glib2 and libusb are not used by systemd, remove

OBS-URL: https://build.opensuse.org/request/show/313718
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=878

0006-pam_systemd-Properly-check-kdbus-availability.patch

@@ -0,0 +1,27 @@
+From c5d452bb228e9f97ebc96be98a957c0b7b8072eb Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Sun, 21 Jun 2015 05:59:34 +0200
+Subject: [PATCH 06/32] pam_systemd: Properly check kdbus availability
+
+This properly avoids setting DBUS_SESSION_BUS_ADDRESS if kdbus
+is loaded (or built into the kernel) but not wanted.
+---
+ src/login/pam_systemd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c
+index 0ebdfdf..dd192b9 100644
+--- a/src/login/pam_systemd.c
++++ b/src/login/pam_systemd.c
+@@ -181,7 +181,7 @@ static int export_legacy_dbus_address(
+         int r;
+ 
+         /* skip export if kdbus is not active */
+-        if (access("/sys/fs/kdbus", F_OK) < 0)
++        if (!is_kdbus_available())
+                 return PAM_SUCCESS;
+ 
+         if (asprintf(&s, KERNEL_USER_BUS_ADDRESS_FMT ";" UNIX_USER_BUS_ADDRESS_FMT, uid, runtime) < 0) {
+-- 
+2.4.3
+

0023-core-fix-reversed-dependency-check-in-unit_check_unn.patch

@@ -0,0 +1,28 @@
+From 084918ba41acbb80076c64e7338cf73101b1385e Mon Sep 17 00:00:00 2001
+From: Abdo Roig-Maranges <abdo.roig@gmail.com>
+Date: Tue, 23 Jun 2015 11:13:13 +0200
+Subject: [PATCH 23/32] core: fix reversed dependency check in
+ unit_check_unneeded
+
+This was introduced by commit be7d9ff730cb88d7c6a8 and breaks
+StopWhenUnneeded=true in the presence of a Requisite dependency.
+---
+ src/core/unit.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/unit.c b/src/core/unit.c
+index 7bb2afc..fac017c 100644
+--- a/src/core/unit.c
++++ b/src/core/unit.c
+@@ -1596,7 +1596,7 @@ static void unit_check_unneeded(Unit *u) {
+         static const UnitDependency needed_dependencies[] = {
+                 UNIT_REQUIRED_BY,
+                 UNIT_REQUIRED_BY_OVERRIDABLE,
+-                UNIT_REQUISITE,
++                UNIT_REQUISITE_OF,
+                 UNIT_REQUISITE_OF_OVERRIDABLE,
+                 UNIT_WANTED_BY,
+                 UNIT_BOUND_BY,
+-- 
+2.4.3
+

0031-install-fix-bad-memory-access.patch

@@ -0,0 +1,25 @@
+From 25d40bf57cd0b850f479c00528b4378e02f2d841 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Tue, 23 Jun 2015 19:16:18 -0400
+Subject: [PATCH 31/32] install: fix bad memory access
+
+---
+ src/shared/install.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/shared/install.c b/src/shared/install.c
+index 6172c42..559fda2 100644
+--- a/src/shared/install.c
++++ b/src/shared/install.c
+@@ -220,7 +220,7 @@ static int remove_marked_symlinks_fd(
+                             instance_whitelist &&
+                             !strv_contains(instance_whitelist, de->d_name)) {
+ 
+-                                _cleanup_free_ char *w;
++                                _cleanup_free_ char *w = NULL;
+ 
+                                 /* OK, the file is not listed directly
+                                  * in the whitelist, so let's check if
+-- 
+2.4.3
+

1032-ata_id-unbotch-format-specifier.patch

@@ -0,0 +1,33 @@
+From ec62e858734a66130f68d036c55c2050bde1e52e Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Wed, 24 Jun 2015 01:48:18 +0200
+Subject: [PATCH 32/32] ata_id: unbotch format specifier
+
+Commit v218-247-g11c6f69 broke the output of the utility. "%1$" PRIu64
+"x" expands to "%1$lux", essentially "%lux", which shows the problem.
+u and x cannot be combined, u wins as the type character, and x gets
+emitted verbatim to stdout.
+
+References: https://bugzilla.redhat.com/show_bug.cgi?id=1227503
+---
+ src/udev/ata_id/ata_id.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
+index cc1bf45..7ba0b7f 100644
+--- a/src/udev/ata_id/ata_id.c
++++ b/src/udev/ata_id/ata_id.c
+@@ -639,8 +639,8 @@ int main(int argc, char *argv[])
+                  */
+                 word = identify.wyde[108];
+                 if ((word & 0xf000) == 0x5000)
+-                        printf("ID_WWN=0x%1$"PRIu64"x\n"
+-                               "ID_WWN_WITH_EXTENSION=0x%1$"PRIu64"x\n",
++                        printf("ID_WWN=0x%1$" PRIx64 "\n"
++                               "ID_WWN_WITH_EXTENSION=0x%1$" PRIx64 "\n",
+                                identify.octa[108/4]);
+ 
+                 /* from Linux's include/linux/ata.h */
+-- 
+2.4.3
+

sysctl-handle-boot-sysctl.conf-kernel_release.patch

@@ -1,51 +0,0 @@
-From 752a4370ecb5643a432ad73b1e22c80cd304948f Mon Sep 17 00:00:00 2001
-From: Frederic Crozat <fcrozat@suse.com>
-Date: Fri, 17 May 2013 13:31:46 +0200
-Subject: [PATCH] sysctl: handle /boot/sysctl.conf-<kernel_release>
-
-Add support for kernel release sysctl.conf files (for per-flavor
-configuration), needed by openSUSE (bnc#809420).
----
- src/sysctl/sysctl.c             |    8 ++++++++
- units/systemd-sysctl.service.in |    2 ++
- 2 files changed, 10 insertions(+)
-
-Index: systemd-221/src/sysctl/sysctl.c
-===================================================================
---- systemd-221.orig/src/sysctl/sysctl.c
-+++ systemd-221/src/sysctl/sysctl.c
-@@ -26,6 +26,7 @@
- #include <stdio.h>
- #include <limits.h>
- #include <getopt.h>
-+#include <sys/utsname.h>
- 
- #include "log.h"
- #include "strv.h"
-@@ -264,6 +265,13 @@ int main(int argc, char *argv[]) {
-         } else {
-                 _cleanup_strv_free_ char **files = NULL;
-                 char **f;
-+                char kernel_sysctl[PATH_MAX];
-+                struct utsname uts;
-+
-+                assert_se(uname(&uts) >= 0);
-+
-+                snprintf(kernel_sysctl, sizeof(kernel_sysctl), "/boot/sysctl.conf-%s", uts.release);
-+                r = parse_file(sysctl_options, kernel_sysctl, true);
- 
-                 r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
-                 if (r < 0) {
-Index: systemd-221/units/systemd-sysctl.service.in
-===================================================================
---- systemd-221.orig/units/systemd-sysctl.service.in
-+++ systemd-221/units/systemd-sysctl.service.in
-@@ -13,6 +13,8 @@ Conflicts=shutdown.target
- After=systemd-modules-load.service
- Before=sysinit.target shutdown.target
- ConditionPathIsReadWrite=/proc/sys/
-+ConditionPathExistsGlob=|/boot/sysctl.conf-%v
-+RequiresMountsFor=/boot
- 
- [Service]
- Type=oneshot

systemd-mini.changes

@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Thu Jun 25 17:27:06 UTC 2015 - crrodriguez@opensuse.org
+
+- remove patch sysctl-handle-boot-sysctl.conf-kernel_release.patch 
+  from the filelist.
+
+-------------------------------------------------------------------
+Thu Jun 25 05:56:55 UTC 2015 - crrodriguez@opensuse.org
+
+- libpcre, glib2 and libusb are not used by systemd, remove 
+  from buildrequires.
+
+-------------------------------------------------------------------
+Thu Jun 25 05:19:54 UTC 2015 - crrodriguez@opensuse.org
+
+- 1032-ata_id-unbotch-format-specifier.patch: fix udev ata_id 
+  output.
+- 0023-core-fix-reversed-dependency-check-in-unit_check_unn.patch
+  fix StopWhenUnneeded=true in combination with a Requisite=
+  dependency.
+- 0031-install-fix-bad-memory-access.patch: Fix Bad memory access
+-  0006-pam_systemd-Properly-check-kdbus-availability.patch: if
+   kdbus is enabled (i.e boot with kdbus=1) DBUS_SESSION_BUS_ADDRESS
+   must not be exported.
+- spec: add a min_kernel_version macro to ensure the package
+ conflicts with kernel versions in which systemd cannot run.
+
+-------------------------------------------------------------------
+Wed Jun 24 20:06:27 UTC 2015 - crrodriguez@opensuse.org
+
+- sysctl-handle-boot-sysctl.conf-kernel_release.patch dropped,
+  replaced by a tmpfiles.d snippet "current-kernel-sysctl.conf"
+  (feature implemented in v220 just for our usecase)
+
+-------------------------------------------------------------------
+Wed Jun 24 19:45:17 UTC 2015 - crrodriguez@opensuse.org
+
+- fix build when resolved is enabled 
+- remove fsck -l test in spec file, systemd requires util-linux
+  2.26 or later where this feature is already available.
+
 -------------------------------------------------------------------
 Wed Jun 24 17:43:22 UTC 2015 - hrvoje.senjan@gmail.com
 

systemd-mini.spec

@@ -22,6 +22,8 @@
 ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! #####
 %define udevpkgname udev-mini
 %define udev_major 1
+%define min_kernel_version 3.7
+
 %bcond_without  bash_completion
 %bcond_without  networkd
 %bcond_without  sysvcompat
@@ -70,12 +72,11 @@ BuildRequires:  pam-devel
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  xz
 BuildRequires:  config(suse-module-tools)
-BuildRequires:  pkgconfig(blkid) >= 2.24
+BuildRequires:  pkgconfig(blkid) >= 2.26
 BuildRequires:  pkgconfig(libkmod) >= 15
 BuildRequires:  pkgconfig(liblzma)
 BuildRequires:  pkgconfig(libpci) >= 3
-BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(mount) >= 2.26
-BuildRequires:  pkgconfig(mount) >= 2.20
 %ifarch %ix86 x86_64 x32 %arm ppc64le s390x
 BuildRequires:  pkgconfig(libseccomp)
 %endif
@@ -90,13 +91,11 @@ Conflicts:      kiwi
 %else
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  libgcrypt-devel
-BuildRequires:  libusb-devel
 BuildRequires:  libxslt-tools
 %if %{with python}
 BuildRequires:  python
 %endif
 BuildRequires:  libapparmor-devel
-BuildRequires:  pkgconfig(glib-2.0) >= 2.22.0
 BuildRequires:  pkgconfig(libcryptsetup) >= 1.6.0
 BuildRequires:  pkgconfig(libmicrohttpd)
 BuildRequires:  pkgconfig(libqrencode)
@@ -126,6 +125,7 @@ Requires(post): /usr/bin/getent
 Requires(post): /usr/bin/setfacl
 Conflicts:      filesystem < 11.5
 Conflicts:      mkinitrd < 2.7.0
+Conflicts:      kernel < %{min_kernel_version}
 Obsoletes:      systemd-analyze < 201
 Provides:       systemd-analyze = %{version}
 
@@ -167,8 +167,6 @@ Patch28:        apply-ACL-for-nvidia-uvm-device-node.patch
 Patch37:        suse-sysv-bootd-support.diff
 # PATCH-FIX-OPENSUSE systemd-tmp-safe-defaults.patch FATE#314974 max@suse.de -- Return to SUSE's "safe defaults" policy on deleting files from tmp direcorie.
 Patch39:        systemd-tmp-safe-defaults.patch
-# PATCH-FIX-OPENSUSE sysctl-handle-boot-sysctl.conf-kernel_release.patch bnc#809420 fcrozat@suse.com -- handle /boot/sysctl.conf-<kernel_release> file
-Patch40:        sysctl-handle-boot-sysctl.conf-kernel_release.patch
 # PATCH-FIX-OPENSUSE ensure-shortname-is-set-as-hostname-bnc-820213.patch bnc#820213 fcrozat@suse.com -- Do not set anything beyond first dot as hostname
 Patch41:        ensure-shortname-is-set-as-hostname-bnc-820213.patch
 Patch42:        systemd-pam_config.patch
@@ -249,6 +247,13 @@ Patch520:       systemd-add-user-keep.patch
 # PATCH-FIX-SUSE systemd-add-user-keep.patch (bnc#903009)
 Patch521:       kbd-model-map.patch
 
+# PATCH-FIX-UPSTREAM 0006-pam_systemd-Properly-check-kdbus-availability.patch
+Patch522:       0006-pam_systemd-Properly-check-kdbus-availability.patch
+# PATCH-FIX-UPSTREAM 0023-core-fix-reversed-dependency-check-in-unit_check_unn.patch
+Patch523:       0023-core-fix-reversed-dependency-check-in-unit_check_unn.patch
+# PATCH-FIX-UPSTREAM 0031-install-fix-bad-memory-access.patch
+Patch524:       0031-install-fix-bad-memory-access.patch
+
 # UDEV PATCHES
 # ============
 # NOTE: all udev patches start with 1XXX-*.patch, do not use anything else.
@@ -293,6 +298,8 @@ Patch1096:      1096-new-udev-root-symlink-generator.patch
 Patch1097:      1097-udevd-increase-maximum-number-of-children.patch
 # PATCH-FIX-OPENSUSE 1098-systemd-networkd-alias-network-service.patch
 Patch1098:      1098-systemd-networkd-alias-network-service.patch
+# PATCH-FIX-UPSTREAM 1032-ata_id-unbotch-format-specifier.patch
+Patch1099:      1032-ata_id-unbotch-format-specifier.patch
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -552,7 +559,6 @@ cp %{SOURCE7} m4/
 %patch28 -p1
 %patch37 -p1
 %patch39 -p1
-%patch40 -p1
 %patch41 -p1
 %patch42 -p1
 %patch84 -p1
@@ -592,6 +598,9 @@ cp %{SOURCE7} m4/
 %patch490 -p1
 %patch520 -p1
 %patch521 -p1
+%patch522 -p1
+%patch523 -p1
+%patch524 -p1
 
 # udev patches
 %patch1001 -p1
@@ -614,6 +623,7 @@ cp %{SOURCE7} m4/
 %patch1096 -p1
 %patch1097 -p1
 %patch1098 -p1
+%patch1099 -p1
 
 # remove patch backups
 find -name '*.orig' -exec rm -f '{}' \+
@@ -621,18 +631,6 @@ find -name '*.orig' -exec rm -f '{}' \+
 # ensure generate files are removed
 rm -f units/emergency.service
 
-# disable "-l" option for fsck if it does not support new locking scheme
-# compare with commit c343be283b7152554bac0c02493a4e1759c163f7
-PATH=${PATH}:/sbin:/usr/sbin
-PATH_FSCK=$(type -p fsck)
-if grep -q /run/fsck/%%s\\.lock $PATH_FSCK
-then
-  echo Found new $PATH_FSCK that is allow private locking
-else
-  echo Found old $PATH_FSCK that is disable flock for this one
-  sed -ri 's@^([[:blank:]]+)(cmdline\[i\+\+\][[:blank:]]+=[[:blank:]]+"-l")(;)@\1/* \2 */\3@' src/fsck/fsck.c
-fi
-
 #
 # In combination with Patch352 set-and-use-default-logconsole.patch
 # Ensure that journald log on tty10
@@ -840,6 +838,13 @@ cat << EOF > %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/nocl
 TTYVTDisallocate=no
 EOF
 
+#ensure we get the running kernel sysctl settings. 
+
+cat << EOF > %{buildroot}%{_prefix}/lib/tmpfiles.d/current-kernel-sysctl.conf
+d! /run/sysctl.d
+L! /run/sysctl.d/00-kernel-%v.conf -    -    -    -   /boot/sysctl.conf-%v
+EOF
+
 # ensure after.local wrapper is called
 install -m 644 %{S:11} %{buildroot}/%{_prefix}/lib/systemd/system/
 ln -s ../after-local.service %{buildroot}/%{_prefix}/lib/systemd/system/multi-user.target.wants/
@@ -1368,6 +1373,7 @@ exit 0
 %{_sysconfdir}/systemd/resolved.conf
 %{_libdir}/libnss_resolve.so.2
 %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service
+%{_prefix}/lib/systemd/system/org.freedesktop.resolve1.busname
 %endif
 
 %if ! 0%{?bootstrap}

systemd.changes

@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Thu Jun 25 17:27:06 UTC 2015 - crrodriguez@opensuse.org
+
+- remove patch sysctl-handle-boot-sysctl.conf-kernel_release.patch 
+  from the filelist.
+
+-------------------------------------------------------------------
+Thu Jun 25 05:56:55 UTC 2015 - crrodriguez@opensuse.org
+
+- libpcre, glib2 and libusb are not used by systemd, remove 
+  from buildrequires.
+
+-------------------------------------------------------------------
+Thu Jun 25 05:19:54 UTC 2015 - crrodriguez@opensuse.org
+
+- 1032-ata_id-unbotch-format-specifier.patch: fix udev ata_id 
+  output.
+- 0023-core-fix-reversed-dependency-check-in-unit_check_unn.patch
+  fix StopWhenUnneeded=true in combination with a Requisite=
+  dependency.
+- 0031-install-fix-bad-memory-access.patch: Fix Bad memory access
+-  0006-pam_systemd-Properly-check-kdbus-availability.patch: if
+   kdbus is enabled (i.e boot with kdbus=1) DBUS_SESSION_BUS_ADDRESS
+   must not be exported.
+- spec: add a min_kernel_version macro to ensure the package
+ conflicts with kernel versions in which systemd cannot run.
+
+-------------------------------------------------------------------
+Wed Jun 24 20:06:27 UTC 2015 - crrodriguez@opensuse.org
+
+- sysctl-handle-boot-sysctl.conf-kernel_release.patch dropped,
+  replaced by a tmpfiles.d snippet "current-kernel-sysctl.conf"
+  (feature implemented in v220 just for our usecase)
+
+-------------------------------------------------------------------
+Wed Jun 24 19:45:17 UTC 2015 - crrodriguez@opensuse.org
+
+- fix build when resolved is enabled 
+- remove fsck -l test in spec file, systemd requires util-linux
+  2.26 or later where this feature is already available.
+
 -------------------------------------------------------------------
 Wed Jun 24 17:43:22 UTC 2015 - hrvoje.senjan@gmail.com
 

systemd.spec

@@ -20,6 +20,8 @@
 %define real systemd
 %define udevpkgname udev
 %define udev_major 1
+%define min_kernel_version 3.7
+
 %bcond_without  bash_completion
 %bcond_without  networkd
 %bcond_without  sysvcompat
@@ -65,12 +67,11 @@ BuildRequires:  pam-devel
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  xz
 BuildRequires:  config(suse-module-tools)
-BuildRequires:  pkgconfig(blkid) >= 2.24
+BuildRequires:  pkgconfig(blkid) >= 2.26
 BuildRequires:  pkgconfig(libkmod) >= 15
 BuildRequires:  pkgconfig(liblzma)
 BuildRequires:  pkgconfig(libpci) >= 3
-BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(mount) >= 2.26
-BuildRequires:  pkgconfig(mount) >= 2.20
 %ifarch %ix86 x86_64 x32 %arm ppc64le s390x
 BuildRequires:  pkgconfig(libseccomp)
 %endif
@@ -85,13 +86,11 @@ Conflicts:      kiwi
 %else
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  libgcrypt-devel
-BuildRequires:  libusb-devel
 BuildRequires:  libxslt-tools
 %if %{with python}
 BuildRequires:  python
 %endif
 BuildRequires:  libapparmor-devel
-BuildRequires:  pkgconfig(glib-2.0) >= 2.22.0
 BuildRequires:  pkgconfig(libcryptsetup) >= 1.6.0
 BuildRequires:  pkgconfig(libmicrohttpd)
 BuildRequires:  pkgconfig(libqrencode)
@@ -121,6 +120,7 @@ Requires(post): /usr/bin/getent
 Requires(post): /usr/bin/setfacl
 Conflicts:      filesystem < 11.5
 Conflicts:      mkinitrd < 2.7.0
+Conflicts:      kernel < %{min_kernel_version}
 Obsoletes:      systemd-analyze < 201
 Provides:       systemd-analyze = %{version}
 
@@ -162,8 +162,6 @@ Patch28:        apply-ACL-for-nvidia-uvm-device-node.patch
 Patch37:        suse-sysv-bootd-support.diff
 # PATCH-FIX-OPENSUSE systemd-tmp-safe-defaults.patch FATE#314974 max@suse.de -- Return to SUSE's "safe defaults" policy on deleting files from tmp direcorie.
 Patch39:        systemd-tmp-safe-defaults.patch
-# PATCH-FIX-OPENSUSE sysctl-handle-boot-sysctl.conf-kernel_release.patch bnc#809420 fcrozat@suse.com -- handle /boot/sysctl.conf-<kernel_release> file
-Patch40:        sysctl-handle-boot-sysctl.conf-kernel_release.patch
 # PATCH-FIX-OPENSUSE ensure-shortname-is-set-as-hostname-bnc-820213.patch bnc#820213 fcrozat@suse.com -- Do not set anything beyond first dot as hostname
 Patch41:        ensure-shortname-is-set-as-hostname-bnc-820213.patch
 Patch42:        systemd-pam_config.patch
@@ -244,6 +242,13 @@ Patch520:       systemd-add-user-keep.patch
 # PATCH-FIX-SUSE systemd-add-user-keep.patch (bnc#903009)
 Patch521:       kbd-model-map.patch
 
+# PATCH-FIX-UPSTREAM 0006-pam_systemd-Properly-check-kdbus-availability.patch
+Patch522:       0006-pam_systemd-Properly-check-kdbus-availability.patch
+# PATCH-FIX-UPSTREAM 0023-core-fix-reversed-dependency-check-in-unit_check_unn.patch
+Patch523:       0023-core-fix-reversed-dependency-check-in-unit_check_unn.patch
+# PATCH-FIX-UPSTREAM 0031-install-fix-bad-memory-access.patch
+Patch524:       0031-install-fix-bad-memory-access.patch
+
 # UDEV PATCHES
 # ============
 # NOTE: all udev patches start with 1XXX-*.patch, do not use anything else.
@@ -288,6 +293,8 @@ Patch1096:      1096-new-udev-root-symlink-generator.patch
 Patch1097:      1097-udevd-increase-maximum-number-of-children.patch
 # PATCH-FIX-OPENSUSE 1098-systemd-networkd-alias-network-service.patch
 Patch1098:      1098-systemd-networkd-alias-network-service.patch
+# PATCH-FIX-UPSTREAM 1032-ata_id-unbotch-format-specifier.patch
+Patch1099:      1032-ata_id-unbotch-format-specifier.patch
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -547,7 +554,6 @@ cp %{SOURCE7} m4/
 %patch28 -p1
 %patch37 -p1
 %patch39 -p1
-%patch40 -p1
 %patch41 -p1
 %patch42 -p1
 %patch84 -p1
@@ -587,6 +593,9 @@ cp %{SOURCE7} m4/
 %patch490 -p1
 %patch520 -p1
 %patch521 -p1
+%patch522 -p1
+%patch523 -p1
+%patch524 -p1
 
 # udev patches
 %patch1001 -p1
@@ -609,6 +618,7 @@ cp %{SOURCE7} m4/
 %patch1096 -p1
 %patch1097 -p1
 %patch1098 -p1
+%patch1099 -p1
 
 # remove patch backups
 find -name '*.orig' -exec rm -f '{}' \+
@@ -616,18 +626,6 @@ find -name '*.orig' -exec rm -f '{}' \+
 # ensure generate files are removed
 rm -f units/emergency.service
 
-# disable "-l" option for fsck if it does not support new locking scheme
-# compare with commit c343be283b7152554bac0c02493a4e1759c163f7
-PATH=${PATH}:/sbin:/usr/sbin
-PATH_FSCK=$(type -p fsck)
-if grep -q /run/fsck/%%s\\.lock $PATH_FSCK
-then
-  echo Found new $PATH_FSCK that is allow private locking
-else
-  echo Found old $PATH_FSCK that is disable flock for this one
-  sed -ri 's@^([[:blank:]]+)(cmdline\[i\+\+\][[:blank:]]+=[[:blank:]]+"-l")(;)@\1/* \2 */\3@' src/fsck/fsck.c
-fi
-
 #
 # In combination with Patch352 set-and-use-default-logconsole.patch
 # Ensure that journald log on tty10
@@ -835,6 +833,13 @@ cat << EOF > %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/nocl
 TTYVTDisallocate=no
 EOF
 
+#ensure we get the running kernel sysctl settings. 
+
+cat << EOF > %{buildroot}%{_prefix}/lib/tmpfiles.d/current-kernel-sysctl.conf
+d! /run/sysctl.d
+L! /run/sysctl.d/00-kernel-%v.conf -    -    -    -   /boot/sysctl.conf-%v
+EOF
+
 # ensure after.local wrapper is called
 install -m 644 %{S:11} %{buildroot}/%{_prefix}/lib/systemd/system/
 ln -s ../after-local.service %{buildroot}/%{_prefix}/lib/systemd/system/multi-user.target.wants/
@@ -1363,6 +1368,7 @@ exit 0
 %{_sysconfdir}/systemd/resolved.conf
 %{_libdir}/libnss_resolve.so.2
 %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service
+%{_prefix}/lib/systemd/system/org.freedesktop.resolve1.busname
 %endif
 
 %if ! 0%{?bootstrap}