[systemd/f19] Backport one more patch

Wed Oct 23 20:59:59 UTC 2013

commit 2f8be63bb94c2ef8a580741d93f1bb106f16c169
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Wed Oct 23 17:00:01 2013 -0400

    Backport one more patch

 ...-hwdb-validation-to-look-for-the-new-file.patch |   25 ++++++++++
 systemd.spec                                       |   50 +++++++++++---------
 2 files changed, 52 insertions(+), 23 deletions(-)
---

diff --git a/0090-libudev-fix-hwdb-validation-to-look-for-the-new-file.patch b/0090-libudev-fix-hwdb-validation-to-look-for-the-new-file.patch
new file mode 100644
index 0000000..c59d175
--- /dev/null
+++ b/0090-libudev-fix-hwdb-validation-to-look-for-the-new-file.patch
@@ -0,0 +1,25 @@
+From f872b26251813607032226e124158f5f67385adb Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay at vrfy.org>
+Date: Thu, 15 Aug 2013 19:54:03 +0200
+Subject: [PATCH] libudev: fix hwdb validation to look for the *new* file
+
+---
+ src/libudev/libudev-hwdb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libudev/libudev-hwdb.c b/src/libudev/libudev-hwdb.c
+index 42ab6d9..c2695b5 100644
+--- a/src/libudev/libudev-hwdb.c
++++ b/src/libudev/libudev-hwdb.c
+@@ -354,7 +354,7 @@ bool udev_hwdb_validate(struct udev_hwdb *hwdb) {
+                 return false;
+         if (!hwdb->f)
+                 return false;
+-        if (fstat(fileno(hwdb->f), &st) < 0)
++        if (stat("/etc/udev/hwdb.bin", &st) < 0)
+                 return true;
+         if (timespec_load(&hwdb->st.st_mtim) != timespec_load(&st.st_mtim))
+                 return true;
+-- 
+1.8.3.1
+
diff --git a/systemd.spec b/systemd.spec
index c9c5a1c..0e49c2e 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -111,29 +111,30 @@ Patch63:        0063-systemd-tmpfiles-setup-dev-remain-after-exit.patch
 Patch64:        0064-kmod-static-nodes-remain-after-exit.patch
 Patch65:        0065-sysctl-allow-overwriting-of-values-specified-in-late.patch
 Patch66:        0066-Restore-reading-of-etc-sysctl.conf.patch
-Patch69:        0067-mount-when-learning-about-the-root-mount-from-mounti.patch
-Patch70:        0068-core-mount.c-mount_dump-don-t-segfault-if-mount-is-n.patch
-Patch71:        0069-systemd-serialize-deserialize-forbid_restart-value.patch
-Patch72:        0070-core-unify-the-way-we-denote-serialization-attribute.patch
-Patch73:        0071-journal-vacuum-cleanup.patch
-Patch74:        0072-journald-always-vacuum-empty-offline-files.patch
-Patch75:        0073-journald-fix-vacuuming-of-archived-journals.patch
-Patch76:        0074-journald-fix-fd-leak-in-journal_file_empty.patch
-Patch77:        0075-journald-be-a-bit-more-verbose-when-vacuuming.patch
-Patch78:        0076-journald-fix-minor-memory-leak.patch
-Patch79:        0077-journald-remove-rotated-file-from-hashmap-when-rotat.patch
-Patch80:        0078-udevadm.xml-document-resolve-names-option-for-test.patch
-Patch81:        0079-dbus-common-avoid-leak-in-error-path.patch
-Patch82:        0080-drop-ins-check-return-value.patch
-Patch83:        0081-man-add-more-markup-to-udevadm-8.patch
-Patch84:        0082-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch
-Patch85:        0083-man-document-the-b-special-boot-option.patch
-Patch86:        0084-rules-expose-loop-block-devices-to-systemd.patch
-Patch87:        0085-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch
-Patch88:        0086-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch
-Patch89:        0087-rules-remove-pointless-MODE-settings.patch
-Patch90:        0088-shell-completion-dump-has-moved-to-systemd-analyze.patch
-Patch91:        0089-give-priority-to-etc-sysctl.conf.patch
+Patch67:        0067-mount-when-learning-about-the-root-mount-from-mounti.patch
+Patch68:        0068-core-mount.c-mount_dump-don-t-segfault-if-mount-is-n.patch
+Patch69:        0069-systemd-serialize-deserialize-forbid_restart-value.patch
+Patch70:        0070-core-unify-the-way-we-denote-serialization-attribute.patch
+Patch71:        0071-journal-vacuum-cleanup.patch
+Patch72:        0072-journald-always-vacuum-empty-offline-files.patch
+Patch73:        0073-journald-fix-vacuuming-of-archived-journals.patch
+Patch74:        0074-journald-fix-fd-leak-in-journal_file_empty.patch
+Patch75:        0075-journald-be-a-bit-more-verbose-when-vacuuming.patch
+Patch76:        0076-journald-fix-minor-memory-leak.patch
+Patch77:        0077-journald-remove-rotated-file-from-hashmap-when-rotat.patch
+Patch78:        0078-udevadm.xml-document-resolve-names-option-for-test.patch
+Patch79:        0079-dbus-common-avoid-leak-in-error-path.patch
+Patch80:        0080-drop-ins-check-return-value.patch
+Patch81:        0081-man-add-more-markup-to-udevadm-8.patch
+Patch82:        0082-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch
+Patch83:        0083-man-document-the-b-special-boot-option.patch
+Patch84:        0084-rules-expose-loop-block-devices-to-systemd.patch
+Patch85:        0085-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch
+Patch86:        0086-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch
+Patch87:        0087-rules-remove-pointless-MODE-settings.patch
+Patch88:        0088-shell-completion-dump-has-moved-to-systemd-analyze.patch
+Patch89:        0089-give-priority-to-etc-sysctl.conf.patch
+Patch90:        0090-libudev-fix-hwdb-validation-to-look-for-the-new-file.patch
 
 # git diff --src-prefix=a/ --dst-prefix=b/ v204 -- hwdb/ > systemd-hwdb.patch
 Patch99:        systemd-hwdb.patch
@@ -900,6 +901,9 @@ fi
 %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Wed Oct 23 2013 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> 204-18
+- Fix hwdb validation to look for the *new* file.
+
 * Mon Oct 21 2013 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> 204-17
 - Fix sysctl ordering issue introduced in previous update (#1017473).
 - Backport a bunch of fixes from upstream (#890463, #994268, #1017375, #880709).
