diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 20:44:26 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-08 20:44:26 +0200 |
| commit | 5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3 (patch) | |
| tree | c999ad66361e4c4c5d3ad5443bf575422c41150d /pkgs/os-specific/linux/usbip | |
| parent | ccc8c73ea00321318e9ac2cb75879f57bef328a7 (diff) | |
| parent | e7297363c95415aa2376130583d6c74a85714ab5 (diff) | |
| download | nixpkgs-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar nixpkgs-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.gz nixpkgs-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.bz2 nixpkgs-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.lz nixpkgs-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.xz nixpkgs-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.tar.zst nixpkgs-5f4734b1dd8410d5287fe0f22b9c0f30850a2fc3.zip | |
Merge remote-tracking branch 'upstream/gcc-8' into staging-next
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
Diffstat (limited to 'pkgs/os-specific/linux/usbip')
| -rw-r--r-- | pkgs/os-specific/linux/usbip/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/usbip/fix-snprintf-truncation.patch | 13 |
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 1bb92d7dce1..61f2c454046 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -5,6 +5,11 @@ stdenv.mkDerivation { 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++) { |