From 71e400fe676cf059872b606188677418e7c87549e11609eb6cda0b6dbecd1b2b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 27 Jun 2014 12:59:41 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=693 --- ...-udev_queue_get_queue_is_empty-logic.patch | 25 +++++++++++++++++++ systemd-mini.changes | 6 +++++ systemd-mini.spec | 7 ++++++ systemd.changes | 6 +++++ systemd.spec | 7 ++++++ 5 files changed, 51 insertions(+) create mode 100644 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch diff --git a/1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch b/1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch new file mode 100644 index 00000000..21d21356 --- /dev/null +++ b/1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch @@ -0,0 +1,25 @@ +From 45e60962b7965f32755a76b79a28126299aac149 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +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 + diff --git a/systemd-mini.changes b/systemd-mini.changes index da40a9c5..f0dee4ff 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -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 diff --git a/systemd-mini.spec b/systemd-mini.spec index 15e40108..a9082139 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -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 # 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 +# 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 Systemd is a system and service manager, compatible with SysV and LSB @@ -1204,6 +1206,11 @@ cp %{SOURCE7} m4/ %endif %endif %patch1040 -p1 +%if 0%{?suse_version} > 1310 +%if %{with udevsettle} +%patch1041 -p0 +%endif +%endif # ensure generate files are removed rm -f units/emergency.service diff --git a/systemd.changes b/systemd.changes index da40a9c5..f0dee4ff 100644 --- a/systemd.changes +++ b/systemd.changes @@ -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 diff --git a/systemd.spec b/systemd.spec index 55ff9a7d..4eb30653 100644 --- a/systemd.spec +++ b/systemd.spec @@ -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 # 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 +# 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 Systemd is a system and service manager, compatible with SysV and LSB @@ -1199,6 +1201,11 @@ cp %{SOURCE7} m4/ %endif %endif %patch1040 -p1 +%if 0%{?suse_version} > 1310 +%if %{with udevsettle} +%patch1041 -p0 +%endif +%endif # ensure generate files are removed rm -f units/emergency.service