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

- Systemd v222, bugfix release.
- Drop upstream patches 
0006-pam_systemd-Properly-check-kdbus-availability.patch
0023-core-fix-reversed-dependency-check-in-unit_check_unn.patch
0031-install-fix-bad-memory-access.patch
1032-ata_id-unbotch-format-specifier.patch
- Drop SUSE patch 1013-no-runtime-PM-for-IBM-consoles.patch
  udev does no longer enable USB HID power management at all.
- The udev accelerometer helper was removed, obsoleted by
  iio-sensor-proxy package.
- networkd gained a new configuration option IPv6PrivacyExtensions.
- udev does not longer support the WAIT_FOR_SYSFS= key in udev
  rules. There are no known issues with current sysfs,
  and udev does not need or should be used to work around such bugs.

- Systemd v222, bugfix release.
- Drop upstream patches 
0006-pam_systemd-Properly-check-kdbus-availability.patch
0023-core-fix-reversed-dependency-check-in-unit_check_unn.patch
0031-install-fix-bad-memory-access.patch
1032-ata_id-unbotch-format-specifier.patch
- Drop SUSE patch 1013-no-runtime-PM-for-IBM-consoles.patch
  udev does no longer enable USB HID power management at all.
- The udev accelerometer helper was removed, obsoleted by
  iio-sensor-proxy package.
- networkd gained a new configuration option IPv6PrivacyExtensions.
- udev does not longer support the WAIT_FOR_SYSFS= key in udev
  rules. There are no known issues with current sysfs,
  and udev does not need or should be used to work around such bugs.

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

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

@@ -1,27 +0,0 @@
-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

@@ -1,28 +0,0 @@
-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

@@ -1,25 +0,0 @@
-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
-

1013-no-runtime-PM-for-IBM-consoles.patch

@@ -1,17 +0,0 @@
----
- rules/42-usb-hid-pm.rules |    2 --
- 1 file changed, 2 deletions(-)
-
-Index: systemd-221/rules/42-usb-hid-pm.rules
-===================================================================
---- systemd-221.orig/rules/42-usb-hid-pm.rules
-+++ systemd-221/rules/42-usb-hid-pm.rules
-@@ -19,8 +19,6 @@ ACTION=="add", SUBSYSTEM=="usb", ATTR{id
- ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="413c", ATTR{idProduct}=="0000", TEST=="power/control", ATTR{power/control}="auto"
- 
- # IBM remote access
--ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="04b3", ATTR{idProduct}=="4001", TEST=="power/control", ATTR{power/control}="auto"
--ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="04b3", ATTR{idProduct}=="4002", TEST=="power/control", ATTR{power/control}="auto"
- ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="04b3", ATTR{idProduct}=="4012", TEST=="power/control", ATTR{power/control}="auto"
- 
- # Raritan Computer, Inc KVM.

1032-ata_id-unbotch-format-specifier.patch

@@ -1,33 +0,0 @@
-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
-

1096-new-udev-root-symlink-generator.patch

@@ -5,12 +5,10 @@
  units/systemd-udev-root-symlink.service.in             |   10 ++
  4 files changed, 96 insertions(+)
 
-Index: systemd-221/Makefile.am
+--- systemd-222.orig/Makefile.am
-===================================================================
++++ systemd-222/Makefile.am
---- systemd-221.orig/Makefile.am
+@@ -3759,6 +3759,25 @@ EXTRA_DIST += \
-+++ systemd-221/Makefile.am
+ 	test/mocks/fsck
-@@ -3754,6 +3754,25 @@ EXTRA_DIST += \
- 
  
  # ------------------------------------------------------------------------------
 +rootsymlink_generator_SOURCES = \
@@ -35,10 +33,8 @@ Index: systemd-221/Makefile.am
  ata_id_SOURCES = \
  	src/udev/ata_id/ata_id.c
  
-Index: systemd-221/src/udev/rootsymlink_generator/rootsymlink_generator.c
-===================================================================
 --- /dev/null
-+++ systemd-221/src/udev/rootsymlink_generator/rootsymlink_generator.c
++++ systemd-222/src/udev/rootsymlink_generator/rootsymlink_generator.c
 @@ -0,0 +1,57 @@
 +/*
 + * Copyright (C) 2014-2015 Robert Milasan <rmilasan@suse.com>
@@ -97,10 +93,8 @@ Index: systemd-221/src/udev/rootsymlink_generator/rootsymlink_generator.c
 +		return errno;
 +	return 0;
 +}
-Index: systemd-221/units/systemd-udev-root-symlink.service
-===================================================================
 --- /dev/null
-+++ systemd-221/units/systemd-udev-root-symlink.service
++++ systemd-222/units/systemd-udev-root-symlink.service
 @@ -0,0 +1,10 @@
 +[Unit]
 +Description=Rule generator for /dev/root symlink
@@ -112,10 +106,8 @@ Index: systemd-221/units/systemd-udev-root-symlink.service
 +Type=oneshot
 +RemainAfterExit=yes
 +ExecStart=/usr/lib/udev/rootsymlink-generator
-Index: systemd-221/units/systemd-udev-root-symlink.service.in
-===================================================================
 --- /dev/null
-+++ systemd-221/units/systemd-udev-root-symlink.service.in
++++ systemd-222/units/systemd-udev-root-symlink.service.in
 @@ -0,0 +1,10 @@
 +[Unit]
 +Description=Rule generator for /dev/root symlink

handle-numlock-value-in-etc-sysconfig-keyboard.patch

@@ -14,12 +14,10 @@ Cristian Rodríguez <crrodriguez@opensuse.org>
  units/systemd-vconsole-setup.service.in |    2 -
  5 files changed, 94 insertions(+), 3 deletions(-)
 
-Index: systemd-221/Makefile.am
+--- systemd-222.orig/Makefile.am
-===================================================================
++++ systemd-222/Makefile.am
---- systemd-221.orig/Makefile.am
+@@ -3805,6 +3805,19 @@ dist_udevrules_DATA += \
-+++ systemd-221/Makefile.am
+ 	rules/60-persistent-v4l.rules
-@@ -3813,6 +3813,19 @@ dist_udevrules_DATA += \
- 	rules/61-accelerometer.rules
  
  # ------------------------------------------------------------------------------
 +numlock_on_SOURCES = \
@@ -38,10 +36,8 @@ Index: systemd-221/Makefile.am
  mtd_probe_SOURCES =  \
  	src/udev/mtd_probe/mtd_probe.c \
  	src/udev/mtd_probe/mtd_probe.h \
-Index: systemd-221/rules/73-seat-numlock.rules
-===================================================================
 --- /dev/null
-+++ systemd-221/rules/73-seat-numlock.rules
++++ systemd-222/rules/73-seat-numlock.rules
 @@ -0,0 +1,8 @@
 +#  This file is part of SUSE customization of systemd.
 +#
@@ -51,10 +47,8 @@ Index: systemd-221/rules/73-seat-numlock.rules
 +#  (at your option) any later version.
 +
 +SUBSYSTEM=="tty", ACTION=="add", KERNEL=="tty[0-9]|tty1[0-2]", TEST=="/run/numlock-on", RUN+="numlock-on $env{DEVNAME}"
-Index: systemd-221/src/login/numlock-on.c
-===================================================================
 --- /dev/null
-+++ systemd-221/src/login/numlock-on.c
++++ systemd-222/src/login/numlock-on.c
 @@ -0,0 +1,34 @@
 +/*
 + * numlock-on.c: Turn numlock-on
@@ -90,10 +84,8 @@ Index: systemd-221/src/login/numlock-on.c
 +
 +	exit(0);
 +}
-Index: systemd-221/src/vconsole/vconsole-setup.c
+--- systemd-222.orig/src/vconsole/vconsole-setup.c
-===================================================================
++++ systemd-222/src/vconsole/vconsole-setup.c
---- systemd-221.orig/src/vconsole/vconsole-setup.c
-+++ systemd-221/src/vconsole/vconsole-setup.c
 @@ -41,6 +41,10 @@
  #include "terminal-util.h"
  #include "signal-util.h"
@@ -170,10 +162,8 @@ Index: systemd-221/src/vconsole/vconsole-setup.c
  #ifdef HAVE_SYSV_COMPAT
          comp_ok = compose_load_and_wait(vc, vc_compose_table);
          rate_ok = kbdrate_set_and_wait(vc, vc_kbd_rate, vc_kbd_delay);
-Index: systemd-221/units/systemd-vconsole-setup.service.in
+--- systemd-222.orig/units/systemd-vconsole-setup.service.in
-===================================================================
++++ systemd-222/units/systemd-vconsole-setup.service.in
---- systemd-221.orig/units/systemd-vconsole-setup.service.in
-+++ systemd-221/units/systemd-vconsole-setup.service.in
 @@ -10,7 +10,7 @@ Description=Setup Virtual Console
  Documentation=man:systemd-vconsole-setup.service(8) man:vconsole.conf(5)
  DefaultDependencies=no

suse-sysv-bootd-support.diff

@@ -10,10 +10,8 @@ activated even if symlinks exist in boot.d. Hmmm... -jengelh@inai.de]
  src/sysv-generator/sysv-generator.c |   21 +++++++++++++++------
  1 file changed, 15 insertions(+), 6 deletions(-)
 
-Index: systemd-221/src/sysv-generator/sysv-generator.c
+--- systemd-222.orig/src/sysv-generator/sysv-generator.c
-===================================================================
++++ systemd-222/src/sysv-generator/sysv-generator.c
---- systemd-221.orig/src/sysv-generator/sysv-generator.c
-+++ systemd-221/src/sysv-generator/sysv-generator.c
 @@ -39,7 +39,8 @@
  
  typedef enum RunlevelType {
@@ -47,18 +45,18 @@ Index: systemd-221/src/sysv-generator/sysv-generator.c
  
  typedef struct SysvStub {
          char *name;
-@@ -242,6 +246,10 @@ static bool usage_contains_reload(const
+@@ -243,6 +247,10 @@ static char *sysv_translate_name(const c
- static char *sysv_translate_name(const char *name) {
+         _cleanup_free_ char *c = NULL;
-         char *r;
+         char *res;
  
 +        if (startswith(name, "boot."))
 +                /* Drop SuSE-style boot. prefix */
 +                name += 5;
 +
-         r = new(char, strlen(name) + strlen(".service") + 1);
+         c = strdup(name);
-         if (!r)
+         if (!c)
                  return NULL;
-@@ -853,10 +861,10 @@ static int set_dependencies_from_rcnd(co
+@@ -859,10 +867,10 @@ static int set_dependencies_from_rcnd(co
  
                                  if (de->d_name[0] == 'S')  {
  
@@ -71,7 +69,7 @@ Index: systemd-221/src/sysv-generator/sysv-generator.c
  
                                          r = set_ensure_allocated(&runlevel_services[i], NULL);
                                          if (r < 0)
-@@ -867,7 +875,8 @@ static int set_dependencies_from_rcnd(co
+@@ -873,7 +881,8 @@ static int set_dependencies_from_rcnd(co
                                                  goto finish;
  
                                  } else if (de->d_name[0] == 'K' &&

systemd-221.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:085e088650afbfc688ccb13459aedb1fbc7c8810358605b076301f472d51cc4f
-size 4010048

systemd-222.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:167325ef6a1b1bc33b27bfc0f096ba429b89845131e14e24e840527a550c66cd
+size 2845992

systemd-mini.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Jul  8 20:44:57 UTC 2015 - crrodriguez@opensuse.org
+
+- Systemd v222, bugfix release.
+- Drop upstream patches 
+0006-pam_systemd-Properly-check-kdbus-availability.patch
+0023-core-fix-reversed-dependency-check-in-unit_check_unn.patch
+0031-install-fix-bad-memory-access.patch
+1032-ata_id-unbotch-format-specifier.patch
+- Drop SUSE patch 1013-no-runtime-PM-for-IBM-consoles.patch
+  udev does no longer enable USB HID power management at all.
+- The udev accelerometer helper was removed, obsoleted by
+  iio-sensor-proxy package.
+- networkd gained a new configuration option IPv6PrivacyExtensions.
+- udev does not longer support the WAIT_FOR_SYSFS= key in udev
+  rules. There are no known issues with current sysfs,
+  and udev does not need or should be used to work around such bugs.
+
 -------------------------------------------------------------------
 Tue Jul  7 08:54:38 UTC 2015 - jengelh@inai.de
 

systemd-mini.spec

@@ -47,7 +47,7 @@
 
 Name:           systemd-mini
 Url:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        221
+Version:        222
 Release:        0
 Summary:        A System and Session Manager
 License:        LGPL-2.1+
@@ -131,7 +131,8 @@ Obsoletes:      pm-utils <= 1.4.1
 Obsoletes:      suspend <= 1.0
 
 #Git-Clone:	git://anongit.freedesktop.org/systemd/systemd
-Source:         http://freedesktop.org/software/systemd/systemd-%version.tar.xz
+#There are no release tarballs anymore, only releases through git.
+Source:         systemd-%version.tar.xz
 %if ! 0%{?bootstrap}
 Source1:        systemd-rpmlintrc
 %else
@@ -246,13 +247,6 @@ 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.
@@ -277,8 +271,6 @@ Patch1007:      1007-physical-hotplug-cpu-and-memory.patch
 Patch1011:      1011-64-btrfs.rules-skip-btrfs-check-if-devices-are-not-r.patch
 # PATCH-FIX-SUSE skip persistent device link creation on mp device (bnc#872929)
 Patch1012:      1012-Skip-persistent-device-link-creation-on-multipath-de.patch
-# PATCH-FIX-SUSE Do not use runtime PM for some IBM consoles (bnc#868931)
-Patch1013:      1013-no-runtime-PM-for-IBM-consoles.patch
 # PATCH-FIX-SUSE 1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch
 Patch1035:      1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch
 # PATCH-FIX-SUSE See bnc#882714  comment #51 
@@ -297,8 +289,6 @@ 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
@@ -600,9 +590,6 @@ cp %{SOURCE7} m4/
 %patch490 -p1
 %patch520 -p1
 %patch521 -p1
-%patch522 -p1
-%patch523 -p1
-%patch524 -p1
 
 # udev patches
 %patch1001 -p1
@@ -613,7 +600,6 @@ cp %{SOURCE7} m4/
 %patch1007 -p1
 %patch1011 -p1
 %patch1012 -p1
-%patch1013 -p1
 %patch1035 -p1
 %if %{with blkrrpart}
 %patch1037 -p1
@@ -625,7 +611,6 @@ cp %{SOURCE7} m4/
 %patch1096 -p1
 %patch1097 -p1
 %patch1098 -p1
-%patch1099 -p1
 
 # remove patch backups
 find -name '*.orig' -exec rm -f '{}' \+
@@ -673,7 +658,7 @@ cflags ()
   esac
   set +o noclobber
 }
-autoreconf -fi
+sh autogen.sh
 # prevent pre-generated and distributed files from re-building
 find . -name "*.[1-8]" -exec touch '{}' '+';
 export V=e
@@ -1447,7 +1432,6 @@ exit 0
 %endif
 %{_bindir}/systemd-hwdb
 %dir %{_prefix}/lib/udev/
-%{_prefix}/lib/udev/accelerometer
 %{_prefix}/lib/udev/ata_id
 %{_prefix}/lib/udev/cdrom_id
 %{_prefix}/lib/udev/collect

systemd.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Jul  8 20:44:57 UTC 2015 - crrodriguez@opensuse.org
+
+- Systemd v222, bugfix release.
+- Drop upstream patches 
+0006-pam_systemd-Properly-check-kdbus-availability.patch
+0023-core-fix-reversed-dependency-check-in-unit_check_unn.patch
+0031-install-fix-bad-memory-access.patch
+1032-ata_id-unbotch-format-specifier.patch
+- Drop SUSE patch 1013-no-runtime-PM-for-IBM-consoles.patch
+  udev does no longer enable USB HID power management at all.
+- The udev accelerometer helper was removed, obsoleted by
+  iio-sensor-proxy package.
+- networkd gained a new configuration option IPv6PrivacyExtensions.
+- udev does not longer support the WAIT_FOR_SYSFS= key in udev
+  rules. There are no known issues with current sysfs,
+  and udev does not need or should be used to work around such bugs.
+
 -------------------------------------------------------------------
 Tue Jul  7 08:54:38 UTC 2015 - jengelh@inai.de
 

systemd.spec

@@ -45,7 +45,7 @@
 
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        221
+Version:        222
 Release:        0
 Summary:        A System and Session Manager
 License:        LGPL-2.1+
@@ -126,7 +126,8 @@ Obsoletes:      pm-utils <= 1.4.1
 Obsoletes:      suspend <= 1.0
 
 #Git-Clone:	git://anongit.freedesktop.org/systemd/systemd
-Source:         http://freedesktop.org/software/systemd/systemd-%version.tar.xz
+#There are no release tarballs anymore, only releases through git.
+Source:         systemd-%version.tar.xz
 %if ! 0%{?bootstrap}
 Source1:        systemd-rpmlintrc
 %else
@@ -241,13 +242,6 @@ 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.
@@ -272,8 +266,6 @@ Patch1007:      1007-physical-hotplug-cpu-and-memory.patch
 Patch1011:      1011-64-btrfs.rules-skip-btrfs-check-if-devices-are-not-r.patch
 # PATCH-FIX-SUSE skip persistent device link creation on mp device (bnc#872929)
 Patch1012:      1012-Skip-persistent-device-link-creation-on-multipath-de.patch
-# PATCH-FIX-SUSE Do not use runtime PM for some IBM consoles (bnc#868931)
-Patch1013:      1013-no-runtime-PM-for-IBM-consoles.patch
 # PATCH-FIX-SUSE 1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch
 Patch1035:      1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch
 # PATCH-FIX-SUSE See bnc#882714  comment #51 
@@ -292,8 +284,6 @@ 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
@@ -595,9 +585,6 @@ cp %{SOURCE7} m4/
 %patch490 -p1
 %patch520 -p1
 %patch521 -p1
-%patch522 -p1
-%patch523 -p1
-%patch524 -p1
 
 # udev patches
 %patch1001 -p1
@@ -608,7 +595,6 @@ cp %{SOURCE7} m4/
 %patch1007 -p1
 %patch1011 -p1
 %patch1012 -p1
-%patch1013 -p1
 %patch1035 -p1
 %if %{with blkrrpart}
 %patch1037 -p1
@@ -620,7 +606,6 @@ cp %{SOURCE7} m4/
 %patch1096 -p1
 %patch1097 -p1
 %patch1098 -p1
-%patch1099 -p1
 
 # remove patch backups
 find -name '*.orig' -exec rm -f '{}' \+
@@ -668,7 +653,7 @@ cflags ()
   esac
   set +o noclobber
 }
-autoreconf -fi
+sh autogen.sh
 # prevent pre-generated and distributed files from re-building
 find . -name "*.[1-8]" -exec touch '{}' '+';
 export V=e
@@ -1442,7 +1427,6 @@ exit 0
 %endif
 %{_bindir}/systemd-hwdb
 %dir %{_prefix}/lib/udev/
-%{_prefix}/lib/udev/accelerometer
 %{_prefix}/lib/udev/ata_id
 %{_prefix}/lib/udev/cdrom_id
 %{_prefix}/lib/udev/collect