rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=790
This commit is contained in:
Dr. Werner Fink 2014-09-25 09:07:12 +00:00 committed by Git OBS Bridge
parent 48820717c4
commit d24dd66324
6 changed files with 92 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0001-Fix-warning-about-unused-variable-with-SELINUX.patch Normal file
View File

@ -0,0 +1,31 @@
From 493d521d9ffe706741665a88ea14929913ea2eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
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

29
0002-bus-remove-unused-check.patch Normal file
View File

@ -0,0 +1,29 @@
From 04c553e322680b6fcdf5b271e84b0b4b0ad8d5f9 Mon Sep 17 00:00:00 2001
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
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

13
systemd-mini.changes
View File

@ -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

6
systemd-mini.spec
View File

@ -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

7
systemd.changes
View File

@ -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

6
systemd.spec
View File

@ -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