From d24dd66324764545fd586839c2d093e59a4ac09045d1c09046fa68e7c75a3974 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 25 Sep 2014 09:07:12 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=790 --- ...g-about-unused-variable-with-SELINUX.patch | 31 +++++++++++++++++++ 0002-bus-remove-unused-check.patch | 29 +++++++++++++++++ systemd-mini.changes | 13 ++++++++ systemd-mini.spec | 6 ++++ systemd.changes | 7 +++++ systemd.spec | 6 ++++ 6 files changed, 92 insertions(+) create mode 100644 0001-Fix-warning-about-unused-variable-with-SELINUX.patch create mode 100644 0002-bus-remove-unused-check.patch diff --git a/0001-Fix-warning-about-unused-variable-with-SELINUX.patch b/0001-Fix-warning-about-unused-variable-with-SELINUX.patch new file mode 100644 index 00000000..f1fb4ea9 --- /dev/null +++ b/0001-Fix-warning-about-unused-variable-with-SELINUX.patch @@ -0,0 +1,31 @@ +From 493d521d9ffe706741665a88ea14929913ea2eaf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 23 Sep 2014 09:22:40 -0400 +Subject: [PATCH] Fix warning about unused variable with !SELINUX + +src/shared/label.c:255:15: warning: unused variable 'l' [-Wunused-variable] + char *l = NULL; + ^ +--- + src/shared/label.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git src/shared/label.c src/shared/label.c +index 02b41f0..b6af38d 100644 +--- src/shared/label.c ++++ src/shared/label.c +@@ -252,9 +252,10 @@ fail: + + int label_get_our_label(char **label) { + int r = -EOPNOTSUPP; +- char *l = NULL; + + #ifdef HAVE_SELINUX ++ char *l = NULL; ++ + r = getcon(&l); + if (r < 0) + return r; +-- +1.7.9.2 + diff --git a/0002-bus-remove-unused-check.patch b/0002-bus-remove-unused-check.patch new file mode 100644 index 00000000..32c35276 --- /dev/null +++ b/0002-bus-remove-unused-check.patch @@ -0,0 +1,29 @@ +From 04c553e322680b6fcdf5b271e84b0b4b0ad8d5f9 Mon Sep 17 00:00:00 2001 +From: Thomas Hindoe Paaboel Andersen +Date: Tue, 23 Sep 2014 21:34:21 +0200 +Subject: [PATCH] bus: remove unused check + +strerror_r does not return null here and even if it did we would have +problems already at the preceding strlen call. + +Found by coverity. Fixes: CID#1237770 +--- + src/libsystemd/sd-bus/bus-error.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/libsystemd/sd-bus/bus-error.c src/libsystemd/sd-bus/bus-error.c +index c2e41fb..abdfd73 100644 +--- src/libsystemd/sd-bus/bus-error.c ++++ src/libsystemd/sd-bus/bus-error.c +@@ -312,7 +312,7 @@ static void bus_error_strerror(sd_bus_error *e, int error) { + continue; + } + +- if (!x || errno) { ++ if (errno) { + free(m); + return; + } +-- +1.7.9.2 + diff --git a/systemd-mini.changes b/systemd-mini.changes index 25207206..f6077e12 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Sep 25 09:06:14 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-Fix-warning-about-unused-variable-with-SELINUX.patch + 0002-bus-remove-unused-check.patch + +------------------------------------------------------------------- +Wed Sep 24 15:05:49 UTC 2014 - werner@suse.de + +- Add patch 0001-infinit-timeout-for-kmod-loaded-modules.patch to + be able to avoid killing a running kmod/modprobe (bnc#889297) + ------------------------------------------------------------------- Wed Sep 24 08:36:42 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index e785ee20..04d56c4d 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -896,6 +896,10 @@ Patch432: 0001-nspawn-don-t-try-to-create-veth-link-with-too-long-i.patch Patch433: 0001-socket-introduce-SELinuxContextFromNet-option.patch # PATCH-FIX-UPSTREAM added at 2014/09/24 Patch434: 0002-util-avoid-non-portable-__WORDSIZE.patch +# PATCH-FIX-UPSTREAM added at 2014/09/25 +Patch435: 0001-Fix-warning-about-unused-variable-with-SELINUX.patch +# PATCH-FIX-UPSTREAM added at 2014/09/25 +Patch436: 0002-bus-remove-unused-check.patch # UDEV PATCHES # ============ @@ -1670,6 +1674,8 @@ cp %{SOURCE7} m4/ %patch432 -p0 %patch433 -p0 %patch434 -p0 +%patch435 -p0 +%patch436 -p0 # udev patches %patch1001 -p1 diff --git a/systemd.changes b/systemd.changes index e56b6b32..f6077e12 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 25 09:06:14 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-Fix-warning-about-unused-variable-with-SELINUX.patch + 0002-bus-remove-unused-check.patch + ------------------------------------------------------------------- Wed Sep 24 15:05:49 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 462c3db6..a1d3bcc4 100644 --- a/systemd.spec +++ b/systemd.spec @@ -891,6 +891,10 @@ Patch432: 0001-nspawn-don-t-try-to-create-veth-link-with-too-long-i.patch Patch433: 0001-socket-introduce-SELinuxContextFromNet-option.patch # PATCH-FIX-UPSTREAM added at 2014/09/24 Patch434: 0002-util-avoid-non-portable-__WORDSIZE.patch +# PATCH-FIX-UPSTREAM added at 2014/09/25 +Patch435: 0001-Fix-warning-about-unused-variable-with-SELINUX.patch +# PATCH-FIX-UPSTREAM added at 2014/09/25 +Patch436: 0002-bus-remove-unused-check.patch # UDEV PATCHES # ============ @@ -1665,6 +1669,8 @@ cp %{SOURCE7} m4/ %patch432 -p0 %patch433 -p0 %patch434 -p0 +%patch435 -p0 +%patch436 -p0 # udev patches %patch1001 -p1