summary refs log tree commit diff
path: root/pkgs/os-specific/linux/usbip
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2019-06-17 11:23:19 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2019-06-17 11:24:32 +0200
commit45d6ccea3357c65135b985f2eebf88020ca6461e (patch)
treed0c903b991b33e4b5d2b81f231c5ee4b8a80b7a0 /pkgs/os-specific/linux/usbip
parent84de36a0c8c24eee747f9deaf9687c7b840a4a13 (diff)
downloadnixpkgs-45d6ccea3357c65135b985f2eebf88020ca6461e.tar
nixpkgs-45d6ccea3357c65135b985f2eebf88020ca6461e.tar.gz
nixpkgs-45d6ccea3357c65135b985f2eebf88020ca6461e.tar.bz2
nixpkgs-45d6ccea3357c65135b985f2eebf88020ca6461e.tar.lz
nixpkgs-45d6ccea3357c65135b985f2eebf88020ca6461e.tar.xz
nixpkgs-45d6ccea3357c65135b985f2eebf88020ca6461e.tar.zst
nixpkgs-45d6ccea3357c65135b985f2eebf88020ca6461e.zip
linuxPackages.usbip: fix build with gcc8
Diffstat (limited to 'pkgs/os-specific/linux/usbip')
-rw-r--r--pkgs/os-specific/linux/usbip/default.nix5
-rw-r--r--pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch13
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix
index 497b5c19166..9f8b02c7537 100644
--- a/pkgs/os-specific/linux/usbip/default.nix
+++ b/pkgs/os-specific/linux/usbip/default.nix
@@ -5,6 +5,11 @@ stdenv.mkDerivation rec {
 
   src = kernel.src;
 
+  patches = [
+    # fixes build with gcc8
+    ./fix-snprintf-truncation.patch
+  ];
+
   nativeBuildInputs = [ autoconf automake libtool ];
   buildInputs = [ udev ];
 
diff --git a/pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch b/pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch
new file mode 100644
index 00000000000..63fca9ddbfe
--- /dev/null
+++ b/pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch
@@ -0,0 +1,13 @@
+diff --git a/tools/usb/usbip/libsrc/vhci_driver.c b/tools/usb/usbip/libsrc/vhci_driver.c
+index 8159fd98680b..7d6eb3e3fe1e 100644
+--- a/tools/usb/usbip/libsrc/vhci_driver.c
++++ b/tools/usb/usbip/libsrc/vhci_driver.c
+@@ -111,7 +111,7 @@ static int parse_status(const char *value)
+ static int refresh_imported_device_list(void)
+ {
+ 	const char *attr_status;
+-	char status[MAX_STATUS_NAME+1] = "status";
++	char status[MAX_STATUS_NAME+2] = "status";
+ 	int i, ret;
+ 
+ 	for (i = 0; i < vhci_driver->ncontrollers; i++) {