dirkmueller/systemd
SHA256
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=693
This commit is contained in:
Dr. Werner Fink 2014-06-27 12:59:41 +00:00 committed by Git OBS Bridge
parent 2e7936d2eb
commit 947882671f
5 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch Normal file
View File

@ -0,0 +1,25 @@
From 45e60962b7965f32755a76b79a28126299aac149 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Fri, 27 Jun 2014 14:20:17 +0200
Subject: [PATCH] libudev: fix udev_queue_get_queue_is_empty() logic
---
src/libudev/libudev-queue.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git src/libudev/libudev-queue.c src/libudev/libudev-queue.c
index eb0e096..c32a7ef 100644
--- src/libudev/libudev-queue.c
+++ src/libudev/libudev-queue.c
@@ -175,7 +175,7 @@ _public_ int udev_queue_get_udev_is_active(struct udev_queue *udev_queue)
**/
_public_ int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue)
{
- return access("/run/udev/queue", F_OK) >= 0;
+ return access("/run/udev/queue", F_OK) < 0;
}
/**
--
1.7.9.2

6
systemd-mini.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jun 27 12:46:12 UTC 2014 - werner@suse.de
- Add upstream bug fix patch
1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch (bnc#882714)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 27 08:17:47 UTC 2014 - werner@suse.de Fri Jun 27 08:17:47 UTC 2014 - werner@suse.de

7
systemd-mini.spec
View File

@ -696,6 +696,8 @@ Patch1038: 1038-udev-fix-invalid-free-in-enable_name_policy.patch
Patch1039: 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch Patch1039: 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch
# PATCH-FIX-SUSE 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch (bnc#884403 and bnc#882714) # PATCH-FIX-SUSE 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch (bnc#884403 and bnc#882714)
Patch1040: 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch Patch1040: 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch
# PATCH-FIX-UPSTREAM 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch
Patch1041: 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch
%description %description
Systemd is a system and service manager, compatible with SysV and LSB Systemd is a system and service manager, compatible with SysV and LSB
@ -1204,6 +1206,11 @@ cp %{SOURCE7} m4/
%endif %endif
%endif %endif
%patch1040 -p1 %patch1040 -p1
%if 0%{?suse_version} > 1310
%if %{with udevsettle}
%patch1041 -p0
%endif
%endif
# ensure generate files are removed # ensure generate files are removed
rm -f units/emergency.service rm -f units/emergency.service

6
systemd.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jun 27 12:46:12 UTC 2014 - werner@suse.de
- Add upstream bug fix patch
1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch (bnc#882714)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 27 08:17:47 UTC 2014 - werner@suse.de Fri Jun 27 08:17:47 UTC 2014 - werner@suse.de

7
systemd.spec
View File

@ -691,6 +691,8 @@ Patch1038: 1038-udev-fix-invalid-free-in-enable_name_policy.patch
Patch1039: 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch Patch1039: 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch
# PATCH-FIX-SUSE 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch (bnc#884403 and bnc#882714) # PATCH-FIX-SUSE 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch (bnc#884403 and bnc#882714)
Patch1040: 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch Patch1040: 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch
# PATCH-FIX-UPSTREAM 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch
Patch1041: 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch
%description %description
Systemd is a system and service manager, compatible with SysV and LSB Systemd is a system and service manager, compatible with SysV and LSB
@ -1199,6 +1201,11 @@ cp %{SOURCE7} m4/
%endif %endif
%endif %endif
%patch1040 -p1 %patch1040 -p1
%if 0%{?suse_version} > 1310
%if %{with udevsettle}
%patch1041 -p0
%endif
%endif
# ensure generate files are removed # ensure generate files are removed
rm -f units/emergency.service rm -f units/emergency.service