From a8eb4ac8b06204f17bb059440ea0b44e2d9b286f Mon Sep 17 00:00:00 2001
From: Jonathan Dieter <jdieter@gmail.com>
Date: Sep 20 2018 20:28:08 +0000
Subject: Update to 4.18.9 and add patch to fix #1631148


Signed-off-by: Jonathan Dieter <jdieter@gmail.com>

---

diff --git a/.gitignore b/.gitignore
index 7ab0a40..5dc95b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /usbip-4.9.9.tar.xz
 /usbip-4.14.11.tar.xz
 /usbip-4.15.10.tar.xz
+/usbip-4.18.9.tar.xz
diff --git a/sources b/sources
index 16cce4f..50e67c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (usbip-4.15.10.tar.xz) = dd072441a2b0d32963505f1407e8867cb8ac032cddd9989a15375060573af0a4a8fcdd8350a935a5c429094ac0146871ce46f214c3f1b41cf1ecdfcfd1773a5a
+SHA512 (usbip-4.18.9.tar.xz) = 722556e8dfd25822dfd1325c3b2053819751c997fb77515667f7ff3ec410d6229a42395ad745533aefa22a2df0cbc361fe608fe9dd082cedaeddba76f6fbc4d4
diff --git a/usbip-4.18.9-compare-actual-name.patch b/usbip-4.18.9-compare-actual-name.patch
new file mode 100644
index 0000000..50649bb
--- /dev/null
+++ b/usbip-4.18.9-compare-actual-name.patch
@@ -0,0 +1,12 @@
+diff -urb usbip-4.18.9a/libsrc/vhci_driver.c usbip-4.18.9b/libsrc/vhci_driver.c
+--- usbip-4.18.9a/libsrc/vhci_driver.c	2018-09-19 20:41:37.000000000 +0000
++++ usbip-4.18.9b/libsrc/vhci_driver.c	2018-09-20 10:11:10.843791788 +0000
+@@ -150,7 +150,7 @@
+ 
+ static int vhci_hcd_filter(const struct dirent *dirent)
+ {
+-	return strcmp(dirent->d_name, "vhci_hcd") >= 0;
++	return !strncmp(dirent->d_name, "vhci_hcd", 9);
+ }
+ 
+ static int get_ncontrollers(void)
diff --git a/usbip.spec b/usbip.spec
index 5352140..c348228 100644
--- a/usbip.spec
+++ b/usbip.spec
@@ -3,8 +3,8 @@
 Name:		usbip
 License:	GPLv2+
 Summary:	USB/IP user-space
-Version:	4.15.10
-Release:	3%{?dist}
+Version:	4.18.9
+Release:	1%{?dist}
 #Source:	https://www.kernel.org/pub/linux/kernel/v4.x/linux-%%{version}.tar.xz
 # In the interests of keeping the source rpm from being ridiculously large,
 # download the Linux kernel from above and run `extract_usbip.sh <version>`
@@ -17,6 +17,7 @@ Source:		usbip-%{version}.tar.xz
 Source1:	usbip-server.service
 Source2:	usbip-client.service
 Source99:	extract_usbip.sh
+Patch0:		usbip-4.18.9-compare-actual-name.patch
 Requires:	kmod(usbip-core.ko)
 Requires:	kmod(usbip-host.ko)
 Requires:	kmod(vhci-hcd.ko)
@@ -50,7 +51,7 @@ This package contains headers and static libraries for USB/IP user-space
 development
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 ./autogen.sh
@@ -87,6 +88,11 @@ install -pm 644 %{SOURCE2} %{buildroot}%{_unitdir}
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 20 2018 Jonathan Dieter <jdieter@gmail.com> - 4.18.9-1
+- Update to 4.18.9
+- Add patch to fix problem importing device when another device is in
+  /sys/devices/platform after vhci (#1631148)
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.15.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild