Hello community,
here is the log from the commit of package usbutils for openSUSE:Factory
checked in at Fri Oct 1 23:56:58 CEST 2010.
--------
--- usbutils/usbutils.changes 2009-07-05 15:07:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/usbutils/usbutils.changes 2010-09-29 00:13:06.000000000 +0200
@@ -0,0 +1,15 @@
+-------------------------------------------------------------------
+Wed Sep 29 00:12:12 CEST 2010 - ro@suse.de
+
+- add current file usb.ids as created by included script
+ update-usbids.sh
+
+-------------------------------------------------------------------
+Wed Sep 29 00:05:01 CEST 2010 - ro@suse.de
+
+- update to 0.86
+ - HID device robust fix
+ - usb-devices bugfixes
+ - usb.ids updated
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
usbutils-0.84.tar.bz2
New:
----
usb.ids
usbutils-0.86.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ usbutils.spec ++++++
--- /var/tmp/diff_new_pack.dCqTW8/_old 2010-10-01 23:56:41.000000000 +0200
+++ /var/tmp/diff_new_pack.dCqTW8/_new 2010-10-01 23:56:41.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package usbutils (Version 0.84)
+# spec file for package usbutils (Version 0.86)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,14 +21,15 @@
Name: usbutils
BuildRequires: libusb-compat-devel pkg-config
Url: http://sourceforge.net/projects/linux-usb/
-Version: 0.84
+Version: 0.86
Release: 1
-License: GPL v2 or later
+License: GPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Tools and libraries for USB devices
Group: Hardware/Other
Source0: usbutils-%{version}.tar.bz2
Source1: usbutils-rpmlintrc
+Source2: usb.ids
%description
This package contains a utility for inspecting devices connected to USB
@@ -36,6 +37,7 @@
%prep
%setup -q
+cp %{S:2} usb.ids
%build
%configure \
@@ -47,16 +49,16 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
-mkdir $RPM_BUILD_ROOT%{_prefix}/bin
ln -sv ../sbin/lsusb $RPM_BUILD_ROOT%{_prefix}/bin/lsusb
%files
%defattr(0644, root, root, 0755)
+%attr(0644, root, root) %{_mandir}/man1/*
%attr(0644, root, root) %{_mandir}/man8/*
%attr(0755, root, root) %{_prefix}/bin/*
%attr(0755, root, root) %{_prefix}/sbin/*
%{_datadir}/usb.ids
-%{_libdir}/pkgconfig/usbutils.pc
+%{_datadir}/pkgconfig/usbutils.pc
%doc AUTHORS ChangeLog
%changelog
++++++ usb.ids ++++++
++++ 15789 lines (skipped)
++++++ usbutils-0.84.tar.bz2 -> usbutils-0.86.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/Makefile.am new/usbutils-0.86/Makefile.am
--- old/usbutils-0.84/Makefile.am 2009-06-25 18:40:59.000000000 +0200
+++ new/usbutils-0.86/Makefile.am 2009-08-18 00:23:35.000000000 +0200
@@ -11,7 +11,9 @@
lsusb
sbin_SCRIPTS = \
- update-usbids.sh \
+ update-usbids.sh
+
+bin_SCRIPTS = \
usb-devices
lsusb_SOURCES = \
@@ -31,13 +33,13 @@
man_MANS = \
lsusb.8 \
- usb-devices.8
+ usb-devices.1
EXTRA_DIST = \
usb.ids \
update-usbids.sh.in \
lsusb.8.in \
- usb-devices.8.in \
+ usb-devices.1.in \
usb-devices \
usbutils.pc.in
@@ -49,12 +51,12 @@
chmod 755 $@
lsusb.8: $(srcdir)/lsusb.8.in
- sed 's|@usbids@|$(datadir)/usb.ids|g' $< >$@
+ sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
-usb-devices.8: $(srcdir)/usb-devices.8.in
+usb-devices.1: $(srcdir)/usb-devices.1.in
sed 's|VERSION|$(VERSION)|g' $< >$@
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = usbutils.pc
usbutils.pc: $(srcdir)/usbutils.pc.in
@@ -63,7 +65,7 @@
DISTCLEANFILES = \
usb.ids.gz \
lsusb.8 \
- usb-devices.8 \
+ usb-devices.1 \
update-usbids.sh \
usbutils.pc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/Makefile.in new/usbutils-0.86/Makefile.in
--- old/usbutils-0.84/Makefile.in 2009-06-25 19:08:44.000000000 +0200
+++ new/usbutils-0.86/Makefile.in 2009-08-18 00:29:58.000000000 +0200
@@ -48,7 +48,8 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sbindir)" \
+am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \
+ "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" \
"$(DESTDIR)$(man8dir)" "$(DESTDIR)$(datadir)" \
"$(DESTDIR)$(pkgconfigdir)"
sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -59,8 +60,9 @@
lsusb_OBJECTS = $(am_lsusb_OBJECTS)
am__DEPENDENCIES_1 =
lsusb_DEPENDENCIES = $(am__DEPENDENCIES_1)
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(sbin_SCRIPTS)
+SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS)
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -70,6 +72,7 @@
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(lsusb_SOURCES)
DIST_SOURCES = $(lsusb_SOURCES)
+man1dir = $(mandir)/man1
man8dir = $(mandir)/man8
NROFF = nroff
MANS = $(man_MANS)
@@ -188,7 +191,9 @@
data_DATA = usb.ids $(am__append_1)
sbin_SCRIPTS = \
- update-usbids.sh \
+ update-usbids.sh
+
+bin_SCRIPTS = \
usb-devices
lsusb_SOURCES = \
@@ -208,22 +213,22 @@
man_MANS = \
lsusb.8 \
- usb-devices.8
+ usb-devices.1
EXTRA_DIST = \
usb.ids \
update-usbids.sh.in \
lsusb.8.in \
- usb-devices.8.in \
+ usb-devices.1.in \
usb-devices \
usbutils.pc.in
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = usbutils.pc
DISTCLEANFILES = \
usb.ids.gz \
lsusb.8 \
- usb-devices.8 \
+ usb-devices.1 \
update-usbids.sh \
usbutils.pc
@@ -308,6 +313,25 @@
lsusb$(EXEEXT): $(lsusb_OBJECTS) $(lsusb_DEPENDENCIES)
@rm -f lsusb$(EXEEXT)
$(LINK) $(lsusb_OBJECTS) $(lsusb_LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+ $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-binSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ done
install-sbinSCRIPTS: $(sbin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
@@ -423,6 +447,51 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='usbmisc.c' object='lsusb-usbmisc.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lsusb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lsusb-usbmisc.obj `if test -f 'usbmisc.c'; then $(CYGPATH_W) 'usbmisc.c'; else $(CYGPATH_W) '$(srcdir)/usbmisc.c'; fi`
+install-man1: $(man1_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.1*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ if test -f $$i; then file=$$i; \
+ else file=$(srcdir)/$$i; fi; \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 1*) ;; \
+ *) ext='1' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+ done
+uninstall-man1:
+ @$(NORMAL_UNINSTALL)
+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+ case "$$i" in \
+ *.1*) list="$$list $$i" ;; \
+ esac; \
+ done; \
+ for i in $$list; do \
+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+ case "$$ext" in \
+ 1*) ;; \
+ *) ext='1' ;; \
+ esac; \
+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+ done
install-man8: $(man8_MANS) $(man_MANS)
@$(NORMAL_INSTALL)
test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
@@ -691,7 +760,7 @@
check: check-am
all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h
installdirs:
- for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(pkgconfigdir)"; do \
+ for dir in "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(pkgconfigdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -744,13 +813,14 @@
install-dvi: install-dvi-am
-install-exec-am: install-sbinPROGRAMS install-sbinSCRIPTS
+install-exec-am: install-binSCRIPTS install-sbinPROGRAMS \
+ install-sbinSCRIPTS
install-html: install-html-am
install-info: install-info-am
-install-man: install-man8
+install-man: install-man1 install-man8
install-pdf: install-pdf-am
@@ -777,10 +847,11 @@
ps-am:
-uninstall-am: uninstall-dataDATA uninstall-man uninstall-pkgconfigDATA \
- uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS
+uninstall-am: uninstall-binSCRIPTS uninstall-dataDATA uninstall-man \
+ uninstall-pkgconfigDATA uninstall-sbinPROGRAMS \
+ uninstall-sbinSCRIPTS
-uninstall-man: uninstall-man8
+uninstall-man: uninstall-man1 uninstall-man8
.MAKE: install-am install-strip
@@ -790,16 +861,17 @@
distcheck distclean distclean-compile distclean-generic \
distclean-hdr distclean-local distclean-tags distcleancheck \
distdir distuninstallcheck dvi dvi-am html html-am info \
- info-am install install-am install-data install-data-am \
- install-dataDATA install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-man8 install-pdf \
- install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
- install-sbinPROGRAMS install-sbinSCRIPTS install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-dataDATA uninstall-man uninstall-man8 \
+ info-am install install-am install-binSCRIPTS install-data \
+ install-data-am install-dataDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-man1 \
+ install-man8 install-pdf install-pdf-am install-pkgconfigDATA \
+ install-ps install-ps-am install-sbinPROGRAMS \
+ install-sbinSCRIPTS install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+ ps ps-am tags uninstall uninstall-am uninstall-binSCRIPTS \
+ uninstall-dataDATA uninstall-man uninstall-man1 uninstall-man8 \
uninstall-pkgconfigDATA uninstall-sbinPROGRAMS \
uninstall-sbinSCRIPTS
@@ -812,9 +884,9 @@
chmod 755 $@
lsusb.8: $(srcdir)/lsusb.8.in
- sed 's|@usbids@|$(datadir)/usb.ids|g' $< >$@
+ sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
-usb-devices.8: $(srcdir)/usb-devices.8.in
+usb-devices.1: $(srcdir)/usb-devices.1.in
sed 's|VERSION|$(VERSION)|g' $< >$@
usbutils.pc: $(srcdir)/usbutils.pc.in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/NEWS new/usbutils-0.86/NEWS
--- old/usbutils-0.84/NEWS 2009-06-25 19:08:35.000000000 +0200
+++ new/usbutils-0.86/NEWS 2009-08-18 00:29:42.000000000 +0200
@@ -1,3 +1,12 @@
+usbutils 0.86
+=============
+HID device robust fix
+
+usbutils 0.85
+=============
+usb-devices bugfixes
+build fixes
+
usbutils 0.84
=============
Sync up usb.ids file from upstream
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/configure new/usbutils-0.86/configure
--- old/usbutils-0.84/configure 2009-06-25 19:08:44.000000000 +0200
+++ new/usbutils-0.86/configure 2009-08-18 00:29:58.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for usbutils 0.84.
+# Generated by GNU Autoconf 2.63 for usbutils 0.86.
#
# Report bugs to .
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='usbutils'
PACKAGE_TARNAME='usbutils'
-PACKAGE_VERSION='0.84'
-PACKAGE_STRING='usbutils 0.84'
+PACKAGE_VERSION='0.86'
+PACKAGE_STRING='usbutils 0.86'
PACKAGE_BUGREPORT='linux-usb@vger.kernel.org'
ac_default_prefix=/usr
@@ -1294,7 +1294,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures usbutils 0.84 to adapt to many kinds of systems.
+\`configure' configures usbutils 0.86 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1360,7 +1360,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of usbutils 0.84:";;
+ short | recursive ) echo "Configuration of usbutils 0.86:";;
esac
cat <<\_ACEOF
@@ -1453,7 +1453,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-usbutils configure 0.84
+usbutils configure 0.86
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1467,7 +1467,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by usbutils $as_me 0.84, which was
+It was created by usbutils $as_me 0.86, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2184,7 +2184,7 @@
# Define the identity of the package.
PACKAGE='usbutils'
- VERSION='0.84'
+ VERSION='0.86'
cat >>confdefs.h <<_ACEOF
@@ -2328,6 +2328,7 @@
+
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -5417,7 +5418,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by usbutils $as_me 0.84, which was
+This file was extended by usbutils $as_me 0.86, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5480,7 +5481,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-usbutils config.status 0.84
+usbutils config.status 0.86
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/configure.ac new/usbutils-0.86/configure.ac
--- old/usbutils-0.84/configure.ac 2009-06-25 19:07:47.000000000 +0200
+++ new/usbutils-0.86/configure.ac 2009-08-18 00:29:52.000000000 +0200
@@ -1,8 +1,9 @@
AC_INIT([usbutils],
- [0.84],
+ [0.86],
[linux-usb@vger.kernel.org])
AC_PREREQ(2.60)
AM_INIT_AUTOMAKE([check-news foreign 1.9 dist-bzip2])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_PREFIX_DEFAULT([/usr])
AC_USE_SYSTEM_EXTENSIONS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/lsusb.8.in new/usbutils-0.86/lsusb.8.in
--- old/usbutils-0.84/lsusb.8.in 2009-05-07 00:08:25.000000000 +0200
+++ new/usbutils-0.86/lsusb.8.in 2009-06-25 23:21:48.000000000 +0200
@@ -1,4 +1,4 @@
-.TH lsusb 8 "25 January 2005" "usbutils-0.73" "Linux USB Utilities"
+.TH lsusb 8 "6 May 2009" "usbutils-VERSION" "Linux USB Utilities"
.IX lsusb
.SH NAME
lsusb \- list USB devices
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/lsusb.c new/usbutils-0.86/lsusb.c
--- old/usbutils-0.84/lsusb.c 2009-06-24 01:06:06.000000000 +0200
+++ new/usbutils-0.86/lsusb.c 2009-08-18 00:28:42.000000000 +0200
@@ -2247,15 +2247,23 @@
continue;
}
if (usb_claim_interface(dev, interface->bInterfaceNumber) == 0) {
- if ((n = usb_control_msg(dev,
+ int retries = 4;
+ n = 0;
+ while (n < len && retries--)
+ n = usb_control_msg(dev,
USB_ENDPOINT_IN | USB_TYPE_STANDARD
| USB_RECIP_INTERFACE,
USB_REQ_GET_DESCRIPTOR,
(USB_DT_REPORT << 8),
interface->bInterfaceNumber,
dbuf, len,
- CTRL_TIMEOUT)) > 0)
+ CTRL_TIMEOUT);
+
+ if (n > 0) {
+ if (n < len)
+ printf(" Warning: incomplete report descriptor\n");
dump_report_desc(dbuf, n);
+ }
usb_release_interface(dev, interface->bInterfaceNumber);
} else {
/* recent Linuxes require claim() for RECIP_INTERFACE,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/usb-devices new/usbutils-0.86/usb-devices
--- old/usbutils-0.84/usb-devices 2009-06-25 18:01:46.000000000 +0200
+++ new/usbutils-0.86/usb-devices 2009-08-18 00:20:58.000000000 +0200
@@ -24,14 +24,14 @@
"01") echo "audio" ;;
"02") echo "commc" ;;
"03") echo "HID " ;;
- "05") echo "phys " ;;
- "06") echo "image" ;;
+ "05") echo "PID " ;;
+ "06") echo "still" ;;
"07") echo "print" ;;
- "08") echo "mstor" ;;
+ "08") echo "stor." ;;
"09") echo "hub " ;;
- "0a") echo "comdt" ;;
- "0b") echo "smcrd" ;;
- "0d") echo "cosec" ;;
+ "0a") echo "data " ;;
+ "0b") echo "scard" ;;
+ "0d") echo "c-sec" ;;
"0e") echo "video" ;;
"0f") echo "perhc" ;;
"dc") echo "diagd" ;;
@@ -125,7 +125,7 @@
prodid=`cat idProduct`
revmajor=`cat bcdDevice | cut -c 1-2`
revminor=`cat bcdDevice | cut -c 3-4`
- printf "P: Vendor=%s ProdID=%s Rev=%2i.%02i\n" \
+ printf "P: Vendor=%s ProdID=%s Rev=%s.%s\n" \
$vendid $prodid $revmajor $revminor
print_string manufacturer "Manufacturer"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/usb-devices.1.in new/usbutils-0.86/usb-devices.1.in
--- old/usbutils-0.84/usb-devices.1.in 1970-01-01 01:00:00.000000000 +0100
+++ new/usbutils-0.86/usb-devices.1.in 2009-08-18 00:19:50.000000000 +0200
@@ -0,0 +1,51 @@
+.TH usb-devices 1 "23 June 2009" "usbutils-VERSION" "Linux USB Utilities"
+.IX usb-devices
+.SH NAME
+usb-devices \- print USB device details
+.SH SYNOPSIS
+.B usb-devices
+
+.SH DESCRIPTION
+.B usb-devices
+is a (bash) shell script that can be used to display details of USB
+buses in the system and the devices connected to them.
+
+The output of the script is similar to the \fIusb/devices\fP file
+available either under \fI/proc/bus\fP (if usbfs is mounted), or under
+\fI/sys/kernel/debug\fP (if debugfs is mounted there). The script is
+primairily intended to be used if the file is not available.
+
+In contrast to the \fIusb/devices\fP file, this script only lists
+\fIactive\fP interfaces (those marked with a "*" in the \fIusb/devices\fP
+file) and their endpoints.
+
+Be advised that there can be differences in the way information is sorted,
+as well as in the format of the output.
+
+.SH RETURN VALUE
+If sysfs is not mounted, a non-zero exit code is returned.
+
+.SH FILES
+.TP
+.B /sys/bus/usb/devices/usb*
+The part of the sysfs tree the script walks through to assemble the
+printed information.
+.TP
+.B /proc/bus/usb/devices
+Location where the \fIusb/devices\fP file can normally be found for
+Linux kernels before 2.6.31, if usbfs is mounted.
+.TP
+.B /sys/kernel/debug/usb/devices
+Location where the \fIusb/devices\fP file can normally be found for
+Linux kernel 2.6.31 and later, if debugfs is mounted.
+
+.SH SEE ALSO
+.BR lsusb (8),
+.BR usbview (8).
+
+.SH AUTHORS
+Greg Kroah-Hartman
+.P
+Randy Dunlap
+.P
+Frans Pop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/usb-devices.8.in new/usbutils-0.86/usb-devices.8.in
--- old/usbutils-0.84/usb-devices.8.in 2009-06-25 18:13:22.000000000 +0200
+++ new/usbutils-0.86/usb-devices.8.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,51 +0,0 @@
-.TH usb-devices 8 "23 June 2009" "usbutils-VERSION" "Linux USB Utilities"
-.IX usb-devices
-.SH NAME
-usb-devices \- print USB device details
-.SH SYNOPSIS
-.B usb-devices
-
-.SH DESCRIPTION
-.B usb-devices
-is a (bash) shell script that can be used to display details of USB
-buses in the system and the devices connected to them.
-
-The output of the script is similar to the \fIusb/devices\fP file
-available either under \fI/proc/bus\fP (if usbfs is mounted), or under
-\fI/sys/kernel/debug\fP (if debugfs is mounted there). The script is
-primairily intended to be used if the file is not available.
-
-In contrast to the \fIusb/devices\fP file, this script only lists
-\fIactive\fP interfaces (those marked with a "*" in the \fIusb/devices\fP
-file) and their endpoints.
-
-Be advised that there can be differences in the way information is sorted,
-as well as in the format of the output.
-
-.SH RETURN VALUE
-If sysfs is not mounted, a non-zero exit code is returned.
-
-.SH FILES
-.TP
-.B /sys/bus/usb/devices/usb*
-The part of the sysfs tree the script walks through to assemble the
-printed information.
-.TP
-.B /proc/bus/usb/devices
-Location where the \fIusb/devices\fP file can normally be found for
-Linux kernels before 2.6.31, if usbfs is mounted.
-.TP
-.B /sys/kernel/debug/usb/devices
-Location where the \fIusb/devices\fP file can normally be found for
-Linux kernel 2.6.31 and later, if debugfs is mounted.
-
-.SH SEE ALSO
-.BR lsusb (8),
-.BR usbview (8).
-
-.SH AUTHORS
-Greg Kroah-Hartman
-.P
-Randy Dunlap
-.P
-Frans Pop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usbutils-0.84/usb.ids new/usbutils-0.86/usb.ids
--- old/usbutils-0.84/usb.ids 2009-06-25 19:03:12.000000000 +0200
+++ new/usbutils-0.86/usb.ids 2009-06-26 00:41:25.000000000 +0200
@@ -22,11 +22,11 @@
0003 Club Mac
0004 Nebraska Furniture Mart
0053 Planex
- 5301 GW-US54ZGL 802.11bg (zd1211rw)
+ 5301 GW-US54ZGL 802.11bg
0079 DragonRise Inc.
0006 Generic USB Joystick
0105 Unknown
- 145f 802.11bg (zd1211rw)
+ 145f 802.11bg
0145 Unknown
0112 Card Reader
0204 Chipsbank Microelectronics Co., Ltd
@@ -856,7 +856,7 @@
00cb WLI-U2-G300N 802.11n Adapter
00d8 WLI-U2-SG54HP
00d9 WLI-U2-G54HP
- 00da WLI-U2-KG54L 802.11bg (zd1211rw)
+ 00da WLI-U2-KG54L 802.11bg
0412 Award Software International
0413 Leadtek Research, Inc.
1310 WinFast TV - NTSC + FM
@@ -2165,8 +2165,8 @@
1230 Wireless Adapter 11g
1232 SNU6500 Wireless Adapter
1233 Wireless Adapter Bootloader Download
- 1236 SNU5600 802.11bg (zd1211rw)
- 1237 TalkTalk SNU5630NS/05 802.11bg (zd1211rw)
+ 1236 SNU5600 802.11bg
+ 1237 TalkTalk SNU5630NS/05 802.11bg
1552 ISP 1581 Hi-Speed USB MPEG2 Encoder Reference Kit
1801 Diva MP3 player
200a Wireless Network Adapter
@@ -3216,7 +3216,7 @@
0930 ETG-US2
0937 WN-WAG/USL Wireless LAN Adapter
0938 WN-G54/USL Wireless LAN Adapter
- 093f WNGDNUS2 802.11n (ar9170)
+ 093f WNGDNUS2 802.11n
0a03 Serial USB-RSAQ1
0a07 USB2-iCN Adapter
0a08 USB2-iCN Adapter
@@ -4057,12 +4057,12 @@
3201 F1DF102U/F1DG102U Flip KVM
4050 ZD1211B
5055 F5D5055
- 6051 802.11b (zd1201)
+ 6051 802.11b
7050 F5D7050 ver 1000 WiFi
7051 F5D7051 54g USB Network Adapter
705a F5D7050A Wireless Adapter
705b Wireless G Adapter
- 705c 802.11bg (zd1211rw)
+ 705c 802.11bg
905b F5D9050 ver 3 Wireless Adapter
905c Wireless G Plus MIMO Network Adapter
050e Neon Technology, Inc.
@@ -4841,16 +4841,16 @@
3304 LAN Modem
330a ADSL Modem Interface
330e USB Broadband ADSL Modem Rev 1.10
- 3400 802.11b (zd1201)
- 3401 ZyAIR G-220 802.11bg (zd1211rw)
- 3402 ZyAIR G-220F 802.11bg (zd1211rw)
- 3407 G-200 v2 802.11bg (zd1211rw)
- 3409 AG-225H 802.11bg (zd1211rw)
- 340a M-202 802.11bg (zd1211rw)
- 340f G-220 v2 802.11bg (zd1211rw)
- 3410 ZyAIR G-202 802.11bg (zd1211rw)
- 3412 802.11bg (zd1211rw)
- 3413 ZyAIR AG-225H v2 802.11bg (zd1211rw)
+ 3400 802.11b
+ 3401 ZyAIR G-220 802.11bg
+ 3402 ZyAIR G-220F 802.11bg
+ 3407 G-200 v2 802.11bg
+ 3409 AG-225H 802.11bg
+ 340a M-202 802.11bg
+ 340f G-220 v2 802.11bg
+ 3410 ZyAIR G-202 802.11bg
+ 3412 802.11bg
+ 3413 ZyAIR AG-225H v2 802.11bg
3415 G-210H 802.11g Wireless Adapter
3416 NWD-210N 802.11b/g/n-draft wireless adapter
0587 America Kotobuki Electronics Industries, Inc.
@@ -6783,13 +6783,13 @@
0030 Mobile Communication Device
0042 Mobile
# 2 Mobile Video Pseudo CDC Trace
- 004a XG-760A 802.11bg (zd1211rw)
+ 004a XG-760A 802.11bg
004b Wi-Fi 11g adapter
0056 Agfa AP1100 Photo Printer
005d Mobile Mass Storage
# 1 Mobile Mass Storage Pseudo CDC Trace
# 2 Mobile Mass Storage Pseudo CDC Chimera
- 0062 XG-76NA 802.11bg (zd1211rw)
+ 0062 XG-76NA 802.11bg
079d Alfadata Computer Corp.
0201 GamePort Adapter
07a1 Digicom S.p.A.
@@ -6908,8 +6908,8 @@
4102 USB 1.1 10/100M Fast Ethernet Adapter
4104 XX9
420a UF200 Ethernet
- 6001 802.11bg (zd1211rw)
- 5301 GW-US54ZGL 802.11bg (zd1211rw)
+ 6001 802.11bg
+ 5301 GW-US54ZGL 802.11bg
a001 Wireless Network Adapter
abc1 DU-E10 Ethernet [pegasus]
b000 BWU613
@@ -7101,7 +7101,7 @@
3b01 AirPlus G DWL-G122 Wireless Adapter
3b10 RangeBooster N Adapter
3b11 Wireless N Adapter DWA-130
- 3c10 DWA 160A 802.11n (ar9170)
+ 3c10 DWA 160A 802.11n
3c03 DWL-G122 802.11g Adapter [ralink rt73]
3c04 WUA-1340
3c05 EH103 Wireless G Adapter
@@ -7145,7 +7145,7 @@
07fa Draytek
0778 miniVigor 128 ISDN TA
1012 BeWAN ADSL USB ST (grey)
- 1196 BWIFI-USB54AR 802.11bg (zd1211rw)
+ 1196 BWIFI-USB54AR 802.11bg
a904 BeWAN ADSL
a905 BeWAN ADSL ST
07fd Mark of the Unicorn
@@ -7275,7 +7275,7 @@
3502 WN3501D Wireless Adapter
3503 T-Sinus 111 Wireless Adapter
4501 T-Sinus 154data
- 4505 SMCWUSB-G 802.11bg (zd1211rw)
+ 4505 SMCWUSB-G 802.11bg
5046 SpeedStream 10/100 Ethernet [pegasus]
5501 Wireless Adapter 11g
6500 Cable Modem
@@ -7289,10 +7289,10 @@
c501 Zoom Wireless-G
c561 802.11a/g Wireless Adapter
e501 ZD1211B
- e506 WUS-201 802.11bg (zd1211rw)
+ e506 WUS-201 802.11bg
f501 802.11g Wireless Adapter
f502 802.11g Wireless Adapter
- f522 Arcadyan WN7512 802.11n (ar9170)
+ f522 Arcadyan WN7512 802.11n
083f Global Village
b100 TelePort V.90 Fax/Modem
0840 Argosy Research, Inc.
@@ -7317,8 +7317,8 @@
6a00 WG111v2 54 Mbps Wireless [RealTek RTL8187L]
7100 WN121T RangeMax Next Wireless-N [Marvell TopDog]
9000 WN111(v1) RangeMax Next Wireless [Marvell TopDog]
- 9001 WN111 v2 802.11n (ar9170)
- 9010 WNDA3100 802.11n (ar9170)
+ 9001 WN111 v2 802.11n
+ 9010 WNDA3100 802.11n
a001 PA101 10 Mbps HPNA Home Phoneline RJ-1
084d Minton Optic Industry Co., Inc.
0001 Jenoptik JD800i
@@ -8395,16 +8395,16 @@
0acd ID Tech
0401 ID TECH Spectrum III Hybrid Smartcard Reader
0ace ZyDAS
- 1201 802.11b (zd1201)
- 1211 802.11bg (zd1211rw)
- 1215 WLA-54L 802.11bg (zd1211rw)
- 1221 ZD1221 802.11n (ar9170)
+ 1201 802.11b
+ 1211 802.11bg
+ 1215 WLA-54L 802.11bg
+ 1221 ZD1221 802.11n
1602 ZyXEL Omni FaxModem 56K
1608 ZyXEL Omni FaxModem 56K UNO
1611 ZyXEL Omni FaxModem 56K Plus
- 2011 Virtual media for 802.11bg (zd1211rw)
- 20ff Virtual media for 802.11bg (zd1211rw)
- b215 802.11bg (zd1211rw)
+ 2011 Virtual media for 802.11bg
+ 20ff Virtual media for 802.11bg
+ b215 802.11bg
0acf Intoto, Inc.
0ad0 Intellix Corp.
0ad1 Remotec Technology, Ltd
@@ -8462,12 +8462,12 @@
1707 WL-167g Wireless Adapter
1708 Mass Storage Device
170b Mass Storage Device
- 170c WL-159g 802.11bg (zd1211rw)
+ 170c WL-159g 802.11bg
170d 802.11b/g Wireless Network Adapter
1712 BT-183 Bluetooth 2.0+EDR adapter
1715 2045 Bluetooth 2.0 Device with trace filter
1716 Bluetooth Device
- 171b A9T wireless 802.11bg (zd1211rw)
+ 171b A9T wireless 802.11bg
171c 802.11b/g Wireless Network Adapter
1723 WL-167G v2 802.11g Adapter [ralink]
1724 RT2573
@@ -8517,8 +8517,8 @@
1612 AIR.Mate 2@net 802.11b Adapter
1613 802.11b Wireless LAN Adapter
1620 Allnet USB 2.0 Wireless Network Adapter
- 1630 QuickWLAN 802.11bg (zd1211rw)
- 5630 802.11bg (zd1211rw)
+ 1630 QuickWLAN 802.11bg
+ 5630 802.11bg
6630 ZD1211
0b3c Olivetti Techcenter
a010 Simple_Way Printer/Scanner/Copier
@@ -8626,7 +8626,7 @@
00fb SureConnect ADSL Ethernet/USB Router
0118 U5 802.11g Adapter
011b Wireless MAXg Adapter
- 0121 USR5423 802.11bg (zd1211rw)
+ 0121 USR5423 802.11bg
6112 FaxModem Model 5633
0bb0 Concord Camera Corp.
0100 Sound Vision Stream
@@ -9256,12 +9256,12 @@
0015 Zoom Wireless-G
0016 NB 802.11g Wireless LAN Adapter(3887A)
0018 NB 802.11a/b/g Wireless LAN Adapter(3887A)
- 001a 802.11bg (zd1211rw)
+ 001a 802.11bg
001c 802.11b/g Wireless Network Adapter
0020 Wi-Fi Wireless LAN Adapter
0022 802.11b/g/n Wireless Network Adapter
- 0023 UB81 802.11bgn (ar9170)
- 0026 UB82 802.11abgn (ar9170)
+ 0023 UB81 802.11bgn
+ 0026 UB82 802.11abgn
0ce9 pico Technology
1001 PicoScope3204
0cf1 e-Conn Electronic Co., Ltd
@@ -9274,7 +9274,7 @@
0005 AR5523
0006 AR5523 (no firmware)
9170 AR9170 802.11n
- 1001 TG121N (ar9170)
+ 1001 TG121N
0cf4 Fomtex Corp.
0cf5 Cellink Co., Ltd
0cf6 Compucable Corp.
@@ -9539,7 +9539,7 @@
5515 MP3 Player
5516 MP3 Player
5581 Mega Sky 5580 DVB-T Tuner
- 6823 802.11b (zd1201)
+ 6823 802.11b
6826 IEEE 802.11g Wireless Network Adapter
6855 Bluetooth Device
6861 MSI-6861 802.11g WiFi adapter
@@ -9657,8 +9657,8 @@
2200 Sitecom bluetooth2.0 class 2 dongle CN-512
2208 Sitecom bluetooth2.0 class 2 dongle CN-520
2209 Sitecom bluetooth2.0 class 1 dongle CN-521
- 9071 802.11bg (zd1211rw)
- 9075 802.11bg (zd1211rw)
+ 9071 802.11bg
+ 9075 802.11bg
90ac WL-172
9712 WL-113 rev 2
0df7 Mobile Action Technology, Inc.
@@ -10094,7 +10094,7 @@
8002 GN-BR402W
8003 GN-WLBM101
8004 GN-WLBZ101 802.11b Adapter
- 8005 802.11b (zd1201)
+ 8005 802.11b
8006 GN-WBZB-M 802.11b Adapter
8007 GN-WBKG
8008 GN-WB01GS
@@ -10498,7 +10498,7 @@
126f TwinMOS
1325 Mobile Disk
2168 Mobile Disk III
- a006 G240 802.11bg (zd1211rw)
+ a006 G240 802.11bg
1275 Xaxero Marine Software Engineering, Ltd.
0002 WeatherFax 2000 Demodulator
0080 SkyEye Weather Satellite Receiver
@@ -10511,8 +10511,8 @@
2101 104-key keyboard
1294 RISO KAGAKU CORP.
129b CyberTAN Technology
- 1666 TG54USB 802.11bg (zd1211rw)
- 1667 802.11bg (zd1211rw)
+ 1666 TG54USB 802.11bg
+ 1667 802.11bg
12a7 Trendchip Technologies Corp.
12ab Honey Bee Electronic International Ltd.
12ba Licensed by Sony Computer Entertainment America
@@ -10611,10 +10611,10 @@
0011 WUSB54GP v4.0 802.11g Adapter
0018 USB200M 10/100 Ethernet Adapter
001a HU200TS Wireless Adapter
- 001e WUSBF54G 802.11bg (zd1211rw)
+ 001e WUSBF54G 802.11bg
0020 WUSB54GC 802.11g Adapter [ralink rt73]
0023 WUSB54GR
- 0024 WUSBF54G v1.1 802.11bg (zd1211rw)
+ 0024 WUSBF54G v1.1 802.11bg
13b3 Nippon Dics Co., Ltd.
13ba Unknown
0017 PS/2 Keyboard+Mouse Adapter
@@ -10693,7 +10693,7 @@
1430 RedOctane
1431 Pertech Resources, Inc.
1435 Wistron NeWeb
- 0711 UR055G 802.11bg (zd1211rw)
+ 0711 UR055G 802.11bg
0826 AR5523
0827 AR5523 (no firmware)
0828 AR5523
@@ -10775,7 +10775,7 @@
14ea Planex Communications
ab10 GW-US54GZ
ab11 GU-1000T
- ab13 GW-US54Mini 802.11bg (zd1211rw)
+ ab13 GW-US54Mini 802.11bg
14ed Shure Inc.
1500 Ellisys
1501 Pine-Tum Enterprise Co., Ltd.
@@ -10826,14 +10826,14 @@
157e TRENDnet
3006 TEW-444UB EU
3007 TEW-444UB EU (no firmware)
- 300a TEW-429UB 802.11bg (zd1211rw)
- 300b TEW-429UB 802.11bg (zd1211rw)
- 300d TEW-429UB C1 802.11bg (zd1211rw)
- 3204 ALL0298 v2 802.11bg (zd1211rw)
+ 300a TEW-429UB 802.11bg
+ 300b TEW-429UB 802.11bg
+ 300d TEW-429UB C1 802.11bg
+ 3204 ALL0298 v2 802.11bg
3205 AR5523
3206 AR5523 (no firmware)
1582 Fiberline
- 6003 WL-430U 802.11bg (zd1211rw)
+ 6003 WL-430U 802.11bg
1587 SMA Technologie AG
158d Oakley Inc.
1598 Kunshan Guoji Electronics Co., Ltd.
@@ -11128,7 +11128,7 @@
1737 Linksys
0039 USB1000
1740 Senao
- 2000 NUB-8301 802.11bg (zd1211rw)
+ 2000 NUB-8301 802.11bg
1743 General Atomics
174c ASMedia Technology Inc.
174f Syntek
@@ -11595,8 +11595,8 @@
f118 Formosa 4
2019 PLANEX
3220 GW-US11S WLAN
- 5303 GW-US54GXS 802.11bg (zd1211rw)
- 5304 GWUS300 802.11n (ar9170)
+ 5303 GW-US54GXS 802.11bg
+ 5304 GWUS300 802.11n
ab01 GW-US54HP
ab50 GW-US54Mini2
c002 GW-US54SG
@@ -12051,7 +12051,7 @@
2667 JCOP BlueZ Smartcard reader
8804 WiseGroup SuperJoy Box 5
6891 3Com
- a727 3CRUSB10075 802.11bg (zd1211rw)
+ a727 3CRUSB10075 802.11bg
6993 Freshtel
b001 FT-102 VoIP USB Phone
6a75 Shanghai Jujo Electronics Co., Ltd
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org