diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-05-24 02:34:08 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-05-24 02:34:08 -0400 |
| commit | 9d10a63402e3c3dcda288b9370d04568dfa20ea6 (patch) | |
| tree | 12705e0e3752f73d309a0387bb75674e83d33062 /gnu/packages/patches | |
| parent | 4935701a4a31212e0cf1b2375832fb7ecd3d8809 (diff) | |
| parent | 11c237f54e4de5916e204aba574ab15f7818a3f5 (diff) | |
| download | guix-9d10a63402e3c3dcda288b9370d04568dfa20ea6.tar guix-9d10a63402e3c3dcda288b9370d04568dfa20ea6.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/libusb-for-axoloti.patch | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gnu/packages/patches/libusb-for-axoloti.patch b/gnu/packages/patches/libusb-for-axoloti.patch index 76a45e801d..fb94c489b0 100644 --- a/gnu/packages/patches/libusb-for-axoloti.patch +++ b/gnu/packages/patches/libusb-for-axoloti.patch @@ -1,8 +1,8 @@ -diff -rpu4 libusb-1.0.22.orig/libusb/descriptor.c libusb-1.0.22/libusb/descriptor.c ---- libusb-1.0.22.orig/libusb/descriptor.c 2018-03-17 08:23:37.000000000 +0100 -+++ libusb-1.0.22/libusb/descriptor.c 2018-03-29 10:36:09.968429473 +0200 -@@ -1173,9 +1173,9 @@ int API_EXPORTED libusb_get_string_descr - if (tbuf[1] != LIBUSB_DT_STRING) +diff --git a/libusb/descriptor.c b/libusb/descriptor.c +index 74d6de5..0b0e314 100644 +--- a/libusb/descriptor.c ++++ b/libusb/descriptor.c +@@ -1174,7 +1174,7 @@ int API_EXPORTED libusb_get_string_descriptor_ascii(libusb_device_handle *dev_ha return LIBUSB_ERROR_IO; if (tbuf[0] > r) @@ -11,4 +11,6 @@ diff -rpu4 libusb-1.0.22.orig/libusb/descriptor.c libusb-1.0.22/libusb/descripto di = 0; for (si = 2; si < tbuf[0]; si += 2) { - if (di >= (length - 1)) +-- +2.17.0 + |