update to new upstream 005
This commit is contained in:
parent
c409919b38
commit
71a2faac06
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ usbutils-0.86.tar.gz
|
||||
/usbutils-001.tar.gz
|
||||
/usbutils-003.tar.gz
|
||||
/usbutils-004.tar.gz
|
||||
/usbutils-005.tar.gz
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
481e1de453bcabbd5f43125bb4df2ab7 usbutils-004.tar.gz
|
||||
2e990265d472e2f6f0662356d654683b usbutils-005.tar.gz
|
||||
|
@ -1,30 +1,30 @@
|
||||
diff --git a/lsusb-t.c b/lsusb-t.c
|
||||
index 5438704..c8ab1b9 100644
|
||||
index a07c902..92a9830 100644
|
||||
--- a/lsusb-t.c
|
||||
+++ b/lsusb-t.c
|
||||
@@ -330,9 +330,7 @@ static void add_usb_interface(const char *d_name)
|
||||
l = snprintf(link, MY_PATH_MAX, "%s/%s/driver", sys_bus_usb_devices, d_name);
|
||||
@@ -335,9 +335,7 @@ static void add_usb_interface(const char *d_name)
|
||||
l = snprintf(driver, MY_PATH_MAX, "%s/%s/driver", sys_bus_usb_devices, d_name);
|
||||
if (l > 0 && l < MY_PATH_MAX) {
|
||||
l = readlink(link, link, MY_PATH_MAX);
|
||||
l = readlink(driver, driver, MY_PATH_MAX);
|
||||
- if (l < 0)
|
||||
- perror(d_name);
|
||||
- else {
|
||||
+ if (l >= 0) {
|
||||
if (l < MY_PATH_MAX - 1)
|
||||
link[l] = '\0';
|
||||
driver[l] = '\0';
|
||||
else
|
||||
@@ -395,9 +393,7 @@ static void add_usb_device(const char *d_name)
|
||||
l = snprintf(link, MY_PATH_MAX, "%s/%s/driver", sys_bus_usb_devices, d_name);
|
||||
@@ -400,9 +398,7 @@ static void add_usb_device(const char *d_name)
|
||||
l = snprintf(driver, MY_PATH_MAX, "%s/%s/driver", sys_bus_usb_devices, d_name);
|
||||
if (l > 0 && l < MY_PATH_MAX) {
|
||||
l = readlink(link, link, MY_PATH_MAX);
|
||||
l = readlink(driver, driver, MY_PATH_MAX);
|
||||
- if (l < 0)
|
||||
- perror(d_name);
|
||||
- else {
|
||||
+ if (l >= 0) {
|
||||
if (l < MY_PATH_MAX - 1)
|
||||
link[l] = '\0';
|
||||
driver[l] = '\0';
|
||||
else
|
||||
@@ -418,9 +414,7 @@ static void get_roothub_driver(struct usbbusnode *b, const char *d_name)
|
||||
@@ -423,9 +419,7 @@ static void get_roothub_driver(struct usbbusnode *b, const char *d_name)
|
||||
l = snprintf(path, MY_PATH_MAX, "%s/%s/../driver", sys_bus_usb_devices, d_name);
|
||||
if (l > 0 && l < MY_PATH_MAX) {
|
||||
l = readlink(path, path, MY_PATH_MAX);
|
||||
|
@ -1,7 +1,7 @@
|
||||
Name: usbutils
|
||||
Version: 004
|
||||
Release: 4%{?dist}
|
||||
Source: http://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.tar.gz
|
||||
Version: 005
|
||||
Release: 1%{?dist}
|
||||
Source: %{name}-%{version}.tar.gz
|
||||
URL: http://www.linux-usb.org/
|
||||
License: GPLv2+
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -25,7 +25,7 @@ USB bus.
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
autoreconf
|
||||
./autogen.sh
|
||||
|
||||
%build
|
||||
%configure --sbindir=%{_sbindir}
|
||||
@ -46,6 +46,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%changelog
|
||||
* Thu Apr 19 2012 Lukas Nykryn <lnykryn@redhat.com> 005-1
|
||||
- new upstream release
|
||||
|
||||
* Thu Apr 19 2012 Lukas Nykryn <lnykryn@redhat.com> 004-4
|
||||
- Ignore missing driver symlink (#808934)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user