Hello community, here is the log from the commit of package imx-usb-loader for openSUSE:Factory checked in at 2017-04-29 10:53:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/imx-usb-loader (Old) and /work/SRC/openSUSE:Factory/.imx-usb-loader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "imx-usb-loader" Sat Apr 29 10:53:32 2017 rev:5 rq:491759 version:0.0~git20170410 Changes: -------- --- /work/SRC/openSUSE:Factory/imx-usb-loader/imx-usb-loader.changes 2017-01-17 14:35:15.822794681 +0100 +++ /work/SRC/openSUSE:Factory/.imx-usb-loader.new/imx-usb-loader.changes 2017-04-29 10:54:00.748090183 +0200 @@ -1,0 +2,7 @@ +Fri Apr 28 08:17:39 UTC 2017 - [email protected] + +- Update to git20171004: + * Fix possible overflow (upstreamed fix_strncat_overflow.patch) + * Add i.mx6ull id + +------------------------------------------------------------------- Old: ---- fix_strncat_overflow.patch imx_usb_loader-1482852643.ba6b31c.tar.bz2 New: ---- imx_usb_loader-1491839092.75d8237.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imx-usb-loader.spec ++++++ --- /var/tmp/diff_new_pack.YKT8XS/_old 2017-04-29 10:54:01.571973794 +0200 +++ /var/tmp/diff_new_pack.YKT8XS/_new 2017-04-29 10:54:01.575973230 +0200 @@ -17,17 +17,16 @@ # -%define git_version 1482852643.ba6b31c +%define git_version 1491839092.75d8237 Name: imx-usb-loader -Version: 0.0~git20161227 +Version: 0.0~git20170410 Release: 0 Summary: Vybrid/i.MX recovery utility License: LGPL-2.1+ Group: Hardware/Other Url: https://github.com/boundarydevices/imx_usb_loader Source0: imx_usb_loader-%{git_version}.tar.bz2 -Patch1: fix_strncat_overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libusb-1_0-devel BuildRequires: pkg-config @@ -41,7 +40,6 @@ %prep %setup -q -n imx_usb_loader-%{git_version} -%patch1 %build CFLAGS="$RPM_OPT_FLAGS" \ ++++++ imx_usb_loader-1482852643.ba6b31c.tar.bz2 -> imx_usb_loader-1491839092.75d8237.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imx_usb_loader-1482852643.ba6b31c/README.md new/imx_usb_loader-1491839092.75d8237/README.md --- old/imx_usb_loader-1482852643.ba6b31c/README.md 2016-12-27 16:30:43.000000000 +0100 +++ new/imx_usb_loader-1491839092.75d8237/README.md 2017-04-10 17:44:52.000000000 +0200 @@ -49,6 +49,17 @@ directory. If you use an alternative location or compile libusb from source too, you will have to alter the include/library path in the project settings. +### macOS + +libusb and pkg-config can be installed via Homebrew. + +If imx_usb fails to claim interface, com.apple.driver.usb.IOUSBHostHIDDevice +needs to be unloaded so libusb can claim, run: + +``` +sudo kextunload -b com.apple.driver.usb.IOUSBHostHIDDevice +``` + ## Usage Using USB, your device should be detected automatically using the USB VID/PID from imx_usb.conf. Using UART, the user has to specify a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imx_usb_loader-1482852643.ba6b31c/imx_sdp.c new/imx_usb_loader-1491839092.75d8237/imx_sdp.c --- old/imx_usb_loader-1482852643.ba6b31c/imx_sdp.c 2016-12-27 16:30:43.000000000 +0100 +++ new/imx_usb_loader-1491839092.75d8237/imx_sdp.c 2017-04-10 17:44:52.000000000 +0200 @@ -141,8 +141,8 @@ static char sep = PATH_SEPARATOR; strncpy(conf, conf_path, sizeof(conf)); - strncat(conf, &sep, sizeof(conf)); - strncat(conf, conf_file, sizeof(conf)); + strncat(conf, &sep, sizeof(conf) - strlen(conf) - 1); + strncat(conf, conf_file, sizeof(conf) - strlen(conf) - 1); if (access(conf, R_OK) != -1) { printf("config file <%s>\n", conf); return conf; @@ -728,6 +728,11 @@ return -1; } + if (length == 0) { + printf("No DCD table, skip\n"); + return 0; + } + dl_command.cnt = BE32(length); dcd_end = dcd + length; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imx_usb_loader-1482852643.ba6b31c/imx_usb.conf new/imx_usb_loader-1491839092.75d8237/imx_usb.conf --- old/imx_usb_loader-1482852643.ba6b31c/imx_usb.conf 2016-12-27 16:30:43.000000000 +0100 +++ new/imx_usb_loader-1491839092.75d8237/imx_usb.conf 2017-04-10 17:44:52.000000000 +0200 @@ -7,6 +7,7 @@ 0x15a2:0x0063, mx6_usb_work.conf 0x15a2:0x0071, mx6_usb_work.conf 0x15a2:0x007d, mx6_usb_work.conf +0x15a2:0x0080, mx6_usb_work.conf 0x15a2:0x0076, mx7_usb_work.conf 0x15a2:0x0041, mx51_usb_work.conf 0x15a2:0x004e, mx53_usb_work.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/imx_usb_loader-1482852643.ba6b31c/portable.h new/imx_usb_loader-1491839092.75d8237/portable.h --- old/imx_usb_loader-1482852643.ba6b31c/portable.h 2016-12-27 16:30:43.000000000 +0100 +++ new/imx_usb_loader-1491839092.75d8237/portable.h 2017-04-10 17:44:52.000000000 +0200 @@ -25,6 +25,9 @@ #ifdef __linux__ #include <linux/limits.h> #endif +#ifdef __APPLE__ +#include <sys/syslimits.h> +#endif #ifdef __FreeBSD__ #include <sys/param.h> #endif
