.

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

0003-Do-not-print-invalid-UTF-8-in-error-messages.patch

@@ -50,6 +50,8 @@ index d77bf5c..5628d8c 100644
  
 diff --git src/shared/conf-parser.c src/shared/conf-parser.c
 index 0a87a71..d27b1b7 100644
+--- src/shared/conf-parser.c
++++ src/shared/conf-parser.c
 @@ -618,8 +618,7 @@ int config_parse_string(const char *unit
                  return log_oom();
  

systemd-dbus-system-bus-address.patch

@@ -1,13 +0,0 @@
---- systemd-209/src/libsystemd/sd-bus/sd-bus.c
-+++ systemd-209/src/libsystemd/sd-bus/sd-bus.c
-@@ -794,8 +794,8 @@
-         machine = NULL;
- 
-         b->sockaddr.un.sun_family = AF_UNIX;
--        strncpy(b->sockaddr.un.sun_path, "/var/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path));
--        b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + strlen("/var/run/dbus/system_bus_socket");
-+        strncpy(b->sockaddr.un.sun_path, "/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path));
-+        b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + strlen("/run/dbus/system_bus_socket");
- 
-         return 0;
- }

systemd-mini.spec

@@ -223,31 +223,31 @@ Patch119:       0001-make-fortify-happy-with-ppoll.patch
 # PATCH-FIX-SUSE 0001-avoid-abort-due-timeout-at-user-service.patch werner@suse.com
 Patch120:       0001-avoid-abort-due-timeout-at-user-service.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch121:       0001-nspawn-fix-detection-of-missing-proc-self-loginuid.patch
+Patch121:       0001-login-fix-pos-array-allocation.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch122:       0003-journalctl-refuse-extra-arguments-with-verify-and-si.patch
+Patch122:       0002-login-set-pos-slot-to-fallback-on-pos-eviction.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch123:       0004-logs-show-fix-corrupt-output-with-empty-messages.patch
+Patch123:       0003-login-Allow-calling-org.freedesktop.login1.Seat.Swit.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch124:       0005-mount-don-t-fire-PropertiesChanged-signals-for-mount.patch
+Patch124:       0004-fix-typo-in-iDRAC-network-interface-name-irdac-idrac.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch125:       0006-mount-don-t-send-out-PropertiesChanged-message-if-ac.patch
+Patch125:       0005-Replace-var-run-with-run-in-remaining-places.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch126:       0007-Use-var-run-dbus-system_bus_socket-for-the-D-Bus-soc.patch
+Patch126:       0006-Revert-back-to-var-run-at-a-couple-of-problems.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch127:       0008-README-document-that-var-run-must-be-a-symlink-run.patch
+Patch127:       0007-README-document-that-var-run-must-be-a-symlink-run.patch
-# PATCH-FIX-USTREAM added at 2014/0303
-Patch128:       0010-Replace-var-run-with-run-in-remaining-places.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch129:       0009-Revert-back-to-var-run-at-a-couple-of-problems.patch
+Patch128:       0008-Use-var-run-dbus-system_bus_socket-for-the-D-Bus-soc.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch130:       0011-fix-typo-in-iDRAC-network-interface-name-irdac-idrac.patch
+Patch129:       0009-mount-don-t-send-out-PropertiesChanged-message-if-ac.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch131:       0012-login-Allow-calling-org.freedesktop.login1.Seat.Swit.patch
+Patch130:       0010-mount-don-t-fire-PropertiesChanged-signals-for-mount.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch132:       0013-login-set-pos-slot-to-fallback-on-pos-eviction.patch
+Patch131:       0011-logs-show-fix-corrupt-output-with-empty-messages.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch133:       0014-login-fix-pos-array-allocation.patch
+Patch132:       0012-journalctl-refuse-extra-arguments-with-verify-and-si.patch
+# PATCH-FIX-USTREAM added at 2014/03/03
+Patch133:       0014-nspawn-fix-detection-of-missing-proc-self-loginuid.patch
 # PATCH-FIX-USTREAM added at 2014/03/07
 Patch134:       0001-Fix-systemd-stdio-bridge-symlink.patch
 # PATCH-FIX-USTREAM added at 2014/03/07
@@ -290,16 +290,13 @@ Patch1018:      1018-Make-LSB-Skripts-know-about-Required-and-Should.patch
 Patch1019:      1019-make-completion-smart-to-be-able-to-redirect.patch
 # PATCH-FIX-SUSE 0001-add-network-device-after-NFS-mount-units.patch werner@suse.com
 Patch1020:      0001-add-network-device-after-NFS-mount-units.patch
-# PATCH-FIX-SUSE systemd-dbus-system-bus-address.patch
-Patch1021:      systemd-dbus-system-bus-address.patch
 # PATCH-FIX-SUSE 1022-systemd-tmpfiles-ownerkeep.patch
 Patch1022:      1022-systemd-tmpfiles-ownerkeep.patch
 # PATCH-FIX-SUSE systemd-install-compat_pkgconfig-always.patch
 Patch1999:      systemd-install-compat_pkgconfig-always.patch
-
 # udev patches
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch1034:      0002-cdrom_id-use-the-old-MMC-fallback.patch
+Patch1034:      0013-cdrom_id-use-the-old-MMC-fallback.patch
 # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch
 Patch1001:      1001-re-enable-by_path-links-for-ata-devices.patch
 # PATCH-FIX-OPENSUSE 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch
@@ -604,7 +601,6 @@ cp %{SOURCE7} m4/
 %patch1018 -p1
 %patch1019 -p1
 %patch1020 -p1
-%patch1021 -p1
 %patch1022 -p1
 %patch1999 -p1
 # udev patches

systemd.spec

@@ -218,31 +218,31 @@ Patch119:       0001-make-fortify-happy-with-ppoll.patch
 # PATCH-FIX-SUSE 0001-avoid-abort-due-timeout-at-user-service.patch werner@suse.com
 Patch120:       0001-avoid-abort-due-timeout-at-user-service.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch121:       0001-nspawn-fix-detection-of-missing-proc-self-loginuid.patch
+Patch121:       0001-login-fix-pos-array-allocation.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch122:       0003-journalctl-refuse-extra-arguments-with-verify-and-si.patch
+Patch122:       0002-login-set-pos-slot-to-fallback-on-pos-eviction.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch123:       0004-logs-show-fix-corrupt-output-with-empty-messages.patch
+Patch123:       0003-login-Allow-calling-org.freedesktop.login1.Seat.Swit.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch124:       0005-mount-don-t-fire-PropertiesChanged-signals-for-mount.patch
+Patch124:       0004-fix-typo-in-iDRAC-network-interface-name-irdac-idrac.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch125:       0006-mount-don-t-send-out-PropertiesChanged-message-if-ac.patch
+Patch125:       0005-Replace-var-run-with-run-in-remaining-places.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch126:       0007-Use-var-run-dbus-system_bus_socket-for-the-D-Bus-soc.patch
+Patch126:       0006-Revert-back-to-var-run-at-a-couple-of-problems.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch127:       0008-README-document-that-var-run-must-be-a-symlink-run.patch
+Patch127:       0007-README-document-that-var-run-must-be-a-symlink-run.patch
-# PATCH-FIX-USTREAM added at 2014/0303
-Patch128:       0010-Replace-var-run-with-run-in-remaining-places.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch129:       0009-Revert-back-to-var-run-at-a-couple-of-problems.patch
+Patch128:       0008-Use-var-run-dbus-system_bus_socket-for-the-D-Bus-soc.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch130:       0011-fix-typo-in-iDRAC-network-interface-name-irdac-idrac.patch
+Patch129:       0009-mount-don-t-send-out-PropertiesChanged-message-if-ac.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch131:       0012-login-Allow-calling-org.freedesktop.login1.Seat.Swit.patch
+Patch130:       0010-mount-don-t-fire-PropertiesChanged-signals-for-mount.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch132:       0013-login-set-pos-slot-to-fallback-on-pos-eviction.patch
+Patch131:       0011-logs-show-fix-corrupt-output-with-empty-messages.patch
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch133:       0014-login-fix-pos-array-allocation.patch
+Patch132:       0012-journalctl-refuse-extra-arguments-with-verify-and-si.patch
+# PATCH-FIX-USTREAM added at 2014/03/03
+Patch133:       0014-nspawn-fix-detection-of-missing-proc-self-loginuid.patch
 # PATCH-FIX-USTREAM added at 2014/03/07
 Patch134:       0001-Fix-systemd-stdio-bridge-symlink.patch
 # PATCH-FIX-USTREAM added at 2014/03/07
@@ -285,16 +285,13 @@ Patch1018:      1018-Make-LSB-Skripts-know-about-Required-and-Should.patch
 Patch1019:      1019-make-completion-smart-to-be-able-to-redirect.patch
 # PATCH-FIX-SUSE 0001-add-network-device-after-NFS-mount-units.patch werner@suse.com
 Patch1020:      0001-add-network-device-after-NFS-mount-units.patch
-# PATCH-FIX-SUSE systemd-dbus-system-bus-address.patch
-Patch1021:      systemd-dbus-system-bus-address.patch
 # PATCH-FIX-SUSE 1022-systemd-tmpfiles-ownerkeep.patch
 Patch1022:      1022-systemd-tmpfiles-ownerkeep.patch
 # PATCH-FIX-SUSE systemd-install-compat_pkgconfig-always.patch
 Patch1999:      systemd-install-compat_pkgconfig-always.patch
-
 # udev patches
 # PATCH-FIX-USTREAM added at 2014/03/03
-Patch1034:      0002-cdrom_id-use-the-old-MMC-fallback.patch
+Patch1034:      0013-cdrom_id-use-the-old-MMC-fallback.patch
 # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch
 Patch1001:      1001-re-enable-by_path-links-for-ata-devices.patch
 # PATCH-FIX-OPENSUSE 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch
@@ -599,7 +596,6 @@ cp %{SOURCE7} m4/
 %patch1018 -p1
 %patch1019 -p1
 %patch1020 -p1
-%patch1021 -p1
 %patch1022 -p1
 %patch1999 -p1
 # udev patches