From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 15 Feb 2018 18:09:04 +0000 (+0000)
Subject: update rpmanual-format-overflow patch to remove parts that no longer
X-Git-Tag: archive/raspbian/4.9.80-2+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d5487e98ad18098d81b02b46e1a0ce2e534c9503;p=linux-4.9.git

update rpmanual-format-overflow patch to remove parts that no longer
apply.
---

diff --git a/debian/patches/rpmanualusbip-format-overflow.patch b/debian/patches/rpmanualusbip-format-overflow.patch
index c74810f07868..bc0656a3389e 100644
--- a/debian/patches/rpmanualusbip-format-overflow.patch
+++ b/debian/patches/rpmanualusbip-format-overflow.patch
@@ -1,29 +1,14 @@
-Description:  Fix usbip "format-overflow" failure.
+commit 7bba4828900638795851a595ce3b5ef442630417
 Author: Peter Michael Green <plugwash@raspbian.org>
+Date:   Thu Feb 15 18:08:18 2018 +0000
 
+    Apply parts of previous usbip format overflow patch that still
+    apply.
 
-Index: linux-4.9-4.9.51/tools/usb/usbip/libsrc/usbip_common.c
-===================================================================
---- linux-4.9-4.9.51.orig/tools/usb/usbip/libsrc/usbip_common.c
-+++ linux-4.9-4.9.51/tools/usb/usbip/libsrc/usbip_common.c
-@@ -214,10 +214,11 @@ int read_usb_device(struct udev_device *
- int read_usb_interface(struct usbip_usb_device *udev, int i,
- 		       struct usbip_usb_interface *uinf)
- {
--	char busid[SYSFS_BUS_ID_SIZE];
-+	char busid[SYSFS_BUS_ID_SIZE*2];
- 	struct udev_device *sif;
- 
--	sprintf(busid, "%s:%d.%d", udev->busid, udev->bConfigurationValue, i);
-+	snprintf(busid,SYSFS_BUS_ID_SIZE*2, "%s:%d.%d", udev->busid, udev->bConfigurationValue, i);
-+	busid[SYSFS_BUS_ID_SIZE-1] = 0;
- 
- 	sif = udev_device_new_from_subsystem_sysname(udev_context, "usb", busid);
- 	if (!sif) {
-Index: linux-4.9-4.9.51/tools/usb/usbip/libsrc/usbip_host_common.c
-===================================================================
---- linux-4.9-4.9.51.orig/tools/usb/usbip/libsrc/usbip_host_common.c
-+++ linux-4.9-4.9.51/tools/usb/usbip/libsrc/usbip_host_common.c
+diff --git a/tools/usb/usbip/libsrc/usbip_host_common.c b/tools/usb/usbip/libsrc/usbip_host_common.c
+index 6ff7b601f854..7cc43384f4d1 100644
+--- a/tools/usb/usbip/libsrc/usbip_host_common.c
++++ b/tools/usb/usbip/libsrc/usbip_host_common.c
 @@ -21,6 +21,9 @@
   * along with this program. If not, see <http://www.gnu.org/licenses/>.
   */
@@ -34,17 +19,3 @@ Index: linux-4.9-4.9.51/tools/usb/usbip/libsrc/usbip_host_common.c
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <fcntl.h>
-Index: linux-4.9-4.9.51/tools/usb/usbip/src/usbip.c
-===================================================================
---- linux-4.9-4.9.51.orig/tools/usb/usbip/src/usbip.c
-+++ linux-4.9-4.9.51/tools/usb/usbip/src/usbip.c
-@@ -176,6 +176,9 @@ int main(int argc, char *argv[])
- 			break;
- 		case '?':
- 			printf("usbip: invalid option\n");
-+			usbip_usage();
-+			goto out;
-+			break;
- 		default:
- 			usbip_usage();
- 			goto out;