.

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

0001-cdrom_id-use-the-old-MMC-fallback.patch

@@ -0,0 +1,54 @@
+From a14f14976094650e17d39f3a7d15a1c68c93c333 Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Thu, 27 Feb 2014 11:06:37 +0100
+Subject: [PATCH] cdrom_id: use the old MMC fallback
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1038015
+The problem seems to be that the your virtual DVD is emulating a really
+old DVD device, and doing it kind of strangely.
+
+> dracut:# /lib/udev/cdrom_id --debug /dev/sr0
+> probing: '/dev/sr0'
+> INQUIRY: [IMM     ][Virtual CD/DVD   ][0316]
+> GET CONFIGURATION failed with SK=5h/ASC=24h/ACQ=00h
+
+So your virtual drive rejects the GET CONFIGURATION command as illegal.
+
+Other pre-MMC2 drives that don't accept this command usually return the
+error
+SK=5h,ASC=20h (invalid/unsupported command code), in which case cdrom_id
+tries an older method, and then ID_CDROM_MEDIA_TRACK_COUNT_DATA gets set
+and all the /dev/disk/by-label (etc) links get set up.
+
+The virtual drive returns the error SK=5h,ASC=24h (invalid field in
+Command Descriptor Block), which cdrom_id doesn't handle, so it gives up
+and the links never get made.
+
+The ideal solution would be to make the IMM to emulate a device that's
+less than 15 years old, but I'm not going to hold my breath waiting for
+that.
+
+So probably cdrom_id should also use the old MMC fallback when the error
+is SK=5h,ASC=24h, and then all of this would work as expected.
+
+Suggested-by:Luca Miccini <lmiccini@redhat.com>
+---
+ src/udev/cdrom_id/cdrom_id.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git src/udev/cdrom_id/cdrom_id.c src/udev/cdrom_id/cdrom_id.c
+index 93467c2..33b2bc3 100644
+--- src/udev/cdrom_id/cdrom_id.c
++++ src/udev/cdrom_id/cdrom_id.c
+@@ -556,7 +556,7 @@ static int cd_profiles(struct udev *udev, int fd)
+         if ((err != 0)) {
+                 info_scsi_cmd_err(udev, "GET CONFIGURATION", err);
+                 /* handle pre-MMC2 drives which do not support GET CONFIGURATION */
+-                if (SK(err) == 0x5 && ASC(err) == 0x20) {
++                if (SK(err) == 0x5 && (ASC(err) == 0x20 || ASC(err) == 0x24)) {
+                         log_debug("drive is pre-MMC2 and does not support 46h get configuration command");
+                         log_debug("trying to work around the problem");
+                         ret = cd_profiles_old_mmc(udev, fd);
+-- 
+1.7.9.2
+

0001-journalctl-refuse-extra-arguments-with-verify-and-si.patch

@@ -0,0 +1,30 @@
+From 0b6b7c2004317da48e5bbd3078c5662d8f0061b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Wed, 26 Feb 2014 23:01:43 -0500
+Subject: [PATCH] journalctl: refuse extra arguments with --verify and similar
+
+Positional arguments only make sense with the default action.
+For other actions, complain instead of ignoring them silently.
+---
+ src/journal/journalctl.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git src/journal/journalctl.c src/journal/journalctl.c
+index a328ba1..0619b25 100644
+--- src/journal/journalctl.c
++++ src/journal/journalctl.c
+@@ -658,6 +658,11 @@ static int parse_argv(int argc, char *argv[]) {
+                 return -EINVAL;
+         }
+ 
++        if (arg_action != ACTION_SHOW && optind < argc) {
++                log_error("Extraneous arguments starting with '%s'", argv[optind]);
++                return -EINVAL;
++        }
++
+         return 1;
+ }
+ 
+-- 
+1.7.9.2
+

0001-logs-show-fix-corrupt-output-with-empty-messages.patch

@@ -0,0 +1,41 @@
+From 47d80904a1f72d559962cc5ad32fffd46672a34a Mon Sep 17 00:00:00 2001
+From: Uoti Urpala <uoti.urpala@pp1.inet.fi>
+Date: Thu, 20 Feb 2014 03:00:09 +0200
+Subject: [PATCH] logs-show: fix corrupt output with empty messages
+
+If a message had zero length, journalctl would print no newline, and
+two output lines would be concatenated. Fix. The problem was
+introduced in commit 31f7bf199452 ("logs-show: print multiline
+messages"). Affected short and verbose output modes.
+
+Before fix:
+
+Feb 09 21:16:17 glyph dhclient[1323]: Feb 09 21:16:17 glyph NetworkManager[788]: <info> (enp4s2): DHCPv4 state changed nbi -> preinit
+
+after:
+
+Feb 09 21:16:17 glyph dhclient[1323]:
+Feb 09 21:16:17 glyph NetworkManager[788]: <info> (enp4s2): DHCPv4 state changed nbi -> preinit
+---
+ src/shared/logs-show.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git src/shared/logs-show.c src/shared/logs-show.c
+index 61c3652..12d4a1c 100644
+--- src/shared/logs-show.c
++++ src/shared/logs-show.c
+@@ -124,6 +124,11 @@ static bool print_multiline(FILE *f, unsigned prefix, unsigned n_columns, Output
+                 }
+         }
+ 
++        /* A special case: make sure that we print a newline when
++           the message is empty. */
++        if (message_len == 0)
++                fputs("\n", f);
++
+         for (pos = message;
+              pos < message + message_len;
+              pos = end + 1, line++) {
+-- 
+1.7.9.2
+

0001-nspawn-fix-detection-of-missing-proc-self-loginuid.patch

@@ -0,0 +1,31 @@
+From 13e8ceb84e56907d73b6b07418deb37faaf0e66d Mon Sep 17 00:00:00 2001
+From: Tero Roponen <tero.roponen@gmail.com>
+Date: Tue, 25 Feb 2014 17:19:35 +0200
+Subject: [PATCH] nspawn: fix detection of missing /proc/self/loginuid
+
+Running 'systemd-nspawn -D /srv/Fedora/' gave me this error:
+ Failed to read /proc/self/loginuid: No such file or directory
+
+ Container Fedora failed with error code 1.
+
+This patch fixes the problem.
+---
+ src/nspawn/nspawn.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git src/nspawn/nspawn.c src/nspawn/nspawn.c
+index 1fe641b..92b6728 100644
+--- src/nspawn/nspawn.c
++++ src/nspawn/nspawn.c
+@@ -1349,7 +1349,7 @@ static int reset_audit_loginuid(void) {
+                 return 0;
+ 
+         r = read_one_line_file("/proc/self/loginuid", &p);
+-        if (r == -EEXIST)
++        if (r == -ENOENT)
+                 return 0;
+         if (r < 0) {
+                 log_error("Failed to read /proc/self/loginuid: %s", strerror(-r));
+-- 
+1.7.9.2
+

systemd-mini.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Feb 28 17:41:37 UTC 2014 - werner@suse.de
+
+- Add patch
+  0001-systemd-empty-sigmask-on-reexec.patch
+  which corrects sigmaks for reexec in initrd (bnc#864904)
+
+-------------------------------------------------------------------
+Fri Feb 28 17:38:06 UTC 2014 - werner@suse.de
+
+- Add patch
+  0001-nspawn-fix-detection-of-missing-proc-self-loginuid.patch
+  to avoid error on not existing file /proc/self/loginuid 
+
 -------------------------------------------------------------------
 Fri Feb 28 17:15:38 UTC 2014 - werner@suse.de
 

systemd-mini.spec

@@ -214,6 +214,8 @@ Patch90:        0001-On_s390_con3270_disable_ANSI_colour_esc.patch
 Patch91:        plymouth-quit-and-wait-for-emergency-service.patch
 # PATCH-FIX-SUSE 0001-Don-t-snprintf-a-potentially-NULL-pointer.patch -- Avoid systemd crash on resume (bnc#861488)
 Patch93:        0001-Don-t-snprintf-a-potentially-NULL-pointer.patch
+# PATCH-FIX-SUSE 0001-systemd-empty-sigmask-on-reexec.patch werner@suse.com
+Patch114:       0001-systemd-empty-sigmask-on-reexec.patch
 # PATCH-FIX-SUSE 0001-add-network-device-after-NFS-mount-units.patch werner@suse.com
 Patch115:       0001-add-network-device-after-NFS-mount-units.patch
 # PATCH-FIX-USTREAM 0001-units-serial-getty-.service-add-Install-section.patch werner@suse.com
@@ -226,6 +228,14 @@ Patch118:       0001-make-tests-with-libseccomp-work.patch
 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 0001-nspawn-fix-detection-of-missing-proc-self-loginuid.patch werner@suse.com
+Patch121:       0001-nspawn-fix-detection-of-missing-proc-self-loginuid.patch
+# PATCH-FIX-USTREAM  0001-cdrom_id-use-the-old-MMC-fallback.patch
+Patch122:       0001-cdrom_id-use-the-old-MMC-fallback.patch
+# PATCH-FIX-USTREAM 0001-logs-show-fix-corrupt-output-with-empty-messages.patch
+Patch123:       0001-logs-show-fix-corrupt-output-with-empty-messages.patch
+# PATCH-FIX-USTREAM 0001-journalctl-refuse-extra-arguments-with-verify-and-si.patch
+Patch124:       0001-journalctl-refuse-extra-arguments-with-verify-and-si.patch
 # PATCH-FIX-OPENSUSE 1009-make-xsltproc-use-correct-ROFF-links.patch -- Make ROFF links working again in manual pages (bnc#842844)
 Patch1009:      1009-make-xsltproc-use-correct-ROFF-links.patch
 # PATCH-FIX-OPENSUSE 1010-do-not-install-sulogin-unit-with-poweroff.patch -- Avoid installing console-shell.service (bnc#849071)
@@ -505,6 +515,7 @@ cp %{SOURCE7} m4/
 %patch90 -p1
 %patch91 -p1
 %patch93 -p1
+%patch114 -p0
 %patch115 -p1
 %patch116 -p1
 %if 0%{?suse_version} <= 1310
@@ -513,6 +524,10 @@ cp %{SOURCE7} m4/
 %patch118 -p1
 %patch119 -p1
 %patch120 -p1
+%patch121 -p0
+%patch122 -p0
+%patch123 -p0
+%patch124 -p0
 %patch1009 -p1
 %patch1010 -p1
 %patch1012 -p1

systemd.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Fri Feb 28 17:54:40 UTC 2014 - werner@suse.de
+
+- Add upstream patches
+  + 0001-cdrom_id-use-the-old-MMC-fallback.patch
+  + 0001-logs-show-fix-corrupt-output-with-empty-messages.patch
+  + 0001-journalctl-refuse-extra-arguments-with-verify-and-si.patch
+
+-------------------------------------------------------------------
+Fri Feb 28 17:41:37 UTC 2014 - werner@suse.de
+
+- Add patch
+  0001-systemd-empty-sigmask-on-reexec.patch
+  which corrects sigmaks for reexec in initrd (bnc#864904)
+
+-------------------------------------------------------------------
+Fri Feb 28 17:38:06 UTC 2014 - werner@suse.de
+
+- Add patch
+  0001-nspawn-fix-detection-of-missing-proc-self-loginuid.patch
+  to avoid error on not existing file /proc/self/loginuid 
+
 -------------------------------------------------------------------
 Fri Feb 28 17:15:38 UTC 2014 - werner@suse.de
 

systemd.spec

@@ -209,6 +209,8 @@ Patch90:        0001-On_s390_con3270_disable_ANSI_colour_esc.patch
 Patch91:        plymouth-quit-and-wait-for-emergency-service.patch
 # PATCH-FIX-SUSE 0001-Don-t-snprintf-a-potentially-NULL-pointer.patch -- Avoid systemd crash on resume (bnc#861488)
 Patch93:        0001-Don-t-snprintf-a-potentially-NULL-pointer.patch
+# PATCH-FIX-SUSE 0001-systemd-empty-sigmask-on-reexec.patch werner@suse.com
+Patch114:       0001-systemd-empty-sigmask-on-reexec.patch
 # PATCH-FIX-SUSE 0001-add-network-device-after-NFS-mount-units.patch werner@suse.com
 Patch115:       0001-add-network-device-after-NFS-mount-units.patch
 # PATCH-FIX-USTREAM 0001-units-serial-getty-.service-add-Install-section.patch werner@suse.com
@@ -221,6 +223,14 @@ Patch118:       0001-make-tests-with-libseccomp-work.patch
 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 0001-nspawn-fix-detection-of-missing-proc-self-loginuid.patch werner@suse.com
+Patch121:       0001-nspawn-fix-detection-of-missing-proc-self-loginuid.patch
+# PATCH-FIX-USTREAM  0001-cdrom_id-use-the-old-MMC-fallback.patch
+Patch122:       0001-cdrom_id-use-the-old-MMC-fallback.patch
+# PATCH-FIX-USTREAM 0001-logs-show-fix-corrupt-output-with-empty-messages.patch
+Patch123:       0001-logs-show-fix-corrupt-output-with-empty-messages.patch
+# PATCH-FIX-USTREAM 0001-journalctl-refuse-extra-arguments-with-verify-and-si.patch
+Patch124:       0001-journalctl-refuse-extra-arguments-with-verify-and-si.patch
 # PATCH-FIX-OPENSUSE 1009-make-xsltproc-use-correct-ROFF-links.patch -- Make ROFF links working again in manual pages (bnc#842844)
 Patch1009:      1009-make-xsltproc-use-correct-ROFF-links.patch
 # PATCH-FIX-OPENSUSE 1010-do-not-install-sulogin-unit-with-poweroff.patch -- Avoid installing console-shell.service (bnc#849071)
@@ -500,6 +510,7 @@ cp %{SOURCE7} m4/
 %patch90 -p1
 %patch91 -p1
 %patch93 -p1
+%patch114 -p0
 %patch115 -p1
 %patch116 -p1
 %if 0%{?suse_version} <= 1310
@@ -508,6 +519,10 @@ cp %{SOURCE7} m4/
 %patch118 -p1
 %patch119 -p1
 %patch120 -p1
+%patch121 -p0
+%patch122 -p0
+%patch123 -p0
+%patch124 -p0
 %patch1009 -p1
 %patch1010 -p1
 %patch1012 -p1