diff options
477 files changed, 0 insertions, 77298 deletions
diff --git a/community-testing/aria2/PKGBUILD b/community-testing/aria2/PKGBUILD deleted file mode 100644 index 19a015c8a..000000000 --- a/community-testing/aria2/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=aria2 -pkgver=1.12.1 -pkgrel=2 -pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' -arch=('i686' 'x86_64') -url='http://aria2.sourceforge.net/' -license=('GPL') -depends=('gnutls' 'libxml2' 'sqlite3' 'c-ares' 'ca-certificates') -source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2") -md5sums=('9f3bf96d92bc8b70b74817ed10c2c7e7') - -build() { - cd aria2-${pkgver} - - ./configure \ - --prefix=/usr \ - --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt - - make -} - -package() { - cd aria2-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/ekg2/PKGBUILD b/community-testing/ekg2/PKGBUILD deleted file mode 100644 index 403ec002d..000000000 --- a/community-testing/ekg2/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 53828 2011-08-08 16:55:24Z jelle $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> - -pkgname=ekg2 -pkgver=0.3.1 -pkgrel=1 -pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client" -arch=('i686' 'x86_64') -url="http://ekg2.org/" -license=('GPL') -depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib' 'gpgme') -optdepends=( 'xosd: for xosd support' - 'sqlite3: sqlite support' - 'gtk2: gtk support') -provides=('ekg2-unicode') -source=(http://pl.ekg2.org/ekg2-$pkgver.tar.gz) -md5sums=('652e492fcf72281a42c3e5960347516e') - -build() { - cd $srcdir/$pkgname-$pkgver - sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-libgadu \ - --with-xosd \ - --enable-unicode \ - --enable-shared \ - --without-gpg - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - rm -rf $pkgdir/usr/lib/perl5/core_perl/perllocal.pod - mv $pkgdir/usr/libexec/ioctld $pkgdir/usr/lib/ekg2/ioctld - rm -rf $pkgdir/usr/libexec - chmod -R 755 $pkgdir/usr/lib/perl5 -} -md5sums=('68fc05b432c34622df6561eaabef5a40') diff --git a/community-testing/filezilla/PKGBUILD b/community-testing/filezilla/PKGBUILD deleted file mode 100644 index 73cb4f030..000000000 --- a/community-testing/filezilla/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 53693 2011-08-07 21:01:03Z bluewind $ -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=filezilla -pkgver=3.5.0 -pkgrel=2 -pkgdesc="Fast and reliable FTP, FTPS and SFTP client" -arch=('i686' 'x86_64') -url="http://filezilla-project.org/" -license=('GPL') -depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme' 'sqlite3') -install=filezilla.install -source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2") -md5sums=('25617d75167d07c0d3cfced69a4cf7cc') - -build() { - cd ${pkgname}-${pkgver} - ./autogen.sh - ./configure \ - --prefix=/usr \ - --disable-manualupdatecheck \ - --disable-autoupdatecheck \ - --disable-static \ - --with-tinyxml=builtin - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} -md5sums=('6a83c3afe99c2679d5a3aa73607d80a7') diff --git a/community-testing/filezilla/filezilla.install b/community-testing/filezilla/filezilla.install deleted file mode 100644 index 1a05f573e..000000000 --- a/community-testing/filezilla/filezilla.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/freerdp/PKGBUILD b/community-testing/freerdp/PKGBUILD deleted file mode 100644 index 799008275..000000000 --- a/community-testing/freerdp/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 53713 2011-08-07 21:41:20Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Stijn Segers <francesco dot borromini at gmail dot com> - -pkgname=freerdp -pkgver=0.8.2 -pkgrel=3 -pkgdesc="Free RDP client" -arch=('i686' 'x86_64') -url="http://freerdp.sourceforge.net" -license=('GPL') -depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib') -makedepends=('krb5') -conflicts=('freerdp-git') -changelog=${pkgname}.changelog -options=('!libtool') -source=(http://downloads.sourceforge.net/project/freerdp/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz) -md5sums=('cde590336292c977dfc1b4b7badf24d2') - -build() { - cd `find ${srcdir}/ -type d -name freerdp-\*` - [ -x configure ] || sh ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd `find ${srcdir}/ -type d -name freerdp-\*` - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/freerdp/freerdp.changelog b/community-testing/freerdp/freerdp.changelog deleted file mode 100644 index d47f165c3..000000000 --- a/community-testing/freerdp/freerdp.changelog +++ /dev/null @@ -1,2 +0,0 @@ -0.7.1-1 to 0.7.1-2 -* Added x86_64 to supported architectures (tested by figue). diff --git a/community-testing/gloox/PKGBUILD b/community-testing/gloox/PKGBUILD deleted file mode 100644 index bd6adf0e1..000000000 --- a/community-testing/gloox/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 53716 2011-08-07 21:42:08Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: William Rea <sillywilly@gmail.com> - -pkgname=gloox -pkgver=1.0 -pkgrel=2 -pkgdesc="C++ libraries for development of Jabber client/component/server" -arch=(i686 x86_64) -url="http://camaya.net/gloox" -options=('!libtool') -license=("GPL") -depends=('libidn' 'gnutls') -source=(http://camaya.net/download/gloox-$pkgver.tar.bz2) -md5sums=('f8eacf1c6476e0a309b453fd04f90e31') - -build() { - cd $startdir/src/gloox-$pkgver - ./configure --prefix=/usr - make - make DESTDIR=$startdir/pkg install -} diff --git a/community-testing/gnustep-base/ChangeLog b/community-testing/gnustep-base/ChangeLog deleted file mode 100644 index 590f23f5e..000000000 --- a/community-testing/gnustep-base/ChangeLog +++ /dev/null @@ -1,6 +0,0 @@ -2007-07-24 Snowman <eric@archlinux> - * rebuilt against toolchain in current - * fixed SMP build - * fixed file ownership -2007-06-26 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 diff --git a/community-testing/gnustep-base/PKGBUILD b/community-testing/gnustep-base/PKGBUILD deleted file mode 100644 index d13e1f326..000000000 --- a/community-testing/gnustep-base/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 53739 2011-08-07 22:05:20Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Sebastian Sareyko <public@nooms.de> - -pkgname=gnustep-base -pkgver=1.22.0 -pkgrel=3 -pkgdesc="The GNUstep base package" -arch=('i686' 'x86_64') -url="http://www.gnustep.org/" -license=("GPL" "LGPL") -depends=(libxslt avahi gmp gcc-libs openssl libffi gnustep-make gnutls) -makedepends=(gcc-objc) -conflicts=('gnustep-base-svn') -groups=('gnustep-core') -options=('!emptydirs' '!makeflags') -source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('7faab4891ae6c1e7a6c806d6da368410') - -build() { - cd "$srcdir/$pkgname-$pkgver" - source /etc/profile.d/GNUstep.sh - ./configure --prefix=/usr --sysconfdir=/etc/GNUstep --with-ffi-include=/usr/lib/libffi-3.0.9/include/ - # fix file ownership - sed -i 's/tar -xf $(TIMEZONE_ARCHIVE);/tar -xf $(TIMEZONE_ARCHIVE);chown -R root:root * ;/' NSTimeZones/Makefile.postamble - make VERBOSE=1 -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - chown -R root.root "$pkgdir/" -} diff --git a/community-testing/gsasl/PKGBUILD b/community-testing/gsasl/PKGBUILD deleted file mode 100644 index 735a57862..000000000 --- a/community-testing/gsasl/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 53719 2011-08-07 21:42:52Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Orivej Desh <smpuj@bk.ru> -# Maintainer: Orivej Desh <smpuj@bk.ru> - -pkgname=gsasl -pkgver=1.6.1 -pkgrel=3 -pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms" -arch=("i686" "x86_64") -url="http://josefsson.org/gsasl/" -license=("GPL") -depends=('gnutls' 'libidn' 'krb5' 'libgcrypt') -source=("ftp://ftp.gnu.org/gnu/gsasl/$pkgname-$pkgver.tar.gz") -md5sums=('7ae813eeb1f90ad52e9a781ac9e17f28') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - rm "$pkgdir/usr/share/info/dir" "$pkgdir/usr/lib/libgsasl.la" -} diff --git a/community-testing/gtk-gnutella/PKGBUILD b/community-testing/gtk-gnutella/PKGBUILD deleted file mode 100644 index 1eb8c2b0f..000000000 --- a/community-testing/gtk-gnutella/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 53764 2011-08-08 05:26:47Z ebelanger $ -# Contributor: Dan McGee <dan@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=gtk-gnutella -pkgver=0.97 -pkgrel=2 -pkgdesc="A Gnutella client written in C" -arch=('i686' 'x86_64') -url="http://gtk-gnutella.sourceforge.net/" -license=('GPL') -depends=('gtk2') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('d44e1af3441fb07a5e5712b0d522fae5') -sha1sums=('1b50790adc494d7023a7cf9319d7cdef1c9ab51e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./build.sh --prefix=/usr --gtk2 --disable-dbus -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make install INSTALL_PREFIX="${pkgdir}" -} diff --git a/community-testing/gwenhywfar/PKGBUILD b/community-testing/gwenhywfar/PKGBUILD deleted file mode 100644 index 1512a7eb1..000000000 --- a/community-testing/gwenhywfar/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 53745 2011-08-07 22:06:07Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: William Rea <sillywilly@gmail.com> - -pkgname=gwenhywfar -pkgver=4.2.0 -pkgrel=2 -pkgdesc="OS abstraction functions for various projects" -arch=(i686 x86_64) -url="http://www.aquamaniac.de" -options=('!libtool') -license=("LGPL") -depends=('openssl' 'gnutls') -makedepends=('gtk2' 'qt') -optdepends=('gtk2' 'qt') -source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=62&file=01&dummy=gwenhywfar-$pkgver.tar.gz") -md5sums=('62d15e090a0c21bc9d22489ceaaadfde') - -build() { - pacman -Q gwenhywfar && return 1 - cd $srcdir/gwenhywfar-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --enable-ssl - make - make DESTDIR=$pkgdir install -} diff --git a/community-testing/ifuse/PKGBUILD b/community-testing/ifuse/PKGBUILD deleted file mode 100644 index e85372405..000000000 --- a/community-testing/ifuse/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Gabriel Martinez < reitaka at gmail dot com > - -pkgname=ifuse -pkgver=1.1.1 -pkgrel=4 -pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch' -url='http://libimobiledevice.org/' -arch=('i686' 'x86_64') -license=('LGPL2.1') -depends=('libimobiledevice' 'fuse') -source=("http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8d528a79de024b91f12f8ac67965c37c') - -build() { - cd ${pkgname}-${pkgver} - - ./configure \ - --prefix=/usr - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/jabberd14/PKGBUILD b/community-testing/jabberd14/PKGBUILD deleted file mode 100644 index fccef817a..000000000 --- a/community-testing/jabberd14/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 53845 2011-08-08 21:03:13Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=jabberd14 -pkgver=1.6.1.1 -pkgrel=10 -pkgdesc="old (1.4) jabber server branch" -arch=(i686 x86_64) -url="http://jabberd.org/" -license=("GPL") -depends=(pth libidn expat popt gnutls) -optdepends=(libmysqlclient) -conflicts=(jabberd) -backup=(etc/jabberd/jabber.xml) -options=('!libtool') -source=(http://download.jabberd.org/jabberd14/jabberd14-$pkgver.tar.gz - build-fix.patch - jabberd) -md5sums=('597c7ee14518ba22b1cee883b4737d87' - 'ad795626f26c01700a23515e0e75d654' - '5869169394d70977858320648075c7a6') - -build() { - cd $srcdir/jabberd14-$pkgver - export LDFLAGS="$LDFLAGS -lgcrypt" - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --enable-ssl --enable-legacy --sysconfdir=/etc/jabberd --localstatedir=/var - echo "#undef HAVE_GNUTLS_EXTRA" >>config.h - [ $NOEXTRACT -eq 1 ] || patch -Rp1 <$srcdir/build-fix.patch - make -j1 - make DESTDIR=$pkgdir install - install -D -m 0755 $srcdir/jabberd $pkgdir/etc/rc.d/jabberd - rm -rf $pkgdir/var/run -} diff --git a/community-testing/jabberd14/build-fix.patch b/community-testing/jabberd14/build-fix.patch deleted file mode 100644 index 4f39b523e..000000000 --- a/community-testing/jabberd14/build-fix.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc ---- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc 2011-08-09 00:37:29.000000000 +0400 -+++ jabberd14-1.6.1.1/jabberd/lib/xmlnode.cc 2007-04-07 23:43:18.000000000 +0400 -@@ -910,8 +910,8 @@ - } - - /* separate this step from the next one, and check for a predicate in this step */ -- start_predicate = strchr((char*)path, '['); -- next_step = strchr((char*)path, '/'); -+ start_predicate = strchr(path, '['); -+ next_step = strchr(path, '/'); - if (start_predicate == NULL && next_step == NULL) { - this_step = pstrdup(p, path); - } else if (start_predicate == NULL || start_predicate > next_step && next_step != NULL) { -@@ -1833,8 +1833,7 @@ - if (lang != NULL && strchr(lang, '-') != NULL) { - snprintf(general_lang, sizeof(general_lang), "%s", lang); - if (strchr(lang, '-') != NULL) { -- char *tmp = strchr((char*)lang, '-'); -- tmp[0] = 0; -+ strchr(lang, '-')[0] = 0; - } else { - general_lang[0] = 0; - } -diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/log.cc jabberd14-1.6.1.1/jabberd/log.cc ---- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/log.cc 2011-08-09 00:37:29.000000000 +0400 -+++ jabberd14-1.6.1.1/jabberd/log.cc 2007-07-20 17:56:59.000000000 +0400 -@@ -86,7 +86,7 @@ - char *pos, c = '\0'; - if(zone != NULL && debug__zones != NULL) - { -- pos = strchr((char*)zone,'.'); -+ pos = strchr(zone,'.'); - if(pos != NULL) - { - c = *pos; -diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/mio_tls.cc jabberd14-1.6.1.1/jabberd/mio_tls.cc ---- /mnt/temp/builds/staging-i686/sergej/build/src/jabberd14-1.6.1.1/jabberd/mio_tls.cc 2011-08-09 00:53:55.000000000 +0400 -+++ jabberd14-1.6.1.1/jabberd/mio_tls.cc 2007-07-17 03:20:44.000000000 +0400 -@@ -43,7 +43,6 @@ - #include <vector> - #include <list> - #include <iostream> --#include <gnutls/openpgp.h> - - // Tell gcrypt that we are using libpth - had to move this to a plain C file - extern "C" void mio_tls_gcrypt_init(void); -@@ -613,8 +612,7 @@ - } - - // load OpenPGP key/certificate --// ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile); -- ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile, GNUTLS_OPENPGP_FMT_BASE64); -+ ret = gnutls_certificate_set_openpgp_key_file(current_credentials, pubfile, privfile); - if (ret < 0) { - log_error(NULL, "Error loading OpenPGP key pub=%s/priv=%s: %s", pubfile, privfile, gnutls_strerror(ret)); - continue; -@@ -633,8 +631,7 @@ - } - - // load the OpenPGP keyring --// ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file); -- ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file, GNUTLS_OPENPGP_FMT_BASE64); -+ ret = gnutls_certificate_set_openpgp_keyring_file(current_credentials, file); - if (ret < 0) { - log_error(NULL, "Error loading OpenPGP keyring %s: %s", file, gnutls_strerror(ret)); - continue; -@@ -643,8 +640,6 @@ - continue; - } - -- --/* - // load GnuPG trustdb - if (j_strcmp(xmlnode_get_localname(cur), "trustdb") == 0) { - char const *const file = xmlnode_get_data(cur); -@@ -661,7 +656,6 @@ - continue; - } - } --*/ - - // setup protocols to use - if (j_strcmp(xmlnode_get_localname(cur), "protocols") == 0) { diff --git a/community-testing/jabberd14/jabberd b/community-testing/jabberd14/jabberd deleted file mode 100644 index afbe6ef69..000000000 --- a/community-testing/jabberd14/jabberd +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof /usr/bin/jabberd -} - -case "$1" in - start) - stat_busy "Starting Jabber daemon" - - [ -d /var/run/jabberd ] || mkdir -p /var/run/jabberd - [ -f /var/run/jabberd/jabber.pid ] && rm -f /var/run/jabberd/jabber.pid - PID=`get_pid` - if [ -z "$PID" ]; then - /usr/bin/jabberd -c /etc/jabberd/jabber.xml -B >/dev/null 2>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - sleep 1 # wait on children - echo `get_pid` > /var/run/jabberd/jabberd.pid - add_daemon jabberd - sleep 1 - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping Jabber daemon" - PID=`get_pid` - [ ! -z "$PID" ] && kill $PID &> /dev/null - sleep 2 - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/jabberd/jabberd.pid &> /dev/null - rm_daemon jabberd - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/libinfinity/PKGBUILD b/community-testing/libinfinity/PKGBUILD deleted file mode 100644 index 6f6e5f123..000000000 --- a/community-testing/libinfinity/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 53722 2011-08-07 21:43:34Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Gregory Haynes <greg@greghaynes.net> - -pkgname=libinfinity -pkgver=0.5.1 -pkgrel=2 -pkgdesc="An implementation of the Infininote protocol written in GObject-based C" -arch=('i686' 'x86_64') -url="http://gobby.0x539.de" -license=('GPL') -depends=('gnutls>=1.7.2' 'gsasl>=0.2.21' 'glib2>=2.16' 'libxml2>=2.0' 'gtk2') -makedepends=('gtk-doc' 'pkgconfig') -optdepends=('avahi: zeroconf support' - 'gtk2: gtk support') -options=('!libtool') -source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('85e6d75e101fe25503653d2202054eff') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --localstatedir=/var - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - rm -rf $pkgdir/var -} diff --git a/community-testing/libmicrohttpd/PKGBUILD b/community-testing/libmicrohttpd/PKGBUILD deleted file mode 100644 index 357863f07..000000000 --- a/community-testing/libmicrohttpd/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 53725 2011-08-07 21:44:17Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Norberto Lopes <shelika@mail.telepac.pt> -# Contributor: Kao Dome <kaodome@gmail.com> -# Contributor: Dmitrij D. Czarkoff <czarkoff@gmail.com> -# Contributor: Mathias Rohnstock <linksoft@gmx.de> - -pkgname=libmicrohttpd -pkgver=0.9.12 -pkgrel=2 -pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/libmicrohttpd/" -license=('LGPL') -options=('!libtool') -depends=('gnutls') -install=libmicrohttpd.install -source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('35b000cd7d201ace2b071d53a02b2c0d') - -build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-dependency-tracking --enable-largefile \ - --enable-curl --enable-messages --with-pic - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/platform.h \ - ${pkgdir}/usr/include/$pkgname/platform.h - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/plibc/plibc.h \ - ${pkgdir}/usr/include/$pkgname/plibc.h - sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I{includedir}/libmicrohttpd#' \ - $pkgdir/usr/lib/pkgconfig/libmicrohttpd.pc -} diff --git a/community-testing/libmicrohttpd/libmicrohttpd.install b/community-testing/libmicrohttpd/libmicrohttpd.install deleted file mode 100644 index dc0d2b996..000000000 --- a/community-testing/libmicrohttpd/libmicrohttpd.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(microhttpd.info microhttpd-tutorial.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/community-testing/libvirt/PKGBUILD b/community-testing/libvirt/PKGBUILD deleted file mode 100644 index 87c98529a..000000000 --- a/community-testing/libvirt/PKGBUILD +++ /dev/null @@ -1,81 +0,0 @@ -# $Id: PKGBUILD 53748 2011-08-07 22:06:51Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Jonathan Wiersma <archaur at jonw dot org> - -pkgname=libvirt -pkgver=0.9.4 -pkgrel=2 -pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" -arch=('i686' 'x86_64') -url="http://libvirt.org/" -license=('LGPL') -depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' - 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' - 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' - 'iproute2') -makedepends=('pkgconfig' 'lvm2') -optdepends=('bridge-utils: for briged networking (default)' - 'dnsmasq: for NAT/DHCP for guests' - 'kernel26-ovz24: for openvz guests' - 'kvm' - 'lxc' - 'openbsd-netcat: for remote management over ssh' - 'qemu' - 'user-mode-linux' - 'virtualbox_bin' - 'virtualbox-ose' - 'xen' - 'radvd') -options=('emptydirs' '!libtool') -backup=('etc/conf.d/libvirtd' - 'etc/libvirt/libvirtd.conf' - 'etc/libvirt/qemu.conf' - 'etc/sasl2/libvirt.conf') -install="libvirt.install" -source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" - libvirtd.rc.d - libvirtd.conf.d - openbsd-netcat-default.patch - unixperms.patch - yajl-2.x.patch) -md5sums=('86b411b11bd23d4af20611699f372af7' - 'c43244c40a0437038c82089618e7beaa' - '3ed0e24f5b5e25bf553f5427d64915e6' - 'ee7052f3929d5d918236c646a59edebf' - 'db95aecdf2ccf3693fef5821cdcb7eba' - '5745bb8d0b254abb7a3528c66e03b0f9') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # python2 fix - export PYTHON=`which python2` - for file in $(find . -name '*.py' -print); do - sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done - -# for more information on authentication see http://libvirt.org/auth.html -# If you wish to have unix-permissions based access rather than only polkit -# access, create a group called libvirt and uncomment the line below: -# patch -Np1 -i "$srcdir"/unixperms.patch - - [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch - - # fixes for yajl 2.0 API changes -# [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir/yajl-2.x.patch" - - export LDFLAGS=-lX11 - [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ - --with-storage-lvm --without-xen --with-udev --without-hal - find -name Makefile -exec sed -i 's#-L /usr#-L/usr#' {} \; - make -j1 -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -D -m755 "$srcdir"/libvirtd.rc.d "$pkgdir"/etc/rc.d/libvirtd - install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd - rm -rf $pkgdir/var/run -} diff --git a/community-testing/libvirt/libvirt.install b/community-testing/libvirt/libvirt.install deleted file mode 100644 index 3881386d2..000000000 --- a/community-testing/libvirt/libvirt.install +++ /dev/null @@ -1,38 +0,0 @@ -_libvirt_setup() { - rm -f /usr/lib/python?.?/site-packages/libvirt.pyc - echo ">>> To use libvirt as a non-root user:" - echo ">>> Use polkit to grant access." - echo ">>> ...or change the access model in /etc/libvirt/libvirtd.conf." - echo ">>> (see unixperms.patch in PKGBUILD for help)" - echo "" -} - -post_install() { - _libvirt_setup || return 1 - echo ">>> Be sure to see optdepends as you may find some of them helpfull." - echo ">>> Especially: bridge-utils, dnsmasq, and hal." - echo "" - echo ">>> To start libvirtd run: '/etc/rc.d/libvirtd start' as root." - echo ">>> Add 'libvirtd' to daemons in /etc/rc.conf if you want it to load upon" - echo ">>> booting." - echo "" - /bin/true -} - -post_upgrade() { - _libvirt_setup || return 1 - echo ">>> To finish the upgrade, restart libvirtd by running the command:" - echo ">>> '/etc/rc.d/libvirtd restart' as root or rebooting." - echo ">>> You may also need to run 'rm -rf ~/.libvirt'" - echo "" - /bin/true -} - -post_remove() { - rm -f /usr/lib/python[0-9].[0-9]/site-packages/libvirt.pyc - echo ">>> You may wish to delete the group 'libvirt' if it still exists." - echo ">>> It can be removed by running 'groupdel libvirt' as root." - echo "" - depmod -a - /bin/true -} diff --git a/community-testing/libvirt/libvirtd.conf.d b/community-testing/libvirt/libvirtd.conf.d deleted file mode 100644 index d4d25b47a..000000000 --- a/community-testing/libvirt/libvirtd.conf.d +++ /dev/null @@ -1,3 +0,0 @@ -LIBVIRTD_CONFIG="/etc/libvirt/libvirtd.conf" -LIBVIRTD_ARGS="-p /var/run/libvirtd.pid" -KRB5_KTNAME="/etc/libvirt/krb5.tab" diff --git a/community-testing/libvirt/libvirtd.rc.d b/community-testing/libvirt/libvirtd.rc.d deleted file mode 100755 index 193bffa9c..000000000 --- a/community-testing/libvirt/libvirtd.rc.d +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/conf.d/libvirtd -. /etc/rc.d/functions - -LIBVIRTD_CONFIG_ARGS= -if [ -n "$LIBVIRTD_CONFIG" ] -then - LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG" -fi - -PID=`pidof -o %PPID /usr/sbin/libvirtd` -case "$1" in - start) - stat_busy "Starting libvirtd" - export RADVD=/usr/sbin/radvd - for i in /var/run/libvirt/qemu /var/run/libvirt/lxc /var/run/libvirt/uml /var/run/libvirt/network; do - [ -d $i ] || mkdir -p $i - done - [ -z "$PID" ] && ( - mkdir -p /var/{cache,run}/libvirt - rm -rf /var/cache/libvirt/* - KRB5_KTNAME=$KRB5_KTNAME \ - /usr/sbin/libvirtd --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS - ) - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon libvirtd - stat_done - fi - ;; - stop) - stat_busy "Stopping libvirtd" - [ ! -z "$PID" ] && ( - kill $PID &> /dev/null - rm -rf /var/cache/libvirt/* - rm -f /var/run/libvirtd.pid - ) - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon libvirtd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading libvirtd configuration" - [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo $"Usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/community-testing/libvirt/openbsd-netcat-default.patch b/community-testing/libvirt/openbsd-netcat-default.patch deleted file mode 100644 index c7543c5a4..000000000 --- a/community-testing/libvirt/openbsd-netcat-default.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -wbBur libvirt-0.9.4.org/src/qemu/qemu_migration.c libvirt-0.9.4/src/qemu/qemu_migration.c ---- libvirt-0.9.4.org/src/qemu/qemu_migration.c 2011-08-03 05:36:34.000000000 +0400 -+++ libvirt-0.9.4/src/qemu/qemu_migration.c 2011-08-03 13:29:56.000000000 +0400 -@@ -1612,7 +1612,7 @@ - ret = qemuMonitorMigrateToUnix(priv->mon, background_flags, - unixfile); - } else if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_EXEC)) { -- const char *args[] = { "nc", "-U", unixfile, NULL }; -+ const char *args[] = { "nc.openbsd", "-U", unixfile, NULL }; - ret = qemuMonitorMigrateToCommand(priv->mon, QEMU_MONITOR_MIGRATE_BACKGROUND, args); - } else { - ret = -1; -diff -wbBur libvirt-0.9.4.org/src/remote/remote_driver.c libvirt-0.9.4/src/remote/remote_driver.c ---- libvirt-0.9.4.org/src/remote/remote_driver.c 2011-07-29 09:14:03.000000000 +0400 -+++ libvirt-0.9.4/src/remote/remote_driver.c 2011-08-03 13:30:05.000000000 +0400 -@@ -588,7 +588,7 @@ - username, - !tty, - !verify, -- netcat ? netcat : "nc", -+ netcat ? netcat : "nc.openbsd", - keyfile, - sockname))) - goto failed; -diff -wbBur libvirt-0.9.4.org/src/rpc/virnetsocket.c libvirt-0.9.4/src/rpc/virnetsocket.c ---- libvirt-0.9.4.org/src/rpc/virnetsocket.c 2011-08-01 05:32:35.000000000 +0400 -+++ libvirt-0.9.4/src/rpc/virnetsocket.c 2011-08-03 13:29:46.000000000 +0400 -@@ -629,7 +629,7 @@ - if (noVerify) - virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL); - virCommandAddArgList(cmd, nodename, -- netcat ? netcat : "nc", -+ netcat ? netcat : "nc.openbsd", - "-U", path, NULL); - - return virNetSocketNewConnectCommand(cmd, retsock); diff --git a/community-testing/libvirt/unixperms.patch b/community-testing/libvirt/unixperms.patch deleted file mode 100644 index b3fb86cf5..000000000 --- a/community-testing/libvirt/unixperms.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -ur libvirt-0.7.4-orig/daemon/libvirtd.conf libvirt-0.7.4-patched/daemon/libvirtd.conf ---- libvirt-0.7.4-orig/daemon/libvirtd.conf 2009-11-23 03:10:33.398655655 -0800 -+++ libvirt-0.7.4-patched/daemon/libvirtd.conf 2009-11-23 03:09:37.831189671 -0800 -@@ -78,14 +78,14 @@ - # without becoming root. - # - # This is restricted to 'root' by default. --#unix_sock_group = "libvirt" -+unix_sock_group = "libvirt" - - # Set the UNIX socket permissions for the R/O socket. This is used - # for monitoring VM status only - # - # Default allows any user. If setting group ownership may want to - # restrict this to: --#unix_sock_ro_perms = "0777" -+unix_sock_ro_perms = "0770" - - # Set the UNIX socket permissions for the R/W socket. This is used - # for full management of VMs -@@ -95,7 +95,7 @@ - # - # If not using PolicyKit and setting group ownership for access - # control then you may want to relax this to: --#unix_sock_rw_perms = "0770" -+unix_sock_rw_perms = "0770" - - # Set the name of the directory in which sockets will be found/created. - #unix_sock_dir = "/var/run/libvirt" -@@ -126,7 +126,7 @@ - # - # To restrict monitoring of domains you may wish to enable - # an authentication mechanism here --#auth_unix_ro = "none" -+auth_unix_ro = "none" - - # Set an authentication scheme for UNIX read-write sockets - # By default socket permissions only allow root. If PolicyKit -@@ -135,7 +135,7 @@ - # - # If the unix_sock_rw_perms are changed you may wish to enable - # an authentication mechanism here --#auth_unix_rw = "none" -+auth_unix_rw = "none" - - # Change the authentication scheme for TCP sockets. - # diff --git a/community-testing/libvirt/yajl-2.x.patch b/community-testing/libvirt/yajl-2.x.patch deleted file mode 100644 index 80d3edce0..000000000 --- a/community-testing/libvirt/yajl-2.x.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- a/src/util/json.c 2011-03-24 03:10:26.000000000 -0400 -+++ b/src/util/json.c 2011-04-25 20:01:29.354939116 -0400 -@@ -709,7 +709,7 @@ - - static int virJSONParserHandleNumber(void * ctx, - const char * s, -- unsigned int l) -+ size_t l) - { - virJSONParserPtr parser = ctx; - char *str = strndup(s, l); -@@ -735,7 +735,7 @@ - - static int virJSONParserHandleString(void * ctx, - const unsigned char * stringVal, -- unsigned int stringLen) -+ size_t stringLen) - { - virJSONParserPtr parser = ctx; - virJSONValuePtr value = virJSONValueNewStringLen((const char *)stringVal, -@@ -756,7 +756,7 @@ - - static int virJSONParserHandleMapKey(void * ctx, - const unsigned char * stringVal, -- unsigned int stringLen) -+ size_t stringLen) - { - virJSONParserPtr parser = ctx; - virJSONParserStatePtr state; -@@ -894,14 +894,14 @@ - /* XXX add an incremental streaming parser - yajl trivially supports it */ - virJSONValuePtr virJSONValueFromString(const char *jsonstring) - { -- yajl_parser_config cfg = { 1, 1 }; - yajl_handle hand; - virJSONParser parser = { NULL, NULL, 0 }; - virJSONValuePtr ret = NULL; - - VIR_DEBUG("string=%s", jsonstring); - -- hand = yajl_alloc(&parserCallbacks, &cfg, NULL, &parser); -+ hand = yajl_alloc(&parserCallbacks, NULL, &parser); -+ yajl_config(hand, yajl_allow_comments, 1); - - if (yajl_parse(hand, - (const unsigned char *)jsonstring, -@@ -1002,15 +1002,16 @@ - - char *virJSONValueToString(virJSONValuePtr object) - { -- yajl_gen_config conf = { 0, " " }; /* Turns off pretty printing since QEMU can't cope */ - yajl_gen g; - const unsigned char *str; - char *ret = NULL; -- unsigned int len; -+ size_t len; - - VIR_DEBUG("object=%p", object); - -- g = yajl_gen_alloc(&conf, NULL); -+ g = yajl_gen_alloc(NULL); -+ yajl_gen_config(g, yajl_gen_beautify, 0); -+ yajl_gen_config(g, yajl_gen_indent_string, " "); - - if (virJSONValueToStringOne(object, g) < 0) { - virReportOOMError(); diff --git a/community-testing/mailutils/PKGBUILD b/community-testing/mailutils/PKGBUILD deleted file mode 100644 index 521f58a01..000000000 --- a/community-testing/mailutils/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 53728 2011-08-07 21:45:04Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=mailutils -pkgver=2.2 -pkgrel=3 -pkgdesc="MUA command line tool (mailx)" -arch=(i686 x86_64) -url="http://www.gnu.org/software/mailutils/" -license=('GPL') -depends=('libldap' 'pam' 'gnutls' 'guile') -makedepends=('python2' 'emacs') -optdepends=('python2') -conflicts=('libsieve') -install=mailutils.install -options=(zipman !emptydirs) -source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2) -md5sums=('834d2f616b922856127ecfe6c2de7d1a') - -build() { - cd "$srcdir/mailutils-$pkgver" - - py2=`pacman -Q python2 | cut -d\ -f2 | cut -d. -f1-2` - py3=`pacman -Q python | cut -d\ -f2 | cut -d. -f1-2` - - export PYTHON=/usr/bin/python2 - export PYTHON_CONFIG=/usr/bin/python2-config - export CFLAGS="$CFLAGS `pkg-config --cflags python-$py2`" - export LDFLAGS="$LDFLAGS `pkg-config --libs python-$py2`" - - [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \ - --libexecdir=/usr/lib/$pkgname --without-fribidi \ - --without-tcp-wrappers -# [ -z "$py3" ] || find -type f -name Makefile -exec sed -i "s|python$py3|python$py2|" {} \; - make -j1 -} - -package() { - cd "$srcdir/mailutils-$pkgver" - make -j1 DESTDIR=$pkgdir install - rm -f $pkgdir/usr/share/info/dir - mv $pkgdir/usr/bin/mail $pkgdir/usr/bin/gnu-mail - mv $pkgdir/usr/share/man/man1/mail.1 $pkgdir/usr/share/man/man1/gnu-mail.1 - chown -R root:root $pkgdir -} diff --git a/community-testing/mailutils/mailutils.install b/community-testing/mailutils/mailutils.install deleted file mode 100644 index 03b451b3e..000000000 --- a/community-testing/mailutils/mailutils.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(mailutils.info mailutils.info-1 mailutils.info-2) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/community-testing/minbif/PKGBUILD b/community-testing/minbif/PKGBUILD deleted file mode 100644 index 663b6d65a..000000000 --- a/community-testing/minbif/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 53751 2011-08-07 23:40:14Z lfleischer $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: AkiraYB <brunoyb!yahoo,com,br> - -pkgname=minbif -pkgver=1.0.4 -pkgrel=4 -pkgdesc='An IRC gateway to IM networks that uses libpurple.' -arch=('i686' 'x86_64') -url='http://minbif.im/' -license=('GPL2') -depends=('gnutls' 'libcaca' 'libpurple') -makedepends=('cmake') -optdepends=('xinetd: to run minbif through xinetd') -backup=('etc/minbif/minbif.conf' - 'etc/minbif/minbif.motd') -install='minbif.install' -source=("http://minbif.im/attachments/download/90/${pkgname}-${pkgver}.tar.gz" - 'minbif') -md5sums=('25069fb6015dfb9ddc24ef2e09e74da3' - '307a6fab42bcaeed11a55b5fb4589778') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make PREFIX=/usr CONF_PREFIX=/etc/minbif ENABLE_MINBIF=ON ENABLE_IMLIB=ON ENABLE_CACA=ON \ - ENABLE_VIDEO=OFF ENABLE_PLUGIN=OFF ENABLE_PAM=ON ENABLE_TLS=ON DEBUG=OFF -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - install -dm0755 "${pkgdir}/var/lib" - install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif" - install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif/users" - install -Dm0755 "${srcdir}/minbif" "${pkgdir}/etc/rc.d/minbif" - - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/minbif/minbif b/community-testing/minbif/minbif deleted file mode 100644 index 47888d169..000000000 --- a/community-testing/minbif/minbif +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/minbif` -case "$1" in - start) - stat_busy "Starting minbif daemon" - if [ -z "$PID" ]; then - if [ ! -d /var/run/minbif ]; then - mkdir -p /var/run/minbif && chown minbif:minbif /var/run/minbif - fi - [ -f /var/run/minbif/minbif.pid ] && rm -f /var/run/minbif/minbif.pid - CMD='/usr/bin/minbif --pidfile /var/run/minbif/minbif.pid \ - /etc/minbif/minbif.conf' - su -s /bin/sh -c "$CMD" minbif - - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon minbif - stat_done - fi - else - stat_fail - fi - ;; - - stop) - stat_busy "Stopping minbif daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/minbif/minbif.pid - rm_daemon minbif - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/minbif/minbif.install b/community-testing/minbif/minbif.install deleted file mode 100644 index 264763407..000000000 --- a/community-testing/minbif/minbif.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - grep -qs ^minbif: /etc/group || groupadd -g 67 minbif - grep -qs ^minbif: /etc/passwd || useradd -u 67 -g minbif \ - -d /var/lib/minbif -s /bin/false minbif - - chown -R minbif:minbif /var/lib/minbif - chmod 0770 /var/lib/minbif - chmod 0770 /var/lib/minbif/users -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - grep -qs ^minbif: /etc/passwd && userdel minbif - grep -qs ^minbif: /etc/group && groupdel minbif -} diff --git a/community-testing/mongodb/PKGBUILD b/community-testing/mongodb/PKGBUILD deleted file mode 100644 index 1648fc546..000000000 --- a/community-testing/mongodb/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Mathias Stearn <mathias@10gen.com> -# Contributor: Alec Thomas - -pkgname=mongodb -pkgver=1.8.3 -pkgrel=1 -pkgdesc='A high-performance, open source, schema-free document-oriented database.' -arch=('i686' 'x86_64') -url='http://www.mongodb.org' -license=('AGPL3') -depends=('boost-libs' 'js' 'pcre') -makedepends=('scons' 'boost') -optdepends=('libpcap: needed for mongosniff') -backup=('etc/mongodb.conf') -install="mongodb.install" -source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" - 'mongodb.rc' - 'mongodb.conf' - 'mongodb-1.8.0-spidermonkey-1.8.5-support.patch' - 'add-js185-support-to-SConstruct.diff') -md5sums=('662e7ad6ff9f8e4d16c72c038b4a0c60' - '85eaa28e349fdc6250f883624e624cca' - '4839fe1d638187ca3226e8267b947318' - '2e6409732fba887c9cfe81257b5260ad' - 'ca7e62be31389d951bfd8848b1675c1b') - -build() { - export SCONSFLAGS="$MAKEFLAGS" - - cd mongodb-src-r${pkgver} - - # js185 support https://jira.mongodb.org/browse/SERVER-2887 - patch -Np1 -i ${srcdir}/mongodb-1.8.0-spidermonkey-1.8.5-support.patch - patch -Np0 -i ${srcdir}/add-js185-support-to-SConstruct.diff - - scons \ - all \ - --full -} - -package() { - cd mongodb-src-r${pkgver} - - scons \ - install \ - --full \ - --prefix=${pkgdir}/usr - - install -D -m755 ${srcdir}/mongodb.rc \ - ${pkgdir}/etc/rc.d/mongodb - install -D -m644 ${srcdir}/mongodb.conf \ - ${pkgdir}/etc/mongodb.conf - install -d -m700 ${pkgdir}/var/lib/mongodb - install -d -m755 ${pkgdir}/var/log/mongodb - - if [ -d ${pkgdir}/usr/lib64 ]; then - mv ${pkgdir}/usr/lib64 ${pkgdir}/usr/lib - fi -} diff --git a/community-testing/mongodb/add-js185-support-to-SConstruct.diff b/community-testing/mongodb/add-js185-support-to-SConstruct.diff deleted file mode 100644 index c621d00cb..000000000 --- a/community-testing/mongodb/add-js185-support-to-SConstruct.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- SConstruct.original 2011-07-05 14:23:46.334748007 +0000 -+++ SConstruct 2011-07-05 14:26:15.729533840 +0000 -@@ -208,6 +208,9 @@ - justClientLib = (COMMAND_LINE_TARGETS == ['mongoclient']) - - env = Environment( MSVS_ARCH=msarch , tools = ["default", "gch"], toolpath = '.' ) -+ -+env.ParseConfig('pkg-config --cflags --libs mozjs185') -+ - if has_option( "cxx" ): - env["CC"] = get_option( "cxx" ) - env["CXX"] = get_option( "cxx" ) diff --git a/community-testing/mongodb/mongodb-1.8.0-spidermonkey-1.8.5-support.patch b/community-testing/mongodb/mongodb-1.8.0-spidermonkey-1.8.5-support.patch deleted file mode 100644 index 46160450f..000000000 --- a/community-testing/mongodb/mongodb-1.8.0-spidermonkey-1.8.5-support.patch +++ /dev/null @@ -1,1502 +0,0 @@ ---- mongodb-src-r1.8.0/SConstruct.mozjs185~ 2011-03-16 16:33:30.000000000 +0100 -+++ mongodb-src-r1.8.0/SConstruct 2011-04-01 22:16:43.411100876 +0200 -@@ -671,7 +671,6 @@ if nix: - env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" ) - # env.Append( " -Wconversion" ) TODO: this doesn't really work yet - if linux: -- env.Append( CPPFLAGS=" -Werror " ) - env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's - env.Append( CXXFLAGS=" -Wnon-virtual-dtor " ) - env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" ) -@@ -893,11 +892,11 @@ def doConfigure( myenv , needPcre=True , - if usesm: - - # see http://www.mongodb.org/pages/viewpageattachments.action?pageId=12157032 -- J = [ "mozjs" , "js", "js_static" ] -+ J = [ "mozjs185" , "js", "js_static" ] - if windows: - if msarch == "amd64": - if release: -- J = [ "js64r", "js", "mozjs" , "js_static" ] -+ J = [ "js64r", "js", "mozjs185" , "js_static" ] - else: - J = "js64d" - print( "looking for js64d.lib for spidermonkey. (available at mongodb.org prebuilt)" ); -@@ -905,14 +904,12 @@ def doConfigure( myenv , needPcre=True , - if not force32: - print( "Assuming a 32 bit build is desired" ) - if release: -- J = [ "js32r", "js", "mozjs" , "js_static" ] -+ J = [ "js32r", "js", "mozjs185" , "js_static" ] - else: -- J = [ "js32d", "js", "mozjs" , "js_static" ] -+ J = [ "js32d", "js", "mozjs185" , "js_static" ] - - myCheckLib( J , True ) - mozHeader = "js" -- if bigLibString(myenv).find( "mozjs" ) >= 0: -- mozHeader = "mozjs" - - if not conf.CheckHeader( mozHeader + "/jsapi.h" ): - if conf.CheckHeader( "jsapi.h" ): -@@ -921,6 +918,13 @@ def doConfigure( myenv , needPcre=True , - print( "no spider monkey headers!" ) - Exit(1) - -+ if conf.CheckFunc( 'JS_NewCompartmentAndGlobalObject' ): -+ myenv.Append( CPPDEFINES=[ "HAVE_COMPARTMENTS" ] ) -+ if conf.CheckFunc( 'JS_GetStringCharsAndLength' ): -+ myenv.Append( CPPDEFINES=[ "HAVE_JS_GET_STRING_CHARS_AND_LENGTH" ] ) -+ if conf.CheckFunc( 'JS_NewRegExpObjectNoStatics' ): -+ myenv.Append( CPPDEFINES=[ "JS_NEW_REG_EXP_OBJECT_NO_STATISTICS" ] ) -+ - if usev8: - if debugBuild: - myCheckLib( [ "v8_g" , "v8" ] , True ) ---- mongodb-src-r1.8.0/scripting/engine_spidermonkey.cpp.mozjs185~ 2011-03-16 16:33:30.000000000 +0100 -+++ mongodb-src-r1.8.0/scripting/engine_spidermonkey.cpp 2011-04-01 22:42:19.780233492 +0200 -@@ -192,8 +192,13 @@ namespace mongo { - } - - string toString( JSString * so ) { -+#ifdef HAVE_JS_GET_STRING_CHARS_AND_LENGTH -+ size_t srclen; -+ const jschar * s = JS_GetStringCharsAndLength( _context , so , &srclen ); -+#else - jschar * s = JS_GetStringChars( so ); - size_t srclen = JS_GetStringLength( so ); -+#endif - if( srclen == 0 ) - return ""; - -@@ -360,7 +365,7 @@ namespace mongo { - - case JSTYPE_OBJECT: { - JSObject * o = JSVAL_TO_OBJECT( val ); -- if ( ! o || o == JSVAL_NULL ) { -+ if ( ! o || o == (JSObject *)JSVAL_NULL ){ - b.appendNull( name ); - } - else if ( ! appendSpecialDBObject( this , b , name , val , o ) ) { -@@ -419,16 +424,15 @@ namespace mongo { - return true; - } - -- void addRoot( JSFunction * f , const char * name ); -+ void addRoot( JSFunction * f ); - - JSFunction * compileFunction( const char * code, JSObject * assoc = 0 ) { -- const char * gcName = "unknown"; -- JSFunction * f = _compileFunction( code , assoc , gcName ); -- //addRoot( f , gcName ); -+ JSFunction * f = _compileFunction( code , assoc ); -+ //addRoot( f ); - return f; - } - -- JSFunction * _compileFunction( const char * raw , JSObject * assoc , const char *& gcName ) { -+ JSFunction * _compileFunction( const char * raw , JSObject * assoc ) { - if ( ! assoc ) - assoc = JS_GetGlobalObject( _context ); - -@@ -447,7 +451,6 @@ namespace mongo { - if ( isSimpleStatement( s ) ) { - s = "return " + s; - } -- gcName = "cf anon"; - fname << "anon"; - return JS_CompileFunction( _context , assoc , fname.str().c_str() , 0 , 0 , s.c_str() , s.size() , "nofile_a" , 0 ); - } -@@ -488,7 +491,6 @@ namespace mongo { - log() << "compile failed for: " << raw << endl; - return 0; - } -- gcName = "cf normal"; - return func; - } - -@@ -630,7 +632,11 @@ namespace mongo { - flags++; - } - -+#ifdef JS_NEW_REG_EXP_OBJECT_NO_STATISTICS -+ JSObject * r = JS_NewRegExpObjectNoStatics( _context , (char*)e.regex() , strlen( e.regex() ) , flagNumber); -+#else - JSObject * r = JS_NewRegExpObject( _context , (char*)e.regex() , strlen( e.regex() ) , flagNumber ); -+#endif - assert( r ); - return OBJECT_TO_JSVAL( r ); - } -@@ -791,7 +797,7 @@ namespace mongo { - - BSONFieldIterator * it = (BSONFieldIterator*)JSVAL_TO_PRIVATE( *statep ); - if ( ! it ) { -- *statep = 0; -+ *statep = JSVAL_NULL; - return JS_TRUE; - } - -@@ -803,7 +809,7 @@ namespace mongo { - } - else { - delete it; -- *statep = 0; -+ *statep = JSVAL_NULL; - } - return JS_TRUE; - } -@@ -818,7 +824,7 @@ namespace mongo { - return JS_FALSE; - } - -- JSBool noaccess( JSContext *cx, JSObject *obj, jsval idval, jsval *vp) { -+ JSBool noaccess( JSContext *cx, JSObject *obj, jsid id, jsval *vp){ - BSONHolder * holder = GETHOLDER( cx , obj ); - if ( ! holder ) { - // in init code still -@@ -830,24 +836,37 @@ namespace mongo { - return JS_FALSE; - } - -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp) -+ JSBool strict_noaccess( JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp){ -+ return noaccess( cx , obj , id , vp ); -+ } -+ -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp, JSResolveOp) - JSClass bson_ro_class = { - "bson_ro_object" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE | JSCLASS_NEW_ENUMERATE , -- noaccess, noaccess, JS_PropertyStub, noaccess, -- (JSEnumerateOp)bson_enumerate, (JSResolveOp)(&resolveBSONField) , JS_ConvertStub, bson_finalize , -+ noaccess, noaccess, JS_PropertyStub, strict_noaccess, -+ (JSEnumerateOp)bson_enumerate, (JSResolveOp)resolveBSONField , JS_ConvertStub, bson_finalize , - JSCLASS_NO_OPTIONAL_MEMBERS - }; - -+#ifdef JSFUN_CONSTRUCTOR -+ JSBool bson_cons( JSContext* cx, uintN argc, jsval* vp ){ -+#else - JSBool bson_cons( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) { -+#endif - cerr << "bson_cons : shouldn't be here!" << endl; - JS_ReportError( cx , "can't construct bson object" ); - return JS_FALSE; - } - - JSFunctionSpec bson_functions[] = { -- { 0 } -+ JS_FS_END - }; - -- JSBool bson_add_prop( JSContext *cx, JSObject *obj, jsval idval, jsval *vp) { -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSPropertyOp) -+ JSBool bson_add_prop( JSContext *cx, JSObject *obj, jsid id, jsval *vp){ -+ jsval idval; -+ JS_IdToValue( cx , id , &idval ); - BSONHolder * holder = GETHOLDER( cx , obj ); - if ( ! holder ) { - // static init -@@ -864,8 +883,10 @@ namespace mongo { - return JS_TRUE; - } - -- -- JSBool mark_modified( JSContext *cx, JSObject *obj, jsval idval, jsval *vp) { -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSPropertyOp) -+ JSBool mark_modified( JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp){ -+ jsval idval; -+ JS_IdToValue( cx , id , &idval ); - Convertor c(cx); - BSONHolder * holder = GETHOLDER( cx , obj ); - if ( !holder ) // needed when we're messing with DBRef.prototype -@@ -877,7 +898,10 @@ namespace mongo { - return JS_TRUE; - } - -- JSBool mark_modified_remove( JSContext *cx, JSObject *obj, jsval idval, jsval *vp) { -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSPropertyOp) -+ JSBool mark_modified_remove( JSContext *cx, JSObject *obj, jsid id, jsval *vp){ -+ jsval idval; -+ JS_IdToValue( cx , id , &idval ); - Convertor c(cx); - BSONHolder * holder = GETHOLDER( cx , obj ); - if ( holder->_inResolve ) -@@ -887,23 +911,26 @@ namespace mongo { - return JS_TRUE; - } - -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp, JSResolveOp) - JSClass bson_class = { - "bson_object" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE | JSCLASS_NEW_ENUMERATE , - bson_add_prop, mark_modified_remove, JS_PropertyStub, mark_modified, -- (JSEnumerateOp)bson_enumerate, (JSResolveOp)(&resolveBSONField) , JS_ConvertStub, bson_finalize , -+ (JSEnumerateOp)bson_enumerate, (JSResolveOp)resolveBSONField , JS_ConvertStub, bson_finalize , - JSCLASS_NO_OPTIONAL_MEMBERS - }; - -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp) - static JSClass global_class = { - "global", JSCLASS_GLOBAL_FLAGS, -- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, -+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, - JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub, - JSCLASS_NO_OPTIONAL_MEMBERS - }; - - // --- global helpers --- - -- JSBool native_print( JSContext * cx , JSObject * obj , uintN argc, jsval *argv, jsval *rval ) { -+ JSBool native_print( JSContext * cx , uintN argc , jsval *vp ){ -+ jsval *argv = JS_ARGV( cx , vp); - stringstream ss; - Convertor c( cx ); - for ( uintN i=0; i<argc; i++ ) { -@@ -913,10 +940,13 @@ namespace mongo { - } - ss << "\n"; - Logstream::logLockless( ss.str() ); -+ JS_SET_RVAL( cx , vp , JSVAL_VOID ); - return JS_TRUE; - } - -- JSBool native_helper( JSContext *cx , JSObject *obj , uintN argc, jsval *argv , jsval *rval ) { -+ JSBool native_helper( JSContext *cx , uintN argc, jsval *vp){ -+ jsval *argv = JS_ARGV( cx , vp ); -+ JSObject *obj = JS_THIS_OBJECT( cx , vp ); - Convertor c(cx); - - NativeFunction func = (NativeFunction)((long long)c.getNumber( obj , "x" ) ); -@@ -942,35 +972,37 @@ namespace mongo { - } - - if ( out.isEmpty() ) { -- *rval = JSVAL_VOID; -+ JS_SET_RVAL( cx , vp , JSVAL_VOID ); - } - else { -- *rval = c.toval( out.firstElement() ); -+ JS_SET_RVAL( cx , vp , c.toval( out.firstElement() ) ); - } - - return JS_TRUE; - } - -- JSBool native_load( JSContext *cx , JSObject *obj , uintN argc, jsval *argv , jsval *rval ); -+ JSBool native_load( JSContext *cx , uintN argc, jsval *vp ); - -- JSBool native_gc( JSContext *cx , JSObject *obj , uintN argc, jsval *argv , jsval *rval ) { -+ JSBool native_gc( JSContext *cx , uintN argc, jsval *vp ){ - JS_GC( cx ); -+ JS_SET_RVAL( cx , vp , JSVAL_VOID ); - return JS_TRUE; - } - - JSFunctionSpec globalHelpers[] = { -- { "print" , &native_print , 0 , 0 , 0 } , -- { "nativeHelper" , &native_helper , 1 , 0 , 0 } , -- { "load" , &native_load , 1 , 0 , 0 } , -- { "gc" , &native_gc , 1 , 0 , 0 } , -- { 0 , 0 , 0 , 0 , 0 } -+ JS_FS( "print" , &native_print , 0 , JSFUN_FAST_NATIVE ) , -+ JS_FS( "nativeHelper" , &native_helper , 1 , JSFUN_FAST_NATIVE ) , -+ JS_FS( "load" , &native_load , 1 , JSFUN_FAST_NATIVE ) , -+ JS_FS( "gc" , &native_gc , 1 , JSFUN_FAST_NATIVE ) , -+ JS_FS_END - }; - - // ----END global helpers ---- - - // Object helpers - -- JSBool bson_get_size(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -+ JSBool bson_get_size(JSContext *cx, uintN argc, jsval *vp){ -+ jsval *argv = JS_ARGV( cx , vp ); - if ( argc != 1 || !JSVAL_IS_OBJECT( argv[ 0 ] ) ) { - JS_ReportError( cx , "bsonsize requires one valid object" ); - return JS_FALSE; -@@ -979,7 +1011,7 @@ namespace mongo { - Convertor c(cx); - - if ( argv[0] == JSVAL_VOID || argv[0] == JSVAL_NULL ) { -- *rval = c.toval( 0.0 ); -+ JS_SET_RVAL( cx , vp , c.toval( 0.0 ) ); - return JS_TRUE; - } - -@@ -999,18 +1031,21 @@ namespace mongo { - size = temp.objsize(); - } - -- *rval = c.toval( size ); -+ JS_SET_RVAL( cx , vp , c.toval( size ) ); - return JS_TRUE; - } - - JSFunctionSpec objectHelpers[] = { -- { "bsonsize" , &bson_get_size , 1 , 0 , 0 } , -- { 0 , 0 , 0 , 0 , 0 } -+ JS_FS( "bsonsize" , &bson_get_size , 1 , JSFUN_FAST_NATIVE ) , -+ JS_FS_END - }; - - // end Object helpers - -- JSBool resolveBSONField( JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp ) { -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSResolveOp) -+ JSBool resolveBSONField( JSContext *cx, JSObject *obj, jsid id, uintN flags, JSObject **objp ){ -+ jsval idval; -+ JS_IdToValue( cx , id , &idval ); - assert( JS_EnterLocalRootScope( cx ) ); - Convertor c( cx ); - -@@ -1023,7 +1058,7 @@ namespace mongo { - } - holder->check(); - -- string s = c.toString( id ); -+ string s = c.toString( idval ); - - BSONElement e = holder->_obj[ s.c_str() ]; - -@@ -1139,9 +1174,15 @@ namespace mongo { - //JS_SetVersion( _context , JSVERSION_LATEST); TODO - JS_SetErrorReporter( _context , errorReporter ); - -+#ifdef HAVE_COMPARTMENTS -+ _global = JS_NewCompartmentAndGlobalObject( _context , &global_class , NULL); -+ massert( 13442 , "JS_NewCompartmentAndGlobalObject failed for global" , _global ); -+ _call = JS_EnterCrossCompartmentCall( _context , _global); -+#else - _global = JS_NewObject( _context , &global_class, NULL, NULL); - massert( 10432 , "JS_NewObject failed for global" , _global ); - JS_SetGlobalObject( _context , _global ); -+#endif - massert( 10433 , "js init failed" , JS_InitStandardClasses( _context , _global ) ); - - JS_SetOptions( _context , JS_GetOptions( _context ) | JSOPTION_VAROBJFIX ); -@@ -1159,13 +1200,14 @@ namespace mongo { - smlock; - uassert( 10223 , "deleted SMScope twice?" , _convertor ); - -- for ( list<void*>::iterator i=_roots.begin(); i != _roots.end(); i++ ) { -- JS_RemoveRoot( _context , *i ); -+ for ( list<JSObject*>::iterator i=_roots.begin(); i != _roots.end(); i++ ){ -+ JSObject * obj = (JSObject *)*i; -+ JS_RemoveObjectRoot( _context , &obj ); - } - _roots.clear(); - - if ( _this ) { -- JS_RemoveRoot( _context , &_this ); -+ JS_RemoveObjectRoot( _context , &_this ); - _this = 0; - } - -@@ -1174,6 +1216,13 @@ namespace mongo { - _convertor = 0; - } - -+#ifdef HAVE_COMPARTMENTS -+ if ( _call ) { -+ JS_LeaveCrossCompartmentCall( _call ); -+ _call = 0; -+ } -+#endif -+ - if ( _context ) { - // This is expected to reclaim _global as well. - JS_DestroyContext( _context ); -@@ -1187,16 +1236,16 @@ namespace mongo { - assert( _convertor ); - return; - if ( _this ) { -- JS_RemoveRoot( _context , &_this ); -+ JS_RemoveObjectRoot( _context , &_this ); - _this = 0; - } - currentScope.reset( this ); - _error = ""; - } - -- void addRoot( void * root , const char * name ) { -- JS_AddNamedRoot( _context , root , name ); -- _roots.push_back( root ); -+ void addRoot( JSObject * obj ){ -+ JS_AddObjectRoot( _context , &obj ); -+ _roots.push_back( obj ); - } - - void init( const BSONObj * data ) { -@@ -1336,13 +1385,13 @@ namespace mongo { - void setThis( const BSONObj * obj ) { - smlock; - if ( _this ) { -- JS_RemoveRoot( _context , &_this ); -+ JS_RemoveObjectRoot( _context , &_this ); - _this = 0; - } - - if ( obj ) { - _this = _convertor->toJSObject( obj ); -- JS_AddNamedRoot( _context , &_this , "scope this" ); -+ JS_AddObjectRoot( _context , &_this ); - } - } - -@@ -1402,7 +1451,7 @@ namespace mongo { - spec->start = boost::posix_time::microsec_clock::local_time(); - spec->count = 0; - JS_SetContextPrivate( _context, (void*)spec ); --#if defined(SM181) && !defined(XULRUNNER190) -+#if JS_VERSION >= 181 && !defined(XULRUNNER190) - JS_SetOperationCallback( _context, _interrupt ); - #else - JS_SetBranchCallback( _context, interrupt ); -@@ -1412,7 +1461,7 @@ namespace mongo { - - void uninstallInterrupt( int timeoutMs ) { - if ( timeoutMs != 0 || ScriptEngine::haveCheckInterruptCallback() ) { --#if defined(SM181) && !defined(XULRUNNER190) -+#if JS_VERSION >= 181 && !defined(XULRUNNER190) - JS_SetOperationCallback( _context , 0 ); - #else - JS_SetBranchCallback( _context, 0 ); -@@ -1548,9 +1597,12 @@ namespace mongo { - - JSObject * _global; - JSObject * _this; -+#ifdef HAVE_COMPARTMENTS -+ JSCrossCompartmentCall * _call; -+#endif - - string _error; -- list<void*> _roots; -+ list<JSObject*> _roots; - - bool _externalSetup; - bool _localConnect; -@@ -1579,7 +1631,8 @@ namespace mongo { - } - } - -- JSBool native_load( JSContext *cx , JSObject *obj , uintN argc, jsval *argv , jsval *rval ) { -+ JSBool native_load( JSContext *cx , uintN argc, jsval *vp ){ -+ jsval *argv = JS_ARGV( cx , vp ); - Convertor c(cx); - - Scope * s = currentScope.get(); -@@ -1594,6 +1647,7 @@ namespace mongo { - } - } - -+ JS_SET_RVAL( cx , vp , JSVAL_VOID ); - return JS_TRUE; - } - -@@ -1633,7 +1687,7 @@ namespace mongo { - return new SMScope(); - } - -- void Convertor::addRoot( JSFunction * f , const char * name ) { -+ void Convertor::addRoot( JSFunction * f ){ - if ( ! f ) - return; - -@@ -1642,7 +1696,7 @@ namespace mongo { - - JSObject * o = JS_GetFunctionObject( f ); - assert( o ); -- scope->addRoot( &o , name ); -+ scope->addRoot( o ); - } - - } ---- mongodb-src-r1.8.0/scripting/engine_spidermonkey.h.mozjs185~ 2011-03-16 16:33:30.000000000 +0100 -+++ mongodb-src-r1.8.0/scripting/engine_spidermonkey.h 2011-04-01 21:29:15.697678508 +0200 -@@ -21,6 +21,9 @@ - - // START inc hacking - -+#undef malloc -+#undef realloc -+ - #if defined( MOZJS ) - - #define MOZILLA_1_8_BRANCH -@@ -55,6 +58,9 @@ - - #endif - -+#define malloc MONGO_malloc -+#define realloc MONGO_realloc -+ - // END inc hacking - - // -- SM 1.6 hacks --- -@@ -81,6 +87,10 @@ JSBool JS_CStringsAreUTF8() { - #define SM181 - #endif - -+#ifndef JSFUN_FAST_NATIVE -+#define JSFUN_FAST_NATIVE 0 -+#endif -+ - namespace mongo { - - class SMScope; -@@ -104,7 +114,7 @@ namespace mongo { - extern boost::thread_specific_ptr<SMScope> currentScope; - - // bson -- JSBool resolveBSONField( JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp ); -+ JSBool resolveBSONField( JSContext *cx, JSObject *obj, jsid id, uintN flags, JSObject **objp ); - - - // mongo ---- mongodb-src-r1.8.0/scripting/sm_db.cpp.mozjs185~ 2011-03-16 16:33:30.000000000 +0100 -+++ mongodb-src-r1.8.0/scripting/sm_db.cpp 2011-04-01 22:51:59.701652521 +0200 -@@ -79,13 +79,25 @@ namespace mongo { - return holder->get(); - } - -+#ifdef JSFUN_CONSTRUCTOR -+ JSBool internal_cursor_constructor( JSContext* cx, uintN argc, jsval* vp ){ -+ JSObject *obj = JS_NewObjectForConstructor( cx , vp ); -+ if( ! obj ) { -+ JS_ReportError( cx , "Failed to create 'this' object" ); -+ return JS_FALSE; -+ } -+#else - JSBool internal_cursor_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) { -+#endif - uassert( 10236 , "no args to internal_cursor_constructor" , argc == 0 ); - assert( JS_SetPrivate( cx , obj , 0 ) ); // just for safety -+#ifdef JSFUN_CONSTRUCTOR -+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) ); -+#endif - return JS_TRUE; - } - -- void internal_cursor_finalize( JSContext * cx , JSObject * obj ) { -+ void internal_cursor_finalize( JSContext * cx, JSObject * obj ){ - CursorHolder * holder = (CursorHolder*)JS_GetPrivate( cx , obj ); - if ( holder ) { - delete holder; -@@ -93,10 +105,11 @@ namespace mongo { - } - } - -- JSBool internal_cursor_hasNext(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -+ JSBool internal_cursor_hasNext(JSContext *cx , uintN argc , jsval *vp) { -+ JSObject* obj = JS_THIS_OBJECT( cx , vp ); - DBClientCursor *cursor = getCursor( cx, obj ); - try { -- *rval = cursor->more() ? JSVAL_TRUE : JSVAL_FALSE; -+ JS_SET_RVAL( cx , vp , cursor->more() ? JSVAL_TRUE : JSVAL_FALSE ); - } - catch ( std::exception& e ) { - JS_ReportError( cx , e.what() ); -@@ -105,14 +118,16 @@ namespace mongo { - return JS_TRUE; - } - -- JSBool internal_cursor_objsLeftInBatch(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -+ JSBool internal_cursor_objsLeftInBatch(JSContext *cx, uintN argc, jsval *vp) { -+ JSObject* obj = JS_THIS_OBJECT( cx , vp ); - DBClientCursor *cursor = getCursor( cx, obj ); - Convertor c(cx); -- *rval = c.toval((double) cursor->objsLeftInBatch() ); -+ JS_SET_RVAL( cx , vp , c.toval((double) cursor->objsLeftInBatch()) ); - return JS_TRUE; - } - -- JSBool internal_cursor_next(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -+ JSBool internal_cursor_next(JSContext *cx, uintN argc, jsval *vp) { -+ JSObject* obj = JS_THIS_OBJECT( cx , vp ); - DBClientCursor *cursor = getCursor( cx, obj ); - - BSONObj n; -@@ -131,20 +146,21 @@ namespace mongo { - } - - Convertor c(cx); -- *rval = c.toval( &n ); -+ JS_SET_RVAL( cx , vp , c.toval( &n ) ); - return JS_TRUE; - } - - JSFunctionSpec internal_cursor_functions[] = { -- { "hasNext" , internal_cursor_hasNext , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } , -- { "objsLeftInBatch" , internal_cursor_objsLeftInBatch , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } , -- { "next" , internal_cursor_next , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } , -- { 0 } -+ JS_FS( "hasNext" , internal_cursor_hasNext , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) , -+ JS_FS( "objsLeftInBatch" , internal_cursor_objsLeftInBatch , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) , -+ JS_FS( "next" , internal_cursor_next , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) , -+ JS_FS_END - }; - -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp) - JSClass internal_cursor_class = { - "InternalCursor" , JSCLASS_HAS_PRIVATE , -- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, -+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, - JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, internal_cursor_finalize, - JSCLASS_NO_OPTIONAL_MEMBERS - }; -@@ -157,7 +173,16 @@ namespace mongo { - throw -1; - } - -+#ifdef JSFUN_CONSTRUCTOR -+ JSBool mongo_local_constructor( JSContext* cx, uintN argc, jsval* vp ){ -+ JSObject *obj = JS_NewObjectForConstructor( cx , vp ); -+ if( ! obj ) { -+ JS_ReportError( cx , "Failed to create 'this' object" ); -+ return JS_FALSE; -+ } -+#else - JSBool mongo_local_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) { -+#endif - Convertor c( cx ); - - shared_ptr< DBClientWithCommands > client( createDirectClient() ); -@@ -166,10 +191,23 @@ namespace mongo { - jsval host = c.toval( "EMBEDDED" ); - assert( JS_SetProperty( cx , obj , "host" , &host ) ); - -+#ifdef JSFUN_CONSTRUCTOR -+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) ); -+#endif - return JS_TRUE; - } - -+#ifdef JSFUN_CONSTRUCTOR -+ JSBool mongo_external_constructor( JSContext* cx, uintN argc, jsval* vp ){ -+ jsval *argv = JS_ARGV( cx , vp ); -+ JSObject *obj = JS_NewObjectForConstructor( cx , vp ); -+ if( ! obj ) { -+ JS_ReportError( cx , "Failed to create 'this' object" ); -+ return JS_FALSE; -+ } -+#else - JSBool mongo_external_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) { -+#endif - Convertor c( cx ); - - smuassert( cx , "0 or 1 args to Mongo" , argc <= 1 ); -@@ -197,6 +235,9 @@ namespace mongo { - assert( JS_SetPrivate( cx , obj , (void*)( new shared_ptr< DBClientWithCommands >( conn ) ) ) ); - jsval host_val = c.toval( host.c_str() ); - assert( JS_SetProperty( cx , obj , "host" , &host_val ) ); -+#ifdef JSFUN_CONSTRUCTOR -+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) ); -+#endif - return JS_TRUE; - - } -@@ -215,14 +256,18 @@ namespace mongo { - } - } - -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp) - JSClass mongo_class = { - "Mongo" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE , -- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, -+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, - JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, mongo_finalize, - JSCLASS_NO_OPTIONAL_MEMBERS - }; - -- JSBool mongo_find(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -+ JSBool mongo_find(JSContext *cx, uintN argc, jsval *vp) { -+ JSObject* obj = JS_THIS_OBJECT( cx , vp ); -+ jsval* argv = JS_ARGV( cx , vp ); -+ - smuassert( cx , "mongo_find needs 7 args" , argc == 7 ); - shared_ptr< DBClientWithCommands > * connHolder = (shared_ptr< DBClientWithCommands >*)JS_GetPrivate( cx , obj ); - smuassert( cx , "no connection!" , connHolder && connHolder->get() ); -@@ -252,7 +297,8 @@ namespace mongo { - JSObject * mycursor = JS_NewObject( cx , &internal_cursor_class , 0 , 0 ); - CHECKNEWOBJECT( mycursor, cx, "internal_cursor_class" ); - assert( JS_SetPrivate( cx , mycursor , new CursorHolder( cursor, *connHolder ) ) ); -- *rval = OBJECT_TO_JSVAL( mycursor ); -+ -+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( mycursor )); - return JS_TRUE; - } - catch ( ... ) { -@@ -261,7 +307,10 @@ namespace mongo { - } - } - -- JSBool mongo_update(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -+ JSBool mongo_update(JSContext *cx, uintN argc, jsval *vp) { -+ JSObject* obj = JS_THIS_OBJECT( cx , vp ); -+ jsval* argv = JS_ARGV( cx , vp ); -+ - smuassert( cx , "mongo_find needs at elast 3 args" , argc >= 3 ); - smuassert( cx , "2nd param to update has to be an object" , JSVAL_IS_OBJECT( argv[1] ) ); - smuassert( cx , "3rd param to update has to be an object" , JSVAL_IS_OBJECT( argv[2] ) ); -@@ -282,6 +331,7 @@ namespace mongo { - - try { - conn->update( ns , c.toObject( argv[1] ) , c.toObject( argv[2] ) , upsert , multi ); -+ JS_SET_RVAL( cx , vp , JSVAL_VOID ); - return JS_TRUE; - } - catch ( ... ) { -@@ -290,7 +340,10 @@ namespace mongo { - } - } - -- JSBool mongo_insert(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -+ JSBool mongo_insert(JSContext *cx, uintN argc, jsval *vp) { -+ JSObject* obj = JS_THIS_OBJECT( cx , vp ); -+ jsval* argv = JS_ARGV( cx , vp ); -+ - smuassert( cx , "mongo_insert needs 2 args" , argc == 2 ); - smuassert( cx , "2nd param to insert has to be an object" , JSVAL_IS_OBJECT( argv[1] ) ); - -@@ -310,6 +363,7 @@ namespace mongo { - // TODO: add _id - - conn->insert( ns , o ); -+ JS_SET_RVAL( cx, vp, JSVAL_VOID ); - return JS_TRUE; - } - catch ( std::exception& e ) { -@@ -325,7 +379,10 @@ namespace mongo { - } - } - -- JSBool mongo_remove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -+ JSBool mongo_remove(JSContext *cx, uintN argc, jsval *vp) { -+ JSObject* obj = JS_THIS_OBJECT( cx , vp ); -+ jsval* argv = JS_ARGV( cx , vp ); -+ - smuassert( cx , "mongo_remove needs 2 or 3 arguments" , argc == 2 || argc == 3 ); - smuassert( cx , "2nd param to insert has to be an object" , JSVAL_IS_OBJECT( argv[1] ) ); - -@@ -346,6 +403,7 @@ namespace mongo { - - try { - conn->remove( ns , o , justOne ); -+ JS_SET_RVAL( cx , vp , JSVAL_VOID ); - return JS_TRUE; - } - catch ( std::exception& e ) { -@@ -361,16 +419,26 @@ namespace mongo { - } - - JSFunctionSpec mongo_functions[] = { -- { "find" , mongo_find , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } , -- { "update" , mongo_update , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } , -- { "insert" , mongo_insert , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } , -- { "remove" , mongo_remove , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } , -- { 0 } -+ JS_FS( "find" , mongo_find , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) , -+ JS_FS( "update" , mongo_update , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) , -+ JS_FS( "insert" , mongo_insert , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) , -+ JS_FS( "remove" , mongo_remove , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) , -+ JS_FS_END - }; - - // ------------- db_collection ------------- - -+#ifdef JSFUN_CONSTRUCTOR -+ JSBool db_collection_constructor( JSContext* cx, uintN argc, jsval* vp ){ -+ jsval *argv = JS_ARGV( cx , vp ); -+ JSObject *obj = JS_NewObjectForConstructor( cx , vp ); -+ if( ! obj ) { -+ JS_ReportError( cx , "Failed to create 'this' object" ); -+ return JS_FALSE; -+ } -+#else - JSBool db_collection_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) { -+#endif - smuassert( cx , "db_collection_constructor wrong args" , argc == 4 ); - assert( JS_SetProperty( cx , obj , "_mongo" , &(argv[0]) ) ); - assert( JS_SetProperty( cx , obj , "_db" , &(argv[1]) ) ); -@@ -382,16 +450,22 @@ namespace mongo { - JS_ReportError( cx , "can't use sharded collection from db.eval" ); - return JS_FALSE; - } -- -+#ifdef JSFUN_CONSTRUCTOR -+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) ); -+#endif - return JS_TRUE; - } - -- JSBool db_collection_resolve( JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp ) { -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSResolveOp) -+ JSBool db_collection_resolve( JSContext *cx, JSObject *obj, jsid id, uintN flags, JSObject **objp ){ -+ jsval idval; -+ JS_IdToValue( cx , id , &idval ); -+ - if ( flags & JSRESOLVE_ASSIGNING ) - return JS_TRUE; - - Convertor c( cx ); -- string collname = c.toString( id ); -+ string collname = c.toString( idval ); - - if ( isSpecialName( collname ) ) - return JS_TRUE; -@@ -419,10 +493,11 @@ namespace mongo { - return JS_TRUE; - } - -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp, JSResolveOp) - JSClass db_collection_class = { - "DBCollection" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE , -- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, -- JS_EnumerateStub, (JSResolveOp)(&db_collection_resolve) , JS_ConvertStub, JS_FinalizeStub, -+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, -+ JS_EnumerateStub, (JSResolveOp)db_collection_resolve , JS_ConvertStub, JS_FinalizeStub, - JSCLASS_NO_OPTIONAL_MEMBERS - }; - -@@ -454,15 +529,32 @@ namespace mongo { - // -------------- DB --------------- - - -+#ifdef JSFUN_CONSTRUCTOR -+ JSBool db_constructor( JSContext* cx, uintN argc, jsval* vp ){ -+ jsval *argv = JS_ARGV( cx , vp ); -+ JSObject *obj = JS_NewObjectForConstructor( cx , vp ); -+ if( ! obj ) { -+ JS_ReportError( cx , "Failed to create 'this' object" ); -+ return JS_FALSE; -+ } -+#else - JSBool db_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) { -+#endif - smuassert( cx, "wrong number of arguments to DB" , argc == 2 ); - assert( JS_SetProperty( cx , obj , "_mongo" , &(argv[0]) ) ); - assert( JS_SetProperty( cx , obj , "_name" , &(argv[1]) ) ); - -+#ifdef JSFUN_CONSTRUCTOR -+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) ); -+#endif -+ - return JS_TRUE; - } - -- JSBool db_resolve( JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp ) { -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSResolveOp) -+ JSBool db_resolve( JSContext *cx, JSObject *obj, jsid id, uintN flags, JSObject **objp ){ -+ jsval idval; -+ JS_IdToValue( cx , id , &idval ); - if ( flags & JSRESOLVE_ASSIGNING ) - return JS_TRUE; - -@@ -471,7 +563,7 @@ namespace mongo { - if ( obj == c.getGlobalPrototype( "DB" ) ) - return JS_TRUE; - -- string collname = c.toString( id ); -+ string collname = c.toString( idval ); - - if ( isSpecialName( collname ) ) - return JS_TRUE; -@@ -489,17 +581,28 @@ namespace mongo { - return JS_TRUE; - } - -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp, JSResolveOp) - JSClass db_class = { - "DB" , JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE , -- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, -- JS_EnumerateStub, (JSResolveOp)(&db_resolve) , JS_ConvertStub, JS_FinalizeStub, -+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, -+ JS_EnumerateStub, (JSResolveOp)db_resolve , JS_ConvertStub, JS_FinalizeStub, - JSCLASS_NO_OPTIONAL_MEMBERS - }; - - - // -------------- object id ------------- - -+#ifdef JSFUN_CONSTRUCTOR -+ JSBool object_id_constructor( JSContext* cx, uintN argc, jsval* vp ){ -+ jsval *argv = JS_ARGV( cx , vp ); -+ JSObject *obj = JS_NewObjectForConstructor( cx , vp ); -+ if( ! obj ) { -+ JS_ReportError( cx , "Failed to create 'this' object" ); -+ return JS_FALSE; -+ } -+#else - JSBool object_id_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) { -+#endif - Convertor c( cx ); - - OID oid; -@@ -524,35 +627,48 @@ namespace mongo { - if ( ! JS_InstanceOf( cx , obj , &object_id_class , 0 ) ) { - obj = JS_NewObject( cx , &object_id_class , 0 , 0 ); - CHECKNEWOBJECT( obj, cx, "object_id_constructor" ); -- *rval = OBJECT_TO_JSVAL( obj ); - } - - jsval v = c.toval( oid.str().c_str() ); - assert( JS_SetProperty( cx , obj , "str" , &v ) ); - -+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) ); - return JS_TRUE; - } - -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp) - JSClass object_id_class = { - "ObjectId" , JSCLASS_HAS_PRIVATE , -- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, -+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, - JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub, - JSCLASS_NO_OPTIONAL_MEMBERS - }; - -- JSBool object_id_tostring(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -+ JSBool object_id_tostring(JSContext *cx, uintN argc, jsval *vp){ -+ JSObject *obj = JS_THIS_OBJECT( cx , vp ); - Convertor c(cx); -- return (JSBool) (*rval = c.getProperty( obj , "str" )); -+ JS_SET_RVAL( cx , vp , c.getProperty( obj , "str" )); -+ return JS_TRUE; - } - - JSFunctionSpec object_id_functions[] = { -- { "toString" , object_id_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } , -- { 0 } -+ JS_FS( "toString" , object_id_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) , -+ JS_FS_END - }; - - // dbpointer - -+#ifdef JSFUN_CONSTRUCTOR -+ JSBool dbpointer_constructor( JSContext* cx, uintN argc, jsval* vp ){ -+ jsval *argv = JS_ARGV( cx , vp ); -+ JSObject *obj = JS_NewObjectForConstructor( cx , vp ); -+ if( ! obj ) { -+ JS_ReportError( cx , "Failed to create 'this' object" ); -+ return JS_FALSE; -+ } -+#else - JSBool dbpointer_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) { -+#endif - Convertor c( cx ); - - if ( argc == 2 ) { -@@ -564,6 +680,9 @@ namespace mongo { - - assert( JS_SetProperty( cx , obj , "ns" , &(argv[0]) ) ); - assert( JS_SetProperty( cx , obj , "id" , &(argv[1]) ) ); -+#ifdef JSFUN_CONSTRUCTOR -+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) ); -+#endif - return JS_TRUE; - } - else { -@@ -572,19 +691,30 @@ namespace mongo { - } - } - -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp) - JSClass dbpointer_class = { - "DBPointer" , JSCLASS_HAS_PRIVATE , -- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, -+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, - JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub, - JSCLASS_NO_OPTIONAL_MEMBERS - }; - - JSFunctionSpec dbpointer_functions[] = { -- { 0 } -+ JS_FS_END - }; - - -+#ifdef JSFUN_CONSTRUCTOR -+ JSBool dbref_constructor( JSContext* cx, uintN argc, jsval* vp ){ -+ jsval *argv = JS_ARGV( cx , vp ); -+ JSObject *obj = JS_NewObjectForConstructor( cx , vp ); -+ if( ! obj ) { -+ JS_ReportError( cx , "Failed to create 'this' object" ); -+ return JS_FALSE; -+ } -+#else - JSBool dbref_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) { -+#endif - Convertor c( cx ); - - if ( argc == 2 ) { -@@ -594,6 +724,9 @@ namespace mongo { - assert( JS_SetProperty( cx, o , "$id" , &argv[ 1 ] ) ); - BSONObj bo = c.toObject( o ); - assert( JS_SetPrivate( cx , obj , (void*)(new BSONHolder( bo.getOwned() ) ) ) ); -+#ifdef JSFUN_CONSTRUCTOR -+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) ); -+#endif - return JS_TRUE; - } - else { -@@ -607,7 +740,17 @@ namespace mongo { - - // UUID ************************** - -+#ifdef JSFUN_CONSTRUCTOR -+ JSBool uuid_constructor( JSContext* cx, uintN argc, jsval* vp ){ -+ jsval *argv = JS_ARGV( cx , vp ); -+ JSObject *obj = JS_NewObjectForConstructor( cx , vp ); -+ if( ! obj ) { -+ JS_ReportError( cx , "Failed to create 'this' object" ); -+ return JS_FALSE; -+ } -+#else - JSBool uuid_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) { -+#endif - Convertor c( cx ); - - if( argc == 0 ) { -@@ -635,6 +778,9 @@ namespace mongo { - c.setProperty( obj, "len", c.toval( (double)16 ) ); - c.setProperty( obj, "type", c.toval( (double)3 ) ); - -+#ifdef JSFUN_CONSTRUCTOR -+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) ); -+#endif - return JS_TRUE; - } - else { -@@ -643,7 +789,8 @@ namespace mongo { - } - } - -- JSBool uuid_tostring(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -+ JSBool uuid_tostring(JSContext *cx, uintN argc, jsval *vp){ -+ JSObject *obj = JS_THIS_OBJECT( cx , vp ); - Convertor c(cx); - void *holder = JS_GetPrivate( cx, obj ); - assert( holder ); -@@ -652,7 +799,8 @@ namespace mongo { - ss << "UUID(\"" << toHex(data, 16); - ss << "\")"; - string ret = ss.str(); -- return *rval = c.toval( ret.c_str() ); -+ JS_SET_RVAL( cx , vp , c.toval( ret.c_str() ) ); -+ return JS_TRUE; - } - - void uuid_finalize( JSContext * cx , JSObject * obj ) { -@@ -664,21 +812,32 @@ namespace mongo { - } - } - -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp) - JSClass uuid_class = { - "UUID" , JSCLASS_HAS_PRIVATE , -- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, -+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, - JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, uuid_finalize, - JSCLASS_NO_OPTIONAL_MEMBERS - }; - - JSFunctionSpec uuid_functions[] = { -- { "toString" , uuid_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } , -- { 0 } -+ JS_FS( "toString" , uuid_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) , -+ JS_FS_END - }; - - // BinData ************************** - -+#ifdef JSFUN_CONSTRUCTOR -+ JSBool bindata_constructor( JSContext* cx, uintN argc, jsval* vp ){ -+ jsval *argv = JS_ARGV( cx , vp ); -+ JSObject *obj = JS_NewObjectForConstructor( cx , vp ); -+ if( ! obj ) { -+ JS_ReportError( cx , "Failed to create 'this' object" ); -+ return JS_FALSE; -+ } -+#else - JSBool bindata_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) { -+#endif - Convertor c( cx ); - - if ( argc == 2 ) { -@@ -702,6 +861,9 @@ namespace mongo { - c.setProperty( obj, "len", c.toval( (double)decoded.length() ) ); - c.setProperty( obj, "type", c.toval( (double)type ) ); - -+#ifdef JSFUN_CONSTRUCTOR -+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) ); -+#endif - return JS_TRUE; - } - else { -@@ -710,7 +872,8 @@ namespace mongo { - } - } - -- JSBool bindata_tostring(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -+ JSBool bindata_tostring(JSContext *cx, uintN argc, jsval *vp){ -+ JSObject *obj = JS_THIS_OBJECT( cx , vp ); - Convertor c(cx); - int type = (int)c.getNumber( obj , "type" ); - int len = (int)c.getNumber( obj, "len" ); -@@ -722,10 +885,12 @@ namespace mongo { - base64::encode( ss, (const char *)data, len ); - ss << "\")"; - string ret = ss.str(); -- return *rval = c.toval( ret.c_str() ); -+ JS_SET_RVAL( cx , vp , c.toval( ret.c_str() ) ); -+ return JS_TRUE; - } - -- JSBool bindataBase64(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -+ JSBool bindataBase64(JSContext *cx, uintN argc, jsval *vp){ -+ JSObject *obj = JS_THIS_OBJECT( cx , vp ); - Convertor c(cx); - int len = (int)c.getNumber( obj, "len" ); - void *holder = JS_GetPrivate( cx, obj ); -@@ -734,10 +899,12 @@ namespace mongo { - stringstream ss; - base64::encode( ss, (const char *)data, len ); - string ret = ss.str(); -- return *rval = c.toval( ret.c_str() ); -+ JS_SET_RVAL( cx , vp , c.toval( ret.c_str() ) ); -+ return JS_TRUE; - } - -- JSBool bindataAsHex(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -+ JSBool bindataAsHex(JSContext *cx, uintN argc, jsval *vp){ -+ JSObject *obj = JS_THIS_OBJECT( cx , vp ); - Convertor c(cx); - int len = (int)c.getNumber( obj, "len" ); - void *holder = JS_GetPrivate( cx, obj ); -@@ -750,19 +917,24 @@ namespace mongo { - ss << v; - } - string ret = ss.str(); -- return *rval = c.toval( ret.c_str() ); -+ JS_SET_RVAL( cx , vp , c.toval( ret.c_str() ) ); -+ return JS_TRUE; - } - -- JSBool bindataLength(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -+ JSBool bindataLength(JSContext *cx, uintN argc, jsval *vp){ -+ JSObject *obj = JS_THIS_OBJECT( cx , vp ); - Convertor c(cx); - int len = (int)c.getNumber( obj, "len" ); -- return *rval = c.toval((double) len); -+ JS_SET_RVAL( cx , vp , c.toval((double) len) ); -+ return JS_TRUE; - } - -- JSBool bindataSubtype(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -+ JSBool bindataSubtype(JSContext *cx, uintN argc, jsval *vp){ -+ JSObject *obj = JS_THIS_OBJECT( cx , vp ); - Convertor c(cx); - int t = (int)c.getNumber( obj, "type" ); -- return *rval = c.toval((double) t); -+ JS_SET_RVAL( cx , vp , c.toval((double) t) ); -+ return JS_TRUE; - } - - void bindata_finalize( JSContext * cx , JSObject * obj ) { -@@ -774,20 +946,21 @@ namespace mongo { - } - } - -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp) - JSClass bindata_class = { - "BinData" , JSCLASS_HAS_PRIVATE , -- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, -+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, - JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, bindata_finalize, - JSCLASS_NO_OPTIONAL_MEMBERS - }; - - JSFunctionSpec bindata_functions[] = { -- { "toString" , bindata_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } , -- { "hex", bindataAsHex, 0, JSPROP_READONLY | JSPROP_PERMANENT, 0 } , -- { "base64", bindataBase64, 0, JSPROP_READONLY | JSPROP_PERMANENT, 0 } , -- { "length", bindataLength, 0, JSPROP_READONLY | JSPROP_PERMANENT, 0 } , -- { "subtype", bindataSubtype, 0, JSPROP_READONLY | JSPROP_PERMANENT, 0 } , -- { 0 } -+ JS_FS( "toString" , bindata_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) , -+ JS_FS( "hex", bindataAsHex, 0, JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) , -+ JS_FS( "base64", bindataBase64, 0, JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) , -+ JS_FS( "length", bindataLength, 0, JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) , -+ JS_FS( "subtype", bindataSubtype, 0, JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) , -+ JS_FS_END - }; - - // Map -@@ -796,7 +969,16 @@ namespace mongo { - return s == "put" || s == "get" || s == "_get" || s == "values" || s == "_data" || s == "constructor" ; - } - -+#ifdef JSFUN_CONSTRUCTOR -+ JSBool map_constructor( JSContext* cx, uintN argc, jsval* vp ){ -+ JSObject *obj = JS_NewObjectForConstructor( cx , vp ); -+ if( ! obj ) { -+ JS_ReportError( cx , "Failed to create 'this' object" ); -+ return JS_FALSE; -+ } -+#else - JSBool map_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) { -+#endif - if ( argc > 0 ) { - JS_ReportError( cx , "Map takes no arguments" ); - return JS_FALSE; -@@ -808,10 +990,16 @@ namespace mongo { - jsval a = OBJECT_TO_JSVAL( array ); - JS_SetProperty( cx , obj , "_data" , &a ); - -+#ifdef JSFUN_CONSTRUCTOR -+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) ); -+#endif - return JS_TRUE; - } - -- JSBool map_prop( JSContext *cx, JSObject *obj, jsval idval, jsval *vp ) { -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSPropertyOp) -+ JSBool map_prop( JSContext *cx, JSObject *obj, jsid id, jsval *vp ){ -+ jsval idval; -+ JS_IdToValue( cx , id , &idval ); - Convertor c(cx); - if ( specialMapString( c.toString( idval ) ) ) - return JS_TRUE; -@@ -821,34 +1009,49 @@ namespace mongo { - return JS_FALSE; - } - -+ JSBool strict_map_prop( JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp ){ -+ return map_prop( cx , obj , id , vp ); -+ } -+ -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp) - JSClass map_class = { - "Map" , JSCLASS_HAS_PRIVATE , -- map_prop, JS_PropertyStub, map_prop, map_prop, -+ map_prop, JS_PropertyStub, map_prop, strict_map_prop, - JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub, - JSCLASS_NO_OPTIONAL_MEMBERS - }; - - JSFunctionSpec map_functions[] = { -- { 0 } -+ JS_FS_END - }; - - - // ----- - -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp) - JSClass timestamp_class = { - "Timestamp" , JSCLASS_HAS_PRIVATE , -- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, -+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, - JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub, - JSCLASS_NO_OPTIONAL_MEMBERS - }; - -+#ifdef JSFUN_CONSTRUCTOR -+ JSBool timestamp_constructor( JSContext* cx, uintN argc, jsval* vp ){ -+ jsval *argv = JS_ARGV( cx , vp ); -+ JSObject *obj = JS_NewObjectForConstructor( cx , vp ); -+ if( ! obj ) { -+ JS_ReportError( cx , "Failed to create 'this' object" ); -+ return JS_FALSE; -+ } -+#else - JSBool timestamp_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) { -+#endif - smuassert( cx , "Timestamp needs 0 or 2 args" , argc == 0 || argc == 2 ); - - if ( ! JS_InstanceOf( cx , obj , ×tamp_class , 0 ) ) { - obj = JS_NewObject( cx , ×tamp_class , 0 , 0 ); - CHECKNEWOBJECT( obj, cx, "timestamp_constructor" ); -- *rval = OBJECT_TO_JSVAL( obj ); - } - - Convertor c( cx ); -@@ -864,21 +1067,30 @@ namespace mongo { - return JS_TRUE; - } - -- -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp) - JSClass numberlong_class = { - "NumberLong" , JSCLASS_HAS_PRIVATE , -- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, -+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, - JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub, - JSCLASS_NO_OPTIONAL_MEMBERS - }; - -+#ifdef JSFUN_CONSTRUCTOR -+ JSBool numberlong_constructor( JSContext* cx, uintN argc, jsval* vp ){ -+ jsval *argv = JS_ARGV( cx , vp ); -+ JSObject *obj = JS_NewObjectForConstructor( cx , vp ); -+ if( ! obj ) { -+ JS_ReportError( cx , "Failed to create 'this' object" ); -+ return JS_FALSE; -+ } -+#else - JSBool numberlong_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) { -+#endif - smuassert( cx , "NumberLong needs 0 or 1 args" , argc == 0 || argc == 1 ); - - if ( ! JS_InstanceOf( cx , obj , &numberlong_class , 0 ) ) { - obj = JS_NewObject( cx , &numberlong_class , 0 , 0 ); - CHECKNEWOBJECT( obj, cx, "numberlong_constructor" ); -- *rval = OBJECT_TO_JSVAL( obj ); - } - - Convertor c( cx ); -@@ -903,19 +1115,25 @@ namespace mongo { - c.makeLongObj( n, obj ); - } - -+#ifdef JSFUN_CONSTRUCTOR -+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) ); -+#endif - return JS_TRUE; - } - -- JSBool numberlong_valueof(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -+ JSBool numberlong_valueof(JSContext *cx, uintN argc, jsval *vp){ -+ JSObject *obj = JS_THIS_OBJECT( cx , vp ); - Convertor c(cx); -- return *rval = c.toval( double( c.toNumberLongUnsafe( obj ) ) ); -+ JS_SET_RVAL( cx , vp , c.toval( double( c.toNumberLongUnsafe( obj ) ) ) ); -+ return JS_TRUE; - } - -- JSBool numberlong_tonumber(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -- return numberlong_valueof( cx, obj, argc, argv, rval ); -+ JSBool numberlong_tonumber(JSContext *cx, uintN argc, jsval *vp){ -+ return numberlong_valueof( cx, argc, vp ); - } - -- JSBool numberlong_tostring(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { -+ JSBool numberlong_tostring(JSContext *cx, uintN argc, jsval *vp){ -+ JSObject *obj = JS_THIS_OBJECT( cx , vp ); - Convertor c(cx); - stringstream ss; - long long val = c.toNumberLongUnsafe( obj ); -@@ -927,33 +1145,45 @@ namespace mongo { - ss << "NumberLong(" << val << ")"; - - string ret = ss.str(); -- return *rval = c.toval( ret.c_str() ); -+ JS_SET_RVAL( cx , vp , c.toval( ret.c_str() ) ); -+ return JS_TRUE; - } - - JSFunctionSpec numberlong_functions[] = { -- { "valueOf" , numberlong_valueof , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } , -- { "toNumber" , numberlong_tonumber , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } , -- { "toString" , numberlong_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT, 0 } , -- { 0 } -+ JS_FS( "valueOf" , numberlong_valueof , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) , -+ JS_FS( "toNumber" , numberlong_tonumber , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) , -+ JS_FS( "toString" , numberlong_tostring , 0 , JSPROP_READONLY | JSPROP_PERMANENT | JSFUN_FAST_NATIVE ) , -+ JS_FS_END - }; - -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp) - JSClass minkey_class = { - "MinKey" , JSCLASS_HAS_PRIVATE , -- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, -+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, - JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub, - JSCLASS_NO_OPTIONAL_MEMBERS - }; - - JSClass maxkey_class = { - "MaxKey" , JSCLASS_HAS_PRIVATE , -- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, -+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, - JS_EnumerateStub, JS_ResolveStub , JS_ConvertStub, JS_FinalizeStub, - JSCLASS_NO_OPTIONAL_MEMBERS - }; - - // dbquery - -+#ifdef JSFUN_CONSTRUCTOR -+ JSBool dbquery_constructor( JSContext* cx, uintN argc, jsval* vp ){ -+ jsval *argv = JS_ARGV( cx , vp ); -+ JSObject *obj = JS_NewObjectForConstructor( cx , vp ); -+ if( ! obj ) { -+ JS_ReportError( cx , "Failed to create 'this' object" ); -+ return JS_FALSE; -+ } -+#else - JSBool dbquery_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ) { -+#endif - smuassert( cx , "DDQuery needs at least 4 args" , argc >= 4 ); - - Convertor c(cx); -@@ -1001,28 +1231,35 @@ namespace mongo { - c.setProperty( obj , "_numReturned" , JSVAL_ZERO ); - c.setProperty( obj , "_special" , JSVAL_FALSE ); - -+#ifdef JSFUN_CONSTRUCTOR -+ JS_SET_RVAL( cx , vp , OBJECT_TO_JSVAL( obj ) ); -+#endif - return JS_TRUE; - } - -- JSBool dbquery_resolve( JSContext *cx, JSObject *obj, jsval id, uintN flags, JSObject **objp ) { -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSResolveOp) -+ JSBool dbquery_resolve( JSContext *cx, JSObject *obj, jsid id, uintN flags, JSObject **objp ){ -+ jsval idval; -+ JS_IdToValue( cx , id , &idval ); - if ( flags & JSRESOLVE_ASSIGNING ) - return JS_TRUE; - -- if ( ! JSVAL_IS_NUMBER( id ) ) -+ if ( ! JSVAL_IS_NUMBER( idval ) ) - return JS_TRUE; - - jsval val = JSVAL_VOID; -- assert( JS_CallFunctionName( cx , obj , "arrayAccess" , 1 , &id , &val ) ); -+ assert( JS_CallFunctionName( cx , obj , "arrayAccess" , 1 , &idval , &val ) ); - Convertor c(cx); -- c.setProperty( obj , c.toString( id ).c_str() , val ); -+ c.setProperty( obj , c.toString( idval ).c_str() , val ); - *objp = obj; - return JS_TRUE; - } - -+ // FIXME: This won't build on spidermonkey < 1.8.5 (JSStrictPropertyOp, JSResolveOp) - JSClass dbquery_class = { - "DBQuery" , JSCLASS_NEW_RESOLVE , -- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, -- JS_EnumerateStub, (JSResolveOp)(&dbquery_resolve) , JS_ConvertStub, JS_FinalizeStub, -+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, -+ JS_EnumerateStub, (JSResolveOp)dbquery_resolve , JS_ConvertStub, JS_FinalizeStub, - JSCLASS_NO_OPTIONAL_MEMBERS - }; - -@@ -1102,7 +1339,7 @@ namespace mongo { - return true; - } - --#if defined( SM16 ) || defined( MOZJS ) -+#if defined( SM16 ) || JS_VERSION >= 181 - #warning dates do not work in your version of spider monkey - { - jsdouble d = js_DateGetMsecSinceEpoch( c->_context , o ); -@@ -1150,7 +1387,7 @@ namespace mongo { - } - - bool isDate( JSContext * cx , JSObject * o ) { --#if defined( SM16 ) || defined( MOZJS ) || defined( XULRUNNER ) -+#if defined( SM16 ) || JS_VERSION >= 181 || defined( XULRUNNER ) - return js_DateGetMsecSinceEpoch( cx , o ) != 0; - #else - return JS_InstanceOf( cx , o, &js_DateClass, 0 ); diff --git a/community-testing/mongodb/mongodb.conf b/community-testing/mongodb/mongodb.conf deleted file mode 100644 index c5272b7f2..000000000 --- a/community-testing/mongodb/mongodb.conf +++ /dev/null @@ -1,8 +0,0 @@ -# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details -# Run mongod --help to see a list of options - -bind_ip = 127.0.0.1 -quiet = true -dbpath = /var/lib/mongodb -logpath = /var/log/mongodb/mongod.log -logappend = true diff --git a/community-testing/mongodb/mongodb.install b/community-testing/mongodb/mongodb.install deleted file mode 100755 index 3922c12ef..000000000 --- a/community-testing/mongodb/mongodb.install +++ /dev/null @@ -1,32 +0,0 @@ -# vim: syntax=sh - -post_install() { - useradd -r -g daemon -d /var/lib/mongodb -s /bin/bash mongodb - chown -R mongodb:daemon /var/lib/mongodb - chown -R mongodb:daemon /var/log/mongodb - - if [ "$(arch)" != "x86_64" ] - then - echo '==> Warning: the 32 bit version of MongoDB is limited to about 2GB of data.' - echo '==> See http://blog.mongodb.org/post/137788967/32-bit-limitations' - fi -} - -post_upgrade() { - chown -R mongodb:daemon /var/lib/mongodb - chown -R mongodb:daemon /var/log/mongodb - - if [ "$(vercmp $2 1.8.2-3)" -lt 0 ] - then - # have to fix my fudge up in 1.8.2-2 and 1.8.2-3 - # added july 5th, 2011 - usermod -s /bin/bash mongodb >& /dev/null - echo 'The dbpath has changed from /var/state/mongodb to /var/lib/mongodb' - echo 'Make sure you move your data files to the new dbpath before you start/restart mongodb' - echo 'The logpath has changed from /var/log/mongod to /var/log/mongodb/mongod.log' - fi -} - -pre_remove() { - userdel mongodb -} diff --git a/community-testing/mongodb/mongodb.rc b/community-testing/mongodb/mongodb.rc deleted file mode 100755 index 517258f63..000000000 --- a/community-testing/mongodb/mongodb.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -# vim: syntax=sh - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof /usr/bin/mongod` -case "$1" in - start) - stat_busy "Starting mongodb" - [ -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --fork" > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon mongodb - stat_done - fi - ;; - stop) - stat_busy "Stopping mongodb" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mongodb - while [ ! -z "$(pidof /usr/bin/mongod)" ]; do - sleep 1; - done - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/net6/PKGBUILD b/community-testing/net6/PKGBUILD deleted file mode 100644 index 1d5a6e025..000000000 --- a/community-testing/net6/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 53842 2011-08-08 20:25:54Z spupykin $ -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - -pkgname=net6 -pkgver=1.3.12 -pkgrel=2 -pkgdesc="A library that provides a TCP protocol abstraction for C++" -arch=('i686' 'x86_64') -url="http://gobby.0x539.de/" -license=('LGPL') -depends=('gnutls' 'libsigc++2.0') -options=('!libtool') -source=(http://releases.0x539.de/$pkgname/$pkgname-$pkgver.tar.gz - build-fix.patch) -md5sums=('506776416d8aea2b9ea13a81f9145383' - '18ac67590d6bce0a0a4a6a21af8da429') - -build() { - cd ${srcdir}/$pkgname-$pkgver - patch -Rp1 <$srcdir/build-fix.patch - ./configure --prefix=/usr - make - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/net6/build-fix.patch b/community-testing/net6/build-fix.patch deleted file mode 100644 index 7e932bce6..000000000 --- a/community-testing/net6/build-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp net6-1.3.12/inc/encrypt.hpp ---- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp 2011-08-09 00:19:29.000000000 +0400 -+++ net6-1.3.12/inc/encrypt.hpp 2009-11-15 16:02:46.000000000 +0300 -@@ -34,7 +34,7 @@ - typedef gnutls_anon_server_credentials gnutls_anon_server_credentials_t; - typedef gnutls_transport_ptr gnutls_transport_ptr_t; - typedef gnutls_dh_params gnutls_dh_params_t; --//typedef gnutls_connection_end gnutls_connection_end_t; -+typedef gnutls_connection_end gnutls_connection_end_t; - - class dh_params: private net6::non_copyable - { -diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp net6-1.3.12/src/encrypt.cpp ---- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp 2011-08-09 00:20:12.000000000 +0400 -+++ net6-1.3.12/src/encrypt.cpp 2009-11-15 16:02:46.000000000 +0300 -@@ -25,7 +25,7 @@ - { - const unsigned int DH_BITS = 1024; - -- net6::gnutls_session_t create_session(gnutls_connection_end_t end) -+ net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end) - { - net6::gnutls_session_t session; - gnutls_init(&session, end); diff --git a/community-testing/nzbget/ChangeLog b/community-testing/nzbget/ChangeLog deleted file mode 100644 index 74030cd3d..000000000 --- a/community-testing/nzbget/ChangeLog +++ /dev/null @@ -1,18 +0,0 @@ -2010-05-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Fixed FS#19399 - missing postprocess-example.conf file - -2010-05-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 0.7.0 - -2009-10-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Dependency added (gnutls) in v0.6.0-2 - -2008-03-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 0.6.0 - -2008-09-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 0.5.1 - -2008-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Package moved to [community] - * Update to major release 0.5.0 diff --git a/community-testing/nzbget/PKGBUILD b/community-testing/nzbget/PKGBUILD deleted file mode 100644 index 278e38ac8..000000000 --- a/community-testing/nzbget/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 53834 2011-08-08 19:30:16Z jelle $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - -pkgname=nzbget -pkgver=0.7.0 -pkgrel=3 -pkgdesc="Downloads from Usenet using .nzb files" -arch=('i686' 'x86_64') -url="http://nzbget.sourceforge.net/" -license=('GPL') -depends=('gnutls' 'libpar2' 'libxml2' 'ncurses') -makedepends=('autoconf' 'automake') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('27971846aba75f5e312d80dce7edbc5d') - -build() { - cd ${srcdir}/$pkgname-$pkgver - -# autoreconf -fi || return 1 -#uudeview ("uulib") has been removed, and "it did not work well anyway" - ./configure --prefix=/usr --enable-parcheck || return 1 - make -} -package() { - cd ${srcdir}/$pkgname-$pkgver - make DESTDIR=${pkgdir} install - -#other files - install -d ${pkgdir}/usr/share/$pkgname || return 1 - install -m644 -t ${pkgdir}/usr/share/$pkgname \ - AUTHORS postprocess-example.sh postprocess-example.conf \ - ChangeLog nzbget.conf.example README || return 1 -} diff --git a/community-testing/remmina-plugins/PKGBUILD b/community-testing/remmina-plugins/PKGBUILD deleted file mode 100644 index 9e4534e2f..000000000 --- a/community-testing/remmina-plugins/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 53731 2011-08-07 21:45:50Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Stijn Segers <francesco dot borromini at gmail dot com> - -pkgname=remmina-plugins -pkgver=0.9.2 -pkgrel=2 -pkgdesc="Remina plugins" -#"Remmina supports multiple network protocols in an integrated and consistant user interface. -# Currently RDP, VNC, XDMCP and SSH are supported." -arch=(i686 x86_64) -url="http://sourceforge.net/projects/remmina/" -license=('GPL') -conflicts=(remmina-plugins-svn) -depends=("remmina>=0.9.0" freerdp libxkbfile telepathy-glib) -makedepends=(intltool pkgconfig gettext perl avahi) -install=remmina-plugins.install -options=('!libtool') -source=(http://downloads.sourceforge.net/project/remmina/0.9/$pkgname-$pkgver.tar.gz) -md5sums=('6f6b7cb18f7604f3f17eeda5173ede6a') - -build() { - cd $srcdir/${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-ssh --enable-rdp \ - --enable-vnc --enable-xdmcp --enable-nx \ - --enable-telepathy - make - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/remmina-plugins/remmina-plugins.install b/community-testing/remmina-plugins/remmina-plugins.install deleted file mode 100644 index 1a05f573e..000000000 --- a/community-testing/remmina-plugins/remmina-plugins.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/rsyslog/PKGBUILD b/community-testing/rsyslog/PKGBUILD deleted file mode 100644 index 14d38eb88..000000000 --- a/community-testing/rsyslog/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 53982 2011-08-10 20:56:05Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=rsyslog -pkgver=5.8.4 -pkgrel=2 -pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" -url="http://www.rsyslog.com/" -arch=('i686' 'x86_64') -license=('GPL3') -depends=('zlib') -makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls') -optdepends=('postgresql-libs: PostgreSQL Database Support' - 'libmysqlclient: MySQL Database Support' - 'net-snmp' - 'gnutls') -backup=('etc/rsyslog.conf' \ - 'etc/logrotate.d/rsyslog' - 'etc/conf.d/rsyslog') -options=('strip' 'zipman' '!libtool') -source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" - 'rsyslog' - 'rsyslog.logrotate' - 'rsyslog.conf.d') -md5sums=('a2c2a65ac84d9a895c52a754aff61986' - 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' - '8065db4bef3061a4f000ba58779f6829' - '1a0cd4530dd5d1439456d5ae230574d9') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --enable-mysql \ - --enable-pgsql \ - --enable-mail \ - --enable-imfile \ - --enable-imtemplate \ - --enable-snmp \ - --enable-gnutls \ - --enable-inet \ - --with-systemdsystemunitdir=/lib/systemd/system - make -} -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make install DESTDIR=${pkgdir} - # Install Daemons and Configuration Files - install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d - install -D -m644 ${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf - install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} - install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} -} diff --git a/community-testing/rsyslog/rsyslog b/community-testing/rsyslog/rsyslog deleted file mode 100755 index ee0145418..000000000 --- a/community-testing/rsyslog/rsyslog +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/rsyslog - -PID=`pidof -o %PPID /usr/sbin/rsyslogd` -case "$1" in - start) - stat_busy "Starting RSyslogd" - [ -z "$PID" ] && /usr/sbin/rsyslogd $RSYSLOGD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon rsyslogd - stat_done - fi - ;; - stop) - stat_busy "Stopping RSyslogd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/rsyslogd.pid - rm -f /var/rsyslogd.persist - rm_daemon rsyslogd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/rsyslog/rsyslog.conf.d b/community-testing/rsyslog/rsyslog.conf.d deleted file mode 100644 index e39f8c3b9..000000000 --- a/community-testing/rsyslog/rsyslog.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Parameters to be passed to rsyslogd -# This should almost certainly include at least the current compatability -# level, e.g. -c4 -# -RSYSLOGD_ARGS="-c4" diff --git a/community-testing/rsyslog/rsyslog.logrotate b/community-testing/rsyslog/rsyslog.logrotate deleted file mode 100644 index 76306c560..000000000 --- a/community-testing/rsyslog/rsyslog.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log { - missingok - sharedscripts - postrotate - /usr/bin/killall -HUP /usr/sbin/rsyslogd - endscript -} diff --git a/community-testing/smalltalk/PKGBUILD b/community-testing/smalltalk/PKGBUILD deleted file mode 100644 index 1be6f7500..000000000 --- a/community-testing/smalltalk/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 53831 2011-08-08 19:25:38Z jelle $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: mrshpot <mrshpot at gmail dot com> -# Contributor: Michael Fellinger <m.fellinger@gmail.com> - -pkgname=smalltalk -pkgver=3.2.4 -pkgrel=2 -pkgdesc='A free implementation of Smalltalk-80 by the GNU project' -url='http://smalltalk.gnu.org/' -license=('GPL' 'LGPL') -arch=('i686' 'x86_64') -options=('!libtool') - -depends=('gmp' 'libffi' 'libsigsegv' 'readline') -makedepends=('gdbm' 'gtk2' 'sqlite3' 'tk' 'zip') - -source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('a36a7c9beddca08dc492b500738efc82') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --libexecdir=/usr/lib/smalltalk \ - --with-imagedir=/var/lib/smalltalk \ - --enable-gtk=yes \ - --with-system-libffi \ - --with-system-libsigsegv \ - --with-readline \ - --with-tcl --with-tk \ - --with-x --without-emacs - make -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install - - # fix manpage symlink - rm -f $pkgdir/usr/share/man/man1/gst-reload.1 - ln -s gst-load.1 $pkgdir/usr/share/man/man1/gst-reload.1 -} diff --git a/community/addresses/PKGBUILD b/community/addresses/PKGBUILD deleted file mode 100644 index af9eec5e9..000000000 --- a/community/addresses/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 51616 2011-07-12 10:59:49Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Sebastian Sareyko <public@nooms.de> - -pkgname=addresses -pkgver=0.4.6 -pkgrel=8 -pkgdesc="A versatile address book application for GNUstep" -arch=('i686' 'x86_64') -url="http://giesler.biz/bjoern/en/sw_addr.html" -license=('LGPL') -depends=('gnustep-back' 'gnustep-base' 'gnustep-gui') -makedepends=('gnustep-make' 'gcc-objc') -#source=(http://giesler.biz/bjoern/downloads/Addresses-$pkgver.tar.gz) -source=(http://arch.p5n.pp.ru/~sergej/dl/Addresses-$pkgver.tar.gz) -md5sums=('2d6b6bf9a1578a5b3a13cb0bd2c60fad') - -build() { - . /etc/profile.d/GNUstep.sh - cd $srcdir/Addresses-$pkgver - sed -i -e 's|Versions/A|Versions/0|g' {Test,AddressManager}/GNUmakefile - make -} - -package() { - . /etc/profile.d/GNUstep.sh - cd $srcdir/Addresses-$pkgver - make GNUSTEP_INSTALLATION_DIR=$pkgdir/usr/lib/GNUstep INSTALL_ROOT_DIR=$pkgdir install - # buggy install scripts - cd $pkgdir/usr/lib/GNUstep/Library/Headers/ - rm AddressBook - ln -sf Addresses AddressBook - cd $pkgdir/usr/lib/GNUstep/Library/ - mv * .. - cd .. && rmdir Library -} diff --git a/community/coin/PKGBUILD b/community/coin/PKGBUILD deleted file mode 100644 index 70289ef96..000000000 --- a/community/coin/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: mickele -# Contributor: marcus fritzsch <fritschy@googlemail.com> - -pkgname=coin -pkgver=3.1.3 -pkgrel=5 -pkgdesc='Coin3D is a high-level 3D graphics toolkit on top of OpenGL.' -url='http://www.coin3d.org/' -license=('GPL') -arch=('i686' 'x86_64') -depends=('mesa' 'expat') -makedepends=('doxygen') -optdepends=('openal: sound/dynamic linking support' - 'fontconfig: dynamic linking support' - 'zlib: dynamic linking support' - 'freetype2: dynamic linking support' - 'js: dynamic linking support') -options=('!libtool') -source=("http://ftp.coin3d.org/coin/src/all/Coin-${pkgver}.tar.gz") -md5sums=('1538682f8d92cdf03e845c786879fbea') - -build() { - cd Coin-${pkgver} - - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --enable-optimization \ - --enable-3ds-import \ - --enable-javascript-api \ - --enable-threadsafe \ - --enable-exceptions \ - --enable-man \ - --with-mesa \ - --disable-debug \ - --enable-shared \ - --disable-maintainer-mode \ - --disable-dependency-tracking \ - --enable-system-expat - - make -} - -package() { - cd Coin-${pkgver} - - make DESTDIR=${pkgdir} install - - # final adjustments - for _FILE in threads deprecated ; do - mv "${pkgdir}/usr/share/man/man3/${_FILE}.3" "${pkgdir}/usr/share/man/man3/coin-${_FILE}.3" - done -} diff --git a/community/critterding/PKGBUILD b/community/critterding/PKGBUILD deleted file mode 100644 index ec6c82edd..000000000 --- a/community/critterding/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: Thomas Dziedzic <gostrc at gmail> -# Contributor: Anton Bazhenov <anton.bazhenov at gmail> - -pkgname=critterding -pkgver=beta12.1 -pkgrel=1 -pkgdesc='A Petri dish universe in 3D that demonstrates evolving artificial life.' -arch=('i686' 'x86_64') -url='http://critterding.sourceforge.net/' -license=('GPL') -depends=('freetype2' 'sdl' 'libgl' 'ftgl') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2") -md5sums=('29e9848d76ede1e743e05ab7b23082ba') - -build() { - cd ${pkgname}-${pkgver} - - autoreconf -fi - - ./configure \ - --prefix=/usr - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community/gamin/PKGBUILD b/community/gamin/PKGBUILD deleted file mode 100644 index 7bfc322ac..000000000 --- a/community/gamin/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 30749 2010-10-20 11:18:33Z schuay $ -# Contributor: Abhishek Dasgupta <abhidg@gmail.com> -# Contributor: Pulphix <crimea.v@libero.it> - -pkgname=gamin -pkgver=0.1.10 -pkgrel=4 -pkgdesc='File and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor).' -url='http://www.gnome.org/~veillard/gamin' -license=('GPL') -arch=('i686' 'x86_64') -depends=('glib2') -makedepends=('python2') -options=('libtool') -optdepends=('python2: for the python module.') -provides=('fam') -conflicts=('fam') -source=("http://www.gnome.org/~veillard/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz") -md5sums=('b4ec549e57da470c04edd5ec2876a028') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # python 2 - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' python/gamin.py - - ./configure --prefix=/usr --disable-static --with-threads \ - --disable-debug-api --disable-debug --libexecdir=/usr/lib/gamin \ - --with-python=/usr/bin/python2 - make -} -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} -# vim:set ts=2 sw=2 et: diff --git a/community/gnumail/PKGBUILD b/community/gnumail/PKGBUILD deleted file mode 100644 index 9f64c23b1..000000000 --- a/community/gnumail/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 51621 2011-07-12 11:00:42Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Sebastian Sareyko <public@nooms.de> - -pkgname=gnumail -pkgver=1.2.0pre3 -pkgrel=6 -pkgdesc="A complete and fast mail application for GNUstep" -arch=('i686' 'x86_64') -url="http://www.collaboration-world.com/gnumail" -license=('GPL') -depends=('pantomime' 'addresses' 'gnustep-gui') -makedepends=('gcc-objc') -options=('!makeflags') -source=("GNUMail-$pkgver.tar.gz::http://www.collaboration-world.com/cgi-bin/project/download.cgi/GNUMail-$pkgver.tar.gz?rid=103") -md5sums=('0f91fe0c32ef369ea843a2ab3909fb2b') - -build() { - cd $srcdir/GNUMail - . /etc/profile.d/GNUstep.sh - make \ - ADDITIONAL_OBJCFLAGS=-I/usr/lib/GNUstep/Headers \ - ADDITIONAL_GUI_LIBS="-L/usr/lib/GNUstep/Libraries -lGNUMail -lPantomime -lAddresses -lAddressView" -} - -package() { - cd $srcdir/GNUMail - make GNUSTEP_INSTALLATION_DIR=$pkgdir/usr/lib/GNUstep install - cd $pkgdir/usr/lib/GNUstep/Library/ - mv * .. - cd .. && rmdir Library -} diff --git a/community/gyachi/PKGBUILD b/community/gyachi/PKGBUILD deleted file mode 100644 index e01e8c385..000000000 --- a/community/gyachi/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 41545 2011-03-07 16:44:45Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: TDY <tdy@gmx.com> -# Contributor: Alexandru Mizeranschi <lexu_85@yahoo.com> -# Contributor: Conor Callahan <majikstreet@gmail.com> - -pkgname=gyachi -pkgver=1.2.10 -pkgrel=3 -pkgdesc="An improved fork of the GyachE Yahoo! client" -arch=('i686' 'x86_64') -url="http://gyachi.sourceforge.net/" -license=('GPL') -depends=('libtool' 'jasper' 'libgtkhtml' 'libmcrypt' 'libv4l' 'gpgme' - 'gtkspell') -makedepends=('pkgconfig' 'alsa-lib' 'pulseaudio' 'imagemagick') -optdepends=('pulseaudio: for pulseaudio support') -options=('!libtool') -source=(http://downloads.sourceforge.net/gyachi/gyachi-${pkgver}.tar.gz) -md5sums=('68625f81c7be8cc6d67599fdb02f0178') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64" - ./autogen.sh - ./configure --prefix=/usr --libexecdir=/usr/lib/gyachi \ - --disable-rpath \ - --disable-wine \ - --disable-gtktest \ - --disable-glibtest \ - --disable-plugin_libnotify \ - --with-x - make -} - -package () { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - #icon - install -Dm644 "${pkgdir}/usr/share/gyachi/themes/gyachi-classic/gyach-icon_48.png" \ - "${pkgdir}/usr/share/pixmaps/${pkgname}.png" -} diff --git a/community/java-oracle/PKGBUILD b/community/java-oracle/PKGBUILD deleted file mode 100644 index ac8e89a76..000000000 --- a/community/java-oracle/PKGBUILD +++ /dev/null @@ -1,157 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: kfgz <kfgz at interia dot pl> -# Contributor: Army <gmail.com: uli[dot]armbruster> -# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Guillaume ALAUX <Guillaume at alaux dot net> -# Contributor: Charles Ghislain <charlyghislain at gmail dot com> - -pkgbase=java-oracle -pkgname=('jre' 'jdk') -pkgver=7 -pkgrel=3 -arch=('i686' 'x86_64') - [ "${CARCH}" = 'i686' ] && _arch='i586' - [ "${CARCH}" = 'x86_64' ] && _arch='x64' -url='http://jdk7.java.net/' -license=('custom') -source=("http://download.oracle.com/otn-pub/java/jdk/7/jdk-7-linux-${_arch}.tar.gz" - 'java-monitoring-and-management-console.desktop' - 'java-policy-settings.desktop' - 'java-visualvm.desktop' - 'jre.profile' - 'jre.profile.csh' - 'jdk.profile' - 'jdk.profile.csh' - 'derby-network-server' - 'derby-network-server.conf' - 'javaws-launcher') -[ "${CARCH}" = 'i686' ] && md5sums=('f97244a104f03731e5ff69f0dd5a9927') -[ "${CARCH}" = 'x86_64' ] && md5sums=('b3c1ef5faea7b180469c129a49762b64') -md5sums+=('81cf9b716263ba85f0528d3357dccb75' - '6614b04176b9b7dfe26f22e9ce846801' - 'ef27c6d4062f2f97c532a9e893b6adbe' - '7cd3dc10e7a37468cad4053a067dcd01' - 'cc90df2df6fe80fab885a80036d420a1' - 'b83ab5742651b4234b7d2e20785c6693' - '6f4cbf332816d2c4e9578ecd1d0dce7f' - 'a279e195e249000646895d93e199860d' - '4bdff6982c66d24a879c424aaac3d04d' - '45c15a6b4767288f2f745598455ea2bf') - -package_jre() { - pkgdesc="Oracle's Java Runtime Environment" - depends=('libxtst' 'desktop-file-utils' 'xdg-utils' 'shared-mime-info') - provides=('java-runtime=7') - conflicts=('java-runtime') - install='jre.install' - - # main files - mkdir -p ${pkgdir}/opt/java - cp -r jdk1.7.0/jre ${pkgdir}/opt/java - - # move icons to appropriate location - install -d ${pkgdir}/usr/share - mv ${pkgdir}/opt/java/jre/lib/desktop/icons ${pkgdir}/usr/share - - # install .desktop entries - mv ${pkgdir}/opt/java/jre/lib/desktop/applications ${pkgdir}/usr/share - # desktop entries - install -d ${pkgdir}/usr/share/applications - install -m644 \ - ${srcdir}/java-policy-settings.desktop \ - ${pkgdir}/usr/share/applications - - # move mime files - mv ${pkgdir}/opt/java/jre/lib/desktop/mime ${pkgdir}/usr/share - - # get rid of already installed files - rm -r ${pkgdir}/opt/java/jre/plugin/desktop - rm -r ${pkgdir}/opt/java/jre/lib/desktop - - # TODO: find out the purpose of ./jre/lib/images/icons - - # profiles - install -D ${srcdir}/jre.profile \ - ${pkgdir}/etc/profile.d/jre.sh - install -D ${srcdir}/jre.profile.csh \ - ${pkgdir}/etc/profile.d/jre.csh - - # java browser plugin - mkdir -p ${pkgdir}/usr/lib/mozilla/plugins - if [ "$CARCH" = "i686" ]; then - ln -s /opt/java/jre/lib/i386/libnpjp2.so \ - ${pkgdir}/usr/lib/mozilla/plugins - else - ln -s /opt/java/jre/lib/amd64/libnpjp2.so \ - ${pkgdir}/usr/lib/mozilla/plugins - fi - - # licenses - install -d ${pkgdir}/usr/share/licenses/jre - install -m644 \ - ${pkgdir}/opt/java/jre/{COPYRIGHT,LICENSE,THIRDPARTYLICENSEREADME.txt} \ - ${pkgdir}/usr/share/licenses/jre - - # Clicking a .jnlp file does not launch that file but launch javaws -viewer instead FS#22509 - install ${srcdir}/javaws-launcher \ - ${pkgdir}/opt/java/jre/bin - sed \ - -e 's/Exec=javaws/&-launcher %f/' \ - -e '/NoDisplay=true/d' \ - -i ${pkgdir}/usr/share/applications/sun-javaws.desktop - - # Fix system prefs folder FS#18872 - install -d ${pkgdir}/etc/.java/.systemPrefs -} - -package_jdk() { - pkgdesc="Oracle's Java Development Kit" - depends=('jre') - provides=('java-environment=7') - conflicts=('java-environment') - install='jdk.install' - - #copy icon - install -D -m644 ${srcdir}/jdk1.7.0/jre/lib/desktop/icons/hicolor/48x48/apps/sun-java.png \ - ${pkgdir}/usr/share/pixmaps/java.png - - # main files - install -d ${pkgdir}/opt - cp -r jdk1.7.0 ${pkgdir}/opt/java - - # remove jre folder provided by the jre package - rm -r ${pkgdir}/opt/java/jre - # can not package src.zip due to international use restrictions for certain countries - rm ${pkgdir}/opt/java/src.zip - # remove windows specific batch files - find ${pkgdir}/opt/java -name '*\.bat' -delete - # remove already installed icons, mime and .desktop files provided by jre - rm -r ${pkgdir}/opt/java/lib/desktop - - # profiles - install -D ${srcdir}/jdk.profile \ - ${pkgdir}/etc/profile.d/jdk.sh - install -D ${srcdir}/jdk.profile.csh \ - ${pkgdir}/etc/profile.d/jdk.csh - - # licenses - install -d ${pkgdir}/usr/share/licenses/jdk - install -m644 \ - ${pkgdir}/opt/java/{COPYRIGHT,LICENSE,THIRDPARTYLICENSEREADME.txt} \ - ${pkgdir}/usr/share/licenses/jdk - - # desktop entries - install -d ${pkgdir}/usr/share/applications - install -m644 \ - ${srcdir}/java-{monitoring-and-management-console,visualvm}.desktop \ - ${pkgdir}/usr/share/applications - - # javadb (apache derby) daemon files FS#21186 - install -D ${srcdir}/derby-network-server \ - ${pkgdir}/etc/rc.d/derby-network-server - install -D -m644 ${srcdir}/derby-network-server.conf \ - ${pkgdir}/etc/conf.d/derby-network-server -} - diff --git a/community/java-oracle/derby-network-server b/community/java-oracle/derby-network-server deleted file mode 100644 index f2b36ea56..000000000 --- a/community/java-oracle/derby-network-server +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/profile.d/jdk.sh -. $DERBY_HOME/bin/derby_common.sh - -DAEMON_NAME="derby-network-server" -DAEMON_CONF="/etc/conf.d/$DAEMON_NAME" -DAEMON_PID="/var/run/$DAEMON_NAME.pid" - -[ -f $DAEMON_CONF ] && . $DAEMON_CONF - -DERBY_START_CMD="$JAVACMD $DERBY_OPTS -classpath \"$LOCALCLASSPATH\" org.apache.derby.drda.NetworkServerControl start" -DERBY_STOP_CMD="$JAVACMD $DERBY_OPTS -classpath \"$LOCALCLASSPATH\" org.apache.derby.drda.NetworkServerControl shutdown" - -case "$1" in - start) - stat_busy "Starting Derby Network Server" - - if ck_daemon $DAEMON_NAME; then - $DERBY_START_CMD > /dev/null & - - PID=`ps ax | grep -v grep | grep derby | grep org.apache.derby.drda.NetworkServerControl | awk '{print $1}'` - - if [ -z "$PID" ]; then - stat_fail - else - echo $PID > $DAEMON_PID - add_daemon $DAEMON_NAME - sleep 2 - stat_done - fi - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping Derby Network Server" - - if ck_daemon $DAEMON_NAME; then - stat_fail - else - $DERBY_STOP_CMD > /dev/null & - - if [ $? -gt 0 ]; then - stat_fail - else - rm -f $DAEMON_PID - rm_daemon $DAEMON_NAME - stat_done - fi - fi - ;; - restart) - $0 stop - sleep 5 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/community/java-oracle/derby-network-server.conf b/community/java-oracle/derby-network-server.conf deleted file mode 100644 index ef7478254..000000000 --- a/community/java-oracle/derby-network-server.conf +++ /dev/null @@ -1,2 +0,0 @@ -DERBY_OPTS="-Dderby.stream.error.file=/var/log/derby.log" - diff --git a/community/java-oracle/java-monitoring-and-management-console.desktop b/community/java-oracle/java-monitoring-and-management-console.desktop deleted file mode 100644 index 4de3bd293..000000000 --- a/community/java-oracle/java-monitoring-and-management-console.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Exec=jconsole -Icon=java -Name[cs]=Konzole monitorovánà a správy prostÅ™edà Java -Name=Java Monitoring and Management Console -StartupNotify=true -Terminal=false -Type=Application -Categories=Development;Java; diff --git a/community/java-oracle/java-policy-settings.desktop b/community/java-oracle/java-policy-settings.desktop deleted file mode 100644 index 0e032258d..000000000 --- a/community/java-oracle/java-policy-settings.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Exec=policytool -Icon=sun-java.png -Name[cs]=Nastavenà politiky Java aplikacà -Name=Java Policy Settings -Path= -StartupNotify=true -Terminal=false -Type=Application -Categories=Settings;Java; diff --git a/community/java-oracle/java-visualvm.desktop b/community/java-oracle/java-visualvm.desktop deleted file mode 100644 index f7ad3e324..000000000 --- a/community/java-oracle/java-visualvm.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Exec=jvisualvm -GenericName[cs]=Nástroj pro monitorovánà a sledovánà výkonu Java aplikacà -GenericName=Java Monitoring and Performance Monitoring Tool -Icon=java -Name=Java VisualVM -Path= -StartupNotify=true -Terminal=false -Type=Application -Categories=Development;Java; diff --git a/community/java-oracle/javaws-launcher b/community/java-oracle/javaws-launcher deleted file mode 100644 index 2831dfcbb..000000000 --- a/community/java-oracle/javaws-launcher +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ -z "$@" ]; then - exec javaws -viewer -else - exec javaws "$@" -fi diff --git a/community/java-oracle/jdk.install b/community/java-oracle/jdk.install deleted file mode 100644 index 0d96b6572..000000000 --- a/community/java-oracle/jdk.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - update-desktop-database -q - echo "The jdk package is licensed software." - echo "You MUST read and agree to the license stored in" - echo "/usr/share/licenses/jdk/LICENSE before using it." - - echo 'Please relogin to include jdk in your PATH' -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/community/java-oracle/jdk.profile b/community/java-oracle/jdk.profile deleted file mode 100644 index f9d5deb68..000000000 --- a/community/java-oracle/jdk.profile +++ /dev/null @@ -1,4 +0,0 @@ -export J2SDKDIR=/opt/java -export PATH=$PATH:/opt/java/bin:/opt/java/db/bin -export JAVA_HOME=/opt/java -export DERBY_HOME=/opt/java/db diff --git a/community/java-oracle/jdk.profile.csh b/community/java-oracle/jdk.profile.csh deleted file mode 100644 index 3626e7287..000000000 --- a/community/java-oracle/jdk.profile.csh +++ /dev/null @@ -1,4 +0,0 @@ -setenv J2SDKDIR /opt/java -setenv PATH ${PATH}:/opt/java/bin:/opt/java/db/bin -setenv JAVA_HOME /opt/java -setenv DERBY_HOME /opt/java/db diff --git a/community/java-oracle/jre.install b/community/java-oracle/jre.install deleted file mode 100644 index 573f5f836..000000000 --- a/community/java-oracle/jre.install +++ /dev/null @@ -1,35 +0,0 @@ -post_install() { - update-desktop-database -q - xdg-icon-resource forceupdate - update-mime-database usr/share/mime &> /dev/null - - echo "The jre package is licensed software." - echo "You MUST read and agree to the license stored in" - echo "/usr/share/licenses/jre/LICENSE before using it." - - if [ -f /etc/mailcap ] ; then - sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap - fi - echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap - - echo 'Please relogin to include jre in your PATH.' -} - -post_upgrade() { - update-desktop-database -q - xdg-icon-resource forceupdate - update-mime-database usr/share/mime &> /dev/null -} - -post_remove() { - update-desktop-database -q - xdg-icon-resource forceupdate - update-mime-database usr/share/mime &> /dev/null - - mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap) - if [ "$mailcap" != "" ] ; then - sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap - else - rm /etc/mailcap - fi -} diff --git a/community/java-oracle/jre.profile b/community/java-oracle/jre.profile deleted file mode 100644 index ded0efe81..000000000 --- a/community/java-oracle/jre.profile +++ /dev/null @@ -1,2 +0,0 @@ -export PATH=$PATH:/opt/java/jre/bin -export JAVA_HOME=${JAVA_HOME:-/opt/java/jre} diff --git a/community/java-oracle/jre.profile.csh b/community/java-oracle/jre.profile.csh deleted file mode 100644 index a4e72ddf4..000000000 --- a/community/java-oracle/jre.profile.csh +++ /dev/null @@ -1,4 +0,0 @@ -setenv PATH ${PATH}:/opt/java/jre/bin -if (! "$?JAVA_HOME" ) then - setenv JAVA_HOME /opt/java/jre -endif diff --git a/community/java6-oracle/PKGBUILD b/community/java6-oracle/PKGBUILD deleted file mode 100644 index b273b9b1b..000000000 --- a/community/java6-oracle/PKGBUILD +++ /dev/null @@ -1,156 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Guillaume ALAUX <Guillaume at alaux dot net> - -pkgname=('jre6' 'jdk6') -pkgbase=java6-oracle -pkgver=6u27 -pkgrel=1 -pkgdesc="Sun/Oracle's implementation of tha Java 6 specification" -arch=('i686' 'x86_64') - [ "${CARCH}" = 'i686' ] && _arch=i586 - [ "${CARCH}" = 'x86_64' ] && _arch=x64 -url='http://java.sun.com' -license=('custom') -# oracle moved it ... -# 'https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh' -source=("http://download.oracle.com/otn-pub/java/jdk/${pkgver}-b07/jdk-${pkgver}-linux-${_arch}.bin" - 'construct.sh::http://java.net/projects/jdk-distros/sources/svn/content/trunk/utils/construct.sh?raw=true' - 'java-control-panel.desktop' - 'java-monitoring-and-management-console.desktop' - 'java-policy-settings.desktop' - 'java-visualvm.desktop' - 'java-web-start.desktop' - 'jre.profile' - 'jre.profile.csh' - 'jdk.profile' - 'jdk.profile.csh' - 'derby-network-server' - 'derby-network-server.conf' - 'javaws-launcher') - -[ "${CARCH}" = 'i686' ] && md5sums=('bdb5f05bd20c6aa9a4729726191bf6fd') -[ "${CARCH}" = 'x86_64' ] && md5sums=('94f93a3ff03f824a238ecd79ad90433e') -md5sums+=('94065b612df0046d9ae758943f9f6a75' - 'e4d814c0f310d77ed6990c731bccd0fb' - '4bc2b0be93f76ed07b471e3c89eb5a8a' - '8e3cec7ab641ec449cabd068be583f5c' - '9ba148ebabce8ed3351b813a9a66b6e5' - '619ec32235dcfe454234ef4316f8a7cc' - '7cd3dc10e7a37468cad4053a067dcd01' - 'cc90df2df6fe80fab885a80036d420a1' - 'b83ab5742651b4234b7d2e20785c6693' - '6f4cbf332816d2c4e9578ecd1d0dce7f' - 'a279e195e249000646895d93e199860d' - '4bdff6982c66d24a879c424aaac3d04d' - '45c15a6b4767288f2f745598455ea2bf') - -build() { - mkdir unbundle-jdk - cd unbundle-jdk - sh ../jdk-${pkgver}-linux-$_arch.bin --accept-license - cd .. - sh construct.sh unbundle-jdk linux-jdk linux-jre -} - -package_jre6() { - pkgdesc="Oracle's Java Runtime Environment" - depends=('glibc' 'libxtst') - provides=('j2re' 'java-runtime=6') - conflicts=('j2re' 'java-runtime' 'jre') - replaces=('j2re') - install='jre.install' - - # main files - mkdir -p ${pkgdir}/opt/java - cp -R linux-jdk/jre ${pkgdir}/opt/java - - # profiles - install -D ${srcdir}/jre.profile \ - ${pkgdir}/etc/profile.d/jre.sh - install -D ${srcdir}/jre.profile.csh \ - ${pkgdir}/etc/profile.d/jre.csh - - mkdir -p ${pkgdir}/usr/lib/mozilla/plugins - - if [ "$CARCH" = "i686" ]; then - ln -s /opt/java/jre/lib/i386/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins - else ln -s /opt/java/jre/lib/amd64/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins - fi - - # licenses - install -d ${pkgdir}/usr/share/licenses/jre - install -m644 ${pkgdir}/opt/java/jre/COPYRIGHT \ - ${pkgdir}/usr/share/licenses/jre - install -m644 ${pkgdir}/opt/java/jre/LICENSE \ - ${pkgdir}/usr/share/licenses/jre - install -m644 ${pkgdir}/opt/java/jre/THIRDPARTYLICENSEREADME.txt \ - ${pkgdir}/usr/share/licenses/jre - - # Fix system prefs folder (FS#18872) - install -d ${pkgdir}/etc/.java/.systemPrefs - - # Fix FS#22509 - [jre] Clicking a .jnlp file does not launch that file but launch javaws -viewer instead - install ${srcdir}/javaws-launcher \ - ${pkgdir}/opt/java/jre/bin -} - -package_jdk6() { - pkgdesc="Oracle's Java Development Kit" - depends=('glibc' 'jre6') - provides=('java-environment=6' 'j2sdk') - conflicts=('java-environment' 'j2sdk' 'jdk') - replaces=('j2sdk') - install='jdk.install' - - #copy icon - install -D -m644 ${srcdir}/linux-jdk/jre/lib/desktop/icons/hicolor/48x48/apps/sun-java.png \ - ${pkgdir}/usr/share/pixmaps/java.png - - # main files - rm -rf linux-jdk/jre - install -d ${pkgdir}/opt - mv linux-jdk ${pkgdir}/opt/java - - # profiles - install -D ${srcdir}/jdk.profile \ - ${pkgdir}/etc/profile.d/jdk.sh - install -D ${srcdir}/jdk.profile.csh \ - ${pkgdir}/etc/profile.d/jdk.csh - - # licenses - install -d ${pkgdir}/usr/share/licenses/jdk - install -m644 ${pkgdir}/opt/java/COPYRIGHT \ - ${pkgdir}/usr/share/licenses/jdk - install -m644 ${pkgdir}/opt/java/LICENSE \ - ${pkgdir}/usr/share/licenses/jdk - install -m644 ${pkgdir}/opt/java/THIRDPARTYLICENSEREADME.txt \ - ${pkgdir}/usr/share/licenses/jdk - - # desktop entries - install -Dm644 ${srcdir}/java-control-panel.desktop \ - ${pkgdir}/usr/share/applications/java-control-panel.desktop - install -Dm644 ${srcdir}/java-monitoring-and-management-console.desktop \ - ${pkgdir}/usr/share/applications/java-monitoring-and-management-console.desktop - install -Dm644 ${srcdir}/java-policy-settings.desktop \ - ${pkgdir}/usr/share/applications/java-policy-settings.desktop - install -Dm644 ${srcdir}/java-visualvm.desktop \ - ${pkgdir}/usr/share/applications/java-visualvm.desktop - install -Dm644 ${srcdir}/java-web-start.desktop \ - ${pkgdir}/usr/share/applications/java-web-start.desktop - - # javadb (apache derby) daemon files - install -D ${srcdir}/derby-network-server \ - ${pkgdir}/etc/rc.d/derby-network-server - install -D -m644 ${srcdir}/derby-network-server.conf \ - ${pkgdir}/etc/conf.d/derby-network-server - - # remove dangling links, probably need to find out more about them - for i in kinit ktab klist; do - rm ${pkgdir}/opt/java/bin/${i} - rm ${pkgdir}/opt/java/man/ja_JP.eucJP/man1/${i}.1 - rm ${pkgdir}/opt/java/man/man1/${i}.1 - done -} diff --git a/community/java6-oracle/derby-network-server b/community/java6-oracle/derby-network-server deleted file mode 100644 index f2b36ea56..000000000 --- a/community/java6-oracle/derby-network-server +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/profile.d/jdk.sh -. $DERBY_HOME/bin/derby_common.sh - -DAEMON_NAME="derby-network-server" -DAEMON_CONF="/etc/conf.d/$DAEMON_NAME" -DAEMON_PID="/var/run/$DAEMON_NAME.pid" - -[ -f $DAEMON_CONF ] && . $DAEMON_CONF - -DERBY_START_CMD="$JAVACMD $DERBY_OPTS -classpath \"$LOCALCLASSPATH\" org.apache.derby.drda.NetworkServerControl start" -DERBY_STOP_CMD="$JAVACMD $DERBY_OPTS -classpath \"$LOCALCLASSPATH\" org.apache.derby.drda.NetworkServerControl shutdown" - -case "$1" in - start) - stat_busy "Starting Derby Network Server" - - if ck_daemon $DAEMON_NAME; then - $DERBY_START_CMD > /dev/null & - - PID=`ps ax | grep -v grep | grep derby | grep org.apache.derby.drda.NetworkServerControl | awk '{print $1}'` - - if [ -z "$PID" ]; then - stat_fail - else - echo $PID > $DAEMON_PID - add_daemon $DAEMON_NAME - sleep 2 - stat_done - fi - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping Derby Network Server" - - if ck_daemon $DAEMON_NAME; then - stat_fail - else - $DERBY_STOP_CMD > /dev/null & - - if [ $? -gt 0 ]; then - stat_fail - else - rm -f $DAEMON_PID - rm_daemon $DAEMON_NAME - stat_done - fi - fi - ;; - restart) - $0 stop - sleep 5 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/community/java6-oracle/derby-network-server.conf b/community/java6-oracle/derby-network-server.conf deleted file mode 100644 index ef7478254..000000000 --- a/community/java6-oracle/derby-network-server.conf +++ /dev/null @@ -1,2 +0,0 @@ -DERBY_OPTS="-Dderby.stream.error.file=/var/log/derby.log" - diff --git a/community/java6-oracle/java-control-panel.desktop b/community/java6-oracle/java-control-panel.desktop deleted file mode 100644 index 476e04a82..000000000 --- a/community/java6-oracle/java-control-panel.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Exec=/opt/java/bin/jcontrol -GenericName[cs]=Nastavenà prostÅ™edà Java -GenericName=Java Environment Settings -Icon=java -Name[cs]=Nastavenà Javy -Name=Java Control Panel -Path= -StartupNotify=true -Terminal=false -Type=Application -Categories=Settings;Java; diff --git a/community/java6-oracle/java-monitoring-and-management-console.desktop b/community/java6-oracle/java-monitoring-and-management-console.desktop deleted file mode 100644 index c0e1e59f6..000000000 --- a/community/java6-oracle/java-monitoring-and-management-console.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Exec=/opt/java/bin/jconsole -Icon=java -Name[cs]=Konzole monitorovánà a správy prostÅ™edà Java -Name=Java Monitoring and Management Console -StartupNotify=true -Terminal=false -Type=Application -Categories=Development;Java; diff --git a/community/java6-oracle/java-policy-settings.desktop b/community/java6-oracle/java-policy-settings.desktop deleted file mode 100644 index 1009301b1..000000000 --- a/community/java6-oracle/java-policy-settings.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Exec=/opt/java/bin/policytool -Icon=java -Name[cs]=Nastavenà politiky Java aplikacà -Name=Java Policy Settings -Path= -StartupNotify=true -Terminal=false -Type=Application -Categories=Settings;Java; diff --git a/community/java6-oracle/java-visualvm.desktop b/community/java6-oracle/java-visualvm.desktop deleted file mode 100644 index 8aa9527c8..000000000 --- a/community/java6-oracle/java-visualvm.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Exec=/opt/java/bin/jvisualvm -GenericName[cs]=Nástroj pro monitorovánà a sledovánà výkonu Java aplikacà -GenericName=Java Monitoring and Performance Monitoring Tool -Icon=java -Name=Java VisualVM -Path= -StartupNotify=true -Terminal=false -Type=Application -Categories=Development;Java; diff --git a/community/java6-oracle/java-web-start.desktop b/community/java6-oracle/java-web-start.desktop deleted file mode 100644 index a8a25f9e2..000000000 --- a/community/java6-oracle/java-web-start.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Exec=/opt/java/jre/bin/javaws-launcher %f -GenericName[cs]=Spravovat a spouÅ¡tÄ›t aplikace Java Web Start -GenericName=Manage and run Java Web Start Applications -Icon=java -MimeType=application/x-java-jnlp-file; -Name[cs]=Java Web Start -Name=Java Web Start -Path= -StartupNotify=true -Terminal=false -Type=Application -Categories=Network;Java; diff --git a/community/java6-oracle/javaws-launcher b/community/java6-oracle/javaws-launcher deleted file mode 100644 index 2831dfcbb..000000000 --- a/community/java6-oracle/javaws-launcher +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ -z "$@" ]; then - exec javaws -viewer -else - exec javaws "$@" -fi diff --git a/community/java6-oracle/jdk.install b/community/java6-oracle/jdk.install deleted file mode 100644 index abe08b6a0..000000000 --- a/community/java6-oracle/jdk.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - echo "The jdk package is licensed software." - echo "You MUST read and agree to the license stored in" - echo "/opt/java/LICENSE before using it." - - echo 'Please relogin to include jdk in your PATH' -} diff --git a/community/java6-oracle/jdk.profile b/community/java6-oracle/jdk.profile deleted file mode 100644 index f9d5deb68..000000000 --- a/community/java6-oracle/jdk.profile +++ /dev/null @@ -1,4 +0,0 @@ -export J2SDKDIR=/opt/java -export PATH=$PATH:/opt/java/bin:/opt/java/db/bin -export JAVA_HOME=/opt/java -export DERBY_HOME=/opt/java/db diff --git a/community/java6-oracle/jdk.profile.csh b/community/java6-oracle/jdk.profile.csh deleted file mode 100644 index 3626e7287..000000000 --- a/community/java6-oracle/jdk.profile.csh +++ /dev/null @@ -1,4 +0,0 @@ -setenv J2SDKDIR /opt/java -setenv PATH ${PATH}:/opt/java/bin:/opt/java/db/bin -setenv JAVA_HOME /opt/java -setenv DERBY_HOME /opt/java/db diff --git a/community/java6-oracle/jre.install b/community/java6-oracle/jre.install deleted file mode 100644 index 111da3c2a..000000000 --- a/community/java6-oracle/jre.install +++ /dev/null @@ -1,20 +0,0 @@ -post_install() { - echo "The jre package is licensed software." - echo "You MUST read and agree to the license stored in" - echo "/opt/java/jre/LICENSE before using it." - if [ -f /etc/mailcap ] ; then - sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap - fi - echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap - - echo 'Please relogin to include jre in your PATH.' -} - -post_remove() { - mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap) - if [ "$mailcap" != "" ] ; then - sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap - else - rm /etc/mailcap - fi -} diff --git a/community/java6-oracle/jre.profile b/community/java6-oracle/jre.profile deleted file mode 100644 index ded0efe81..000000000 --- a/community/java6-oracle/jre.profile +++ /dev/null @@ -1,2 +0,0 @@ -export PATH=$PATH:/opt/java/jre/bin -export JAVA_HOME=${JAVA_HOME:-/opt/java/jre} diff --git a/community/java6-oracle/jre.profile.csh b/community/java6-oracle/jre.profile.csh deleted file mode 100644 index a4e72ddf4..000000000 --- a/community/java6-oracle/jre.profile.csh +++ /dev/null @@ -1,4 +0,0 @@ -setenv PATH ${PATH}:/opt/java/jre/bin -if (! "$?JAVA_HOME" ) then - setenv JAVA_HOME /opt/java/jre -endif diff --git a/community/liboop/PKGBUILD b/community/liboop/PKGBUILD deleted file mode 100644 index ef8ea7bfc..000000000 --- a/community/liboop/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 21592 2010-07-16 19:40:26Z tdziedzic $ -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=liboop -pkgver=1.0 -pkgrel=3 -pkgdesc='A low-level event loop management library' -arch=('i686' 'x86_64') -url='http://liboop.org' -options=('!libtool') -license=('LGPL') -depends=('glib2' 'readline' 'adns') -source=("http://download.ofb.net/${pkgname}/${pkgname}-$pkgver.tar.bz2") -md5sums=('88fc8decf99fd75d2af40e0a005fa0d3') - -build() { - cd ${pkgname}-${pkgver} - - ./configure \ - --prefix=/usr \ - --without-tcl - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community/ltris/ChangeLog b/community/ltris/ChangeLog deleted file mode 100644 index b8c8e0cb0..000000000 --- a/community/ltris/ChangeLog +++ /dev/null @@ -1,20 +0,0 @@ -2011-08-09 Thorsten Töpper <atsutane-tu@freethoughts.de> - - * ltris 1.0.16-1 - * Upstream update - -2009-12-29 Eric Belanger <eric@archlinux.org> - - * ltris 1.0.14-1 - * Upstream update - -2009-11-07 Eric Belanger <eric@archlinux.org> - - * ltris 1.0.13-1 - * Upstream update - -2009-04-07 Eric Belanger <eric@archlinux.org> - - * ltris 1.0.12-1 - * Fixed score file location and permissions (close FS#13489) - * Added ChangeLog diff --git a/community/mldonkey/mldonkey-gcc46.patch b/community/mldonkey/mldonkey-gcc46.patch deleted file mode 100644 index 656d72f85..000000000 --- a/community/mldonkey/mldonkey-gcc46.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h -index 775a898..af1621b 100644 ---- a/src/utils/lib/CryptoPP.h -+++ b/src/utils/lib/CryptoPP.h -@@ -695,6 +695,7 @@ class CRYPTOPP_DLL NullNameValuePairs : public NameValuePairs - { - public: - bool GetVoidValue(const char* /* name */, const std::type_info& /* valueType */, void* /* pValue */) const {return false;} -+ NullNameValuePairs() {} - }; - - //! _ diff --git a/community/nepim/PKGBUILD b/community/nepim/PKGBUILD deleted file mode 100644 index 31cbe035a..000000000 --- a/community/nepim/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# Maintainer: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=nepim -pkgver=0.9 -pkgrel=1 -pkgdesc='A tool for measuring available bandwidth between hosts.' -url='http://www.nongnu.org/nepim' -license=('GPL') -arch=('i686' 'x86_64') -depends=('liboop') -source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('7d1f2fd248a1b5fec42f92b286208fcf') - -build() { - cd ${pkgname}-${pkgver}/src - - make OOP_BASE=/usr -} - -package() { - cd ${pkgname}-${pkgver}/src - - install -D ${pkgname} ${pkgdir}/usr/bin/${pkgname} -} diff --git a/community/open-vm-tools/xautostart.conf b/community/open-vm-tools/xautostart.conf deleted file mode 100644 index 829f379ce..000000000 --- a/community/open-vm-tools/xautostart.conf +++ /dev/null @@ -1,6 +0,0 @@ -gnome-panel -ksmserver -startkde -kwrapper -panel -xfce4-panel diff --git a/community/pantomime/PKGBUILD b/community/pantomime/PKGBUILD deleted file mode 100644 index 88875acfb..000000000 --- a/community/pantomime/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 51631 2011-07-12 11:02:36Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Sebastian Sareyko <public@nooms.de> - -pkgname=pantomime -pkgver=1.2.0pre3 -pkgrel=4 -pkgdesc="A set of Objective-C classes that model a mail system" -arch=('i686' 'x86_64') -url="http://www.collaboration-world.com/pantomime" -license=("LGPL" "custom") -depends=('gnustep-back' 'openssl') -makedepends=('gnustep-make' 'gnustep-base' 'gcc-objc') -options=('!makeflags') -source=("Pantomime-$pkgver.tar.gz::http://www.collaboration-world.com/cgi-bin/project/download.cgi/Pantomime-$pkgver.tar.gz?rid=104" - build-fix.patch) -md5sums=('b88f4634ec1f3a1ea1d5551ee10d9db7' - '53dc4960f4c2b50274ca01b2f29567d0') - -build() { - cd $srcdir/Pantomime - source /etc/profile.d/GNUstep.sh - patch -p1 <$srcdir/build-fix.patch - make -} - -package() { - cd $srcdir/Pantomime - make GNUSTEP_INSTALLATION_DIR=$pkgdir/usr/lib/GNUstep install - install -D -m644 Documentation/LICENSE.elm $pkgdir/usr/share/licenses/$pkgname/LICENSE.elm - cd $pkgdir/usr/lib/GNUstep/Library/ - mv * .. - cd .. && rmdir Library -} diff --git a/community/pantomime/build-fix.patch b/community/pantomime/build-fix.patch deleted file mode 100644 index 5696024b4..000000000 --- a/community/pantomime/build-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -wbBur Pantomime/Framework/Pantomime/NSString+Extensions.m Pantomime.my/Framework/Pantomime/NSString+Extensions.m ---- Pantomime/Framework/Pantomime/NSString+Extensions.m 2006-09-04 20:04:02.000000000 +0000 -+++ Pantomime.my/Framework/Pantomime/NSString+Extensions.m 2011-05-03 09:49:54.000000000 +0000 -@@ -41,7 +41,7 @@ - #include <CoreFoundation/CFString.h> - #include <CoreFoundation/CFStringEncodingExt.h> - #else --#include <GNUstepBase/GSCategories.h> -+//#include <GNUstepBase/GSCategories.h> - #endif - - #include <ctype.h> diff --git a/community/pyxattr/PKGBUILD b/community/pyxattr/PKGBUILD deleted file mode 100644 index 2b0603640..000000000 --- a/community/pyxattr/PKGBUILD +++ /dev/null @@ -1,19 +0,0 @@ -# $Id: PKGBUILD 31904 2010-11-07 19:21:57Z lfleischer $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> - -pkgname=pyxattr -pkgver=0.5.0 -pkgrel=1 -pkgdesc="A python extension module that allows you to manipulate the extended attributes." -arch=('i686' 'x86_64') -url='http://pyxattr.sourceforge.net/' -license=('GPL') -depends=('python2') -makedepends=('python2-distribute') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('0f7ab1e185087329e40f7de218517c84') - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - python2 setup.py install --root="${pkgdir}" -} diff --git a/community/qstardict/ChangeLog b/community/qstardict/ChangeLog deleted file mode 100644 index f79486aa2..000000000 --- a/community/qstardict/ChangeLog +++ /dev/null @@ -1,8 +0,0 @@ -2008-02-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 0.13.1 - -2008-02-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 0.13.0 - -2008-10-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Moved to [community] diff --git a/community/qstardict/gcc4.4.patch b/community/qstardict/gcc4.4.patch deleted file mode 100644 index 5c285ac2f..000000000 --- a/community/qstardict/gcc4.4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trunk/plugins/stardict/dictziplib.cpp 2009/07/10 15:01:40 446 -+++ trunk/plugins/stardict/dictziplib.cpp 2009/08/06 07:32:12 447 -@@ -305,7 +305,7 @@ - - #ifdef Q_OS_UNIX - if (stat(fname.c_str(), &sb) || !S_ISREG(sb.st_mode)) --#elif def Q_OS_WIN32 -+#elif defined(Q_OS_WIN32) - if (_stat(fname.c_str(), &sb) || !(sb.stMode & _S_IFREG)) - #endif - { diff --git a/community/root/reorder-lzma-search-r40128.diff b/community/root/reorder-lzma-search-r40128.diff deleted file mode 100644 index 1dd0fc56e..000000000 --- a/community/root/reorder-lzma-search-r40128.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- branches/v5-30-00-patches/configure 2011/06/27 13:38:32 39993 -+++ branches/v5-30-00-patches/configure 2011/07/04 15:43:59 40128 -@@ -2430,8 +2430,9 @@ - check_header "lzma.h" "" \ - $LZMA ${LZMA:+$LZMA/include} \ - ${finkdir:+$finkdir/include} \ -- /usr/local/include /usr/include/lzma /usr/local/include/lzma \ -- /opt/lzma/include /usr/include -+ /usr/local/include /usr/include \ -+ /usr/local/include/lzma /usr/include/lzma \ -+ /opt/lzma/include - if test "x$found_dir" = "x" ; then - enable_builtin_lzma=yes - else diff --git a/community/soqt/PKGBUILD b/community/soqt/PKGBUILD deleted file mode 100644 index 33f7556c9..000000000 --- a/community/soqt/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: mickele -# Contributor: marcus fritzsch <fritschy@googlemail.com> - -pkgname=soqt -pkgver=1.5.0 -pkgrel=3 -pkgdesc='SoQt is a library which provides the glue between Coin and Qt.' -arch=('i686' 'x86_64') -url='http://www.coin3d.org/lib/soqt/' -license=('GPL') -depends=('coin' 'qt') -makedepends=('doxygen') -options=('!libtool') -source=("http://ftp.coin3d.org/coin/src/all/SoQt-${pkgver}.tar.gz") -md5sums=('9f1e582373d66f556b1db113a93ac68e') - -build() { - cd SoQt-${pkgver} - - ./configure --prefix=/usr \ - --enable-optimization \ - --enable-man \ - --enable-exceptions \ - --disable-debug \ - --disable-maintainer-mode \ - --disable-dependency-tracking \ - --enable-shared \ - --disable-static \ - --with-qt=/usr - - make -} - -package() { - cd SoQt-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community/speed-dreams/speed-dreams.sh b/community/speed-dreams/speed-dreams.sh deleted file mode 100644 index fa6dde97a..000000000 --- a/community/speed-dreams/speed-dreams.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -cd /opt/speed-dreams/bin -./speed-dreams diff --git a/community/systemd/0001-convert-int-to-boolean-for-dbus_bool_t.patch b/community/systemd/0001-convert-int-to-boolean-for-dbus_bool_t.patch deleted file mode 100644 index 675bc0478..000000000 --- a/community/systemd/0001-convert-int-to-boolean-for-dbus_bool_t.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e191553d1dc80cd6d65d05f0cb29f8967fab6983 Mon Sep 17 00:00:00 2001 -From: Kay Sievers <kay.sievers@vrfy.org> -Date: Wed, 17 Aug 2011 19:38:07 +0200 -Subject: [PATCH] convert int to boolean for dbus_bool_t - ---- - src/dbus-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/dbus-manager.c b/src/dbus-manager.c -index ae88895..cfc2afc 100644 ---- a/src/dbus-manager.c -+++ b/src/dbus-manager.c -@@ -444,7 +444,7 @@ static DBusMessage *message_from_file_changes( - if (carries_install_info >= 0) { - dbus_bool_t b; - -- b = carries_install_info; -+ b = !!carries_install_info; - if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &b)) - goto oom; - } --- -1.7.6 - diff --git a/community/tilda/ChangeLog b/community/tilda/ChangeLog deleted file mode 100644 index 443441949..000000000 --- a/community/tilda/ChangeLog +++ /dev/null @@ -1,12 +0,0 @@ -2008-04-29 Mateusz Herych <heniekk@gmail.com> - - * Updated for x86_64 - 0.9.6 - -2008-04-28 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated for i686 - 0.9.6 - -2007-12-30 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated to newer version - 0.9.5 - diff --git a/community/viking/gpsd-2.96.patch b/community/viking/gpsd-2.96.patch deleted file mode 100644 index 01b117312..000000000 --- a/community/viking/gpsd-2.96.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -wbBur viking-1.1/configure.ac viking-1.1.my/configure.ac ---- viking-1.1/configure.ac 2011-02-08 21:29:01.000000000 +0000 -+++ viking-1.1.my/configure.ac 2011-04-18 13:31:07.000000000 +0000 -@@ -244,7 +244,7 @@ - [ac_cv_enable_realtimegpstracking], [ac_cv_enable_realtimegpstracking=yes]) - case $ac_cv_enable_realtimegpstracking in - yes) -- AC_CHECK_LIB(gps,gps_poll,,AC_MSG_ERROR([libgps is needed for Realtime GPS Tracking feature[,] but not found. The feature can be disable with --disable-realtime-gps-tracking])) -+ AC_CHECK_LIB(gps,gps_read,,AC_MSG_ERROR([libgps is needed for Realtime GPS Tracking feature[,] but not found. The feature can be disable with --disable-realtime-gps-tracking])) - AC_DEFINE(VIK_CONFIG_REALTIME_GPS_TRACKING, [], [REALTIME GPS TRACKING STUFF]) - ;; - esac -diff -wbBur viking-1.1/src/vikgpslayer.c viking-1.1.my/src/vikgpslayer.c ---- viking-1.1/src/vikgpslayer.c 2011-02-08 21:09:00.000000000 +0000 -+++ viking-1.1.my/src/vikgpslayer.c 2011-04-18 13:35:48.000000000 +0000 -@@ -1377,8 +1377,11 @@ - { - VikGpsLayer *vgl = data; - if (condition == G_IO_IN) { -- if (!gps_poll(&vgl->vgpsd->gpsd)) -+ if (!gps_read(&vgl->vgpsd->gpsd)) -+ { -+ gpsd_raw_hook(&vgl->vgpsd->gpsd, NULL); - return TRUE; -+ } - else { - g_warning("Disconnected from gpsd. Trying to reconnect"); - rt_gpsd_disconnect(vgl); -@@ -1408,7 +1411,8 @@ - { - VikGpsLayer *vgl = (VikGpsLayer *)data; - #ifndef HAVE_GPS_OPEN_R -- struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port); -+ static struct gps_data_t __gd; -+ struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port, &__gd) ? NULL : &__gd; - - if (gpsd == NULL) { - #else -@@ -1439,7 +1443,7 @@ - vik_trw_layer_add_track(vtl, vgl->realtime_track_name, vgl->realtime_track); - } - -- gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook); -+// gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook); - vgl->realtime_io_channel = g_io_channel_unix_new(vgl->vgpsd->gpsd.gps_fd); - vgl->realtime_io_watch_id = g_io_add_watch( vgl->realtime_io_channel, - G_IO_IN | G_IO_ERR | G_IO_HUP, gpsd_data_available, vgl); diff --git a/community/virtualbox/fix-kernel-panic.patch b/community/virtualbox/fix-kernel-panic.patch deleted file mode 100644 index 1f1ea993d..000000000 --- a/community/virtualbox/fix-kernel-panic.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: /trunk/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c
-===================================================================
---- /trunk/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 38199)
-+++ /trunk/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (revision 38232)
-@@ -78,5 +78,5 @@
- * @remarks This can be invoked in interrupt context.
- */
--static void rtMpNotificationLinuxOnCurrentCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
-+static DECLCALLBACK(void) rtMpNotificationLinuxOnCurrentCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
- {
- unsigned long ulNativeEvent = *(unsigned long *)pvUser2;
diff --git a/community/vtk/missingheader.diff b/community/vtk/missingheader.diff deleted file mode 100644 index 47956d81d..000000000 --- a/community/vtk/missingheader.diff +++ /dev/null @@ -1,28 +0,0 @@ -From be4c4f115793598f6c8937a98bdd1f227d471540 Mon Sep 17 00:00:00 2001 -From: Brad King <brad.king@kitware.com> -Date: Tue, 19 Apr 2011 15:25:09 -0400 -Subject: [PATCH] MetaIO: Add missing include <stddef.h> for ptrdiff_t - -Fixes error "ptrdiff_t was not declared in this scope". - -Author: David Doria <daviddoria@gmail.com> -Change-Id: I1e0dee67d26681f4119ac1fd00ecec3d139eb726 ---- - Utilities/vtkmetaio/metaUtils.cxx | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/Utilities/vtkmetaio/metaUtils.cxx b/Utilities/vtkmetaio/metaUtils.cxx -index dcb26ca..27bde1e 100644 ---- a/Utilities/vtkmetaio/metaUtils.cxx -+++ b/Utilities/vtkmetaio/metaUtils.cxx -@@ -18,6 +18,7 @@ - - #include <stdio.h> - #include <ctype.h> -+#include <stddef.h> - - #include <sys/stat.h> - #include <fcntl.h> --- -1.7.0 - diff --git a/core/dnsutils/tools-only.patch b/core/dnsutils/tools-only.patch deleted file mode 100644 index b46b71f60..000000000 --- a/core/dnsutils/tools-only.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur bind-9.7.1-P2.orig/bin/Makefile.in bind-9.7.1-P2/bin/Makefile.in ---- bind-9.7.1-P2.orig/bin/Makefile.in 2009-10-05 08:07:08.000000000 -0400 -+++ bind-9.7.1-P2/bin/Makefile.in 2010-07-22 15:55:00.000000000 -0400 -@@ -19,8 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -- check confgen @PKCS11_TOOLS@ -+SUBDIRS = dig nsupdate - TARGETS = - - @BIND9_MAKE_RULES@ -diff -Naur bind-9.7.1-P2.orig/lib/Makefile.in bind-9.7.1-P2/lib/Makefile.in ---- bind-9.7.1-P2.orig/lib/Makefile.in 2007-06-19 19:47:13.000000000 -0400 -+++ bind-9.7.1-P2/lib/Makefile.in 2010-07-22 15:56:29.000000000 -0400 -@@ -23,7 +23,7 @@ - # Attempt to disable parallel processing. - .NOTPARALLEL: - .NO_PARALLEL: --SUBDIRS = isc isccc dns isccfg bind9 lwres tests -+SUBDIRS = isc dns isccfg bind9 lwres - TARGETS = - - @BIND9_MAKE_RULES@ diff --git a/core/usbutils/usb.ids-2011.04.14 b/core/usbutils/usb.ids-2011.04.14 deleted file mode 100644 index 02e03ba36..000000000 --- a/core/usbutils/usb.ids-2011.04.14 +++ /dev/null @@ -1,16374 +0,0 @@ -# -# List of USB ID's -# -# Maintained by Stephen J. Gowdy <linux.usb.ids@gmail.com> -# If you have any new entries, please submit them via -# http://www.linux-usb.org/usb-ids.html -# or send entries as patches (diff -u old new) in the -# body of your email (a bot will attempt to deal with it). -# The latest version can be obtained from -# http://www.linux-usb.org/usb.ids -# -# Version: 2011.04.14 -# Date: 2011-04-14 20:34:04 -# - -# Vendors, devices and interfaces. Please keep sorted. - -# Syntax: -# vendor vendor_name -# device device_name <-- single tab -# interface interface_name <-- two tabs - -0001 Fry's Electronics - 142b Arbiter Systems, Inc. -0002 Ingram -0003 Club Mac -0004 Nebraska Furniture Mart -0053 Planex - 5301 GW-US54ZGL 802.11bg -0079 DragonRise Inc. - 0006 Generic USB Joystick - 0011 Gamepad -0105 Trust International B.V. - 145f NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211] -0145 Unknown - 0112 Card Reader -0204 Chipsbank Microelectronics Co., Ltd - 6025 CBM2080 Flash drive controller - 6026 CBM1180 Flash drive controller -0218 Hangzhou Worlde - 0301 MIDI Port -02ad HUMAX Co., Ltd. - 138c PVR Mass Storage -0300 MM300 eBook Reader -0324 OCZ Technology Inc - bc06 OCZ ATV USB 2.0 Flash Drive - bc08 OCZ Rally2/ATV USB 2.0 Flash Drive -0325 OCZ Technology Inc - ac02 ATV Turbo / Rally2 Dual Channel USB 2.0 Flash Drive -0386 LTS - 0001 PSX for USB Converter -03da Bernd Walter Computer Technology - 0002 HD44780 LCD interface -03e8 EndPoints, Inc. - 0004 SE401 Webcam - 0008 101 Ethernet [klsi] - 0015 ATAPI Enclosure - 2123 SiPix StyleCam Deluxe - 8004 Aox 99001 -03e9 Thesys Microelectronics -03ea Data Broadcasting Corp. -03eb Atmel Corp. - 0902 4-Port Hub - 2002 Mass Storage Device - 2015 at90usbkey sample firmware (HID keyboard) - 2018 at90usbkey sample firmware (CDC ACM) - 2019 stk525 sample firmware (microphone) - 201c at90usbkey sample firmware (HID mouse) - 201d at90usbkey sample firmware (HID generic) - 2022 at90usbkey sample firmware (composite device) - 2040 LUFA Test PID - 2041 LUFA Mouse Demo Application - 2042 LUFA Keyboard Demo Application - 2043 LUFA Joystick Demo Application - 2044 LUFA CDC Demo Application - 2045 LUFA Mass Storage Demo Application - 2046 LUFA Audio Output Demo Application - 2047 LUFA Audio Input Demo Application - 2048 LUFA MIDI Demo Application - 2049 Stripe Snoop Magnetic Stripe Reader - 204a LUFA CDC Class Bootloader - 204b LUFA USB to Serial Adapter Project - 204c LUFA RNDIS Demo Application - 204d LUFA Combined Mouse and Keyboard Demo Application - 204e LUFA Dual CDC Demo Application - 204f LUFA Generic HID Demo Application - 2060 Benito Programmer Project - 2061 LUFA Combined Mass Storage and Keyboard Demo Application - 2062 LUFA Combined CDC and Mouse Demo Application - 2063 LUFA Datalogger Device - 2064 Interfaceless Control-Only LUFA Devices - 2065 LUFA Test and Measurement Demo Application - 2066 LUFA Multiple Report HID Demo - 2068 LUFA Virtual Serial/Mass Storage Demo - 2103 JTAG ICE mkII - 2104 AVR ISP mkII - 2105 AVRONE! - 2106 STK600 development board - 2107 AVR Dragon - 210d XPLAIN evaluation kit (CDC ACM) - 2122 XMEGA-A1 Explained evaluation kit - 2310 EVK11xx evaluation board - 2ffb at90usb AVR DFU bootloader - 2ffd at89c5130/c5131 DFU bootloader - 2fff at89c5132/c51snd1c DFU bootloader - 3301 at43301 4-Port Hub - 3312 4-Port Hub - 4102 AirVast W-Buddie WN210 - 5601 at76c510 Prism-II 802.11b Access Point - 5603 Cisco 7920 WiFi IP Phone - 6124 at91sam SAMBA bootloader - 7603 D-Link DWL-120 802.11b Wireless Adapter [Atmel at76c503a] - 7604 at76c503a 802.11b Adapter - 7605 at76c503a 802.11b Adapter - 7606 at76c505 802.11b Adapter - 7611 at76c510 rfmd2948 802.11b Access Point - 7613 WL-1130 USB - 7614 AT76c505a Wireless Adapter - 7615 AT76C505AMX Wireless Adapter - 7617 AT76C505AS Wireless Adapter - ff07 Tux Droid fish dongle -03ec Iwatsu America, Inc. -03ed Mitel Corp. -03ee Mitsumi - 0000 CD-R/RW Drive - 2501 eHome Infrared Receiver - 2502 eHome Infrared Receiver - 5609 Japanese Keyboard - 641f WIF-0402C Bluetooth Adapter - 6438 Bluetooth Device - 6440 WML-C52APR Bluetooth Adapter - 6901 SmartDisk FDD - 6902 Floppy Disk Drive - 7500 CD-R/RW - ffff Dongle with BlueCore in DFU mode -03f0 Hewlett-Packard - 0004 DeskJet 895c - 0011 OfficeJet G55 - 0012 DeskJet 1125C Printer Port - 0024 KU-0316 Keyboard - 002a LaserJet P1102 - 0101 ScanJet 4100c - 0102 PhotoSmart S20 - 0104 DeskJet 880c/970c - 0105 ScanJet 4200c - 0107 CD-Writer Plus - 010c Multimedia Keyboard Hub - 0111 G55xi Printer/Scanner/Copier - 0117 LaserJet 3200 - 011c hn210w 802.11b Adapter - 011d Integrated Bluetooth Module - 0121 HP49g+ Calculator - 0122 HID Internet Keyboard - 0201 ScanJet 6200c - 0202 PhotoSmart S20 - 0204 DeskJet 815c - 0205 ScanJet 3300c - 0207 CD-Writer Plus 8200e - 020c Multimedia Keyboard - 0211 OfficeJet G85 - 0212 DeskJet 1220C - 0217 LaserJet 2200 - 0218 APOLLO P2500/2600 - 0304 DeskJet 810c/812c - 0305 ScanJet 4300c - 0307 CD-Writer+ CD-4e - 0311 OfficeJet G85xi - 0312 Color Inkjet CP1700 - 0314 designjet 30/130 series - 0317 LaserJet 1200 - 0324 SK-2885 keyboard - 0401 ScanJet 5200c - 0404 DeskJet 830c/832c - 0405 ScanJet 3400cse - 0411 OfficeJet G95 - 0412 Printing Support - 0417 LaserJet 1200 series - 0423 HS-COMBO - 0504 DeskJet 885c - 0505 ScanJet 2100c - 0507 DVD+RW - 050c 5219 Wireless Keyboard - 0511 OfficeJet K60 - 0512 DeckJet 450 - 0517 LaserJet 1000 - 051d integrated module with Bluetooth wireless technology. - 0601 ScanJet 6300c - 0604 DeskJet 840c - 0605 ScanJet 2200c - 0611 OfficeJet K60xi - 0612 business inkjet 3000 - 0624 Bluetooth Dongle - 0701 ScanJet 5300c/5370c - 0704 DeskJet 825c - 0705 ScanJet 4400c - 0711 OfficeJet K80 - 0712 DeskJet 1180c - 0714 Printing Support - 0801 ScanJet 7400c - 0804 DeskJet 816c - 0805 HP4470C - 0811 OfficeJet K80xi - 0817 LaserJet 3300 - 0901 ScanJet 2300c - 0904 DeskJet 845c - 0912 Printing Support - 0917 LaserJet 3330 - 0924 Modular Smartcard Keyboard - 0a01 ScanJet 2400c - 0a17 color LaserJet 3700 - 0b01 ScanJet 82x0C - 0b0c Wireless Keyboard and Optical Mouse receiver - 0b17 LaserJet 2300d - 0c17 LaserJet 1010 - 0c24 Bluetooth Dongle - 0d12 OfficeJet 9100 series - 0d17 LaserJet 1012 - 0e17 LaserJet 1015 - 0f0c Wireless Keyboard and Optical Mouse receiver - 0f11 OfficeJet V40 - 0f12 Printing Support - 0f17 LaserJet 1150 - 1001 Photo Scanner 1000 - 1002 PhotoSmart 140 series - 1004 DeskJet 970c/970cse - 1005 ScanJet 5400c - 1011 OfficeJet V40xi - 1016 Jornada 548 / iPAQ HW6515 Pocket PC - 1017 LaserJet 1300 - 1024 Smart Card Keyboard - 1027 Virtual keyboard and mouse - 1102 PhotoSmart 240 series - 1104 DeskJet 959c - 1105 ScanJet 5470c/5490c - 1111 OfficeJet v60 - 1116 Jornada 568 Pocket PC - 1117 LaserJet 1300n - 1151 PSC-750xi Printer/Scanner/Copier - 1202 PhotoSmart 320 series - 1204 DeskJet 930c - 1205 ScanJet 4500C/5550C - 1211 OfficeJet v60xi - 1217 LaserJet 2300L - 1302 PhotoSmart 370 series - 1305 ScanJet 4570c - 1311 OfficeJet V30 - 1312 DeskJet 460 - 1317 LaserJet 1005 - 1405 ScanJet 3670 - 1411 PSC 750 - 1424 f2105 Monitor Hub - 1502 PhotoSmart 420 series - 1504 DeskJet 920c - 150c Mood Lighting (Microchip Technology Inc.) - 1511 PSC 750xi - 1512 Printing Support - 1517 color LaserJet 3500 - 1524 Smart Card Keyboard - KR - 1602 PhotoSmart 330 series - 1604 DeskJet 940c - 1605 ScanJet 5530C PhotoSmart - 1611 psc 780 - 1617 LaserJet 3015 - 161d Wireless Rechargeable Optical Mouse (HID) - 1624 Smart Card Keyboard - JP - 1702 PhotoSmart 380 series - 1704 DeskJet 948C - 1705 ScanJet 5590 - 1711 psc 780xi - 1712 Printing Support - 1717 LaserJet 3020 - 171d Wireless (Bluetooth + WLAN) Interface [Integrated Module] - 1801 Inkjet P-2000U - 1802 PhotoSmart 470 series - 1804 DeskJet 916C - 1805 ScanJet 7650 - 1811 PSC 720 - 1812 OfficeJet Pro K550 - 1817 LaserJet 3030 - 181d integrated module with Bluetooth 2.0 wireless technology. - 1902 PhotoSmart A430 series - 1904 DeskJet 3820 - 1911 OfficeJet V45 - 1917 LaserJet 3380 - 1a02 PhotoSmart A510 series - 1a11 OfficeJet 5100 series - 1a17 color LaserJet 4650 - 1b02 PhotoSmart A610 series - 1b04 DeskJet 3810 - 1b05 ScanJet 4850C/4890C - 1c02 PhotoSmart A710 series - 1c17 Color LaserJet 2550l - 1d02 PhotoSmart A310 series - 1d17 LaserJet 1320 - 1e02 PhotoSmart A320 Printer series - 1e11 PSC-950 - 1e17 LaserJet 1160 series - 1f02 PhotoSmart A440 Printer series - 1f11 PSC 920 - 1f12 OfficeJet Pro K5300 - 1f17 color LaserJet 5550 - 1f1d un2400 Gobi Wireless Modem - 2001 Floppy - 2002 Hub - 2004 DeskJet 640c - 2005 ScanJet 3570c - 2012 OfficeJet Pro K5400 - 201d un2400 Gobi Wireless Modem (QDL mode) - 2102 PhotoSmart 7345 - 2104 DeskJet 630c - 2112 OfficeJet Pro L7500 - 211d Sierra MC5725 [ev2210] - 2202 PhotoSmart 7600 series - 2205 ScanJet 3500c - 2212 OfficeJet Pro L7600 - 2217 color LaserJet 9500 MFP - 2302 PhotoSmart 7600 series - 2304 DeskJet 656c - 2305 ScanJet 3970c - 2311 OfficeJet d series - 2312 OfficeJet Pro L7700 - 2317 LaserJet 4350 - 2402 PhotoSmart 7700 series - 2404 Deskjet F2280 series - 2405 ScanJet 4070 PhotoSmart - 2417 LaserJet 4250 - 241d Gobi 2000 Wireless Modem (QDL mode) - 2424 LP1965 19" Monitor Hub - 2502 PhotoSmart 7700 series - 2504 DeskJet F4200 series - 2505 ScanJet 3770 - 2512 OfficeJet Pro L7300 - 2517 LaserJet 2410 - 251d Gobi 2000 Wireless Modem - 2524 LP3065 30" Monitor Hub - 2602 PhotoSmart A520 series - 2605 ScanJet 3800c - 2611 OfficeJet 7100 series - 2617 Color LaserJet 2820 series - 2624 Pole Display (HP522 2 x 20 Line Display) - 2702 PhotoSmart A620 series - 2704 DeskJet 915 - 2717 Color LaserJet 2830 - 2811 PSC-2100 - 2817 Color LaserJet 2840 - 2902 PhotoSmart A820 series - 2911 PSC 2200 - 2917 LaserJet 2420 - 2a11 PSC 2150 series - 2a17 LaserJet 2430 - 2b11 PSC 2170 series - 2b17 LaserJet 1020 - 2c12 Officejet J4680 - 2c17 LaserJet 1022 - 2c24 Logitech M-UAL-96 Mouse - 2d11 OfficeJet 6110 - 2d17 Printing Support - 2e11 PSC 1000 - 2e17 LaserJet 2600n - 2e24 LP2275w Monitor Hub - 2f11 PSC 1200 - 2f17 EWS 2605dn - 2f24 LP2475w Monitor Hub - 3002 PhotoSmart P1000 - 3004 DeskJet 980c - 3005 ScanJet 4670v - 3011 PSC 1100 series - 3017 Printing Support - 3102 PhotoSmart P1100 Printer w/ Card Reader - 3104 DeskJet 960c - 3111 OfficeJet 4100 series - 3117 EWS 2605dtn - 311d Atheros AR9285 Malbec Bluetooth Adapter - 3202 PhotoSmart 1215 - 3207 4 GB flash drive - 3211 OfficeJet 4105 series - 3217 LaserJet 3050 - 3302 PhotoSmart 1218 - 3304 DeskJet 990c - 3312 OfficeJet J6410 - 3317 LaserJet 3052 - 3402 PhotoSmart 1115 - 3404 DeskJet 6122 - 3417 LaserJet 3055 - 3502 PhotoSmart 230 - 3504 DeskJet 6127c - 3511 PSC 2300 - 3517 LaserJet 3390 - 3602 PhotoSmart 1315 - 3611 PSC 2410 PhotoSmart - 3617 Color LaserJet 2605 - 3711 PSC 2500 - 3717 EWS UPD - 3724 Webcam - 3802 PhotoSmart 100 - 3817 LaserJet P2015 series - 3902 PhotoSmart 130 - 3a02 PhotoSmart 7150 - 3a11 OfficeJet 5500 series - 3a17 Printing Support - 3b02 PhotoSmart 7150~ - 3b11 PSC 1300 series - 3b17 LaserJet M1005 MFP - 3c02 PhotoSmart 7350 - 3c11 PSC 1358 - 3c17 EWS UPD - 3d02 PhotoSmart 7350~ - 3d11 OfficeJet 4215 - 3d17 LaserJet P1005 - 3e02 PhotoSmart 7550 - 3e17 LaserJet P1006 - 3f02 PhotoSmart 7550~ - 3f11 PSC-1315/PSC-1317 - 4002 PhotoSmart 635/715/720/735/935 (storage) - 4004 cp1160 - 4102 PhotoSmart 618 - 4105 ScanJet 4370 - 4111 OfficeJet 7200 series - 4117 LaserJet 1018 - 4202 PhotoSmart 812 - 4205 ScanJet G3010 - 4211 OfficeJet 7300 series - 4217 EWS CM1015 - 4302 PhotoSmart 850 (ptp) - 4305 ScanJet G3110 - 4311 OfficeJet 7400 series - 4317 Color LaserJet CM1017 - 4402 PhotoSmart 935 (ptp) - 4417 EWS UPD - 4502 PhotoSmart 945 (PTP mode) - 4505 ScanJet G4010 - 4511 PhotoSmart 2600 - 4517 EWS UPD - 4605 ScanJet G4050 - 4611 PhotoSmart 2700 - 4717 Color LaserJet CP1215 - 4811 PSC 1600 - 4911 PSC 2350 - 4b11 OfficeJet 6200 - 4c11 PSC 1500 series - 4c17 EWS UPD - 4d11 PSC 1400 - 4d17 EWS UPD - 4e11 PhotoSmart 2570 series - 4f11 OfficeJet 5600 (USBHUB) - 5004 DeskJet 995c - 5011 PhotoSmart 3100 series - 5017 EWS UPD - 5111 PhotoSmart 3200 series - 5211 PhotoSmart 3300 series - 5311 OfficeJet 6300 - 5411 OfficeJet 4300 - 5511 DeskJet F300 series - 5611 PhotoSmart C3180 - 5617 LaserJet M1120 MFP - 5711 PhotoSmart C4100 series - 5717 LaserJet M1120n MFP - 5811 PhotoSmart C5100 series - 5817 LaserJet M1319f MFP - 5911 PhotoSmart C6180 - 5a11 PhotoSmart C7100 series - 5b11 OfficeJet J2100 series - 5c11 PhotoSmart C4200 Printer series - 5d11 PhotoSmart C5200 series - 5e11 PhotoSmart D7400 series - 6004 DeskJet 5550 - 6102 Hewlett Packard Digital Camera - 6104 DeskJet 5650c - 6117 color LaserJet 3550 - 6202 PhotoSmart 215 - 6204 DeskJet 5150c - 6217 Color LaserJet 4700 - 6302 PhotoSmart 318/612 - 6317 Color LaserJet 4730mfp - 6402 PhotoSmart 715 (ptp) - 6411 PhotoSmart C8100 series - 6417 LaserJet 5200 - 6502 PhotoSmart 120 (ptp) - 6511 PhotoSmart C7200 series - 6602 PhotoSmart 320 - 6611 PhotoSmart C4380 series - 6617 LaserJet 5200L - 6702 PhotoSmart 720 (ptp) - 6717 Color LaserJet 3000 - 6802 PhotoSmart 620 (ptp) - 6811 PhotoSmart D5300 series - 6817 Color LaserJet 3800 - 6911 PhotoSmart D7200 series - 6917 Color LaserJet 3600 - 6a02 PhotoSmart 735 (ptp) - 6a11 PhotoSmart C6200 series - 6a17 LaserJet 4240 - 6b02 PhotoSmart R707 (PTP mode) - 6b11 Photosmart C4500 series - 6c17 Color LaserJet 4610 - 6f17 Color LaserJet CP6015 series - 7004 DeskJet 3320c - 7102 PhotoSmart 635 (PTP mode) - 7104 DeskJet 3420c - 7117 CM8060 Color MFP with Edgeline Technology - 7202 PhotoSmart 43x (ptp) - 7204 DeskJet 36xx - 7217 LaserJet M5035 MFP - 7302 PhotoSmart M307 (PTP mode) - 7304 DeskJet 35xx - 7311 Photosmart Premium C309 - 7317 LaserJet P3005 - 7404 Printing Support - 7417 LaserJet M4345 MFP - 7504 Printing Support - 7517 LaserJet M3035 MFP - 7604 DeskJet 3940 - 7611 DeskJet F2492 All-in-One - 7617 LaserJet P3004 - 7702 PhotoSmart R817 (PTP mode) - 7704 DeskJet D4100 - 7717 CM8050 Color MFP with Edgeline Technology - 7804 DeskJet D1360 - 7817 Color LaserJet CP3505 - 7917 LaserJet M5025 MFP - 7a02 PhotoSmart M415 (PTP mode) - 7a04 DeskJet D2460 - 7a17 LaserJet M3027 MFP - 7b02 PhotoSmart M23 (PTP mode) - 7b17 Color LaserJet CP4005 - 7c17 Color LaserJet CM6040 series - 7d04 DeskJet F2100 Printer series - 7d17 Color LaserJet CM4730 MFP - 7e04 DeskJet F4100 Printer series - 8017 LaserJet P4515 - 8104 Printing Support - 8117 LaserJet P4015 - 811c Ethernet HN210E - 8204 Printing Support - 8207 FHA-3510 2.4GHz Wireless Optical Mobile Mouse - 8217 LaserJet P4014 - 8317 LaserJet M9050 MFP - 8404 DeskJet 6800 series - 8417 LaserJet M9040 MFP - 8504 DeskJet 6600 series - 8604 DeskJet 5440 - 8704 DeskJet 5940 - 8804 DeskJet 6980 series - 8904 DeskJet 6940 series - 9002 PhotoSmart M437 - 9102 PhotoSmart M537 - 9302 PhotoSmart R930 series - 9402 PhotoSmart R837 - 9502 PhotoSmart R840 series - 9602 PhotoSmart M730 series - 9702 PhotoSmart R740 series - 9802 PhotoSmart Mz60 series - 9902 PhotoSmart M630 series - 9a02 PhotoSmart E330 series - 9b02 PhotoSmart M540 series - 9c02 PhotoSmart M440 series - a004 DeskJet 5850c - b002 PhotoSmart 7200 series - b102 PhotoSmart 7200 series - b116 Webcam - b202 PhotoSmart 7600 series - b302 PhotoSmart 7600 series - b402 PhotoSmart 7700 series - b502 PhotoSmart 7700 series - b602 PhotoSmart 7900 series - b702 PhotoSmart 7900 series - b802 PhotoSmart 7400 series - b902 PhotoSmart 7800 series - ba02 PhotoSmart 8100 series - bb02 PhotoSmart 8400 series - bc02 PhotoSmart 8700 series - bd02 PhotoSmart Pro B9100 series - bef4 NEC Picty760 - c002 PhotoSmart 7800 series - c102 PhotoSmart 8000 series - c202 PhotoSmart 8200 series - c302 DeskJet D2300 - c402 PhotoSmart D5100 series - c502 PhotoSmart D6100 series - c602 PhotoSmart D7100 series - c702 PhotoSmart D7300 series - c802 PhotoSmart D5060 Printer - d104 Bluetooth Dongle - efbe NEC Picty900 - f0be NEC Picty920 - f1be NEC Picty800 -03f1 Genoa Technology -03f2 Oak Technology, Inc. -03f3 Adaptec, Inc. - 0020 AWN-8020 WLAN - 0080 AVC-1100 Audio Capture - 0083 AVC-2200 Device - 0087 AVC-2210 Loader - 0088 AVC-2210 Device - 008b AVC-2310 Loader - 008c AVC-2310 Device - 0094 eHome Infrared Receiver - 009b AVC-1410 GameBridge TV NTSC - 2000 USBXchange - 2001 USBXchange Adapter - 2002 USB2-Xchange - 2003 USB2-Xchange Adapter - adcc Composite Device Support -03f4 Diebold, Inc. -03f5 Siemens Electromechanical -03f8 Epson Imaging Technology Center -03f9 KeyTronic Corp. - 0100 Keyboard - 0101 Keyboard - 0102 Keyboard Mouse -03fb OPTi, Inc. -03fc Elitegroup Computer Systems -03fd Xilinx, Inc. -03fe Farallon Comunications -0400 National Semiconductor Corp. - 05dc Rigol Technologies DS1000USB Oscilloscope - 0807 Bluetooth Dongle - 080a Bluetooth Device - 09c4 Rigol Technologies DG1022 Arbitrary Waveform Generator - 1000 Mustek BearPaw 1200 Scanner - 1001 Mustek BearPaw 2400 Scanner - 1237 Hub - a000 Smart Display Reference Device - c359 Logitech Harmony (Boot loader mode) - c35b Printing Support - c55d Rigol Technologies DS5000USB Oscilloscope -0401 National Registry, Inc. -0402 ALi Corp. - 5462 M5462 IDE Controller - 5602 M5602 Video Camera Controller - 5603 M5603 Video Camera Controller - 5606 M5606 Video Camera Controller [UVC] - 5621 M5621 High-Speed IDE Controller - 5623 M5623 Scanner Controller - 5627 Welland ME-740PS USB2 3.5" Power Saving Enclosure - 5632 M5632 Host-to-Host Link - 5635 M5635 Flash Card Reader - 5636 USB 2.0 Storage Device - 5637 M5637 IDE Controller - 5661 M5661 MP3 player - 5667 M5667 MP3 player -0403 Future Technology Devices International, Ltd - 0000 H4SMK 7 Port Hub - 0232 Serial Converter - 1060 JTAG adapter - 6001 FT232 USB-Serial (UART) IC - 6007 Serial Converter - 6008 Serial Converter - 6009 Serial Converter - 6010 FT2232C Dual USB-UART/FIFO IC - 6011 FT4232H - 8040 4 Port Hub - 8070 7 Port Hub - 8370 7 Port Hub - 8371 PS/2 Keyboard And Mouse - 8372 FT8U100AX Serial Port - bcd8 Stellaris Development Board - bcd9 Stellaris Evaluation Board - c630 lcd2usb interface - c7d0 RR-CirKits LocoBuffer-USB - c8b8 Alpermann+Velte MTD TCU - c8b9 Alpermann+Velte MTD TCU 1HE - c8ba Alpermann+Velte Rubidium H1 - c8bb Alpermann+Velte Rubidium H3 - c8bc Alpermann+Velte Rubidium S1 - c8bd Alpermann+Velte Rubidium T1 - c8be Alpermann+Velte Rubidium D1 - cc48 product FTDI TACTRIX_OPENPORT_13M 0xcc48 OpenPort 1.3 Mitsubishi - cc49 product FTDI TACTRIX_OPENPORT_13S 0xcc49 OpenPort 1.3 Subaru - cc4a product FTDI TACTRIX_OPENPORT_13U 0xcc4a OpenPort 1.3 Universal - d010 SCS PTC-IIusb - d011 SCS Position-Tracker/TNC - d012 SCS DRAGON 1 - d013 SCS DRAGON 1 - d6f8 UNI Black BOX - d9a9 Actisense USG-1 NMEA Serial Gateway - d9aa Actisense NGT-1 NMEA2000 PC Interface - e0d0 Total Phase Aardvark I2C/SPI Host Adapter - e521 EVER Sinline XL Series UPS - e700 Elster Unicom III Optical Probe - e888 Expert ISDN Control USB - e889 USB-RS232 OptoBridge - e88a Expert mouseCLOCK USB II - e88b Precision Clock MSF USB - e88c Expert mouseCLOCK USB II HBG - ea90 Eclo 1-Wire Adapter - ed71 HAMEG HO870 Serial Port - ed72 HAMEG HO720 Serial Port - ed73 HAMEG HO730 Serial Port - ed74 HAMEG HO820 Serial Port - ef10 FT1245BL - f070 Serial Converter 422/485 [Vardaan VEUSB422R3] - f1a0 Asix PRESTO Programmer - f208 Papenmeier Braille-Display - f3c0 4N-GALAXY Serial Converter - f680 Suunto Sports Instrument - f758 GW Instek GDS-8x0 Oscilloscope - f850 USB-UIRT (Universal Infrared Receiver+Transmitter) - f918 Ant8 Logic Probe - fa00 Matrix Orbital USB Serial - fa01 Matrix Orbital MX2 or MX3 - fa02 Matrix Orbital MX4 or MX5 - fa03 Matrix Orbital VK/LK202 Family - fa04 Matrix Orbital VK/LK204 Family - fc08 Crystalfontz CFA-632 USB LCD - fc09 Crystalfontz CFA-634 USB LCD - fc0b Crystalfontz CFA-633 USB LCD - fc0c Crystalfontz CFA-631 USB LCD - fc0d Crystalfontz CFA-635 USB LCD - fc82 SEMC DSS-20/DSS-25 SyncStation - fd48 ShipModul MiniPlex-4xUSB NMEA Multiplexer - fd49 ShipModul MiniPlex-4xUSB-AIS NMEA Multiplexer - ff08 ToolHouse LoopBack Adapter - ff18 Logbook Bus - ff19 Logbook Bus - ff1a Logbook Bus - ff1b Logbook Bus - ff1c Logbook Bus - ff1d Logbook Bus - ff1e Logbook Bus - ff1f Logbook Bus -0404 NCR Corp. - 0202 78XX Scanner - 0203 78XX Scanner - Embedded System - 0310 K590 Printer, Self-Service - 0311 7167 Printer, Receipt/Slip - 0312 7197 Printer Receipt - 0320 5932-USB Keyboard - 0321 5953-USB Dynakey - 0322 5932-USB Enhanced Keyboard - 0323 5932-USB Enhanced Keyboard, Flash-Recovery/Download - 0324 5953-USB Enhanced Dynakey - 0325 5953-USB Enhanced Dynakey Flash-Recovery/Download - 0328 K016: USB-MSR ISO 3-track MSR: POS Standard (See HID pages) - 0329 K018: USB-MSR JIS 2-Track MSR: POS Standard - 032a K016: USB-MSR ISO 3-Track MSR: HID Keyboard Mode - 032b K016/K018: USB-MSR Flash-Recovery/Download -0405 Synopsys, Inc. -0406 Fujitsu-ICL Computers -0407 Fujitsu Personal Systems, Inc. -0408 Quanta Computer, Inc. - 0103 FV TouchCam N1 (Audio) - 030c HP Webcam - 03b2 HP Webcam - 1030 FV TouchCam N1 (Video) - 3000 Optical dual-touch panel - 3001 Optical Touch Screen -0409 NEC Corp. - 0011 PC98 Series Layout Keyboard Mouse - 0012 ATerm IT75DSU ISDN TA - 0014 Japanese Keyboard - 0019 109 Japanese Keyboard with Bus-Powered Hub - 001a PC98 Series Layout Keyboard with Bus-Powered Hub - 0025 Mini Keyboard with Bus-Powered Hub - 0027 MultiSync Monitor - 002c Clik!-USB Drive - 0034 109 Japanese Keyboard with One-touch start buttons - 003f Wireless Keyboard with One-touch start buttons - 0040 Floppy - 004e SuperScript 1400 Series - 004f Wireless Keyboard with One-touch start buttons - 0058 HighSpeed Hub - 0059 HighSpeed Hub - 005a HighSpeed Hub - 006a Conceptronic USB Harddisk Box - 0081 SuperScript 1400 Series - 0082 SuperScript 1400 Series - 0094 Japanese Keyboard with One-touch start buttons - 0095 Japanese Keyboard - 00a9 AtermIT21L 128K Support Standard - 00aa AtermITX72 128K Support Standard - 00ab AtermITX62 128K Support Standard - 00ac AtermIT42 128K Support Standard - 00ae INSMATEV70G-MAX Standard - 00af AtermITX70 128K Support Standard - 00b0 AtermITX80 128K Support Standard - 00b2 AtermITX80D 128K Support Standard - 00c0 Wireless Remocon - 00f7 Smart Display PK-SD10 - 011d e228 Mobile Phone - 0203 HID Audio Controls - 0248 Aterm PA-WL54GU - 0249 Aterm WL300NU-G - 02b4 Aterm WL300NU-AG - 55aa Hub - 55ab Hub [iMac/iTouch kbd] - 8010 Intellibase Hub - 8011 Intellibase Hub - efbe P!cty 900 [HP DJ] - f0be P!cty 920 [HP DJ 812c] -040a Kodak Co. - 0001 DVC-323 - 0002 DVC-325 - 0100 DC-220 - 0110 DC-260 - 0111 DC-265 - 0112 DC-290 - 0120 DC-240 - 0121 DC-240 (PTP firmware) - 0130 DC-280 - 0131 DC-5000 - 0132 DC-3400 - 0140 DC-4800 - 0160 DC4800 - 0170 DX3900 - 0200 Digital Camera - 0300 EZ-200 - 0400 MC3 - 0402 Digital Camera - 0403 Z7590 - 0500 DX3500 - 0510 DX3600 - 0525 DX3215 - 0530 DX3700 - 0535 EasyShare CX4230 Camera - 0540 LS420 - 0550 DX4900 - 0555 DX4330 - 0560 CX4200 - 0565 CX4210 - 0566 CX4300 - 0567 LS753 - 0568 LS443 - 0569 LS663 - 0570 DX6340 - 0571 CX6330 - 0572 DX6440 - 0573 CX6230 - 0574 CX6200 - 0575 DX6490 - 0576 DX4530 - 0577 DX7630 - 0578 CX7300/CX7310 - 0579 CX7220 - 057a CX7330 - 057b CX7430 - 057c CX7530 - 057d DX7440 - 057e C300 - 057f DX7590 - 0580 Z730 - 0581 Digital Camera - 0582 Digital Camera - 0583 Digital Camera - 0584 CX6445 - 0585 Digital Camera - 0586 CX7525 - 0587 Digital Camera - 0588 Digital Camera - 0589 EasyShare C360 - 058a C310 - 058b Digital Camera - 058c C330 - 058d C340 - 058e V530 - 058f V550 - 0590 Digital Camera - 0591 Digital Camera - 0592 Digital Camera - 0593 Digital Camera - 0594 Digital Camera - 0595 Digital Camera - 0596 Digital Camera - 0597 Digital Camera - 0598 Digital Camera - 0599 Digital Camera - 059a Digital Camera - 059b Digital Camera - 059c Digital Camera - 059d Digital Camera - 059e Digital Camera - 059f Digital Camera - 05a0 Digital Camera - 05a1 Digital Camera - 05a2 Digital Camera - 05a3 Digital Camera - 05a4 Digital Camera - 05a5 Digital Camera - 05a6 Digital Camera - 05a7 Digital Camera - 05a8 Digital Camera - 05a9 Digital Camera - 05aa Digital Camera - 05ab Digital Camera - 05ac Digital Camera - 05ad Digital Camera - 05ae Digital Camera - 05af Digital Camera - 05b0 Digital Camera - 05b1 Digital Camera - 05b2 Digital Camera - 05b3 EasyShare Z710 Camera - 05b4 Digital Camera - 05b5 Digital Camera - 05b6 Digital Camera - 05b7 Digital Camera - 05b8 Digital Camera - 05b9 Digital Camera - 05ba Digital Camera - 05bb Digital Camera - 05bc Digital Camera - 05bd Digital Camera - 05be Digital Camera - 05bf Digital Camera - 05c0 Digital Camera - 05c1 Digital Camera - 05c2 Digital Camera - 05c3 Digital Camera - 05c4 Digital Camera - 05c5 Digital Camera - 05c8 EASYSHARE Z1485 IS Digital Camera - 05d3 EasyShare M320 Camera - 05d4 EasyShare C180 Digital Camera - 1001 EasyShare SV811 Digital Picture Frame - 4000 InkJet Color Printer - 4109 EasyShare Printer Dock Series 3 - 410d EasyShare G600 Printer Dock - 5010 Wireless Adapter - 5012 DBT-220 Bluetooth Adapter - 6001 i30 - 6002 i40 - 6003 i50 - 6004 i60 - 6005 i80 -040b Weltrend Semiconductor - 6510 Weltrend Bar Code Reader - 6520 XBOX Xploder - 6533 Speed-Link Competition Pro -040c VTech Computers, Ltd -040d VIA Technologies, Inc. - 3184 VNT VT6656 USB-802.11 Wireless LAN Adapter - 6205 USB 2.0 Card Reader -040e MCCI -040f Echo Speech Corp. -0411 BUFFALO INC. (formerly MelCo., Inc.) - 0001 LUA-TX Ethernet [pegasus] - 0005 LUA-TX Ethernet - 0006 WLI-USB-L11 Wireless LAN Adapter - 0009 LUA2-TX Ethernet - 000b WLI-USB-L11G-WR Wireless LAN Adapter - 000d WLI-USB-L11G Wireless LAN Adapter - 0012 LUA-KTX Ethernet - 0013 USB2-IDE Adapter - 0016 WLI-USB-S11 802.11b Adapter - 0018 USB2-IDE Adapter - 001c USB-IDE Bridge: DUB-PxxG - 0027 WLI-USB-KS11G 802.11b Adapter - 003d LUA-U2-KTX Ethernet - 0044 WLI-USB-KB11 Wireless LAN Adapter - 004b WLI-USB-G54 802.11g Adapter [Broadcom 4320 USB] - 004d WLI-USB-B11 Wireless LAN Adapter - 0050 WLI2-USB2-G54 Wireless LAN Adapter - 005e WLI-U2-KG54-YB WLAN - 0065 Python2 WDM Encoder - 0066 WLI-U2-KG54 WLAN - 0067 WLI-U2-KG54-AI WLAN - 0089 Buffalo RUF-C/U2 Flash Drive - 008b Nintendo Wi-Fi - 0091 WLI-U2-KAMG54 Wireless LAN Adapter - 0092 WLI-U2-KAMG54 Bootloader - 0097 WLI-U2-KG54-BB - 00a9 WLI-U2-AMG54HP Wireless LAN Adapter - 00aa WLI-U2-AMG54HP Bootloader - 00b3 PC-OP-RS1 RemoteStation - 00bc WLI-U2-KG125S 802.11g Adapter [Broadcom 4320 USB] - 00ca 802.11n Network Adapter - 00cb WLI-U2-G300N 802.11n Adapter - 00d8 WLI-U2-SG54HP - 00d9 WLI-U2-G54HP - 00da WLI-U2-KG54L 802.11bg [ZyDAS ZD1211B] - 00e8 Buffalo WLI-UC-G300N Wireless LAN Adapter - 012e Buffalo WLI-UC-AG300N Wireless LAN Adapter - 0148 Buffalo WLI-UC-G300HP Wireless LAN Adapter - 0150 Buffalo WLP-UC-AG300 Wireless LAN Adapter - 0157 Buffalo External Hard Drive HD-PEU2 - 0158 Buffalo WLI-UC-GNHP Wireless LAN Adapter - 015d Buffalo WLI-UC-GN Wireless LAN Adapter [Ralink RT2870] - 016f Buffalo WLI-UC-G301N Wireless LAN Adapter - 017f Sony UWA-BR100 802.11abgn Wireless Adapter [Atheros AR7010+AR9280] - 019e Buffalo WLI-UC-GNP Wireless LAN Adapter - 01a1 MiniStation Metro - 01a2 Buffalo WLI-UC-GNM Wireless LAN Adapter -0412 Award Software International -0413 Leadtek Research, Inc. - 1310 WinFast TV - NTSC + FM - 1311 WinFast TV - NTSC + MTS + FM - 1312 WinFast TV - PAL BG + FM - 1313 WinFast TV - PAL BG+TXT + FM - 1314 WinFast TV Audio - PHP PAL I - 1315 WinFast TV Audio - PHP PAL I+TXT - 1316 WinFast TV Audio - PHP PAL DK - 1317 WinFast TV Audio - PHP PAL DK+TXT - 1318 WinFast TV - PAL I/DK + FM - 1319 WinFast TV - PAL N + FM - 131a WinFast TV Audio - PHP SECAM LL - 131b WinFast TV Audio - PHP SECAM LL+TXT - 131c WinFast TV Audio - PHP SECAM DK - 131d WinFast TV - SECAM DK + TXT + FM - 131e WinFast TV - NTSC Japan + FM - 1320 WinFast TV - NTSC - 1321 WinFast TV - NTSC + MTS - 1322 WinFast TV - PAL BG - 1323 WinFast TV - PAL BG+TXT - 1324 WinFast TV Audio - PHP PAL I - 1325 WinFast TV Audio - PHP PAL I+TXT - 1326 WinFast TV Audio - PHP PAL DK - 1327 WinFast TV Audio - PHP PAL DK+TXT - 1328 WinFast TV - PAL I/DK - 1329 WinFast TV - PAL N - 132a WinFast TV Audio - PHP SECAM LL - 132b WinFast TV Audio - PHP SECAM LL+TXT - 132c WinFast TV Audio - PHP SECAM DK - 132d WinFast TV - SECAM DK + TXT - 132e WinFast TV - NTSC Japan - 6023 EMP Audio Device - 6024 WinFast PalmTop/Novo TV Video - 6025 WinFast DTV Dongle (cold state) - 6026 WinFast DTV Dongle (warm state) - 6029 WinFast DTV Dongle Gold - 6125 WinFast DTV Dongle - 6126 WinFast DTV Dongle BDA Driver - 6f00 WinFast DTV Dongle (STK7700P based) -0414 Giga-Byte Technology Co., Ltd -0416 Winbond Electronics Corp. - 0035 W89C35 802.11bg WLAN Adapter - 0101 Hub - 0961 AVL Flash Card Reader - 3810 Smart Card Controller - 3811 Generic Controller - Single interface - 3812 Smart Card Controller_2Interface - 3813 Panel Display - 5518 4-Port Hub - 551a PC Sync Keypad - 551b PC Async Keypad - 551c Sync Tenkey - 551d Async Tenkey - 551e Keyboard - 551f Keyboard w/ Sys and Media - 5521 Keyboard - 6481 16-bit Scanner - 7721 Memory Stick Reader/Writer - 7722 Memory Stick Reader/Writer - 7723 SD Card Reader -0417 Symbios Logic -0418 AST Research -0419 Samsung Info. Systems America, Inc. - 0001 IrDA Remote Controller / Creative Cordless Mouse - 0600 Desktop Wireless 6000 - 3001 Xerox P1202 Laser Printer - 3003 Olivetti PG L12L - 3201 Docuprint P8ex - 3404 SCX-5x12 series - 3406 MFP 830 series - 3407 ML-912 - 3601 InkJet Color Printer - 3602 InkJet Color Printer - 4602 Remote NDIS Network Device - 8001 Hub - 8002 SyncMaster HID Monitor Control - aa03 SDAS-3 MP3 Player -041a Phoenix Technologies, Ltd -041b d'TV -041d S3, Inc. -041e Creative Technology, Ltd - 1002 Nomad II - 1003 Blaster GamePad Cobra - 1050 GamePad Cobra - 1053 Mouse Gamer HD7600L - 200c MuVo V100 - 2020 Zen X-Fi 2 - 2029 ZiiO - 2801 Prodikeys PC-MIDI multifunction keyboard - 3000 SoundBlaster Extigy - 3002 SB External Composite Device - 3010 SoundBlaster MP3+ - 3014 SB External Composite Device - 3015 Sound Blaster Digital Music LX - 3020 SoundBlaster Audigy 2 NX - 3030 SB External Composite Device - 3040 SoundBlaster Live! 24-bit External SB0490 - 3060 Sound Blaster Audigy 2 ZS External - 3061 SoundBlaster Audigy 2 ZS Video Editor - 3090 Sound Blaster Digital Music SX - 3f00 E-Mu Xboard 25 MIDI Controller - 3f02 E-Mu 0202 - 3f04 E-Mu 0404 - 3f07 E-Mu Xmidi 1x1 - 4003 VideoBlaster Webcam Go Plus [W9967CF] - 4004 Nomad II MG - 4005 Webcam Blaster Go ES - 4007 Go Mini - 400a PC-Cam 300 - 400b PC-Cam 600 - 400c Webcam 5 [pwc] - 400d Webcam PD1001 - 400f PC-CAM 550 (Composite) - 4011 Webcam PRO eX - 4012 PC-CAM350 - 4013 PC-Cam 750 - 4015 CardCam Value - 4016 CardCam - 4017 Webcam Mobile [PD1090] - 4018 Webcam Vista [PD1100] - 4019 Audio Device - 401a Webcam Vista [PD1100] - 401c Webcam NX [PD1110] - 401d Webcam NX Ultra - 401e Webcam NX Pro - 401f Webcam Notebook [PD1171] - 4020 Webcam NX - 4021 Webcam NX Ultra - 4022 Webcam NX Pro - 4028 Vista Plus cam [VF0090] - 4029 Webcam Live! - 402f DC-CAM 3000Z - 4034 Webcam Instant - 4035 Webcam Instant - 4036 Webcam Live!/Live! Pro - 4037 Webcam Live! - 4038 ORITE CCD Webcam [PC370R] - 4039 Webcam Live! Effects - 403a Webcam NX Pro 2 - 403b Creative Webcam Vista [VF0010] - 403c Webcam Live! Ultra - 403d Webcam Notebook Ultra - 403e Webcam Vista Plus - 4041 Webcam Live! Motion - 4045 Live! Cam Voice - 4049 Live! Cam Voice - 4051 Live! Cam Notebook Pro [VF0250] - 4052 Live! Cam Vista IM - 4053 Live! Cam Video IM - 4054 Live! Cam Video IM - 4055 Live! Cam Video IM Pro - 4056 Live! Cam Video IM Pro - 4057 Live! Cam Optia - 4058 Live! Cam Optia AF - 4061 Live! Cam Notebook Pro [VF0400] - 4063 Live! Cam Video IM Pro - 4068 Live! Cam Notebook [VF0470] - 406c Live! Cam Sync [VF0520] - 4083 Live! Cam Socialize [VF0640] - 4100 Nomad Jukebox 2 - 4101 Nomad Jukebox 3 - 4102 NOMAD MuVo^2 - 4106 Nomad MuVo - 4107 NOMAD MuVo - 4108 Nomad Jukebox Zen - 4109 Nomad Jukebox Zen NX - 410b Nomad Jukebox Zen USB 2.0 - 410c Nomad MuVo NX - 410f NOMAD MuVo^2 (Flash) - 4110 Nomad Jukebox Zen Xtra - 4111 Dell Digital Jukebox - 4116 MuVo^2 - 4117 Nomad MuVo TX - 411b Zen Touch - 411c Nomad MuVo USB 2.0 - 411d Zen - 411e Zen Micro - 4120 Nomad MuVo TX FM - 4123 Zen Portable Media Center - 4124 MuVo^2 FM (uHDD) - 4126 Dell DJ (2nd gen) - 4127 Dell DJ - 4128 NOMAD Jukebox Zen Xtra (mtp) - 412b MuVo N200 with FM radio - 412f Dell Digital Jukebox 2.Gen - 4130 Zen Micro (mtp) - 4131 Zen Touch (mtp) - 4133 Mass Storage Device - 4134 Zen Neeon - 4136 Zen Sleek - 4137 Zen Sleek (mtp) - 4139 Zen Nano Plus - 413c Zen MicroPhoto - 4150 Zen V (MTP) - 4151 Zen Vision:M (mtp) - 4152 Zen V Plus - 4153 Zen Vision W - 4155 Zen Stone plus - 4157 Zen (MTP) - 500f Broadband Blaster 8012U-V - 5015 TECOM Bluetooth Device - ffff Webcam Live! Ultra -041f LCS Telegraphics -0420 Chips and Technologies - 1307 Celly SIM Card Reader -0421 Nokia Mobile Phones - 0001 E61i (PC Suite mode) - 0018 6288 GSM Smartphone - 0019 6288 GSM Smartphone (imaging mode) - 001a 6288 GSM Smartphone (file transfer mode) - 0024 5610 XpressMusic (Storage mode) - 0025 5610 XpressMusic (PC Suite mode) - 0028 5610 XpressMusic (Imaging mode) - 002d 6120 Phone (Mass storage mode) - 002e 6120 Phone (Media-Player mode) - 002f 6120 Phone (PC-Suite mode) - 0042 E51 (PC Suite mode) - 0064 3109c GSM Phone - 006b 5310 Xpress Music (PC Suite mode) - 006c 5310 Xpress music (Storage mode) - 006d N95 (Storage mode) - 006e N95 (Multimedia mode) - 006f N95 (Printing mode) - 0070 N95 (PC Suite mode) - 0096 N810 Internet Tablet - 00aa E71 (Mass storage mode) - 00ab E71 (PC Suite mode) - 00e4 E71 (Media transfer mode) - 0103 ADL Flashing Engine AVALON Parent - 0104 ADL Re-Flashing Engine Parent - 0105 Nokia Firmware Upgrade Mode - 0106 ROM Parent - 0154 5800 XpressMusic (PC Suite mode) - 0155 5800 XpressMusic (Multimedia mode) - 0156 5800 XpressMusic (Storage mode) - 0157 5800 XpressMusic (Imaging mode) - 0199 6700 Classic (msc) - 019a 6700 Classic (PC Suite) - 019b 6700 Classic (mtp) - 01b0 6303 classic Phone (PC Suite mode) - 01b1 6303 classic Phone (Mass storage mode) - 01b2 6303 classic Phone (Printing and media mode) - 01c7 N900 (Storage Mode) - 01c8 N900 (PC-Suite Mode) - 0228 5530 XpressMusic - 026a N97 (mass storage) - 026b N97 (Multimedia) - 026c N97 (PC Suite) - 026d N97 (Pictures) - 0295 660i/6600i Slide Phone (Mass Storage) - 0297 660i/6600i Slide Phone (Still Image) - 02e1 5230 (Storage mode) - 02e2 5230 (Multimedia mode) - 02e3 5230 (PC-Suite mode) - 02e4 5230 (Imaging mode) - 03a4 C5 (Storage mode) - 0400 7600 Phone Parent - 0401 6650 GSM Phone - 0402 6255 Phone Parent - 0404 5510 - 0405 9500 GSM Communicator - 0407 Music Player HDR-1(tm) - 040b N-Gage GSM Phone - 040d 6620 Phone Parent - 040e 6651 Phone Parent - 040f 6230 GSM Phone - 0410 6630 Imaging Smartphone - 0411 7610 Phone Parent - 0413 6260 Phone Parent - 0414 7370 - 0415 9300 GSM Smartphone - 0416 6170 Phone Parent - 0417 7270 Phone Parent - 0418 E70 (PC Suite mode) - 0419 E60 (PC Suite mode) - 041a 9500 GSM Communicator (RNDIS) - 041b 9300 GSM Smartphone (RNDIS) - 041c 7710 Phone Parent - 041d 6670 Phone Parent - 041e 6680 - 041f 6235 Phone Parent - 0421 3230 Phone Parent - 0422 6681 Phone Parent - 0423 6682 Phone Parent - 0428 6230i Modem - 0429 6230i MultiMedia Card - 0431 770 Internet Tablet - 0432 N90 Phone Parent - 0435 E70 (IP Passthrough/RNDIS mode) - 0436 E60 (IP Passthrough/RNDIS mode) - 0437 6265 Phone Parent - 043a N70 USB Phone Parent - 043b 3155 Phone Parent - 043c 6155 Phone Parent - 043d 6270 Phone Parent - 0443 N70 Phone Parent - 0444 N91 - 044c NM850iG Phone Parent - 044d E61 (PC Suite mode) - 044e E61 (Data Exchange mode) - 044f E61 (IP Passthrough/RNDIS mode) - 0453 9300 Phone Parent - 0456 6111 Phone Parent - 0457 6111 Phone (Printing mode) - 045a 6280 Phone Parent - 045d 6282 Phone Parent - 046e 6110 Navigator - 0471 6110 Navigator - 0485 MTP Device - 04b9 5300 - 04c3 N800 Internet Tablet - 04ce E90 Communicator (PC Suite mode) - 04cf E90 Communicator (Storage mode) - 04f0 Nokia N95 (PC Suite mode) - 04f9 6300 (PC Suite mode) - 0508 E65 (PC Suite mode) - 0509 E65 (Storage mode) - 0600 Digital Pen SU-1B - 0610 CS-15 (Internet Stick 3G modem) - 0800 Connectivity Cable DKU-5 - 0801 Data Cable DKU-6 - 0802 CA-42 Phone Parent -0422 ADI Systems, Inc. -0423 Computer Access Technology Corp. - 000a NetMate Ethernet - 000c NetMate2 Ethernet - 000d USB Chief Analyzer - 0100 Generic Universal Protocol Analyzer - 0101 UPA USBTracer - 0200 Generic 10K Universal Protocol Analyzer - 020a PETracer ML - 0300 Generic Universal Protocol Analyzer - 0301 2500H Tracer Trainer - 030a PETracer x1 - 1237 Andromeda Hub -0424 Standard Microsystems Corp. - 0001 Integrated Hub - 0acd Sitecom Internal Multi Memory reader/writer MD-005 - 0fdc Floppy - 10cd Sitecom Internal Multi Memory reader/writer MD-005 - 2020 USB Hub - 20cd Sitecom Internal Multi Memory reader/writer MD-005 - 20fc 6-in-1 Card Reader - 2228 9-in-2 Card Reader - 223a 8-in-1 Card Reader - 2503 USB 2.0 Hub - 2504 USB 2.0 Hub - 2512 USB 2.0 Hub - 2514 USB 2.0 Hub - 2524 USB MultiSwitch Hub - 2602 USB 2.0 Hub - 2640 USB 2.0 Hub - 4060 Ultra Fast Media Reader - 4064 Ultra Fast Media Reader -0425 Motorola Semiconductors HK, Ltd - 0101 G-Tech Wireless Mouse & Keyboard - f102 G-Tech U+P Wireless Mouse -0426 Integrated Device Technology, Inc. - 0426 WDM Driver -0427 Motorola Electronics Taiwan, Ltd -0428 Advanced Gravis Computer Tech, Ltd - 4001 GamePad Pro -0429 Cirrus Logic -042a Ericsson Austrian, AG -042b Intel Corp. - 9316 8x931Hx Customer Hub -042c Innovative Semiconductors, Inc. -042d Micronics -042e Acer, Inc. - 0380 MP3 Player -042f Molex, Inc. -0430 Sun Microsystems, Inc. - 0002 109 Keyboard - 0005 Type 6 Keyboard - 000a 109 Japanese Keyboard - 000b 109 Japanese Keyboard - 0082 109 Japanese Keyboard - 0083 109 Japanese Keyboard - 00a2 Type 7 Keyboard - 0100 3-button Mouse - 100e 24.1" LCD Monitor v4 / FID-638 Mouse - 36ba Bus Powered Hub - cdab Raritan KVM dongle -0431 Itac Systems, Inc. - 0100 Mouse-Trak 3-button Track Ball -0432 Unisys Corp. -0433 Alps Electric, Inc. - 1101 IBM Game Controller - abab Keyboard -0434 Samsung Info. Systems America, Inc. -0435 Hyundai Electronics America -0436 Taugagreining HF - 0005 CameraMate (DPCM_USB) -0437 Framatome Connectors USA -0438 Advanced Micro Devices, Inc. -0439 Voice Technologies Group -043d Lexmark International, Inc. - 0001 Laser Printer - 0002 Optra E310 Printer - 0003 Laser Printer - 0004 Laser Printer - 0005 Laser Printer - 0006 Laser Printer - 0007 Laser Printer - 0008 Inkjet Color Printer - 0009 Optra S2450 Printer - 000a Laser Printer - 000b Inkjet Color Printer - 000c Optra E312 Printer - 000d Laser Printer - 000e Laser Printer - 000f Laser Printer - 0010 Laser Printer - 0011 Laser Printer - 0012 Inkjet Color Printer - 0013 Inkjet Color Printer - 0014 InkJet Color Printer - 0015 InkJet Color Printer - 0016 Z12 Color Jetprinter - 0017 Z32 printer - 0018 Z52 Printer - 0019 Forms Printer - 001a Z65 Printer - 001b InkJet Photo Printer - 001c Kodak Personal Picture Maker 200 Printer - 001d InkJet Color Printer - 001e InkJet Photo Printer - 001f Kodak Personal Picture Maker 200 Card Reader - 0020 Z51 Printer - 0021 Z33 Printer - 0022 InkJet Color Printer - 0023 Laser Printer - 0024 Laser Printer - 0025 InkJet Color Printer - 0026 InkJet Color Printer - 0027 InkJet Color Printer - 0028 InkJet Color Printer - 0029 Scan Print Copy - 002a Scan Print Copy - 002b Scan Print Copy - 002c Scan Print Copy - 002d X70/X73 Scan/Print/Copy - 002e Scan Print Copy - 002f Scan Print Copy - 0030 Scan Print Copy - 0031 Scan Print Copy - 0032 Scan Print Copy - 0033 Scan Print Copy - 0034 Scan Print Copy - 0035 Scan Print Copy - 0036 Scan Print Copy - 0037 Scan Print Copy - 0038 Scan Print Copy - 0039 Scan Print Copy - 003a Scan Print Copy - 003b Scan Print Copy - 003c Scan Print Copy - 003d X83 Scan/Print/Copy - 003e Scan Print Copy - 003f Scan Print Copy - 0040 Scan Print Copy - 0041 Scan Print Copy - 0042 Scan Print Copy - 0043 Scan Print Copy - 0044 Scan Print Copy - 0045 Scan Print Copy - 0046 Scan Print Copy - 0047 Scan Print Copy - 0048 Scan Print Copy - 0049 Scan Print Copy - 004a Scan Print Copy - 004b Scan Print Copy - 004c Scan Print Copy - 004d Laser Printer - 004e Laser Printer - 004f InkJet Color Printer - 0050 InkJet Color Printer - 0051 Laser Printer - 0052 Laser Printer - 0053 InkJet Color Printer - 0054 InkJet Color Printer - 0057 Z35 Printer - 0058 Laser Printer - 005a X63 - 005c InkJet Color Printer - 0060 X74/X75 Scanner - 0061 X74 Hub - 0065 X5130 - 0069 X74/X75 Printer - 006d X125 - 006e C510 - 0072 X6170 Printer - 0073 InkJet Color Printer - 0078 InkJet Color Printer - 0079 InkJet Color Printer - 007a Generic Hub - 007b InkJet Color Printer - 007c Lexmark X1110/X1130/X1140/X1150/X1170/X1180/X1185 - 007d Photo 3150 - 008a 4200 series - 008b InkJet Color Printer - 008c to CF/SM/SD/MS Card Reader - 008e InkJet Color Printer - 008f X422 - 0093 X5250 - 0095 E220 Printer - 0096 2200 series - 0097 P6250 - 0098 7100 series - 009e P910 series Human Interface Device - 009f InkJet Color Printer - 00a9 IBM Infoprint 1410 MFP - 00ab InkJet Color Printer - 00b2 3300 series - 00b8 7300 series - 00b9 8300 series - 00ba InkJet Color Printer - 00bb 2300 series - 00bd Printing Support - 00be Printing Support - 00bf Printing Support - 00c0 6300 series - 00c1 4300 series - 00c7 Printing Support - 00c8 Printing Support - 00c9 Printing Support - 00cb Printing Support - 00cc E120(n) - 00d0 9300 series - 00d3 X340 Scanner - 00d4 X342n Scanner - 00d5 Printing Support - 00d6 X340 Scanner - 00e8 X642e - 00e9 2400 series - 00f6 3400 series - 00f7 InkJet Color Printer - 00ff InkJet Color Printer - 010b 2500 series - 010d 3500-4500 series - 010f 6500 series - 0142 X3650 (Printer, Scanner, Copier) - 4303 Xerox WorkCentre Pro 412 -043e LG Electronics USA, Inc. - 3001 AN-WF100 802.11abgn Wireless Adapter [Broadcom BCM4323] - 42bd Flatron 795FT Plus Monitor - 4a4d Flatron 915FT Plus Monitor - 7001 MF-PD100 Soul Digital MP3 Player - 7013 MP3 Player - 8484 LPC-U30 Webcam II - 8585 LPC-UC35 Webcam - 8888 Electronics VCS Camera II(LPC-U20) - 9800 Remote Control Receiver_iMON - 9803 eHome Infrared Receiver - 9804 DMB Receiver Control - 9c01 LGE Sync -043f RadiSys Corp. -0440 Eizo Nanao Corp. -0441 Winbond Systems Lab. - 1456 Hub -0442 Ericsson, Inc. - abba Bluetooth Device -0443 Gateway, Inc. - 000e Multimedia Keyboard - 002e Millennium Keyboard -0445 Lucent Technologies, Inc. -0446 NMB Technologies Corp. - 6781 Keyboard with PS/2 Mouse Port - 6782 Keyboard -0447 Momentum Microsystems -044a Shamrock Tech. Co., Ltd -044b WSI -044c CCL/ITRI -044d Siemens Nixdorf AG -044e Alps Electric Co., Ltd - 1104 Japanese Keyboard - 2002 MD-5500 Printer - 2014 Bluetooth Device - 3001 UGTZ4 Bluetooth - 3002 Bluetooth Device - 3003 Bluetooth Device - 3004 Bluetooth Adapter - 3005 Integrated Bluetooth Device - 3006 Bluetooth Adapter - 3007 Bluetooth Controller (ALPS/UGX) - 300c Bluetooth Controller (ALPS/UGPZ6) - 300d Bluetooth Controller (ALPS/UGPZ6) - 3010 Bluetooth Adapter - 3017 BCM2046 Bluetooth Device - ffff Compaq Bluetooth Multiport Module -044f ThrustMaster, Inc. - 0400 HOTAS Cougar - a003 Rage 3D Game Pad - a01b PK-GP301 Driving Wheel - a0a0 Top Gun Joystick - a0a1 Top Gun Joystick (rev2) - a0a3 Fusion Digital GamePad - a201 PK-GP201 PlayStick - b10a T.16000M Joystick - b203 360 Modena Pro Wheel - b300 Firestorm Dual Power - b304 Firestorm Dual Power - b307 vibrating Upad - b30b Wireless VibrationPad - b323 Dual Trigger 3-in-1 (PC Mode) - b324 Dual Trigger 3-in-1 (PS3 Mode) - b603 force feedback Wheel - b605 force feedback Racing Wheel - b651 Ferrari GT Rumble Force Wheel - b653 RGT Force Feedback Clutch Racing Wheel - b654 Ferrari GT Force Feedback Wheel - b700 Tacticalboard -0450 DFI, Inc. -0451 Texas Instruments, Inc. - 1234 Bluetooth Device - 1428 Hub - 1446 TUSB2040/2070 Hub - 16a6 BM-USBD1 BlueRobin RF heart rate sensor receiver - 2036 TUSB2036 Hub - 2046 TUSB2046 Hub - 2077 TUSB2077 Hub - 3410 TUSB3410 Microcontroller - 3f00 OMAP1610 - 3f02 SMC WSKP100 Wi-Fi Phone - 5409 Frontier Labs NEX IA+ Digital Audio Player - 6000 AU5 ADSL Modem (pre-reenum) - 6001 AU5 ADSL Modem - 6060 RNDIS/BeWAN ADSL2+ - 6070 RNDIS/BeWAN ADSL2+ - 625f Trekstor USB-Stick 12 CS-D 12 GB - dbc0 Device Bay Controller - e001 GraphLink - e003 TI-84 Plus Calculator - e004 TI-89 Titanium Calculator - e008 TI-84 Plus Silver Calculator - f430 MSP-FET430UIF JTAG Tool - f432 eZ430 Development Tool - ffff Bluetooth Device -0452 Mitsubishi Electronics America, Inc. - 0021 HID Monitor Controls - 0050 Diamond Pro 900u CRT Monitor - 0051 Integrated Hub -0453 CMD Technology - 6781 NMB Keyboard - 6783 Chicony Composite Keyboard -0454 Vobis Microcomputer AG -0455 Telematics International, Inc. -0456 Analog Devices, Inc. - f000 FT2232 JTAG ICE [gnICE] - f001 FT2232H Hi-Speed JTAG ICE [gnICE+] -0457 Silicon Integrated Systems Corp. - 0150 Super Talent 1GB Flash Drive - 0151 Super Flash 1GB / GXT 64MB Flash Drive - 0162 SiS162 usb Wireless LAN Adapter - 0163 802.11 Wireless LAN Adapter - 5401 Wireless Adapter RO80211GS-USB -0458 KYE Systems Corp. (Mouse Systems) - 0001 Mouse - 0002 Genius NetMouse Pro - 0003 Genius NetScroll+ - 0006 Easy Mouse+ USB(USB\Vid_0458&Pid;_0006) Mouse - 000b NetMouse Wheel(P+U) - 000c TACOMA Fingerprint V1.06.01 - 000e VideoCAM Web - 0013 TACOMA Fingerprint Mouse V1.06.01 - 001a Genius WebScroll+ - 0036 Pocket Mouse LE - 0039 NetScroll+ Superior - 003a NetScroll+ Mini Traveler / Genius NetScroll 120 - 004c Slimstar Pro Keyboard - 0056 Ergo 300 Mouse - 0057 Enhanced Gaming Device - 0059 Enhanced Laser Device - 005a Enhanced Device - 005b Enhanced Device - 005c Enhanced Laser Gaming Device - 005d Enhanced Device - 0061 Bluetooth Dongle - 0072 Navigator 335 - 0083 Bluetooth Dongle - 0087 Ergo 525V Laser Mouse - 0100 EasyPen Tablet - 0101 CueCat - 011b NetScroll T220 - 1001 Joystick - 1002 Game Pad - 1003 Genius VideoCam - 1004 Flight2000 F-23 Joystick - 100a Aashima Technology Trust Sight Fighter Vibration Feedback Joystick - 2001 ColorPage-Vivid Pro Scanner - 2004 ColorPage-HR6 V1 Scanner - 2005 ColorPage-HR6/Vivid3 - 2007 ColorPage-HR6 V2 Scanner - 2008 ColorPage-HR6 V2 Scanner - 2009 ColorPage-HR6A Scanner - 2011 ColorPage-Vivid3x Scanner - 2012 Plustek Scanner - 2013 ColorPage-HR7 Scanner - 2014 ColorPage-Vivid4 - 2015 ColorPage-HR7LE Scanner - 2016 ColorPage-HR6X Scanner - 2017 ColorPage-Vivid3xe - 2018 ColorPage-HR7X - 2019 ColorPage-HR6X Slim - 201a ColorPage-Vivid4xe - 201b ColorPage-Vivid4x - 201c ColorPage-HR8 - 201d ColorPage-Vivid 1200 X - 201e ColorPage-Slim 1200 - 201f ColorPage-Vivid 1200 XE - 2020 ColorPage-Slim 1200 USB2 - 2021 ColorPage-SF600 - 3017 SPEED WHEEL 3 Vibration - 3018 Wireless 2.4Ghz Game Pad - 3019 10-Button USB Joystick with Vibration - 301a MaxFire G-12U Vibration - 301d Genius MaxFire MiniPad - 400f Genius TVGo DVB-T02Q MCE - 4012 TVGo DVB-T03 - 5003 G-pen 560 Tablet - 5004 G-pen Tablet - 6001 GF3000F Ethernet Adapter - 7004 VideoCAM Express V2 - 7006 Dsc 1.3 Smart Camera Device - 7007 VideoCAM Web - 7009 G-Shot G312 Still Camera Device - 700c VideoCAM Web V3 - 700d G-Shot G511 Composite Device - 700f VideoCAM Web - 7012 WebCAM USB2.0 - 7014 VideoCAM Live V3 - 701c G-Shot G512 Still Camera - 7020 Sim 321C - 7025 Eye 311Q Camera - 7029 Genius Look 320s (SN9C201 + HV7131R) - 702f Genius Slim 322 - 7035 i-Look 325T Camera - 7045 Genius Look 1320 V2 - 704c Genius i-Look 1321 - 704d Slim 1322AF - 7055 Slim 2020AF camera - 705a Asus USB2.0 Webcam - 705c Genius iSlim 1300AF -0459 Adobe Systems, Inc. -045a SONICblue, Inc. - 07da Supra Express 56K modem - 0b4a SupraMax 2890 56K Modem [Lucent Atlas] - 0b68 SupraMax 56K Modem - 5001 Rio 600 MP3 Player - 5002 Rio 800 MP3 Player - 5003 Nike Psa/Play MP3 Player - 5005 Rio S10 MP3 Player - 5006 Rio S50 MP3 Player - 5007 Rio S35 MP3 Player - 5008 Rio 900 MP3 Player - 5009 Rio S30 MP3 Player - 500d Fuse MP3 Player - 500e Chiba MP3 Player - 500f Cali MP3 Player - 5010 Rio S11 MP3 Player - 501c Virgin MPF-1000 - 501d Rio Fuse - 501e Rio Chiba - 501f Rio Cali - 503f Cali256 MP3 Player - 5202 Rio Riot MP3 Player - 5210 Rio Karma Music Player - 5220 Rio Nitrus MP3 Player - 5221 Rio Eigen -045b Hitachi, Ltd -045d Nortel Networks, Ltd -045e Microsoft Corp. - 0007 SideWinder Game Pad - 0008 SideWinder Precision Pro - 0009 IntelliMouse - 000b Natural Keyboard Elite - 000e SideWinder® Freestyle Pro - 0014 Digital Sound System 80 - 001a SideWinder Precision Racing Wheel - 001b SideWinder Force Feedback 2 Joystick - 001c Internet Keyboard Pro - 001d Natural Keyboard Pro - 001e IntelliMouse Explorer - 0023 Trackball Optical - 0024 Trackball Explorer - 0025 IntelliEye Mouse - 0026 SideWinder GamePad Pro - 0027 SideWinder PnP GamePad - 0028 SideWinder Dual Strike - 0029 IntelliMouse Optical - 002b Internet Keyboard Pro - 002d Internet Keyboard - 002f Integrated Hub - 0033 Sidewinder Strategic Commander - 0034 SideWinder Force Feedback Wheel - 0038 SideWinder Precision 2 - 0039 IntelliMouse Optical - 003b SideWinder Game Voice - 003c SideWinder Joystick - 0040 Wheel Mouse Optical - 0047 IntelliMouse Explorer 3.0 - 0048 Office Keyboard 1.0A - 0053 Optical Mouse - 0059 Wireless IntelliMouse Explorer - 005c Office Keyboard (106/109) - 005f Wireless MultiMedia Keyboard - 0061 Wireless MultiMedia Keyboard (106/109) - 0063 Wireless Natural MultiMedia Keyboard - 0065 Wireless Natural MultiMedia Keyboard (106/109) - 006a Wireless Optical Mouse (IntelliPoint) - 006d eHome Remote Control Keyboard keys - 006e MN510 802.11b Adapter - 006f Smart Display Reference Device - 0070 Wireless MultiMedia Keyboard - 0071 Wireless MultiMedia Keyboard (106/109) - 0072 Wireless Natural MultiMedia Keyboard - 0073 Wireless Natural MultiMedia Keyboard (106/109) - 0079 IXI Ogo CT-17 handheld device - 007a 10/100 USB NIC - 007d Notebook Optical Mouse - 007e Wireless Transceiver for Bluetooth - 0080 Digital Media Pro Keyboard - 0083 Basic Optical Mouse - 0084 Basic Optical Mouse - 008a Wireless Keyboard and Mouse - 008b Dual Receiver Wireless Mouse (IntelliPoint) - 008c Wireless Intellimouse Explorer 2.0 - 0095 IntelliMouse Explorer 4.0 (IntelliPoint) - 009c Wireless Transceiver for Bluetooth 2.0 - 009d Wireless Optical Desktop 3.0 - 00a0 eHome Infrared Receiver - 00b0 Digital Media Pro Keyboard - 00b9 Wireless Optical Mouse 3.0 - 00bb Fingerprint Reader - 00bc Fingerprint Reader - 00bd Fingerprint Reader - 00c2 MN-710 802.11g Wireless Adapter [Intersil ISL3886] - 00c9 MTP Device - 00ca Fingerprint Reader - 00cb Basic Optical Mouse v2.0 - 00ce Generic PPC Flash device - 00d1 Optical Mouse with Tilt Wheel - 00da eHome Infrared Receiver - 00db Natural Ergonomic Keyboard 4000 V1.0 - 00dd Comfort Curve Keyboard 2000 V1.0 - 00e1 Wireless Laser Mouse 6000 Reciever - 00f4 LifeCam VX-6000 (SN9C20x + OV9650) - 00f5 LifeCam VX-3000 - 00f6 Comfort Optical Mouse 1000 - 00f7 LifeCam VX-1000 - 00f8 LifeCam NX-6000 - 00f9 Wireless Desktop Receiver 3.1 - 0202 Xbox Controller - 0280 XBox Device - 0283 Xbox Communicator - 0284 Xbox DVD Playback Kit - 0285 Xbox Controller S - 0288 Xbox Controller S Hub - 0289 Xbox Controller S - 028b Xbox360 DVD Emulator - 028d Xbox360 Memory Unit 64MB - 028e Xbox360 Controller - 028f Xbox360 Wireless Controller - 0290 Xbox360 Performance Pipe (PIX) - 0291 Xbox 360 Wireless Receiver for Windows - 0292 Xbox360 Wireless Networking Adapter - 029c Xbox360 HD-DVD Drive - 029d Xbox360 HD-DVD Drive - 029e Xbox360 HD-DVD Memory Unit - 02a0 Xbox360 Big Button IR - 02a8 Xbox360 Wireless N Networking Adapter [Atheros AR7010+AR9280] - 02ad Xbox NUI Audio - 02ae Xbox NUI Camera - 02b0 Xbox NUI Motor - 0400 Windows Powered Pocket PC 2002 - 0401 Windows Powered Pocket PC 2002 - 0402 Windows Powered Pocket PC 2002 - 0403 Windows Powered Pocket PC 2002 - 0404 Windows Powered Pocket PC 2002 - 0405 Windows Powered Pocket PC 2002 - 0406 Windows Powered Pocket PC 2002 - 0407 Windows Powered Pocket PC 2002 - 0408 Windows Powered Pocket PC 2002 - 0409 Windows Powered Pocket PC 2002 - 040a Windows Powered Pocket PC 2002 - 040b Windows Powered Pocket PC 2002 - 040c Windows Powered Pocket PC 2002 - 040d Windows Powered Pocket PC 2002 - 040e Windows Powered Pocket PC 2002 - 040f Windows Powered Pocket PC 2002 - 0410 Windows Powered Pocket PC 2002 - 0411 Windows Powered Pocket PC 2002 - 0412 Windows Powered Pocket PC 2002 - 0413 Windows Powered Pocket PC 2002 - 0414 Windows Powered Pocket PC 2002 - 0415 Windows Powered Pocket PC 2002 - 0416 Windows Powered Pocket PC 2002 - 0417 Windows Powered Pocket PC 2002 - 0432 Windows Powered Pocket PC 2003 - 0433 Windows Powered Pocket PC 2003 - 0434 Windows Powered Pocket PC 2003 - 0435 Windows Powered Pocket PC 2003 - 0436 Windows Powered Pocket PC 2003 - 0437 Windows Powered Pocket PC 2003 - 0438 Windows Powered Pocket PC 2003 - 0439 Windows Powered Pocket PC 2003 - 043a Windows Powered Pocket PC 2003 - 043b Windows Powered Pocket PC 2003 - 043c Windows Powered Pocket PC 2003 - 043d Becker Traffic Assist Highspeed 7934 - 043e Windows Powered Pocket PC 2003 - 043f Windows Powered Pocket PC 2003 - 0440 Windows Powered Pocket PC 2003 - 0441 Windows Powered Pocket PC 2003 - 0442 Windows Powered Pocket PC 2003 - 0443 Windows Powered Pocket PC 2003 - 0444 Windows Powered Pocket PC 2003 - 0445 Windows Powered Pocket PC 2003 - 0446 Windows Powered Pocket PC 2003 - 0447 Windows Powered Pocket PC 2003 - 0448 Windows Powered Pocket PC 2003 - 0449 Windows Powered Pocket PC 2003 - 044a Windows Powered Pocket PC 2003 - 044b Windows Powered Pocket PC 2003 - 044c Windows Powered Pocket PC 2003 - 044d Windows Powered Pocket PC 2003 - 044e Windows Powered Pocket PC 2003 - 044f Windows Powered Pocket PC 2003 - 0450 Windows Powered Pocket PC 2003 - 0451 Windows Powered Pocket PC 2003 - 0452 Windows Powered Pocket PC 2003 - 0453 Windows Powered Pocket PC 2003 - 0454 Windows Powered Pocket PC 2003 - 0455 Windows Powered Pocket PC 2003 - 0456 Windows Powered Pocket PC 2003 - 0457 Windows Powered Pocket PC 2003 - 0458 Windows Powered Pocket PC 2003 - 0459 Windows Powered Pocket PC 2003 - 045a Windows Powered Pocket PC 2003 - 045b Windows Powered Pocket PC 2003 - 045c Windows Powered Pocket PC 2003 - 045d Windows Powered Pocket PC 2003 - 045e Windows Powered Pocket PC 2003 - 045f Windows Powered Pocket PC 2003 - 0460 Windows Powered Pocket PC 2003 - 0461 Windows Powered Pocket PC 2003 - 0462 Windows Powered Pocket PC 2003 - 0463 Windows Powered Pocket PC 2003 - 0464 Windows Powered Pocket PC 2003 - 0465 Windows Powered Pocket PC 2003 - 0466 Windows Powered Pocket PC 2003 - 0467 Windows Powered Pocket PC 2003 - 0468 Windows Powered Pocket PC 2003 - 0469 Windows Powered Pocket PC 2003 - 046a Windows Powered Pocket PC 2003 - 046b Windows Powered Pocket PC 2003 - 046c Windows Powered Pocket PC 2003 - 046d Windows Powered Pocket PC 2003 - 046e Windows Powered Pocket PC 2003 - 046f Windows Powered Pocket PC 2003 - 0470 Windows Powered Pocket PC 2003 - 0471 Windows Powered Pocket PC 2003 - 0472 Windows Powered Pocket PC 2003 - 0473 Windows Powered Pocket PC 2003 - 0474 Windows Powered Pocket PC 2003 - 0475 Windows Powered Pocket PC 2003 - 0476 Windows Powered Pocket PC 2003 - 0477 Windows Powered Pocket PC 2003 - 0478 Windows Powered Pocket PC 2003 - 0479 Windows Powered Pocket PC 2003 - 047a Windows Powered Pocket PC 2003 - 047b Windows Powered Pocket PC 2003 - 04c8 Windows Powered Smartphone 2002 - 04c9 Windows Powered Smartphone 2002 - 04ca Windows Powered Smartphone 2002 - 04cb Windows Powered Smartphone 2002 - 04cc Windows Powered Smartphone 2002 - 04cd Windows Powered Smartphone 2002 - 04ce Windows Powered Smartphone 2002 - 04d7 Windows Powered Smartphone 2003 - 04d8 Windows Powered Smartphone 2003 - 04d9 Windows Powered Smartphone 2003 - 04da Windows Powered Smartphone 2003 - 04db Windows Powered Smartphone 2003 - 04dc Windows Powered Smartphone 2003 - 04dd Windows Powered Smartphone 2003 - 04de Windows Powered Smartphone 2003 - 04df Windows Powered Smartphone 2003 - 04e0 Windows Powered Smartphone 2003 - 04e1 Windows Powered Smartphone 2003 - 04e2 Windows Powered Smartphone 2003 - 04e3 Windows Powered Smartphone 2003 - 04e4 Windows Powered Smartphone 2003 - 04e5 Windows Powered Smartphone 2003 - 04e6 Windows Powered Smartphone 2003 - 04e7 Windows Powered Smartphone 2003 - 04e8 Windows Powered Smartphone 2003 - 04e9 Windows Powered Smartphone 2003 - 04ea Windows Powered Smartphone 2003 - 04ec Windows Phone (Zune) - 063e Zune HD Media Player - 0640 KIN Phone - 0641 KIN Phone - 0642 KIN Phone - 0707 Wireless Laser Mouse 8000 - 0708 Transceiver v 3.0 for Bluetooth - 070a Charon Bluetooth Dongle (DFU) - 0710 Zune Media Player - 0713 Wireless Presenter Mouse 8000 - 0719 Xbox 360 Wireless Adapter - 0721 LifeCam NX-3000 (UVC-compliant) - 0723 LifeCam VX-7000 (UVC-compliant) - 0734 Wireless Optical Desktop 700 - 0737 Compact Optical Mouse 500 - 0745 Nano Transceiver v1.0 for Bluetooth - 0750 Wired Keyboard 600 - 075d LifeCam Cinema - 076d LifeCam HD-5000 - 930a ISOUSB.SYS Intel 82930 Isochronous IO Test Board - fff8 Keyboard - ffff Windows CE Mass Storage -0460 Ace Cad Enterprise Co., Ltd - 0004 Tablet (5x3.75) - 0006 LCD Tablet (12x9) - 0008 Tablet (3x2.25) -0461 Primax Electronics, Ltd - 0300 G2-300 Scanner - 0301 G2E-300 Scanner - 0302 G2-300 #2 Scanner - 0303 G2E-300 #2 Scanner - 0340 Colorado 9600 Scanner - 0341 Colorado 600u Scanner - 0345 Visioneer 6200 Scanner - 0346 Memorex Maxx 6136u Scanner - 0347 Primascan Colorado 2600u/Visioneer 4400 Scanner - 0360 Colorado 19200 Scanner - 0361 Colorado 1200u Scanner - 0363 VistaScan Astra 3600(ENG) - 0364 LG Electronics Scanworks 600U Scanner - 0365 VistaScan Astra 3600(ENG) - 0366 6400 - 0367 VistaScan Astra 3600(ENG) - 0371 Visioneer Onetouch 8920 Scanner - 0374 UMAX Astra 2500 - 0375 VistaScan Astra 3600(ENG) - 0377 Medion MD 5345 Scanner - 0378 VistaScan Astra 3600(ENG) - 037b Medion MD 6190 Scanner - 037c VistaScan Astra 3600(ENG) - 0380 G2-600 Scanner - 0381 ReadyScan 636i Scanner - 0382 G2-600 #2 Scanner - 0383 G2E-600 Scanner - 038a UMAX Astra 3000/3600 - 038b Xerox 2400 Onetouch - 038c UMAX Astra 4100 - 0392 Medion/Lifetec/Tevion/Cytron MD 6190 - 03a8 9420M - 0813 IBM UltraPort Camera - 0815 Micro Innovations IC200 Webcam - 0819 Fujifilm IX-30 Camera [webcam mode] - 081a Fujifilm IX-30 Camera [storage mode] - 081c Elitegroup ECS-C11 Camera - 081d Elitegroup ECS-C11 Storage - 0a00 Micro Innovations Web Cam 320 - 4d01 Comfort Keyboard - 4d02 Mouse-in-a-Box - 4d03 Kensington Mouse-in-a-box - 4d04 Mouse - 4d06 Balless Mouse (HID) - 4d15 Dell Optical Mouse - 4d17 Optical Mouse - 4d2a PoPo Elixir Mouse (HID) - 4d2b Wireless Laser Mini Mouse (HID) - 4d2c PoPo Mini Pointer Mouse (HID) - 4d2e Optical Mobile Mouse (HID) - 4d51 0Y357C PMX-MMOCZUL (B) [Dell Laser Mouse] - 4d75 Rocketfish RF-FLBTAD Bluetooth Adapter -0463 MGE UPS Systems - 0001 UPS - ffff UPS -0464 AMP/Tycoelectronics Corp. -0467 AT&T Paradyne -0468 Wieson Technologies Co., Ltd -046a Cherry GmbH - 0001 My3000 Keyboard - 0003 My3000 Hub - 0004 CyBoard Keyboard - 0005 XX33 SmartCard Reader Keyboard - 0008 Wireless Keyboard and Mouse - 0010 SmartBoard XX44 - 0011 G83 (RS 6000) Keyboard - 0021 CyMotion Expert Combo - 0023 CyMotion Master Linux Keyboard - 0027 CyMotion Master Solar Keyboard - 002a Wireless Mouse & Keyboard - 002d SmartTerminal XX44 - 003e SmartTerminal ST-2xxx - 0080 eHealth Terminal ST 1503 - 0081 eHealth Keyboard G87 1504 - 0106 R-300 Wireless Mouse Receiver -046b American Megatrends, Inc. - 0001 Keyboard - 0101 PS/2 Keyboard, Mouse & Joystick Ports - 0301 USB 1.0 Hub - 0500 Serial & Parallel Ports -046c Toshiba Corp., Digital Media Equipment -046d Logitech, Inc. - 0082 Acer Aspire 5672 Webcam - 0200 WingMan Extreme Joystick - 0203 M2452 Keyboard - 0301 M4848 Mouse - 0401 HP PageScan - 0402 NEC PageScan - 040f Logitech/Storm PageScan - 0430 Mic (Cordless) - 0801 QuickCam Home - 0802 Webcam C200 - 0804 Webcam C250 - 0805 Webcam C300 - 0807 Webcam B500 - 0808 Webcam C600 - 0809 Webcam Pro 9000 - 080a Portable Webcam C905 - 080f Webcam C120 - 0810 QuickCam Pro - 0819 Webcam C210 - 081b Webcam C310 - 0820 QuickCam VC - 0825 Webcam C270 - 0830 QuickClip - 0840 QuickCam Express - 0850 QuickCam Web - 0870 QuickCam Express - 0890 QuickCam Traveler - 0892 OrbiCam - 0894 CrystalCam - 0895 QuickCam for Dell Notebooks - 0896 OrbiCam - 0897 QuickCam for Dell Notebooks - 0899 QuickCam for Dell Notebooks - 089d QuickCam E2500 series - 08a0 QuickCam IM - 08a1 QuickCam IM with sound - 08a2 Labtec Webcam Pro - 08a3 QuickCam QuickCam Chat - 08a6 QuickCam IM - 08a7 QuickCam Image - 08a9 Notebook Deluxe - 08aa Labtec Notebooks - 08ac QuickCam Cool - 08ad QuickCam Communicate STX - 08ae QuickCam for Notebooks - 08af QuickCam Easy/Cool - 08b0 QuickCam 3000 Pro [pwc] - 08b1 QuickCam Notebook Pro - 08b2 QuickCam Pro 4000 - 08b3 QuickCam Zoom - 08b4 QuickCam Zoom - 08b5 QuickCam Sphere - 08b9 QuickCam IM - 08bd Microphone (Pro 4000) - 08c0 QuickCam Pro 3000 - 08c1 QuickCam Fusion - 08c2 QuickCam PTZ - 08c3 Camera (Notebooks Pro) - 08c5 QuickCam Pro 5000 - 08c6 QuickCam for DELL Notebooks - 08c7 QuickCam OEM Cisco VT Camera II - 08c9 QuickCam Ultra Vision - 08ca Mic (Fusion) - 08cb Mic (Notebooks Pro) - 08cc Mic (PTZ) - 08ce QuickCam Pro 5000 - 08cf QuickCam UpdateMe - 08d0 QuickCam Express - 08d7 QuickCam Communicate STX - 08d8 QuickCam for Notebook Deluxe - 08d9 QuickCam IM/Connect - 08da QuickCam Messanger - 08dd QuickCam for Notebooks - 08e0 QuickCam Express - 08e1 Labtec Webcam - 08f0 QuickCam Messenger - 08f1 QuickCam Express - 08f2 Microphone (Messenger) - 08f3 QuickCam Express - 08f4 Labtec Webcam - 08f5 QuickCam Messenger Communicate - 08f6 QuickCam Messenger Plus - 0900 ClickSmart 310 - 0901 ClickSmart 510 - 0903 ClickSmart 820 - 0905 ClickSmart 820 - 0910 QuickCam Cordless - 0920 QuickCam Express - 0921 Labtec Webcam - 0922 QuickCam Live - 0928 QuickCam Express - 0929 Labtec Webcam Pro - 092a QuickCam for Notebooks - 092b Labtec Webcam Plus - 092c QuickCam Chat - 092d QuickCam Express / Go - 092e QuickCam Chat - 092f QuickCam Express Plus - 0950 Pocket Camera - 0960 ClickSmart 420 - 0970 Pocket750 - 0990 QuickCam Pro 9000 - 0991 QuickCam Pro for Notebooks - 0992 QuickCam Communicate Deluxe - 0994 QuickCam Orbit/Sphere AF - 09a1 QuickCam Communicate MP/S5500 - 09a2 QuickCam Communicate Deluxe/S7500 - 09a4 QuickCam E 3500 - 09a5 Quickcam 3000 For Business - 09a6 QuickCam Vision Pro - 09b0 Acer OrbiCam - 09b2 Fujitsu Webcam - 09c0 QuickCam for Dell Notebooks Mic - 09c1 QuickCam Deluxe for Notebooks - 0a01 USB Headset - 0a02 Premium Stereo USB Headset 350 - 0a03 Logitech USB Microphone - 0a04 V20 portable speakers (USB powered) - 0a07 Z-10 Speakers - 0a0b ClearChat Pro USB - 0a0c Clear Chat Comfort USB Headset - 0a13 Z-5 Speakers - 0a17 G330 Headset - 0b02 BT Mini-Receiver (HID proxy mode) - 8801 Video Camera - b305 BT Mini-Receiver - bfe4 Premium Optical Wheel Mouse - c000 N43 [Pilot Mouse] - c001 N48/M-BB48 [FirstMouse Plus] - c002 M-BA47 [MouseMan Plus] - c003 MouseMan - c004 WingMan Gaming Mouse - c005 WingMan Gaming Wheel Mouse - c00b MouseMan Wheel - c00c Optical Wheel Mouse - c00d MouseMan Wheel+ - c00e M-BJ58/M-BJ69 Optical Wheel Mouse - c00f MouseMan Traveler/Mobile - c011 Optical MouseMan - c012 Mouseman Dual Optical - c014 Corded Workstation Mouse - c015 Corded Workstation Mouse - c016 Optical Wheel Mouse - c018 Optical Wheel Mouse - c019 Optical Tilt Wheel Mouse - c01a M-BQ85 Optical Wheel Mouse - c01b MX310 Optical Mouse - c01c Optical Mouse - c01d MX510 Optical Mouse - c01e MX518 Optical Mouse - c024 MX300 Optical Mouse - c025 MX500 Optical Mouse - c030 iFeel Mouse - c031 iFeel Mouse+ - c032 MouseMan iFeel - c033 iFeel MouseMan+ - c034 MouseMan Optical - c035 Mouse - c036 Mouse - c037 Mouse - c038 Mouse - c03d M-BT96a Pilot Optical Mouse - c03e Premium Optical Wheel Mouse (M-BT58) - c03f M-BT85 [UltraX Optical Mouse] - c040 Corded Tilt-Wheel Mouse - c041 G5 Laser Mouse - c042 G3 Laser Mouse - c043 MX320/MX400 Laser Mouse - c044 LX3 Optical Mouse - c045 Optical Mouse - c046 RX1000 Laser Mouse - c047 Laser Mouse - c048 G9 Laser Mouse - c049 G5 Laser Mouse - c050 RX 250 Optical Mouse - c051 G3 (MX518) Optical Mouse - c053 Laser Mouse - c058 M115 Mouse - c05a Optical Mouse M90 - c05d Optical Mouse - c061 RX1500 Laser Mouse - c062 LS1 Laser Mouse, corded - c068 G500 Laser Mouse - c101 UltraX Media Remote - c110 Harmony 885 Remote - c11f Harmony 900 Remote - c122 Harmony 700 Remote - c201 WingMan Extreme Joystick with Throttle - c202 WingMan Formula - c207 WingMan Extreme Digital 3D - c208 WingMan Gamepad Extreme - c209 WingMan Gamepad - c20a WingMan RumblePad - c20b WingMan Action Pad - c20c WingMan Precision - c20d WingMan Attack 2 - c20e WingMan Formula GP - c211 iTouch Cordless Reciever - c212 WingMan Extreme Digital 3D - c213 J-UH16 (Freedom 2.4 Cordless Joystick) - c214 ATK3 (Attack III Joystick) - c215 Extreme 3D Pro - c216 Dual Action Gamepad - c218 Logitech RumblePad 2 USB - c219 Cordless RumblePad 2 - c21a Precision Gamepad - c21c G13 Advanced Gameboard - c21d F310 Gamepad [XInput Mode] - c21f F710 Wireless Gamepad [XInput Mode] - c221 G11/G15 Keyboard / Keyboard - c222 G15 Keyboard / LCD - c223 G11/G15 Keyboard / USB Hub - c225 G11/G15 Keyboard / G keys - c226 G15 Refresh Keyboard - c227 G15 Refresh Keyboard - c22d G510 Gaming Keyboard - c22e G510 Gaming Keyboard onboard audio - c281 WingMan Force - c283 WingMan Force 3D - c285 WingMan Strike Force 3D - c286 Force 3D Pro - c287 Flight System G940 - c291 WingMan Formula Force - c293 WingMan Formula Force GP - c294 Driving Force - c295 Momo Force Steering Wheel - c298 Driving Force Pro - c299 G25 Racing Wheel - c2a0 Wingman Force Feedback Mouse - c2a1 WingMan Force Feedback Mouse - c301 iTouch Keyboard - c302 iTouch Pro Keyboard - c303 iTouch Keyboard - c305 Internet Keyboard - c307 Internet Keyboard - c308 Internet Navigator Keyboard - c309 Internet Keyboard - c30a iTouch Composite - c30b NetPlay Keyboard - c30c Internet Keys (X) - c30d Internet Keys - c30e UltraX Keyboard (Y-BL49) - c30f Logicool HID-Compliant Keyboard (106 key) - c311 Y-UF49 [Internet Pro Keyboard] - c312 DeLuxe 250 Keyboard - c313 Internet 350 Keyboard - c315 Classic New Touch Keyboard - c316 HID-Compliant Keyboard - c317 Wave Corded Keyboard - c318 Illuminated Keyboard - c31a Comfort Wave 450 - c31b Compact Keyboard K300 - c31c Keyboard K120 for Business - c401 TrackMan Marble Wheel - c402 Marble Mouse (2-button) - c403 Turbo TrackMan Marble FX - c404 TrackMan Wheel - c408 Marble Mouse (4-button) - c501 Cordless Mouse Receiver - c502 Cordless Mouse & iTouch Keys - c503 Cordless Mouse+Keyboard Receiver - c504 Cordless Mouse+Keyboard Receiver - c505 Cordless Mouse+Keyboard Receiver - c506 MX700 Cordless Mouse Receiver - c508 Cordless Trackball - c509 Cordless Keyboard & Mouse - c50a Cordless Mouse - c50b Cordless Desktop Optical - c50c Cordless Desktop S510 - c50d Cordless Mouse - c50e Cordless Mouse Receiver - c510 Cordless Mouse - c512 LX-700 Cordless Desktop Receiver - c513 MX3000 Cordless Desktop Receiver - c514 Cordless Mouse - c515 Cordless 2.4 GHz Presenter Presentation remote control - c517 LX710 Cordless Desktop Laser - c518 MX610 Laser Cordless Mouse - c51a MX Revolution/G7 Cordless Mouse - c51b V220 Cordless Optical Mouse for Notebooks - c521 Cordless Mouse Receiver - c525 MX Revolution Cordless Mouse - c526 Nano Receiver - c529 diNovo Keyboard for notebooks - c52b Unifying Receiver - c52f Wireless Mouse M305 - c623 3Dconnexion Space Traveller 3D Mouse - c625 3Dconnexion Space Pilot 3D Mouse - c626 3Dconnexion Space Navigator 3D Mouse - c627 3Dconnexion Space Explorer 3D Mouse - c702 Cordless Presenter - c703 Elite Keyboard Y-RP20 + Mouse MX900 (Bluetooth) - c704 diNovo Wireless Desktop - c705 MX900 Bluetooth Wireless Hub (C-UJ16A) - c707 Bluetooth wireless hub - c708 Bluetooth wireless hub - c709 BT Mini-Receiver (HCI mode) - c70a MX5000 Cordless Desktop - c70b BT Mini-Receiver (HID proxy mode) - c70c BT Mini-Receiver (HID proxy mode) - c70d Bluetooth wireless hub - c70e MX1000 Bluetooth Laser Mouse - c70f Bluetooth wireless hub - c712 Bluetooth wireless hub - c714 diNovo Edge Keyboard - c715 Bluetooth wireless hub - c71a Bluetooth wireless hub - c71d Bluetooth wireless hub - c71f diNovo Mini Wireless Keyboard - c720 Bluetooth wireless hub - ca03 MOMO Racing - ca04 Formula Vibration Feedback Wheel - cab1 Cordless Keyboard for Wii HID Receiver - d001 QuickCam Pro -046e Behavior Tech. Computer Corp. - 0100 Keyboard - 3001 Mass Storage Device - 3002 Mass Storage Device - 3003 Mass Storage Device - 3005 Mass Storage Device - 3008 Mass Storage Device - 5250 KeyMaestro Multimedia Keyboard - 5273 KeyMaestro Multimedia Keyboard - 52e6 Cordless Mouse - 5308 KeyMaestro Keyboard - 5408 KeyMaestro Multimedia Keyboard/Hub - 5500 Portable Keyboard 86+9 keys (Model 6100C US) - 5720 Smart Card Reader - 6782 BTC 7932 mouse+keyboard -046f Crystal Semiconductor -0471 Philips (or NXP) - 0101 DSS350 Digital Speaker System - 0104 DSS330 Digital Speaker System [uda1321] - 0105 UDA1321 - 014f GoGear SA9200 - 0160 MP3 Player - 0161 MP3 Player - 0163 GoGear SA1100 - 0164 GoGear SA1110/02 - 0165 GoGear SA1330 - 0201 Hub - 0222 Creative Nomad Jukebox - 0302 PCA645VC Webcam [pwc] - 0303 PCA646VC Webcam [pwc] - 0304 Askey VC010 Webcam [pwc] - 0307 PCVC675K Webcam [pwc] - 0308 PCVC680K Webcam [pwc] - 030b PC VGA Camera (Vesta Fun) - 030c PCVC690K Webcam [pwc] - 0310 PCVC730K Webcam [pwc] - 0311 PCVC740K ToUcam Pro [pwc] - 0312 PCVC750K Webcam [pwc] - 0314 DMVC 1000K - 0316 DMVC 2000K Video Capture - 0321 FunCam - 0322 DMVC1300K PC Camera - 0325 SPC 200NC PC Camera - 0326 SPC 300NC PC Camera - 0327 Webcam SPC 6000 NC (Webcam w/ mic) - 0328 SPC 700NC PC Camera - 0329 SPC 900NC PC Camera / ORITE CCD Webcam(PC370R) - 032d SPC 210NC PC Camera - 032e SPC 315NC PC Camera - 0330 SPC 710NC PC Camera - 0331 SPC 1300NC PC Camera - 0332 SPC 1000NC PC Camera - 0333 SPC 620NC PC Camera - 0334 SPC 520/525NC PC Camera - 0401 Semiconductors CICT Keyboard - 0402 PS/2 Mouse on Semiconductors CICT Keyboard - 0406 15 inch Detachable Monitor - 0407 10 inch Mobile Monitor - 0471 Digital Speaker System - 0601 OVU1020 IR Dongle (Kbd+Mouse) - 0602 ATI Remote Wonder II Input Device - 0603 ATI Remote Wonder II Controller - 0608 eHome Infrared Receiver - 060a TSU9600 Remote Control - 060c Consumer Infrared Transceiver (HP) - 060d Consumer Infrared Transceiver (SRM5100) - 060e RF Dongle - 060f Consumer Infrared Transceiver - 0613 Infrared Transceiver - 0617 IEEE802.15.4 RF Dongle - 0619 TSU9400 Remote Control - 0666 Hantek DDS-3005 Arbitrary Waveform Generator - 0700 Semiconductors CICT Hub - 0701 150P1 TFT Display - 0809 AVNET Bluetooth Device - 0811 JR24 CDRW - 0814 DCCX38/P data cable - 0815 eHome Infrared Receiver - 0844 SA2111/02 1GB Flash Audio Player - 084a GoGear SA3125 - 084e GoGear SA60xx (mtp) - 0888 Hantek DDS-3005 Arbitrary Waveform Generator - 1103 Digital Speaker System - 1120 Creative Rhomba MP3 player - 1125 Nike psa[128max Player - 1137 HDD065 MP3 player - 1201 Arima Bluetooth Device - 1230 Wireless Adapter 11g - 1232 SNU6500 Wireless Adapter - 1233 Wireless Adapter Bootloader Download - 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 - 200f 802.11n Wireless Adapter - 2021 SDE3273FC/97 2.5" SATA HDD Enclosure [INIC-1608L] - 2022 GoGear SA52XX - 2034 Webcam SPC530NC - 2036 Webcam SPC1030NC - 203f TSU9200 Remote Control - 2046 TSU9800 Remote Control - 204e GoGear RaGa (SA1942/02) - 205e TSU9300 Remote Control - 2070 GoGear Mix - 2076 GoGear Aria - 2079 GoGear Opus - 2088 MCE IR Receiver with ALS- Spinel plus for ASUS - 262c SPC230NC Webcam - 485d Senselock SenseIV v2.x - df55 LPCXpresso LPC-Link -0472 Chicony Electronics Co., Ltd - 0065 PFU-65 Keyboard [Chicony] - b086 Asus USB2.0 Webcam - b091 Webcam -0473 Sanyo Information Business Co., Ltd -0474 Sanyo Electric Co., Ltd - 0110 Digital Voice Recorder R200 - 0217 Xacti J2 - 022f C5 Digital Media Camera (mass storage mode) - 0230 C5 Digital Media Camera (PictBridge mode) - 0231 C5 Digital Media Camera (PC control mode) - 0401 Optical Drive - 0701 SCP-4900 Cellphone - 071f Usb Com Port Enumerator - 0722 W33SA Camera -0475 Relisys/Teco Information System - 0100 NEC Petiscan - 0103 Eclipse 1200U/Episode - 0210 Scorpio Ultra 3 -0476 AESP -0477 Seagate Technology, Inc. -0478 Connectix Corp. - 0001 QuickCam - 0002 QuickClip - 0003 QuickCam Pro -0479 Advanced Peripheral Laboratories -047a Semtech Corp. - 0004 ScreenCoder UR7HCTS2-USB -047b Silitek Corp. - 0001 Keyboard - 0002 Keyboard and Mouse - 00f9 SK-1789u Keyboard - 0101 BlueTooth Keyboard and Mouse - 020b SK-3105 SmartCard Reader - 050e Internet Compact Keyboard - 1000 Trust Office Scan USB 19200 - 1002 HP ScanJet 4300c Parallel Port -047c Dell Computer Corp. -047d Kensington - 1001 Mouse*in*a*Box - 1002 Expert Mouse Pro - 1003 Orbit TrackBall - 1004 MouseWorks - 1005 TurboBall - 1006 TurboRing - 1009 Orbit TrackBall for Mac - 1012 PocketMouse - 1013 Mouse*in*a*Box Optical Pro - 1014 Expert Mouse Pro Wireless - 1015 Expert Mouse - 1016 ADB/USB Orbit - 1018 Studio Mouse - 101d Mouse*in*a*Box Optical Pro - 101e Studio Mouse Wireless - 101f PocketMouse Pro - 1020 Expert Mouse Trackball - 1021 Expert Mouse Wireless - 1022 Orbit Optical - 1023 Pocket Mouse Pro Wireless - 1024 PocketMouse - 1025 Mouse*in*a*Box Optical Elite Wireless - 1026 Pocket Mouse Pro - 1027 StudioMouse - 1028 StudioMouse Wireless - 1029 Mouse*in*a*Box Optical Elite - 102a Mouse*in*a*Box Optical - 102b PocketMouse - 102c Iridio - 102d Pilot Optical - 102e Pilot Optical Pro - 102f Pilot Optical Pro Wireless - 1043 Ci65m Wireless Notebook Optical Mouse - 104a PilotMouse Mini Retractable - 105d PocketMouse Bluetooth - 105e Bluetooth EDR Dongle - 1061 PocketMouse Grip - 1062 PocketMouse Max - 1063 PocketMouse Max Wireless - 1064 PocketMouse 2.0 Wireless - 1065 PocketMouse 2.0 - 1066 PocketMouse Max Glow - 1067 ValueMouse - 1068 ValueOpt White - 1069 ValueOpt Black - 106a PilotMouse Laser Wireless Mini - 106b PilotMouse Laser - 3 Button - 106c PilotMouse Laser - Gaming - 106d PilotMouse Laser - Wired - 106e PilotMouse Micro Laser - 1070 ValueOpt Travel - 1071 ValueOpt RF TX - 1072 PocketMouse Colour - 1073 PilotMouse Laser - 6 Button - 1074 PilotMouse Laser Wireless Mini - 1075 SlimBlade Presenter Media Mouse - 1076 SlimBlade Media Mouse - 1077 SlimBlade Presenter Mouse - 1152 Bluetooth EDR Dongle - 2002 Optical Elite Wireless - 2010 Wireless Presentation Remote - 2012 Wireless Presenter with Laser Pointer - 2021 PilotBoard Wireless - 2030 PilotBoard Wireless - 2034 SlimBlade Media Notebook Set - 2041 SlimBlade Trackball - 4003 Gravis Xterminator Digital Gamepad - 4005 Gravis Eliminator GamePad Pro - 4006 Gravis Eliminator AfterShock - 4007 Gravis Xterminator Force - 4008 Gravis Destroyer TiltPad - 5001 Cabo I Camera - 5002 VideoCam CABO II - 5003 VideoCam -047e Agere Systems, Inc. (Lucent) - 0300 ORiNOCO Card - 1001 USS720 Parallel Port - 2892 Systems Soft Modem - bad1 Lucent 56k Modem - f101 Atlas Modem -047f Plantronics, Inc. - 0101 Bulk Driver - 0301 Bulk Driver - 0ca1 USB DSP v4 Audio Interface - 4254 BUA-100 Bluetooth Adapter -0480 Toshiba America Info. Systems, Inc. - 0001 InTouch Module - 0004 InTouch Module - 0011 InTouch Module - 0014 InTouch Module -0481 Zenith Data Systems -0482 Kyocera Corp. - 000e FS-1020D Printer - 0100 Finecam S3x - 0101 Finecam S4 - 0103 Finecam S5 - 0105 Finecam L3 - 0106 Finecam - 0107 Digital Camera Device - 0108 Digital Camera Device - 0203 AH-K3001V - 0204 iBurst Terminal -0483 SGS Thomson Microelectronics - 0137 BeWAN ADSL USB ST (blue or green) - 0138 Unicorn II (ST70138B + MTC-20174TQ chipset) - 1307 Cytronix 6in1 Card Reader - 163d Cool Icam Digi-MP3 - 2015 TouchChip® Fingerprint Reader - 2016 Fingerprint Reader - 2017 Biometric Smart Card Reader - 2018 BioSimKey - 2302 Portable Flash Device (PFD) - 4810 ISDN adapter - 481d BT Digital Access adapter - 5000 ST Micro Bluetooth Device - 5001 ST Micro Bluetooth Device - 5721 Hantek DDS-3X25 Arbitrary Waveform Generator - 7270 ST Micro Serial Bridge - 7554 56k SoftModem - ff10 Swann ST56 Modem -0484 Specialix -0485 Nokia Monitors -0486 ASUS Computers, Inc. - 0185 EeePC T91MT HID Touch Panel -0487 Stewart Connector -0488 Cirque Corp. -0489 Foxconn / Hon Hai - 0502 SmartMedia Card Reader Firmware Loader - 0503 SmartMedia Card Reader - d00c Rollei Compactline (Storage Mode) - d00e Rollei Compactline (Video Mode) - e000 T-Com TC 300 - e003 Pirelli DP-L10 - e00f Foxconn T77H114 BCM2070 [Single-Chip Bluetooth 2.1 + EDR Adapter] - e016 Ubee PXU1900 WiMAX Adapter [Beceem BCSM250] - e02c Atheros AR5BBU12 Bluetooth Device -048a S-MOS Systems, Inc. -048c Alps Electric Ireland, Ltd -048d Integrated Technology Express, Inc. - 9009 Zolid HD DVD Maker - 9135 Zolid Mini DVB-T Stick -048f Eicon Tech. -0490 United Microelectronics Corp. -0491 Capetronic - 0003 Taxan Monitor Control -0492 Samsung SemiConductor, Inc. - 0140 MP3 player - 0141 MP3 Player -0493 MAG Technology Co., Ltd -0495 ESS Technology, Inc. -0496 Micron Electronics -0497 Smile International - c001 Camera Device -0498 Capetronic (Kaohsiung) Corp. -0499 Yamaha Corp. - 1000 UX256 MIDI I/F - 1001 MU1000 - 1002 MU2000 - 1003 MU500 - 1004 UW500 - 1005 MOTIF6 - 1006 MOTIF7 - 1007 MOTIF8 - 1008 UX96 MIDI I/F - 1009 UX16 MIDI I/F - 100a EOS BX - 100c UC-MX - 100d UC-KX - 100e S08 - 100f CLP-150 - 1010 CLP-170 - 1011 P-250 - 1012 TYROS - 1013 PF-500 - 1014 S90 - 1015 MOTIF-R - 1016 MDP-5 - 1017 CVP-204 - 1018 CVP-206 - 1019 CVP-208 - 101a CVP-210 - 101b PSR-1100 - 101c PSR-2100 - 101d CLP-175 - 101e PSR-K1 - 101f EZ-J24 - 1020 EZ-250i - 1021 MOTIF ES 6 - 1022 MOTIF ES 7 - 1023 MOTIF ES 8 - 1024 CVP-301 - 1025 CVP-303 - 1026 CVP-305 - 1027 CVP-307 - 1028 CVP-309 - 1029 CVP-309GP - 102a PSR-1500 - 102b PSR-3000 - 102e ELS-01/01C - 1030 PSR-295/293 - 1031 DGX-205/203 - 1032 DGX-305 - 1033 DGX-505 - 1037 PSR-E403 - 103c MOTIF-RACK ES - 1054 S90XS Keyboard/Music Synthesizer - 2000 DGP-7 - 2001 DGP-5 - 3001 YST-MS55D USB Speaker - 3003 YST-M45D USB Speaker - 4000 NetVolante RTA54i Broadband&ISDN Router - 4001 NetVolante RTW65b Broadband Wireless Router - 4002 NetVolante RTW65i Broadband&ISDN Wireless Router - 4004 NetVolante RTA55i Broadband VoIP Router - 5000 CS1D - 5001 DSP1D - 5002 DME32 - 5003 DM2000 - 5004 02R96 - 5005 ACU16-C - 5006 NHB32-C - 5007 DM1000 - 5008 01V96 - 5009 SPX2000 - 500a PM5D - 500b DME64N - 500c DME24N - 6001 CRW2200UX Lightspeed 2 External CD-RW Drive - 7000 DTX - 7010 UB99 -049a Gandalf Technologies, Ltd -049b Curtis Computer Products -049c Acer Advanced Labs, Inc. - 0002 Keyboard (???) -049d VLSI Technology -049f Compaq Computer Corp. - 0002 InkJet Color Printer - 0003 iPAQ PocketPC - 000e Internet Keyboard - 0012 InkJet Color Printer - 0018 PA-1/PA-2 MP3 Player - 0019 InkJet Color Printer - 001a S4 100 Scanner - 001e IJ650 Inkjet Printer - 001f WL215 Adapter - 0021 S200 Scanner - 0027 Bluetooth Multiport Module by Compaq - 002a 1400P Inkjet Printer - 002b A3000 - 002c Lexmark X125 - 0032 802.11b Adapter [ipaq h5400] - 0033 802.11b Adapter [orinoco] - 0036 Bluetooth Multiport Module - 0051 KU-0133 Easy Access Interner Keyboard - 0076 Wireless LAN MultiPort W200 - 0080 GPRS Multiport - 0086 Bluetooth Device - 504a Personal Jukebox PJB100 - 505a Linux-USB "CDC Subset" Device, or Itsy (experimental) - 8511 iPAQ Networking 10/100 Ethernet [pegasus2] -04a0 Digital Equipment Corp. -04a1 SystemSoft Corp. - fff0 Telex Composite Device -04a2 FirePower Systems -04a3 Trident Microsystems, Inc. -04a4 Hitachi, Ltd - 0004 DVD-CAM DZ-MV100A Camcorder - 001e DVDCAM USB HS Interface -04a5 Acer Peripherals Inc. (now BenQ Corp.) - 0001 Keyboard - 0002 API Ergo K/B - 0003 API Generic K/B Mouse - 12a6 AcerScan C310U - 1a20 Prisa 310U - 1a2a Prisa 620U - 2022 Prisa 320U/340U - 2040 Prisa 620UT - 205e ScanPrisa 640BU - 2060 Prisa 620U+/640U - 207e Prisa 640BU - 209e ScanPrisa 640BT - 20ae S2W 3000U - 20b0 S2W 3300U/4300U - 20be Prisa 640BT - 20c0 Prisa 1240UT - 20de S2W 4300U+ - 20f8 Benq 5000 - 20fc Benq 5000 - 20fe SW2 5300U - 2137 Benq 5150/5250 - 2202 Benq 7400UT - 2311 Benq 5560 - 3003 Benq Webcam - 3008 Benq 1500 - 300a Benq 3410 - 300c Benq 1016 - 3019 Benq DC C40 - 4000 P30 Composite Device - 4013 BenQ-Siemens EF82/SL91 - 4044 BenQ-Siemens SF71 - 4045 BenQ-Siemens E81 - 4048 BenQ M7 - 6001 Mass Storage Device - 6002 Mass Storage Device - 6003 ATA/ATAPI Adapter - 6004 Mass Storage Device - 6005 Mass Storage Device - 6006 Mass Storage Device - 6007 Mass Storage Device - 6008 Mass Storage Device - 6009 Mass Storage Device - 600a Mass Storage Device - 600b Mass Storage Device - 600c Mass Storage Device - 600d Mass Storage Device - 600e Mass Storage Device - 600f Mass Storage Device - 6010 Mass Storage Device - 6011 Mass Storage Device - 6012 Mass Storage Device - 6013 Mass Storage Device - 6014 Mass Storage Device - 6015 Mass Storage Device - 6125 MP3 Player - 6180 MP3 Player - 6200 MP3 Player - 7500 Hi-Speed Mass Storage Device - 9000 AWL300 Wireless Adapter - 9001 AWL400 Wireless Adapter - 9213 Kbd Hub -04a6 Nokia Display Products - 00b9 Audio - 0180 Hub Type P - 0181 HID Monitor Controls -04a7 Visioneer - 0100 StrobePro - 0101 Strobe Pro Scanner (1.01) - 0102 StrobePro Scanner - 0211 OneTouch 7600 Scanner - 0221 OneTouch 5300 Scanner - 0223 OneTouch 8200 - 0224 OneTouch 4800 USB/Microtek Scanport 3000 - 0225 VistaScan Astra 3600(ENG) - 0226 OneTouch 5300 USB - 0229 OneTouch 7100 - 022a OneTouch 6600 - 022c OneTouch 9000/9020 - 0231 6100 Scanner - 0311 6200 EPP/USB Scanner - 0321 OneTouch 8100 EPP/USB Scanner - 0331 OneTouch 8600 EPP/USB Scanner - 0341 6400 - 0361 VistaScan Astra 3600(ENG) - 0362 OneTouch 9320 - 0371 OneTouch 8700/8920 - 0380 OneTouch 7700 - 0382 Photo Port 7700 - 0390 9650 - 03a0 Xerox 4800 One Touch - 0410 OneTouch Pro 8800/8820 - 0421 9450 USB - 0423 9750 Scanner - 0424 Strobe XP 450 - 0425 Strobe XP 100 - 0426 Strobe XP 200 - 0427 Strobe XP 100 - 0444 OneTouch 7300 - 0445 CardReader 100 - 0446 Xerox DocuMate 510 - 0447 XEROX DocuMate 520 - 0448 XEROX DocuMate 250 - 0449 Xerox DocuMate 252 - 044a Xerox 6400 - 044c Xerox DocuMate 262 - 0474 Strobe XP 300 - 0475 Xerox DocuMate 272 - 0478 Strobe XP 220 - 0479 Strobe XP 470 - 047a 9450 - 047b 9650 - 047d 9420 - 0480 9520 - 048f Strobe XP 470 - 0491 Strobe XP 450 - 0493 9750 - 0494 Strobe XP 120 - 0497 Patriot 430 - 0498 Patriot 680 - 0499 Patriot 780 - 049b Strobe XP 100 - 04a0 7400 - 04ac Xerox Travel Scanner 100 -04a8 Multivideo Labs, Inc. - 0101 Hub - 0303 Peripheral Switch - 0404 Peripheral Switch -04a9 Canon, Inc. - 1005 BJ Printer Hub - 1035 PD Printer Storage - 1050 BJC-8200 - 1051 BJC-3000 Color Printer - 1052 BJC-6100 - 1053 BJC-6200 - 1054 BJC-6500 - 1055 BJC-85 - 1056 BJC-2110 Color Printer - 1057 LR1 - 105a BJC-55 - 105b S600 Printer - 105c S400 - 105d S450 Printer - 105e S800 - 1062 S500 Printer - 1063 S4500 - 1064 S300 Printer - 1065 S100 - 1066 S630 - 1067 S900 - 1068 S9000 - 1069 S820 - 106a S200 Printer - 106b S520 Printer - 106d S750 Printer - 106e S820D - 1070 S530D - 1072 I850 Printer - 1073 I550 Printer - 1074 S330 Printer - 1076 i70 - 1077 i950 - 107a S830D - 107b i320 - 107c i470D - 107d i9100 - 107e i450 - 107f i860 - 1082 i350 - 1084 i250 - 1085 i255 - 1086 i560 - 1088 i965 - 108a i455 - 108b i900D - 108c i475D - 108d PIXMA iP2000 - 108f i80 - 1090 i9900 Photo Printer - 1091 PIXMA iP1500 - 1093 PIXMA iP4000 - 1094 PIXMA iP3000x Printer - 1095 PIXMA iP6000D - 1097 PIXMA iP5000 - 1098 PIXMA iP1000 - 1099 PIXMA iP8500 - 109c PIXMA iP4000R - 109d iP90 - 10a0 PIXMA iP1600 Printer - 10a2 iP4200 - 10a4 iP5200R - 10a5 iP5200 - 10a7 iP6210D - 10a8 iP6220D - 10a9 iP6600D - 10b6 PIXMA iP4300 Printer - 10c2 PIXMA iP1800 Printer - 10c4 Pixma iP4500 Printer - 1404 W6400PG - 1405 W8400PG - 150f BIJ2350 PCL - 1510 BIJ1350 PCL - 1512 BIJ1350D PCL - 1601 DR-2080C Scanner - 1607 DR-6080 Scanner - 1700 PIXMA MP110 Scanner - 1701 PIXMA MP130 Scanner - 1702 MP410 Composite - 1703 MP430 Composite - 1704 MP330 Composite - 1706 PIXMA MP750 Scanner - 1707 PIXMA MP780 Scanner - 1708 PIXMA MP760 Scanner - 1709 PIXMA MP150 Scanner - 170a PIXMA MP170 Scanner - 170b PIXMA MP450 Scanner - 170c PIXMA MP500 Scanner - 170d PIXMA MP800 Scanner - 170e MP800R - 1710 MP950 - 1712 MP530 - 1713 PIXMA MP830 Scanner - 1714 MP160 - 1715 MP180 Storage - 1716 MP460 Composite - 1717 MP510 - 1718 MP600 Storage - 171a MP810 Storage - 171b MP960 - 1721 MP210 ser - 1723 MP470 ser - 1725 MP610 ser - 1726 MP970 ser - 1727 MX300 ser - 1728 MX310 ser - 1729 MX700 ser - 172b MP140 ser - 173e MP560 - 173f Pixma MP640 Multifunction device - 1748 Pixma MG5150 - 1900 CanoScan LiDE 90 - 1901 CanoScan 8800F - 1904 CanoScan LiDE 100 - 1905 CanoScan LiDE 200 - 1906 CanoScan 5600F - 1907 CanoScan LiDE 700F - 1909 CanoScan LiDE 110 - 190a CanoScan LiDE 210 - 2200 CanoScan LiDE 25 - 2201 CanoScan FB320U - 2202 CanoScan FB620U - 2204 CanoScan FB630U - 2205 CanoScan FB1210U - 2206 CanoScan N650U/N656U - 2207 CanoScan 1220U - 2208 CanoScan D660U - 220a CanoScan D2400UF - 220b CanoScan D646U - 220c CanoScan D1250U2 - 220d CanoScan N670U/N676U/LiDE 20 - 220e CanoScan N1240U/LiDE 30 - 220f CanoScan 8000F - 2210 CanoScan 9900F - 2212 CanoScan 5000F - 2213 CanoScan LiDE 50/LiDE 35/LiDE 40 - 2214 CanoScan LiDE 80 - 2215 CanoScan 3000/3000F/3000ex - 2216 CanoScan 3200F - 2217 CanoScan 5200F - 2219 CanoScan 9950F - 221b CanoScan 4200F - 221c CanoScan LiDE 60 - 221e CanoScan 8400F - 221f CanoScan LiDE 500F - 2220 CanoScan LIDE 25 - 2224 CanoScan LiDE 600F - 2225 CanoScan LiDE 70 - 2228 CanoScan 4400F - 2602 MultiPASS C555 - 2603 MultiPASS C755 - 260a CAPT Printer - 260e LBP-2000 - 2610 MPC600F - 2611 SmartBase MPC400 - 2612 MultiPASS C855 - 2617 CAPT Printer - 261a iR1600 - 261b iR1610 - 261c iC2300 - 261f MPC200 Printer - 2621 iR2000 - 2622 iR2010 - 2623 FAX-B180C - 2629 FAXPHONE L75 - 262b LaserShot LBP-1120 Printer - 262d iR C3200 - 262f MultiPASS MP730 - 2630 MultiPASS MP700 - 2631 LASER CLASS 700 - 2632 FAX-L2000 - 2635 MPC190 - 2637 iR C6800 - 2638 iR C3100 - 263c Smartbase MP360 - 263d MP370 - 263e MP390 FAX - 263f MP375 - 2646 MF5530 Scanner Device V1.9.1 - 2647 MF5550 Composite - 264d PIXMA MP710 - 264e MF5630 - 264f MF5650 (FAX) - 2650 iR 6800C EUR - 2651 iR 3100C EUR - 2655 FP-L170/MF350/L380/L398 - 2659 MF8100 - 265b CAPT Printer - 265c iR C3220 - 265d MF5730 - 265e MF5750 - 265f MF5770 - 2660 MF3110 - 2663 iR3570/iR4570 - 2664 iR2270/iR2870 - 2665 iR C2620 - 2666 iR C5800 - 2667 iR85PLUS - 2669 iR105PLUS - 266a CAPT Device - 266b iR8070 - 266c iR9070 - 266d iR 5800C EUR - 266e CAPT Device - 266f iR2230 - 2670 iR3530 - 2671 iR5570/iR6570 - 2672 iR C3170 - 2673 iR 3170C EUR - 2674 L120 - 2675 iR2830 - 2676 CAPT Device - 2677 iR C2570 - 2678 iR 2570C EUR - 2679 CAPT Device - 267a iR2016 - 267b iR2020 - 267d MF7100 series - 2684 MF3200 series - 2686 MF6500 series - 2687 iR4530 - 2688 LBP3460 - 268c iR C6870 - 268d iR 6870C EUR - 268e iR C5870 - 268f iR 5870C EUR - 2691 iR7105 - 26a3 MF4100 series - 26b0 MF4600 series - 26b4 MF4010 series - 26b5 MF4200 series - 3041 PowerShot S10 - 3042 CanoScan FS4000US Film Scanner - 3043 PowerShot S20 - 3044 EOS D30 - 3045 PowerShot S100 - 3046 IXY Digital - 3047 Digital IXUS - 3048 PowerShot G1 - 3049 PowerShot Pro90 IS - 304a CP-10 - 304b IXY Digital 300 - 304c PowerShot S300 - 304d Digital IXUS 300 - 304e PowerShot A20 - 304f PowerShot A10 - 3050 PowerShot unknown 1 - 3051 PowerShot S110 - 3052 Digital IXUS V - 3055 PowerShot G2 - 3056 PowerShot S40 - 3057 PowerShot S30 - 3058 PowerShot A40 - 3059 PowerShot A30 - 305b ZR45MC Digital Camcorder - 305c PowerShot unknown 2 - 3060 EOS D60 - 3061 PowerShot A100 - 3062 PowerShot A200 - 3063 CP-100 - 3065 PowerShot S200 - 3066 Digital IXUS 330 - 3067 MV550i Digital Video Camera - 3069 PowerShot G3 - 306a Digital unknown 3 - 306b MVX2i Digital Video Camera - 306c PowerShot S45 - 306d PowerShot S45 PtP Mode - 306e PowerShot G3 (normal mode) - 306f PowerShot G3 (ptp) - 3070 PowerShot S230 - 3071 PowerShot S230 (ptp) - 3072 PowerShot SD100 / Digital IXUS II (ptp) - 3073 PowerShot A70 (ptp) - 3074 PowerShot A60 (ptp) - 3075 IXUS 400 Camera - 3076 PowerShot A300 - 3077 PowerShot S50 - 3078 ZR70MC Digital Camcorder - 307a MV650i (normal mode) - 307b MV630i Digital Video Camera - 307c MV630i (normal mode) - 307d CP-300 - 307f Optura 20 - 3080 MVX150i (normal mode) / Optura 20 (normal mode) - 3081 Optura 10 - 3082 MVX100i / Optura 10 - 3083 EOS 10D - 3084 EOS 300D / EOS Digital Rebel - 3085 PowerShot G5 - 3087 Elura 50 (PTP mode) - 3088 Elura 50 (normal mode) - 308d MVX3i - 308e FV M1 (normal mode) / MVX 3i (normal mode) / Optura Xi (normal mode) - 3093 Optura 300 - 3096 IXY DV M2 (normal mode) / MVX 10i (normal mode) - 3099 EOS 300D (ptp) - 309a PowerShot A80 - 309b Digital IXUS (ptp) - 309c PowerShot S1 IS - 309d Camera - 309f Camera - 30a0 Camera - 30a1 Camera - 30a2 Camera - 30a8 Elura 60E/Optura 40 (ptp) - 30a9 MVX25i (normal mode) / Optura 40 (normal mode) - 30b1 PowerShot S70 (normal mode) / PowerShot S70 (PTP mode) - 30b2 PowerShot S60 (normal mode) / PowerShot S60 (PTP mode) - 30b3 PowerShot G6 (normal mode) / PowerShot G6 (PTP mode) - 30b4 PowerShot S500 - 30b5 PowerShot A75 - 30b6 Digital IXUS II2 / Digital IXUS II2 (PTP mode) / PowerShot SD110 (PTP mode) / PowerShot SD110 Digital ELPH - 30b7 PowerShot A400 / PowerShot A400 (PTP mode) - 30b8 PowerShot A310 / PowerShot A310 (PTP mode) - 30b9 Powershot A85 - 30ba PowerShot S410 Digital Elph - 30bb PowerShot A95 - 30bd CP-220 - 30be CP-330 - 30bf Digital IXUS 40 - 30c0 Digital IXUS 30 (PTP mode) / PowerShot SD200 (PTP mode) - 30c1 Digital IXUS 50 (normal mode) / IXY Digital 55 (normal mode) / PowerShot A520 (PTP mode) / PowerShot SD400 (normal mode) - 30c2 PowerShot A510 (normal mode) / PowerShot A510 (PTP mode) - 30c4 Digital IXUS i5 (normal mode) / IXY Digital L2 (normal mode) / PowerShot SD20 (normal mode) - 30ea EOS 1D Mark II (PTP mode) - 30eb EOS 20D - 30ec EOS 20D (ptp) - 30ee EOS 350D - 30ef EOS 350D (ptp) - 30f0 PowerShot S2 IS (PTP mode) - 30f2 Digital IXUS 700 (normal mode) / Digital IXUS 700 (PTP mode) / IXY Digital 600 (normal mode) / PowerShot SD500 (normal mode) / PowerShot SD500 (PTP mode) - 30f6 SELPHY CP400 - 30f8 Powershot A430 - 30f9 PowerShot A410 (PTP mode) - 30fc PowerShot A620 (PTP mode) - 30fd PowerShot A610 (normal mode)/PowerShot A610 (PTP mode) - 30fe Digital IXUS 65 (PTP mode)/PowerShot SD630 (PTP mode) - 30ff Digital IXUS 55 (PTP mode)/PowerShot SD450 (PTP mode) - 310b SELPHY CP600 - 310e Digital IXUS 50 (PTP mode) - 3110 EOS Digital Rebel XTi - 3116 Digital IXUS 750 (PTP mode) - 3117 PowerShot A700 - 312d Elura 100 - 3138 PowerShot A710 IS - 3147 EOS 1Ds Mark III - 3155 PowerShot A450 - 315a PowerShot G9 - 315d PowerShot A720 - 3160 Digital IXUS 860 IS - 3175 IXY Digital 25 IS - 3176 PowerShot A590 - 317a Powershot A470 - 3184 Digital IXUS 80 IS (PTP mode) - 319a EOS 7D - 31bc PowerShot D10 - 31c0 PowerShot SX200 IS - 31e5 Digital IXUS 200 IS - 31ee SELPHY ES40 - 31f3 PowerShot Digital ELPH SD1400 IS - 31ff Digital IXUS 55 -04aa DaeWoo Telecom, Ltd -04ab Chromatic Research -04ac Micro Audiometrics Corp. -04ad Dooin Electronics - 2501 Bluetooth Device -04af Winnov L.P. -04b0 Nikon Corp. - 0102 Coolpix 990 - 0103 Coolpix 880 - 0104 Coolpix 995 - 0106 Coolpix 775 - 0107 Coolpix 5000 - 0108 Coolpix 2500 - 0109 Coolpix 2500 (ptp) - 010a Coolpix 4500 - 010b Coolpix 4500 (ptp) - 010d Coolpix 5700 (ptp) - 010e Coolpix 4300 (storage) - 010f Coolpix 4300 (ptp) - 0110 Coolpix 3500 (Sierra Mode) - 0111 Coolpix 3500 (ptp) - 0112 Coolpix 885 (ptp) - 0113 Coolpix 5000 (ptp) - 0114 Coolpix 3100 (storage) - 0115 Coolpix 3100 (ptp) - 0117 Coolpix 2100 (ptp) - 0119 Coolpix 5400 (ptp) - 011d Coolpix 3700 (ptp) - 0121 Coolpix 3200 (ptp) - 0122 Coolpix 2200 (ptp) - 0124 Coolpix 8400 (mass storage mode) - 0125 Coolpix 8400 (ptp) - 0126 Coolpix 8800 - 0129 Coolpix 4800 (ptp) - 012c Coolpix 4100 (storage) - 012d Coolpix 4100 (ptp) - 012e Coolpix 5600 (ptp) - 0130 Coolpix 4600 (ptp) - 0135 Coolpix 5900 (ptp) - 0136 Coolpix 7900 (storage) - 0137 Coolpix 7900 (ptp) - 013a Coolpix 100 (storage) - 013b Coolpix 100 (ptp) - 0141 Coolpix P2 (storage) - 0142 Coolpix P2 (ptp) - 0163 Coolpix P5100 (ptp) - 0169 Coolpix P50 (ptp) - 0202 Coolpix SQ (ptp) - 0203 Coolpix 4200 (mass storage mode) - 0204 Coolpix 4200 (ptp) - 0205 Coolpix 5200 (storage) - 0206 Coolpix 5200 (ptp) - 0301 Coolpix 2000 (storage) - 0302 Coolpix 2000 (ptp) - 0317 Coolpix L20 (ptp) - 0402 DSC D100 (ptp) - 0403 D2H (mass storage mode) - 0404 D2H SLR (ptp) - 0405 D70 (mass storage mode) - 0406 DSC D70 (ptp) - 0408 D2X SLR (ptp) - 0409 D50 digital camera - 040a D50 (ptp) - 040c D2Hs - 040e DSC D70s (ptp) - 040f D200 (mass storage mode) - 0410 D200 (ptp) - 0413 D40 (mass storage mode) - 0422 D700 (ptp) - 0425 D300S - 0f03 PD-10 Wireless Printer Adapter - 4000 Coolscan LS 40 ED - 4001 LS 50 ED/Coolscan V ED - 4002 Super Coolscan LS-5000 ED -04b1 Pan International -04b3 IBM Corp. - 3003 Rapid Access III Keyboard - 3004 Media Access Pro Keyboard - 300a Rapid Access IIIe Keyboard - 3016 UltraNav Keyboard Hub - 3018 UltraNav Keyboard - 301b SK-8815 Keyboard - 301c Enhanced Performance Keyboard - 3020 Enhanced Performance Keyboard - 3100 NetVista Mouse - 3103 ScrollPoint Pro Mouse - 3104 ScrollPoint Wireless Mouse - 3105 ScrollPoint Optical (HID) - 3107 ThinkPad 800dpi Optical Travel Mouse - 3108 800dpi Optical Mouse w/ Scroll Point - 3109 Optical ScrollPoint Pro Mouse - 310b Red Wheel Mouse - 310c Wheel Mouse - 4427 Portable CD ROM - 4482 Serial Converter - 4485 Serial Converter - 4525 Double sided CRT - 4550 NVRAM (128 KB) - 4554 Cash Drawer - 4580 Hub w/ NVRAM - 4581 4800-2xx Hub w/ Cash Drawer - 4604 Keyboard w/ Card Reader - 4671 4820 LCD w/ MSR/KB -04b4 Cypress Semiconductor Corp. - 0000 Dacal DC-101 CD Library - 0001 Mouse - 0002 CY7C63x0x Thermometer - 0033 Mouse - 0100 Cino FuzzyScan F760-B - 0101 Keyboard/Hub - 0102 Keyboard with APM - 0130 MyIRC Remote Receiver - 0306 Telephone Receiver - 0407 Optical Skype Mouse - 0bad MetaGeek Wi-Spy - 1002 CY7C63001 R100 FM Radio - 1006 Human Interface Device - 2050 hub - 2830 Opera1 DVB-S (cold state) - 4381 SCAPS USC-1 Scanner Controller - 4611 Storage Adapter FX2 (CY) - 4616 Flash Disk (TPP) - 5201 Combi Keyboard-Hub (Hub) - 5202 Combi Keyboard-Hub (Keyboard) - 5500 HID->COM RS232 Adapter - 6370 ViewMate Desktop Mouse CC2201 - 6560 CY7C65640 USB-2.0 "TetraHub" - 6830 CY7C68300A EZ-USB AT2 USB 2.0 to ATA/ATAPI - 6831 Storage Adapter ISD-300LP (CY) - 7417 Wireless PC Lock/Ultra Mouse - 8329 USB To keyboard/Mouse Converter - 8613 CY7C68013 EZ-USB FX2 USB 2.0 Development Kit - 8614 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 861f Anysee E30 USB 2.0 DVB-T Receiver - bca1 Barcode Reader - cc04 Centor USB RACIA-ALVAR USB PORT - cc06 Centor-P RACIA-ALVAR USB PORT - d5d5 CY7C63x0x Zoltrix Z-Boxer GamePad - de61 Barcode Reader - de64 Barcode Reader - f000 CY30700 Licorice evaluation board - f111 CY8CKIT-002 PSoC MiniProg3 Rev A Program and debug kit - f115 PSoC FirstTouch Programmer -04b5 ROHM LSI Systems USA, LLC -04b6 Hint Corp. -04b7 Compal Electronics, Inc. -04b8 Seiko Epson Corp. - 0001 Stylus Color 740 / Photo 750 - 0002 ISD Smart Cable for Mac - 0003 ISD Smart Cable - 0004 Printer - 0005 Printer - 0006 Printer - 0007 Printer - 0101 Perfection 636 - 0102 GT-2200 - 0103 Perfection 610 - 0104 Perfection 1200 - 0105 StylusScan 2000 - 0106 Stylus Scan 2500 - 0107 Expression 1600U - 0109 Expression 1640 XL - 010a Perfection 1640SU - 010b Perfection 1240 - 010c Perfection 640 - 010e Perfection 1680 - 010f Perfection 1250 - 0110 Perfection 1650 - 0112 Perfection 2450 - 0114 Perfection 660 - 0116 Perfection 3170 (GT-9400) - 0118 Perfection 4180 (GF-F600) - 0119 Perfection 4490 Photo - 011a 1000 ICS - 011b Perfection 2400 Photo - 011c Perfection 3200 - 011d Perfection 1260 Photo - 011e Perfection 1660 Photo - 011f Perfection 1670 - 0120 Perfection 1270 scanner - 0121 Perfection 2480 Photo - 0122 Perfection 3590 scanner - 0126 GT-15000 (ES-7000) - 0128 Perfection 4870 (GT-X700) - 0129 Expression 10000XL (ES-10000G) - 012a Perfection 4990 Photo scanner - 012b GT-2500 (ES-H300) - 012c Perfection V700 Photo (GT-X900) - 012d Perfection V10/V100 (GT-S600/F650) - 012f Perfection V350 (GT-F700) - 0130 Perfection V500 (GT-X770) - 0131 Perfection V300 - 0202 Receipt Printer M129C - 0401 CP 800 Digital Camera - 0402 PhotoPC 850z - 0403 PhotoPC 3000z - 0509 JVC PIX-MC10 - 0601 Stylus Photo 875DC Card Reader - 0602 Stylus Photo 895 Card Reader - 0801 Stylus CX5200/CX5400/CX6600 - 0802 Stylus CX3200 - 0803 Printer (Composite Device) - 0804 Storage Device - 0805 Stylus CX6400 - 0806 Stylus Photo RX600/610 - 0807 Stylus Photo RX500/510 - 0808 Stylus CX5200 - 0809 Storage Device - 080a Storage Device - 080c ME100 - 080d Stylus CX4500/4600 - 080e CX-3500/3600/3650 MFP - 080f Stylus Photo RX425 scanner - 0810 Stylus Photo RX700 (PM-A900) - 0811 Stylus Photo RX620 all-in-one - 0812 MFP Composite Device - 0813 Stylus CX6500/6600 - 0814 (PM-A700) - 0815 AcuLaser CX11 (LP-A500) - 0816 Printer (Composite Device) - 0817 (LP-M5500) - 0818 Stylus CX3700/CX3800/DX3800 - 0819 Stylus CX4700/CX4800/DX4800 (PX-A750) - 081a Stylus Photo RX520/RX530 (PM-A750) - 081b MFP Composite Device - 081c Stylus Photo RX640/RX650 (PM-A890) - 081d (PM-A950) - 081e MFP Composite Device - 081f Stylus CX7700/7800 - 0820 CX4200 MP scanner - 0821 MFP Composite Device - 0822 Storage Device - 0823 MFP Composite Device - 0824 Storage Device - 0825 MFP Composite Device - 0826 Storage Device - 0827 Stylus Photo RX560/580/590 (PM-A820) - 0828 (PM-A970) - 0829 (PM-T990) - 082a (PM-A920) - 082b Stylus DX5050 - 082c Storage Device - 082d Storage Device - 082e 0x082e DX-60x0 MFP scanner - 082f Stylus DX4050 - 0830 Stylus CX2800/CX2900/ME200 - 0831 MFP Composite Device - 0832 MFP Composite Device - 0833 (LP-M5600) - 0834 MFP Composite Device - 0835 AcuLaser CX21 - 0836 MFP Composite Device - 0837 MFP Composite Device - 0838 CX7300/CX7400/DX7400 - 0839 CX8300/CX8400/DX8400 - 083a CX9300F/CX9400Fax/DX9400F - 083b MFP Composite Device - 083c MFP Composite Device - 083d MFP Composite Device - 083e MFP Composite Device - 083f Stylus DX4450 - 0849 Stylus SX205 - 084d Stylus SX115 - 0856 Stylus SX515W -04b9 Rainbow Technologies, Inc. - 0300 SafeNet USB SuperPro/UltraPro - 1000 iKey 1000 Token - 1001 iKey 1200 Token - 1002 iKey Token - 1003 iKey Token - 1004 iKey Token - 1005 iKey Token - 1006 iKey Token - 1200 iKey 2000 Token - 1201 iKey Token - 1202 iKey 2032 Token - 1203 iKey Token - 1204 iKey Token - 1205 iKey Token - 1206 iKey 4000 Token - 1300 iKey 3000 Token - 1301 iKey 3000 - 1302 iKey Token - 1303 iKey Token - 1304 iKey Token - 1305 iKey Token - 1306 iKey Token -04ba Toucan Systems, Ltd -04bb I-O Data Device, Inc. - 0101 USB2-IDE/ATAPI Bridge Adapter - 0201 USB2-IDE/ATAPI Bridge Adapter - 0204 DVD Multi-plus unit iU-CD2 - 0206 DVD Multi-plus unit DVR-UEH8 - 0301 Storage Device - 0314 USB-SSMRW SD-card - 0319 USB2-IDE/ATAPI Bridge Adapter - 031a USB2-IDE/ATAPI Bridge Adapter - 031b USB2-IDE/ATAPI Bridge Adapter - 031e USB-SDRW SD-card - 0502 Nogatech Live! (BT) - 0528 GV-USB Video Capture - 0901 USB ETT - 0904 ET/TX Ethernet [pegasus] - 0913 ET/TX-S Ethernet [pegasus2] - 0919 USB WN-B11 - 0922 IOData AirPort WN-B11/USBS 802.11b - 0930 ETG-US2 - 0937 WN-WAG/USL Wireless LAN Adapter - 0938 WN-G54/USL Wireless LAN Adapter - 093b WN-GDN/USB - 093f WNGDNUS2 802.11n - 0944 WHG-AGDN/US Wireless LAN Adapter - 0945 WN-GDN/US3 Wireless LAN Adapter - 0947 WN-G150U Wireless LAN Adapter - 0948 WN-G300U Wireless LAN Adapter - 0a03 Serial USB-RSAQ1 - 0a07 USB2-iCN Adapter - 0a08 USB2-iCN Adapter - 0c01 FM-10 Pro Disk -04bd Toshiba Electronics Taiwan Corp. -04be Telia Research AB -04bf TDK Corp. - 0100 MediaReader CF - 0115 USB-PDC Adapter UPA9664 - 0116 USB-cdmaOne Adapter UCA1464 - 0117 USB-PHS Adapter UHA6400 - 0118 USB-PHS Adapter UPA6400 - 0135 MediaReader Dual - 0202 73S1121F Smart Card Reader- - 0309 Bluetooth USB dongle - 030a IBM Bluetooth Ultraport Module - 030b Bluetooth Device - 030c Ultraport Bluetooth Device - 0310 Integrated Bluetooth - 0311 Integrated Bluetooth Device - 0317 Bluetooth UltraPort Module from IBM - 0318 IBM Integrated Bluetooth - 0319 Bluetooth Adapter - 0320 Bluetooth Adapter - 0321 Bluetooth Device - 0a28 INDI AV-IN Device -04c1 U.S. Robotics (3Com) - 0020 56K Voice Pro - 0022 56K Voice Pro - 007e ISDN TA - 0082 OfficeConnect Analog Modem - 008f Pro ISDN TA - 0097 OfficeConnect Analog - 009d HomeConnect Webcam [vicam] - 00a9 ISDN Pro TA-U - 00b9 HomeConnect IDSL Modem - 3021 56k Voice FaxModem Pro -04c2 Methode Electronics Far East PTE, Ltd -04c3 Maxi Switch, Inc. - 1102 Mouse - 2102 Mouse -04c4 Lockheed Martin Energy Research -04c5 Fujitsu, Ltd - 1029 fi-4010c Scanner - 1033 fi-4110CU - 1041 fi-4120c Scanner - 1042 fi-4220c Scanner - 105b AH-F401U Air H device - 1096 fi-5110EOX - 1097 fi-5110C - 10ae fi-4120C2 - 10af fi-4220C2 - 10e0 fi-5120c Scanner - 10e1 fi-5220C - 10e7 fi-5900C - 10fe S500 -04c6 Toshiba America Electronic Components -04c7 Micro Macro Technologies -04c8 Konica Corp. - 0720 Digital Color Camera - 0721 e-miniD Camera - 0722 e-mini - 0723 KD-200Z Camera - 0726 KD-310Z Camera - 0728 Revio C2 Mass Storage Device - 0729 Revio C2 Digital Camera - 072c Revio KD20M - 072d Revio KD410Z -04ca Lite-On Technology Corp. - 1766 HID Monitor Controls - 9304 Hub -04cb Fuji Photo Film Co., Ltd - 0100 FinePix 30i/40i/50i, A101/201, 1300/2200, 1400/2400/2600/2800/4500/4700/4800/4900/6800/6900 Zoom - 0103 FinePix NX-500/NX-700 printer - 0104 FinePix A101, 2600/2800/4800/6800 Zoom (PC CAM) - 0108 FinePix F601 Zoom (DSC) - 0109 FinePix F601 Zoom (PC CAM) - 010a FinePix S602 (Pro) Zoom (DSC) - 010b FinePix S602 (Pro) Zoom (PC CAM) - 010d FinePix Digital Camera 020531 - 010e FinePix F402 Zoom (DSC) - 010f FinePix F402 Zoom (PC CAM) - 0110 FinePix M603 Zoom (DSC) - 0111 FinePix M603 Zoom (PC CAM) - 0112 FinePix A202, A200 Zoom (DSC) - 0113 FinePix A202, A200 Zoom (PC CAM) - 0114 FinePix F401 Zoom (DSC) - 0115 FinePix F401 Zoom (PC CAM) - 0116 FinePix A203 Zoom (DSC) - 0117 FinePix A203 Zoom (PC CAM) - 0118 FinePix A303 Zoom (DSC) - 0119 FinePix A303 Zoom (PC CAM) - 011a FinePix S304/3800 Zoom (DSC) - 011b FinePix S304/3800 Zoom (PC CAM) - 011c FinePix A204/2650 Zoom (DSC) - 011d FinePix A204/2650 Zoom (PC CAM) - 0120 FinePix F700 Zoom (DSC) - 0121 FinePix F700 Zoom (PC CAM) - 0122 FinePix F410 Zoom (DSC) - 0123 FinePix F410 Zoom (PC CAM) - 0124 FinePix A310 Zoom (DSC) - 0125 FinePix A310 Zoom (PC CAM) - 0126 FinePix A210 Zoom (DSC) - 0127 FinePix A210 Zoom (PC CAM) - 0128 FinePix A205(S) Zoom (DSC) - 0129 FinePix A205(S) Zoom (PC CAM) - 012a FinePix F610 Zoom (DSC) - 012b FinePix Digital Camera 030513 - 012c FinePix S7000 Zoom (DSC) - 012d FinePix S7000 Zoom (PC CAM) - 012f FinePix Digital Camera 030731 - 0130 FinePix S5000 Zoom (DSC) - 0131 FinePix S5000 Zoom (PC CAM) - 013b FinePix Digital Camera 030722 - 013c FinePix S3000 Zoom (DSC) - 013d FinePix S3000 Zoom (PC CAM) - 013e FinePix F420 Zoom (DSC) - 013f FinePix F420 Zoom (PC CAM) - 0142 FinePix S7000 Zoom (PTP) - 0148 FinePix A330 Zoom (DSC) - 0149 FinePix A330 Zoom (UVC) - 014a FinePix A330 Zoom (PTP) - 014b FinePix A340 Zoom (DSC) - 014c FinePix A340 Zoom (UVC) - 0159 FinePix F710 Zoom (DSC) - 0165 FinePix S3500 Zoom (DSC) - 0168 FinePix E500 Zoom (DSC) - 0169 FinePix E500 Zoom (UVC) - 016b FinePix E510 Zoom (DSC) - 016c FinePix E510 Zoom (PC CAM) - 016e FinePix S5500 Zoom (DSC) - 016f FinePix S5500 Zoom (UVC) - 0171 FinePix E550 Zoom (DSC) - 0172 FinePix E550 Zoom (UVC) - 0177 FinePix F10 (DSC) - 0179 Finepix F10 (PTP) - 0186 FinePix S5200/S5600 Zoom (DSC) - 0188 FinePix S5200/S5600 Zoom (PTP) - 018e FinePix S9500 Zoom (DSC) - 018f FinePix S9500 Zoom (PTP) - 0192 FinePix E900 Zoom (DSC) - 0193 FinePix E900 Zoom (PTP) - 019b FinePix F30 (PTP) - 01af FinePix A700 (PTP) - 01bf FinePix F6000fd/S6500fd Zoom (PTP) - 01c0 FinePix F20 (PTP) - 01c1 FinePix F31fd (PTP) - 01c4 FinePix S5700 Zoom (PTP) - 01c5 FinePix F40fd (PTP) - 01c6 FinePix A820 Zoom (PTP) - 01d2 FinePix A800 Zoom (PTP) - 01d4 FinePix F50fd (PTP) - 01d5 FinePix F47 (PTP) - 01f7 FinePix J250 (PTP) - 01fd A160 -04cc ST-Ericsson - 1122 Hub - 1520 USB 2.0 Hub (Avocent KVM) - 1521 USB 2.0 Hub - 1a62 GW Instek GSP-830 Spectrum Analyzer (HID) - 2533 NFC device (PN533) - 8116 Camera -04cd Tatung Co. Of America -04ce ScanLogic Corp. - 0002 SL11R-IDE IDE Bridge - 0100 USB2PRN Printer Class - 0300 Phantom 336CX - C3 scanner - 04ce SL11DEMO, VID: 0x4ce, PID: 0x4ce - 07d1 SL11R, VID: 0x4ce, PID: 0x07D1 -04cf Myson Century, Inc. - 0800 MTP800 Mass Storage Device - 8810 CS8810 Mass Storage Device - 8811 CS8811 Mass Storage Device - 8813 CS8813 Mass Storage Device - 8818 USB2.0 to ATAPI Bridge Controller - 8819 USB 2.0 SD/MMC Reader - 9920 CS8819A2-114 Mass Storage Device -04d0 Digi International -04d1 ITT Canon -04d2 Altec Lansing Technologies - 0070 ADA70 Speakers - 0305 Non-Compliant Audio Device - 0311 ADA-310 Speakers - 2060 Claritel-i750 - vp - ff05 ADA-305 Speakers - ff47 Lansing HID Audio Controls - ff49 Lansing HID Audio Controls -04d3 VidUS, Inc. -04d4 LSI Logic, Inc. -04d5 Forte Technologies, Inc. -04d6 Mentor Graphics -04d7 Oki Semiconductor - 1be4 Bluetooth Device -04d8 Microchip Technology, Inc. - 0002 PicoLCD 20x2 - 0003 PICkit 2 Microcontroller Programmer - 000a CDC RS-232 Emulation Demo - 000b PIC18F2550 (32K Flashable 10 Channel, 10 Bit A/D USB Microcontroller) - 0032 PICkit1 - 0033 PICkit2 - 0036 PICkit Serial Analyzer - 00e0 PIC32 Starter Board - 0a04 AGP LIN Serial Analyzer - 8000 In-Circuit Debugger - 8001 ICD2 in-circuit debugger - 900a PICkit3 - c001 PicoLCD 20x4 - fbba DiscFerret Magnetic Disc Analyser (bootloader mode) - fbbb DiscFerret Magnetic Disc Analyser (active mode) -04d9 Holtek Semiconductor, Inc. - 0022 Portable Keyboard - 048e Optical Mouse - 0499 Optical Mouse - 1203 Keyboard - 1400 PS/2 keyboard + mouse controller - 1503 Shortboard Lefty -04da Panasonic (Matsushita) - 0901 LS-120 Camera - 0912 SDR-S10 - 0b01 CD-R/RW Drive - 0b03 SuperDisk 240MB - 0d01 CD-R Drive KXL-840AN - 0d09 CD-R Drive KXL-RW32AN - 0d0a CD-R Drive KXL-CB20AN - 0d0d CDRCB03 - 0d0e DVD-ROM & CD-R/RW - 0f40 Printer - 1500 MFSUSB Driver - 1800 DY-WL10 802.11abgn Adapter [Broadcom BCM4323] - 1b00 MultiMediaCard - 2121 EB-VS6 - 2316 DVC Mass Storage Device - 2317 DVC USB-SERIAL Driver for WinXP - 2318 NV-GS11/230/250 (webcam mode) - 2319 NV-GS15 (webcam mode) - 231a NV-GS11/230/250 (DV mode) - 231d DVC Web Camera Device - 231e DVC DV Stream Device - 2372 Lumix Camera - 2374 DMC-FZ18/FZ20 - 2451 HDC-SD9 - 2497 HDC-TM700 - 250c Gobi Wireless Modem (QDL mode) - 250d Gobi Wireless Modem - 3904 N5HBZ0000055 802.11abgn Wireless Adapter [Atheros AR7010] - 3c04 JT-P100MR-20 [ePassport Reader] -04db Hypertec Pty, Ltd -04dc Huan Hsin Holdings, Ltd -04dd Sharp Corp. - 13a6 MFC2000 - 6006 AL-1216 - 6007 AL-1045 - 6008 AL-1255 - 6009 AL-1530CS - 600a AL-1540CS - 600b AL-1456 - 600c AL-1555 - 600d AL-1225 - 600e AL-1551CS - 600f AR-122E - 6010 AR-152E - 6011 AR-157E - 6012 SN-1045 - 6013 SN-1255 - 6014 SN-1456 - 6015 SN-1555 - 6016 AR-153E - 6017 AR-122E N - 6018 AR-153E N - 6019 AR-152E N - 601a AR-157E N - 601b AL-1217 - 601c AL-1226 - 601d AR-123E - 6021 IS01 - 7002 DVC Ver.1.0 - 7004 VE-CG40U Digital Still Camera - 7005 VE-CG30 Digital Still Camera - 7007 VL-Z7S Digital Camcorder - 8004 Zaurus SL-5000D/SL-5500 PDA - 8005 Zaurus A-300 - 8006 Zaurus SL-B500/SL-5600 PDA - 8007 Zaurus C-700 PDA - 9014 IM-DR80 Portable NetMD Player - 9031 Zaurus C-750/C-760/C-860/SL-C3000 PDA - 9032 Zaurus SL-6000 - 903a GSM GPRS - 9050 Zaurus C-860 PDA - 9056 Viewcam Z - 9073 AM-900 - 9074 GSM GPRS - 90a9 Sharp Composite - 90d0 USB-to-Serial Comm. Port - 90f2 Sharp 3G GSM USB Control - 9120 WS004SH - 9122 WS007SH - 9123 W-ZERO3 ES Smartphone - 91a3 922SH Internet Machine -04de MindShare, Inc. -04df Interlink Electronics -04e1 Iiyama North America, Inc. - 0201 Monitor Hub -04e2 Exar Corp. -04e3 Zilog, Inc. -04e4 ACC Microelectronics -04e5 Promise Technology -04e6 SCM Microsystems, Inc. - 0001 E-USB ATA Bridge - 0002 eUSCSI SCSI Bridge - 0003 eUSB SmartMedia Card Reader - 0005 eUSB SmartMedia/CompactFlash Card Reader - 0006 eUSB SmartMedia Card Reader - 0007 Hifd - 0009 eUSB ATA/ATAPI Adapter - 000a eUSB CompactFlash Adapter - 000b eUSCSI Bridge - 000c eUSCSI Bridge - 000d Dazzle MS - 0012 Dazzle SD/MMC - 0101 eUSB ATA Bridge (Sony Spressa USB CDRW) - 0311 Dazzle DM-CF - 0312 Dazzle DM-SD/MMC - 0313 Dazzle SM - 0314 Dazzle MS - 0322 e-Film Reader-5 - 0325 eUSB ORCA Quad Reader - 0327 Digital Media Reader - 03fe DMHS2 DFU Adapter - 0406 eUSB SmartDM Reader - 04e6 eUSB DFU Adapter - 04e7 STCII DFU Adapter - 04e8 eUSBDM DFU Adapter - 04e9 DM-E DFU Adapter - 0500 Veridicom 5thSense Fingerprint Sensor and eUSB SmartCard - 0701 DCS200 Loader Device - 0702 DVD Creation Station 200 - 0703 DVC100 Loader Device - 0704 Digital Video Creator 100 - 1001 SCR300 Smart Card Reader - 1010 USBAT-2 CompactFlash Card Reader - 1014 e-Film Reader-3 - 1020 USBAT ATA/ATAPI Adapter - 2007 RSA SecurID ComboReader - 2009 Citibank Smart Card Reader - 200a Reflex v.2 Smart Card Reader - 200d STR391 Reader - 5111 SCR331-DI SmartCard Reader - 5113 SCR333 SmartCard Reader - 5114 SCR331-DI SmartCard Reader - 5115 SCR335 SmartCard Reader - 5116 SCR331-LC1 / SCR3310 SmartCard Reader - 5117 SCR3320 - Smart Card Reader - 5118 Expresscard SIM Card Reader - 5119 SCR3340 - ExpressCard54 Smart Card Reader - 511b SmartCard Reader - 511d SCR3311 Smart Card Reader - 5120 SCR331-DI SmartCard Reader - 5121 SDI010 Smart Card Reader - 5151 SCR338 Keyboard Smart Card Reader - 5292 SCL011 RFID reader - 5410 SCR35xx Smart Card Reader - e000 SCRx31 Reader - e001 SCR331 SmartCard Reader - e003 SPR532 PinPad SmartCard Reader -04e7 Elo TouchSystems - 0001 TouchScreen - 0002 Touchmonitor Interface 2600 Rev 2 - 0004 4000U CarrollTouch® Touchmonitor Interface - 0007 2500U IntelliTouch® Touchmonitor Interface - 0008 3000U AccuTouch® Touchmonitor Interface - 0009 4000U CarrollTouch® Touchmonitor Interface - 0020 Touchscreen Interface (2700) - 0021 Touchmonitor Interface - 0030 4500U CarrollTouch® Touchmonitor Interface - 0032 Touchmonitor Interface - 0033 Touchmonitor Interface - 0041 5010 Surface Capacitive Touchmonitor Interface - 0042 Touchmonitor Interface - 0050 2216 AccuTouch® Touchmonitor Interface - 0071 Touchmonitor Interface - 0072 Touchmonitor Interface - 0081 Touchmonitor Interface - 0082 Touchmonitor Interface - 00ff Touchmonitor Interface -04e8 Samsung Electronics Co., Ltd - 0100 Kingston Flash Drive (128MB) - 0110 Connect3D Flash Drive - 0111 Connect3D Flash Drive - 1003 MP3 Player and Recorder - 1006 SDC-200Z - 2018 WIS09ABGN LinkStick Wireless LAN Adapter - 2035 Digital Photo Frame Mass Storage - 2036 Digital Photo Frame Mini Monitor - 3004 ML-4600 - 3005 Docuprint P1210 - 3008 ML-6060 laser printer - 300c ML-1210 Printer - 300e Laser Printer - 3104 ML-3550N - 3210 ML-5200A Laser Printer - 3226 Laser Printer - 3228 Laser Printer - 322a Laser Printer - 322c Laser Printer - 3230 ML-1440 - 3232 Laser Printer - 3236 ML-1450 - 3238 ML-1430 - 323a ML-1710 Printer - 323b Phaser 3130 - 323c Laser Printer - 323d Phaser 3120 - 323e Laser Printer - 3240 Laser Printer - 3242 ML-1510 Laser Printer - 3248 Color Laser Printer - 324a Laser Printer - 324c ML-1740 Printer - 324d Phaser 3121 - 3256 ML-1520 Laser Printer - 325b Xerox Phaser 3117 Laser Printer - 325f Phaser 3425 Laser Printer - 3260 CLP-510 Color Laser Printer - 3268 ML-1610 Mono Laser Printer - 326c ML-2010P Mono Laser Printer - 3276 ML-3050/ML-3051 Laser Printer - 328e CLP-310 Color Laser Printer - 3296 ML-2580N Mono Laser Printer - 3297 ML-191x/ML-252x Laser Printer - 3409 SCX-4216F Scanner - 340c SCX-5x15 series - 340d SCX-6x20 series - 340e MFP 560 series - 340f Printing Support - 3412 SCX-4x20 series - 3413 SCX-4100 Scanner - 3415 Composite Device - 3419 Composite Device - 341a Printing Support - 341b SCX-4200 series - 341c Composite Device - 341d Composite Device - 341f Composite Device - 3420 Composite Device - 3426 SCX-4500 Laser Printer - 3605 InkJet Color Printer - 3606 InkJet Color Printer - 3609 InkJet Color Printer - 3902 InkJet Color Printer - 3903 Xerox WorkCentre XK50cx - 390f InkJet Color Printer - 3911 SCX-1020 series - 4005 GT-S8000 Jet (msc) - 4f1f GT-S8000 Jet (mtp) - 5000 YP-MF series - 5001 YP-100 - 5002 YP-30 - 5003 YP-700 - 5004 YP-30 - 5005 YP-300 - 5006 YP-750 - 500d MP3 Player - 5010 Yepp YP-35 - 5011 YP-780 - 5013 YP-60 - 5015 yepp upgrade - 501b MP3 Player - 5021 Yepp YP-ST5 - 5026 YP-MT6V - 5027 YP-T7 - 502b YP-F1 - 5032 YP-J70 - 503b YP-U1 MP3 Player - 503d YP-T7F - 5041 YP-Z5 - 5050 YP-U2 MP3 Player - 5051 YP-F2R - 5055 YP-T9 - 507d YP-U3 (mtp) - 507f YP-T9J - 5080 Yepp YP-K3 (msc) - 5081 Yepp YP-K3 (mtp) - 5082 YP-P2 (msc) - 5083 YP-P2 (mtp) - 508a YP-T10 - 508b YP-S5 MP3 Player - 508c YP-S5 - 5090 YP-S3 (msc) - 5091 YP-S3 (mtp) - 5092 YP-U4 (msc) - 5093 YP-U4 (mtp) - 5095 YP-S2 - 510f YP-R1 - 5119 Yepp YP-P3 - 511c YP-Q2 - 5121 YP-U5 - 5123 Yepp YP-M1 - 5a00 YP-NEU - 5a01 YP-NDU - 5a03 Yepp MP3 Player - 5a04 YP-800 - 5a08 YP-90 - 5a0f Meizu M6 MiniPlayer - 5b01 Memory Stick Reader/Writer - 5b02 Memory Stick Reader/Writer - 5b03 Memory Stick Reader/Writer - 5b04 Memory Stick Reader/Writer - 5b05 Memory Stick Reader/Writer - 5b11 SEW-2001u Card - 5f00 NEXiO Sync - 5f01 NEXiO Sync - 5f02 NEXiO Sync - 5f03 NEXiO Sync - 5f04 NEXiO Sync - 6032 G2 Portable hard drive - 6601 Mobile Phone - 6602 Galaxy - 6603 Galaxy - 6611 MITs Sync - 6613 MITs Sync - 6615 MITs Sync - 6617 MITs Sync - 6619 MITs Sync - 661b MITs Sync - 661e Handheld - 6620 Handheld - 6622 Handheld - 6624 Handheld - 662e MITs Sync - 6630 MITs Sync - 6632 MITs Sync - 663e D900e Phone - 663f SGH-E720/SGH-E840 - 6640 Usb Modem Enumerator - 6702 X830 - 6708 U600 Phone - 6709 U600 - 6734 Juke - 6759 D900e Media Player - 675a D900e Mass Storage - 675b D900e Camera - 6772 Standalone LTE device (Trial) - 6795 S5230 - 6802 Standalone HSPA device - 6806 Composite LTE device (Trial) - 6807 Composite HSPA device - 681c Galaxy Portal/Spica/S - 681d Galaxy Portal/Spica Android Phone - 684e Wave (GT-S8500) - 6875 GT-B3710 Standalone LTE device (Commercial) - 6876 GT-B3710 LTE Modem - 6877 Galaxy S - 6888 GT-B3730 Composite LTE device (Commercial) - 6889 GT-B3730 Composite LTE device (Commercial) - 689a LTE Storage Driver [CMC2xx] - 7011 SEW-2003U Card - 7021 Bluetooth Device - 7061 eHome Infrared Receiver - 7080 Anycall SCH-W580 - 7081 Human Interface Device - 8001 Handheld - e020 SERI E02 SCOM 6200 UMTS Phone - e021 SERI E02 SCOM 6200 Virtual UARTs - e022 SERI E02 SCOM 6200 Flash Load Disk - ff30 SG_iMON -04e9 PC-Tel, Inc. -04ea Brooktree Corp. -04eb Northstar Systems, Inc. - e004 eHome Infrared Transceiver -04ec Tokyo Electron Device, Ltd -04ed Annabooks -04ef Pacific Electronic International, Inc. -04f0 Daewoo Electronics Co., Ltd -04f1 Victor Company of Japan, Ltd - 0001 GC-QX3 Digital Still Camera - 0004 GR-DVL815U Digital Video Camera - 0006 DV Camera Storage - 0008 GZ-MG30AA/MC500E Digital Video Camera - 0009 GR-DX25EK Digital Video Camera - 000a GR-D72 Digital Video Camera - 1001 GC-A50 Camera Device - 3008 MP-PRX1 Ethernet - 3009 MP-XP7250 WLAN Adapter -04f2 Chicony Electronics Co., Ltd - 0001 KU-8933 Keyboard - 0002 NT68P81 Keyboard - 0110 KU-2971 Keyboard - 0111 KU-9908 Keyboard - 0112 KU-8933 Keyboard with PS/2 Mouse port - 0116 KU-2971/KU-0325 Keyboard - 0220 Wireless HID Receiver - 0402 Genius LuxeMate i200 Keyboard - 0403 KU-0420 keyboard - 0418 KU-0418 Tactical Pad - 0760 Acer KU-0760 Keyboard - 0860 2.4G Multimedia Wireless Kit - a001 E-Video DC-100 Camera - a120 ORITE CCD Webcam(PC370R) - a121 ORITE CCD Webcam(PC370R) - a122 ORITE CCD Webcam(PC370R) - a123 ORITE CCD Webcam(PC370R) - a124 ORITE CCD Webcam(PC370R) - a128 PC Camera (SN9C202 + OV7663 + EEPROM) - a133 Gateway Webcam - a136 LabTec Webcam 5500 - a204 DSC WIA Device (1300) - a208 DSC WIA Device (2320) - a209 Labtec DC-2320 - a20a DSC WIA Device (3310) - a20c DSC WIA Device (3320) - a210 Audio Device - b008 USB 2.0 Camera - b009 Integrated Camera - b010 Integrated Camera - b012 1.3 MPixel UVC Webcam - b013 USB 2.0 Camera - b015 VGA 24fps UVC Webcam - b016 VGA 30fps UVC Webcam - b018 2M UVC Webcam - b021 ViewSonic 1.3M, USB2.0 Webcam - b022 Gateway USB 2.0 Webcam - b023 Gateway USB 2.0 Webcam - b024 USB 2.0 Webcam - b025 Camera - b027 Gateway USB 2.0 Webcam - b028 VGA UVC Webcam - b029 1.3M UVC Webcam - b036 Asus Integrated 0.3M UVC Webcam - b044 Acer CrystalEye Webcam - b057 integrated USB webcam - b071 2.0M UVC Webcam / CNF7129 - b091 Webcam - b104 CNF7069 Webcam - b107 CNF7070 Webcam - b14c CNF8050 Webcam - b175 4-Port Hub - b1aa Webcam-101 - b1b4 Lenovo Integrated Camera - b1cf Lenovo Integrated Camera -04f3 Elan Microelectronics Corp. - 0210 AM-400 Hama Optical Mouse - 0212 Laser Mouse - 0214 Lynx M9 Optical Mouse - 0230 3D Optical Mouse - 02f4 2.4G Cordless Mouse -04f4 Harting Elektronik, Inc. -04f5 Fujitsu-ICL Systems, Inc. -04f6 Norand Corp. -04f7 Newnex Technology Corp. -04f8 FuturePlus Systems -04f9 Brother Industries, Ltd - 0002 HL-1050 Laser Printer - 0005 Printer - 0006 HL-1240 Laser Printer - 0007 HL-1250 Laser Printer - 0008 HL-1270 Laser Printer - 0009 Printer - 000a P2500 series - 000b Printer - 000c Printer - 000d HL-1440 Laser Printer - 000e HL-1450 series - 000f HL-1470N series - 0010 Printer - 0011 Printer - 0012 Printer - 0013 Printer - 0014 Printer - 0015 Printer - 0016 Printer - 0017 Printer - 0018 Printer - 001a HL-1430 Laser Printer - 001c Printer - 001e Printer - 0020 HL-5130 series - 0021 HL-5140 series - 0022 HL-5150D series - 0023 HL-5170DN series - 0024 Printer - 0025 Printer - 0027 HL-2030 Laser Printer - 0028 Printer - 0029 Printer - 002a HL-52x0 series - 002b HL-5250DN Printer - 002c Printer - 002d Printer - 0100 MFC8600/9650 series - 0101 MFC9600/9870 series - 0102 MFC9750/1200 series - 0104 MFC-8300J - 0105 MFC-9600J - 0106 MFC-7300C - 0107 MFC-7400C - 0108 MFC-9200C - 0109 MFC-830 - 010a MFC-840 - 010b MFC-860 - 010c MFC-7400J - 010d MFC-9200J - 010e MFC3100C Scanner - 010f MFC 5100C - 0110 MFC4800 Scanner - 0111 MFC 6800 - 0112 DCP1000 Port(FaxModem) - 0113 MFC-8500 - 0114 MFC9700 Port(FaxModem) - 0115 MFC9800 Scanner - 0116 DCP1400 Scanner - 0119 MFC-9660 - 011b MFC-9880 - 011c MFC-9760 - 011d MFC-9070 - 011e MFC-9180 - 011f MFC-9160 - 0120 MFC580 Port(FaxModem) - 0121 MFC-590 - 0122 MFC-5100J - 0129 Imagistics 2500 (MFC-8640D clone) - 012f FAX-4750e - 0132 MFC-5200C RemovableDisk - 0135 MFC-100 Scanner - 0136 MFC-150CL Scanner - 013c MFC-890 Port - 013d MFC-5200J Printer - 013e MFC-4420C RemovableDisk - 013f MFC-4820C RemovableDisk - 0140 DCP-8020 - 0141 DCP-8025D - 0142 MFC-8420 - 0143 MFC-8820D - 0144 DCP-4020C RemovableDisk - 0146 MFC-3220C - 0147 FAX-1820C Printer - 0148 MFC-3320CN Printer - 0149 FAX-1920CN Printer - 014a MFC-3420C - 014b MFC-3820CN - 014d FAX-1815C Printer - 014e MFC-8820J - 0150 MFC-8220 Port(FaxModem) - 0151 MFC-8210J - 0157 MFC-3420J Printer - 0158 MFC-3820JN Port(FaxModem) - 015d MFC Composite Device - 015e DCP-8045D - 015f MFC-8440 - 0160 MFC-8840D - 0161 MFC-210C - 0162 MFC-420CN Remote Setup Port - 0163 MFC-410CN RemovableDisk - 0165 MFC-620CN - 0166 MFC-610CLN RemovableDisk - 0168 MFC-620CLN - 0169 DCP-110C RemovableDisk - 016b DCP-310CN RemovableDisk - 016c FAX-2440C Printer - 016d MFC-5440CN - 016e MFC-5840CN Remote Setup Port - 0170 FAX-1840C Printer - 0171 FAX-1835C Printer - 0172 FAX-1940CN Printer - 0173 MFC-3240C Remote Setup Port - 0174 MFC-3340CN RemovableDisk - 017b Imagistics sx2100 - 0180 MFC-7420 - 0181 MFC-7820N Port(FaxModem) - 0182 Composite Device - 0183 DCP-7020 - 0184 DCP-7025 Printer - 0185 MFC-7220 Printer - 0186 Composite Device - 0187 FAX-2820 Printer - 0188 FAX-2920 Printer - 018a MFC-9420CN - 018c DCP-115C - 018d DCP-116C - 018e DCP-117C - 018f DCP-118C - 0190 DCP-120C - 0191 DCP-315CN - 0192 DCP-340CW - 0193 MFC-215C - 0194 MFC-425CN - 0195 MFC-820CW Remote Setup Port - 0196 MFC-820CN Remote Setup Port - 0197 MFC-640CW - 019a MFC-840CLN Remote Setup Port - 01a2 MFC-8640D - 01a3 Composite Device - 01a4 DCP-8065DN Printer - 01a5 MFC-8460N Port(FaxModem) - 01a6 MFC-8860DN Port(FaxModem) - 01a7 MFC-8870DW Printer - 01a8 DCP-130C - 01a9 DCP-330C - 01aa DCP-540CN - 01ab MFC-240C - 01ae DCP-750CW RemovableDisk - 01af MFC-440CN - 01b0 MFC-660CN - 01b1 MFC-665CW Remote Setup Port - 01b2 MFC-845CW Remote Setup Port - 01b4 MFC-460CN Remote Setup Port - 01b5 MFC-630CD - 01b6 MFC-850CDN - 01b7 MFC-5460CN Remote Setup Port - 01b8 MFC-5860CN - 01ba MFC-3360C - 01bd MFC-8660DN - 01be DCP-750CN RemovableDisk - 01bf MFC-860CDN Remote Setup Port - 01c0 DCP-128C - 01c1 DCP-129C - 01c2 DCP-131C - 01c3 DCP-329C - 01c4 DCP-331C - 01c5 MFC-239C - 01ca MFC-9440CN Remote Setup Port - 01ce DCP-135C - 01cf DCP-150C - 01d0 DCP-350C - 01d1 DCP-560CN - 01d4 MFC-230C - 01d5 MFC-235C - 01d6 MFC-260C - 01df DCP-155C - 01e0 MFC-265C - 01e1 DCP-153C - 01e2 DCP-157C - 01e3 DCP-353C - 01e4 DCP-357C - 01e7 MFC-7340 - 01e9 DCP-7040 - 01ea DCP-7030 - 01eb MFC-7320 - 01f4 MFC-5890CN - 1000 Printer - 1002 Printer - 2002 PTUSB Printing - 2004 PT-2300/2310 p-Touch Laber Printer - 2015 QL-500 P-touch label printer - 2016 QL-550 P-touch label printer - 201a PT-18R P-touch label printer - 2027 QL-560 P-Touch Label Printer - 2100 Card Reader Writer -04fa Dallas Semiconductor - 2490 DS1490F 2-in-1 Fob, 1-Wire adapter - 4201 DS4201 Audio DAC -04fb Biostar Microtech International Corp. -04fc Sunplus Technology Co., Ltd - 0003 CM1092 Optical Scroller Mouse - 0005 USB OpticalWheel Mouse - 0013 ViewMate Desktop Mouse CC2201 - 0015 ViewMate Desktop Mouse CC2201 - 00d3 00052486 / Laser Mouse M1052 [hama] - 0171 SPCA1527A/SPCA1528 SD card camera (Mass Storage mode) - 0232 Fingerprint - 0561 Flexcam 100 - 05d8 Wireless keyboard/mouse - 0c15 SPIF215A SATA bridge - 0c25 SATALink SPIF225A - 1528 SPCA1527A/SPCA1528 SD card camera (webcam mode) - 1533 Mass Storage - 2080 ASUS Webcam - 500c CA500C Digital Camera - 504a Aiptek Mini PenCam 1.3 - 504b Aiptek Mega PockerCam 1.3/Maxell MaxPocket LE 1.3 - 5330 Digitrex 2110 - 5331 Vivitar Vivicam 10 - 5360 Sunplus Generic Digital Camera - 5720 Card Reader Driver - 7333 Finet Technology Palmpix DC-85 - 757a Aiptek, MP315 MP3 Player - ffff PureDigital Ritz Disposable -04fd Soliton Systems, K.K. - 0003 Smart Card Reader II -04fe PFU, Ltd -04ff E-CMOS Corp. -0500 Siam United Hi-Tech - 0001 DART Keyboard Mouse - 0002 DART-2 Keyboard -0501 Fujikura DDK, Ltd -0502 Acer, Inc. - 0001 Handheld - 0736 Handheld - 15b1 PDA n311 - 1631 c10 Series - 1632 c20 Series - 16e1 n10 Handheld Sync - 16e2 n20 Pocket PC Sync - 16e3 n30 Handheld Sync - 3202 Liquid - 3203 Liquid (Debug mode) - d001 Divio NW801/DVC-V6+ Digital Camera -0503 Hitachi America, Ltd -0504 Hayes Microcomputer Products -0506 3Com Corp. - 009d HomeConnect Camera - 00a0 3CREB96 Bluetooth Adapter - 00a1 Bluetooth Device - 00a2 Bluetooth Device - 00df 3Com Home Connect lite - 0100 HomeConnect ADSL Modem Driver - 03e8 3C19250 Ethernet [klsi] - 0a01 3CRSHEW696 Wireless Adapter - 0a11 3CRWE254G72 802.11g Adapter - 11f8 HomeConnect 3C460 - 2922 HomeConnect Cable Modem External with - 3021 U.S.Robotics 56000 Voice FaxModem Pro - 4601 3C460B 10/100 Ethernet Adapter - f002 3CP4218 ADSL Modem (pre-init) - f003 3CP4218 ADSL Modem - f100 3CP4218 ADSL Modem (pre-init) -0507 Hosiden Corp. - 0011 Konami ParaParaParadise Controller -0508 Clarion Co., Ltd -0509 Aztech Systems, Ltd - 0801 ADSL Modem - 0802 ADSL Modem (RFC1483) - 0806 DSL Modem - 080f Binatone ADSL500 Modem Network Interface - 0812 Pirelli ADSL Modem Network Interface -050a Cinch Connectors -050b Cable System International -050c InnoMedia, Inc. -050d Belkin Components - 0004 Direct Connect - 0012 F8T012 Bluetooth Adapter - 0013 F8T013 Bluetooth Adapter - 0017 B8T017 Bluetooth+EDR 2.1 - 0050 F5D6050 802.11b Wireless Adapter v2000 [Atmel at76c503a] - 0081 F8T001v2 Bluetooth - 0083 Bluetooth Device - 0084 F8T003v2 Bluetooth - 0102 Flip KVM - 0103 F5U103 Serial Adapter [etek] - 0106 VideoBus II Adapter, Video - 0108 F1DE108B KVM - 0109 F5U109/F5U409 PDA Adapter - 0115 SCSI Adapter - 0119 F5U120-PC Dual PS/2 Ports / F5U118-UNV ADB Adapter - 0121 F5D5050 100Mbps Ethernet - 0122 Ethernet Adapter - 0131 Bluetooth Device with trace filter - 016a Bluetooth Mini Dongle - 0201 Peripheral Switch - 0208 USBView II Video Adapter [nt1004] - 0210 F5U228 Hi-Speed USB 2.0 DVD Creator - 0211 F5U211 USB 2.0 15-in-1 Media Reader & Writer - 0224 F5U224 USB 2.0 4-Port Hub - 0234 F5U234 USB 2.0 4-Port Hub - 0237 F5U237 USB 2.0 7-Port Hub - 0240 F5U240 USB 2.0 CF Card Reader - 0249 USB 2 Flash Media Device - 0257 F5U257 Serial - 0304 FSU304 USB 2.0 - 4 Ports Hub - 0409 F5U409 Serial - 0551 F6C550-AVR UPS - 0802 Nostromo n40 Gamepad - 0803 Nostromo 1745 GamePad - 0805 Nostromo N50 GamePad - 0815 Nostromo n52 HID SpeedPad Mouse Wheel - 0826 ErgoFit Wireless Optical Mouse (HID) - 0980 HID UPS Battery - 1102 Realtek RTL8188CE-VAU 1T1R 802.11n WLAN Adapter - 1202 F5U120-PC Parallel Printer Port - 1203 F5U120-PC Serial Port - 258a F5U258 Host to Host cable - 3101 F1DF102U/F1DG102U Flip Hub - 3201 F1DF102U/F1DG102U Flip KVM - 4050 ZD1211B - 5055 F5D5055 Gigabit Network Adapter [AX88xxx] - 6051 F5D6051 802.11b Wireless Network Adapter [ZyDAS ZD1201] - 7050 F5D7050 Wireless G Adapter v1000/v2000 [Intersil ISL3887] - 7051 F5D7051 802.11g Adapter v1000 [Broadcom 4320 USB] - 705a F5D7050 Wireless G Adapter v3000 [Ralink RT2573] - 705b Wireless G Adapter - 705c F5D7050 Wireless G Adapter v4000 [Zydas ZD1211B] - 705e F5D7050 Wireless G Adapter v5000 [Realtek RTL8187B] - 8053 F5D8053 N Wireless USB Adapter v1000/v4000 [Ralink RT2870] - 805c F5D8053 N Wireless Adapter v3000 [Ralink RT2870] - 805e F5D8053 N Wireless USB Adapter v5000 [Realtek RTL8192U] - 815c F5D8053 N Wireless USB Adapter v3000 [Ralink RT2870] - 815f F5D8053 N Wireless USB Adapter v6000 [Realtek RTL8192SU] - 825a F5D8055 N+ Wireless Adapter v1000 [Ralink RT2870] - 825b F5D8055 N+ Wireless Adapter v2000 [Ralink RT3070] - 845a F7D2101deSH [rtl8192su] - 905b F5D9050 Wireless G+ MIMO Network Adapter v3000 [Ralink RT2573] - 905c F5D9050 Wireless G+ MIMO Network Adapter v4000 [Ralink RT2573] - 935a F6D4050 N150 Enhanced Wireless Network Adapter v1000 [Ralink RT2870] - 935b F6D4050 N150 Enhanced Wireless Network Adapter v2000 [Ralink RT3070] - 945a F7D1101 Basic Wireless USB Adapter v1000 [Realtek RTL8188SU] -050e Neon Technology, Inc. -050f KC Technology, Inc. - 0001 Hub - 0003 KC82C160S Hub - 0180 KC-180 IrDA Dongle - 0190 KC2190 USB Host-to-Host cable -0510 Sejin Electron, Inc. - 0001 Keyboard - 1000 Keyboard with PS/2 Mouse Port - e001 Mouse -0511 N'Able (DataBook) Technologies, Inc. -0512 Hualon Microelectronics Corp. -0513 digital-X, Inc. -0514 FCI Electronics -0515 ACTC -0516 Longwell Electronics -0517 Butterfly Communications -0518 EzKEY Corp. - 0001 USB to PS2 Adaptor v1.09 - 0002 EZ-9900C Keyboard -0519 Star Micronics Co., Ltd - 0003 TSP100ECO/TSP100II - c002 Xlive Bluetooth XBM-100S MP3 Player -051a WYSE Technology - a005 Smart Display Version 9973 -051b Silicon Graphics -051c Shuttle, Inc. - 0005 VFD Module - c001 eHome Infrared Receiver - c002 eHome Infrared Receiver -051d American Power Conversion - 0001 UPS - 0002 Uninterruptible Power Supply - 0003 UPS -051e Scientific Atlanta, Inc. -051f IO Systems (Elite Electronics), Inc. -0520 Taiwan Semiconductor Manufacturing Co. -0521 Airborn Connectors -0522 Advanced Connectek, Inc. -0523 ATEN GmbH -0524 Sola Electronics -0525 Netchip Technology, Inc. - 100d RFMD Bluetooth Device - 1080 NET1080 USB-USB Bridge - 1265 File-backed Storage Gadget - a140 USB Clik! 40 - a141 (OME) PocketZip 40 MP3 Player Driver - a220 GVC Bluetooth Wireless Adapter - a4a0 Linux-USB "Gadget Zero" - a4a1 Linux-USB Ethernet Gadget - a4a2 Linux-USB Ethernet/RNDIS Gadget - a4a3 Linux-USB user-mode isochronous source/sink - a4a4 Linux-USB user-mode bulk source/sink - a4a5 Linux-USB File Storage Gadget - a4a6 Linux-USB Serial Gadget - a4a7 Linux-USB Serial Gadget (CDC ACM mode) - a4a8 Linux-USB Printer Gadget - a4a9 Linux-USB OBEX Gadget - a4aa Linux-USB CDC Composite Gadge (Ethernet and ACM) -0526 Temic MHS S.A. -0527 ALTRA -0528 ATI Technologies, Inc. - 7561 TV Wonder - 7562 TV Wonder, Edition (FN5) - 7563 TV Wonder, Edition (FI) - 7564 TV Wonder, Edition (FQ) - 7565 TV Wonder, Edition (NTSC+) - 7566 TV Wonder, Edition (FN5) - 7567 TV Wonder, Edition (FI) - 7568 TV Wonder, Edition (FQ) - 7569 Live! Pro (A) - 756a Live! Pro Audio (O) -0529 Aladdin Knowledge Systems - 0001 HASP v0.06 - 030b eToken R1 v3.1.3.x - 0313 eToken R1 v3.2.3.x - 031b eToken R1 v3.3.3.x - 0323 eToken R1 v3.4.3.x - 0412 eToken R2 v2.2.4.x - 041a eToken R2 v2.2.4.x - 0422 eToken R2 v2.4.4.x - 042a eToken R2 v2.5.4.x - 050c eToken Pro v4.1.5.x - 0514 eToken Pro v4.2.5.4 - 0600 eToken Pro 64k (4.2) -052a Crescent Heart Software -052b Tekom Technologies, Inc. - 0102 Ca508A HP1020 Camera v.1.3.1.6 - 0801 Yakumo MegaImage 37 - 1512 Yakumo MegaImage IV - 1513 Aosta CX100 Webcam - 1514 Aosta CX100 Webcam Storage - 1905 Yakumo MegaImage 47 - 1911 Yakumo MegaImage 47 SL - 2202 WDM Still Image Capture - 2203 Sound Vision Stream Driver - 3a06 DigiLife DDV-5120A - d001 P35U Camera Capture -052c Canon Information Systems, Inc. -052d Avid Electronics Corp. -052e Standard Microsystems Corp. -052f Unicore Software, Inc. -0530 American Microsystems, Inc. -0531 Wacom Technology Corp. -0532 Systech Corp. -0533 Alcatel Mobile Phones -0534 Motorola, Inc. -0535 LIH TZU Electric Co., Ltd -0536 Hand Held Products (Welch Allyn, Inc.) - 01a0 PDT -0537 Inventec Corp. -0538 Caldera International, Inc. (SCO) -0539 Shyh Shiun Terminals Co., Ltd -053a PrehKeyTec GmbH - 0b00 Hub -053b Global Village Communication -053c Institut of Microelectronic & Mechatronic Systems -053d Silicon Architect -053e Mobility Electronics -053f Synopsys, Inc. -0540 UniAccess AB - 0101 Panache Surf ISDN TA -0541 Sirf Technology, Inc. -0543 ViewSonic Corp. - 00fe G773 Monitor Hub - 00ff P815 Monitor Hub - 0bf2 airpanel V150 Wireless Smart Display - 0bf3 airpanel V110 Wireless Smart Display - 0ed9 Color Pocket PC V35 - 0f01 airsync Wi-Fi Wireless Adapter - 1527 Color Pocket PC V36 - 1529 Color Pocket PC V37 - 152b Color Pocket PC V38 - 152e Pocket PC - 1921 Communicator Pocket PC - 1922 Smartphone - 1923 Pocket PC V30 - 1a11 Wireless 802.11g Adapter - 1e60 TA310 - ATSC/NTSC/PAL Driver(PCM4) - 4153 ViewSonic G773 Control (?) -0544 Cristie Electronics, Ltd -0545 Xirlink, Inc. - 7333 Trution Web Camera - 8002 IBM NetCamera - 8009 Veo PC Camera - 800c Veo Stingray - 800d Veo PC Camera - 8080 IBM C-It Webcam - 808a Veo PC Camera - 808b Veo Stingray - 808d Veo PC Camera - 810a Veo Advanced Connect Webcam - 810b Veo PC Camera - 810c Veo PC Camera - 8135 Veo Mobile/Advanced Web Camera - 813a Veo PC Camera - 813b Veo PC Camera - 813c Veo Mobile/Advanced Web Camera - 8333 Veo Stingray/Connect Web Camera - 888c eVision 123 digital camera - 888d eVision 123 digital camera -0546 Polaroid Corp. - 0daf PDC 2300Z - 1bed PDC 1320 Camera - 3097 PDC 310 - 3155 PDC 3070 Camera - 3187 Digital Camera - 3191 Ion 80 Camera - 3273 PDC 2030 Camera - 3304 a500 Digital Camera - dccf Sound Vision Stream Driver -0547 Anchor Chips, Inc. - 0001 ICSI Bluetooth Device - 1002 Python2 WDM Encoder - 2131 AN2131 EZUSB Microcontroller - 2235 AN2235 EZUSB-FX Microcontroller - 2710 EZ-Link Loader (EZLNKLDR.SYS) - 2720 AN2720 USB-USB Bridge - 2727 Xircom PGUNET USB-USB Bridge - 2750 EZ-Link (EZLNKUSB.SYS) - 2810 Cypress ATAPI Bridge - 7777 Bluetooth Device - 9999 AN2131 uninitialized (?) -0548 Tyan Computer Corp. - 1005 EZ Cart II GameBoy Flash Programmer -0549 Pixera Corp. -054a Fujitsu Microelectronics, Inc. -054b New Media Corp. -054c Sony Corp. - 0001 HUB - 0002 Standard HUB - 0010 DSC-S30/S70/S75/F505V/F505/FD92/W1 Cybershot/Mavica Digital Camera - 0014 Nogatech USBVision (SY) - 0022 Storage Adapter V2 (TPP) - 0023 CD Writer - 0024 Mavica CD-1000 Camera - 0025 NW-MS7 Walkman MemoryStick Reader - 002b Portable USB Harddrive V2 - 002c USB Floppy Disk Drive - 002d MSAC-US1 MemoryStick Reader - 002e Sony HandyCam MemoryStick Reader - 0030 Storage Adapter V2 (TPP) - 0032 MemoryStick MSC-U01 Reader - 0035 Network Walkman (E) - 0036 Net MD - 0037 MG Memory Stick Reader/Writer - 0038 Clie PEG-S300/D PalmOS PDA - 0039 Network Walkman (MS) - 003c VAIO-MX LCD Control - 0045 Digital Imaging Video - 0046 Network Walkman - 004a Memory Stick Hi-Fi System - 004b Memory Stick Reader/Writer - 004e DSC-xxx (ptp) - 0056 MG Memory Stick Reader/Writer - 0058 Clie PEG-N7x0C PalmOS PDA Mass Storage - 0066 Clie PEG-N7x0C/PEG-T425 PalmOS PDA Serial - 0067 CMR-PC3 Webcam - 0069 Memorystick MSC-U03 Reader - 006c FeliCa S310 [PaSoRi] - 006d Clie PEG-T425 PDA Mass Storage - 006f Network Walkman (EV) - 0073 Storage CRX1750U - 0075 Net MD - 0076 Storage Adapter ACR-U20 - 007c Net MD - 007f IC Recorder (MS) - 0080 Net MD - 0081 Net MD - 0084 Net MD - 0085 Net MD - 0086 Net MD - 008b Micro Vault 64M Mass Storage - 0095 Sony Clie s360 - 0099 Clie NR70 PDA Mass Storage - 009a Clie NR70 PDA Serial - 00ab Visual Communication Camera (PCGA-UVC10) - 00af DPP-EX Series Digital Photo Printer - 00bf IC Recorder (S) - 00c0 Handycam DCR-30 - 00c6 Net MD - 00c7 Net MD - 00c8 MZ-N710 Minidisc Walkman - 00c9 Net MD - 00ca MZ-DN430 Minidisc Walkman - 00cb MSAC-US20 Memory Stick Reader - 00da Sony Clie nx60 - 00e8 Network Walkman (MS) - 00e9 Handheld - 00eb Net MD - 0101 Net MD - 0103 IC Recorder (ST) - 0105 Micro Vault Hub - 0107 VCC-U01 Visual Communication Camera - 0110 Digital Imaging Video - 0113 Net MD - 0116 IC Recorder (P) - 0144 Clie PEG-TH55 PDA - 0147 Visual Communication Camera (PCGA-UVC11) - 014c Aiwa AM-NX9 Net MD Music Recorder MDLP - 014d Memory Stick Reader/Writer - 0154 Eyetoy Audio Device - 015f IC Recorder (BM) - 0169 Clie PEG-TJ35 PDA Serial - 016a Clie PEG-TJ35 PDA Mass Storage - 016b Mobile HDD - 016d IC Recorder (SX) - 016e DPP-EX50 Digital Photo Printer - 0171 Fingerprint Sensor 3500 - 017e Net MD - 017f Hi-MD WALKMAN - 0180 Net MD - 0181 Hi-MD WALKMAN - 0182 Net MD - 0183 Hi-MD WALKMAN - 0184 Net MD - 0185 Hi-MD WALKMAN - 0186 Net MD - 0187 Hi-MD MZ-NH600 WALKMAN - 0188 Net MD - 018a Net MD - 018b Hi-MD SOUND GATE - 019e Micro Vault 1.0G Mass Storage - 01ad ATRAC HDD PA - 01bb FeliCa S320 [PaSoRi] - 01bd MRW62E Multi-Card Reader/Writer - 01c3 NW-E55 Network Walkman - 01c6 MEMORY P-AUDIO - 01c7 Printing Support - 01c8 PSP Type A - 01c9 PSP Type B - 01d0 DVD+RW External Drive DRU-700A - 01d5 IC RECORDER - 01de VRD-VC10 [Video Capture] - 01e9 Net MD - 01ea Hi-MD WALKMAN - 01ee IC RECORDER - 01fa Sony IC Recorder (P) - 01fb NW-E405 Network Walkman - 020f Device - 0210 ATRAC HDD PA - 0219 Net MD - 021a Hi-MD WALKMAN - 021b Net MD - 021c Hi-MD WALKMAN - 021d Net MD - 0227 Printing Support - 022c Net MD - 022d Hi-MD AUDIO - 0233 ATRAC HDD PA - 0236 Mobile HDD - 023b DVD+RW External Drive DRU-800UL - 023c Net MD - 023d Hi-MD WALKMAN - 0243 MicroVault Flash Drive - 024b Vaio VGX Mouse - 0257 IFU-WLM2 USB Wireless LAN Module (Wireless Mode) - 0258 IFU-WLM2 USB Wireless LAN Module (Memory Mode) - 0259 IC RECORDER - 0267 Tachikoma Device - 0268 Batoh Device / PlayStation 3 Controller - 0269 HDD WALKMAN - 026a HDD WALKMAN - 0271 IC Recorder (P) - 027c NETWORK WALKMAN - 027e SONY Communicator - 027f IC RECORDER - 0286 Net MD - 0287 Hi-MD WALKMAN - 0290 VGP-UVC100 Visual Communication Camera - 029b PRS-500 eBook reader - 02a5 MicroVault Flash Drive - 02af Handycam DCR-DVD306E - 02c4 Device - 02d1 DVD RW - 02d2 PSP Slim - 02e1 FeliCa S330 [PaSoRi] - 02ea PlayStation 3 Memory Card Adaptor - 02f9 DSC-H9 - 0317 WALKMAN - 031a Walkman NWD-B103F - 031e PRS-300/PRS-505 eBook reader - 033e DSC-W120 - 0346 Handycam DCR-SR55E - 0348 HandyCam HDR-TG3E - 0382 Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1) - 03bc Webbie HD - MHS-CM1 - 03d3 DR-BT100CX - 03d5 PlayStation Move motion controller - 03fc WALKMAN [NWZ-E345] - 03fd Walkman NWZ-E443 - 0440 DSC-H55 - 0485 MHS-PM5 HD camcorder - 04cb WALKMAN NWZ-E354 - 1000 Wireless Buzz! Receiver -054d Try Corp. -054e Proside Corp. -054f WYSE Technology Taiwan -0550 Fuji Xerox Co., Ltd - 0002 InkJet Color Printer - 0004 InkJet Color Printer - 0005 InkJet Color Printer -0551 CompuTrend Systems, Inc. -0552 Philips Monitors -0553 STMicroelectronics Imaging Division (VLSI Vision) - 0001 TerraCAM - 0002 CPiA Webcam - 0100 STV0672 Camera - 0140 Video Camera - 0150 CDE CAM 100 - 0151 Digital Blue QX5 Microscope - 0200 Dual-mode Camera0 - 0201 Dual-mode Camera1 - 0202 Aiptek PenCam 1 - 0674 Multi-mode Camera - 0679 NMS Video Camera (Webcam) - 1002 Che-ez! Splash -0554 Dictaphone Corp. -0555 ANAM S&T Co., Ltd -0556 Asahi Kasei Microsystems Co., Ltd - 0001 AK5370 I/F A/D Converter -0557 ATEN International Co., Ltd - 2001 UC-1284 Printer Port - 2002 10Mbps Ethernet [klsi] - 2004 UC-100KM PS/2 Mouse and Keyboard adapter - 2006 UC-1284B Printer Port - 2007 UC-110T 100Mbps Ethernet [pegasus] - 2008 UC-232A Serial Port [pl2303] - 2009 UC-210T Ethernet - 2011 UC-2324 4xSerial Ports [mos7840] - 2202 CS124U Miniview II KVM Switch - 2213 CS682 2-Port USB 2.0 DVI KVM Switch - 2600 IDE Bridge - 2701 CE700A KVM Extender - 4000 DSB-650 10Mbps Ethernet [klsi] - 7000 Hub - 7820 UC-2322 2xSerial Ports [mos7820] -0558 Truevision, Inc. - 1009 GW Instek GDS-1000 Oscilloscope - 100a GW Instek GDS-1000A Oscilloscope - 2009 GW Instek GDS-2000 Oscilloscope -0559 Cadence Design Systems, Inc. -055a Kenwood USA -055b KnowledgeTek, Inc. -055c Proton Electronic Ind. -055d Samsung Electro-Mechanics Co. - 0001 Keyboard - 0bb1 Bluetooth Device - 1030 Optical Wheel Mouse (OMS3CB/OMGB30) - 1031 Optical Wheel Mouse (OMA3CB/OMGI30) - 1040 Mouse HID Device - 1050 E-Mail Optical Wheel Mouse (OMS3CE) - 1080 Optical Wheel Mouse (OMS3CH) - 2020 Floppy Disk Drive - 6780 Keyboard V1 - 6781 Keyboard Mouse - 8001 E.M. Hub - 9000 AnyCam [pwc] - 9001 MPC-C30 AnyCam Premium for Notebooks [pwc] - a000 SWL-2100U - a010 WLAN Adapter(SWL-2300) - a011 Boot Device - a012 WLAN Adapter(SWL-2300) - a013 WLAN Adapter(SWL-2350) - a230 Boot Device - b000 11Mbps WLAN Mini Adapter - b230 Netopia 802.11b WLAN Adapter - b231 LG Wireless LAN 11b Adapter -055e CTX Opto-Electronics Corp. -055f Mustek Systems, Inc. - 0001 ScanExpress 1200 CU - 0002 ScanExpress 600 CU - 0003 ScanExpress 1200 USB - 0006 ScanExpress 1200 UB - 0007 ScanExpress 1200 USB Plus - 0008 ScanExpress 1200 CU Plus - 0010 BearPaw 1200F - 0210 ScanExpress A3 USB - 0218 BearPaw 2400 TA - 0219 BearPaw 2400 TA Plus - 021a BearPaw 2448 TA Plus - 021b BearPaw 1200 CU Plus - 021c BearPaw 1200 CU Plus - 021d BearPaw 2400 CU Plus - 021e BearPaw 1200 TA/CS - 021f SNAPSCAN e22 - 0400 BearPaw 2400 TA Pro - 0401 P 3600 A3 Pro - 0408 BearPaw 2448 CU Pro - 0409 BearPaw 2448 TA Pro - 0873 ScanExpress 600 USB - 1000 BearPaw 4800 TA Pro - a350 gSmart 350 Camera - a800 MDC 800 Camera - b500 MDC 3000 Camera - c005 PC CAM 300A - c200 gSmart 300 - c211 Kowa Bs888e Microcamera - c220 gSmart mini - c230 Digicam 330K - c232 MDC3500 Camera - c360 DV 4000 Camera - c420 gSmart mini 2 Camera - c430 gSmart LCD 2 Camera - c440 DV 3000 Camera - c520 gSmart mini 3 Camera - c530 gSmart LCD 2 Camera - c540 gSmart D30 Camera - c630 MDC 4000 Camera - c631 MDC 4000 Camera - c650 MDC 5500Z Camera - d001 WCam 300 - d003 WCam 300A - d004 WCam 300AN -0560 Interface Corp. -0561 Oasis Design, Inc. -0562 Telex Communications, Inc. - 0001 Enhanced Microphone - 0002 Telex Microphone -0563 Immersion Corp. -0564 Kodak Digital Product Center, Japan Ltd. (formerly Chinon Industries Inc.) -0565 Peracom Networks, Inc. - 0001 Serial Port [etek] - 0002 Enet Ethernet [klsi] - 0003 @Home Networks Ethernet [klsi] - 0005 Enet2 Ethernet [klsi] - 0041 Peracom Remote NDIS Ethernet Adapter -0566 Monterey International Corp. - 0110 ViewMate Desktop Mouse CC2201 - 1001 ViewMate Desktop Mouse CC2201 - 1002 ViewMate Desktop Mouse CC2201 - 1003 ViewMate Desktop Mouse CC2201 - 1004 ViewMate Desktop Mouse CC2201 - 1005 ViewMate Desktop Mouse CC2201 - 1006 ViewMate Desktop Mouse CC2201 - 1007 ViewMate Desktop Mouse CC2201 - 2800 MIC K/B - 2801 MIC K/B Mouse - 2802 Kbd Hub - 3004 Genius KB-29E -0567 Xyratex International, Ltd -0568 Quartz Ingenierie -0569 SegaSoft -056a Wacom Co., Ltd - 0000 PenPartner - 0001 PenPartner 4x5 - 0002 PenPartner 6x8 - 0003 Cintiq Partner - 0010 Graphire - 0011 Graphire 2 4x5 - 0012 Graphire 2 5x7 - 0013 Graphire 3 4x5 - 0014 Graphire 3 6x8 - 0015 Graphire 4 4x5 - 0016 Graphire 4 6x8 - 0017 Bamboo Fun 4x5 - 0018 Bamboo Fun 6x8 - 0019 Bamboo One Medium - 0020 Intuos 4x5 - 0021 Intuos 6x8 - 0022 Intuos 9x12 - 0023 Intuos 12x12 - 0024 Intuos 12x18 - 0030 PL400 - 0031 PL500 - 0032 PL600 - 0033 PL600SX - 0034 PL550 - 0035 PL800 - 0037 PL700 - 0038 PL510 - 0039 DTU-710 - 003f Cintiq 21UX - 0041 Intuos2 4x5 - 0042 Intuos2 6x8 - 0043 Intuos2 9x12 - 0044 Intuos2 12x12 - 0045 Intuos2 12x18 - 0047 Intuos2 6x8 - 0060 Volito - 0061 PenStation2 - 0062 Volito2 4x5 - 0063 Volito2 2x3 - 0064 PenPartner2 - 0065 Bamboo - 0069 Bamboo One - 0081 Graphire Wireless 6x8 - 0090 TPC90 - 0093 TPC93 - 009a TPC9A - 00b0 Intuos3 4x5 - 00b1 Intuos3 6x18 - 00b2 Intuos3 9x12 - 00b3 Intuos3 12x12 - 00b4 Intuos3 12x19 - 00b5 Intuos3 6x11 (PTZ-631W) - 00b7 Intuos3 4x6 - 00b8 Intuos4 4x6 - 00b9 Intuos4 6x9 - 00ba Intuos4 8x13 - 00bb Intuos4 12x19 - 00c0 DTF-521 - 00c4 DTF-720 - 00c5 Cintiq 20WSX - 00c6 Cintiq 12WX - 00c7 DTU-1931 - 00d1 Bamboo Pen & Touch (CTH-460-DE) - 00d3 Bamboo Fun (CTH-661) - 00db Bamboo Fun (CTH-661SE-NL) - 0400 PenPartner 4x5 - 4850 PenPartner 6x8 -056b Decicon, Inc. -056c eTEK Labs - 0006 KwikLink Host-Host Connector - 8007 Kwik232 Serial Port - 8100 KwikLink Host-Host Connector - 8101 KwikLink USB-USB Bridge -056d EIZO Corp. - 0000 Hub - 0001 Monitor - 0002 HID Monitor Controls - 0003 Device Bay Controller -056e Elecom Co., Ltd - 0002 29UO Mouse - 200c LD-USB/TX - 4002 Laneed 100Mbps Ethernet LD-USB/TX [pegasus] - 4005 LD-USBL/TX - 400b LD-USB/TX - 4010 LD-USB20 - 5003 UC-SGT - 5004 UC-SGT - abc1 LD-USB/TX -056f Korea Data Systems Co., Ltd - cd00 CDM-751 CD organizer -0570 Epson America -0571 Interex, Inc. - 0002 echoFX InterView Lite -0572 Conexant Systems (Rockwell), Inc. - 0001 Ezcam II Webcam - 0002 Ezcam II Webcam - 0040 Wondereye CP-115 Webcam - 0041 Webcam Notebook - 0042 Webcam Notebook - 1232 V.90 modem - 1234 Typhoon Redfun Modem V90 56k - 1252 HCF V90 Data Fax Voice Modem - 1253 Zoom V.92 Faxmodem - 1300 SoftK56 Data Fax Voice CARP - 1301 Modem Enumerator - 2000 SoftGate 802.11 Adapter - 2002 SoftGate 802.11 Adapter - 8390 WinFast PalmTop/Novo TV Video - 8392 WinFast PalmTop/Novo TV Video - cafe AccessRunner ADSL Modem - cb00 ADSL Modem - cb01 ADSL Modem - cb06 StarModem Network Interface -0573 Zoran Co. Personal Media Division (Nogatech) - 0003 USBGear USBG-V1 - 0400 D-Link V100 - 0600 Dazzle USBVision (1006) - 1300 leadtek USBVision (1006) - 2000 X10 va10a Wireless Camera - 2001 Dazzle EmMe (2001) - 2101 Zoran Co. PMD (Nogatech) AV-grabber Manhattan - 2d00 Osprey 50 - 2d01 Hauppauge USB-Live Model 600 - 3000 Dazzle MicroCam (NTSC) - 3001 Dazzle MicroCam (PAL) - 4000 Nogatech TV! (NTSC) - 4001 Nogatech TV! (PAL) - 4002 Nogatech TV! (PAL-I-) - 4003 Nogatech TV! (MF-) - 4008 Nogatech TV! (NTSC) (T) - 4009 Nogatech TV! (PAL) (T) - 4010 Nogatech TV! (NTSC) (A) - 4100 USB-TV FM (NTSC) - 4110 PNY USB-TV (NTSC) FM - 4400 Nogatech TV! Pro (NTSC) - 4401 Nogatech TV! Pro (PAL) - 4450 PixelView PlayTv-USB PRO (PAL) FM - 4451 Nogatech TV! Pro (PAL+) - 4452 Nogatech TV! Pro (PAL-I+) - 4500 Nogatech TV! Pro (NTSC) - 4501 Nogatech TV! Pro (PAL) - 4550 ZTV ZT-721 2.4GHz A/V Receiver - 4551 Dazzle TV! Pro Audio (P+) - 4d00 Hauppauge WinTV-USB USA - 4d01 Hauppauge WinTV-USB - 4d02 Hauppauge WinTV-USB UK - 4d03 Hauppauge WinTV-USB France - 4d04 Hauppauge WinTV (PAL D/K) - 4d10 Hauppauge WinTV-USB with FM USA radio - 4d11 Hauppauge WinTV-USB (PAL) with FM radio - 4d12 Hauppauge WinTV-USB UK with FM Radio - 4d14 Hauppauge WinTV (PAL D/K FM) - 4d20 Hauppauge WinTV-USB II (PAL) with FM radio - 4d21 Hauppauge WinTV-USB II (PAL) - 4d22 Hauppauge WinTV-USB II (PAL) Model 566 - 4d23 Hauppauge WinTV-USB France 4D23 - 4d24 Hauppauge WinTV Pro (PAL D/K) - 4d25 Hauppauge WinTV-USB Model 40209 rev B234 - 4d26 Hauppauge WinTV-USB Model 40209 rev B243 - 4d27 Hauppauge WinTV-USB Model 40204 Rev B281 - 4d28 Hauppauge WinTV-USB Model 40204 rev B283 - 4d29 Hauppauge WinTV-USB Model 40205 rev B298 - 4d2a Hauppague WinTV-USB Model 602 Rev B285 - 4d2b Hauppague WinTV-USB Model 602 Rev B282 - 4d2c Hauppauge WinTV Pro (PAL/SECAM) - 4d30 Hauppauge WinTV-USB FM Model 40211 Rev B123 - 4d31 Hauppauge WinTV-USB III (PAL) with FM radio Model 568 - 4d32 Hauppauge WinTV-USB III (PAL) FM Model 573 - 4d34 Hauppauge WinTV Pro (PAL D/K FM) - 4d35 Hauppauge WinTV-USB III (PAL) FM Model 597 - 4d36 Hauppauge WinTV Pro (PAL B/G FM) - 4d37 Hauppauge WinTV-USB Model 40219 rev E189 - 4d38 Hauppauge WinTV Pro (NTSC FM) -0574 City University of Hong Kong -0575 Philips Creative Display Solutions -0576 BAFO/Quality Computer Accessories -0577 ELSA -0578 Intrinsix Corp. -0579 GVC Corp. -057a Samsung Electronics America -057b Y-E Data, Inc. - 0000 FlashBuster-U Floppy - 0001 Tri-Media Reader Floppy - 0006 Tri-Media Reader Card Reader - 0010 Memory Stick Reader Writer - 0020 HEXA Media Drive 6-in-1 Card Reader Writer - 0030 Memory Card Viewer (TV) -057c AVM GmbH - 0b00 ISDN-Controller B1 Family - 0c00 ISDN-Controller FRITZ!Card - 1000 ISDN-Controller FRITZ!Card v2.0 - 1900 ISDN-Controller FRITZ!Card v2.1 - 2000 ISDN-Connector FRITZ!X - 2200 BlueFRITZ! - 2300 Teledat X130 DSL - 2800 ISDN-Connector TA - 3200 Teledat X130 DSL - 3500 FRITZ!Card DSL SL - 3701 FRITZ!Box SL - 3702 FRITZ!Box - 3800 BlueFRITZ! Bluetooth Stick - 3a00 FRITZ!Box Fon - 3c00 FRITZ!Box WLAN - 3d00 Fritz!Box - 3e01 FRITZ!Box (Annex A) - 4001 FRITZ!Box Fon (Annex A) - 4101 FRITZ!Box WLAN (Annex A) - 4201 FRITZ!Box Fon WLAN (Annex A) - 4601 Eumex 5520PC (WinXP/2000) - 4602 Eumex 400 (WinXP/2000) - 4701 AVM FRITZ!Box Fon ata - 5401 Eumex 300 IP - 5601 AVM Fritz!WLAN [Texas Instruments TNETW1450] - 6201 AVM Fritz!WLAN v1.1 [Texas Instruments TNETW1450] - 62ff AVM Fritz!WLAN USB (in CD-ROM-mode) - 8401 AVM Fritz!WLAN N [Atheros AR9001U] - 8402 AVM Fritz!WLAN N 2.4 [Atheros AR9001U] - 84ff AVM Fritz!WLAN USB N (in CD-ROM-mode) -057d Shark Multimedia, Inc. -057e Nintendo Co., Ltd - 0306 Wii Remote Controller RVL-003 -057f QuickShot, Ltd - 6238 USB StrikePad -0580 Denron, Inc. -0581 Racal Data Group -0582 Roland Corp. - 0000 UA-100 - 0002 UM-4/MPU-64 MIDI Interface - 0003 SoundCanvas SC-8850 - 0004 U-8 - 0005 Edirol UM-2 MIDI Adapter - 0007 SoundCanvas SC-8820 - 0008 PC-300 - 0009 Edirol UM-1SX MIDI Adapter - 000b SK-500 - 000c SC-D70 - 0010 EDIROL UA-5 - 0011 Edirol UA-5 Sound Capture - 0012 XV-5050 - 0013 XV-5050 - 0014 EDIROL UM-880 MIDI I/F (native) - 0015 EDIROL UM-880 MIDI I/F (generic) - 0016 EDIROL SD-90 - 0017 EDIROL SD-90 - 0018 UA-1A - 001b MMP-2 - 001c MMP-2 - 001d V-SYNTH - 001e V-SYNTH - 0023 EDIROL UM-550 - 0024 EDIROL UM-550 - 0025 EDIROL UA-20 - 0026 EDIROL UA-20 - 0027 EDIROL SD-20 - 0028 EDIROL SD-20 - 0029 EDIROL SD-80 - 002a EDIROL SD-80 - 002b EDIROL UA-700 - 002c EDIROL UA-700 - 002d XV-2020 Synthesizer - 002e XV-2020 Synthesizer - 002f VariOS - 0030 VariOS - 0033 EDIROL PCR - 0034 EDIROL PCR - 0037 Digital Piano - 0038 Digital Piano - 003b BOSS GS-10 - 003c BOSS GS-10 - 0040 GI-20 - 0041 GI-20 - 0042 RS-70 - 0043 RS-70 - 0044 EDIROL UA-1000 - 0047 EDIROL UR-80 WAVE - 0048 EDIROL UR-80 MIDI - 0049 EDIROL UR-80 WAVE - 004a EDIROL UR-80 MIDI - 004b EDIROL M-100FX - 004c EDIROL PCR-A WAVE - 004d EDIROL PCR-A MIDI - 004e EDIROL PCR-A WAVE - 004f EDIROL PCR-A MIDI - 0050 EDIROL UA-3FX - 0052 EDIROL UM-1SX - 0054 Digital Piano - 0060 EXR Series - 0064 EDIROL PCR-1 WAVE - 0065 EDIROL PCR-1 MIDI - 0066 EDIROL PCR-1 WAVE - 0067 EDIROL PCR-1 MIDI - 006a SP-606 - 006b SP-606 - 006d FANTOM-X - 006e FANTOM-X - 0073 EDIROL UA-25 - 0074 EDIROL UA-25 - 0075 BOSS DR-880 - 0076 BOSS DR-880 - 007a RD - 007b RD - 007d EDIROL UA-101 - 0080 G-70 - 0081 G-70 - 008b EDIROL PC-50 - 008c EDIROL PC-50 - 008d EDIROL UA-101 USB1 - 0092 EDIROL PC-80 WAVE - 0093 EDIROL PC-80 MIDI - 0096 EDIROL UA-1EX - 009a EDIROL UM-3EX - 009d EDIROL UM-1 - 00a2 Digital Piano - 00a3 EDIROL UA-4FX - 00a6 Juno-G - 00ad SH-201 - 00c4 EDIROL M-16DX - 00db BOSS GT-10 Guitar Effects Processor - 00de Fantom-G7 - 00e6 EDIROL UA-25EX (Advanced mode) - 00e7 EDIROL UA-25EX - 010f A-PRO - 0110 A-PRO -0583 Padix Co., Ltd (Rockfire) - 0001 4 Axis 12 button +POV - 0002 4 Axis 12 button +POV - 2030 RM-203 USB Nest [mode 1] - 2031 RM-203 USB Nest [mode 2] - 2032 RM-203 USB Nest [mode 3] - 2033 RM-203 USB Nest [mode 4] - 2050 PX-205 PSX Bridge - 205f PSX/USB converter - 206f USB, 2-axis 8-button gamepad - 3050 QF-305u Gamepad - 3379 Rockfire X-Force - 337f Rockfire USB RacingStar Vibra - 509f USB,4-Axis,12-Button with POV - 5259 Rockfire USB SkyShuttle Vibra - 525f USB Vibration Pad - 5308 USB Wireless VibrationPad - 5359 Rockfire USB SkyShuttle Pro - 535f USB,real VibrationPad - 5659 Rockfire USB SkyShuttle Vibra - 565f USB VibrationPad - 6009 Revenger - 600f USB,GameBoard II - 6258 USB, 4-axis, 6-button joystick w/view finder - 6889 Windstorm Pro - 688f QF-688uv Windstorm Pro Joystick - 7070 QF-707u Bazooka Joystick - a000 MaxFire G-08XU Gamepad - a015 4-Axis,16-Button with POV - a019 USB, Vibration ,4-axis, 8-button joystick w/view finder - a020 USB,4-Axis,10-Button with POV - a021 USB,4-Axis,12-Button with POV - a022 USB,4-Axis,14-Button with POV - a023 USB,4-Axis,16-Button with POV - a024 4axis,12button vibrition audio gamepad - a025 4axis,12button vibrition audio gamepad - a130 USB Wireless 2.4GHz Gamepad - a131 USB Wireless 2.4GHz Joystick - a132 USB Wireless 2.4GHz Wheelpad - a133 USB Wireless 2.4GHz Wheel&Gamepad - a202 ForceFeedbackWheel - a209 MetalStrike FF - b000 USB,4-Axis,12-Button with POV - b001 USB,4-Axis,12-Button with POV - b002 Vibration,12-Button USB Wheel - b005 USB,12-Button Wheel - b008 USB Wireless 2.4GHz Wheel - b009 USB,12-Button Wheel - b00a PSX/USB converter - b00b PSX/USB converter - b00c PSX/USB converter - b00d PSX/USB converter - b00e 4-Axis,12-Button with POV - b00f USB,5-Axis,10-Button with POV - b010 MetalStrike Pro - b012 Wireless MetalStrike - b013 USB,Wiress 2.4GHZ Joystick - b016 USB,5-Axis,10-Button with POV - b018 TW6 Wheel - ff60 USB Wireless VibrationPad -0584 RATOC System, Inc. - 0008 Fujifilm MemoryCard ReaderWriter - 0220 U2SCX SCSI Converter - b000 REX-USB60 -0585 FlashPoint Technology, Inc. - 0001 Digital Camera - 0002 Digital Camera - 0003 Digital Camera - 0004 Digital Camera - 0005 Digital Camera - 0006 Digital Camera - 0007 Digital Camera - 0008 Digital Camera - 0009 Digital Camera - 000a Digital Camera - 000b Digital Camera - 000c Digital Camera - 000d Digital Camera - 000e Digital Camera - 000f Digital Camera -0586 ZyXEL Communications Corp. - 0025 802.11b/g/n USB Wireless Network Adapter - 0102 omni.net II ISDN TA - 1000 Omni NET Modem / ISDN TA - 1500 Omni 56K Plus - 2011 Scorpion-980N keyboard - 3304 LAN Modem - 3309 ADSL Modem Prestige 600 series - 330a ADSL Modem Interface - 330e USB Broadband ADSL Modem Rev 1.10 - 3400 ZyAIR B-220 IEEE 802.11b Adapter - 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 - 3417 NWD271N 802.11n Wireless Adapter [Atheros AR9001U-(2)NG] - 3418 NWD211AN 802.11abgn Wireless Adapter [Ralink RT2870] - 341a NWD-270N Wireless N-lite USB Adapter -0587 America Kotobuki Electronics Industries, Inc. -0588 Sapien Design -0589 Victron -058a Nohau Corp. -058b Infineon Technologies -058c In Focus Systems - 0007 Flash - 0008 LP130 - 000a LP530 - 0010 Projector - 0011 Projector - 0012 Projector - 0013 Projector - 0014 Projector - 0015 Projector - 0016 Projector - 0017 Projector - 0018 Projector - 0019 Projector - 001a Projector - 001b Projector - 001c Projector - 001d Projector - 001e Projector - 001f Projector -058d Micrel Semiconductor -058e Tripath Technology, Inc. -058f Alcor Micro Corp. - 1234 Flash Drive - 2412 SCard R/W CSR-145 - 2802 Monterey Keyboard - 5492 Hub - 6232 Hi-Speed 16-in-1 Flash Card Reader/Writer - 6254 USB Hub - 6331 SD/MMC/MS Card Reader - 6332 Multi-Function Card Reader - 6335 SD/MMC Card Reader - 6360 Multimedia Card Reader - 6361 Multimedia Card Reader - 6362 Flash Card Reader/Writer - 6366 Multi Flash Reader - 6377 Multimedia Card Reader - 6386 Memory Card - 6387 Transcend JetFlash Flash Drive - 6390 USB 2.0-IDE bridge - 9213 MacAlly Kbd Hub - 9215 AU9814 Hub - 9254 Hub - 9310 Mass Storage (UID4/5A & UID7A) - 9320 Micro Storage Driver for Win98 - 9321 Micro Storage Driver for Win98 - 9330 SD Reader - 9331 Micro Storage Driver for Win98 - 9340 Delkin eFilm Reader-32 - 9350 Delkin eFilm Reader-32 - 9360 8-in-1 Media Card Reader - 9361 Multimedia Card Reader - 9368 Multimedia Card Reader - 9380 Flash Drive - 9382 Acer/Sweex Flash drive - 9384 qdi U2Disk T209M - 9410 Keyboard - 9472 Keyboard Hub - 9510 ChunghwaTL USB02 Smartcard Reader - 9520 EMV Certified Smart Card Reader - 9720 USB-Serial Adapter -0590 Omron Corp. - 0004 Cable Modem - 000b MR56SVS - 0028 HJ-720IT Pedometer / Blood Pressure Monitor HEM-7080IT-E -0591 Questra Consulting -0592 Powerware Corp. - 0002 UPS (X-Slot) -0593 Incite -0594 Princeton Graphic Systems -0595 Zoran Microelectronics, Ltd - 1001 Digitrex DSC-1300/DSC-2100 (mass storage mode) - 2002 DIGITAL STILL CAMERA 6M 4X - 4343 Digital Camera EX-20 DSC -0596 MicroTouch Systems, Inc. - 0001 Touchscreen - 0002 Touch Screen Controller - 0500 PCT Multitouch HID Controller -0597 Trisignal Communications -0598 Niigata Canotec Co., Inc. -0599 Brilliance Semiconductor, Inc. -059a Spectrum Signal Processing, Inc. -059b Iomega Corp. - 0001 Zip 100 (Type 1) - 000b Zip 100 (Type 2) - 0021 Win98 Disk Controller - 0030 Zip 250 (Ver 1) - 0031 Zip 100 (Type 3) - 0032 Zip 250 (Ver 2) - 0034 Zip 100 Driver - 0037 Zip 750 MB - 0040 SCSI Bridge - 0042 Rev 70 GB - 0050 Zip CD 650 Writer - 0053 CDRW55292EXT CD-RW External Drive - 0057 Mass Storage Device - 005d Mass Storage Device - 005f CDRW64892EXT3-C CD-RW 52x24x52x External Drive - 0060 PCMCIA PocketZip Dock - 0061 Varo PocketZip 40 MP3 Player - 006d HipZip MP3 Player - 007c Ultra Max USB/1394 - 007e Mini 256MB/512MB Flash Drive [IOM2D5] - 00db FotoShow Zip 250 Driver - 0150 Mass Storage Device - 015d Super DVD Writer - 0173 Hi-Speed USB-to-IDE Bridge Controller - 0174 Hi-Speed USB-to-IDE Bridge Controller - 0176 Hi-Speed USB-to-IDE Bridge Controller - 0177 Hi-Speed USB-to-IDE Bridge Controller - 0178 Hi-Speed USB-to-IDE Bridge Controller - 0179 Hi-Speed USB-to-IDE Bridge Controller - 017a HDD - 017b HDD/1394A - 017c HDD/1394B - 0251 Optical - 0252 Optical - 027a LPHD250-U [Portable Hard Drive Silver Series 250 Go] - 0470 Prestige Portable Hard Drive - 047a Select Portable Hard Drive - 0579 eGo Portable Hard Drive - 1052 DVD+RW External Drive -059c A-Trend Technology Co., Ltd -059d Advanced Input Devices -059e Intelligent Instrumentation -059f LaCie, Ltd - 0201 StudioDrive USB2 - 0202 StudioDrive USB2 - 0203 StudioDrive USB2 - 0211 PocketDrive - 0212 PocketDrive - 0213 PocketDrive USB2 - 0323 LaCie d2 Drive USB2 - 0421 Big Disk G465 - 0641 Mobile Hard Drive - 1010 Desktop Hard Drive - 1019 Desktop Hard Drive - 102a Rikiki Hard Drive - a601 HardDrive - a602 CD R/W -05a0 Vetronix Corp. -05a1 USC Corp. -05a2 Fuji Film Microdevices Co., Ltd -05a3 ARC International - 8388 Marvell 88W8388 802.11a/b/g WLAN -05a4 Ortek Technology, Inc. - 2000 WKB-2000 Wireless Keyboard with Touchpad - 9720 Keyboard Mouse - 9722 Keyboard - 9731 MCK-600W/MCK-800USB Keyboard - 9783 Wireless Keypad -05a5 Sampo Technology Corp. -05a6 Cisco Systems, Inc. - 0001 CVA124 Cable Voice Adapter (WDM) - 0002 CVA122 Cable Voice Adapter (WDM) - 0003 CVA124E Cable Voice Adapter (WDM) - 0004 CVA122E Cable Voice Adapter (WDM) -05a7 Bose Corp. -05a8 Spacetec IMC Corp. -05a9 OmniVision Technologies, Inc. - 0511 OV511 Webcam - 0518 OV518 Webcam - 0519 OV519 Microphone - 1550 VEHO Filmscanner - 2640 OV2640 Webcam - 2643 Monitor Webcam - 264b Monitor Webcam - 2800 SuperCAM - 4519 Webcam Classic - 7670 OV7670 Webcam - 8519 OV519 Webcam - a511 OV511+ Webcam - a518 D-Link DSB-C310 Webcam -05aa Utilux South China, Ltd -05ab In-System Design - 0002 Parallel Port - 0030 Storage Adapter V2 (TPP) - 0031 ATA Bridge - 0060 USB 2.0 ATA Bridge - 0061 Storage Adapter V3 (TPP-I) - 0101 Storage Adapter (TPP) - 0130 Compact Flash and Microdrive Reader (TPP) - 0200 USS725 ATA Bridge - 0201 Storage Adapter (TPP) - 0202 ATA Bridge - 0300 Portable Hard Drive (TPP) - 0301 Portable Hard Drive V2 - 0350 Portable Hard Drive (TPP) - 0351 Portable Hard Drive V2 - 081a ATA Bridge - 0cda ATA Bridge for CD-R/RW - 1001 BAYI Printer Class Support - 5700 Storage Adapter V2 (TPP) - 5701 USB Storage Adapter V2 - 5901 Smart Board (TPP) - 5a01 ATI Storage Adapter (TPP) - 5d01 DataBook Adapter (TPP) -05ac Apple, Inc. - 0201 USB Keyboard [Alps or Logitech, M2452] - 0202 Keyboard [ALPS] - 0205 Extended Keyboard [Mitsumi] - 0206 Extended Keyboard [Mitsumi] - 020b Pro Keyboard [Mitsumi, A1048/US layout] - 020c Extended Keyboard [Mitsumi] - 020d Pro Keyboard [Mitsumi, A1048/JIS layout] - 020e Internal Keyboard/Trackpad (ANSI) - 020f Internal Keyboard/Trackpad (ISO) - 0214 Internal Keyboard/Trackpad (ANSI) - 0215 Internal Keyboard/Trackpad (ISO) - 0216 Internal Keyboard/Trackpad (JIS) - 0217 Internal Keyboard/Trackpad (ANSI) - 0218 Internal Keyboard/Trackpad (ISO) - 0219 Internal Keyboard/Trackpad (JIS) - 021a Internal Keyboard/Trackpad (ANSI) - 021b Internal Keyboard/Trackpad (ISO) - 021c Internal Keyboard/Trackpad (JIS) - 021d Aluminum Mini Keyboard (ANSI) - 021e Aluminum Mini Keyboard (ISO) - 021f Aluminum Mini Keyboard (JIS) - 0220 Aluminum Keyboard (ANSI) - 0221 Aluminum Keyboard (ISO) - 0222 Aluminum Keyboard (JIS) - 0223 Internal Keyboard/Trackpad (ANSI) - 0224 Internal Keyboard/Trackpad (ISO) - 0225 Internal Keyboard/Trackpad (JIS) - 0229 Internal Keyboard/Trackpad (MacBook Pro) (ANSI) - 022a Internal Keyboard/Trackpad (MacBook Pro) (ISO) - 022b Internal Keyboard/Trackpad (MacBook Pro) (JIS) - 0230 Internal Keyboard/Trackpad (MacBook Pro 4,1) (ANSI) - 0231 Internal Keyboard/Trackpad (MacBook Pro 4,1) (ISO) - 0232 Internal Keyboard/Trackpad (MacBook Pro 4,1) (JIS) - 0236 Internal Keyboard/Trackpad (ANSI) - 0237 Internal Keyboard/Trackpad (ISO) - 0238 Internal Keyboard/Trackpad (JIS) - 0301 USB Mouse [Mitsumi, M4848] - 0302 Optical Mouse [Fujitsu] - 0304 Optical USB Mouse [Mitsumi] - 0306 Optical USB Mouse [Fujitsu] - 030a Internal Trackpad - 030b Internal Trackpad - 030e Wireless Trackpad [Magic Trackpad] - 1000 Bluetooth HCI MacBookPro (HID mode) - 1001 Keyboard Hub [ALPS] - 1002 Extended Keyboard Hub [Mitsumi] - 1003 Hub in Pro Keyboard [Mitsumi, A1048] - 1006 Hub in Aluminum Keyboard - 1101 Speakers - 1201 3G iPod - 1202 iPod 2G - 1203 iPod 4.Gen Grayscale 40G - 1204 iPod [Photo] - 1205 iPod Mini 1.Gen/2.Gen - 1206 iPod '06' - 1207 iPod '07' - 1208 iPod '08' - 1209 iPod Video - 120a iPod Nano - 1223 iPod Classic/Nano 3.Gen (DFU mode) - 1224 iPod Nano 3.Gen (DFU mode) - 1225 iPod Nano 4.Gen (DFU mode) - 1227 Mobile Device (DFU Mode) - 1231 iPod Nano 5.Gen (DFU mode) - 1240 iPod Nano 2.Gen (DFU mode) - 1242 iPod Nano 3.Gen (WTF mode) - 1243 iPod Nano 4.Gen (WTF mode) - 1245 iPod Classic 3.Gen (WTF mode) - 1246 iPod Nano 5.Gen (WTF mode) - 1255 iPod Nano 4.Gen (DFU mode) - 1260 iPod Nano 2.Gen - 1261 iPod Classic - 1262 iPod Nano 3.Gen - 1263 iPod Nano 4.Gen - 1265 iPod Nano 5.Gen - 1266 iPod Nano 6.Gen - 1281 Apple Mobile Device [Recovery Mode] - 1290 iPhone - 1291 iPod Touch 1.Gen - 1292 iPhone 3G - 1293 iPod Touch 2.Gen - 1294 iPhone 3GS - 1296 iPod Touch 3.Gen (8GB) - 1297 iPhone 4 - 1299 iPod Touch 3.Gen - 129a iPad - 129e iPod Touch 4.Gen - 1300 iPod Shuffle - 1301 iPod Shuffle 2.Gen - 1302 iPod Shuffle 3.Gen - 1303 iPod Shuffle 4.Gen - 1401 Modem - 8202 HCF V.90 Data/Fax Modem - 8203 Bluetooth HCI - 8204 Bluetooth HCI [Bluetooth 2.0 + EDR, built-in] - 8205 Bluetooth HCI - 8206 Bluetooth HCI - 820f Bluetooth HCI - 8215 Bluetooth USB Host Controller - 8216 Bluetooth USB Host Controller - 8217 Bluetooth USB Host Controller - 8218 Bluetooth Host Controller - 8240 IR Receiver [built-in] - 8241 IR Receiver [built-in] - 8242 IR Receiver [built-in] - 8300 Built-in iSight (no firmware loaded) - 8403 Internal Memory Card Reader - 8501 Built-in iSight [Micron] - 8502 Built-in iSight - 8505 Built-in iSight - 8507 Built-in iSight - 912f Hub in 30" Cinema Display - 9221 30" Cinema Display - ffff Bluetooth in DFU mode - Driver -05ad Y.C. Cable U.S.A., Inc. -05ae Synopsys, Inc. -05af Jing-Mold Enterprise Co., Ltd - 0809 Wireless Keyboard and Mouse - 0821 IDE to - 3062 Cordless Keyboard - 9167 KB 9151B - 678 - 9267 KB 9251B - 678 Mouse -05b0 Fountain Technologies, Inc. -05b1 First International Computer, Inc. - 1389 Bluetooth Wireless Adapter -05b4 LG Semicon Co., Ltd - 4857 M-Any DAH-210 - 6001 Digisette DUO-MP3 AR-100 -05b5 Dialogic Corp. -05b6 Proxima Corp. -05b7 Medianix Semiconductor, Inc. -05b8 Agiler, Inc. - 3002 Scroll Mouse -05b9 Philips Research Laboratories -05ba DigitalPersona, Inc. - 0007 Fingerprint Reader - 0008 Fingerprint Reader - 000a Fingerprint Reader -05bb Grey Cell Systems -05bc 3G Green Green Globe Co., Ltd - 0004 Trackball -05bd RAFI GmbH & Co. KG -05be Tyco Electronics (Raychem) -05bf S & S Research -05c0 Keil Software -05c1 Kawasaki Microelectronics, Inc. -05c2 Media Phonics (Suisse) S.A. -05c5 Digi International, Inc. - 0002 AccelePort USB 2 - 0004 AccelePort USB 4 - 0008 AccelePort USB 8 -05c6 Qualcomm, Inc. - 0114 Select RW-200 CDMA Wireless Modem - 1000 Mass Storage Device - 3100 CDMA Wireless Modem/Phone - 3196 CDMA Wireless Modem - 3197 CDMA Wireless Modem/Phone - 6000 Siemens SG75 - 6503 AnyData APE-540H - 6613 Onda H600/N501HS ZTE MF330 - 9000 SIMCom SIM5218 modem - 9001 Gobi Wireless Modem - 9002 Gobi Wireless Modem - 9008 Gobi Wireless Modem (QDL mode) - 9201 Gobi Wireless Modem (QDL mode) - 9202 Gobi Wireless Modem - 9203 Gobi Wireless Modem - 9211 Acer Gobi Wireless Modem (QDL mode) - 9212 Acer Gobi Wireless Modem - 9214 Acer Gobi 2000 Wireless Modem (QDL mode) - 9215 Acer Gobi 2000 Wireless Modem - 9221 Gobi Wireless Modem (QDL mode) - 9222 Gobi Wireless Modem - 9224 Sony Gobi 2000 Wireless Modem (QDL mode) - 9225 Sony Gobi 2000 Wireless Modem - 9231 Gobi Wireless Modem (QDL mode) - 9234 Top Global Gobi 2000 Wireless Modem (QDL mode) - 9235 Top Global Gobi 2000 Wireless Modem - 9244 Samsung Gobi 2000 Wireless Modem (QDL mode) - 9245 Samsung Gobi 2000 Wireless Modem - 9264 Asus Gobi 2000 Wireless Modem (QDL mode) - 9265 Asus Gobi 2000 Wireless Modem - 9274 iRex Technologies Gobi 2000 Wireless Modem (QDL mode) - 9275 iRex Technologies Gobi 2000 Wireless Modem -05c7 Qtronix Corp. - 0113 PC Line Mouse - 1001 Lynx Mouse - 2001 Keyboard - 2011 SCorpius Keyboard - 6001 Ten-Keypad -05c8 Cheng Uei Precision Industry Co., Ltd (Foxlink) - 0103 FO13FF-65 PC-CAM - 0403 Webcam -05c9 Semtech Corp. -05ca Ricoh Co., Ltd - 0101 RDC-5300 Camera - 0325 Caplio GX (ptp) - 032d Caplio GX 8 (ptp) - 032f Caplio R3 (ptp) - 03a1 IS200e - 0403 Printing Support - 0405 Type 101 - 0406 Type 102 - 1803 V5 camera [R5U870] - 1810 Pavilion Webcam [R5U870] - 1812 Pavilion Webcam - 1814 HD Webcam - 1830 Visual Communication Camera VGP-VCC2 [R5U870] - 1832 Visual Communication Camera VGP-VCC3 [R5U870] - 1833 Visual Communication Camera VGP-VCC2 [R5U870] - 1834 Visual Communication Camera VGP-VCC2 [R5U870] - 1835 Visual Communication Camera VGP-VCC5 [R5U870] - 1836 Visual Communication Camera VGP-VCC4 [R5U870] - 1837 Visual Communication Camera VGP-VCC4 [R5U870] - 1839 Visual Communication Camera VGP-VCC6 [R5U870] - 183a Visual Communication Camera VGP-VCC7 [R5U870] - 183b Visual Communication Camera VGP-VCC8 [R5U870] - 183d Sony Vaio Integrated Webcam - 183e Visual Communication Camera VGP-VCC9 [R5U870] - 1841 Fujitsu F01/ Lifebook U810 [R5U870] - 1870 Webcam 1000 - 18b0 Sony Vaio Integrated Webcam - 18b1 Sony Vaio Integrated Webcam - 18b3 Sony Vaio Integrated Webcam - 2201 RDC-7 Camera - 2202 Caplio RR30 - 2203 Caplio 300G - 2204 Caplio G3 - 2205 Caplio RR30 / Medion MD 6126 Camera - 2206 Konica DG-3Z - 2207 Caplio Pro G3 - 2208 Caplio G4 - 2209 Caplio 400G wide - 220a KONICA MINOLTA DG-4Wide - 220b Caplio RX - 220c Caplio GX - 220d Caplio R1/RZ1 - 220e Sea & Sea 5000G - 220f Rollei dr5 / Rollei dr5 (PTP mode) - 2211 Caplio R1S - 2212 Caplio R1v Camera - 2213 Caplio R2 - 2214 Caplio GX 8 - 2215 DSC 725 - 2216 Caplio R3 - 2222 RDC-i500 -05cb PowerVision Technologies, Inc. - 1483 PV8630 interface (scanners, webcams) -05cc ELSA AG - 2100 MicroLink ISDN Office - 2219 MicroLink ISDN - 2265 MicroLink 56k - 2267 MicroLink 56k (V.250) - 2280 MicroLink 56k Fun - 3000 Micolink USB2Ethernet [pegasus] - 3100 AirLancer USB-11 - 3363 MicroLink ADSL Fun -05cd Silicom, Ltd -05ce sci-worx GmbH -05cf Sung Forn Co., Ltd -05d0 GE Medical Systems Lunar -05d1 Brainboxes, Ltd - 0003 Bluetooth Adapter BL-554 -05d2 Wave Systems Corp. -05d3 Tohoku Ricoh Co., Ltd -05d5 Super Gate Technology Co., Ltd -05d6 Philips Semiconductors, CICT -05d7 Thomas & Betts Corp. - 0099 10Mbps Ethernet [klsi] -05d8 Ultima Electronics Corp. - 4001 Artec Ultima 2000 - 4002 Artec Ultima 2000 (GT6801 based)/Lifetec LT9385/ScanMagic 1200 UB Plus Scanner - 4003 Artec E+ 48U - 4004 Artec E+ Pro - 4005 MEM48U - 4006 TRUST EASY WEBSCAN 19200 - 4007 TRUST 240H EASY WEBSCAN GOLD - 4008 Trust Easy Webscan 19200 - 4009 Umax Astraslim - 4013 IT Scan 1200 - 8105 Artec T1 USB TVBOX (cold) - 8106 Artec T1 USB TVBOX (warm) - 8107 Artec T1 USB TVBOX with AN2235 (cold) - 8108 Artec T1 USB TVBOX with AN2235 (warm) - 8109 Artec T1 USB2.0 TVBOX (cold -05d9 Axiohm Transaction Solutions - a225 A225 Printer - a758 A758 Printer - a794 A794 Printer -05da Microtek International, Inc. - 0091 ScanMaker X6u - 0093 ScanMaker V6USL - 0094 Phantom 336CX/C3 - 0099 ScanMaker X6/X6U - 009a Phantom C6 - 00a0 Phantom 336CX/C3 (#2) - 00a3 ScanMaker V6USL - 00ac ScanMaker V6UL - 00b6 ScanMaker V6UPL - 00ef ScanMaker V6UPL - 1006 Jenoptik JD350 entrance - 1011 NHJ Che-ez! Kiss Digital Camera - 1018 Digital Dream Enigma 1.3 - 1020 Digital Dream l'espion xtra - 1025 Take-it Still Camera Device - 1026 Take-it - 1043 Take-It 1300 DSC Bulk Driver - 1045 Take-it D1 - 1047 Take-it Camera Composite Device - 1048 Take-it Q3 - 1049 3M Still Camera Device - 1051 Camcorder Series - 1052 Mass Storage Device - 1053 Take-it DV Composite Device - 1054 Mass Storage Device - 1055 Digital Camera Series(536) - 1056 Mass Storage Device - 1057 Take-it DSC Camera Device(536) - 1058 Mass Storage Device - 1059 Camcorder DSC Series - 1060 Microtek Take-it MV500 - 2007 ArtixScan DI 1210 - 200c 1394_USB2 Scanner - 200e ArtixScan DI 810 - 2017 UF ICE Scanner - 201c 4800 Scanner - 201d ArtixScan DI 1610 - 201f 4800 Scanner-ICE - 202e ArtixScan DI 2020 - 208b ScanMaker 6800 - 208f ArtixScan DI 2010 - 209e ScanMaker 4700LP - 20a7 ScanMaker 5600 - 20b0 ScanMaker X12USL - 20b1 ScanMaker 8700 - 20b4 ScanMaker 4700 - 20bd ScanMaker 5700 - 20c9 ScanMaker 6700 - 20d2 Microtek ArtixScan 1800f - 20d6 PS4000 - 20de ScanMaker 9800XL - 20e0 ScanMaker 9700XL - 20ed ScanMaker 4700 - 20ee Micortek ScanMaker X12USL - 3008 Scanner - 300a 4800 ICE Scanner - 300b 4800 Scanner - 300f MiniScan C5 - 3020 4800dpi Scanner - 3021 1200dpi Scanner - 3022 Scanner 4800dpi - 3023 USB1200II Scanner - 30c1 USB600 Scanner - 30ce ScanMaker 3800 - 30cf ScanMaker 4800 - 30d4 USB1200 Scanner - 30d8 Scanner - 30d9 USB2400 Scanner - 30e4 ScanMaker 4100 - 30e5 USB3200 Scanner - 30e6 ScanMaker i320 - 40b3 ScanMaker 3600 - 40b8 ScanMaker 3700 - 40c7 ScanMaker 4600 - 40ca ScanMaker 3600 - 40cb ScanMaker 3700 - 40dd ScanMaker 3750i - 40ff ScanMaker 3600 - 5003 Goya - 5013 3200 Scanner - 80a3 ScanMaker V6USL (#2) - 80ac ScanMaker V6UL/SpicyU -05db Sun Corp. (Suntac?) - 0003 SUNTAC U-Cable type D2 - 0005 SUNTAC U-Cable type P1 - 0009 SUNTAC Slipper U - 000a SUNTAC Ir-Trinity - 000b SUNTAC U-Cable type A3 - 0011 SUNTAC U-Cable type A4 -05dc Lexar Media, Inc. - 0001 jumpSHOT CompactFlash Reader - 0002 JumpShot - 0003 JumpShot - 0080 Jumpdrive Secure 64MB - 0081 RBC Compact Flash Drive - 00a7 JumpDrive Impact - 0100 JumpDrive PRO - 0200 JumpDrive 2.0 Pro - 0300 Jumpdrive Geysr - 0301 JumpDrive Classic - 0302 JD Micro - 0303 JD Micro Pro - 0304 JD Secure II - 0310 JumpDrive - 0311 JumpDrive Classic - 0312 JD Micro - 0313 JD Micro Pro - 0320 JumpDrive - 0321 JD Micro - 0322 JD Micro Pro - 0323 UFC - 0330 JumpDrive Expression - 0340 JumpDrive TAD - 0350 Express Card - 0400 UFDC - 0401 UFDC - 0403 Locked B Device - 0405 Locked C Device - 0407 Locked D Device - 0409 Locked E Device - 040b Locked F Device - 040d Locked G Device - 040f Locked H Device - 0410 JumpDrive - 0411 JumpDrive - 0413 Locked J Device - 0415 Locked K Device - 0417 Locked L Device - 0419 Locked M Device - 041b Locked N Device - 041d Locked O Device - 041f Locked P Device - 0420 JumpDrive - 0421 JumpDrive - 0423 Locked R Device - 0425 Locked S Device - 0427 Locked T Device - 0429 Locked U Device - 042b Locked V Device - 042d Locked W Device - 042f Locked X Device - 0431 Locked Y Device - 0433 Locked Z Device - 4d02 MP3 Player - 4d12 MP3 Player - 4d30 MP3 Player - a300 JumpDrive2 - a400 JumpDrive trade; Pro 40-501 - a410 JumpDrive 128MB/256MB - a411 JumpDrive Traveler - a420 JumpDrive Pro - a421 JumpDrive Pro II - a422 JumpDrive Micro Pro - a430 JumpDrive Secure - a431 JumpDrive Secure II - a432 JumpDrive Classic - a440 JumpDrive Lightning - a450 JumpDrive TouchGuard - a460 JD Mercury - a501 JumpDrive Classic - a510 JumpDrive Sport - a530 JumpDrive Expression - a531 JumpDrive Secure II - a560 JumpDrive FireFly - a701 JumpDrive FireFly - a731 JumpDrive FireFly - a790 JumpDrive 2GB - b002 USB CF Reader - b018 Multi-Card Reader - b047 SDHC Reader [RW047-7000] -05dd Delta Electronics, Inc. - ff31 AWU-120 - ff32 FriendlyNET AeroLAN AL2011 - ff35 PCW 100 - Wireless 802.11b Adapter - ff91 2Wire PC Port Phoneline 10Mbps Adapter -05df Silicon Vision, Inc. -05e0 Symbol Technologies - 0700 Bar Code Scanner (CS1504) - 0800 Spectrum24 Wireless LAN Adapter - 1200 DS6608 Bar Code Scanner - 1900 SNAPI Imaging Device - 2000 MC3090 Rugged Mobile Computer - 200d MC70 Rugged Mobile Computer -05e1 Syntek Semiconductor Co., Ltd - 0100 802.11g + Bluetooth Wireless Adapter - 0408 STK1160 Video Capture Device - 0500 DC-112X Webcam - 0501 DC-1125 Webcam - 0890 STK011 Camera - 0892 STK013 Camera - 0895 STK016 Camera - 0896 STK017 Camera -05e2 ElecVision, Inc. -05e3 Genesys Logic, Inc. - 000a Keyboard with PS/2 Port - 000b Mouse - 0100 Nintendo Game Boy Advance SP - 0120 Pacific Image Electronics PrimeFilm 1800u slide/negative scanner - 0131 CF/SM Reader/Writer - 0142 Multiple Slides Scanner-3600 - 0143 Multiple Frames Film Scanner-36series - 0180 Plustek Scanner - 0182 Wize Media 1000 - 0189 ScanJet 4600 series - 018a Xerox 6400 - 0300 GLUSB98PT Parallel Port - 0301 USB2LPT Cable Release2 - 0406 Hub - 0501 GL620USB Host-Host interface - 0502 GL620USB-A GeneLink USB-USB Bridge - 0503 Webcam - 0504 HID Keyboard Filter - 0604 USB 1.1 Hub - 0605 USB 2.0 Hub [ednet] - 0606 USB 2.0 Hub / D-Link DUB-H4 USB 2.0 Hub - 0608 USB-2.0 4-Port HUB - 0660 USB 2.0 Hub - 0700 SIIG US2256 CompactFlash Card Reader - 0701 USB 2.0 IDE Adapter - 0702 USB 2.0 IDE Adapter [GL811E] - 0703 Card Reader - 0704 Card Reader - 0705 Card Reader - 0706 Card Reader - 0707 Card Reader - 0708 Card Reader - 0709 Card Reader - 070a Pen Flash - 070b DMHS1B Rev 3 DFU Adapter - 070e USB 2.0 Card Reader - 070f Pen Flash - 0710 USB 2.0 33-in-1 Card Reader - 0711 Card Reader - 0712 Delkin Mass Storage Device - 0715 USB 2.0 microSD Reader - 0716 USB 2.0 Multislot Card Reader/Writer - 0718 IDE/SATA Adapter - 0723 GL827L SD/MMC/MS Flash Card Reader - 0760 USB 2.0 Card Reader/Writer - 0761 Genesys Mass Storage Device - 0780 USBFS DFU Adapter - 07a0 Pen Flash - 0880 Wasp (SL-6612) - 0927 Card Reader - 1205 Afilias Optical Mouse H3003 - a700 Pen Flash - f102 VX7012 TV Box - f103 VX7012 TV Box - f104 VX7012 TV Box - fd21 3M TL20 Temperature Logger - fe00 Razer Mouse -05e4 Red Wing Corp. -05e5 Fuji Electric Co., Ltd -05e6 Keithley Instruments -05e8 ICC, Inc. -05e9 Kawasaki LSI - 0008 KL5KUSB101B Ethernet [klsi] - 0009 Sony 10Mbps Ethernet [pegasus] - 000c USB-to-RS-232 - 000d USB-to-RS-232 - 0014 RS-232 J104 - 0040 Ethernet Adapter - 2008 Ethernet Adapter -05eb FFC, Ltd -05ec COM21, Inc. -05ee Cytechinfo Inc. -05ef AVB, Inc. [anko?] - 020a Top Shot Pegasus Joystick - 8884 Mag Turbo Force Wheel - 8888 Top Shot Force Feedback Racing Wheel -05f0 Canopus Co., Ltd - 0101 DA-Port DAC -05f1 Compass Communications -05f2 Dexin Corp., Ltd - 0010 AQ Mouse -05f3 PI Engineering, Inc. - 0007 Kinesis Advantage PRO MPC/USB Keyboard - 0081 Kinesis Integrated Hub - 00ff VEC Footpedal - 020b PS2 Adapter - 0232 X-Keys Switch Interface, Programming Mode - 0261 X-Keys Switch Interface, SPLAT Mode - 0264 X-Keys Switch Interface, Composite Mode -05f5 Unixtar Technology, Inc. -05f6 AOC International -05f7 RFC Distribution(s) PTE, Ltd -05f9 PSC Scanning, Inc. - 2602 Datalogic Magellan 1100i Barcode Scanner -05fa Siemens Telecommunications Systems, Ltd - 3301 Keyboard with PS/2 Mouse Port - 3302 Keyboard - 3303 Keyboard with PS/2 Mouse Port -05fc Harman Multimedia - 7849 Harman/Kardon SoundSticks -05fd InterAct, Inc. - 0239 SV-239 HammerHead Digital - 0251 Raider Pro - 0253 ProPad 8 Digital - 0286 SV-286 Cyclone Digital - 107a PowerPad Pro X-Box pad - 262a 3dfx HammerHead FX - 262f HammerHead Fx - daae Game Shark -05fe Chic Technology Corp. - 0001 Mouse - 0003 Cypress USB Mouse - 0005 Viewmaster 4D Browser Mouse - 0007 Twinhead Mouse - 0009 Inland Pro 4500/5000 Mouse - 0011 Browser Mouse - 0014 Gamepad - 1010 Optical Wireless -05ff LeCroy Corp. -0600 Barco Display Systems -0601 Jazz Hipster Corp. - 0003 Internet Security Co., Ltd. SecureKey -0602 Vista Imaging, Inc. - 1001 ViCam Webcam -0603 Novatek Microelectronics Corp. - 00f1 Keyboard - 6871 Mouse -0604 Jean Co., Ltd -0605 Anchor C&C Co., Ltd -0606 Royal Information Electronics Co., Ltd -0607 Bridge Information Co., Ltd -0608 Genrad Ads -0609 SMK Manufacturing, Inc. - 031d eHome Infrared Receiver - 0322 eHome Infrared Receiver - 0334 eHome Infrared Receiver - ff12 SMK Bluetooth Device -060a Worthington Data Solutions, Inc. -060b Solid Year - 0001 MacAlly Keyboard - 1006 Japanese Keyboard - 260U - 2101 Keyboard - 2231 KSK-6001 UELX Keyboard - 5811 ACK-571U Wireless Keyboard - 5903 Japanese Keyboard - 595U - 6001 SolidTek USB 2p HUB - 6002 SolidTek USB Keyboard - 6003 Japanese Keyboard - 600HM - a001 Maxwell Compact Pc PM3 -060c EEH Datalink GmbH -060d Auctor Corp. -060e Transmonde Technologies, Inc. -060f Joinsoon Electronics Mfg. Co., Ltd -0610 Costar Electronics, Inc. -0611 Totoku Electric Co., Ltd -0613 TransAct Technologies, Inc. -0614 Bio-Rad Laboratories -0615 Quabbin Wire & Cable Co., Inc. -0616 Future Techno Designs PVT, Ltd -0617 Swiss Federal Insitute of Technology -0618 MacAlly - 0101 Mouse -0619 Seiko Instruments, Inc. - 0101 SLP-100 Driver - 0102 SLP-200 Driver - 0103 SLP-100N Driver - 0104 SLP-200N Driver - 0105 SLP-240 Driver - 0501 SLP-440 Driver - 0502 SLP-450 Driver -061a Veridicom International, Inc. - 0110 5thSense Fingerprint Sensor - 0200 FPS200 Fingerprint Sensor - 8200 VKI-A Fingerprint Sensor/Flash Storage (dumb) - 9200 VKI-B Fingerprint Sensor/Flash Storage (smart) -061b Promptus Communications, Inc. -061c Act Labs, Ltd -061d Quatech, Inc. -061e Nissei Electric Co. - 0001 nissei 128DE-USB - - 0010 nissei 128DE-PNA - -0620 Alaris, Inc. - 0004 QuickVideo weeCam - 0007 QuickVideo weeCam - 000a QuickVideo weeCam - 000b QuickVideo weeCam -0621 ODU-Steckverbindungssysteme GmbH & Co. KG -0622 Iotech, Inc. -0623 Littelfuse, Inc. -0624 Avocent Corp. - 0294 Dell 03R874 KVM dongle -0625 TiMedia Technology Co., Ltd -0626 Nippon Systems Development Co., Ltd -0627 Adomax Technology Co., Ltd -0628 Tasking Software, Inc. -0629 Zida Technologies, Ltd -062a Creative Labs - 0000 Optical mouse - 0001 Notebook Optical Mouse - 0102 Wireless Keyboard/Mouse Combo [MK1152WC] - 0201 Defender Office Keyboard (K7310) S Zodiak KM-9010 - 0252 Emerge Uni-retractable Laser Mouse - 9003 VoIP Conference Hub (A16GH) - 9004 USR9602 USB Internet Mini Phone -062b Greatlink Electronics Taiwan, Ltd -062c Institute for Information Industry -062d Taiwan Tai-Hao Enterprises Co., Ltd -062e Mainsuper Enterprises Co., Ltd -062f Sin Sheng Terminal & Machine, Inc. -0631 JUJO Electronics Corp. -0633 Cyrix Corp. -0634 Micron Technology, Inc. -0635 Methode Electronics, Inc. -0636 Sierra Imaging, Inc. - 0003 Vivicam 35Xx -0638 Avision, Inc. - 0268 iVina 1200U Scanner - 026a Minolta Dimage Scan Dual II - 0a10 iVina FB1600/UMAX Astra 4500 - 0a13 AV600U - 0a16 SC-215 - 0a30 UMAX Astra 6700 Scanner - 0a41 Avision AM3000/MF3000 Series - 0f01 fi-4010CU - 4004 Minolta Dimage Scan Elite II -0639 Chrontel, Inc. -063a Techwin Corp. -063b Taugagreining HF -063c Yamaichi Electronics Co., Ltd (Sakura) -063d Fong Kai Industrial Co., Ltd -063e RealMedia Technology, Inc. -063f New Technology Cable, Ltd -0640 Hitex Development Tools - 0026 LPC-Stick -0641 Woods Industries, Inc. -0642 VIA Medical Corp. -0644 TEAC Corp. - 0000 Floppy - 0200 All-In-One Multi-Card Reader CA200/B/S - 1000 CD-ROM Drive - 800d TASCAM Portastudio DP-01FX - 800e TASCAM US-122L - 8021 TASCAM US-122mkII - d001 CD-R/RW Unit - d002 CD-R/RW Unit - d010 CD-RW/DVD Unit -0645 Who? Vision Systems, Inc. -0646 UMAX -0647 Acton Research Corp. - 0100 ARC SpectraPro UV/VIS/IR Monochromator/Spectrograph - 0101 ARC AM-VM Mono Airpath/Vacuum Monochromator/Spectrograph - 0102 ARC Inspectrum Mono - 0103 ARC Filterwheel - 03e9 Inspectrum 128x1024 F VIS Spectrograph - 03ea Inspectrum 256x1024 F VIS Spectrograph - 03eb Inspectrum 128x1024 B VIS Spectrograph - 03ec Inspectrum 256x1024 B VIS Spectrograph -0648 Inside Out Networks -0649 Weli Science Co., Ltd -064b Analog Devices, Inc. (White Mountain DSP) - 0165 Blackfin 535 [ADZS HPUSB ICE] -064c Ji-Haw Industrial Co., Ltd -064d TriTech Microelectronics, Ltd -064e Suyin Corp. - a100 Acer OrbiCam - a101 Acer CrystalEye Webcam - a102 Acer/Lenovo Webcam [CN0316] - a103 Acer/HP Integrated Webcam [CN0314] - a110 HP Webcam - a136 Asus Integrated Webcam [CN031B] - a219 1.3M WebCam (notebook emachines E730, Acer sub-brand) - c107 HP webcam [dv6-1190en] - d101 Acer CrystalEye Webcam - e201 Lenovo Integrated Webcam - e203 Lenovo Integrated Webcam - f102 Lenovo Integrated Webcam [R5U877] - f103 Lenovo Integrated Webcam [R5U877] -064f WIBU-Systems AG - 03e9 Propellerhead Record Ignition Key - 03f2 CmStick/M (article no. 1010) - 03f3 CmStick/M (article no. 1011) - 0bd7 BOX/U - 0bd8 BOX/RU -0650 Dynapro Systems -0651 Likom Technology Sdn. Bhd. -0652 Stargate Solutions, Inc. -0653 CNF, Inc. -0654 Granite Microsystems, Inc. - 0005 Device Bay Controller - 0006 Hub - 0007 Device Bay Controller - 0016 Hub -0655 Space Shuttle Hi-Tech Co., Ltd -0656 Glory Mark Electronic, Ltd -0657 Tekcon Electronics Corp. -0658 Sigma Designs, Inc. -0659 Aethra -065a Optoelectronics Co., Ltd - 0001 Barcode scanner -065b Tracewell Systems -065e Silicon Graphics -065f Good Way Technology Co., Ltd & GWC technology Inc. -0660 TSAY-E (BVI) International, Inc. -0661 Hamamatsu Photonics K.K. -0662 Kansai Electric Co., Ltd -0663 Topmax Electronic Co., Ltd - 0103 CobraPad -0664 Groovy Technology Corp. - 0301 GTouch Touch Screen - 0302 GTouch Touch Screen - 0303 GTouch Touch Screen - 0304 GTouch Touch Screen - 0305 GTouch Touch Screen - 0306 GTouch Touch Screen - 0307 GTouch Touch Screen - 0309 GTouch Touch Screen -0665 Cypress Semiconductor - 5161 USB to Serial -0667 Aiwa Co., Ltd - 0fa1 TD-U8000 Tape Drive -0668 WordWand -0669 Oce' Printing Systems GmbH -066a Total Technologies, Ltd -066b Linksys, Inc. - 0105 SCM eUSB SmartMedia Card Reader - 010a Melco MCR-U2 SmartMedia / CompactFlash Reader - 200c USB10TX - 2202 USB10TX Ethernet [pegasus] - 2203 USB100TX Ethernet [pegasus] - 2204 USB100TX HomePNA Ethernet [pegasus] - 2206 USB Ethernet [pegasus] - 2207 HomeLink Phoneline 10M Network Adapter - 2211 WUSB11 802.11b Adapter - 2212 WUSB11v2.5 802.11b Adapter - 2213 WUSB12v1.1 802.11b Adapter - 2219 Instant Wireless Network Adapter - 400b USB10TX -066d Entrega, Inc. -066e Acer Semiconductor America, Inc. -066f SigmaTel, Inc. - 003b MP3 Player - 003e MP3 Player - 003f MP3 Player - 0040 MP3 Player - 0041 MP3 Player - 0042 MP3 Player - 0043 MP3 Player - 004b A-Max PA11 MP3 Player - 3400 STMP3400 D-Major MP3 Player - 3410 STMP3410 D-Major MP3 Player - 3500 Player Recovery Device - 4200 STIr4200 IrDA Bridge - 4210 STIr4210 IrDA Bridge - 8000 MSCN MP3 Player - 8001 SigmaTel MSCN Audio Player - 8004 MSCNMMC MP3 Player - 8008 i-Bead 100 MP3 Player - 8020 MP3 Player - 8034 MP3 Player - 8036 MP3 Player - 8038 MP3 Player - 8056 MP3 Player - 8060 MP3 Player - 8066 MP3 Player - 807e MP3 Player - 8092 MP3 Player - 8096 MP3 Player - 809a MP3 Player - 80aa MP3 Player - 80ac MP3 Player - 80b8 MP3 Player - 80ba MP3 Player - 80bc MP3 Player - 80bf MP3 Player - 80c5 MP3 Player - 80c8 MP3 Player - 80ca MP3 Player - 80cc MP3 Player - 8104 MP3 Player - 8106 MP3 Player - 8108 MP3 Player - 810a MP3 Player - 810c MP3 Player - 8122 MP3 Player - 8124 MP3 Player - 8126 MP3 Player - 8128 MP3 Player - 8134 MP3 Player - 8136 MP3 Player - 8138 MP3 Player - 813a MP3 Player - 813e MP3 Player - 8140 MP3 Player - 8142 MP3 Player - 8144 MP3 Player - 8146 MP3 Player - 8148 MP3 Player - 814c MP3 Player - 8201 MP3 Player - 8202 Jens of Sweden / I-BEAD 150M/150H MP3 player - 8203 MP3 Player - 8204 MP3 Player - 8205 MP3 Player - 8206 Digital MP3 Music Player - 8207 MP3 Player - 8208 MP3 Player - 8209 MP3 Player - 820a MP3 Player - 820b MP3 Player - 820c MP3 Player - 820d MP3 Player - 820e MP3 Player - 820f MP3 Player - 8210 MP3 Player - 8211 MP3 Player - 8212 MP3 Player - 8213 MP3 Player - 8214 MP3 Player - 8215 MP3 Player - 8216 MP3 Player - 8217 MP3 Player - 8218 MP3 Player - 8219 MP3 Player - 821a MP3 Player - 821b MP3 Player - 821c MP3 Player - 821d MP3 Player - 821e MP3 Player - 821f MP3 Player - 8220 MP3 Player - 8221 MP3 Player - 8222 MP3 Player - 8223 MP3 Player - 8224 MP3 Player - 8225 MP3 Player - 8226 MP3 Player - 8227 MP3 Player - 8228 MP3 Player - 8229 MP3 Player - 8230 MP3 Player - 829c MP3 Player - 82e0 MP3 Player - 835d MP3 Player - 9000 MP3 Player - 9001 MP3 Player - 9002 MP3 Player -0670 Sequel Imaging - 0001 Calibrator - 0005 Enable Cable -0672 Labtec, Inc. - 1041 LCS1040 Speaker System - 5000 SpaceBall 4000 FLX -0673 HCL - 5000 Keyboard -0674 Key Mouse Electronic Enterprise Co., Ltd -0675 DrayTek Corp. - 0110 Vigor 128 ISDN TA - 0530 Vigor530 IEEE 802.11G Adapter (ISL3880+NET2280) - 0550 Vigor550 - 1688 miniVigor 128 ISDN TA - 6694 USB ISDN TA -0676 Teles AG -0677 Aiwa Co., Ltd - 07d5 TM-ED1285(USB) - 0fa1 TD-U8000 Tape Drive -0678 ACard Technology Corp. -067b Prolific Technology, Inc. - 0000 PL2301 USB-USB Bridge - 0001 PL2302 USB-USB Bridge - 0307 Motorola Serial Adapter - 04bb PL2303 Serial (IODATA USB-RSAQ2) - 0610 Onext EG210U MODEM - 0611 AlDiga AL-11U Quad-band GSM/GPRS/EDGE modem - 2303 PL2303 Serial Port - 2305 PL2305 Parallel Port - 2306 Raylink Bridge Controller - 2307 PL2307 USB-ATAPI4 Bridge - 2313 FITEL PHS U Cable Adaptor - 2315 Flash Disk Embedded Hub - 2316 Flash Disk Security Device - 2317 Mass Storage Device - 2501 PL2501 USB-USB Bridge (USB 2.0) - 2507 PL2507 Hi-speed USB to IDE bridge controller - 2515 Flash Disk Embedded Hub - 2517 Flash Disk Mass Storage Device - 25a1 PL25A1 Host-Host Bridge - 3400 Hi-Speed Flash Disk with TruePrint AES3400 - 3500 Hi-Speed Flash Disk with TruePrint AES3500 - 3507 PL3507 ATAPI6 Bridge - aaa0 Prolific Pharos - aaa2 PL2303 Serial Adapter (IODATA USB-RSAQ3) -067c Efficient Networks, Inc. - 1001 Siemens SpeedStream 100MBps Ethernet - 1022 Siemens SpeedStream 1022 802.11b Adapter - 1023 SpeedStream Wireless - 4020 SpeedStream 4020 ATM/ADSL Installer - 4031 Efficient ADSL Modem - 4032 SpeedStream 4031 ATM/ADSL Installer - 4033 SpeedStream 4031 ATM/ADSL Installer - 4060 Alcatel Speedstream 4060 ADSL Modem - 4062 Efficient Networks 4060 Loader - 5667 Efficient Networks Virtual Bus for ADSL Modem - c031 SpeedStream 4031 ATM/ADSL Installer - c032 SpeedStream 4031 ATM/ADSL Installer - c033 SpeedStream 4031 ATM/ADSL Installer - c060 SpeedStream 4060 Miniport ATM/ADSL Adapter - d667 Efficient Networks Virtual Bus for ADSL Modem - e240 Speedstream Ethernet Adapter E240 - e540 Speedstream Ethernet Adapter E240 -067d Hohner Corp. -067e Intermec Technologies Corp. - 0801 HID Keyboard, Barcode scanner - 0803 VCP, Barcode scanner - 0805 VCP + UVC, Barcode scanner - 1001 Mobile Computer -067f Virata, Ltd - 4552 DSL-200 ADSL Modem - 6542 DSL Modem - 6549 DSL Modem - 7541 DSL Modem -0680 Realtek Semiconductor Corp., CPP Div. (Avance Logic) - 0002 Arowana Optical Wheel Mouse MSOP-01 -0681 Siemens Information and Communication Products - 0001 Dect Base - 0002 Gigaset 3075 Passive ISDN - 0005 ID-Mouse with Fingerprint Reader - 0012 I-Gate 802.11b Adapter - 001b WLL013 - 001d Hipath 1000 - 0022 Gigaset SX353 ISDN - 0026 DECT Data - Gigaset M34 - 002b A-100-I ADSL Modem - 002e ADSL Router_S-141 - 0034 GSM module MC35/ES75 USB Modem - 3c06 54g USB Network Adapter -0682 Victor Company of Japan, Ltd -0684 Actiontec Electronics, Inc. -0686 Minolta Co., Ltd - 2001 PagePro 4110W - 2004 PagePro 1200W - 2005 Magicolor 2300 DL - 3001 PagePro 4100 - 3005 PagePro 1250E - 3006 PagePro 1250W - 3009 Magicolor 2300W - 300b PagePro 1350W - 300c PagePro 1300W - 302e Develop D 1650iD PCL - 3034 Develop D 2050iD PCL - 4001 Dimage 2300 - 4003 Dimage 2330 Zoom Camera - 4004 Scan Elite II - 4005 Minolta DiMAGE E201 Mass Storage Device - 4006 Dimage 7 Camera - 4007 Dimage S304 Camera - 4008 Dimage 5 Camera - 4009 Dimage X Camera - 400a Dimage S404 Camera - 400b Dimage 7i Camera - 400c Dimage F100 Camera - 400d Scan Dual III - 400e Dimage 5400 - 400f Dimage 7Hi Camera - 4010 Dimage Xi Camera - 4011 Dimage F300 Camera - 4012 Dimage F200 Camera - 4014 Dimage S414 Camera - 4015 Dimage XT Camera [storage] - 4016 Dimage XT Camera [remote mode] - 4017 Dimage E223 - 4018 Dimage Z1 Camera - 4019 Dimage A1 Camera [remote mode] - 401a Dimage A1 Camera [storage] - 401c Dimage X20 Camera - 401e Dimage E323 Camera -068a Pertech, Inc. -068b Potrans International, Inc. -068e CH Products, Inc. - 00d3 OEM 3 axis 5 button joystick - 00e2 HFX OEM Joystick - 00f1 Pro Throttle - 00f2 Flight Sim Pedals - 00f3 Fighterstick - 00f4 Combatstick - 00fa Flight Sim Pedals - 00ff Flight Sim Yoke - 0500 GameStick 3D - 0501 CH Pro Pedals - 0504 F-16 Combat Stick -0690 Golden Bridge Electech, Inc. -0693 Hagiwara Sys-Com Co., Ltd - 0002 FlashGate SmartMedia Card Reader - 0003 FlashGate CompactFlash Card Reader - 0005 FlashGate - 0006 SM PCCard R/W and SPD - 0007 FlashGate ME (Authenticated) - 000a SDCard/MMC Reader/Writer -0694 Lego Group - 0001 Mindstorms Tower - 0002 Mindstorms NXT -0698 Chuntex (CTX) - 1786 1300ex Monitor - 2003 CTX M730V built in Camera - 9999 VLxxxx Monitor+Hub -0699 Tektronix, Inc. -069a Askey Computer Corp. - 0001 VC010 Webcam [pwc] - 0303 Cable Modem - 0311 ADSL Router Remote NDIS Device - 0318 Remote NDIS Device - 0319 220V Remote NDIS Device - 0320 IEEE 802.11b Wireless LAN Card - 0321 Dynalink WLL013 / Compex WLU11A 802.11b Adapter - 0402 Scientific Atlanta WebSTAR 100 & 200 series Cable Modem - 0811 BT Virtual Bus for Helium - 0821 BT Voyager 1010 802.11b Adapter - 4402 Scientific Atlanta WebSTAR 2000 series Cable Modem - 4403 Scientific Atlanta WebSTAR 300 series Cable Modem - 4501 Scientific-Atlanta WebSTAR 2000 series Cable Modem -069b Thomson, Inc. - 0704 DCM245 Cable Modem - 0705 THG540K Cable Modem - 070c MP3 Player - 070d MP3 Player - 070e MP3 Player - 070f RCA Lyra RD1071 MP3 Player - 0731 Lyra M200E256 - 0761 RCA H100A - 0778 PEARL USB Device - 2220 RCA Kazoo RD1000 MP3 Player - 300a RCA Lyra MP3 Player - 3012 MP3 Player - 3013 MP3 Player - 5557 RCA CDS6300 -069d Hughes Network Systems (HNS) - 0001 Satellite Receiver Device - 0002 Satellite Device -069e Marx - 0005 CryptoBox v1.2 -069f Allied Data Technologies BV - 0010 Tornado Speakerphone FaxModem 56.0 - 0011 Tornado Speakerphone FaxModem 56.0 - 1000 ADT VvBus for CopperJet - 1004 CopperJet 821 RouterPlus -06a2 Topro Technology, Inc. - 0033 USB Mouse -06a3 Saitek PLC - 0006 Cyborg Gold Joystick - 0109 P880 Pad - 0160 ST290 Pro - 0200 Xbox Adrenalin Hub - 0241 Xbox Adrenalin Gamepad - 0255 X52 Flight Controller - 040b P990 Dual Analog Pad - 040c P2900 Wireless Pad - 0422 ST90 Joystick - 0460 ST290 Pro Flight Stick - 0463 ST290 - 0464 Cyborg Evo - 0471 Cyborg Graphite Stick - 0501 R100 Sports Wheel - 0502 ST200 Stick - 0506 R220 Digital Wheel - 051e Cyborg Digital II Stick - 052d P750 Gamepad - 053c X45 Flight Controller - 053f X36F Flightstick - 056c P2000 Tilt Pad - 056f P2000 Tilt Pad - 05d2 PC Dash 2 - 075c X52 Flight Controller - 0762 Saitek X52 Pro Flight Control System - 0805 R440 Force Wheel - 1003 GM2 Action Pad - 1009 Action Pad - 100a SP550 Pad and Joystick Combo - 100b SP550 Pad - 1509 P3000 Wireless Pad - 1589 P3000 Wireless Pad - 2541 X45 Flight Controller - 3509 P3000 RF GamePad - 353e Cyborg Evo Wireless - 3589 P3000 Wireless Pad - 35be Cyborg Evo - 5509 P3000 Wireless Pad - 8000 Gamers' Keyboard - 801e Cyborg 3D Digital Stick II - 8020 Eclipse Keyboard - 8021 Eclipse II Keyboard - 802d P750 Pad - 803f X36 Flight Controller - 806f P2000 Tilt Pad - 80c0 Pro Gamer Command Unit - 80c1 Cyborg Command Pad Unit - a502 Gaming Mouse - f518 P3200 Rumble Force Game Pad - ff04 R440 Force Wheel - ff0c Cyborg Force Rumble Pad - ff0d P2600 Rumble Force Pad - ff12 Cyborg 3D Force Stick - ff17 ST 330 Rumble Force Stick - ff52 Cyborg 3D Rumble Force Joystick - ffb5 Cyborg Evo Force Joystick -06a4 Xiamen Doowell Electron Co., Ltd -06a5 Divio - 0000 Typhoon Webcam 100k [nw8000] - d001 ProLink DS3303u Webcam - d800 Chicony TwinkleCam - d820 Wize Media 1000 -06a7 MicroStore, Inc. -06a8 Topaz Systems, Inc. - 0042 SignatureGem 1X5 Pad - 0043 SignatureGem 1X5-HID Pad -06a9 Westell - 0005 WireSpeed Dual Connect Modem - 0006 WireSpeed Dual Connect Modem - 000a WireSpeed Dual Connect Modem - 000b WireSpeed Dual Connect Modem - 000e A90-211WG-01 802.11g Adapter [Intersil ISL3887] -06aa Sysgration, Ltd -06ac Fujitsu Laboratories of America, Inc. -06ad Greatland Electronics Taiwan, Ltd -06ae Professional Multimedia Testing Centre -06af Harting, Inc. of North America -06b8 Pixela Corp. -06b9 Alcatel Telecom - 0120 SpeedTouch 120g 802.11g Wireless Adapter [Intersil ISL3886] - 0121 SpeedTouch 121g Wireless Dongle - 2001 SPEED TOUCH Card - 4061 SpeedTouch ISDN or ADSL Modem - a5a5 DynaMiTe Modem -06ba Smooth Cord & Connector Co., Ltd -06bb EDA, Inc. -06bc Oki Data Corp. - 000b Okipage 14ex Printer - 0a91 B2500MFP (printer+scanner) - 3801 B6100 Laser Printer -06bd AGFA-Gevaert NV - 0001 SnapScan 1212U - 0002 SnapScan 1236U - 0100 SnapScan Touch - 0101 SNAPSCAN ELITE - 0200 ScanMaker 8700 - 02bf DUOSCAN f40 - 0400 CL30 - 0401 Mass Storage - 0403 ePhoto CL18 Camera - 0404 ePhoto CL20 Camera - 2061 SnapScan 1212U (?) - 208d Snapscan e40 - 208f SnapScan e50 - 2091 SnapScan e20 - 2093 SnapScan e10 - 2095 SnapScan e25 - 2097 SnapScan e26 - 20fd SnapScan e52 - 20ff SnapScan e42 -06be AME Optimedia Technology Co., Ltd - 0800 Optimedia Camera - 1005 Dazzle DPVM! (1005) - d001 P35U Camera Capture -06bf Leoco Corp. -06c2 Phidgets Inc. (formerly GLAB) - 0030 PhidgetRFID - 0038 4-Motor PhidgetServo v3.0 - 0039 1-Motor PhidgetServo v3.0 - 003a 8-Motor PhidgetAvancedServo - 0040 PhidgetInterface Kit 0-0-4 - 0044 PhidgetInterface Kit 0-16-16 - 0045 PhidgetInterface Kit 8-8-8 - 0048 PhidgetStepper (Under Development) - 0049 PhidgetTextLED Ver 1.0 - 004a PhidgetLED Ver 1.0 - 004b PhidgetEncoder Ver 1.0 - 0051 PhidgetInterface Kit 0-5-7 (Custom) - 0052 PhidgetTextLCD - 0053 PhidgetInterfaceKit 0-8-8 - 0058 PhidgetMotorControl Ver 1.0 - 0070 PhidgetTemperatureSensor Ver 1.0 - 0071 PhidgetAccelerometer Ver 1.0 - 0072 PhidgetWeightSensor Ver 1.0 - 0073 PhidgetHumiditySensor - 0074 PhidgetPHSensor - 0075 PhidgetGyroscope -06c4 Bizlink International Corp. -06c5 Hagenuk, GmbH -06c6 Infowave Software, Inc. -06c8 SIIG, Inc. -06c9 Taxan (Europe), Ltd - 0005 Monitor Control - 0007 Monitor Control - 0009 Monitor Control -06ca Newer Technology, Inc. -06cb Synaptics, Inc. - 0001 HID Device - 0002 HID Device - 0003 HID Device - 0005 Touchpad/FPS - 0006 HID Device - 0007 HID Device - 0008 HID Device - 0009 Composite TouchPad and TrackPoint - 000e HID Device - 0010 Composite Human Interface Device - 0013 Human Interface Device -06cc Terayon Communication Systems - 0101 Cable Modem - 0102 Cable Modem - 0103 Cable Modem - 0104 Cable Modem - 0304 Cable Modem -06cd Keyspan - 0101 USA-28 PDA [no firmware] - 0102 USA-28X PDA [no firmware] - 0103 USA-19 PDA [no firmware] - 0104 PDA [prerenum] - 0105 USA-18X PDA [no firmware] - 0106 USA-19W PDA [no firmware] - 0107 USA-19 PDA - 0108 USA-19W PDA - 0109 USA-49W serial adapter [no firmware] - 010a USA-49W serial adapter - 010b USA-19Qi serial adapter [no firmware] - 010c USA-19Qi serial adapter - 010d USA-19Q serial Adapter (no firmware) - 010e USA-19Q serial Adapter - 010f USA-28 PDA - 0110 USA-28Xb PDA - 0111 USA-18 serial Adapter - 0112 USA-18X PDA - 0113 USA-28Xb PDA [no firmware] - 0114 USA-28Xa PDA [no firmware] - 0115 USA-28Xa PDA - 0116 USA-18XA serial Adapter (no firmware) - 0117 USA-18XA serial Adapter - 0118 USA-19QW PDA [no firmware] - 0119 USA-19QW PDA - 011a USA-49Wlc serial adapter [no firmware] - 011b MPR Serial Preloader (MPRQI) - 011c MPR Serial (MPRQI) - 011d MPR Serial Preloader (MPRQ) - 011e MPR Serial (MPRQ) - 0121 USA-19hs serial adapter - 012a USA-49Wlc serial adapter - 0201 UIA-10 Digital Media Remote [Cypress AN2131SC] - 0202 UIA-11 Digital Media Remote -06cf SpheronVR AG - 1010 PanoCam 10 - 1012 PanoCam 12/12X -06d0 LapLink, Inc. - 0622 LapLink Gold USB-USB Bridge [net1080] -06d1 Daewoo Electronics Co., Ltd -06d3 Mitsubishi Electric Corp. - 0380 CP8000D Port - 0381 CP770D Port - 0385 CP900D Port - 0387 CP980D Port - 038b CP3020D Port - 038c CP900DW(ID) Port - 0393 CP9500D/DW Port - 0394 CP9000D/DW Port - 03a1 CP9550D/DW Port -06d4 Cisco Systems -06d5 Toshiba - 4000 Japanese Keyboard -06d6 Aashima Technology B.V. - 0025 Gamepad - 0026 Predator TH 400 Gamepad - 002d Trust PowerC@m 350FT - 002e Trust PowerC@m 350FS - 0030 Trust 710 LCD POWERC@M ZOOM - MSD - 0031 Trust 610/710 LCD POWERC@M ZOOM - 003a Trust PowerC@m 770Z (mass storage mode) - 003b Trust PowerC@m 770Z (webcam mode) - 003c Trust 910z PowerC@m - 003f Trust 735S POWERC@M ZOOM, WDM DSC Bulk Driver - 0050 Trust 738AV LCD PV Digital Camera - 0062 TRUST 782AV LCD P. V. Video Capture - 0066 TRUST Digital PCTV and Movie Editor - 0067 Trust 350FS POWERC@M FLASH - 006b TRUST AUDIO VIDEO EDITOR -06d7 Network Computing Devices (NCD) -06d8 Technical Marketing Research, Inc. -06da Phoenixtec Power Co., Ltd - 0002 UPS - 0003 1300VA UPS -06db Paradyne -06dc Foxlink Image Technology Co., Ltd - 0012 Scan 1200c Scanner - 0014 Prolink Winscan Pro 2448U -06de Heisei Electronics Co., Ltd -06e0 Multi-Tech Systems, Inc. - f101 MT5634ZBA-USB MultiModemUSB (old firmware) - f103 MT5634MU MultiMobileUSB - f104 MT5634ZBA-USB MultiModemUSB (new firmware) - f107 MT5634ZBA-USB-V92 MultiModemUSB -06e1 ADS Technologies, Inc. - 0008 UBS-10BT Ethernet [klsi] - 0009 UBS-10BT Ethernet - 0833 Mass Storage Device - a155 FM Radio Receiver/Instant FM Music (RDX-155-EF) - a160 Instant Video-To-Go RDX-160 (no firmware) - a161 Instant Video-To-Go RDX-160 - a190 Instand VCD Capture - a191 Instant VideoXpress - a337 Mini DigitalTV - a701 DVD Xpress - b337 Mini DigitalTV - b701 DVD Xpress B -06e4 Alcatel Microelectronics -06e6 Tiger Jet Network, Inc. - 0200 Internet Phone - 0201 Internet Phone - 0202 Composite Device - 0203 Internet Phone - 0210 Composite Device - 0211 Internet Phone - 0212 Internet Phone - 031c Internet Phone - 031d Internet Phone - 031e Internet Phone - 3200 Composite Device - 3201 Internet Phone - 3202 Composite Device - 3203 Composite Device - 7200 Composite Device - 7210 Composite Device - 7250 Composite Device - 825c Internet Phone - 831c Internet Phone - 831d Composite Device - 831e Composite Device - b200 Composite Device - b201 Composite Device - b202 Internet Phone - b210 Internet Phone - b211 Composite Device - b212 Composite Device - b250 Composite Device - b251 Internet Phone - b252 Internet Phone - c200 Internet Phone - c201 Internet Phone - c202 Composite Device - c203 Internet Phone - c210 Personal PhoneGateway - c211 Personal PhoneGateway - c212 Personal PhoneGateway - c213 PPG Device - c25c Composite Device - c290 PPG Device - c291 PPG Device - c292 PPG Device - c293 Personal PhoneGateway - c31c Composite Device - c39c Personal PhoneGateway - c39d PPG Device - c39e PPG Device - c39f PPG Device - c700 Internet Phone - c701 Internet Phone - c702 Composite Device - c703 Internet Phone - c710 VoIP Combo Device - c711 VoIP Combo - c712 VoIP Combo Device - c713 VoIP Combo Device - cf00 Composite Device - cf01 Internet Phone - cf02 Internet Phone - cf03 Composite Device - d210 Personal PhoneGateway - d211 PPG Device - d212 PPG Device - d213 Personal PhoneGateway - d700 Composite Device - d701 Composite Device - d702 Internet Phone - d703 Composite Device - d710 VoIP Combo - d711 VoIP Combo Device - d712 VoIP Combo - d713 VoIP Combo - df00 Composite Device - df01 Composite Device - df02 Internet Phone - df03 Internet Phone - f200 Internet Phone - f201 Internet Phone - f202 Composite Device - f203 Composite Device - f210 Internet Phone - f250 Composite Device - f252 Internet Phone - f310 Internet Phone - f350 Composite Device -06ea Sirius Technologies - 0001 NetCom Roadster II 56k - 0002 Roadster II 56k -06eb PC Expert Tech. Co., Ltd -06ef I.A.C. Geometrische Ingenieurs B.V. -06f0 T.N.C Industrial Co., Ltd - de01 DualCam Video Camera - de02 DualCam Still Camera -06f1 Opcode Systems, Inc. - a011 SonicPort - a021 SonicPort Optical -06f2 Emine Technology Co. - 0011 KVM Switch Keyboard -06f6 Wintrend Technology Co., Ltd -06f7 Wailly Technology Ltd - 0003 USB->Din 4 Adaptor -06f8 Guillemot Corp. - 3002 Hercules Blog Webcam - 3004 Hercules Classic Silver - 3005 Hercules Dualpix Exchange - 3007 Hercules Dualpix Chat and Show - a300 Dual Analog Leader GamePad - b000 Hercules DJ Console - c000 Hercules Muse Pocket - d002 Hercules DJ Console - e000 HWGUSB2-54 WLAN - e010 HWGUSB2-54-LB - e020 HWGUSB2-54V2-AP - e031 Hercules HWNUm-300 Wireless N mini [Realtek RTL8191S] - e032 HWGUm-54 [Hercules Wireless G Ultra Mini Key] -06f9 ASYST electronic d.o.o. -06fa HSD S.r.L -06fc Motorola Semiconductor Products Sector -06fd Boston Acoustics - 0101 Audio Device - 0102 Audio Device - 0201 2-piece Audio Device -06fe Gallant Computer, Inc. -0701 Supercomal Wire & Cable SDN. BHD. -0703 Bvtech Industry, Inc. -0705 NKK Corp. -0706 Ariel Corp. -0707 Standard Microsystems Corp. - 0100 2202 Ethernet [klsi] - 0200 2202 Ethernet [pegasus] - 0201 EZ Connect USB Ethernet - ee04 SMCWUSB32 802.11b Wireless LAN Card - ee06 SMC2862W-G v1 EZ Connect 802.11g Adapter [Intersil ISL3886] - ee13 SMC2862W-G v2 EZ Connect 802.11g Adapter [Intersil ISL3887] -0708 Putercom Co., Ltd - 047e USB-1284 BRIDGE -0709 Silicon Systems, Ltd (SSL) -070a Oki Electric Industry Co., Ltd - 4002 Bluetooth Device - 4003 Bluetooth Device -070d Comoss Electronic Co., Ltd -070e Excel Cell Electronic Co., Ltd -0710 Connect Tech, Inc. - 0001 WhiteHeat (fake ID) - 8001 WhiteHeat -0711 Magic Control Technology Corp. - 0100 Hub - 0180 IRXpress Infrared Device - 0181 IRXpress Infrared Device - 0200 BAY-3U1S1P Serial Port - 0210 MCT1S Serial Port - 0230 MCT-232 Serial Port - 0231 PS/2 Mouse Port - 0232 Serial On Port - 0240 PS/2 to USB Converter - 0300 BAY-3U1S1P Parallel Port - 0302 Parallel Port - 0900 SVGA Adapter - 5001 Trigger UV-002BD[Startech USBVGAE] -0713 Interval Research Corp. -0714 NewMotion, Inc. - 0003 ADB to USB convertor -0717 ZNK Corp. -0718 Imation Corp. - 0002 SuperDisk 120MB - 0003 SuperDisk 120MB (Authenticated) - 0060 Flash Drive - 0061 Flash Drive - 0062 Flash Drive - 0063 Swivel Flash Drive - 0064 Flash Drive - 0065 Flash Drive - 0066 Flash Drive - 0067 Flash Drive - 0068 Flash Drive - 0084 Flash Drive Mini - 0582 Revo Flash Drive - d000 Disc Stakka CD/DVD Manager -0719 Tremon Enterprises Co., Ltd -071b Domain Technologies, Inc. - 0002 DTI-56362-USB Digital Interface Unit - 0101 Audio4-USB DSP Data Acquisition Unit - 0201 Audio4-5410 DSP Data Acquisition Unit - 0301 SB-USB JTAG Emulator - 3203 Rockchip Media Player - 32bb Music Mediatouch -071c Xionics Document Technologies, Inc. -071d Eicon Networks Corp. - 1000 Diva ISDN TA - 1003 Diva - 2000 Teledat Surf -071e Ariston Technologies -0723 Centillium Communications Corp. - 0002 Palladia 300/400 Adsl Modem -0726 Vanguard International Semiconductor-America -0729 Amitm - 1000 USC-1000 Serial Port -072e Sunix Co., Ltd -072f Advanced Card Systems, Ltd - 0001 AC1030-based SmartCard Reader - 0008 ACR 80 Smart Card Reader - 1000 PLDT Drive - 1001 PLDT Drive - 8002 AET63 BioTRUSTKey - 8003 ACR120 - 8103 ACR120 - 9000 ACR38 AC1038-based Smart Card Reader - 90cc ACR38 SmartCard Reader - 90cf ACR38 SAM Smart Card Reader - 90d0 PertoSmart EMV - Card Reader -0731 Susteen, Inc. - 0528 SonyEricsson DCU-11 Cable -0732 Goldfull Electronics & Telecommunications Corp. -0733 ViewQuest Technologies, Inc. - 0101 Digital Video Camera - 0110 VQ110 Video Camera - 0401 CS330 Webcam - 0402 M-318B Webcam - 0430 Intel Pro Share Webcam - 0630 VQ630 Dual Mode Digital Camera(Bulk) - 0631 Hercules Dualpix - 0780 Smart Cam Deluxe(composite) - 1310 Epsilon 1.3/Jenoptik JD C1.3/UMAX AstraPix 470 - 1311 Digital Dream Epsilon 1.3 - 1314 Mercury 2.1MEG Deluxe Classic Cam - 2211 Jenoptik jdc 21 LCD Camera - 2221 Mercury Digital Pro 3.1p - 3261 Concord 3045 spca536a Camera - 3281 Cyberpix S550V -0734 Lasat Communications A/S - 0001 560V Modem - 0002 Lasat 560V Modem - 043a DVS Audio - 043b 3DeMon USB Capture -0735 Asuscom Network - 2100 ISDN Adapter - 2101 ISDN Adapter - 6694 ISDNlink 128K - c541 ISDN TA 280 -0736 Lorom Industrial Co., Ltd -0738 Mad Catz, Inc. - 4507 XBox Device - 4516 XBox Device - 4520 XBox Device - 4526 XBox Device - 4536 XBox Device - 4540 XBox Device - 4556 XBox Device - 4566 XBox Device - 4576 XBox Device - 4586 XBox Device - 4588 XBox Device - 8818 Street Fighter IV Arcade FightStick (PS3) -073a Chaplet Systems, Inc. -073b Suncom Technologies -073c Industrial Electronic Engineers, Inc. - 0305 Pole Display (PC305-3415 2 x 20 Line Display) - 0322 Pole Display (PC322-3415 2 x 20 Line Display) - 0324 Pole Display (LB324-USB 4 x 20 Line Display) - 0330 Pole Display (P330-3415 2 x 20 Line Display) - 0424 Pole Display (SP324-4415 4 x 20 Line Display) - 0450 Pole Display (L450-USB Graphic Line Display) - 0505 Pole Display (SPC505-3415 2 x 20 Line Display) - 0522 Pole Display (SPC522-3415 2 x 20 Line Display) - 0624 Pole Display (SP324-3415 4 x 20 Line Display) -073d Eutron S.p.a. - 0005 Crypto Token - 0007 CryptoIdentity CCID - 0025 SmartKey 3 - 0c00 Pocket Reader - 0d00 StarSign Bio Token 3.0 EU -073e NEC, Inc. - 0301 Game Pad -0745 Syntech Information Co., Ltd -0746 Onkyo Corp. - 5500 SE-U55 Audio Device -0747 Labway Corp. -0748 Strong Man Enterprise Co., Ltd -0749 EVer Electronics Corp. -074a Ming Fortune Industry Co., Ltd -074b Polestar Tech. Corp. -074c C-C-C Group PLC -074d Micronas GmbH - 3553 Composite USB-Device - 3554 Composite USB-Device - 3556 Composite USB-Device -074e Digital Stream Corp. - 0001 PS/2 Adapter - 0002 PS/2 Adapter -0755 Aureal Semiconductor -0757 Network Technologies, Inc. -075b Sophisticated Circuits, Inc. - 0001 Kick-off! Watchdog -0763 Midiman - 0115 O2 / KeyRig 25 - 0117 Trigger Finger - 0119 MidAir - 0150 M-Audio Uno - 0160 M-Audio 1x1 - 0192 M-Audio Keystation 88es - 0193 ProKeys 88 - 0194 ProKeys 88sx - 0195 Oxygen 8 v2 - 0196 Oxygen 49 - 0197 Oxygen 61 - 0198 Axiom 25 - 0199 Axiom 49 - 019a Axiom 61 - 019b KeyRig 49 - 019c KeyStudio - 1001 MidiSport 2x2 - 1002 MidiSport 2x2 - 1003 MidiSport 2x2 - 1010 MidiSport 1x1 - 1011 MidiSport 1x1 - 1014 M-Audio Keystation Loader - 1015 M-Audio Keystation - 1020 Midisport 4x4 - 1021 MidiSport 4x4 - 1030 Midisport 8x8 - 1031 MidiSport 8x8/s Loader - 1033 MidiSport 8x8/s - 1040 M-Audio MidiSport 2x4 Loader - 1041 M-Audio MidiSport 2x4 - 1110 MidiSport 1x1 - 2001 M Audio Quattro - 2002 M Audio Duo - 2003 M Audio AudioPhile - 2004 M-Audio MobilePre - 2006 M-Audio Transit - 2007 M-Audio Sonica Theater - 2008 M-Audio Ozone - 200d M-Audio OmniStudio - 200f M-Audio MobilePre - 2010 M-Audio Fast Track - 2012 M-Audio Fast Track Pro - 2013 M-Audio JamLab - 2015 M-Audio RunTime DFU - 2016 M-Audio RunTime DFU - 2019 M-Audio Ozone Academic - 201a M-Audio Micro - 201b M-Audio RunTime DFU - 201d M-Audio Producer - 2080 M-Audio RunTime DFU - 2081 M-Audio RunTime DFU / Fast Track Ultra 8R - 2803 M-Audio Audiophile DFU - 2804 M-Audio MobilePre DFU - 2806 M-Audio Transit DFU - 2815 M-Audio DFU - 2816 M-Audio DFU - 281b M-Audio DFU - 2880 M-Audio DFU - 2881 M-Audio DFU -0764 Cyber Power System, Inc. - 0005 Cyber Power UPS - 0501 CP1500 AVR UPS -0765 X-Rite, Inc. - d094 X-Rite DTP94 [Quato Silver Haze Pro] -0766 Jess-Link Products Co., Ltd - 0204 TopSpeed Cyberlink Remote Control -0767 Tokheim Corp. -0768 Camtel Technology Corp. - 0006 Camtel Technology USB TV Genie Pro FM Model TVB330 - 0023 eHome Infrared Receiver -0769 Surecom Technology Corp. - 11f2 EP-9001-g 802.11g 54M WLAN Adapter - 11f3 RT2570 - 11f7 802.11g 54M WLAN Adapter - 31f3 RT2573 -076a Smart Technology Enablers, Inc. -076b OmniKey AG - 0596 CardMan 2020 - 1021 CardMan 1021 - 1221 CardMan 1221 - 1784 CardMan 6020 - 3021 CardMan 3121 - 3610 CardMan 3620 - 3621 CardMan 3621 - 3821 CardMan 3821 - 4321 CardMan 4321 - 5121 CardMan 5121 - 5125 CardMan 5125 - 6622 CardMan 6121 - a011 CCID Smart Card Reader Keyboard - a021 CCID Smart Card Reader - a022 CardMan Smart@Link - c000 CardMan 3x21 CS - c001 CardMan 5121 CS -076c Partner Tech -076d Denso Corp. -076e Kuan Tech Enterprise Co., Ltd -076f Jhen Vei Electronic Co., Ltd -0770 Welch Allyn, Inc - Medical Division -0771 Observator Instruments BV - 4455 OMC45III - ae0f OMC45III -0774 AmTRAN Technology Co., Ltd -0775 Longshine Electronics Corp. -0776 Inalways Corp. -0777 Comda Enterprise Corp. -0778 Volex, Inc. -0779 Fairchild Semiconductor -077a Sankyo Seiki Mfg. Co., Ltd -077b Linksys - 08be BEFCMU10 v4 Cable Modem - 2219 WUSB11 V2.6 802.11b Adapter - 2226 USB200M 100baseTX Adapter - 2227 Network Everywhere NWU11B -077c Forward Electronics Co., Ltd - 0005 NEC Keyboard -077d Griffin Technology - 0223 IMic Audio In/Out - 0405 iMate, ADB Adapter - 0410 PowerMate - 041a PowerWave - 04aa SoundKnob - 07af iMic - 1016 AirClick - 627a Radio SHARK -077f Well Excellent & Most Corp. -0780 Sagem Monetel GmbH - 1202 ORGA 900 Smart Card Terminal Virtual Com Port - 1302 ORGA 6000 Smart Card Terminal Virtual Com Port - 1303 ORGA 6000 Smart Card Terminal USB RNDIS - df55 ORGA 900/6000 Smart Card Terminal DFU -0781 SanDisk Corp. - 0001 SDDR-05a ImageMate CompactFlash Reader - 0002 SDDR-31 ImageMate II CompactFlash Reader - 0005 SDDR-05b (CF II) ImageMate CompactFlash Reader - 0100 ImageMate SDDR-12 - 0200 SDDR-09 (SSFDC) ImageMate SmartMedia Reader [eusb] - 0400 SecureMate SD/MMC Reader - 0621 SDDR-86 Imagemate 6-in-1 Reader - 0720 Sansa C200 series in recovery mode - 0729 Sansa E200 series in recovery mode - 0810 SDDR-75 ImageMate CF-SM Reader - 0830 ImageMate CF/MMC/SD Reader - 1234 Cruzer Mini Flash Drive - 5150 SDCZ2 Cruzer Mini Flash Drive (thin) - 5151 Cruzer Micro Flash Drive - 5153 Cruzer Flash Drive - 5402 U3 Cruzer Micro - 5406 Cruzer Micro U3 - 5408 Cruzer Titanium U3 - 540e Cruzer Contour Flash Drive - 5530 Cruzer - 5567 Cruzer Blade - 5e10 Encrypted - 6100 Ultra II SD Plus 2GB - 7100 Cruzer Mini - 7101 Pen Flash - 7102 Cruzer Mini - 7103 Cruzer Mini - 7104 Cruzer Micro Mini 256MB Flash Drive - 7105 Cruzer Mini - 7106 Cruzer Mini - 7112 Cruzer Micro 128MB Flash Drive - 7113 Cruzer Micro 256MB Flash Drive - 7114 Cruzer Mini - 7115 Cruzer Mini - 7301 Sansa e100 series (mtp) - 7302 Sansa e100 series (msc) - 7400 Sansa M200 series (mtp) - 7401 Sansa M200 series (msc) - 7420 Sansa E200 series (mtp) - 7421 Sansa E200 Series (msc) - 7422 Sansa E200 series v2 (mtp) - 7423 Sansa E200 series v2 (msc) - 7430 Sansa M200 series - 7431 Sansa M200 series V4 (msc) - 7432 Sansa Clip (mtp) - 7433 Sansa Clip (msc) - 7434 Sansa Clip V2 (mtp) - 7435 Sansa Clip V2 (msc) - 7450 Sansa C250 - 7451 Sansa C240 - 7460 Sansa Express - 7480 Sansa Connect - 7481 Sansa Connect (in recovery mode) - 74b0 Sansa View (msc) - 74b1 Sansa View (mtp) - 74c0 Sansa Fuze (mtp) - 74c1 Sansa Fuze (msc) - 74c2 Sansa Fuze V2 (mtp) - 74c3 Sansa Fuze V2 (msc) - 74d0 Sansa Clip+ (mtp) - 74d1 Sansa Clip+ (msc) - 8181 Pen Flash - 8183 Hi-Speed Mass Storage Device - 8185 SDCZ2 Cruzer Mini Flash Drive (older, thick) - 8888 Card Reader - 8889 SDDR-88 Imagemate 8-in-1 Reader - 8919 Card Reader - 8989 ImageMate 12-in-1 Reader - 9191 ImageMate CF - 9219 Card Reader - 9292 ImageMate CF Reader/Writer - 9393 ImageMate SD-MMC - 9595 ImageMate xD-SM - 9797 ImageMate MS-PRO - 9919 Card Reader - 9999 SDDR-99 5-in-1 Reader - a7e8 SDDR-113 MicroMate SDHC Reader - b2b3 SDDR-103 MobileMate SD+ Reader - b4b5 SDDR-89 V4 ImageMate 12-in-1 Reader -0782 Trackerball -0783 C3PO - 0003 LTC31 SmartCard Reader - 0006 LTC31v2 - 0009 KBR36 - 0010 LTC32 -0784 Vivitar, Inc. - 0100 Vivicam 2655 - 1310 Vivicam 3305 - 1688 Vivicam 3665 - 1689 Gateway DC-M42/Labtec DC-505/Vivitar Vivicam 3705 - 2620 AOL Photocam Plus - 2888 Polaroid DC700 - 3330 Nytec ND-3200 Camera - 4300 Traveler D1 - 5260 Werlisa Sport PX 100 / JVC GC-A33 Camera - 5300 Pretec dc530 -0785 NTT-ME - 0001 MN128mini-V ISDN TA - 0003 MN128mini-J ISDN TA -0789 Logitec Corp. - 0026 LHD Device - 0033 DVD Multi-plus unit LDR-H443SU2 - 0063 LDR Device - 0064 LDR-R Device - 00b3 DVD Multi-plus unit LDR-H443U2 - 010c Realtek RTL8187 Wireless 802.11g 54Mbps Network Adapter - 0162 LAN-WN22/U2 Wireless LAN Adapter - 0163 LAN-WN12/U2 Wireless LAN Adapter - 0164 LAN-W150/U2M Wireless LAN Adapter - 0166 LAN-W300N/U2 Wireless LAN Adapter - 0168 LAN-W150N/U2 Wireless LAN Adapter -078b Happ Controls, Inc. - 0010 Driving UGCI - 0020 Flying UGCI - 0030 Fighting UGCI -078c GTCO/CalComp - 0090 Tablet Adapter - 0100 Tablet Adapter - 0200 Tablet Adapter - 0300 Tablet Adapter - 0400 Digitizer (Whiteboard) -078e Brincom, Inc. -0790 Pro-Image Manufacturing Co., Ltd -0791 Copartner Wire and Cable Mfg. Corp. -0792 Axis Communications AB -0793 Wha Yu Industrial Co., Ltd -0794 ABL Electronics Corp. -0795 RealChip, Inc. -0796 Certicom Corp. -0797 Grandtech Semiconductor Corp. - 6801 Flatbed Scanner - 6802 InkJet Color Printer - 8001 SmartCam - 801a Typhoon StyloCam - 801c Meade Binoculars/Camera - 8901 ScanHex SX-35a - 8909 ScanHex SX-35b - 8911 ScanHex SX-35c -0798 Optelec - 0001 Braille Voyager -0799 Altera - 7651 Programming Unit -079b Sagem - 0027 USB-Serial Controller - 002f Mobile - 0030 Mobile Communication Device - 0042 Mobile - 004a XG-760A 802.11bg - 004b Wi-Fi 11g adapter - 0056 Agfa AP1100 Photo Printer - 005d Mobile Mass Storage - 0062 XG-76NA 802.11bg - 0078 Laser Pro Monochrome MFP -079d Alfadata Computer Corp. - 0201 GamePort Adapter -07a1 Digicom S.p.A. - d952 Palladio USB V.92 Modem -07a2 National Technical Systems -07a3 Onnto Corp. -07a4 Be, Inc. -07a6 ADMtek, Inc. - 07c2 AN986A Ethernet - 0986 AN986 Pegasus Ethernet - 8266 Infineon WildCard-USB Wireless LAN Adapter - 8511 ADM8511 Pegasus II Ethernet - 8513 AN8513 Ethernet - 8515 AN8515 Ethernet -07aa Corega K.K. - 0001 Ether USB-T Ethernet [klsi] - 0004 FEther USB-TX Ethernet [pegasus] - 000c WirelessLAN USB-11 - 000d FEther USB-TXS - 0011 Wireless LAN USB-11 mini - 0012 Stick-11 802.11b Adapter - 0017 FEther USB2-TX - 0018 Wireless LAN USB-11 mini 2 - 001a ULUSB-11 Key - 001c CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887] - 002f CG-WLUSB2GNL - 003c CG-WLUSB2GNL - 003f CG-WLUSB300AGN - 0041 CG-WLUSB300GNS - 0042 CG-WLUSB300GNM - 0043 CG-WLUSB300N rev A2 [Realtek RTL8192U] - 0047 CG-WLUSBNM - 0051 CG-WLUSB300NM - 7613 Stick-11 V2 802.11b Adapter - 9601 FEther USB-TXC -07ab Freecom Technologies - fc01 IDE bridge - fc02 Cable II USB-2 - fc03 USB2-IDE IDE bridge - fcd6 Freecom HD Classic - fcf6 DataBar 512 MB - fcf8 Freecom Classic SL Network Drive -07af Microtech - 0004 SCSI-DB25 SCSI Bridge [shuttle] - 0005 SCSI-HD50 SCSI Bridge [shuttle] - 0006 CameraMate SmartMedia and CompactFlash Card Reader [eusb/shuttle] - fc01 Freecom USB-IDE -07b0 Trust Technologies - 0001 ISDN TA - 0002 ISDN TA128 Plus - 0003 ISDN TA128 Deluxe - 0005 ISDN TA128 SE - 0006 ISDN TA128 CE - 0007 ISDN TA - 0008 ISDN TA -07b1 IMP, Inc. -07b2 Motorola BCS, Inc. - 0100 SURFboard Voice over IP Cable Modem - 0900 SURFboard Gateway - 0950 SURFboard SBG950 Gateway - 1000 SURFboard SBG1000 Gateway - 4100 SurfBoard SB4100 Cable Modem - 4200 SurfBoard SB4200 Cable Modem - 4210 SurfBoard 4210 Cable Modem - 4220 SURFboard SB4220 Cable Modem - 4500 CG4500 Communications Gateway - 450b CG4501 Communications Gateway - 450e CG4500E Communications Gateway - 5100 SurfBoard SB5100 Cable Modem - 5101 SurfBoard SB5101 Cable Modem - 5120 SurfBoard SB5120 Cable Modem (RNDIS) - 5121 Surfboard 5121 Cable Modem - 7030 Wireless Adapter WU830G -07b3 Plustek, Inc. - 0001 OpticPro 1212U Scanner - 0003 Scanner - 0010 OpticPro U12 Scanner - 0011 OpticPro U24 Scanner - 0013 OpticPro UT12 Scanner - 0014 Scanner - 0015 OpticPro U24 Scanner - 0017 OpticPro UT12/16/24 Scanner - 0204 Scanner - 0400 OpticPro 1248U Scanner - 0401 OpticPro 1248U Scanner #2 - 0403 OpticPro U16B Scanner - 0404 Scanner - 0405 A8 Namecard-s Controller - 0406 A8 Namecard-D Controller - 0410 Scanner - 0412 Scanner - 0413 OpticSlim 1200 Scanner - 0601 OpticPro ST24 Scanner - 0800 OpticPro ST48 Scanner - 0906 OpticBook 3600 Scanner - 0a06 TVcam VD100 - 0b00 SmartPhoto F50 - 0c03 OpticPro ST64+ Scanner - 0c04 Optic Film 7200i scanner - 0c26 OpticBook 4600 Scanner - 0c2b Mobile Office D428 Scanner -07b4 Olympus Optical Co., Ltd - 0100 Camedia C-2100/C-3000 Ultra Zoom Camera - 0102 Camedia E-10/C-220/C-50 Camera - 0105 Camedia C-310Z/C-700/C-750UZ/C-755/C-765UZ/C-3040/C-4000/C-5050Z/D-560/C-3020Z Zoom Camera - 0109 C-370Z/C-500Z/D-535Z/X-450 - 010a MAUSB-10 xD and SmartMedia Card Reader - 0112 MAUSB-100 xD Card Reader - 0113 Mju 500 - 0114 C-350Z Camera - 0118 Digital Camera - 0184 P-S100 port - 0203 Digital Voice Recorder DW-90 - 0206 Digital Voice Recorder DS-330 - 0207 Digital Voice Recorder & Camera W-10 - 0209 Digital Voice Recorder DM-20 - 020d Digital Voice Recorder VN-240PC - 0280 m:robe 100 -07b5 Mega World International, Ltd - 0017 Joystick - 0213 Thrustmaster Firestorm Digital 3 Gamepad - 0312 Gamepad - 9902 GamePad -07b6 Marubun Corp. -07b7 TIME Interconnect, Ltd -07b8 AboCom Systems Inc - 110c XX1 - 1201 IEEE 802.11b Adapter - 200c XX2 - 2573 Wireless LAN Card - 2770 802.11n/b/g Mini Wireless LAN USB2.0 Adapter - 2870 802.11n/b/g Wireless LAN USB2.0 Adapter - 3070 802.11n/b/g Mini Wireless LAN USB2.0 Adapter - 3071 802.11n/b/g Mini Wireless LAN USB2.0 Adapter - 3072 802.11n/b/g Mini Wireless LAN USB2.0 Adapter - 4000 DU-E10 Ethernet [klsi] - 4002 DU-E100 Ethernet [pegasus] - 4003 1/10/100 Ethernet Adapter - 4004 XX4 - 4007 XX5 - 400b XX6 - 400c XX7 - 401a RTL8151 - 4102 USB 1.1 10/100M Fast Ethernet Adapter - 4104 XX9 - 420a UF200 Ethernet - 5301 GW-US54ZGL 802.11bg - 6001 802.11bg - a001 WUG2200 802.11g Wireless Adapter [Envara WiND512] - abc1 DU-E10 Ethernet [pegasus] - b000 BWU613 - b02a AboCom Bluetooth Device - b02b Bluetooth dongle - b02c BCM92045DG-Flash with trace filter - b02d BCM92045DG-Flash with trace filter - b02e BCM92045DG-Flash with trace filter - b030 BCM92045DG-Flash with trace filter - b031 BCM92045DG-Flash with trace filter - b032 BCM92045DG-Flash with trace filter - b033 BCM92045DG-Flash with trace filter - b21a WUG2400 802.11g Wireless Adapter [Texas Instruments TNETW1450] - b21b HWU54DM - b21c RT2573 - b21d RT2573 - b21e RT2573 - b21f WUG2700 - d011 MP3 Player - e001 Mass Storage Device - e002 Mass Storage Device - e003 Mass Storage Device - e004 Mass Storage Device - e005 Mass Storage Device - e006 Mass Storage Device - e007 Mass Storage Device - e008 Mass Storage Device - e009 Mass Storage Device - e00a Mass Storage Device - e4f0 Card Reader Driver - f101 DSB-560 Modem [atlas] -07bc Canon Computer Systems, Inc. -07bd Webgear, Inc. -07be Veridicom -07c0 Code Mercenaries Hard- und Software GmbH - 1121 The Claw - 1500 IO-Warrior 40 - 1501 IO-Warrior 24 - 1502 IO-Warrior 48 - 1503 IO-Warrior 28 - 1511 IO-Warrior 24 Power Vampire - 1512 IO-Warrior 24 Power Vampire -07c1 Keisokugiken - 0068 HKS-0200 USBDAQ -07c4 Datafab Systems, Inc. - 0102 USB to LS120 - 0103 USB to IDE - 1234 USB to ATAPI - a000 CompactFlash Card Reader - a001 CompactFlash & SmartMedia Card Reader [eusb] - a002 Disk Drive - a003 Datafab-based Reader - a004 USB to MMC Class Drive - a005 CompactFlash & SmartMedia Card Reader - a006 SmartMedia Card Reader - a007 Memory Stick Class Drive - a103 MDSM-B reader - a107 USB to Memory Stick (LC1) Drive - a109 LC1 CompactFlash & SmartMedia Card Reader - a10b USB to CF+MS(LC1) - a200 DF-UT-06 Hama MMC/SD Reader - a400 CompactFlash & Microdrive Reader - a600 Card Reader - ad01 Mass Storage Device - ae01 Mass Storage Device - af01 Mass Storage Device - b000 USB to CF(LC1) - b001 USB to CF+PCMCIA - b004 MMC/SD Reader - b006 USB to PCMCIA - b00a USB to CF+SD Drive(LC1) - b00b USB to Memory Stick(LC1) -07c5 APG Cash Drawer -07c6 ShareWave, Inc. - 0002 Bodega Wireless Access Point -07c7 Powertech Industrial Co., Ltd -07c8 B.U.G., Inc. - 0202 MN128-SOHO PAL -07c9 Allied Telesyn International - b100 AT-USB100 -07ca AVerMedia Technologies, Inc. - 0002 AVerTV PVR USB/EZMaker Pro Device - 0026 AVerTV - 0337 A867 DVB-T dongle - 1228 MPEG-2 Capture Device (M038) - 1830 AVerTV Volar Video Capture (H830) - 850a AverTV Volar Black HD (A850) - 850b AverTV Red HD+ (A850T) - a309 AVerTV DVB-T (A309) - a801 AVerTV DVB-T (A800) - a815 AVerTV DVB-T Volar X (A815) - a867 AVerTV DVB-T (A867) - b800 MR800 FM Radio - e880 MPEG-2 Capture Device (E880) - e882 MPEG-2 Capture Device (E882) -07cb Kingmax Technology, Inc. -07cc Carry Computer Eng., Co., Ltd - 0000 CF Card Reader - 0001 Reader (UICSE) - 0002 Reader (UIS) - 0003 SM Card Reader - 0004 SM/CF/PCMCIA Card Reader - 0005 Reader (UISA2SE) - 0006 SM/CF/PCMCIA Card Reader - 0007 Reader (UISA6SE) - 000c SM/CF Card Reader - 000d SM/CF Card Reader - 000e Reader (UISDA) - 000f Reader (UICLIK) - 0010 Reader (UISMA) - 0012 Reader (UISC6SE-FLASH) - 0014 Litronic Fortezza Reader - 0030 Mass Storage (UISDMC12S) - 0040 Mass Storage (UISDMC13S) - 0100 Reader (UID) - 0101 Reader (UIM) - 0102 Reader (UISDMA) - 0103 Reader (UISDMC) - 0104 Reader (UISDM) - 0200 6-in-1 Card Reader - 0201 Mass Storage (UISDMC1S & UISDMC3S) - 0202 Mass Storage (UISDMC5S) - 0203 Mass Storage (UISMC5S) - 0204 Mass Storage (UIM4/5S & UIM7S) - 0205 Mass Storage (UIS4/5S & UIS7S) - 0206 Mass Storage (UISDMC10S & UISDMC11S) - 0207 Mass Storage (UPIDMA) - 0208 Mass Storage (UCFC II) - 0210 Mass Storage (UPIXXA) - 0213 Mass Storage (UPIDA) - 0214 Mass Storage (UPIMA) - 0215 Mass Storage (UPISA) - 0217 Mass Storage (UPISDMA) - 0223 Mass Storage (UCIDA) - 0224 Mass Storage (UCIMA) - 0225 Mass Storage (UIS7S) - 0227 Mass Storage (UCIDMA) - 0234 Mass Storage (UIM7S) - 0235 Mass Storage (UIS4S-S) - 0237 Velper (UISDMC4S) - 0300 6-in-1 Card Reader - 0301 6-in-1 Card Reader - 0303 Mass Storage (UID10W) - 0304 Mass Storage (UIM10W) - 0305 Mass Storage (UIS10W) - 0308 Mass Storage (UIC10W) - 0309 Mass Storage (UISC3W) - 0310 Mass Storage (UISDMA2W) - 0311 Mass Storage (UISDMC14W) - 0320 Mass Storage (UISDMC4W) - 0321 Mass Storage (UISDMC37W) - 0330 WINTERREADER Reader - 0350 9-in-1 Card Reader - 0500 Mass Storage - 0501 Mass Storage -07cd Elektor - 0001 USBuart Serial Port -07cf Casio Computer Co., Ltd - 1001 QV-8000SX/5700/3000EX Digicam; Exilim EX-M20 - 1003 Exilim EX-S500 - 1004 Exilim EX-Z120 - 1011 USB-CASIO PC CAMERA - 1116 EXILIM EX-Z19 - 1133 Exilim EX-Z350 Digital Camera (mass storage mode) - 1233 Exilim EX-Z350 Digital Camera (PictBridge mode) - 2002 E-125 Cassiopeia Pocket PC - 3801 WMP-1 MP3-Watch - 4001 Label Printer KL-P1000 - 4007 CW50 Device - 4104 Cw75 Device - 4107 CW-L300 Device - 4500 LV-20 Digital Camera - 6801 PL-40R - 6802 MIDI Keyboard -07d0 Dazzle - 0001 Digital Video Creator I - 0002 Global Village VideoFX Grabber - 0003 Fusion Model DVC-50 Rev 1 (NTSC) - 0004 DVC-800 (PAL) Grabber - 0005 Fusion Video and Audio Ports - 0006 DVC 150 Loader Device - 0007 DVC 150 - 0327 Fusion Digital Media Reader - 1001 DM-FLEX DFU Adapter - 1002 DMHS2 DFU Adapter - 1102 CF Reader/Writer - 1103 SD Reader/Writer - 1104 SM Reader/Writer - 1105 MS Reader/Writer - 1106 xD/SM Reader/Writer - 1202 MultiSlot Reader/Writer - 2000 FX2 DFU Adapter - 2001 eUSB CompactFlash Reader - 4100 Kingsun SF-620 Infrared Adapter - 4101 Connectivity Cable (CA-42 clone) - 4959 Kingsun KS-959 Infrared Adapter -07d1 D-Link System - 13ec VvBus for Helium 2xx - 13ed VvBus for Helium 2xx - 13f1 DSL-302G Modem - 13f2 DSL-502G Router - 3300 DWA-130 802.11n Wireless N Adapter(rev.E) [Realtek RTL8192SU] - 3302 DWA-130 802.11n Wireless N Adapter(rev.C2) [Realtek RTL8192SU] - 3303 DWA-131 802.11n Wireless N Nano Adapter(rev.A1) [Realtek RTL8192SU] - 3a07 WUA-2340 RangeBooster G Adapter(rev.A) [Atheros AR5523] - 3a08 WUA-2340 RangeBooster G Adapter(rev.A) (no firmware) [Atheros AR5523] - 3a09 DWA-160 Xtreme N Dual Band USB Adapter(rev.A2) [Atheros AR9001U-(2)NG] - 3a0d DWA-120 802.11g Wireless 108G Adapter [Atheros AR5523] - 3a0f DWA-130 802.11n Wireless N Adapter(rev.D) [Atheros AR9001U-(2)NG] - 3a10 DWA-126 802.11n Wireless Adapter [Atheros AR9271] - 3b01 AirPlus G DWL-G122 Wireless Adapter(rev.D) [Marvell 88W8338+88W8010] - 3b10 RangeBooster N Adapter - 3b11 DWA-130 802.11n Wireless N Adapter(rev.A1) [Marvell W8360USB] - 3c03 AirPlus G DWL-G122 Wireless Adapter(rev.C1) [Ralink RT73] - 3c04 WUA-1340 - 3c05 EH103 Wireless G Adapter - 3c07 Wireless G DWA-110 Adapter - 3c09 DWA-140 RangeBooster N Adapter(rev.B1) [Ralink RT2870] - 3c0a DWA-140 RangeBooster N Adapter(rev.B2) [Ralink RT2870] - 3c0b DWA-110 Wireless G USB Adapter(rev.B) - 3c0d DWA-125 Wireless N 150 Adapter(rev.A1) [Ralink RT2870] - 3c0e WUA-2340 RangeBooster G Adapter(rev.B) [Ralink RT2070] - 3c0f AirPlus G DWL-G122 Wireless Adapter(rev.E) [Ralink RT2870] - 3c10 DWA-160 Xtreme N Dual Band USB Adapter(rev.A) [Atheros AR9001U-(2)NG] - 3c11 DWA-160 Xtreme N Dual Band USB Adapter(rev.B) [Ralink RT2870] - 3c13 DWA-130 802.11n Wireless N Adapter(rev.B) [Ralink RT2870] - 3c15 DWA-140 RangeBooster N Adapter(rev.B3) [Ralink RT2870] - 3c16 DWA-125 Wireless N 150 Adapter(rev.A2) [Ralink RT2870] - 3e02 DWM-156 3.75G HSUPA Adapter - 5100 Remote NDIS Device - a800 DWM-152 3.75G HSUPA Adapter - f101 DBT-122 Bluetooth - fc01 DBT-120 Bluetooth Adapter -07d2 Aptio Products, Inc. -07d3 Cyberdata Corp. -07d5 Radiant Systems -07d7 GCC Technologies, Inc. -07da Arasan Chip Systems -07de Diamond Multimedia - 2820 VC500 Video Capture Dongle -07df David Electronics Co., Ltd -07e1 Ambient Technologies, Inc. - 5201 V.90 Modem -07e2 Elmeg GmbH & Co., Ltd -07e3 Planex Communications, Inc. -07e4 Movado Enterprise Co., Ltd - 0967 SCard R/W CSR-145 - 0968 SCard R/W CSR-145 -07e5 QPS, Inc. - 05c2 IDE-to-USB2.0 PCA - 5c01 Que! CDRW -07e6 Allied Cable Corp. -07e7 Mirvo Toys, Inc. -07e8 Labsystems -07ea Iwatsu Electric Co., Ltd -07eb Double-H Technology Co., Ltd -07ec Taiyo Electric Wire & Cable Co., Ltd -07ee Torex Retail (formerly Logware) - 0002 Cash Drawer I/F -07ef STSN - 0001 Internet Access Device -07f2 Microcomputer Applications, Inc. - 0001 KEYLOK II -07f6 Circuit Assembly Corp. -07f7 Century Corp. - 0005 ScanLogic/Century Corporation uATA - 011e Century USB Disk Enclosure -07f9 Dotop Technology, Inc. -07fa DrayTek Corp. - 0778 miniVigor 128 ISDN TA - 1012 BeWAN ADSL USB ST (grey) - 1196 BWIFI-USB54AR 802.11bg - a904 BeWAN ADSL - a905 BeWAN ADSL ST -07fd Mark of the Unicorn - 0000 FastLane MIDI Interface - 0001 FastLane Quad MIDI Interface - 0002 MOTU Audio for 64 bit -07ff Unknown - 00ff Portable Hard Drive -0801 Mag-Tek - 0001 Mini Swipe Reader (Keyboard Emulation) - 0002 Mini Swipe Reader -0802 Mako Technologies, LLC -0803 Zoom Telephonics, Inc. - 1300 V92 Faxmodem - 4310 Wireless-G - 5241 Cable Modem - 5551 DSL Modem - 9700 2986L FaxModem - 9800 Cable Modem - a312 Wireless-G -0809 Genicom Technology, Inc. -080a Evermuch Technology Co., Ltd -080b Cross Match Technologies - 0002 Fingerprint Scanner (After ReNumeration) - 0010 300LC Series Fingerprint Scanner (Before ReNumeration) -080c Datalogic S.p.A. - 0300 Gryphon D120 Barcode Scanner - 0400 Gryphon D120 Barcode Scanner - 0500 Gryphon D120 Barcode Scanner - 0600 Gryphon M100 Barcode Scanner -080d Teco Image Systems Co., Ltd - 0102 Hercules Scan@home 48 - 0104 3.2Slim - 0110 UMAX AstraSlim 1200 Scanner -0810 Personal Communication Systems, Inc. - 0001 Dual PSX Adaptor - 0002 Dual PCS Adaptor -0813 Mattel, Inc. - 0001 Intel Play QX3 Microscope - 0002 Dual Mode Camera Plus -0819 eLicenser - 0101 License Management and Copy Protection -081a MG Logic - 1000 Duo Pen Tablet -081b Indigita Corp. - 0600 Storage Adapter - 0601 Storage Adapter -081c Mipsys -081e AlphaSmart, Inc. - df00 Handheld -0822 Reudo Corp. - 2001 IRXpress Infrared Device -0825 GC Protronics -0826 Data Transit -0827 BroadLogic, Inc. -0828 Sato Corp. -0829 DirecTV Broadband, Inc. (Telocity) -082d Handspring - 0100 Visor - 0200 Treo - 0300 Treo 600 - 0400 Handheld - 0500 Handheld - 0600 Handheld -0830 Palm, Inc. - 0001 m500 - 0002 m505 - 0003 m515 - 0004 Handheld - 0005 Handheld - 0006 Handheld - 0010 Handheld - 0011 Handheld - 0012 Handheld - 0013 Handheld - 0014 Handheld - 0020 i705 - 0021 Handheld - 0022 Handheld - 0023 Handheld - 0024 Handheld - 0030 Handheld - 0031 Tungsten W - 0032 Handheld - 0033 Handheld - 0034 Handheld - 0040 m125 - 0041 Handheld - 0042 Handheld - 0043 Handheld - 0044 Handheld - 0050 m130 - 0051 Handheld - 0052 Handheld - 0053 Handheld - 0054 Handheld - 0060 Tungsten C/E/T/T2/T3 / Zire 71 - 0061 Lifedrive / Treo 650/680 / Tunsten E2/T5/TX / Centro / Zire 21/31/72 / Z22 - 0062 Handheld - 0063 Handheld - 0064 Handheld - 0070 Zire - 0071 Handheld - 0072 Handheld - 0080 Serial Adapter [for Palm III] - 0081 Handheld - 0082 Handheld - 00a0 Treo 800w - 0101 Pre -0832 Kouwell Electronics Corp. - 5850 Cable -0833 Sourcenext Corp. - 012e KeikaiDenwa 8 with charger - 039f KeikaiDenwa 8 -0835 Action Star Enterprise Co., Ltd -0839 Samsung Techwin Co., Ltd - 0005 Digimax Camera - 0008 Digimax 230 Camera - 0009 Digimax 340 - 000a Digimax 410 - 000e Digimax 360 - 0010 Digimax 300 - 1003 Digimax 210SE - 1005 Digimax 220 - 1009 Digimax V4 - 1012 6500 Document Camera - 1058 S730 Camera - 1064 Digimax D830 Camera - 1542 Digimax 50 Duo - 3000 Digimax 35 MP3 -083a Accton Technology Corp. - 1046 10/100 Ethernet [pegasus] - 1060 HomeLine Adapter - 1f4d SMC8013WG Broadband Remote NDIS Device - 3046 10/100 Series Adapter - 3060 1/10/100 Adapter - 3501 2664W - 3502 WN3501D Wireless Adapter - 3503 T-Sinus 111 Wireless Adapter - 4501 T-Sinus 154data - 4502 Siemens S30853-S1016-R107 802.11g Wireless Adapter [Intersil ISL3886] - 4505 SMCWUSB-G 802.11bg - 4507 SMCWUSBT-G2 802.11g Wireless Adapter [Atheros AR5523] - 4521 Siemens S30863-S1016-R107-2 802.11g Wireless Adapter [Intersil ISL3887] - 5046 SpeedStream 10/100 Ethernet [pegasus] - 5501 Wireless Adapter 11g - 6500 Cable Modem - 6618 802.11n Wireless Adapter - 7511 Arcadyan 802.11N Wireless Adapter - 7512 Arcadyan 802.11N Wireless Adapter - 7522 Arcadyan 802.11N Wireless Adapter - 8522 Arcadyan 802.11N Wireless Adapter - 8541 WN4501F 802.11g Wireless Adapter [Intersil ISL3887] - a512 Arcadyan 802.11N Wireless Adapter - a618 SMCWUSBS-N EZ Connect N Draft 11n Wireless Adapter [Ralink RT2870] - a701 SMCWUSBS-N3 EZ Connect N Wireless Adapter [Ralink RT3070] - b004 CPWUE001 USB/Ethernet Adapter - b522 SMCWUSBS-N2 EZ Connect N Wireless Adapter [Ralink RT2870] - bb01 BlueExpert Bluetooth Device - c003 802.11b Wireless Adapter - c501 Zoom Wireless-G - c561 802.11a/g Wireless Adapter - d522 Speedport W 102 Stick IEEE 802.11n USB 2.0 Adapter - e501 ZD1211B - e503 Arcadyan WN4501 802.11b/g - e506 WUS-201 802.11bg - f501 802.11g Wireless Adapter - f502 802.11g Wireless Adapter - f522 Arcadyan WN7512 802.11n -083f Global Village - b100 TelePort V.90 Fax/Modem -0840 Argosy Research, Inc. - 0060 Storage Adapter Bridge Module -0841 Rioport.com, Inc. - 0001 Rio 500 -0844 Welland Industrial Co., Ltd -0846 NetGear, Inc. - 1001 EA101 10 Mbps 10BASE-T Ethernet [Kawasaki LSI KL5KLUSB101B] - 1002 Ethernet - 1020 FA101 Fast Ethernet USB 1.1 - 1040 FA120 Fast Ethernet USB 2.0 [Asix AX88172 / AX8817x] - 4110 MA111(v1) 802.11b Wireless [Intersil Prism 3.0] - 4200 WG121(v1) 54 Mbps Wireless [Intersil ISL3886] - 4210 WG121(v2) 54 Mbps Wireless [Intersil ISL3886] - 4220 WG111(v1) 54 Mbps Wireless [Intersil ISL3886] - 4230 MA111(v2) 802.11b Wireless [SIS SIS 162] - 4240 WG111(v1) rev 2 54 Mbps Wireless [Intersil ISL3887] - 4250 WG111T 802.11g Wireless Adapter [Atheros AR5523] - 4260 WG111v3 54 Mbps Wireless [realtek RTL8187B] - 4300 WG111U Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX] - 4301 WG111U (no firmware) Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX] - 5f00 WPN111 802.11g Wireless Adapter [Atheros AR5523] - 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) RangeMax Next Wireless [Atheros AR9001U-(2)NG] - 9010 WNDA3100(v1) 802.11n [Atheros AR9001U-(2)NG] - 9011 WNDA3100(v2) 802.11n [Broadcom BCM4323] - 9018 WNDA3200 802.11abgn Wireless Adapter [Atheros AR7010+AR9280] - 9020 WNA3100(v1) Wireless-N 300 [Broadcom BCM43231] - 9030 WNA1100 Wireless-N 150 [Atheros AR9271] - 9040 WNA1000 Wireless-N 150 [Atheros AR9001U-(2)NG] - a001 PA101 10 Mbps HPNA Home Phoneline RJ-1 -084d Minton Optic Industry Co., Inc. - 0001 Jenoptik JD800i - 0003 S-Cam F5/D-Link DSC-350 Digital Camera - 0011 Argus DC3500 Digital Camera - 0014 Praktica DC 32 - 0019 Praktica DPix3000 - 0025 Praktica DC 60 - 1001 ScanHex SX-35d -084e KB Gear - 0001 JamCam Camera - 1001 Jam Studio Tablet - 1002 Pablo Tablet -084f Empeg - 0001 Empeg-Car Mark I/II Player -0850 Fast Point Technologies, Inc. -0851 Macronix International Co., Ltd - 1542 SiPix Blink - 1543 Maxell WS30 Slim Digital Camera, or Pandigital PI8004W01 digital photo frame - a168 MXIC -0852 CSEM -0853 Topre Corporation - 0100 HHKB Professional -0854 ActiveWire, Inc. - 0100 I/O Board - 0101 I/O Board, rev1 -0856 B&B Electronics - ac01 uLinks USOTL4 RS422/485 Adapter -0858 Hitachi Maxell, Ltd - 3102 Bluetooth Device - ffff Maxell module with BlueCore in DFU mode -0859 Minolta Systems Laboratory, Inc. -085a Xircom - 0001 Portstation Dual Serial Port - 0003 Portstation Paraller Port - 0008 Ethernet - 0009 Ethernet - 000b Portstation Dual PS/2 Port - 0021 1 port to Serial Converter - 0022 Parallel Port - 0023 2 port to Serial Converter - 0024 Parallel Port - 0027 1 port to Serial Converter - 0028 PortGear to SCSI Converter - 0032 PortStation SCSI Module - 003c Bluetooth Adapter - 0299 Colorvision, Inc. Monitor Spyder - 8021 1 port to Serial - 8023 2 port to Serial - 8027 PGSDB9 Serial Port -085c ColorVision, Inc. - 0200 Monitor Spyder -0862 Teletrol Systems, Inc. -0863 Filanet Corp. -0864 NetGear, Inc. - 4100 MA101 802.11b Adapter - 4102 MA101 802.11b Adapter -0867 Data Translation, Inc. - 9812 ECON Data acquisition unit - 9816 DT9816 ECON data acquisition module - 9836 DT9836 data acquisition card -086a Emagic Soft- und Hardware GmbH - 0001 Unitor8 - 0002 AMT8 - 0003 MT4 -086c DeTeWe - Deutsche Telephonwerke AG & Co. - 1001 Eumex 504PC ISDN TA - 1002 Eumex 504PC (FlashLoad) - 1003 TA33 ISDN TA - 1004 TA33 (FlashLoad) - 1005 Eumex 604PC HomeNet - 1006 Eumex 604PC HomeNet (FlashLoad) - 1007 Eumex 704PC DSL - 1008 Eumex 704PC DSL (FlashLoad) - 1009 Eumex 724PC DSL - 100a Eumex 724PC DSL (FlashLoad) - 100b OpenCom 30 - 100c OpenCom 30 (FlashLoad) - 100d BeeTel Home 100 - 100e BeeTel Home 100 (FlashLoad) - 1011 USB2DECT - 1012 USB2DECT (FlashLoad) - 1013 Eumex 704PC LAN - 1014 Eumex 704PC LAN (FlashLoad) - 1021 OpenCom 40 - 1022 OpenCom 40 (FlashLoad) - 1023 OpenCom 45 - 1024 OpenCom 45 (FlashLoad) - 1025 Sinus 61 data - 1029 dect BOX - 102c Eumex 604PC HomeNet [FlashLoad] - 1030 Eumex 704PC DSL [FlashLoad] - 1032 OpenCom 40 [FlashLoad] - 1033 OpenCom 30 plus - 1034 OpenCom 30 plus (FlashLoad) - 1055 Eumex 220 ISDN TA - 2000 OpenCom 1000 -086e System TALKS, Inc. - 1920 SGC-X2UL -086f MEC IMEX, Inc. -0870 Metricom - 0001 Ricochet GS -0871 SanDisk, Inc. - 0001 SDDR-01 Compact Flash Reader - 0002 SDDR-31 Compact Flash Reader - 0005 SDDR-05 Compact Flash Reader -0873 Xpeed, Inc. -0874 A-Tec Subsystem, Inc. -0879 Comtrol Corp. -087c Adesso/Kbtek America, Inc. -087d Jaton Corp. - 5704 Ethernet -087e Fujitsu Computer Products of America -087f Virtual IP Group, Inc. -0880 APT Technologies, Inc. -0883 Recording Industry Association of America (RIAA) -0885 Boca Research, Inc. -0886 XAC Automation Corp. - 0630 Intel PC Camera CS630 -0887 Hannstar Electronics Corp. -088b MassWorks, Inc. - 4944 MassWorks ID-75 TouchScreen -088c Swecoin AB - 2030 Ticket Printer TTP 2030 -088e iLok - 5036 Portable secure storage for software licenses -0892 DioGraphy, Inc. - 0101 Smartdio Reader/Writer -0897 Lauterbach - 0002 Power Debug/Power Debug II -089c United Technologies Research Cntr. -089d Icron Technologies Corp. -089e NST Co., Ltd -089f Primex Aerospace Co. -08a5 e9, Inc. -08a8 Andrea Electronics -08ae Macally (Mace Group, Inc.) -08b4 Sorenson Vision, Inc. -08b7 NATSU - 0001 Playstation adapter -08b8 J. Gordon Electronic Design, Inc. - 01f4 USBSIMM1 -08b9 RadioShack Corp. (Tandy) -08bb Texas Instruments Japan - 2702 Speakers - 2900 PCM2900 Audio Codec - 2901 PCM2901 Audio Codec - 2902 PCM2902 Audio Codec - 2904 PCM2904 Audio Codec - 2910 PCM2912 Audio Codec -08bd Citizen Watch Co., Ltd - 0208 CLP-521 Label Printer - 1100 X1-USB Floppy -08c3 Precise Biometrics - 0001 100 SC - 0002 100 A - 0003 100 SC BioKeyboard - 0006 100 A BioKeyboard - 0100 100 MC ISP - 0101 100 MC FingerPrint and SmartCard Reader - 0300 100 AX - 0400 100 SC - 0401 150 MC - 0402 200 MC FingerPrint and SmartCard Reader - 0404 100 SC Upgrade - 0405 150 MC Upgrade - 0406 100 MC Upgrade -08c4 Proxim, Inc. - 0100 Skyline 802.11b Wireless Adapter - 02f2 Farallon Home Phoneline Adapter -08c7 Key Nice Enterprise Co., Ltd -08c8 2Wire, Inc. -08c9 Nippon Telegraph and Telephone Corp. -08ca Aiptek International, Inc. - 0001 Tablet - 0010 Tablet - 0020 APT-6000U Tablet - 0021 APT-2 Tablet - 0022 Tablet - 0023 Tablet - 0024 Tablet - 0100 Pen Drive - 0102 DualCam - 0103 Pocket DV Digital Camera - 0104 Pocket DVII - 0105 Mega DV(Disk) - 0106 Pocket DV3100+ - 0107 Pocket DV3100 - 0109 Nisis DV4 Digital Camera - 010a Trust 738AV LCD PV Mass Storage - 0111 PenCam VGA Plus - 2008 Mini PenCam 2 - 2010 Pocket CAM 3 Mega (webcam) - 2011 Pocket CAM 3 Mega (storage) - 2016 PocketCam 2 Mega - 2018 Pencam SD 2M - 2020 Slim 3000F - 2022 Slim 3200 - 2024 Pocket DV3500 - 2028 Pocket Cam4M - 2040 Pocket DV4100M - 2042 Pocket DV5100M Composite Device - 2043 Pocket DV5100M (Disk) - 2060 Pocket DV5300 -08cd Jue Hsun Ind. Corp. -08ce Long Well Electronics Corp. -08cf Productivity Enhancement Products -08d1 smartBridges, Inc. - 0001 smartNIC Ethernet [catc] - 0003 smartNIC 2 PnP Ethernet -08d3 Virtual Ink -08d4 Fujitsu Siemens Computers - 0009 SCR SmartCard Reader -08d8 IXXAT Automation GmbH - 0002 USB-to-CAN compact - 0003 USB-to-CAN II - 0100 USB-to-CAN -08d9 Increment P Corp. -08dd Billionton Systems, Inc. - 0112 Wireless LAN Adapter - 0113 Wireless LAN Adapter - 0986 USB-100N Ethernet [pegasus] - 0987 USBLP-100 HomePNA Ethernet [pegasus] - 0988 USBEL-100 Ethernet [pegasus] - 1986 10/100 LAN Adapter - 2103 DVB-T TV-Tuner Card-R - 8511 USBE-100 Ethernet [pegasus2] - 90ff USB2AR Ethernet -08de ??? - 7a01 802.11b Adapter -08df Spyrus, Inc. - 0001 Rosetta Token V1 - 0002 Rosetta Token V2 - 0003 Rosetta Token V3 - 0a00 Lynks Interface -08e3 Olitec, Inc. - 0002 USB-RS232 Bridge - 0100 Interface ADSL - 0101 Interface ADSL - 0102 ADSL - 0301 RNIS -08e4 Pioneer Corp. -08e5 Litronic -08e6 Gemplus - 0001 GemPC-Touch 430 - 0430 GemPC430 SmartCard Reader - 0432 GemPC432 SmartCard Reader - 0435 GemPC435 SmartCard Reader - 0437 GemPC433 SL SmartCard Reader - 1359 UA SECURE STORAGE TOKEN - 2202 Gem e-Seal Pro Token - 3437 GemPC Twin SmartCard Reader - 3438 GemPC Key SmartCard Reader - 3478 PinPad Smart Card Reader - 4433 GemPC433-Swap - 5501 GemProx-PU Contactless Smart Card Reader - ace0 UA HYBRID TOKEN -08e7 Pan-International Wire & Cable -08e8 Integrated Memory Logic -08e9 Extended Systems, Inc. - 0100 XTNDAccess IrDA Dongle -08ea Ericsson, Inc., Blue Ridge Labs - 00c9 ADSL Modem HM120dp Loader - 00ca ADSL WAN Modem HM120dp - 00ce HM230d Virtual Bus for Helium - abba USB Driver for Bluetooth Wireless Technology - abbb Bluetooth Device in DFU State -08ec M-Systems Flash Disk Pioneers - 0001 TravelDrive 2C - 0002 TravelDrive 2C - 0005 TravelDrive 2C - 0008 TravelDrive 2C - 0010 DiskOnKey - 0011 DiskOnKey - 0012 TravelDrive 2C - 0014 TravelDrive 2C - 0015 Kingston DataTraveler ELITE - 0016 Kingston DataTraveler U3 - 0020 TravelDrive - 0021 TravelDrive - 0022 TravelDrive - 0023 TravelDrive - 0024 TravelDrive - 0025 TravelDrive - 0026 TravelDrive - 0027 TravelDrive - 0028 TravelDrive - 0029 TravelDrive - 0030 TravelDrive - 0822 TravelDrive 2C - 0832 Hi-Speed Mass Storage Device - 0834 M-Disk 220 - 0998 Kingston Data Traveler2.0 Disk Driver - 0999 Kingston Data Traveler2.0 Disk Driver - 1000 TravelDrive 2C - 2000 TravelDrive 2C - 2038 TravelDrive - 2039 TravelDrive - 204a TravelDrive - 204b TravelDrive -08ed MediaTek Inc. - 0002 CECT M800 memory card -08ee CCSI/Hesso -08f0 Corex Technologies -08f1 CTI Electronics Corp. -08f2 Gotop Information Inc. - 007f Super Q2 Tablet -08f5 SysTec Co., Ltd -08f6 Logic 3 International, Ltd -08f7 Vernier - 0001 LabPro - 0002 EasyTemp/Go!Temp - 0003 Go!Link - 0004 Go!Motion -08f8 Keen Top International Enterprise Co., Ltd -08f9 Wipro Technologies -08fa Caere -08fb Socket Communications -08fc Sicon Cable Technology Co., Ltd -08fd Digianswer A/S - 0001 Bluetooth Device -08ff AuthenTec, Inc. - 1600 AES1600 - 1610 AES1600 - 2500 AES2501 - 2501 AES2501 - 2502 AES2501 - 2503 AES2501 - 2504 AES2501 - 2505 AES2501 - 2506 AES2501 - 2507 AES2501 - 2508 AES2501 - 2509 AES2501 - 250a AES2501 - 250b AES2501 - 250c AES2501 - 250d AES2501 - 250e AES2501 - 250f AES2501 - 2510 AES2510 - 2580 AES2501 Fingerprint Sensor - 2588 AES2501 - 2589 AES2501 - 258a AES2501 - 258b AES2501 - 258c AES2501 - 258d AES2501 - 258e AES2501 - 258f AES2501 - 2810 AES2810 - 3400 AES3400 TruePrint Sensor - 3401 AES3400 Sensor - 3402 AES3400 Sensor - 3403 AES3400 Sensor - 3404 AES3400 TruePrint Sensor - 3405 AES3400 TruePrint Sensor - 3406 AES3400 TruePrint Sensor - 3407 AES3400 TruePrint Sensor - 4902 BioMV with TruePrint AES3500 - 4903 BioMV with TruePrint AES3400 - 5500 AES4000 - 5501 AES4000 TruePrint Sensor - 5503 AES4000 TruePrint Sensor - 5505 AES4000 TruePrint Sensor - 5507 AES4000 TruePrint Sensor - 55ff AES4000 TruePrint Sensor. - 5700 AES3500 Fingerprint Reader - 5701 AES3500 TruePrint Sensor - 5702 AES3500 TruePrint Sensor - 5703 AES3500 TruePrint Sensor - 5704 AES3500-BZ TruePrint Sensor - 5705 AES3500-BZ TruePrint Sensor - 5706 AES3500-BZ TruePrint Sensor - 5707 AES3500-BZ TruePrint Sensor - 5710 AES3500 TruePrint Sensor - 5711 AES3500 TruePrint Sensor - 5712 AES3500 TruePrint Sensor - 5713 AES3500 TruePrint Sensor - 5714 AES3500-BZ TruePrint Sensor - 5715 AES3500-BZ TruePrint Sensor - 5716 AES3500-BZ TruePrint Sensor - 5717 AES3500-BZ TruePrint Sensor - 5730 AES3500 TruePrint Sensor - 5731 AES3500 TruePrint Sensor - 5732 AES3500 TruePrint Sensor - 5733 AES3500 TruePrint Sensor - 5734 AES3500-BZ TruePrint Sensor - 5735 AES3500-BZ TruePrint Sensor - 5736 AES3500-BZ TruePrint Sensor - 5737 AES3500-BZ TruePrint Sensor - afe3 FingerLoc Sensor Module (Anchor) - afe4 FingerLoc Sensor Module (Anchor) - afe5 FingerLoc Sensor Module (Anchor) - afe6 FingerLoc Sensor Module (Anchor) - fffd AES2510 Sensor (USB Emulator) - ffff Sensor (Emulator) -0900 Pinnacle Systems, Inc. -0901 VST Technologies - 0001 Hard Drive Adapter (TPP) - 0002 SigmaDrive Adapter (TPP) -0906 Faraday Technology Corp. -0908 ShenZhen SANZHAI Technology Co.,Ltd - 2701 Spy Pen VGA -0909 Audio-Technica Corp. -090a Trumpion Microelectronics, Inc. - 1001 T33520 Flash Card Controller - 1100 Comotron C3310 MP3 player - 1200 MP3 player - 1540 Digitex Container Flash Disk -090b Neurosmith -090c Silicon Motion, Inc. - Taiwan (formerly Feiya Technology Corp.) - 0371 Silicon Motion SM371 Camera - 0373 Silicon Motion Camera - 037a Silicon Motion Camera - 037b Silicon Motion Camera - 1000 Flash Drive - 1132 5-in-1 Card Reader - 337b Silicon Motion Camera - 3710 Silicon Motion Camera - 3720 Silicon Motion Camera - 37c0 Silicon Motion Camera - 6000 SD/SDHC Card Reader (SG365 / FlexiDrive XC+) - 6200 microSD card reader - 837b Silicon Motion Camera - 937b Silicon Motion Camera - b370 Silicon Motion SM370 Camera - b371 Silicon Motion SM371 Camera -090d Multiport Computer Vertriebs GmbH -090e Shining Technology, Inc. -090f Fujitsu Devices, Inc. -0910 Alation Systems, Inc. -0911 Philips Speech Processing - 2512 SpeechMike Pro -0912 Voquette, Inc. -0915 GlobeSpan, Inc. - 0001 DSL Modem - 0002 ADSL ATM Modem - 0005 LAN Modem - 2000 802.11 Adapter - 2002 802.11 Adapter - 8000 ADSL LAN Modem - 8005 DSL-302G Modem - 8101 ADSL WAN Modem - 8102 DSL-200 ADSL Modem - 8103 DSL-200 ADSL Modem - 8104 DSL-200 Modem - 8400 DSL Modem - 8401 DSL Modem - 8402 DSL Modem - 8500 DSL Modem - 8501 DSL Modem -0917 SmartDisk Corp. - 0001 eFilm Reader-11 SM/CF - 0002 eFilm Reader-11 SM - 0003 eFilm Reader-11 CF - 0200 FireFly - 0201 FireLite - 0202 STORAGE ADAPTER (FirePower) - 0204 FlashTrax Storage - 0205 STORAGE ADAPTER (CrossFire) - 0206 FireFly 20G HDD - 0207 FireLite - 020f STORAGE ADAPTER (FireLite) - da01 eFilm Reader-11 Test - ffff eFilm Reader-11 (Class/PDR) -0919 Tiger Electronics - 0100 Fast Flicks Digital Camera -091e Garmin International - 0003 GPS (various models) - 0004 iQue 3600 - 0200 Data Card Programmer (install) - 1200 Data Card Programmer - 21a5 etrex Cx (msc) - 2271 Edge 605/705 - 2295 Colorado 300 - 22b6 eTrex Vista HCx (Mass Storage mode) - 2353 Nüvi 205T - 2535 Edge 800 -0920 Echelon Co. - 7500 Network Interface -0921 GoHubs, Inc. - 1001 GoCOM232 Serial -0922 Dymo-CoStar Corp. - 0007 LabelWriter 330 - 0009 LabelWriter 310 -0923 IC Media Corp. - 010f SIIG MobileCam -0924 Xerox - 23dd DocuPrint M760 (X760_USB) - 3ce8 Phaser 3428 Printer - 3d5b Phaser 6115MFP TWAIN Scanner - 420f WorkCentre PE220 Series - 421f M20 Scanner - 423b Printing Support - ffef WorkCenter M15 - fffb DocuPrint M750 (X750_USB) -0925 Lakeview Research - 0005 Gamtec.,Ltd SmartJoy PLUS Adapter - 8101 Phidgets, Inc., 1-Motor PhidgetServo v2.0 - 8104 Phidgets, Inc., 4-Motor PhidgetServo v2.0 - 8800 WiseGroup Ltd, MP-8800 Quad Joypad - 8866 WiseGroup Ltd, MP-8866 Dual Joypad -0927 Summus, Ltd -0928 Oxford Semiconductor, Ltd -0929 American Biometric Co. -092a Toshiba Information & Industrial Sys. And Services -092b Sena Technologies, Inc. -092f Northern Embedded Science/CAVNEX - 0004 JTAG-4 - 0005 JTAG-5 -0930 Toshiba Corp. - 0009 Gigabeat F/X (HDD audio player) - 000c Gigabeat F (mtp) - 0010 Gigabeat S (mtp) - 0301 PCX1100U Cable Modem (WDM) - 0302 PCX2000 Cable Modem (WDM) - 0305 Cable Modem PCX3000 - 0307 Cable Modem PCX2500 - 0308 PCX2200 Cable Modem (WDM) - 0309 PCX5000 Cable Modem (WDM) - 030b Cable Modem PCX2600 - 0501 Bluetooth Controller - 0502 Integrated Bluetooth - 0503 Bluetooth Controller - 0505 Integrated Bluetooth - 0506 Integrated Bluetooth - 0507 Bluetooth Adapter - 0508 Integrated Bluetooth HCI - 0509 BT EDR Dongle - 0706 PocketPC e740 - 0707 Pocket PC e330 Series - 0708 Pocket PC e350 Series - 0709 Pocket PC e750 Series - 070a Pocket PC e400 Series - 070b Pocket PC e800 Series - 0a07 WLM-10U1 802.11abgn Wireless Adapter [Ralink RT3572] - 0b05 PX1220E-1G25 External hard drive - 0b09 PX1396E-3T01 External hard drive - 1300 Wireless Broadband (CDMA EV-DO) SM-Bus Minicard Status Port - 1301 Wireless Broadband (CDMA EV-DO) Minicard Status Port - 1302 Wireless Broadband (3G HSDPA) SM-Bus Minicard Status Port - 1303 Wireless Broadband (3G HSDPA) Minicard Status Port - 1308 Broadband (3G HSDPA) SM-Bus Minicard Diagnostics Port - 130b F3507g Mobile Broadband Module - 130c F3607gw Mobile Broadband Module - 1311 F3607gw v2 Mobile Broadband Module - 642f TravelDrive - 6506 TravelDrive 2C - 6507 TravelDrive 2C - 6508 TravelDrive 2C - 6509 TravelDrive 2C - 6510 TravelDrive 2C - 6517 TravelDrive 2C - 6518 TravelDrive 2C - 6519 Kingston DataTraveler 2.0 USB Stick - 651a TravelDrive 2C - 651b TravelDrive 2C - 651c TravelDrive 2C - 651d TravelDrive 2C - 651e TravelDrive 2C - 651f TravelDrive 2C - 6520 TravelDrive 2C - 6521 TravelDrive 2C - 6522 TravelDrive 2C - 6523 TravelDrive - 6524 TravelDrive - 6525 TravelDrive - 6526 TravelDrive - 6527 TravelDrive - 6528 TravelDrive - 6529 TravelDrive - 652a TravelDrive - 652b TravelDrive - 652c TravelDrive - 652d TravelDrive - 652f TravelDrive - 6530 TravelDrive - 6531 TravelDrive - 6532 256M Stick - 6533 512M Stick - 6534 TravelDrive - 653c Kingston DataTraveler 2.0 Stick (512M) - 653d Kingston DataTraveler 2.0 Stick (1GB) - 653e Flash Memory - 6540 TransMemory Flash Memory - 6544 Kingston DataTraveler 2.0 Stick (2GB) - 6545 Kingston DataTraveler 102 Flash Drive / HEMA Flash Drive 2 GB / PNY Attache 4GB Stick -0931 Harmonic Data Systems, Ltd -0932 Crescentec Corp. - 0300 VideoAdvantage - 0302 Syntek DC-112X - 0320 VideoAdvantage - 0482 USB2.0 TVBOX - 1100 DC-1100 Video Enhamcement Device - 1112 Veo Web Camera - a311 Video Enhancement Device -0933 Quantum Corp. -0934 Netcom Systems -0936 NuTesla - 0030 Composite Device, Mass Storage Device (Flash Drive) amd HID - 003c Rhythmedics HID Bootloader -0939 Lumberg, Inc. -093a Pixart Imaging, Inc. - 0007 CMOS 100K-R Rev. 1.90 - 010e Digital camera, CD302N/Elta Medi@ digi-cam/HE-501A - 010f Argus DC-1610/DC-1620/Emprex PCD3600/Philips P44417B keychain camera/Precision Mini,Model HA513A/Vivitar Vivicam 55 - 020f Bullet Line Photo Viewer - 050f Mars-Semi Pc-Camera - 2460 Q-TEC WEBCAM 100 - 2468 SoC PC-Camera - 2470 SoC PC-Camera - 2471 SoC PC-Camera - 2500 USB Optical Mouse - 2510 Optical Mouse - 2600 Typhoon Easycam USB 330K (newer)/Typhoon Easycam USB 2.0 VGA 1.3M/Sansun SN-508 - 2601 SPC 610NC Laptop Camera - 2603 PAC7312 Camera - 2608 PAC7311 Trust WB-3300p - 260e PAC7311 Gigaware VGA PC Camera:Trust WB-3350p:SIGMA cam 2350 - 260f PAC7311 SnakeCam - 2621 PAC731x Trust Webcam - 2624 Webcam -093b Plextor Corp. - 0010 Storage Adapter - 0011 PlexWriter 40/12/40U - 0041 PX-708A DVD RW - 0042 PX-712UF DVD RW - a002 ConvertX M402U XLOADER - a003 ConvertX AV100U A/V Capture Audio - a004 ConvertX TV402U XLOADER - a005 ConvertX TV100U A/V Capture - a102 ConvertX M402U A/V Capture - a104 ConvertX PX-TV402U/NA -093c Intrepid Control Systems, Inc. - 0601 ValueCAN - 0701 NeoVI Blue vehicle bus interface -093d InnoSync, Inc. -093e J.S.T. Mfg. Co., Ltd -093f Olympia Telecom Vertriebs GmbH -0940 Japan Storage Battery Co., Ltd -0941 Photobit Corp. -0942 i2Go.com, LLC -0943 HCL Technologies India Private, Ltd -0944 KORG, Inc. - 0001 PXR4 4-Track Digital Recorder - 0020 KAOSS Pad KP3 Dynamic Effect/Sampler - 010d nanoKEY MIDI keyboard - 010e nanoPAD pad controller - 010f nanoKONTROL studio controller - 0f03 K-Series K61P MIDI studio controller -0945 Pasco Scientific -0948 Kronauer music in digital - 0301 USB Pro (24/48) - 0302 USB Pro (24/96 playback) - 0303 USB Pro (24/96 record) - 0304 USB Pro (16/48) - 1105 USB One -094b Linkup Systems Corp. - 0001 neonode N2 -094d Cable Television Laboratories -094f Yano - 0101 U640MO-03 - 05fc METALWEAR-HDD -0951 Kingston Technology - 0008 Ethernet - 000a KNU101TX 100baseTX Ethernet - 1600 DataTraveler II Pen Drive - 1601 DataTraveler II+ Pen Drive - 1602 DataTraveler Mini - 1603 DataTraveler 1GB/2GB Pen Drive - 1607 DataTraveler 100 - 1613 DataTraveler DT101C Flash Drive - 1616 Kingston DataTraveler Locker (4GB) - 1624 DataTraveler G2 - 1625 DataTraveler 101 II - 162a DataTraveler 112 4GB Pen Drive - 1643 DataTraveler G3 4GB -0954 RPM Systems Corp. -0955 NVidia Corp. -0956 BSquare Corp. -0957 Agilent Technologies, Inc. - 0200 E-Video DC-350 Camera - 0202 E-Video DC-350 Camera -0958 CompuLink Research, Inc. -0959 Cologne Chip AG - 2bd0 Intelligent ISDN (Ver. 3.60.04) -095a Portsmith - 3003 Express Ethernet -095b Medialogic Corp. -095c K-Tec Electronics -095d Polycom, Inc. - 0001 Polycom ViaVideo -0967 Acer (??) - 0204 WarpLink 802.11b Adapter -0968 Catalyst Enterprises, Inc. -096e Feitian Technologies, Inc. - 0802 ePass2000 (G&D STARCOS SPK 2.4) -0971 Gretag-Macbeth AG - 2003 Eye-One display - 2005 Huey - 2007 ColorMunki -0973 Schlumberger - 0001 e-gate Smart Card -0974 Datagraphix, a business unit of Anacomp -0975 OL'E Communications, Inc. -0976 Adirondack Wire & Cable -0977 Lightsurf Technologies -0978 Beckhoff GmbH -0979 Jeilin Technology Corp., Ltd - 0224 JL2005A Toy Camera - 0226 JL2005A Toy Camera -097a Minds At Work LLC - 0001 Digital Wallet -097b Knudsen Engineering, Ltd -097c Marunix Co., Ltd -097d Rosun Technologies, Inc. -097f Barun Electronics Co., Ltd -0981 Oak Technology, Ltd -0984 Apricorn - 0200 Hard Drive Storage (TPP) -0985 cab Produkttechnik GmbH & Co KG - 0045 Mach4/200 Label Printer - 00a3 A3/200 or A3/300 Label Printer -0986 Matsushita Electric Works, Ltd. -098c Vitana Corp. -098d INDesign -098e Integrated Intellectual Property, Inc. -098f Kenwood TMI Corp. -0993 Gemstar eBook Group, Ltd - 0001 REB1100 eBook Reader - 0002 eBook -0996 Integrated Telecom Express, Inc. -099a Zippy Technology Corp. - 0638 Sanwa Supply Inc. Small Keyboard - 610c EL-610 Super Mini Electron luminescent Keyboard - 7160 Hyper Slim Keyboard -09a3 PairGain Technologies -09a4 Contech Research, Inc. -09a5 VCON Telecommunications -09a6 Poinchips - 8001 Mass Storage Device -09a7 Data Transmission Network Corp. -09a8 Lin Shiung Enterprise Co., Ltd -09a9 Smart Card Technologies Co., Ltd -09aa Intersil Corp. - 1000 Prism GT 802.11b/g Adapter - 3642 Prism 2.x 802.11b Adapter -09ab Japan Cash Machine Co., Ltd. -09ae Tripp Lite -09b2 Franklin Electronic Publishers, Inc. - 0001 eBookman Palm Computer -09b3 Altius Solutions, Inc. -09b4 MDS Telephone Systems -09b5 Celltrix Technology Co., Ltd -09bc Grundig - 0002 MPaxx MP150 MP3 Player -09be MySmart.Com - 0001 MySmartPad -09bf Auerswald GmbH & Co. KG - 00c0 COMpact 2104 ISDN PBX - 00db COMpact 4410/2206 ISDN ISDN - 00f1 COMfort System Telephones -09c0 Genpix Electronics, LLC - 0202 8PSK DVB-S tuner - 0203 Skywalker-1 DVB-S tuner - 0204 Skywalker-CW3K DVB-S tuner - 0205 Skywalker-CW3K DVB-S tuner - 0206 Skywalker-2 DVB-S tuner -09c1 Arris Interactive LLC - 1337 TOUCHSTONE DEVICE -09c2 Nisca Corp. -09c3 ActivCard, Inc. - 0007 Reader V2 - 0008 ZFG-9800-AC SmartCard Reader -09c4 ACTiSYS Corp. - 0011 ACT-IR2000U IrDA Dongle -09c5 Memory Corp. -09cc Workbit Corp. - 0404 BAFO USB-ATA/ATAPI Bridge Controller -09cd Psion Dacom Home Networks, Ltd - 2001 Psion WaveFinder DAB radio receiver -09ce City Electronics, Ltd -09cf Electronics Testing Center, Taiwan -09d1 NeoMagic, Inc. -09d2 Vreelin Engineering, Inc. -09d3 Com One - 0001 ISDN TA -09d7 Novatel Wireless - 0100 NovAtel FlexPack GPS receiver -09d9 KRF Tech, Ltd -09da A4 Tech Co., Ltd - 0006 Optical Mouse WOP-35 / Trust 450L Optical Mouse - 000a Port Mouse - 0018 Trust Human Interface Device - 001a Wireless Mouse & RXM-15 Receiver - 002a Wireless Optical Mouse NB-30 - 022b Wireless Mouse (Battery Free) - 024f RF Receiver and G6-20D Wireless Optical Mouse - 032b Wireless Mouse (Battery Free) - 9090 XL-750BK Laser Mouse -09db Measurement Computing Corp. - 0075 MiniLab 1008 - 0076 PMD-1024 - 007a PMD-1208LS - 0081 USB-1616FS - 0082 USB-1208FS - 0088 USB-1616FS internal hub -09dc Aimex Corp. -09dd Fellowes, Inc. -09df Addonics Technologies Corp. -09e1 Intellon Corp. - 5121 MicroLink dLAN -09e5 Jo-Dan International, Inc. -09e6 Silutia, Inc. -09e7 Real 3D, Inc. -09e8 AKAI Professional M.I. Corp. - 0062 MPD16 MIDI Pad Controller Unit - 006d EWI electronic wind instrument - 0071 MPK25 MIDI Keyboard - 0076 LPK25 MIDI Keyboard -09e9 Chen-Source, Inc. -09eb IM Networks, Inc. - 4331 iRhythm Tuner Remote -09ef Xitel - 0101 MD-Port DG2 MiniDisc Interface -09f3 GoFlight, Inc. - 0018 GF-46 Multi-Mode Display Module - 0028 RP-48 Combination Pushbutton-Rotary Module - 0048 LGTII - Landing Gear and Trim Control Module - 0064 MCPPro - Airliner Mode Control Panel (Autopilot) - 0300 EFIS - Electronic Flight Information System -09f5 AresCom - 0168 Network Adapter - 0188 LAN Adapter - 0850 Adapter -09f6 RocketChips, Inc. -09f7 Edu-Science (H.K.), Ltd -09f8 SoftConnex Technologies, Inc. -09f9 Bay Associates -09fa Mtek Vision -09fb Altera - 6001 Blaster -09ff Gain Technology Corp. -0a00 Liquid Audio -0a01 ViA, Inc. -0a07 Ontrak Control Systems Inc. - 0064 ADU100 Data Acquisition Interface - 0078 ADU120 Data Acquisition Interface - 0082 ADU130 Data Acquisition Interface - 00c8 ADU200 Relay I/O Interface - 00d0 ADU208 Relay I/O Interface - 00da ADU218 Solid-State Relay I/O Interface -0a0b Cybex Computer Products Co. -0a11 Xentec, Inc. -0a12 Cambridge Silicon Radio, Ltd - 0001 Bluetooth Dongle (HCI mode) - 0002 Frontline Test Equipment Bluetooth Device - 0003 Nanosira - 0004 Nanosira WHQL Reference Radio - 0005 Nanosira-Multimedia - 0006 Nanosira-Multimedia WHQL Reference Radio - 0007 Nanosira3-ROM - 0008 Nanosira3-ROM - 0009 Nanosira4-EDR WHQL Reference Radio - 000a Nanosira4-EDR-ROM - 000b Nanosira5-ROM - 0043 Bluetooth Device - 0100 Casira with BlueCore2-External Module - 0101 Casira with BlueCore2-Flash Module - 0102 Casira with BlueCore3-Multimedia Module - 0103 Casira with BlueCore3-Flash Module - 0104 Casira with BlueCore4-External Module - 0105 Casira with BlueCore4-Multimedia Module - 1000 Bluetooth Dongle (HID proxy mode) - 1010 Bluetooth Device - 1011 Bluetooth Device - 1012 Bluetooth Device - ffff USB Bluetooth Device in DFU State -0a13 Telebyte, Inc. -0a14 Spacelabs Medical, Inc. -0a15 Scalar Corp. -0a16 Trek Technology (S) PTE, Ltd - 1111 ThumbDrive - 8888 IBM USB Memory Key - 9988 Trek2000 TD-G2 -0a17 Pentax Corp. - 0004 Optio 330 - 0006 Optio S - 0007 Optio 550 - 0009 Optio 33WR - 000a Optio 555 - 000c Optio 43WR (mass storage mode) - 000d Optio 43WR - 0015 Optio S40/S5i - 003b Optio 50 (mass storage mode) - 003d Optio S55 - 0043 *ist DL - 0047 Optio S60 - 0052 Optio 60 Digital Camera - 006e K10D - 0070 K100D - 0093 K200D - 00a7 Optio E50 - 1001 EI2000 Camera powered by Digita! -0a18 Heidelberger Druckmaschinen AG -0a19 Hua Geng Technologies, Inc. -0a21 Medtronic Physio Control Corp. - 8001 MMT-7305WW [Medtronic Minimed CareLink] -0a22 Century Semiconductor USA, Inc. -0a27 Datacard Group - 0102 SP35 -0a2c AK-Modul-Bus Computer GmbH - 0008 GPIO Ports -0a34 TG3 Electronics, Inc. - 0101 TG82tp - 0110 Deck 82-key backlit keyboard -0a35 Radikal Technologies - 002a SAC - Software Assigned Controller - 008a SAC Hub -0a39 Gilat Satellite Networks, Ltd -0a3a PentaMedia Co., Ltd - 0163 KN-W510U 1.0 Wireless LAN Adapter -0a3c NTT DoCoMo, Inc. -0a3d Varo Vision -0a3f Swissonic AG -0a43 Boca Systems, Inc. -0a46 Davicom Semiconductor, Inc. - 0268 ST268 - 6688 ZT6688 Fast Ethernet Adapter - 8515 ADMtek ADM8515 NIC - 9000 DM9000E Fast Ethernet Adapter - 9601 DM9601 Fast Ethernet Adapter -0a47 Hirose Electric -0a48 I/O Interconnect - 3233 Multimedia Card Reader - 3239 Multimedia Card Reader - 3258 Dane Elec zMate SD Reader - 3259 Dane Elec zMate CF Reader - 5000 MediaGear xD-SM - 500a Mass Storage Device - 500f Mass Storage Device - 5010 Mass Storage Device - 5011 Mass Storage Device - 5014 Mass Storage Device - 5020 Mass Storage Device - 5021 Mass Storage Device - 5022 Mass Storage Device - 5023 Mass Storage Device - 5024 Mass Storage Device - 5025 Mass Storage Device -0a4b Fujitsu Media Devices, Ltd -0a4c Computex Co., Ltd -0a4d Evolution Electronics, Ltd - 0064 MK-225 Driver - 0065 MK-225C Driver - 0066 MK-225C Driver - 0067 MK-425C Driver - 0078 MK-37 Driver - 0079 MK-37C Driver - 007a MK-37C Driver - 008c TerraTec MIDI MASTER - 008d MK-249C Driver - 008e MK-249C MIDI Keyboard - 008f MK-449C Driver - 0090 Keystation 49e Driver - 0091 Keystation 61es Driver - 00a0 MK-361 Driver - 00a1 MK-361C Driver - 00a2 MK-361C Driver - 00a3 MK-461C MIDI Keyboard - 00b5 Keystation Pro 88 Driver - 00d2 E-Keys Driver - 00f0 UC-16 Driver - 00f1 X-Session Driver - 00f5 UC-33e MIDI Controller -0a4e Steinberg Soft-und Hardware GmbH -0a4f Litton Systems, Inc. -0a50 Mimaki Engineering Co., Ltd -0a51 Sony Electronics, Inc. -0a52 Jebsee Electronics Co., Ltd -0a53 Portable Peripheral Co., Ltd - 1000 Scanner - 2000 Q-Scan A6 Scanner - 2001 Q-Scan A6 Scanner - 2013 Media Drive A6 Scanner - 2014 Media Drive A6 Scanner - 2015 BizCardReader 600C - 2016 BizCardReader 600C - 202a Scanshell-CSSN - 3000 Q-Scan A8 Scanner - 3002 Q-Scan A8 Reader - 3015 BizCardReader 300G - 302a LM9832 - PA570 Mini Business Card Scanner [Targus] - 5001 BizCardReader 900C -0a5a Electronics For Imaging, Inc. -0a5b EAsics NV -0a5c Broadcom Corp. - 0201 iLine10(tm) Network Adapter - 2000 Bluetooth Device - 2001 Bluetooth Device - 2009 Bluetooth Controller - 200a BCM2035 Bluetooth dongle - 200f Bluetooth Controller - 201d Bluetooth Device - 201e IBM Integrated Bluetooth IV - 2020 Bluetooth dongle - 2033 BCM2033 Bluetooth - 2035 BCM2035 Bluetooth - 2038 Blutonium Device - 2039 Bluetooth Device - 2045 Bluetooth Controller - 2046 Bluetooth Device - 2047 Bluetooth Device - 205e Bluetooth Device - 2100 Bluetooth 2.0+eDR dongle - 2101 Bluetooth Controller - 2102 ANYCOM Blue USB-200/250 - 2110 Bluetooth Controller - 2111 ANYCOM Blue USB-UHE 200/250 - 2120 2045 Bluetooth 2.0 USB-UHE Device with trace filter - 2121 BCM2210 Bluetooth - 2122 Bluetooth 2.0+EDR dongle - 2123 Bluetooth dongle - 2130 2045 Bluetooth 2.0 USB-UHE Device with trace filter - 2131 2045 Bluetooth 2.0 Device with trace filter - 2145 Bluetooth with Enhanced Data Rate II - 2148 BCM92046DG-CL1ROM Bluetooth 2.1 Adapter - 2150 BCM2046 Bluetooth Device - 2151 Bluetooth - 217f Bluetooth Controller - 219b Bluetooth 2.1 Device - 21b1 HP Bluetooth Module - 21b4 BCM2070 Bluetooth 2.1 + EDR - 21b9 BCM2070 Bluetooth 2.1 + EDR - 21ba BCM2070 Bluetooth 2.1 + EDR - 21bb BCM2070 Bluetooth 2.1 + EDR - 21bc BCM2070 Bluetooth 2.1 + EDR - 21bd BCM2070 Bluetooth 2.1 + EDR - 22be BCM2070 Bluetooth 3.0 + HS - 4500 BCM2046B1 USB 2.0 Hub (part of BCM2046 Bluetooth) - 4502 Keyboard (Boot Interface Subclass) - 4503 Mouse (Boot Interface Subclass) - 5800 BCM5880 Secure Applications Processor - 5801 BCM5880 Secure Applications Processor with fingerprint swipe sensor - 5802 BCM5880 Secure Applications Processor with fingerprint touch sensor - 5803 BCM5880 Secure Applications Processor with secure keyboard - 6300 Pirelli Remote NDIS Device - bd13 Arcadyan WN8522B [Broadcom BCM4323] - d11b Eminent EM4045 [Broadcom 4320 USB] -0a5d Diatrend Corp. -0a5f Zebra - 0009 LP2844 Printer - 0081 GK420t Label Printer - 008b HC100 wristbands Printer - 930a Printer -0a62 MPMan - 0010 MPMan MP-F40 MP3 Player -0a66 ClearCube Technology -0a67 Medeli Electronics Co., Ltd -0a68 Comaide Corp. -0a69 Chroma ate, Inc. -0a6b Green House Co., Ltd - 0001 Compact Flash R/W with MP3 player - 000f FlashDisk -0a6c Integrated Circuit Systems, Inc. -0a6d UPS Manufacturing -0a6e Benwin -0a6f Core Technology, Inc. - 0400 Xanboo -0a70 International Game Technology -0a71 VIPColor Technologies USA, Inc. - 0001 VP485 Printer -0a72 Sanwa Denshi -0a7d NSTL, Inc. -0a7e Octagon Systems Corp. -0a80 Rexon Technology Corp., Ltd -0a81 Chesen Electronics Corp. - 0101 Keyboard - 0103 Keyboard - 0203 Mouse - 0205 PS/2 Keyboard+Mouse Adapter - 0701 USB Missile Launcher -0a82 Syscan - 4600 TravelScan 460/464 -0a83 NextComm, Inc. -0a84 Maui Innovative Peripherals -0a85 Idexx Labs -0a86 NITGen Co., Ltd -0a8d Picturetel -0a8e Japan Aviation Electronics Industry, Ltd - 2011 Filter Driver For JAE XMC R/W -0a90 Candy Technology Co., Ltd -0a91 Globlink Technology, Inc. - 3801 Targus PAKP003 Mouse -0a92 EGO SYStems, Inc. - 0011 SYS WaveTerminal U2A - 0021 GIGAPort - 0031 GIGAPortAG - 0053 AudioTrak Optoplay - 0061 Waveterminal U24 - 0071 MAYA EX7 - 0091 Maya 44 - 00b1 MAYA EX5 - 1000 MIDI Mate - 1010 RoMI/O - 1020 M4U - 1030 M8U - 1090 KeyControl49 - 10a0 KeyControl25 -0a93 C Technologies AB - 0002 C-Pen 10 - 0005 MyPen Light - 000d Input Pen - 0010 C-Pen 20 - 0a93 PayPen -0a94 Intersense -0aa3 Lava Computer Mfg., Inc. -0aa4 Develco Elektronik -0aa5 First International Digital - 0002 irock! 500 Series - 0801 MP3 Player -0aa6 Perception Digital, Ltd - 0101 Hercules Jukebox - 1501 Store 'n' Go HD Drive -0aa7 Wincor Nixdorf International GmbH - 0100 POS Keyboard, TA58P-USB - 0101 POS Keyboard, TA85P-USB - 0102 POS Keyboard, TA59-USB - 0103 POS Keyboard, TA60-USB - 0104 SNIkey Keyboard, SNIKey-KB-USB - 0200 Operator Display, BA63-USB - 0201 Operator Display, BA66-USB - 0202 Operator Display & Scanner, XiCheck-BA63 - 0203 Operator Display & Scanner, XiCheck-BA66 - 0204 Graphics Operator Display, BA63GV - 0300 POS Printer (printer class mode), TH210 - 0301 POS Printer (native mode), TH210 - 0302 POS Printer (printer class mode), TH220 - 0303 POS Printer (native mode), TH220 - 0304 POS Printer, TH230 - 0305 Lottery Printer, XiPrintPlus - 0306 POS Printer (printer class mode), TH320 - 0307 POS Printer (native mode), TH320 - 0308 POS Printer (printer class mode), TH420 - 0309 POS Printer (native mode), TH420 - 030a POS Printer, TH200B - 0400 Lottery Scanner, Xiscan S - 0401 Lottery Scanner, Xiscan 3 - 0402 Programmable Magnetic Swipe Card Reader, MSRP-USB - 0500 IDE Adapter - 0501 Hub Printer Interface - 0502 Hub SNIKey Keyboard - 4304 Banking Printer TP07 - 4305 Banking Printer TP07c - 4500 WN Central Special Electronics -0aa8 TriGem Computer, Inc. - 0060 TG 11Mbps WLAN Mini Adapter - 1001 DreamComboM4100 - 3002 InkJet Color Printer - 8001 TG_iMON - 8002 TG_KLOSS - a001 TG_X2 - a002 TGVFD_KLOSS - ffda iMON_VFD -0aa9 Baromtec Co. - f01b Medion MD 6242 MP3 Player -0aaa Japan CBM Corp. -0aab Vision Shape Europe SA -0aac iCompression, Inc. -0aad Rohde & Schwarz GmbH & Co. KG -0aae NEC infrontia Corp. (Nitsuko) -0aaf Digitalway Co., Ltd -0ab0 Arrow Strong Electronics Co., Ltd -0ab1 FEIG ELECTRONIC GmbH - 0002 OBID RFID-Reader -0aba Ellisys - 8001 Tracker 110 Protocol Analyzer - 8002 Explorer 200 Protocol Analyzer -0abe Stereo-Link - 0101 SL1200 DAC -0abf Diolan - 3370 I2C/SPI Adapter - U2C-12 -0ac3 Sanyo Semiconductor Company Micro -0ac4 Leco Corp. -0ac5 I & C Corp. -0ac6 Singing Electrons, Inc. -0ac7 Panwest Corp. -0ac8 Z-Star Microelectronics Corp. - 0301 Web Camera - 0302 ZC0302 Webcam - 0321 Vimicro generic vc0321 Camera - 0323 Luxya WC-1200 USB 2.0 Webcam - 0328 A4Tech PK-130MG - 0336 Elecom UCAM-DLQ30 - 301b ZC0301 Webcam - 303b ZC0303 Webcam - 305b ZC0305 Webcam - 307b USB 1.1 Webcam - 332d Vega USB 2.0 Camera - 3343 Sirius USB 2.0 Camera - 3420 Venus USB2.0 Camera - c001 Sony embedded vimicro Camera - c002 Visual Communication Camera VGP-VCC1 - c302 Vega USB 2.0 Camera - c303 Saturn USB 2.0 Camera - c326 Namuga 1.3M Webcam - c33f Webcam -0ac9 Micro Solutions, Inc. - 0000 Backpack CD-ReWriter - 0001 BACKPACK 2 Cable - 0010 BACKPACK - 0011 Backpack 40GB Hard Drive - 0110 BACKPACK - 0111 BackPack - 1234 BACKPACK -0aca OPEN Networks Ltd - 1060 OPEN NT1 Plus II -0acc Koga Electronics Co. -0acd ID Tech - 0401 ID TECH Spectrum III Hybrid Smartcard Reader - 0630 ID TECH Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC -0ace ZyDAS - 1201 ZD1201 802.11b - 1211 ZEW 2501 802.11bg Wireless Adapter - 1215 ZD1211B 802.11g - 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 - 20ff Virtual media for 802.11bg - a211 ZD1211 802.11b/g Wireless Adapter - b215 802.11bg -0acf Intoto, Inc. -0ad0 Intellix Corp. -0ad1 Remotec Technology, Ltd -0ad2 Service & Quality Technology Co., Ltd -0ada Data Encryption Systems Ltd. - 0005 DK2 -0ae3 Allion Computer, Inc. -0ae4 Taito Corp. -0ae7 Neodym Systems, Inc. -0ae8 System Support Co., Ltd -0ae9 North Shore Circuit Design L.L.P. -0aea SciEssence, LLC -0aeb TTP Communications, Ltd -0aec Neodio Technologies Corp. - 2101 SmartMedia Card Reader - 2102 CompactFlash Card Reader - 2103 MMC/SD Card Reader - 2104 MemoryStick Card Reader - 2201 SmartMedia+CompactFlash Card Reader - 2202 SmartMedia+MMC/SD Card Reader - 2203 SmartMedia+MemoryStick Card Reader - 2204 CompactFlash+MMC/SD Card Reader - 2205 CompactFlash+MemoryStick Card Reader - 2206 MMC/SD+MemoryStick Card Reader - 2301 SmartMedia+CompactFlash+MMC/SD Card Reader - 2302 SmartMedia+CompactFlash+MemoryStick Card Reader - 2303 SmartMedia+MMC/SD+MemoryStick Card Reader - 2304 CompactFlash+MMC/SD+MemoryStick Card Reader - 3016 MMC/SD+Memory Stick Card Reader - 3050 ND3050 8-in-1 Card Reader - 3060 1.1 FS Card Reader - 3101 MMC/SD Card Reader - 3102 MemoryStick Card Reader - 3201 MMC/SD+MemoryStick Card Reader - 3216 HS Card Reader - 3260 7-in-1 Card Reader - 5010 ND5010 Card Reader -0af0 Option - 5000 UMTS Card - 6000 GlobeTrotter 3G datacard - 6300 GT 3G Quad UMTS/GPRS Card - 6600 GlobeTrotter 3G+ datacard - 6711 GlobeTrotter Express 7.2 v2 - 6971 Globetrotter HSDPA Modem - 7251 Globetrotter HSUPA Modem (aka iCON HSUPA E) - 7501 Globetrotter HSUPA Modem (icon 411 aka "Vodafone K3760") - 7601 Globetrotter MO40x 3G Modem (GTM 382) - 7701 Globetrotter HSUPA Modem (aka icon 451) -0af6 Silver I Co., Ltd -0af7 B2C2, Inc. - 0101 Digital TV USB Receiver (DVB-S/T/C / ATSC) -0af9 Hama, Inc. - 0010 USB SightCam 100 - 0011 Micro Innovations IC50C Webcam -0afc Zaptronix Ltd -0afd Tateno Dennou, Inc. -0afe Cummins Engine Co. -0aff Jump Zone Network Products, Inc. -0b00 INGENICO -0b05 ASUSTek Computer, Inc. - 1101 Mass Storage (UISDMC4S) - 1706 WL-167G v1 802.11g Adapter [Ralink RT2500USB] - 1707 WL-167G v1 802.11g Adapter [Ralink RT2500USB] - 1708 Mass Storage Device - 170b Mass Storage Device - 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 - 1717 WL169gE 802.11g Adapter [Broadcom 4320 USB] - 171b A9T wireless 802.11bg - 171c 802.11b/g Wireless Network Adapter - 171f My Cinema U3000 Mini [DiBcom DiB7700P] - 1723 WL-167G v2 802.11g Adapter [Ralink RT73] - 1724 RT2573 - 1726 Laptop OLED Display - 172a ASUS 802.11n Network Adapter - 172b 802.11n Network Adapter - 1731 802.11n Network Adapter - 1732 802.11n Network Adapter - 1734 ASUS AF-200 - 173c BT-183 Bluetooth 2.0 - 173f My Cinema U3100 Mini - 1742 802.11n Network Adapter - 1743 Xonar U1 Audio Station - 1751 BT-253 Bluetooth Adapter - 175b Laptop OLED Display - 1760 802.11n Network Adapter - 1761 802.11n Network Adapter - 1774 Gobi Wireless Modem (QDL mode) - 1776 Gobi Wireless Modem - 1779 My Cinema U3100 Mini Plus [AF9035A] - 1784 USB-N13 802.11n Network Adapter [Ralink RT2870] - 6101 Cable Modem - 620a Remote NDIS Device - b700 Broadcom Bluetooth 2.1 -0b0b Datamax-O'Neil - 106e Datamax E-4304 -0b0c Todos AB - 0009 Todos Argos Mini II Smart Card Reader - 001e e.dentifier2 (ABN AMRO electronic banking card reader NL) - 002e C200 smartcard controller (Nordea card reader) - 003f Todos C400 smartcard controller (Handelsbanken card reader) - 0050 Argos Mini II Smart Card Reader (CCID) -0b0d ProjectLab - 0000 CenturyCD -0b0e GN Netcom -0b0f AVID Technology -0b10 Pcally -0b11 I Tech Solutions Co., Ltd -0b1e Electronic Warfare Assoc., Inc. (EWA) -0b1f Insyde Software Corp. -0b20 TransDimension, Inc. -0b21 Yokogawa Electric Corp. -0b22 Japan System Development Co., Ltd -0b23 Pan-Asia Electronics Co., Ltd -0b24 Link Evolution Corp. -0b27 Ritek Corp. -0b28 Kenwood Corp. -0b2c Village Center, Inc. -0b30 PNY Technologies, Inc. - 0006 SM Media-Shuttle Card Reader -0b33 Contour Design, Inc. - 0020 ShuttleXpress -0b37 Hitachi ULSI Systems Co., Ltd -0b38 Gear Head - 0010 107-Key Keyboard -0b39 Omnidirectional Control Technology, Inc. - 0001 Composite USB PS2 Converter - 0109 USB TO Ethernet - 0421 Serial - 0801 USB-Parallel Bridge - 0901 OCT To Fast Ethernet Converter - 0c03 LAN DOCK Serial Converter -0b3a IPaxess -0b3b Tekram Technology Co., Ltd - 0163 TL-WN320G 1.0 WLAN Adapter - 1601 Allnet 0193 802.11b Adapter - 1602 ZyXEL ZyAIR B200 802.11b Adapter - 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 - 5630 802.11bg - 6630 ZD1211 -0b3c Olivetti Techcenter - a010 Simple_Way Printer/Scanner/Copier - c000 Olicard 100 - c700 Olicard 100 (Mass Storage mode) -0b3e Kikusui Electronics Corp. -0b41 Hal Corp. - 0011 Crossam2+USB IR commander -0b43 Play.com, Inc. - 0003 PS2 Controller Converter -0b47 Sportbug.com, Inc. -0b48 TechnoTrend AG - 1003 Technotrend/Hauppauge USB-Nova - 1004 TT-PCline - 1005 Technotrend/Hauppauge USB-Nova - 1006 Technotrend/Hauppauge DEC3000-s - 1007 TT-micro plus Device - 1008 Technotrend/Hauppauge DEC2000-t - 1009 Technotrend/Hauppauge DEC2540-t - 3001 DVB-S receiver - 3002 DVB-C receiver - 3003 DVB-T receiver - 3004 TT TV-Stick - 3005 TT TV-Stick (8kB EEPROM) - 3006 TT-connect S-2400 DVB-S receiver - 3007 TT-connect S2-3600 - 3008 TT-connect - 3009 TT-connect S-2400 DVB-S receiver (8kB EEPROM) - 300a TT-connect S2-3650 CI - 300b TT-connect C-3650 CI - 300c TT-connect T-3650 CI - 300d TT-connect CT-3650 CI - 300e TT-connect C-2400 -0b49 ASCII Corp. - 064f Trance Vibrator -0b4b Pine Corp. Ltd. - 0100 D'music MP3 Player -0b4d Graphtec America, Inc. - 110a Graphtec CC200-20 -0b4e Musical Electronics, Ltd - 6500 MP3 Player - 8028 MP3 Player - 8920 MP3 Player -0b50 Dumpries Co., Ltd -0b51 Comfort Keyboard Co. - 0020 Comfort Keyboard -0b52 Colorado MicroDisplay, Inc. -0b54 Sinbon Electronics Co., Ltd -0b56 TYI Systems, Ltd -0b57 Beijing HanwangTechnology Co., Ltd -0b59 Lake Communications, Ltd -0b5a Corel Corp. -0b5f Green Electronics Co., Ltd -0b60 Nsine, Ltd -0b61 NEC Viewtechnology, Ltd -0b62 Orange Micro, Inc. - 000b Bluetooth Device - 0059 iBOT2 Webcam -0b63 ADLink Technology, Inc. -0b64 Wonderful Wire Cable Co., Ltd -0b65 Expert Magnetics Corp. -0b69 CacheVision -0b6a Maxim Integrated Products -0b6f Nagano Japan Radio Co., Ltd -0b70 PortalPlayer, Inc. - 00ba iRiver H10 20GB -0b71 SHIN-EI Sangyo Co., Ltd -0b72 Embedded Wireless Technology Co., Ltd -0b73 Computone Corp. -0b75 Roland DG Corp. -0b79 Sunrise Telecom, Inc. -0b7a Zeevo, Inc. - 07d0 Bluetooth Dongle -0b7b Taiko Denki Co., Ltd -0b7c ITRAN Communications, Ltd -0b7d Astrodesign, Inc. -0b81 id3 Semiconductors - 0001 Biothentic II smartcard reader with fingerprint sensor - 0002 DFU-Enabled Devices (DFU) - 0012 BioPAD biometric module (DFU + CDC) - 0102 Certis V1 fingerprint reader - 0103 Certis V2 fingerprint reader - 0200 CL1356T / CL1356T5 / CL1356A smartcard readers (CCID) - 0201 CL1356T / CL1356T5 / CL1356A smartcard readers (DFU + CCID) - 0220 CL1356A FFPJP smartcard reader (CCID + HID) - 0221 CL1356A smartcard reader (DFU + CCID + HID) -0b84 Rextron Technology, Inc. -0b85 Elkat Electronics, Sdn., Bhd. -0b86 Exputer Systems, Inc. - 5100 XMC5100 Zippy Drive - 5110 XMC5110 Flash Drive - 5200 XMC5200 Zippy Drive - 5201 XMC5200 Zippy Drive - 5202 XMC5200 Zippy Drive - 5280 XMC5280 Storage Drive - fff0 ISP5200 Debugger -0b87 Plus-One I & T, Inc. -0b88 Sigma Koki Co., Ltd, Technology Center -0b89 Advanced Digital Broadcast, Ltd -0b8c SMART Technologies Inc. - 00c3 Sympodium ID350 -0b95 ASIX Electronics Corp. - 1720 10/100 Ethernet - 1780 AX88178 - 7720 AX88772 -0b96 Sewon Telecom -0b97 O2 Micro, Inc. - 7732 Smart Card Reader - 7761 Oz776 1.1 Hub - 7762 Oz776 SmartCard Reader - 7772 OZ776 CCID Smartcard Reader -0b98 Playmates Toys, Inc. -0b99 Audio International, Inc. -0b9b Dipl.-Ing. Stefan Kunde - 4012 Reflex RC-controller Interface -0b9d Softprotec Co. -0b9f Chippo Technologies -0baf U.S. Robotics - 00e5 USR6000 - 00eb USR1120 802.11b Adapter - 00ec 56K Faxmodem - 00f1 SureConnect ADSL ATM Adapter - 00f2 SureConnect ADSL Loader - 00f5 SureConnect ADSL ATM Adapter - 00f6 SureConnect ADSL Loader - 00f7 SureConnect ADSL ATM Adapter - 00f8 SureConnect ADSL Loader - 00f9 SureConnect ADSL ATM Adapter - 00fa SureConnect ADSL Loader - 00fb SureConnect ADSL Ethernet/USB Router - 0111 USR5420 802.11g Adapter [Broadcom 4320 USB] - 0118 U5 802.11g Adapter - 011b Wireless MAXg Adapter [Broadcom 4320] - 0121 USR5423 802.11bg - 6112 FaxModem Model 5633 -0bb0 Concord Camera Corp. - 0100 Sound Vision Stream - 5007 3340z/Rollei DC3100 -0bb1 Infinilink Corp. -0bb2 Ambit Microsystems Corp. - 0302 U10H010 802.11b Wireless Adapter [Intersil PRISM 3] - 6098 USB Cable Modem -0bb3 Ofuji Technology -0bb4 High Tech Computer Corp. - 00ce mmO2 XDA GSM/GPRS Pocket PC - 00cf SPV C500 Smart Phone - 0a01 PocketPC Sync - 0a02 Himalaya GSM/GPRS Pocket PC - 0a03 PocketPC Sync - 0a04 PocketPC Sync - 0a05 PocketPC Sync - 0a06 PocketPC Sync - 0a07 Magician PocketPC SmartPhone / O2 XDA - 0a08 PocketPC Sync - 0a09 PocketPC Sync - 0a0a PocketPC Sync - 0a0b PocketPC Sync - 0a0c PocketPC Sync - 0a0d PocketPC Sync - 0a0e PocketPC Sync - 0a0f PocketPC Sync - 0a10 PocketPC Sync - 0a11 PocketPC Sync - 0a12 PocketPC Sync - 0a13 PocketPC Sync - 0a14 PocketPC Sync - 0a15 PocketPC Sync - 0a16 PocketPC Sync - 0a17 PocketPC Sync - 0a18 PocketPC Sync - 0a19 PocketPC Sync - 0a1a PocketPC Sync - 0a1b PocketPC Sync - 0a1c PocketPC Sync - 0a1d PocketPC Sync - 0a1e PocketPC Sync - 0a1f PocketPC Sync - 0a20 PocketPC Sync - 0a21 PocketPC Sync - 0a22 PocketPC Sync - 0a23 PocketPC Sync - 0a24 PocketPC Sync - 0a25 PocketPC Sync - 0a26 PocketPC Sync - 0a27 PocketPC Sync - 0a28 PocketPC Sync - 0a29 PocketPC Sync - 0a2a PocketPC Sync - 0a2b PocketPC Sync - 0a2c PocketPC Sync - 0a2d PocketPC Sync - 0a2e PocketPC Sync - 0a2f PocketPC Sync - 0a30 PocketPC Sync - 0a31 PocketPC Sync - 0a32 PocketPC Sync - 0a33 PocketPC Sync - 0a34 PocketPC Sync - 0a35 PocketPC Sync - 0a36 PocketPC Sync - 0a37 PocketPC Sync - 0a38 PocketPC Sync - 0a39 PocketPC Sync - 0a3a PocketPC Sync - 0a3b PocketPC Sync - 0a3c PocketPC Sync - 0a3d PocketPC Sync - 0a3e PocketPC Sync - 0a3f PocketPC Sync - 0a40 PocketPC Sync - 0a41 PocketPC Sync - 0a42 PocketPC Sync - 0a43 PocketPC Sync - 0a44 PocketPC Sync - 0a45 PocketPC Sync - 0a46 PocketPC Sync - 0a47 PocketPC Sync - 0a48 PocketPC Sync - 0a49 PocketPC Sync - 0a4a PocketPC Sync - 0a4b PocketPC Sync - 0a4c PocketPC Sync - 0a4d PocketPC Sync - 0a4e PocketPC Sync - 0a4f PocketPC Sync - 0a50 HTC SmartPhone Sync - 0a51 SPV C400 / T-Mobile SDA GSM/GPRS Pocket PC - 0a52 SmartPhone Sync - 0a53 SmartPhone Sync - 0a54 SmartPhone Sync - 0a55 SmartPhone Sync - 0a56 SmartPhone Sync - 0a57 SmartPhone Sync - 0a58 SmartPhone Sync - 0a59 SmartPhone Sync - 0a5a SmartPhone Sync - 0a5b SmartPhone Sync - 0a5c SmartPhone Sync - 0a5d SmartPhone Sync - 0a5e SmartPhone Sync - 0a5f SmartPhone Sync - 0a60 SmartPhone Sync - 0a61 SmartPhone Sync - 0a62 SmartPhone Sync - 0a63 SmartPhone Sync - 0a64 SmartPhone Sync - 0a65 SmartPhone Sync - 0a66 SmartPhone Sync - 0a67 SmartPhone Sync - 0a68 SmartPhone Sync - 0a69 SmartPhone Sync - 0a6a SmartPhone Sync - 0a6b SmartPhone Sync - 0a6c SmartPhone Sync - 0a6d SmartPhone Sync - 0a6e SmartPhone Sync - 0a6f SmartPhone Sync - 0a70 SmartPhone Sync - 0a71 SmartPhone Sync - 0a72 SmartPhone Sync - 0a73 SmartPhone Sync - 0a74 SmartPhone Sync - 0a75 SmartPhone Sync - 0a76 SmartPhone Sync - 0a77 SmartPhone Sync - 0a78 SmartPhone Sync - 0a79 SmartPhone Sync - 0a7a SmartPhone Sync - 0a7b SmartPhone Sync - 0a7c SmartPhone Sync - 0a7d SmartPhone Sync - 0a7e SmartPhone Sync - 0a7f SmartPhone Sync - 0a80 SmartPhone Sync - 0a81 SmartPhone Sync - 0a82 SmartPhone Sync - 0a83 SmartPhone Sync - 0a84 SmartPhone Sync - 0a85 SmartPhone Sync - 0a86 SmartPhone Sync - 0a87 SmartPhone Sync - 0a88 SmartPhone Sync - 0a89 SmartPhone Sync - 0a8a SmartPhone Sync - 0a8b SmartPhone Sync - 0a8c SmartPhone Sync - 0a8d SmartPhone Sync - 0a8e SmartPhone Sync - 0a8f SmartPhone Sync - 0a90 SmartPhone Sync - 0a91 SmartPhone Sync - 0a92 SmartPhone Sync - 0a93 SmartPhone Sync - 0a94 SmartPhone Sync - 0a95 SmartPhone Sync - 0a96 SmartPhone Sync - 0a97 SmartPhone Sync - 0a98 SmartPhone Sync - 0a99 SmartPhone Sync - 0a9a SmartPhone Sync - 0a9b SmartPhone Sync - 0a9c SmartPhone Sync - 0a9d SmartPhone Sync - 0a9e SmartPhone Sync - 0a9f SmartPhone Sync - 0b03 Ozone Mobile Broadband - 0b04 Hermes / TyTN / T-Mobile MDA Vario II / O2 Xda Trion - 0b05 P3600 - 0b06 Athena / Advantage x7500 / Dopod U1000 / T-Mobile AMEO - 0b0c Elf / Touch / P3450 / T-Mobile MDA Touch / O2 Xda Nova / Dopod S1 - 0b1f Sony Ericsson XPERIA X1 - 0b2f Rhodium - 0b51 Qtek 8310 mobile phone [Tornado Noble] - 0bce Vario MDA - 0c01 Dream / ADP1 / G1 / Magic / Tattoo - 0c02 Dream / ADP1 / G1 / Magic / Tattoo (Debug) - 0c13 Diamond - 0c1f Sony Ericsson XPERIA X1 - 0c5f Snap - 0c87 Desire (debug) - 0c8d EVO 4G (debug) - 0c91 Vision - 0c94 Vision - 0c97 Legend - 0c99 Desire (debug) - 0c9e Incredible - 0ca2 Desire HD (debug mode) - 0ff9 Desire / Desire HD / Hero - 0ffe Desire HD (modem mode) - 0fff Android Fastboot Bootloader -0bb5 Murata Manufacturing Co., Ltd -0bb6 Network Alchemy -0bb7 Joytech Computer Co., Ltd -0bb8 Hitachi Semiconductor and Devices Sales Co., Ltd -0bb9 Eiger M&C Co., Ltd -0bba ZAccess Systems -0bbb General Meters Corp. -0bbc Assistive Technology, Inc. -0bbd System Connection, Inc. -0bc0 Knilink Technology, Inc. -0bc1 Fuw Yng Electronics Co., Ltd -0bc2 Seagate RSS LLC - 2000 Storage Adapter V3 (TPP) - 2200 FreeAgent Go FW - 5021 FreeAgent GoFlex USB 2.0 - 5031 FreeAgent GoFlex USB 3.0 -0bc3 IPWireless, Inc. - 0001 UMTS-TDD (TD-CDMA) modem -0bc4 Microcube Corp. -0bc5 JCN Co., Ltd -0bc6 ExWAY, Inc. -0bc7 X10 Wireless Technology, Inc. - 0001 ActiveHome (ACPI-compliant) - 0002 Firecracker Interface (ACPI-compliant) - 0003 VGA Video Sender (ACPI-compliant) - 0004 X10 Receiver - 0005 Wireless Transceiver (ACPI-compliant) - 0006 Wireless Transceiver (ACPI-compliant) - 0007 Wireless Transceiver (ACPI-compliant) - 0008 Wireless Transceiver (ACPI-compliant) - 0009 Wireless Transceiver (ACPI-compliant) - 000a Wireless Transceiver (ACPI-compliant) - 000b Transceiver (ACPI-compliant) - 000c Transceiver (ACPI-compliant) - 000d Transceiver (ACPI-compliant) - 000e Transceiver (ACPI-compliant) - 000f Transceiver (ACPI-compliant) -0bc8 Telmax Communications -0bc9 ECI Telecom, Ltd -0bca Startek Engineering, Inc. -0bcb Perfect Technic Enterprise Co., Ltd -0bd7 Andrew Pargeter & Associates - a021 Amptek DP4 multichannel signal analyzer -0bda Realtek Semiconductor Corp. - 0103 USB 2.0 Card Reader - 0104 Mass Storage Device - 0106 Mass Storage Device - 0107 Mass Storage Device - 0108 Mass Storage Device - 0111 Card Reader - 0113 Mass Storage Device - 0115 Mass Storage Device (Multicard Reader) - 0116 Mass Storage Device - 0117 Mass Storage Device - 0118 Mass Storage Device - 0151 Mass Storage Device (Multicard Reader) - 0152 Mass Storage Device - 0153 Mass Storage Device - 0156 Mass Storage Device - 0157 Mass Storage Device - 0158 USB 2.0 multicard reader - 0159 Digital Media Card Reader - 0161 Mass Storage Device - 0168 Mass Storage Device - 0169 Mass Storage Device - 0171 Mass Storage Device - 0176 Mass Storage Device - 0178 Mass Storage Device - 2831 RTL2831U DVB-T - 2832 RTL2832U DVB-T - 8150 RTL8150 Fast Ethernet Adapter - 8151 RTL8151 Adapteon Business Mobile Networks BV - 8171 RTL8188SU 802.11n WLAN Adapter - 8172 RTL8191S WLAN Adapter - 8176 RTL8188CUS 802.11n WLAN - 8187 RTL8187 Wireless Adapter - 8189 RTL8187B Wireless 802.11g 54Mbps Network Adapter - 8192 RTL8192U 802.11n Wireless Adapter - 8197 RTL8187B Wireless Adapter - 8198 RTL8187B Wireless Adapter -0bdb Ericsson Business Mobile Networks BV - 1000 BV Bluetooth Device - 1002 Bluetooth Device 1.2 - 1049 C3607w Mobile Broadband Module - 1900 F3507g Mobile Broadband Module - 1902 F3507g v2 Mobile Broadband Module - 1904 F3607gw Mobile Broadband Module - 1905 F3607gw v2 Mobile Broadband Module - 1906 F3607gw v3 Mobile Broadband Module - 1909 F3307 v2 Mobile Broadband Module - 190a F3307 Mobile Broadband Module - 190b C3607w v2 Mobile Broadband Module -0bdc Y Media Corp. -0bdd Orange PCS -0be2 Kanda Tsushin Kogyo Co., Ltd -0be3 TOYO Corp. -0be4 Elka International, Ltd -0be5 DOME imaging systems, Inc. -0be6 Dong Guan Humen Wonderful Wire Cable Factory -0bed Silicon Labs - 1100 MEI (TM) Cashflow-SC Bill/Voucher Acceptor -0bee LTK Industries, Ltd -0bef Way2Call Communications -0bf0 Pace Micro Technology PLC -0bf1 Intracom S.A. - 0001 netMod Driver Ver 2.4.17 (CAPI) - 0002 netMod Driver Ver 2.4 (CAPI) - 0003 netMod Driver Ver 2.4 (CAPI) -0bf2 Konexx -0bf6 Addonics Technologies, Inc. - 0103 Storage Device - 1234 Storage Device - a000 Cable 205 (TPP) - a001 Cable 205 - a002 IDE Bridge -0bf7 Sunny Giken, Inc. -0bf8 Fujitsu Siemens Computers - 1001 Fujitsu Pocket Loox 600 PDA - 1006 SmartCard Reader 2A - 1007 Connect2Air E-5400 802.11g Wireless Adapter - 1009 Name: Connect2Air E-5400 D1700 802.11g Wireless Adapter [Intersil ISL3887] - 100f miniCard D2301 802.11bg Wireless Module [SiS 163U] -0c04 MOTO Development Group, Inc. -0c05 Appian Graphics -0c06 Hasbro Games, Inc. -0c07 Infinite Data Storage, Ltd -0c08 Agate - 0378 Q 16MB Storage Device -0c09 Comjet Information System - a5a5 Litto Version USB2.0 -0c0a Highpoint Technologies, Inc. -0c0b Dura Micro, Inc. (Acomdata) - 27cb 6-in-1 Flash Reader and Writer - 27d7 Multi Memory reader/writer MD-005 - 27da Multi Memory reader/writer MD-005 - 27dc Multi Memory reader/writer MD-005 - 27e7 3,5'' HDD case MD-231 - 27ee 3,5'' HDD case MD-231 - 2814 3,5'' HDD case MD-231 - 2815 3,5'' HDD case MD-231 - 281d 3,5'' HDD case MD-231 - 5fab Storage Adaptor - a109 CF/SM Reader and Writer - a10c SD/MS Reader and Writer - b001 USB 2.0 Mass Storage IDE adapter - b004 MMC/SD Reader and Writer -0c12 Zeroplus - 0005 PSX Vibration Feedback Converter - 0030 PSX Vibration Feedback Converter - 700e Logic Analyzer (LAP-C-16032) - 8801 Xbox Controller - 8802 Xbox Controller - 8809 Red Octane Ignition Xbox DDR Pad - 880a Pelican Eclipse PL-2023 - 8810 Xbox Controller - 9902 VibraX -0c15 Iris Graphics -0c16 Gyration, Inc. - 0002 RF Technology Receiver - 0003 RF Technology Receiver - 0008 RF Technology Receiver - 0080 eHome Infrared Receiver - 0081 eHome Infrared Receiver -0c17 Cyberboard A/S -0c18 SynerTek Korea, Inc. -0c19 cyberPIXIE, Inc. -0c1a Silicon Motion, Inc. -0c1b MIPS Technologies -0c1c Hang Zhou Silan Electronics Co., Ltd -0c22 Tally Printer Corp. -0c23 Lernout + Hauspie -0c24 Taiyo Yuden - 0001 Bluetooth Adaptor - 0002 Bluetooth Device2 - 0005 Bluetooth Device(BC04-External) - 000b Bluetooth Device(BC04-External) - 000c Bluetooth Adaptor - 000e Bluetooth Device(BC04-External) - 000f Bluetooth Device (V2.0+EDR) - 0010 Bluetooth Device(BC04-External) - 0012 Bluetooth Device(BC04-External) - 0018 Bluetooth Device(BC04-External) - 0019 Bluetooth Device - 0c24 Bluetooth Device(SAMPLE) - ffff Bluetooth module with BlueCore in DFU mode -0c25 Sampo Corp. - 0310 Scream Cam -0c26 Prolific Technology Inc. - 0018 USB-Serial Controller [Icom Inc. OPC-478UC] -0c27 RFIDeas, Inc - 3bfa pcProx Card Reader -0c2e Metro - 0007 Metrologic MS7120 Barcode Scanner (IBM SurePOS mode) - 0200 Metrologic Scanner - 0204 Metrologic MS7120 Barcode Scanner (keyboard mode) - 0700 Metrologic MS7120 Barcode Scanner (uni-directional serial mode) - 0720 Metrologic MS7120 Barcode Scanner (bi-directional serial mode) -0c35 Eagletron, Inc. -0c36 E Ink Corp. -0c37 e.Digital -0c38 Der An Electric Wire & Cable Co., Ltd -0c39 IFR -0c3a Furui Precise Component (Kunshan) Co., Ltd -0c3b Komatsu, Ltd -0c3c Radius Co., Ltd -0c3d Innocom, Inc. -0c3e Nextcell, Inc. -0c44 Motorola iDEN - 0021 iDEN P2k0 Device - 0022 iDEN P2k1 Device - 03a2 iDEN Smartphone - 41d9 i1 phone -0c45 Microdia - 0011 EBUDDY - 1020 Mass Storage Reader - 1028 Mass Storage Reader - 1030 Mass Storage Reader - 1031 Sonix Mass Storage Device - 1032 Mass Storage Reader - 1033 Sonix Mass Storage Device - 1034 Mass Storage Reader - 1035 Mass Storage Reader - 1036 Mass Storage Reader - 1037 Sonix Mass Storage Device - 1050 CF Card Reader - 1058 HDD Reader - 1060 iFlash SM-Direct Card Reader - 1061 Mass Storage Reader - 1062 Mass Storage Reader - 1063 Sonix Mass Storage Device - 1064 Mass Storage Reader - 1065 Mass Storage Reader - 1066 Mass Storage Reader - 1067 Mass Storage Reader - 1158 A56AK - 184c VoIP Phone - 6001 Genius VideoCAM NB - 6005 Sweex Mini Webcam - 6007 VideoCAM Eye - 6009 VideoCAM ExpressII - 600d TwinkleCam USB camera - 6011 PC Camera (SN9C102) - 6019 PC Camera (SN9C102) - 6024 VideoCAM ExpressII - 6025 VideoCAM ExpressII - 6028 Typhoon Easycam USB 330K (older) - 6029 Triplex i-mini PC Camera - 602a Meade ETX-105EC Camera - 602b VideoCAM NB 300 - 602c Clas Ohlson TWC-30XOP Webcam - 602d VideoCAM ExpressII - 602e VideoCAM Messenger - 6030 VideoCAM ExpressII - 603f VideoCAM ExpressII - 6040 CCD PC Camera (PC390A) - 606a CCD PC Camera (PC390A) - 607a CCD PC Camera (PC390A) - 607b Win2 PC Camera - 607c CCD PC Camera (PC390A) - 607e CCD PC Camera (PC390A) - 6080 Audio (Microphone) - 6082 VideoCAM Look - 6083 VideoCAM Look - 608c VideoCAM Look - 608e VideoCAM Look - 608f PC Camera (SN9C103 + OV7630) - 60a8 VideoCAM Look - 60aa VideoCAM Look - 60ab PC Camera - 60af VideoCAM Look - 60b0 Genius VideoCam Look - 60c0 PC Camera with Mic (SN9C105) - 60c8 Win2 PC Camera - 60cc PC Camera with Mic (SN9C105) - 60ec PC Camera with Mic (SN9C105) - 60ef Win2 PC Camera - 60fa PC Camera with Mic (SN9C105) - 60fb Composite Device - 60fc PC Camera with Mic (SN9C105) - 60fe Audio (Microphone) - 6108 Win2 PC Camera - 6122 PC Camera (SN9C110) - 6123 PC Camera (SN9C110) - 6128 PC Camera (SN9C325 + OM6802) - 612a PC Camera (SN9C325) - 612c PC Camera (SN9C110) - 612e PC Camera (SN9C110) - 612f PC Camera (SN9C110) - 6130 PC Camera (SN9C120) - 6138 Win2 PC Camera - 613a PC Camera (SN9C120) - 613b Win2 PC Camera - 613c PC Camera (SN9C120) - 613e PC Camera (SN9C120) - 6143 PC Camera (SN9C120 + SP80708) - 6240 PC Camera (SN9C201 + MI1300) - 6242 PC Camera (SN9C201 + MI1310) - 6243 PC Camera (SN9C201 + S5K4AAFX) - 6248 PC Camera (SN9C201 + OV9655) - 624b PC Camera (SN9C201 + CX1332) - 624c PC Camera (SN9C201 + MI1320) - 624e PC Camera (SN9C201 + SOI968) - 624f PC Camera (SN9C201 + OV9650) - 6251 PC Camera (SN9C201 + OV9650) - 6253 PC Camera (SN9C201 + OV9650) - 6260 PC Camera (SN9C201 + OV7670ISP) - 6262 PC Camera (SN9C201 + OM6802) - 6270 PC Camera (SN9C201 + MI0360/MT9V011 or MI0360SOC/MT9V111) U-CAM PC Camera NE878, Whitcom WHC017, ... - 627a PC Camera (SN9C201 + S5K53BEB) - 627b PC Camera (SN9C201 + OV7660) - 627c PC Camera (SN9C201 + HV7131R) - 627f PC Camera (SN9C201 + OV965x + EEPROM) - 6280 PC Camera with Microphone (SN9C202 + MI1300) - 6282 PC Camera with Microphone (SN9C202 + MI1310) - 6283 PC Camera with Microphone (SN9C202 + S5K4AAFX) - 6288 PC Camera with Microphone (SN9C202 + OV9655) - 628a PC Camera with Microphone (SN9C202 + ICM107) - 628b PC Camera with Microphone (SN9C202 + CX1332) - 628c PC Camera with Microphone (SN9C202 + MI1320) - 628e PC Camera with Microphone (SN9C202 + SOI968) - 628f PC Camera with Microphone (SN9C202 + OV9650) - 62a0 PC Camera with Microphone (SN9C202 + OV7670ISP) - 62a2 PC Camera with Microphone (SN9C202 + OM6802) - 62b0 PC Camera with Microphone (SN9C202 + MI0360/MT9V011 or MI0360SOC/MT9V111) - 62b3 PC Camera with Microphone (SN9C202 + OV9655) - 62ba PC Camera with Microphone (SN9C202 + S5K53BEB) - 62bb PC Camera with Microphone (SN9C202 + OV7660) - 62bc PC Camera with Microphone (SN9C202 + HV7131R) - 62be PC Camera with Microphone (SN9C202 + OV7663) - 62c0 Sonix USB 2.0 Camera - 62e0 MSI Starcam Racer - 6310 Sonix USB 2.0 Camera - 63e0 Sonix Integrated Webcam - 63f1 Integrated Webcam - 63f8 Sonix Integrated Webcam - 6409 Webcam - 6417 Integrated Webcam - 8000 DC31VC - 8006 Dual Mode Camera (8006 VGA) - 800a Vivitar Vivicam3350B -0c46 WaveRider Communications, Inc. -0c4b Reiner SCT Kartensysteme GmbH - 0100 cyberJack e-com/pinpad - 0300 cyberJack pinpad(a) - 9102 cyberJack RFID basis contactless smartcard reader -0c52 Sealevel Systems, Inc. - 2101 Serial Converter -0c53 ViewPLUS, Inc. -0c54 Glory, Ltd -0c55 Spectrum Digital, Inc. - 0510 Spectrum Digital XDS510 JTAG Debugger - 0540 SPI540 - 5416 TMS320C5416 DSK - 6416 TMS320C6416 DDB -0c56 Billion Bright, Ltd -0c57 Imaginative Design Operation Co., Ltd -0c58 Vidar Systems Corp. -0c59 Dong Guan Shinko Wire Co., Ltd -0c5a TRS International Mfg., Inc. -0c5e Xytronix Research & Design -0c60 Apogee Electronics Corp. -0c62 Chant Sincere Co., Ltd -0c63 Toko, Inc. -0c64 Signality System Engineering Co., Ltd -0c65 Eminence Enterprise Co., Ltd -0c66 Rexon Electronics Corp. -0c67 Concept Telecom, Ltd -0c70 MCT Elektronikladen - 0000 USB08 Development board -0c74 Optronic Laboratories Inc. - 0002 OL 700-30 Goniometer -0c76 JMTek, LLC. - 0001 Mass Storage Controller - 0002 Mass Storage Controller - 0003 USBdisk - 0004 Mass Storage Controller - 0005 Transcend Flash disk - 0006 Transcend JetFlash - 0007 Mass Storage Device - 1605 SSS Headphone Set - 1607 audio controller -0c77 Sipix Group, Ltd - 1001 SiPix Web2 - 1002 SiPix SC2100 - 1010 SiPix Snap - 1011 SiPix Blink 2 - 1015 SiPix CAMeleon -0c78 Detto Corp. -0c79 NuConnex Technologies Pte., Ltd -0c7a Wing-Span Enterprise Co., Ltd -0c86 NDA Technologies, Inc. -0c88 Kyocera Wireless Corp. - 0021 Handheld - 17da Qualcomm Kyocera CDMA Technologies MSM -0c89 Honda Tsushin Kogyo Co., Ltd -0c8a Pathway Connectivity, Inc. -0c8b Wavefly Corp. -0c8c Coactive Networks -0c8d Tempo -0c8e Cesscom Co., Ltd - 6000 Luxian Series -0c8f Applied Microsystems -0c98 Berkshire Products, Inc. - 1140 USB PC Watchdog -0c99 Innochips Co., Ltd -0c9a Hanwool Robotics Corp. -0c9b Jobin Yvon, Inc. -0c9d SemTek - 0170 3873 Manual Insert card reader -0ca2 Zyfer -0ca3 Sega Corp. -0ca4 ST&T Instrument Corp. -0ca5 BAE Systems Canada, Inc. -0ca6 Castles Technology Co., Ltd - 0010 EZUSB PC/SC Smart Card Reader - 0050 EZ220PU Reader Controller - 1077 Bludrive Family Smart Card Reader - 107e Reader Controller - 2010 myPad110 PC/SC Smart Card Reader - 3050 EZ710 Smart Card Reader -0ca7 Information Systems Laboratories -0cad Motorola CGISS - 9001 PowerPad Pocket PC Device -0cae Ascom Business Systems, Ltd -0caf Buslink - 2507 Hi-Speed USB-to-IDE Bridge Controller - 2515 Flash Disk Embedded Hub - 2516 Flash Disk Security Device - 2517 Flash Disk Mass Storage Device - 25c7 Hi-Speed USB-to-IDE Bridge Controller - 3a00 Hard Drive - 3a20 Mass Storage Device - 3acd Mass Storage Device -0cb0 Flying Pig Systems -0cb1 Innovonics, Inc. -0cb6 Celestix Networks, Pte., Ltd -0cb7 Singatron Enterprise Co., Ltd -0cb8 Opticis Co., Ltd -0cba Trust Electronic (Shanghai) Co., Ltd -0cbb Shanghai Darong Electronics Co., Ltd -0cbc Palmax Technology Co., Ltd - 0101 Pocket PC P6C - 0201 Personal Digital Assistant - 0301 Personal Digital Assistant P6M+ - 0401 Pocket PC -0cbd Pentel Co., Ltd (Electronics Equipment Div.) -0cbe Keryx Technologies, Inc. -0cbf Union Genius Computer Co., Ltd -0cc0 Kuon Yi Industrial Corp. -0cc1 Given Imaging, Ltd -0cc2 Timex Corp. -0cc3 Rimage Corp. -0cc4 emsys GmbH -0cc5 Sendo -0cc6 Intermagic Corp. -0cc7 Kontron Medical AG -0cc8 Technotools Corp. -0cc9 BroadMAX Technologies, Inc. -0cca Amphenol -0ccb SKNet Co., Ltd -0ccc Domex Technology Corp. -0ccd TerraTec Electronic GmbH - 0012 PHASE 26 - 0013 PHASE 26 - 0014 PHASE 26 - 0015 Flash Update for TerraTec PHASE 26 - 0021 Cameo Grabster 200 - 0023 Mystify Claw - 0028 Aureon 5.1 MkII - 0032 MIDI HUBBLE - 0035 Miditech Play'n Roll - 0036 Cinergy 250 Audio - 0037 Cinergy 250 Audio - 0038 Cinergy T² DVB-T Receiver - 0039 Grabster AV 400 - 003b Cinergy 400 - 003c Grabster AV 250 - 0042 Cinergy Hybrid T XS - 0043 Cinergy T XS - 004e Cinergy T XS - 004f Cinergy Analog XS - 0055 Cinergy T XE (Version 1, AF9005) - 005c Cinergy T² - 0069 Cinergy T XE (Version 2, AF9015) - 0072 Cinergy Hybrid T - 0077 Aureon Dual USB - 0086 Cinergy Hybrid XE - 0097 Cinergy T RC MKII - 00a5 Cinergy Hybrid Stick - 00a9 RTL2838 DVB-T COFDM Demodulator [TerraTec Cinergy T Stick Black] -0cd4 Bang Olufsen - 0101 BeolinkPC2 -0cd5 LabJack Corporation - 0003 U3 - 0009 UE9 -0cd7 NewChip S.r.l. -0cd8 JS Digitech, Inc. - 2007 Smart Card Reader/JSTU-9700 -0cd9 Hitachi Shin Din Cable, Ltd -0cde Z-Com - 0001 XI-750 802.11b Wireless Adapter [Atmel AT76C503A] - 0002 XI-725/726 Prism2.5 802.11b Adapter - 0003 Sagem 802.11b Dongle - 0004 Sagem 802.11b Dongle - 0005 XI-735 Prism3 802.11b Adapter - 0006 XG-300 802.11b Adapter - 0008 XG-703A 802.11g Wireless Adapter [Intersil ISL3887] - 0009 (ZD1211)IEEE 802.11b+g Adapter - 0011 ZD1211 - 0012 AR5523 - 0013 AR5523 driver (no firmware) - 0014 NB 802.11g Wireless LAN Adapter(3887A) - 0015 XG-705A 802.11g Wireless Adapter [Intersil ISL3887] - 0016 NB 802.11g Wireless LAN Adapter(3887A) - 0018 NB 802.11a/b/g Wireless LAN Adapter(3887A) - 001a 802.11bg - 001c 802.11b/g Wireless Network Adapter - 0020 AG-760A 802.11abg Wireless Adapter [ZyDAS ZD1211B] - 0022 802.11b/g/n Wireless Network Adapter - 0023 UB81 802.11bgn - 0025 802.11b/g/n USB Wireless Network Adapter - 0026 UB82 802.11abgn -0ce5 Validation Technologies International - 0003 Matrix -0ce9 pico Technology - 1001 PicoScope3204 -0cf1 e-Conn Electronic Co., Ltd -0cf2 ENE Technology, Inc. - 6220 SD Card Reader (SG361) - 6225 SD card reader (UB6225) - 6250 SD card reader (UB6250) -0cf3 Atheros Communications, Inc. - 0001 AR5523 - 0002 AR5523 (no firmware) - 0003 AR5523 - 0004 AR5523 (no firmware) - 0005 AR5523 - 0006 AR5523 (no firmware) - 1001 Thomson TG121N [Atheros AR9001U-(2)NG] - 1002 TP-Link TL-WN821N v2 [Atheros AR9001U-(2)NG] - 1006 TP-Link TL-WN322G v3 / TL-WN422G v2 802.11g [Atheros AR9271] - 1010 3Com 3CRUSBN275 802.11abgn Wireless Adapter [Atheros AR9170] - 3000 AR3011 - 7015 TP-Link TL-WN821N - 9170 AR9170 802.11n - 9271 AR9271 802.11n - b002 Ubiquiti WiFiStation 802.11n [Atheros AR9271] - b003 Ubiquiti WiFiStationEXT 802.11n [Atheros AR9271] -0cf4 Fomtex Corp. -0cf5 Cellink Co., Ltd -0cf6 Compucable Corp. -0cf7 ishoni Networks -0cf8 Clarisys, Inc. - 0750 Claritel-i750 - vp -0cf9 Central System Research Co., Ltd -0cfa Inviso, Inc. -0cfc Minolta-QMS, Inc. - 2301 Magicolor 2300 DL - 2350 Magicolor 2350EN/3300 - 3100 Magicolor 3100 - 7300 Magicolor 5450/5550 -0cff SAFA MEDIA Co., Ltd. - 0320 SR-380N -0d06 telos EDV Systementwicklung GmbH -0d08 UTStarcom - 0602 DV007 [serial] - 0603 DV007 [storage] -0d0b Contemporary Controls -0d0c Astron Electronics Co., Ltd -0d0d MKNet Corp. -0d0e Hybrid Networks, Inc. -0d0f Feng Shin Cable Co., Ltd -0d10 Elastic Networks - 0001 StormPort (WDM) -0d11 Maspro Denkoh Corp. -0d12 Hansol Electronics, Inc. -0d13 BMF Corp. -0d14 Array Comm, Inc. -0d15 OnStream b.v. -0d16 Hi-Touch Imaging Technologies Co., Ltd - 0001 PhotoShuttle - 0002 Photo Printer 730 series - 0004 Photo Printer 63xPL/PS - 0100 Photo Printer 63xPL/PS - 0102 Photo Printer 64xPS - 0103 Photo Printer 730 series - 0104 Photo Printer 63xPL/PS - 0105 Photo Printer 64xPS - 0200 Photo Printer 64xDL -0d17 NALTEC, Inc. -0d18 coaXmedia -0d19 Hank Connection Industrial Co., Ltd -0d28 NXP - 0204 LPC1768 -0d32 Leo Hui Electric Wire & Cable Co., Ltd -0d33 AirSpeak, Inc. -0d34 Rearden Steel Technologies -0d35 Dah Kun Co., Ltd -0d3a Posiflex Technologies, Inc. -0d3c Sri Cable Technology, Ltd -0d3d Tangtop Technology Co., Ltd - 0001 HID Keyboard -0d3e Fitcom, inc. -0d3f MTS Systems Corp. -0d40 Ascor, Inc. -0d41 Ta Yun Terminals Industrial Co., Ltd -0d42 Full Der Co., Ltd -0d46 Kobil Systems GmbH - 2012 KAAN Standard Plus (Smartcard reader) - 3003 mIDentity Light / KAAN SIM III - 4000 mIDentity (mass storage) - 4001 mIDentity Basic/Classic (composite device) - 4081 mIDentity Basic/Classic (installationless) -0d49 Maxtor - 3000 Drive - 3010 3000LE Drive - 3100 Hi-Speed USB-IDE Bridge Controller - 3200 Personal Storage 3200 - 5000 5000XT Drive - 5010 5000LE Drive - 5020 Mobile Hard Disk Drive - 7000 OneTouch - 7010 OneTouch - 7410 Mobile Hard Disk Drive (1TB) - 7450 Basics Portable USB Device -0d4a NF Corp. -0d4b Grape Systems, Inc. -0d4c Tedas AG -0d4d Coherent, Inc. -0d4e Agere Systems Netherland BV - 047a WLAN Card - 1000 Wireless Card Model 0801 - 1001 Wireless Card Model 0802 -0d4f EADS Airbus France -0d50 Cleware GmbH - 0011 USB-Temp2 Thermometer -0d51 Volex (Asia) Pte., Ltd -0d53 HMI Co., Ltd -0d54 Holon Corp. -0d55 ASKA Technologies, Inc. -0d56 AVLAB Technology, Inc. -0d57 Solomon Microtech, Ltd -0d5c SMC Networks, Inc. - a001 SMC2662W (v1) EZ Connect 802.11b Wireless Adapter [Atmel AT76C503A] - a002 SMC2662W v2 / SMC2662W-AR / Belkin F5D6050 [Atmel at76c503a] -0d5e Myacom, Ltd - 2346 BT Digital Access adapter -0d5f CSI, Inc. -0d60 IVL Technologies, Ltd -0d61 Meilu Electronics (Shenzhen) Co., Ltd -0d62 Darfon Electronics Corp. - 0003 Smartcard Reader - 0004 Filter Driver - 001c Benq X120 Internet Keyboard Pro - 0306 M530 Mouse - 0800 Magic Wheel - 2021 AM805 Keyboard - 2026 TECOM Bluetooth Device - 2050 Mouse - 2106 Dell L20U Multimedia Keyboard - a100 Optical Mouse -0d63 Fritz Gegauf AG -0d64 DXG Technology Corp. - 0105 Dual Mode Digital Camera 1.3M - 0107 Horus MT-409 Camera - 0108 Dual Mode Digital Camera - 0202 Dual Mode Video Camera Device - 0303 DXG-305V Camera - 1001 SiPix Stylecam/UMAX AstraPix 320s - 1002 Fashion Cam 01 Dual-Mode DSC (Video Camera) - 1003 Fashion Cam Dual-Mode DSC (Controller) - 1021 D-Link DSC 350F - 1208 Dual Mode Still Camera Device - 2208 Mass Storage - 3105 Dual Mode Digital Camera Disk - 3108 Digicam Mass Storage Device -0d65 KMJP Co., Ltd -0d66 TMT -0d67 Advanet, Inc. -0d68 Super Link Electronics Co., Ltd -0d69 NSI -0d6a Megapower International Corp. -0d6b And-Or Logic -0d70 Try Computer Co., Ltd -0d71 Hirakawa Hewtech Corp. -0d72 Winmate Communication, Inc. -0d73 Hit's Communications, Inc. -0d76 MFP Korea, Inc. -0d77 Power Sentry/Newpoint -0d78 Japan Distributor Corp. -0d7a MARX Datentechnik GmbH -0d7b Wellco Technology Co., Ltd -0d7c Taiwan Line Tek Electronic Co., Ltd -0d7d Phison Electronics Corp. - 0100 PS1001/1011/1006/1026 Flash Disk - 0110 Gigabyte FlexDrive - 0120 Disk Pro 64MB - 0124 GIGABYTE Disk - 0240 I/O-Magic/Transcend 6-in-1 Card Reader - 110e NEC uPD720121/130 USB-ATA/ATAPI Bridge - 1240 Apacer 6-in-1 Card Reader 2.0 - 1270 Wolverine SixPac 6000 - 1300 Flash Disk - 1320 PS2031 Flash Disk - 1400 Attache 256MB USB 2.0 Flash Drive - 1420 PS2044 Pen Drive - 1470 Vosonic X's-Drive II+ VP2160 - 1620 USB Disk Pro - 1900 USB Thumb Drive -0d7e American Computer & Digital Components - 2507 Hi-Speed USB-to-IDE Bridge Controller - 2517 Hi-Speed Mass Storage Device - 25c7 Hi-Speed USB-to-IDE Bridge Controller -0d7f Essential Reality LLC - 0100 P5 Glove glove controller -0d80 H.R. Silvine Electronics, Inc. -0d81 TechnoVision -0d83 Think Outside, Inc. -0d87 Dolby Laboratories Inc. -0d89 Oz Software -0d8a King Jim Co., Ltd - 0101 TEPRA PRO -0d8b Ascom Telecommunications, Ltd -0d8c C-Media Electronics, Inc. - 0001 Audio Device - 0002 Composite Device - 0003 Sound Device - 0006 Storm HP-USB500 5.1 Headset - 000c Audio Adapter - 000d Composite Device - 000e Audio Adapter (Planet UP-100, Genius G-Talk) - 001f CM108 Audio Controller - 0102 CM106 Like Sound Device - 0103 CM102-A+/102S+ Audio Controller - 0104 CM103+ Audio Controller - 0105 CM108 Audio Controller - 0107 CM108 Audio Controller - 010f CM108 Audio Controller - 0115 CM108 Audio Controller - 0201 CM6501 - 5000 Mass Storage Controller - 5200 Mass Storage Controller(0D8C,5200) - b213 USB Phone CM109 (aka CT2000,VPT1000) -0d8d Promotion & Display Technology, Ltd - 0234 V-234 Composite Device - 0550 V-550 Composite Device - 0551 V-551 Composite Device - 0552 V-552 Composite Device - 0651 V-651 Composite Device - 0652 V-652 Composite Device - 0653 V-653 Composite Device - 0654 V-654 Composite Device - 0655 V-655 Composite Device - 0656 V-656 Composite Device - 0657 V-657 Composite Device - 0658 V-658 Composite Device - 0659 V-659 Composite Device - 0660 V-660 Composite Device - 0661 V-661 Composite Device - 0662 V-662 Composite Device - 0850 V-850 Composite Device - 0851 V-851 Composite Device - 0852 V-852 Composite Device - 0901 V-901 Composite Device - 0902 V-902 Composite Device - 0903 V-903 Composite Device - 4754 Voyager DMP Composite Device - bb00 Bloomberg Composite Device - bb01 Bloomberg Composite Device - bb02 Bloomberg Composite Device - bb03 Bloomberg Composite Device - bb04 Bloomberg Composite Device - bb05 Bloomberg Composite Device - fffe Global Tuner Composite Device - ffff Voyager DMP Composite Device -0d8e Global Sun Technology, Inc. - 0163 802.11g 54 Mbps Wireless Dongle - 1621 802.11b Wireless Adapter - 3762 Cohiba 802.11g Wireless Mini adapter [Intersil ISL3887] - 3763 802.11g Wireless dongle - 7100 802.11b Adapter - 7110 WL-210 / WU210P 802.11b Wireless Adapter [Atmel AT76C503A] - 7605 TRENDnet TEW-224UB 802.11b Wireless Adapter [Atmel AT76C503A] - 7801 AR5523 - 7802 AR5523 (no firmware) - 7811 AR5523 - 7812 AR5523 (no firmware) - 7a01 PRISM25 802.11b Adapter -0d8f Pitney Bowes -0d90 Sure-Fire Electrical Corp. -0d96 Skanhex Technology, Inc. - 0000 Jenoptik JD350 video - 3300 SX330z Camera - 4100 SX410z Camera - 4102 MD 9700 Camera - 4104 Jenoptik JD-4100z3s - 410a Medion 9801/Novatech SX-410z - 5200 SX-520z Camera -0d97 Santa Barbara Instrument Group - 0001 SBIG Astronomy Camera (without firmware) - 0101 SBIG Astronomy Camera (with firmware) -0d98 Mars Semiconductor Corp. - 0300 Avaya Wireless Card -0d99 Trazer Technologies, Inc. -0d9a RTX Telecom AS - 0001 Bluetooth Device -0d9b Tat Shing Electrical Co. -0d9c Chee Chen Hi-Technology Co., Ltd -0d9d Sanwa Supply, Inc. -0d9e Avaya - 0300 Wireless Card -0d9f Powercom Co., Ltd - 0001 Uninterruptible Power Supply - 0002 Black Knight PRO / WOW Uninterruptible Power Supply (Cypress HID->COM RS232) - 00a2 Imperial Uninterruptible Power Supply (HID PDC) - 00a3 Smart King PRO Uninterruptible Power Supply (HID PDC) - 00a4 WOW Uninterruptible Power Supply (HID PDC) - 00a5 Vanguard Uninterruptible Power Supply (HID PDC) - 00a6 Black Knight PRO Uninterruptible Power Supply (HID PDC) -0da0 Danger Research -0da1 Suzhou Peter's Precise Industrial Co., Ltd -0da2 Land Instruments International, Ltd -0da3 Nippon Electro-Sensory Devices Corp. -0da4 Polar Electro OY - 0001 Interface -0da7 IOGear, Inc. -0da8 softDSP Co., Ltd - 0001 SDS 200A Oscilloscope -0dab Cubig Group - 0100 DVR/CVR-M140 MP3 Player -0dad Westover Scientific -0db0 Micro Star International - 1020 PC2PC WLAN Card - 1967 Bluetooth Dongle - 3801 Motorola Bluetooth 2.1+EDR Device - 4011 Medion Flash XL V2.0 Card Reader - 4600 802.11b/g Turbo Wireless Adapter - 5501 Mass Storage Device - 5502 Mass Storage Device - 5513 MP3 Player - 5515 MP3 Player - 5516 MP3 Player - 5580 Mega Sky 580 DVB-T Tuner [M902x] - 5581 Mega Sky 580 DVB-T Tuner [GL861] - 6823 UB11B/MS-6823 802.11b Wi-Fi adapter - 6826 IEEE 802.11g Wireless Network Adapter - 6855 Bluetooth Device - 6861 MSI-6861 802.11g WiFi adapter - 6865 RT2570 - 6869 RT2570 - 6874 RT2573 - 6877 RT2573 - 6881 Bluetooth Class I EDR Device - 688a Bluetooth Class I EDR Device - 6899 802.11bgn 1T1R Mini Card Wireless Adapter - 6970 MS-6970 BToes Bluetooth adapter - 697a Bluetooth Dongle - 6982 Medion Flash XL Card Reader - a861 RT2573 - a874 RT2573 - a970 Bluetooth dongle - a97a Bluetooth EDR Device - b970 Bluetooth EDR Device - b97a Bluetooth EDR Device -0db1 Wen Te Electronics Co., Ltd -0db2 Shian Hwi Plug Parts, Plastic Factory -0db3 Tekram Technology Co., Ltd -0db4 Chung Fu Chen Yeh Enterprise Corp. -0db7 ELCON Systemtechnik - 0002 Goldpfeil P-LAN -0dbc A&D Medical - 0003 AND Serial Cable [AND Smart Cable] -0dbe Jiuh Shiuh Precision Industry Co., Ltd -0dbf Quik Tech Solutions - 0002 SmartDongle Security Key - 0200 HDD Storage Solution - 021b USB-2.0 IDE Adapter - 0300 Storage Adapter - 0333 Storage Adapter - 0707 ZIV Drive -0dc0 G7 Solutions (formerly Great Notions) -0dc1 Tamagawa Seiki Co., Ltd -0dc3 Athena Smartcard Solutions, Inc. - 0801 ASEDrive III - 0802 ASEDrive IIIe - 1104 ASEDrive IIIe KB - 1701 ASEKey - 1702 ASEKey -0dc4 Macpower Peripherals, Ltd - 0040 Mass Storage Device - 0041 Mass Storage Device - 0042 Mass Storage Device - 0101 Hi-Speed Mass Storage Device -0dc5 SDK Co., Ltd -0dc6 Precision Squared Technology Corp. - 2301 Wireless Touchpad Keyboard -0dc7 First Cable Line, Inc. -0dcd NetworkFab Corp. - 0001 Remote Interface Adapter - 0002 High Bandwidth Codec -0dd0 Access Solutions - 1002 Triple Talk Speech Synthesizer -0dd1 Contek Electronics Co., Ltd -0dd2 Power Quotient International Co., Ltd - 0003 Mass Storage (P) -0dd3 MediaQ -0dd4 Custom Engineering SPA -0dd5 California Micro Devices -0dd7 Kocom Co., Ltd -0dd8 Netac Technology Co., Ltd - 1060 USB-CF-Card - e007 OnlyDisk U222 Pendrive - f607 OnlyDisk U208 1G flash drive [U-SAFE] -0dd9 HighSpeed Surfing -0dda Integrated Circuit Solution, Inc. - 0001 Multi-Card Reader 6in1 - 0002 Multi-Card Reader 7in1 - 0003 Flash Disk - 0005 Internal Multi-Card Reader 6in1 - 0008 SD single card reader - 0009 MS single card reader - 000a MS+SD Dual Card Reader - 000b SM single card reader - 0101 All-In-One Card Reader - 0102 All-In-One Card Reader - 0301 MP3 Player - 0302 Multi-Card MP3 Player - 1001 Multi-Flash Disk - 2001 Multi-Card Reader - 2002 Q018 default PID - 2003 Multi-Card Reader - 2005 Datalux DLX-1611 16in1 Card Reader - 2006 All-In-One Card Reader - 2007 USB to ATAPI bridge - 2008 All-In-One Card Reader - 2013 SD/MS Combo Card Reader - 2014 SD/MS Single Card Reader - 2023 card reader SD/MS DEMO board with ICSI brand name (MaskROM version) - 2024 card reader SD/MS DEMO board with Generic brand name (MaskROM version) - 2026 USB2.0 Card Reader - 2027 USB 2.0 Card Reader - 2315 UFD MP3 player (model 2) - 2318 UFD MP3 player (model 1) - 2321 UFD MP3 player -0ddb Tamarack, Inc. -0ddd Datelink Technology Co., Ltd -0dde Ubicom, Inc. -0de0 BD Consumer Healthcare -0dea UTECH Electronic (D.G.) Co., Ltd. -0ded Novasonics -0dee Lifetime Memory Products - 4010 Storage Adapter -0def Full Rise Electronic Co., Ltd -0df4 NET&SYS - 0201 MNG-2005 -0df6 Sitecom Europe B.V. - 0001 C-Media VOIP Device - 0004 Bluetooth 2.0 Adapter 100m - 0007 Bluetooth 2.0 Adapter 10m - 000b Bluetooth 2.0 Adapter DFU - 000d WL-168 Wireless Network Adapter 54g - 0017 WL-182 Wireless-N Network USB Card - 0019 Bluetooth 2.0 adapter 10m CN-512v2 001 - 001a Bluetooth 2.0 adapter 100m CN-521v2 001 - 002b WL-188 Wireless Network 300N USB Adapter - 002c WL-301 Wireless Network 300N USB Adapter - 002d WL-302 Wireless Network 300N USB dongle - 0036 WL-603 Wireless Adapter - 0039 WL-315 Wireless-N USB Adapter - 003b WL-321 Wireless USB Gaming Adapter 300N - 003c WL-323 Wireless-N USB Adapter - 003d WL-324 Wireless USB Adapter 300N - 003e WL-343 Wireless USB Adapter 150N X1 - 003f WL-608 Wireless USB Adapter 54g - 0040 WL-344 Wireless USB Adapter 300N X2 - 0041 WL-329 Wireless Dualband USB adapter 300N - 0042 WL-345 Wireless USB adapter 300N X3 - 0045 WL-353 Wireless USB Adapter 150N Nano - 0047 WL-352v1 Wireless USB Adapter 300N 002 - 0048 WL-349v1 Wireless USB Adapter 150N 002 - 004a WL-358v1 Wireless Micro USB Adapter 300N X3 002 - 004b WL-349v3 Wireless Micro Adapter 150N X1 [Realtek RTL8192SU] - 004c WL-352 802.11n Adapter [realtek rtl8191s] - 0050 WL-349v4 Wireless Micro Adapter 150N X1 [Ralink RT3370] - 061c LN-028 Network USB 2.0 Adapter - 21f4 44 St Bluetooth Device - 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 WL-113 rev 1 Wireless Network USB Adapter - 9075 WL-117 Hi-Speed USB Adapter - 90ac WL-172 Wireless Network USB Adapter 54g Turbo - 9712 WL-113 rev 2 Wireless Network USB Adapter -0df7 Mobile Action Technology, Inc. - 0620 MA-620 Infrared Adapter - 0700 MA-700 Bluetooth Adapter - 0720 MA-720 Bluetooth Adapter - 0722 Bluetooth Dongle - 0730 MA-730/MA-730G Bluetooth Adapter - 0800 Data Cable - 0820 Data Cable - 0900 MA i-gotU Travel Logger GPS - 1800 Generic Card Reader - 1802 Card Reader -0dfa Toyo Communication Equipment Co., Ltd -0dfc GeneralTouch Technology Co., Ltd - 0001 Touchscreen -0e03 Nippon Systemware Co., Ltd -0e08 Winbest Technology Co., Ltd -0e0b Amigo Technology Inc. - 9031 802.11n Wireless USB Card - 9041 802.11n Wireless USB Card -0e0c Gesytec - 0101 LonUSB LonTalk Network Adapter -0e0f VMware, Inc. - 0001 Device - 0002 Virtual USB Hub - 0003 Virtual Mouse - 0004 Virtual CCID - 0005 Virtual Mass Storage - 0006 Virtual Keyboard - f80a Smoker FX2 -0e16 JMTek, LLC -0e17 Walex Electronic, Ltd -0e1b Crewave -0e20 Pegasus Technologies Ltd. - 0101 NoteTaker -0e21 Cowon Systems, Inc. - 0300 iAudio CW200 - 0400 MP3 Player - 0500 iAudio M3 - 0510 iAudio X5, subpack USB port - 0513 iAudio X5, side USB port - 0520 iAudio M5, side USB port - 0601 iAudio G3 - 0700 iAudio U3 - 0751 iAudio 7 - 0760 iAUDIO U5 / iAUDIO G2 - 0800 Cowon D2 (UMS mode) - 0801 Cowon D2 (MTP mode) - 0910 iAUDIO 9 - 0920 J3 -0e22 Symbian Ltd. -0e23 Liou Yuane Enterprise Co., Ltd -0e25 VinChip Systems, Inc. -0e26 J-Phone East Co., Ltd -0e30 HeartMath LLC -0e34 Micro Computer Control Corp. -0e35 3Pea Technologies, Inc. -0e36 TiePie engineering - 0008 Handyscope HS3 - 0009 Handyscope HS3 (br) - 000a Handyscope HS4 - 000b Handyscope HS4 (br) - 000e Handyscope HS4-DIFF - 000f Handyscope HS4-DIFF (br) - 0010 Handyscope HS2 - 0011 TiePieSCOPE HS805 (br) - 0012 TiePieSCOPE HS805 - 0018 Handyprobe HP2 - 0042 TiePieSCOPE HS801 - 00fd USB To Parallel adapter - 00fe USB To Parallel adapter -0e38 Stratitec, Inc. -0e39 Smart Modular Technologies, Inc. - 0137 Bluetooth Device -0e3a Neostar Technology Co., Ltd - 1100 CW-1100 Wireless Network Adapter -0e3b Mansella, Ltd -0e41 Line6, Inc. - 4147 TonePort GX - 4250 BassPODxt - 4252 BassPODxt Pro - 4642 BassPODxt Live - 4650 PODxt Live - 4750 GuitarPort - 5044 PODxt - 5050 PODxt Pro - 534d SeaMonkey -0e44 Sun-Riseful Technology Co., Ltd. -0e48 Julia Corp., Ltd - 0100 CardPro SmartCard Reader -0e4a Shenzhen Bao Hing Electric Wire & Cable Mfr. Co. -0e4c Radica Games, Ltd - 1097 Gamester Controller - 2390 Games Jtech Controller - 7288 funkey reader -0e55 Speed Dragon Multimedia, Ltd - 110a Tanic S110-SG1 + ISSC IS1002N [Slow Infra-Red (SIR) & Bluetooth 1.2 (Class 2) Adapter] - 110b MS3303H USB-to-Serial Bridge -0e56 Kingston Technology Company, Inc. - 6021 K-PEX 100 -0e5a Active Co., Ltd -0e5b Union Power Information Industrial Co., Ltd -0e5c Bitland Information Technology Co., Ltd - 6118 LCD Device - 6119 remote receive and control device - 6441 C-Media Sound Device -0e5d Neltron Industrial Co., Ltd -0e5e Conwise Technology Co., Ltd. - 6622 CW6622 -0e66 Hawking Technologies - 0001 HWUN1 Hi-Gain Wireless-300N Adapter w/ Upgradable Antenna [Ralink RT2870] - 0003 HWDN1 Hi-Gain Wireless-300N Dish Adapter [Ralink RT2870] - 0009 HWUN2 Hi-Gain Wireless-150N Adapter w/ Upgradable Antenna [Ralink RT2770] - 000b HWDN2 Hi-Gain Wireless-150N Dish Adapter [Ralink RT2770] - 0013 HWUN3 Hi-Gain Wireless-N Adapter [Ralink RT3070] - 0017 HAWNU1 Hi-Gain Wireless-150N Network Adapter with Range Amplifier [Ralink RT3070] - 0018 Wireless-N Network Adapter [Ralink RT2870] - 400b UF100 10/100 Network Adapter - 400c UF100 Ethernet [pegasus2] -0e67 Fossil, Inc. - 0002 Wrist PDA -0e6a Megawin Technology Co., Ltd - 0101 MA100 [USB-UART Bridge IC] - 6001 GEMBIRD Flexible keyboard KB-109F-B-DE -0e6f Logic3 - 0003 Freebird wireless Controller - 0005 Eclipse wireless Controller - 0006 Edge wireless Controller -0e70 Tokyo Electronic Industry Co., Ltd -0e72 Hsi-Chin Electronics Co., Ltd -0e75 TVS Electronics, Ltd -0e79 Archos, Inc. - 1106 Pocket Media Assistant - PMA400 - 1204 Gmini XS 200 - 1306 504 Portable Multimedia Player - 1330 5 Tablet - 1332 5 IMT - 1416 32 IT -0e7b On-Tech Industry Co., Ltd -0e7e Gmate, Inc. - 0001 Yopy 3000 PDA - 1001 YP3X00 PDA -0e82 Ching Tai Electric Wire & Cable Co., Ltd -0e83 Shin An Wire & Cable Co. -0e8c Well Force Electronic Co., Ltd -0e8d MediaTek Inc. - 0003 MT6227 phone - 0004 MT6227 phone -0e8f GreenAsia Inc. - 0003 MaxFire Blaze2 - 0012 USB Wireless 2.4GHz Gamepad - 0016 4 port USB 1.1 hub UH-174 - 0020 USB to PS/2 Adapter - 0021 Multimedia Keyboard Controller - 0201 SmartJoy Frag Xpad/PS2 adaptor -0e90 WiebeTech, LLC - 0100 Storage Adapter V1 -0e91 VTech Engineering Canada, Ltd -0e92 C's Glory Enterprise Co., Ltd -0e93 eM Technics Co., Ltd -0e95 Future Technology Co., Ltd -0e96 Aplux Communications, Ltd - c001 TRUST 380 USB2 SPACEC@M -0e97 Fingerworks, Inc. - 0908 Composite HID (Keyboard and Mouse) -0e98 Advanced Analogic Technologies, Inc. -0e99 Parallel Dice Co., Ltd -0e9a TA HSING Industries, Ltd -0e9b ADTEC Corp. -0e9c Streamzap, Inc. - 0000 Streamzap Remote Control -0e9f Tamura Corp. -0ea0 Ours Technology, Inc. - 2126 7-in-1 Card Reader - 2153 SD Card Reader Key - 2168 Transcend JetFlash 2.0 / Astone USB Drive - 6803 OTI-6803 Flash Disk - 6808 OTI-6808 Flash Disk - 6828 OTI-6828 Flash Disk -0ea6 Nihon Computer Co., Ltd -0ea7 MSL Enterprises Corp. -0ea8 CenDyne, Inc. -0ead Humax Co., Ltd -0eb0 NovaTech - 9020 NovaTech NV-902W - 9021 RT2573 -0eb1 WIS Technologies, Inc. - 6666 WinFast WalkieTV TV Loader - 6668 WinFast WalkieTV TV Loader - 7007 WinFast WalkieTV WDM Capture -0eb2 Y-S Electronic Co., Ltd -0eb3 Saint Technology Corp. -0eb7 Endor AG -0ebe VWeb Corp. -0ebf Omega Technology of Taiwan, Inc. -0ec0 LHI Technology (China) Co., Ltd -0ec1 Abit Computer Corp. -0ec2 Sweetray Industrial, Ltd -0ec3 Axell Co., Ltd -0ec4 Ballracing Developments, Ltd -0ec5 GT Information System Co., Ltd -0ec6 InnoVISION Multimedia, Ltd -0ec7 Theta Link Corp. - 1008 So., Show 301 Digital Camera -0ecd Lite-On IT Corp. - 1400 CD\RW 40X - a100 LDW-411SX DVD/CD Rewritable Drive -0ece TaiSol Electronics Co., Ltd -0ecf Phogenix Imaging, LLC -0ed1 WinMaxGroup - 6660 Flash Disk 64M-C - 6680 Flash Disk 64M-B - 7634 MP3 Player -0ed2 Kyoto Micro Computer Co., Ltd -0ed3 Wing-Tech Enterprise Co., Ltd -0ed5 Fiberbyte - e000 USB-inSync Device - f000 Fiberbyte USB-inSync Device - f201 Fiberbyte USB-inSync DAQ-2500X -0eda Noriake Itron Corp. -0edf e-MDT Co., Ltd - 2060 FID irock! 100 Series -0ee0 Shima Seiki Mfg., Ltd -0ee1 Sarotech Co., Ltd -0ee2 AMI Semiconductor, Inc. -0ee3 ComTrue Technology Corp. - 1000 Image Tank 1.5 -0ee4 Sunrich Technology, Ltd -0eee Digital Stream Technology, Inc. - 8810 Mass Storage Drive -0eef D-WAV Scientific Co., Ltd - 0001 eGalax TouchScreen - 0002 Touchscreen Controller(Professional) -0ef0 Hitachi Cable, Ltd -0ef1 Aichi Micro Intelligent Corp. -0ef2 I/O Magic Corp. -0ef3 Lynn Products, Inc. -0ef4 DSI Datotech -0ef5 PointChips - 2202 Flash Disk - 2366 Flash Disk -0ef6 Yield Microelectronics Corp. -0ef7 SM Tech Co., Ltd (Tulip) -0efd Oasis Semiconductor -0efe Wem Technology, Inc. -0f06 Visual Frontier Enterprise Co., Ltd -0f08 CSL Wire & Plug (Shen Zhen) Co. -0f0c CAS Corp. -0f0d Hori Co., Ltd - 0011 Real Arcade Pro 3 -0f0e Energy Full Corp. -0f11 LD Didactic GmbH - 1000 CASSY-S - 1010 Pocket-CASSY - 1020 Mobile-CASSY - 1080 Joule and Wattmeter - 1081 Digital Multimeter P - 1090 UMI P - 1100 X-Ray Apparatus - 1101 X-Ray Apparatus - 1200 VideoCom - 2000 COM3LAB - 2010 Terminal Adapter - 2020 Network Analyser - 2030 Converter Control Unit - 2040 Machine Test System -0f12 Mars Engineering Corp. -0f13 Acetek Technology Co., Ltd -0f18 Finger Lakes Instrumentation - 0002 CCD - 0006 Focuser - 0007 Filter Wheel - 000a ProLine CCD - 000b Color Filter Wheel 4 - 000c PDF2 - 000d Guider -0f19 Oracom Co., Ltd -0f1b Onset Computer Corp. -0f1c Funai Electric Co., Ltd -0f1d Iwill Corp. -0f21 IOI Technology Corp. -0f22 Senior Industries, Inc. -0f23 Leader Tech Manufacturer Co., Ltd -0f24 Flex-P Industries, Snd., Bhd. -0f2d ViPower, Inc. -0f2e Geniality Maple Technology Co., Ltd -0f2f Priva Design Services -0f30 Jess Technology Co., Ltd - 001c PS3 Guitar Controller Dongle - 0110 Dual Analog Rumble Pad - 0111 Colour Rumble Pad - 0208 Xbox & PC Gamepad -0f31 Chrysalis Development -0f32 YFC-BonEagle Electric Co., Ltd -0f37 Kokuyo Co., Ltd -0f38 Nien-Yi Industrial Corp. -0f3d Airprime, Incorporated - 0112 CDMA 1xEVDO PC Card, PC 5220 -0f41 RDC Semiconductor Co., Ltd -0f42 Nital Consulting Services, Inc. -0f44 Polhemus - ef11 Patriot (firmware not loaded) - ef12 Patriot - ff11 Liberty (firmware not loaded) - ff12 Liberty -0f4b St. John Technology Co., Ltd -0f4c WorldWide Cable Opto Corp. -0f4d Microtune, Inc. - 1000 Bluetooth Dongle -0f4e Freedom Scientific -0f52 Wing Key Electrical Co., Ltd -0f53 Dongguan White Horse Cable Factory, Ltd -0f54 Kawai Musical Instruments Mfg. Co., Ltd -0f55 AmbiCom, Inc. -0f5c Prairiecomm, Inc. -0f5d NewAge International, LLC - 9455 Compact Drive -0f5f Key Technology Corp. -0f60 NTK, Ltd -0f61 Varian, Inc. -0f62 Acrox Technologies Co., Ltd - 1001 Targus Mini Trackball Optical Mouse -0f63 LeapFrog Enterprises - 0010 Leapster Explorer - 0500 Fly Fusion - 0600 Leap Port Turbo - 0700 POGO - 0800 Didj - 0900 TAGSchool - 0a00 Leapster 2 - 0b00 Crammer - 0c00 Tag Jr - 0d00 My Pal Scout - 0e00 Tag32 - 0f00 Tag64 - 1000 Kiwi16 - 1100 Leapster L2x - 1111 Fly Fusion - 1300 Didj UK/France (Leapster Advance) -0f68 Kobe Steel, Ltd -0f69 Dionex Corp. -0f6a Vibren Technologies, Inc. -0f6e INTELLIGENT SYSTEMS - 0100 GameBoy Color Emulator - 0201 GameBoy Advance Flash Gang Writer - 0202 GameBoy Advance Capture - 0300 Gamecube DOL Viewer - 0400 NDS Emulator - 0401 NDS UIC - 0402 NDS Writer - 0403 NDS Capture - 0404 NDS Emulator (Lite) -0f73 DFI -0f7c DQ Technology, Inc. -0f7d NetBotz, Inc. -0f7e Fluke Corp. -0f88 VTech Holdings, Ltd - 3012 RT2570 - 3014 ZD1211B -0f8b Yazaki Corp. -0f8c Young Generation International Corp. -0f8d Uniwill Computer Corp. -0f8e Kingnet Technology Co., Ltd -0f8f Soma Networks -0f97 CviLux Corp. -0f98 CyberBank Corp. -0f9c Hyun Won, Inc. - 0301 M-Any Premium DAH-610 MP3/WMA Player - 0332 mobiBLU DAH-1200 MP3/Ogg Player -0f9e Lucent Technologies -0fa3 Starconn Electronic Co., Ltd -0fa4 ATL Technology -0fa5 Sotec Co., Ltd -0fa7 Epox Computer Co., Ltd -0fa8 Logic Controls, Inc. -0faf Winpoint Electronic Corp. -0fb0 Haurtian Wire & Cable Co., Ltd -0fb1 Inclose Design, Inc. -0fb2 Juan-Chern Industrial Co., Ltd -0fb8 Wistron Corp. - 0002 eHome Infrared Receiver -0fb9 AACom Corp. -0fba San Shing Electronics Co., Ltd -0fbb Bitwise Systems, Inc. -0fc1 Mitac Internatinal Corp. -0fc2 Plug and Jack Industrial, Inc. -0fc5 Delcom Engineering - 1222 I/O Development Board -0fc6 Dataplus Supplies, Inc. -0fca Research In Motion, Ltd. - 0001 Blackberry Handheld - 0004 Blackberry Handheld - 0006 Blackberry Pearl - 0008 Blackberry Pearl - 8001 Blackberry Handheld - 8004 Blackberry Handheld - 8007 Blackberry Handheld -0fce Sony Ericsson Mobile Communications AB - 0076 W910i (Multimedia mode) - 00af V640i Phone [PTP Camera] - 00d4 C902 [MTP] - 00d9 C702 Phone - 0112 W995 Walkman Phone - 1010 WMC Modem - 10af V640i Phone [PictBridge] - 10d4 C902 Phone [PictBridge] - 2105 W715 Phone - 2137 Xperia X10 mini (USB debug) - 2138 Xperia X10 mini pro (Debug) - 2149 Xperia X8 (debug) - 3137 Xperia X10 mini - 3138 Xperia X10 mini pro - 3149 Xperia X8 - 8004 9000 Phone [Mass Storage] - d008 V800-Vodafone 802SE Phone - d016 K750i Phone - d017 K608i Phone - d019 VDC EGPRS Modem - d025 520 WMC Data Modem - d028 W800i - d038 W850i Phone - d039 K800i (phone mode) - d041 K510i Phone - d042 W810i Phone - d043 V630i Phone - d046 K610i Phone - d065 W960i Phone (PC Suite) - d076 W910i (Phone mode) - d089 W580i Phone (mass storage) - d0af V640i Phone - d0cf MD300 Mobile Broadband Modem - d0d4 C902 Phone [Modem] - d0e1 MD400 Mobile Broadband Modem - d12e Xperia X10 - e039 K800i (msc mode) - e042 W810i Phone - e043 V630i Phone [Mass Storage] - e075 K850i - e076 W910i (Mass storage) - e089 W580i Phone - e090 W200 Phone (Mass Storage) - e0a3 W660i - e0af V640i Phone [Mass Storage] - e0d4 C902 Phone [Mass Storage] - e0ef C905 Phone [Mass Storage] - e0f3 W595 - e112 W995 Phone (Mass Storage) - e12e X10i Phone -0fcf Dynastream Innovations, Inc. -0fd0 Tulip Computers B.V. -0fd1 Giant Electronics Ltd. -0fd4 Tenovis GmbH & Co., KG -0fd5 Direct Access Technology, Inc. -0fdc Micro Plus -0fe4 IN-Tech Electronics, Ltd -0fe5 Greenconn (U.S.A.), Inc. -0fe6 Kontron (Industrial Computer Source / ICS Advent) - 8101 DM9601 Fast Ethernet Adapter - 811e Parallel Adapter - 9700 DM9601 Fast Ethernet Adapter -0fe9 DVICO - 4020 TViX M-6500 - db00 FusionHDTV DVB-T (MT352+LgZ201) (uninitialized) - db01 FusionHDTV DVB-T (MT352+LgZ201) (initialized) - db10 FusionHDTV DVB-T (MT352+Thomson7579) (uninitialized) - db11 FusionHDTV DVB-T (MT352+Thomson7579) (initialized) - db78 FusionHDTV DVB-T Dual Digital 4 (ZL10353+xc2028/xc3028) (initialized) -0fea United Computer Accessories -0feb CRS Electronic Co., Ltd -0fec UMC Electronics Co., Ltd -0fed Access Co., Ltd -0fee Xsido Corp. -0fef MJ Research, Inc. -0ff6 Core Valley Co., Ltd -0ff7 CHI SHING Computer Accessories Co., Ltd -0fff Aopen, Inc. -1000 Speed Tech Corp. -1001 Ritronics Components (S) Pte., Ltd -1003 Sigma Corp. - 0100 Sigma SD10 -1004 LG Electronics, Inc. - 1fae U8120 3G Cellphone - 6000 KU330/KU990/VX4400/VX6000 - 6005 T5100 - 6018 GM360/GD510/GW520/KP501 - 618e Ally/Optimus One/Vortex (debug mode) - 618f Ally/Optimus One - 61c6 Vortex (msc) - 6800 CDMA Modem - 7000 LG LDP-7024D(LD)USB - a400 Renoir (KC910) -1005 Apacer Technology, Inc. - 1001 MP3 Player - 1004 MP3 Player - 1006 MP3 Player - b113 Handy Steno 2.0/HT203 - b223 CD-RW + 6in1 Card Reader Digital Storage / Converter -1006 iRiver, Ltd. - 3001 iHP-100 - 3002 iHP-120/140 MP3 Player - 3003 H320/H340 - 3004 H340 (mtp) -1009 Emuzed, Inc. - 000e eHome Infrared Receiver - 0013 Angel MPEG Device - 0015 Lumanate Wave PAL SECAM DVBT Device - 0016 Lumanate Wave NTSC/ATSC Combo Device -100a AV Chaseway, Ltd - 2402 MP3 Player - 2404 MP3 Player - 2405 MP3 Player - 2406 MP3 Player - a0c0 MP3 Player -100b Chou Chin Industrial Co., Ltd -100d Netopia, Inc. - 3342 Cayman 3352 DSL Modem - 3382 3380 Series Network Interface - 6072 DSL Modem - 9031 Motorola 802.11n Dualband USB Wireless Adapter - 9032 Motorola 802.11n 5G USB Wireless Adapter - cb01 Cayman 3341 Ethernet DSL Router -1010 Fukuda Denshi Co., Ltd -1011 Mobile Media Tech. - 0001 AccFast Mp3 -1012 SDKM Fibres, Wires & Cables Berhad -1013 TST-Touchless Sensor Technology AG -1014 Densitron Technologies PLC -1015 Softronics Pty., Ltd -1016 Xiamen Hung's Enterprise Co., Ltd -1017 Speedy Industrial Supplies, Pte., Ltd -1019 Elitegroup Computer Systems (ECS) - 0c55 Flash Reader, Desknote UCR-61S2B - 0f38 Infrared Receiver -1020 Labtec - 0006 Wireless Keyboard - 000a Wireless Optical Mouse - 0106 Wireless Optical Mouse -1022 Shinko Shoji Co., Ltd -1025 Hyper-Paltek - 005e USB DVB-T device - 005f USB DVB-T device - 0300 MP3 Player - 0350 MP3 Player -1026 Newly Corp. -1027 Time Domain -1028 Inovys Corp. -1029 Atlantic Coast Telesys -102a Ramos Technology Co., Ltd -102b Infotronic America, Inc. -102c Etoms Electronics Corp. - 6151 Q-Cam Sangha CIF - 6251 Q-Cam VGA -102d Winic Corp. -1031 Comax Technology, Inc. -1032 C-One Technology Corp. -1033 Nucam Corp. - 0068 3,5'' HDD case MD-231 -1038 Ideazon, Inc. - 0100 Zboard -1039 devolo AG - 2140 dsl+ 1100 duo -103d Stanton - 0100 ScratchAmp - 0101 ScratchAmp -1043 iCreate Technologies Corp. - 160f Wireless Network Adapter - 4901 AV-836 Video Capture Device - 8006 Flash Disk 32-256 MB - 8012 Flash Disk 256 MB -1044 Chu Yuen Enterprise Co., Ltd - 7001 Gigabyte U7000 DVB-T tuner - 7002 Gigabyte U8000 DVB-T tuner - 7004 Gigabyte U7100 DVB-T tuner - 7005 Gigabyte U7200 DVB-T tuner [AF9035] - 7006 Gigabyte U6000 DVB-T tuner [em2863] - 8001 GN-54G - 8002 GN-BR402W - 8003 GN-WLBM101 - 8004 GN-WLBZ101 802.11b Adapter - 8005 GN-WLBZ201 802.11b Adapter - 8006 GN-WBZB-M 802.11b Adapter - 8007 GN-WBKG - 8008 GN-WB01GS - 800a GN-WI05GS - 800b GN-WB30N 802.11n WLAN Card - 800c GN-WB31N 802.11n USB WLAN Card - 800d GN-WB32L 802.11n USB WLAN Card -1046 Winbond Electronics Corp. [hex] - 6694 Generic W6694 USB - 8901 Bluetooth Device - 9967 W9967CF/W9968CF Webcam IC -1048 Targus Group International -104b Mylex / Buslogic -104c AMCO TEC International, Inc. -104d Newport Corporation - 1003 Model-52 LED Light Source Power Supply and Driver -104f WB Electronics - 0001 Infinity Phoenix - 0002 Smartmouse - 0003 FunProgrammer - 0004 Infinity Unlimited - 0006 Infinity Smart - 0007 Infinity Smart module - 0008 Infinity CryptoKey - 0009 RE-BL PlayStation 3 IR-to-Bluetooth converter -1050 Yubico.com - 0010 Yubikey -1053 Immanuel Electronics Co., Ltd -1054 BMS International Beheer N.V. - 5004 DSL 7420 Loader - 5005 DSL 7420 LAN Modem -1055 Complex Micro Interconnection Co., Ltd -1056 Hsin Chen Ent Co., Ltd -1057 ON Semiconductor -1058 Western Digital Technologies, Inc. - 0200 Firewire USB Combo - 0400 External HDD - 0500 hub - 0702 Passport External HDD - 0704 Passport External HDD - 070a My Passport Essential SE - 071a My Passport 1TB - 0900 MyBook Essential External HDD - 0901 MyBook External HDD - 0910 MyBook Essential External HDD - 1001 External Hard Disk [Elements] - 1021 Elements 2TB - 1104 MyBook Mirror Edition External HDD - 1123 My Book 3.0 -1059 Giesecke & Devrient GmbH - 000b StarSign Bio Token 3.0 -105c Hong Ji Electric Wire & Cable (Dongguan) Co., Ltd -105d Delkin Devices, Inc. -105e Valence Semiconductor Design, Ltd -105f Chin Shong Enterprise Co., Ltd -1060 Easthome Industrial Co., Ltd -1063 Motorola Electronics Taiwan, Ltd [hex] - 1555 MC141555 Hub - 4100 SB4100 USB Cable Modem -1065 CCYU Technology - 0020 USB-DVR2 Dev Board - 2136 EasyDisk ED1064 -106a Loyal Legend, Ltd -106c Curitel Communications, Inc. - 1101 CDMA 2000 1xRTT USB modem (HX-550C) - 1102 Packet Service - 1103 Packet Service Diagnostic Serial Port (WDM) - 1104 Packet Service Diagnostic Serial Port (WDM) - 1105 Composite Device - 1106 Packet Service Diagnostic Serial Port (WDM) - 1301 Composite Device - 1302 Packet Service Diagnostic Serial Port (WDM) - 1303 Packet Service - 1304 Packet Service - 1401 Composite Device - 1402 Packet Service - 1403 Packet Service Diagnostic Serial Port (WDM) - 1501 Packet Service - 1502 Packet Service Diagnostic Serial Port (WDM) - 1503 Packet Service - 1601 Packet Service - 1602 Packet Service Diagnostic Serial Port (WDM) - 1603 Packet Service - 2101 AudioVox 8900 Cell Phone - 2102 Packet Service - 2103 Packet Service Diagnostic Serial Port (WDM) - 2301 Packet Service - 2302 Packet Service Diagnostic Serial Port (WDM) - 2303 Packet Service - 2401 Packet Service Diagnostic Serial Port (WDM) - 2402 Packet Service - 2403 Packet Service Diagnostic Serial Port (WDM) - 2501 Packet Service - 2502 Packet Service Diagnostic Serial Port (WDM) - 2503 Packet Service - 2601 Packet Service - 2602 Packet Service Diagnostic Serial Port (WDM) - 2603 Packet Service - 3701 Broadband Wireless modem - 3702 Pantech PX-500 - 3714 PANTECH USB MODEM [UM175] - 3eb4 Packet Service Diagnostic Serial Port (WDM) - 4101 Packet Service Diagnostic Serial Port (WDM) - 4102 Packet Service - 4301 Composite Device - 4302 Packet Service Diagnostic Serial Port (WDM) - 4401 Composite Device - 4402 Packet Service - 4501 Packet Service - 4502 Packet Service Diagnostic Serial Port (WDM) - 4601 Composite Device - 4602 Packet Service Diagnostic Serial Port (WDM) - 5101 Packet Service - 5102 Packet Service Diagnostic Serial Port (WDM) - 5301 Packet Service Diagnostic Serial Port (WDM) - 5302 Packet Service - 5401 Packet Service - 5402 Packet Service Diagnostic Serial Port (WDM) - 5501 Packet Service Diagnostic Serial Port (WDM) - 5502 Packet Service - 5601 Packet Service Diagnostic Serial Port (WDM) - 5602 Packet Service - 7101 Composite Device - 7102 Packet Service - a000 Packet Service - a001 Packet Service Diagnostic Serial Port (WDM) - c100 Packet Service - c200 Packet Service - c500 Packet Service Diagnostic Serial Port (WDM) - e200 Packet Service -106d San Chieh Manufacturing, Ltd -106e ConectL -106f Money Controls -1076 GCT Semiconductor, Inc. - 0031 Bluetooth Device - 0032 Bluetooth Device -107b Gateway, Inc. - 3009 eHome Infrared Transceiver - 55b2 WBU-110 802.11b Wireless Adapter [Intersil PRISM 3] - 55f2 WGU-210 802.11g Adapter [Intersil ISL3886] -107d Arlec Australia, Ltd -107e Midoriya Electric Co., Ltd -107f KidzMouse, Inc. -1082 Shin-Etsukaken Co., Ltd -1083 Canon Electronics, Inc. - 162c P-150 Scanner -1084 Pantech Co., Ltd -108a Chloride Power Protection -108b Grand-tek Technology Co., Ltd -108c Robert Bosch GmbH -108e Lotes Co., Ltd. -1099 Surface Optics Corp. -109a DATASOFT Systems GmbH -109f eSOL Co., Ltd - 3163 Trigem Mobile SmartDisplay84 - 3164 Trigem Mobile SmartDisplay121 -10a0 Hirotech, Inc. -10a3 Mitsubishi Materials Corp. -10a9 SK Teletech Co., Ltd - 1102 Sky Love Actually IM-U460K - 1104 Sky Vega IM-A650S - 6021 SIRIUS alpha -10aa Cables To Go -10ab USI Co., Ltd - 1002 Bluetooth Device - 1003 BC02-EXT in DFU - 1005 Bluetooth Adptr - 1006 BC04-EXT in DFU - 10c5 Sony-Ericsson / Samsung DataCable -10ac Honeywell, Inc. -10ae Princeton Technology Corp. -10af Liebert Corp. - 0000 UPS - 0001 PowerSure PSA UPS - 0002 PowerSure PST UPS - 0003 PowerSure PSP UPS - 0004 PowerSure PSI UPS - 0005 UPStation GXT 2U UPS - 0006 UPStation GXT UPS - 0007 Nfinity Power Systems UPS - 0008 PowerSure Interactive UPS -10b5 Comodo (PLX?) - 9060 Test Board -10b8 DiBcom - 0bb8 DiBcom USB DVB-T reference design (MOD300) (cold) - 0bb9 DiBcom USB DVB-T reference design (MOD300) (warm) - 0bc6 DiBcom USB2.0 DVB-T reference design (MOD3000P) (cold) - 0bc7 DiBcom USB2.0 DVB-T reference design (MOD3000P) (warm) -10bb TM Technology, Inc. -10bc Dinging Technology Co., Ltd -10bd TMT Technology, Inc. - 1427 Ethernet -10bf SmartHome - 0001 SmartHome PowerLinc -10c4 Cygnal Integrated Products, Inc. - 0002 F32x USBXpress Device - 0003 CommandIR - 8044 USB Debug Adapter - 804e Software Bisque Paramount ME - 80a9 CP210x to UART Bridge Controller - 80ca ATM2400 Sensor Device - 818a Silicon Labs FM Radio Reference Design - 8461 Sangoma U100 - ea60 CP210x Composite Device -10c5 Sanei Electric, Inc. - 819a FM Radio -10c6 Intec, Inc. -10cb Eratech -10cc GBM Connector Co., Ltd - 1101 MP3 Player -10cd Kycon, Inc. -10ce Silicon Labs - ea6a MobiData EDGE USB Modem -10cf Velleman Components, Inc. - 2011 R-Engine MPEG2 encoder/decoder - 5500 8055 Experiment Interface Board (address=0) - 5501 8055 Experiment Interface Board (address=1) - 5502 8055 Experiment Interface Board (address=2) - 5503 8055 Experiment Interface Board (address=3) -10d1 Hottinger Baldwin Measurement - 0101 USB-Module for Spider8, CP32 - 0202 CP22 - Communication Processor - 0301 CP42 - Communication Processor -10d4 Man Boon Manufactory, Ltd -10d5 Uni Class Technology Co., Ltd - 5552 KVM Human Interface Composite Device (Keyboard/Mouse ports) - 55a2 2Port KVMSwitcher -10d6 Actions Semiconductor Co., Ltd - 1000 MP3 Player - 1100 MPMan MP-Ki 128 MP3 Player/Recorder - 1101 D-Wave 2GB MP4 Player / AK1025 MP3/MP4 Player - 2200 Acer MP-120 MP3 player - 8888 ADFU Device - ff51 ADFU Device - ff61 MP4 Player - ff66 Craig 2GB MP3/Video Player -10de Authenex, Inc. -10df In-Win Development, Inc. - 0500 iAPP CR-e500 Card reader -10e0 Post-Op Video, Inc. -10e1 CablePlus, Ltd -10e2 Nada Electronics, Ltd -10ec Vast Technologies, Inc. -10f0 Nexio Co., Ltd - 2002 iNexio Touchscreen controller -10f1 Importek - 1a08 Internal Webcam - 1a1e Laptop Integrated Webcam 1.3M -10f5 Turtle Beach - 0200 Audio Advantage Roadie -10fb Pictos Technologies, Inc. -10fd Anubis Electronics, Ltd - 7e50 FlyCam Usb 100 - 804d Typhoon Webshot II Webcam [zc0301] - 8050 FlyCAM-USB 300 XP2 - de00 WinFast WalkieTV WDM Capture Driver. -1100 VirTouch, Ltd - 0001 VTPlayer VTP-1 Braille Mouse -1101 EasyPass Industrial Co., Ltd - 0001 FSK Electronics Super GSM Reader -1108 Brightcom Technologies, Ltd -110a Moxa Technologies Co., Ltd. - 1250 UPort 1250 2-Port RS-232/422/485 - 1251 UPort 1250I 2-Port RS-232/422/485 with Isolation - 1410 UPort 1410 4-Port RS-232 - 1450 UPort 1450 4-Port RS-232/422/485 - 1451 UPort 1450I 4-Port RS-232/422/485 with Isolation - 1613 UPort 1610-16 16-Port RS-232 - 1618 UPort 1610-8 8-Port RS-232 - 1653 UPort 1650-16 16-Port RS-232/422/485 - 1658 UPort 1650-8 8-Port RS-232/422/485 -1110 Analog Devices Canada, Ltd (Allied Telesyn) - 5c01 Huawei MT-882 Remote NDIS Network Device - 6489 ADSL ETH/USB RTR - 9000 ADSL LAN Adapter - 9001 ADSL Loader - 900f AT-AR215 DSL Modem - 9010 AT-AR215 DSL Modem - 9021 ADSL WAN Adapter - 9022 ADSL Loader - 9023 ADSL WAN Adapter - 9024 ADSL Loader - 9031 ADSL LAN Adapter - 9032 ADSL Loader -1111 Pandora International Ltd. - 8888 Evolution Device -1112 YM ELECTRIC CO., Ltd -1113 Medion AG - a0a2 Active Sync device -111e VSO Electric Co., Ltd -112a RedRat - 0001 RedRat3 IR Transceiver - 0005 RedRat3II IR Transceiver -112e Master Hill Electric Wire and Cable Co., Ltd -112f Cellon International, Inc. -1130 Tenx Technology, Inc. - 0002 iBuddy - 6604 MCE IR-Receiver - 660c Foot Pedal/Thermometer - 6806 Keychain photo frame - f211 TP6911 Audio Headset -1131 Integrated System Solution Corp. - 1001 KY-BT100 Bluetooth Adapter - 1002 Bluetooth Device - 1003 Bluetooth Device - 1004 Bluetooth Device -1132 Toshiba Corp., Digital Media Equipment [hex] - 4331 PDR-M4/M5/M70 Digital Camera - 4332 PDR-M60 Digital Camera - 4333 PDR-M2300/PDR-M700 - 4334 PDR-M65 - 4335 PDR-M61 - 4337 PDR-M11 - 4338 PDR-M25 -1136 CTS Electronincs - 3131 CTS LS515 -113c Arin Tech Co., Ltd -113d Mapower Electronics Co., Ltd -1141 V One Multimedia, Pte., Ltd -1142 CyberScan Technologies, Inc. -1145 Japan Radio Company - 0001 AirH PHONE AH-J3001V/J3002V -1146 Shimane SANYO Electric Co., Ltd. -1147 Ever Great Electric Wire and Cable Co., Ltd -114b Sphairon Access Systems GmbH - 0110 Turbolink UB801R WLAN Adapter - 0150 Turbolink UB801RE Wireless 802.11g 54Mbps Network Adapter [RTL8187] -114c Tinius Olsen Testing Machine Co., Inc. -114d Alpha Imaging Technology Corp. -114f Wavecom -115b Salix Technology Co., Ltd. -1162 Secugen Corp. -1163 DeLorme Publishing, Inc. - 0100 Earthmate GPS (orig) - 0200 Earthmate GPS (LT-20, LT-40) - 2020 Earthmate GPS (PN-40) -1164 YUAN High-Tech Development Co., Ltd - 0300 ELSAVISION 460D - 0601 Analog TV Tuner - 0900 TigerBird BMP837 USB2.0 WDM Encoder - 0bc7 Digital TV Tuner - 521b MC521A mini Card ATSC Tuner - 6601 Digital TV Tuner Card [RTL2832U] -1165 Telson Electronics Co., Ltd -1166 Bantam Interactive Technologies -1167 Salient Systems Corp. -1168 BizConn International Corp. -116e Gigastorage Corp. -116f Silicon 10 Technology Corp. - 0005 Flash Card Reader - c108 Flash Card Reader - c109 Flash Card Reader -1175 Shengyih Steel Mold Co., Ltd -117d Santa Electronic, Inc. -117e JNC, Inc. -1182 Venture Corp., Ltd -1183 Compaq Computer Corp. [hex] (Digital Dream ??) - 0001 DigitalDream l'espion XS - 19c7 ISDN TA - 4008 56k FaxModem - 504a PJB-100 Personal Jukebox -1184 Kyocera Elco Corp. -1188 Bloomberg L.P. -1189 Acer Communications & Multimedia - 0893 EP-1427X-2 Ethernet Adapter -118f You Yang Technology Co., Ltd -1190 Tripace -1191 Loyalty Founder Enterprise Co., Ltd -1196 Yankee Robotics, LLC - 0010 Trifid Camera without code - 0011 Trifid Camera -1197 Technoimagia Co., Ltd -1198 StarShine Technology Corp. -1199 Sierra Wireless, Inc. - 0019 AC595U - 0021 AC597E - 0024 MC5727 CDMA modem - 0110 Composite Device - 0112 CDMA 1xEVDO PC Card, AirCard 580 - 0120 AC595U - 0218 MC5720 Wireless Modem - 6467 MP Series Network Adapter - 6468 MP Series Network Adapter - 6469 MP Series Network Adapter - 6802 MC8755 Device - 6803 MC8765 Device - 6804 MC8755 Device - 6805 MC8765 Device - 6812 MC8775 Device - 6820 AC875 Device - 6832 MC8780 Device - 6833 MC8781 Device - 683a MC8785 Device - 6850 AirCard 880 Device - 6851 AirCard 881 Device - 6852 AirCard 880E Device - 6853 AirCard 881E Device - 6854 AirCard 885 Device - 6856 ATT "USB Connect 881" - 6870 MC8780 Device - 6871 MC8781 Device - 6893 MC8777 Device - 9000 Gobi 2000 Wireless Modem (QDL mode) - 9001 Gobi 2000 Wireless Modem - 9002 Gobi 2000 Wireless Modem - 9003 Gobi 2000 Wireless Modem - 9004 Gobi 2000 Wireless Modem - 9005 Gobi 2000 Wireless Modem - 9006 Gobi 2000 Wireless Modem - 9007 Gobi 2000 Wireless Modem - 9008 Gobi 2000 Wireless Modem - 9009 Gobi 2000 Wireless Modem - 900a Gobi 2000 Wireless Modem -119a ZHAN QI Technology Co., Ltd -119b ruwido austria GmbH - 0400 Infrared Keyboard V2.01 -11a0 Chipcon AS - eb11 CC2400EB 2.0 ZigBee Sniffer -11a3 Technovas Co., Ltd - 8031 MP3 Player - 8032 MP3 Player -11aa GlobalMedia Group, LLC - 1518 iREZ K2 -11ab Exito Electronics Co., Ltd -11b0 ATECH FLASH TECHNOLOGY -11c5 Inmax - 0521 IMT-0521 Smartcard Reader -11db Topfield Co., Ltd. - 1000 PVR - 1100 PVR -11e6 K.I. Technology Co. Ltd. -11f5 Siemens AG - 0001 SX1 - 0003 Mobile phone USB cable - 0004 X75 - 0005 SXG75/EF81 - 0008 UMTS/HSDPA Data Card -11f6 Prolific - 2001 Willcom WSIM -11f7 Alcatel (?) - 02df TD10 Mobile phone USB cable -1203 TSC Auto ID Technology Co., Ltd - 0140 TTP-245C -1209 InterBiometrics - 1001 USB Hub - 1002 USB Relais - 1003 IBSecureCam-P - 1004 IBSecureCam-O - 1005 IBSecureCam-N -120e Hudson Soft Co., Ltd -120f Magellan - 5260 Triton Handheld GPS Receiver (300/400/500/1500/2000) -1210 DigiTech - 001b RP155 Guitar Multi-Effects Processor - 001c RP255 Guitar Multi-Effects Processor -121e Jungsoft Co., Ltd - 3403 Muzio JM250 Audio Player -1223 SKYCABLE ENTERPRISE. CO., LTD. -1230 Chipidea-Microelectronica, S.A. -1233 Denver Electronics - 5677 FUSB200 mp3 player -1234 Unknown - ed02 Emotiv EPOC Developer Headset Wireless Dongle -1235 Novation EMS - 0001 ReMOTE Audio/XStation - 0002 Speedio - 0003 ReMOTE ZeRO SL - 4661 ReMOTE25 -1241 Belkin - 1111 Mouse - 1122 Typhoon Stream Optical Mouse USB+PS/2 - 1155 PS2/USB Browser Combo Mouse - 1166 MI-2150 Trust Mouse - 1177 F8E842-DL Mouse - 1503 Keyboard - 1603 Keyboard -124a AirVast - 168b PRISM3 WLAN Adapter - 4017 PC-Chips 802.11b Adapter -124b Nyko (Honey Bee) - 4d01 Airflo EX Joystick -124c MXI - Memory Experts International, Inc. - 3200 Stealth MXP 1GB -125c Apogee Inc. - 0010 Alta series CCD -125f A-DATA Technology Co., Ltd. - c81a Flash drive -1260 Standard Microsystems Corp. - ee22 SMC2862W-G v3 EZ Connect 802.11g Adapter [Intersil ISL3887] -1264 Covidien Energy-based Devices -1266 Pirelli Broadband Solutions - 6302 Fastweb DRG A226M ADSL Router -1267 Logic3 / SpectraVideo plc - 0103 G-720 Keyboard - 0201 A4Tech SWOP-3 Mouse - a001 JP260 PC Game Pad - c002 Wireless Optical Mouse -126c Aristocrat Technologies -126d Bel Stewart -126e Strobe Data, Inc. -126f TwinMOS - 1325 Mobile Disk - 2168 Mobile Disk III - a006 G240 802.11bg -1274 Ensoniq -1275 Xaxero Marine Software Engineering, Ltd. - 0002 WeatherFax 2000 Demodulator - 0080 SkyEye Weather Satellite Receiver -1283 zebris Medical GmbH - 0100 USB-RS232 Adaptor - 0110 CMS20 - 0111 CMS 10 - 0112 CMS 05 - 0114 ARCUS digma PC-Interface - 0115 SAM Axioquick recorder - 0116 SAM Axioquick recorder - 0120 emed-X - 0121 emed-AT - 0130 PDM - 0150 CMS10GI (Golf) -1286 Marvell Semiconductor, Inc. - 1fab 88W8338 [Libertas] 802.11g - 2001 88W8388 802.11a/b/g WLAN - 2006 88W8360 802.11n WLAN - 8001 BLOB boot loader firmware -1291 Qualcomm Flarion Technologies, Inc. / Leadtek Research, Inc. - 0010 FDM 2xxx Flash-OFDM modem - 0011 LR7F06/LR7F14 Flash-OFDM modem -1292 Innomedia - 0258 Creative Labs VoIP Blaster -1293 Belkin Components [hex] - 0002 F5U002 Parallel Port [uss720] - 2101 104-key keyboard -1294 RISO KAGAKU CORP. -129b CyberTAN Technology - 160b Siemens S30853-S1031-R351 802.11g Wireless Adapter [Atheros AR5523] - 160c Siemens S30853-S1038-R351 802.11g Wireless Adapter [Atheros AR5523] - 1666 TG54USB 802.11bg - 1667 802.11bg - 1828 Gigaset USB Adapter 300 -12a7 Trendchip Technologies Corp. -12ab Honey Bee Electronic International Ltd. -12b8 Zhejiang Xinya Electronic Technology Co., Ltd. -12ba Licensed by Sony Computer Entertainment America - 0100 RedOctane Guitar for PlayStation(R)3 - 0120 RedOctane Drum Kit for PlayStation(R)3 - 0200 Harmonix Guitar for PlayStation(R)3 - 0210 Harmonix Drum Kit for PlayStation(R)3 -12c4 Autocue Group Ltd - 0006 Teleprompter Two-button Hand Control (v1) - 0008 Teleprompter Foot Control (v1) -12d1 Huawei Technologies Co., Ltd. - 1001 E620 USB Modem - 1003 E220 HSDPA Modem / E230/E270 HSDPA/HSUPA Modem - 1009 U120 - 1010 ETS2252+ CDMA Fixed Wireless Terminal - 1037 Ideos - 1038 Ideos (debug mode) - 1406 E1750 - 140b EC1260 Wireless Data Modem HSD USB Card - 1446 E1552 (HSPA modem) - 1501 Pulse - 380b WiMAX USB modem(s) -12d2 LINE TECH INDUSTRIAL CO., LTD. -12d6 EMS Dr. Thomas Wuensche - 0444 CPC-USB/ARM7 - 0888 CPC-USB/M16C -12d7 BETTER WIRE FACTORY CO., LTD. -12e6 Waldorf Music GmbH - 0013 Blofeld -12ef Tapwave, Inc. - 0100 Tapwave Handheld [Tapwave Zodiac] -12f5 Dynamic System Electronics Corp. -12f7 Memorex Products, Inc. - 1a00 TD Classic 003B - 1e23 TravelDrive 2007 Flash Drive -12fd AIN Comm. Technology Co., Ltd - 1001 AWU2000b 802.11b Stick -12ff Fascinating Electronics, Inc. - 0101 Advanced RC Servo Controller -1307 Transcend Information, Inc. - 0163 256MB/512MB/1GB Flash Drive - 0165 2GB/4GB Flash Drive - 0361 CR-75: 51-in-1 Card Reader/Writer - 1169 TS2GJF210 JetFlash 210 2GB - 1171 Fingerprint Reader -1308 Shuttle, Inc. - 0003 VFD Module - c001 eHome Infrared Transceiver -1310 Roper - 0001 Class 1 Bluetooth Dongle -1312 ICS Electronics -131d Natural Point - 0155 TrackIR 3 Pro Head Tracker - 0156 TrackIR 4 Pro Head Tracker -132a Envara Inc. - 1502 WiND 802.11abg / 802.11bg WLAN -132b Konica Minolta - 0000 Dimage A2 Camera - 0001 Minolta DiMAGE A2 (ptp) - 0003 Dimage Xg Camera - 0006 Dimage Z2 Camera - 0007 Minolta DiMAGE Z2 (PictBridge mode) - 0008 Dimage X21 Camera - 000a Dimage Scan Dual IV - 000b Dimage Z10 Camera - 000d Dimage X50 Camera [storage?] - 000f Dimage X50 Camera [p2p?] - 0010 Dimage G600 Camera - 0012 Dimage Scan Elite5400 2 - 0013 Dimage X31 Camera - 0015 Dimage G530 Camera - 0017 Dimage Z3 Camera - 0018 Minolta DiMAGE Z3 (PictBridge mode) - 0019 Dimage A200 Camera - 0021 Dimage Z5 Camera - 0022 Minolta DiMAGE Z5 (PictBridge mode) - 002c Dynax 5D camera - 2001 Magicolor 2400w - 2004 Magicolor 5430DL - 2005 Magicolor 2430 DL - 2029 Magicolor 5440DL - 2030 PagePro 1350E(N) - 2033 PagePro 1400W - 2043 Magicolor 2530DL - 2045 Magicolor 2500W - 2049 Magicolor 2490MF -1342 Mobility - 0200 EasiDock 200 Hub - 0201 EasiDock 200 Keyboard and Mouse Port - 0202 EasiDock 200 Serial Port - 0203 EasiDock 200 Printer Port - 0204 Ethernet - 0304 EasiDock Ethernet -1345 Sino Lite Technology Corp. - 001c Xbox Controller Hub -1347 Moravian Instruments - 0400 G2CCD USB 1.1 obsolete - 0401 G2CCD-S with Sony ICX285 CCD - 0402 G2CCD2 - 0403 G2/G3CCD-I KAI CCD - 0404 G2/G3CCD-F KAF CCD - 0410 G1-0400 CCD - 0411 G1-0800 CCD - 0412 G1-0300 CCD - 0413 G1-2000 CCD - 0414 G1-1400 CCD -1348 Katsuragawa Electric Co., Ltd. -134c PanJit International Inc. - 0001 Touch Panel Controller - 0002 Touch Panel Controller - 0003 Touch Panel Controller - 0004 Touch Panel Controller -134e Digby's Bitpile, Inc. DBA D Bit -1357 P&E Microcomputer Systems - 0503 USB-ML-12 HCS08/HCS12 Multilink - 0504 DEMOJM -1366 SEGGER - 0101 J-Link ARM -136b STEC -1370 Swissbit - 0323 Swissmemory cirrusWHITE - 6828 Victorinox Flash Drive -1371 CNet Technology Inc. - 0001 CNUSB-611AR Wireless Adapter-G [AT76C503] - 0002 CNUSB-611AR Wireless Adapter-G [AT76C503] (FiberLine WL-240U) - 0013 CNUSB-611 Wireless Adapter [AT76C505] - 0014 CNUSB-611 Wireless Adapter [AT76C505] (FiberLine WL-240U) - 5743 CNUSB-611 (D) Wireless Adapter [AT76C503] - 9022 CWD-854 [RT2573] - 9032 CWD-854 rev F - 9401 CWD-854 Wireless 802.11g 54Mbps Network Adapter [RTL8187] -1376 Vimtron Electronics Co., Ltd. -137b SCAPS GmbH - 0002 SCAPS USC-2 Scanner Controller -1385 Netgear, Inc - 4250 WG111T - 4251 WG111T (no firmware) - 5f00 WPN111 RangeMax(TM) Wireless USB 2.0 Adapter - 5f01 WPN111 (no firmware) - 6e00 WPNT121 802.11g 240Mbps Wireless Adapter [Airgo AGN300] -138a Validity Sensors, Inc. - 0001 VFS101 Fingeprint Reader - 0005 VFS301 Fingerprint Reader - 0007 VFS451 Fingeprint Reader - 0008 VFS300 Fingeprint Reader -138e Jungo LTD - 9000 Raisonance S.A. STM32 ARM evaluation board -1390 TOMTOM B.V. - 0001 GO 520 T -1391 IdealTEK, Inc. - 1000 URTC-1000 -1395 Sennheiser Communications - 3556 USB Headset -1397 BEHRINGER International GmbH - 00bc BCF2000 -1398 Q-tec - 2103 USB 2.0 Storage Device -13ad Baltech - 9999 Card reader -13b0 PerkinElmer Optoelectronics - 000a Alesis Photon X25 MIDI Controller -13b1 Linksys - 000a WUSB54G v2 802.11g Adapter [Intersil ISL3887] - 000b WUSB11 v4.0 802.11b Adapter [ALi M4301] - 000c WUSB54AG 802.11a/g Adapter [Intersil ISL3887] - 000d WUSB54G v4 802.11g Adapter [Ralink RT2500USB] - 000e WUSB54GS v1 802.11g Adapter [Broadcom 4320 USB] - 0011 WUSB54GP v4.0 802.11g Adapter [Ralink RT2500USB] - 0014 WUSB54GS v2 802.11g Adapter [Broadcom 4320 USB] - 0018 USB200M 10/100 Ethernet Adapter - 001a HU200TS Wireless Adapter - 001e WUSBF54G 802.11bg - 0020 WUSB54GC v1 802.11g Adapter [Ralink RT73] - 0022 WUSB54GX4 802.11g 240Mbps Wireless Adapter [Airgo AGN300] - 0023 WUSB54GR - 0024 WUSBF54G v1.1 802.11bg - 0026 WUSB54GSC v1 802.11g Adapter [Broadcom 4320 USB] - 002f AE1000 v1 802.11n [Ralink RT2870] - 0031 AM10 v1 802.11n [Ralink RT2870] - 13b1 WUSB200: Wireless-G Business Network Adapter with Rangebooster -13b2 Alesis - 0030 Multimix 8 -13b3 Nippon Dics Co., Ltd. -13ba Unknown - 0017 PS/2 Keyboard+Mouse Adapter -13be Ricoh Printing Systems, Ltd. -13ca JyeTai Precision Industrial Co., Ltd. -13cf Wisair Ltd. - 1200 Olidata Wireless Multimedia Adapter -13d0 Techsan Electronics Co., Ltd. - 2282 TechniSat DVB-PC TV Star 2 -13d1 A-Max Technology Macao Commercial Offshore Co. Ltd. - 7019 MD 82288 - abe6 Wireless 802.11g 54Mbps Network Adapter [RTL8187] -13d2 Shark Multimedia - 0400 Pocket Ethernet [klsi] -13d3 IMC Networks - 3201 VisionDTV USB-Ter/HAMA USB DVB-T device cold - 3202 VisionDTV USB-Ter/HAMA USB DVB-T device warm - 3203 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 3204 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 3205 DNTV Live! Tiny USB2 BDA (No Remote) - 3206 DNTV Live! Tiny USB2 BDA (No Remote) - 3207 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 3208 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 3209 DTV-DVB UDST7022BDA DVB-S Box(Without HID) - 3211 DTV-DVB Hybrid Analog/Capture / Pinnacle PCTV 310e - 3212 DTV-DVB UDTT704C - DVBT/NTSC/PAL Driver(PCM4) - 3213 DTV-DVB UDTT704D - DVBT/NTSC/PAL Driver (PCM4) - 3214 DTV-DVB UDTT704F -(MiniCard) DVBT/NTSC/PAL Driver(Without HID) - 3215 DTV-DVB UDAT7240 - ATSC/NTSC/PAL Driver(PCM4) - 3216 DTV-DVB UDTT 7047-USB 2.0 DVB-T Driver - 3217 Digital-TV Receiver. - 3219 DTV-DVB UDTT7049 - DVB-T Driver(Without HID) - 3220 DTV-DVB UDTT 7047M-USB 2.0 DVB-T Driver - 3223 DNTV Live! Tiny USB2 BDA (No Remote) - 3224 DNTV Live! Tiny USB2 BDA (No Remote) - 3226 DigitalNow TinyTwin DVB-T Receiver - 3234 DVB-T FTA Half Minicard [RTL2832U] - 3236 DTV-DVB UDTT 7047A-USB 2.0 DVB-T Driver - 3237 DTV-DVB UDTT 704J - dual DVB-T Driver - 3239 DTV-DVB UDTT704D - DVBT/NTSC/PAL Driver(Without HID) - 3240 DTV-DVB UDXTTM6010 - A/D Driver(Without HID) - 3241 DTV-DVB UDXTTM6010 - A/D Driver(Without HID) - 3242 DTV-DVB UDAT7240LP - ATSC/NTSC/PAL Driver(Without HID) - 3243 DTV-DVB UDXTTM6010 - A/D Driver(Without HID) - 3244 DTV-DVB UDTT 7047Z-USB 2.0 DVB-T Driver - 3247 802.11 n/g/b Wireless LAN Adapter - 3249 Internal Bluetooth - 3262 802.11 n/g/b Wireless LAN USB Adapter - 3273 802.11 n/g/b Wireless LAN USB Mini-Card - 3274 DVB-T Dongle [RTL2832U] - 3282 DVB-T + GPS Minicard [RTL2832U] - 3284 Wireless LAN USB Mini-Card - 3306 WLAN [RTL8191S] - 5070 Webcam - 5111 Integrated Webcam - 5115 Integrated Webcam - 5116 Integrated Webcam - 7020 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 7022 DTV-DVB UDST7022BDA DVB-S Box(Without HID) -13dc ALEREON, INC. -13dd i.Tech Dynamic Limited -13e1 Kaibo Wire & Cable (Shenzhen) Co., Ltd. -13e5 Rane - 0001 SL-1 -13e6 TechnoScope Co., Ltd. -13ec Zydacron - 0006 HID Remote Control -13ee MosArt - 0003 Optical Mouse -13fd Initio Corporation - 0841 Samsung SE-T084M DVD-RW - 1340 Hi-Speed USB to SATA Bridge - 160f RocketFish SATA Bridge [INIC-1611] - 1640 ASUS SDRW-08D1S-U DVD-RW - 1840 Shintaro SH23SDOCK Hard Drive Docker [INIC-1608L] -13fe Kingston Technology Company Inc. - 1a00 512MB/1GB Flash Drive - 1a23 512MB Flash Drive - 1d00 DataTraveler 2.0 1GB/4GB Flash Drive / Patriot Xporter 4GB Flash Drive - 1e00 Flash Drive 2 GB [ICIDU 2 GB] - 1f00 DataTraveler 2.0 4GB Flash Drive / Patriot Xporter 32GB (PEF32GUSB) Flash Drive - 2240 microSD card reader - 3100 2/4 GB stick -1400 Axxion Group Corp. -1402 Bowe Bell & Howell -1403 Sitronix - 0001 Digital Photo Frame -140e Telechips, Inc. - b011 TCC780X-based player (USB Boot mode) - b021 TCC77X-based players (USB Boot mode) -1410 Novatel Wireless - 1110 Merlin S620 - 1120 Merlin EX720 - 1130 Merlin S720 - 1400 Merlin U730/U740 (Vodafone) - 1410 Merlin U740 (non-Vodafone) - 1430 Merlin XU870 - 1450 Merlin X950D - 2110 Ovation U720/MCD3000 - 2410 Expedite EU740 - 2420 Expedite EU850D/EU860D/EU870D - 4100 U727 - 4400 Ovation MC930D/MC950D - a001 Gobi Wireless Modem - a008 Gobi Wireless Modem (QDL mode) -1415 Nam Tai E&E Products Ltd. or OmniVision Technologies, Inc. - 0000 Sony SingStar USBMIC - 0020 Sony Wireless SingStar - 2000 Sony Playstation Eye -1419 ABILITY ENTERPRISE CO., LTD. -1429 Vega Technologies Industrial (Austria) Co. -142a Thales E-Transactions - 0003 Artema Hybrid - 0005 Artema Modular - 0043 medCompact -142b Arbiter Systems, Inc. - 03a5 933A Portable Power Sentinel -1430 RedOctane - 4734 Guitar Hero4 hub - 474b Guitar Hero MIDI interface -1431 Pertech Resources, Inc. -1435 Wistron NeWeb - 0427 UR054g 802.11g Wireless Adapter [Intersil ISL3887] - 0711 UR055G 802.11bg - 0804 AR9170+AR9104 802.11abgn Wireless Adapter - 0826 AR5523 - 0827 AR5523 (no firmware) - 0828 AR5523 - 0829 AR5523 (no firmware) -1436 Denali Software, Inc. -143c Altek Corporation -1443 Digilent - 0007 CoolRunner-II CPLD Starter Kit -1453 Radio Shack - 4026 26-183 Serial Cable -1456 Extending Wire & Cable Co., Ltd. -1457 First International Computer, Inc. - 5117 OpenMoko Neo1973 kernel usbnet (g_ether, CDC Ethernet) mode - 5118 OpenMoko Neo1973 Debug board (V2+) - 5119 OpenMoko Neo1973 u-boot cdc_acm serial port - 5120 OpenMoko Neo1973 u-boot usbtty generic serial - 5121 OpenMoko Neo1973 kernel mass storage (g_storage) mode - 5122 OpenMoko Neo1973 / Neo Freerunner kernel cdc_ether USB network - 5123 OpenMoko Neo1973 internal USB CSR4 module - 5124 OpenMoko Neo1973 Bluetooth Device ID service -145f Trust - 0106 Trust K56 V92 USB Modem - 013d PC Camera (SN9C201 + OV7660) - 013f Megapixel Auto Focus Webcam - 0142 WB-6250X Webcam - 015a WB-8300X 2MP Webcam -1460 Tatung Co. - 9150 eHome Infrared Transceiver -1461 Staccato Communications -1462 Micro Star International - 5512 MegaStick-1 Flash Stick - 8807 DIGIVOX mini III [af9015] -1472 Huawei-3Com - 0007 Aolynk WUB300g [ZyDAS ZD1211] - 0009 Aolynk WUB320g -147a Formosa Industrial Computing, Inc. - e015 eHome Infrared Receiver - e016 eHome Infrared Receiver - e017 eHome Infrared Receiver - e018 eHome Infrared Receiver - e03a eHome Infrared Receiver - e03c eHome Infrared Receiver - e03e Infrared Receiver [IR605A/Q] -147e Upek - 1000 Biometric Touchchip/Touchstrip Fingerprint Sensor - 2016 Biometric Touchchip/Touchstrip Fingerprint Sensor -147f Hama GmbH & Co., KG -1482 Vaillant - 1005 VRD PC-Interface -1484 Elsa AG [hex] - 1746 Ecomo 19H99 Monitor - 7616 Elsa Hub -1485 Silicom - 0001 U2E - 0002 Psion Gold Port Ethernet -1487 DSP Group, Ltd. -148e EVATRONIX SA -148f Ralink Technology, Corp. - 1706 RT2500USB Wireless Adapter - 2070 RT2070 Wireless Adapter - 2570 RT2570 Wireless Adapter - 2573 RT2501/RT2573 Wireless Adapter - 2671 RT2601/RT2671 Wireless Adapter - 2770 RT2770 Wireless Adapter - 2870 RT2870 Wireless Adapter - 3070 RT2870/RT3070 Wireless Adapter - 3071 RT3071 Wireless Adapter - 3072 RT3072 Wireless Adapter - 3572 RT3572 Wireless Adapter - 9020 RT2500USB Wireless Adapter - 9021 RT2501USB Wireless Adapter -1497 Panstrong Company Ltd. -1498 Microtek International Inc. - a090 DVB-T Tuner -149a Imagination Technologies - 2107 DBX1 DSP core -14aa WideView Technology Inc. - 0001 Avermedia AverTV DVBT USB1.1 (cold) - 0002 Avermedia AverTV DVBT USB1.1 (warm) - 0201 AVermedia/Yakumo/Hama/Typhoon DVB-T USB2.0 (cold) - 0221 WT-220U DVB-T dongle - 022b WT-220U DVB-T dongle - 0301 AVermedia/Yakumo/Hama/Typhoon DVB-T USB2.0 (warm) -14ad CTK Corporation -14ae Printronix Inc. -14af ATP Electronics Inc. -14b0 StarTech.com Ltd. -14b2 Ralink Technology, Corp. - 3a95 Toshiba WUS-G06G-JT 802.11bg Wireless Adapter - 3a98 Airlink101 AWLL4130 802.11bg Wireless Adapter [Atheros AR5523] - 3c02 rt2500 802.11g WLAN - 3c05 rt2570 802.11g WLAN - 3c06 Conceptronic C300RU v1 802.11bgn Wireless Adapter [Ralink RT2870] - 3c07 802.11n adapter - 3c09 802.11n adapter - 3c22 Conceptronic C54RU 802.11bg Wireless Adapter [Ralink RT73] - 3c23 Airlink101 AWLL6080 802.11bgn Wireless Adapter [Ralink RT2870] - 3c25 DrayTek Vigor N61 802.11bgn Wireless Adapter [Ralink RT2870] - 3c27 Airlink101 AWLL6070 802.11bgn Wireless Adapter [Ralink RT2770] - 3c28 Conceptronic C300RU v2 802.11bgn Wireless Adapter [Ralink RT2770] - 3c2c Keebox W150NU 802.11bgn Wireless Adapter [Ralink RT3070] -14c0 Rockwell Automation, Inc. -14c2 Gemlight Computer, Ltd - 0250 Storage Adapter V2 - 0350 Storage Adapter V2 -14cd Super Top - 121c microSD card reader - 123a SD/MMC/RS-MMC Card Reader - 127b SDXC Reader - 6600 USB 2.0 IDE DEVICE - 6700 Card Reader - 6900 Card Reader - 8123 SD MMC Reader - 8125 SD MMC Reader -14d8 JAMER INDUSTRIES CO., LTD. -14dd Raritan Computer, Inc. -14e1 Dialogue Technology Corp. - 5000 PenMount 5000 Touch Controller -14e5 SAIN Information & Communications Co., Ltd. -14ea Planex Communications - ab10 GW-US54GZ - ab11 GU-1000T - ab13 GW-US54Mini 802.11bg -14ed Shure Inc. -14f7 TechniSat Digital GmbH - 0001 SkyStar 2 HD CI - 0002 SkyStar 2 HD CI - 0003 CableStar Combo HD CI - 0004 AirStar TeleStick 2 - 0500 DVB-PC TV Star HD -1500 Ellisys -1501 Pine-Tum Enterprise Co., Ltd. -1509 First International Computer, Inc. - 9242 eHome Infrared Transceiver -1513 medMobile - 0444 medMobile -1514 Actel - 2003 FlashPro3 Programmer - 2004 FlashPro3 Programmer - 2005 FlashPro3 Programmer -1516 CompUSA - 1603 Flash Drive - 8628 Pen Drive -1518 Cheshire Engineering Corp. - 0001 HDReye High Dynamic Range Camera - 0002 HDReye (before firmware loads) -1520 Bitwire Corp. -1524 ENE Technology Inc - 6680 UTS 6680 -1527 Silicon Portals - 0200 YAP Phone (no firmware) - 0201 YAP Phone -1529 UBIQUAM Co., Ltd. - 3100 CDMA 1xRTT USB Modem (U-100/105/200/300/520) -152d JMicron Technology Corp. / JMicron USA Technology Corp. - 2329 JM20329 SATA Bridge - 2335 ATA/ATAPI Bridge - 2336 Hard Disk Drive - 2337 ATA/ATAPI Bridge - 2338 JM20337 Hi-Speed USB to SATA & PATA Combo Bridge - 2352 ATA/ATAPI Bridge - 2509 JMS539 SuperSpeed SATA II 3.0G Bridge -152e LG (HLDS) - 2507 PL-2507 IDE Controller - e001 GSA-5120D DVD-RW -1532 Razer USA, Ltd - 0001 RZ01-020300 Optical Mouse [Diamondback] - 0003 Krait Mouse - 0007 DeathAdder Mouse - 001c RZ01-0036 Optical Gaming Mouse [Abyssus] - 0101 Copperhead Mouse - 0102 Tarantula Keyboard - 0109 Lycosa Keyboard -1546 U-Blox AG -154a Celectronic GmbH - 8180 CARD STAR/medic2 -154b PNY - 0010 USB 2.0 Flash Drive - 6545 FD Device -154d ConnectCounty Holdings Berhad -154e D&M Holdings, Inc. (Denon/Marantz) - 3000 Marantz RC9001 Remote Control -1554 Prolink Microsystems Corp. -1557 OQO - 0002 model 01 WiFi interface - 0003 model 01 Bluetooth interface - 0a80 Gobi Wireless Modem (QDL mode) - 7720 model 01+ Ethernet - 8150 model 01 Ethernet interface -1568 Sunf Pu Technology Co., Ltd -156f Quantum Corporation -1570 ALLTOP TECHNOLOGY CO., LTD. -157b Ketron SRL -157e TRENDnet - 3006 TEW-444UB EU - 3007 TEW-444UB EU (no firmware) - 300a TEW-429UB 802.11bg - 300b TEW-429UB 802.11bg - 300d TEW-429UB C1 802.11bg - 3204 Allnet ALL0298 v2 802.11bg - 3205 Allnet ALL0283 [AR5523] - 3206 Allnet ALL0283 [AR5523](no firmware) -1582 Fiberline - 6003 WL-430U 802.11bg -1587 SMA Technologie AG -158d Oakley Inc. -158e JDS Uniphase Corporation (JDSU) - 0820 SmartPocket Class Device -1598 Kunshan Guoji Electronics Co., Ltd. -15a2 Freescale Semiconductor, Inc. -15a4 Afatech Technologies, Inc. - 1000 AF9015/AF9035 DVB-T stick - 1001 AF9015/AF9035 DVB-T stick - 1336 SDHC/MicroSD/MMC/MS/M2/CF/XD Flash Card Reader - 9015 AF9015 DVB-T USB2.0 stick - 9016 AF9015 DVB-T USB2.0 stick -15a8 Teams Power Limited -15a9 Gemtek - 0004 WUBR177G - 0006 Wireless 11n USB Adapter - 0010 802.11n USB Wireless Card - 0012 WUBR-208N 802.11abgn Wireless Adapter [Ralink RT2870] -15aa Gearway Electronics (Dong Guan) Co., Ltd. -15ad VMware Inc. -15ba Olimex Ltd. - 0003 OpenOCD JTAG - 0004 OpenOCD JTAG TINY -15c0 XL Imaging - 0001 2M pixel Microscope Camera - 0002 3M pixel Microscope Camera - 0003 1.3M pixel Microscope Camera (mono) - 0004 1.3M pixel Microscope Camera (colour) - 0005 3M pixel Microscope Camera (Mk 2) - 0006 2M pixel Microscope Camera (with capture button) - 0007 3M pixel Microscope Camera (with capture button) - 0008 1.3M pixel Microscope Camera (colour, with capture button) - 0009 1.3M pixel Microscope Camera (colour, with capture button) - 000a 2M pixel Microscope Camera (Mk 2) - 0010 1.3M pixel "Tinycam" - 0101 3M pixel Microscope Camera -15c2 SoundGraph Inc. - 0036 LC16M VFD Display/IR Receiver - 0038 GD01 MX VFD Display/IR Receiver - ffda iMON PAD Remote Controller - ffdc iMON PAD Remote Controller -15c5 Advance Multimedia Internet Technology Inc. (AMIT) - 0008 WL532U 802.11g Adapter -15c6 Laboratoires MXM - 1000 DigistimSP (cold) - 1001 DigistimSP (warm) - 1002 DigimapSP USB (cold) - 1003 DigimapSP USB (warm) -15c8 KTF Technologies - 3201 EVER EV-W100/EV-W250 -15c9 D-Box Technologies -15ca Textech International Ltd. - 00c3 Mini Optical Mouse - 0101 MIDI Interface cable - 1806 MIDI Interface cable -15d5 Coulomb Electronics Ltd. -15d9 Trust International B.V. - 0a33 Optical Mouse - 0a37 Mouse - 0a41 MI-2540D [Optical mouse] - 0a4c USB+PS/2 Optical Mouse -15dc Hynix Semiconductor Inc. -15e0 Seong Ji Industrial Co., Ltd. -15e1 RSA - 2007 RSA SecurID (R) Authenticator -15e8 SohoWare - 9100 NUB100 Ethernet [pegasus] - 9110 10/100 USB Ethernet -15e9 Pacific Digital Corp. - 04ce MemoryFrame MF-570 - 1968 MemoryFrame MF-570 - 1969 Digital Frame -15ec Belcarra Technologies Corp. -15f4 HanfTek - 0001 HanfTek UMT-010 USB2.0 DVB-T (cold) - 0025 HanfTek UMT-010 USB2.0 DVB-T (warm) -1604 Tascam - 8000 US-428 Audio/Midi Controller (without fw) - 8001 US-428 Audio/Midi Controller - 8004 US-224 Audio/Midi Controller (without fw) - 8005 US-224 Audio/Midi Controller - 8006 US-122 Audio/Midi Interface (without fw) - 8007 US-122 Audio/Midi Interface -1606 Umax - 0002 Astra 1236U Scanner - 0010 Astra 1220U - 0030 Astra 1600U/2000U - 0050 Scanner - 0060 Astra 3400/3450 - 0070 Astra 4400/4450 - 0130 Astra 2100U - 0160 Astra 5400U - 0170 Uniscan D50 - 0230 Astra 2200/2200SU - 0350 Astra 4800/4850 Scanner - 1030 Astra 4000U - 1220 Genesys Logic Scanner Controller NT5.0 - 2010 AstraCam Digital Camera - 2020 AstraCam 1000 - 2030 AstraCam 1800 Digital Camera -1608 Inside Out Networks [hex] - 0001 EdgePort/4 Serial Port - 0002 Edgeport/8 - 0003 Rapidport/4 - 0004 Edgeport/4 - 0005 Edgeport/2 - 0006 Edgeport/4i - 0007 Edgeport/2i - 0008 Edgeport/8 - 000c Edgeport/421 - 000d Edgeport/21 - 000e Edgeport/4 - 000f Edgeport/8 - 0010 Edgeport/2 - 0011 Edgeport/4 - 0012 Edgeport/416 - 0014 Edgeport/8i - 0018 Edgeport/412 - 0019 Edgeport/412 - 001a Edgeport/2+2i - 0101 Edgeport/4 - 0105 Edgeport/2 - 0106 Edgeport/4i - 0107 Edgeport/2i - 010c Edgeport/421 - 010d Edgeport/21 - 0110 Edgeport/2 - 0111 Edgeport/4 - 0112 Edgeport/416 - 0114 Edgeport/8i - 0201 Edgeport/4 - 0203 Rapidport/4 - 0204 Edgeport/4 - 0205 Edgeport/2 - 0206 Edgeport/4i - 0207 Edgeport/2i - 020c Edgeport/421 - 020d Edgeport/21 - 020e Edgeport/4 - 020f Edgeport/8 - 0210 Edgeport/2 - 0211 Edgeport/4 - 0212 Edgeport/416 - 0214 Edgeport/8i - 0215 Edgeport/1 - 0216 EPOS/44 - 0217 Edgeport/42 - 021a Edgeport/2+2i - 021b Edgeport/2c - 021c Edgeport/221c - 021d Edgeport/22c - 021e Edgeport/21c - 021f Edgeport/62 - 0240 Edgeport/1 - 0241 Edgeport/1i - 0242 Edgeport/4s - 0243 Edgeport/8s - 0244 Edgeport/8 - 0245 Edgeport/22c - 0301 Watchport/P - 0302 Watchport/M - 0303 Watchport/W - 0304 Watchport/T - 0305 Watchport/H - 0306 Watchport/E - 0307 Watchport/L - 0308 Watchport/R - 0309 Watchport/A - 030a Watchport/D - 030b Watchport/D - 030c Power Management Port - 030e Power Management Port - 030f Watchport/G - 0310 Watchport/Tc - 0311 Watchport/Hc - 1403 MultiTech Systems MT4X56 Modem - 1a17 Agilent Technologies (E6473) -160a VIA Technologies, Inc. - 3184 VIA VNT-6656 [WiFi 802.11b/g USB Dongle] -1614 Amoi Electronics - 0404 WMA9109 UMTS Phone - 0600 Vodafone VDA GPS / Toschiba Protege G710 - 0804 WP-S1 Phone -1619 L & K Precision Technology Co., Ltd. -1621 Wionics Research -1628 Stonestreet One, Inc. -162a Airgo Networks Inc. -162f WiQuest Communications, Inc. -1630 2Wire, Inc. - 0005 802.11g Wireless Adapter [Intersil ISL3886] - ff81 802.11b Wireless Adapter [Lucent/Agere Hermes I] -1631 Good Way Technology - 6200 GWUSB2E - c019 RT2573 -1645 Cross Match Technologies GmbH - 0001 1S Serial Port - 0002 2S Serial Port - 0003 1S25 Serial Port - 0004 4S Serial Port - 0005 E45 Ethernet [klsi] - 0006 Parallel Port - 0007 U1-SC25 SCSI - 0008 Ethernet - 0016 Bi-directional to Parallel Printer Converter - 0080 1 port to Serial Converter - 0081 1 port to Serial Converter - 0093 1S9 Serial Port - 8000 EZ-USB - 8001 1 port to Serial - 8002 2x Serial Port - 8003 1 port to Serial - 8004 2U4S serial/usb hub - 8005 Ethernet - 8080 1 port to Serial - 8081 1 port to Serial - 8093 PortGear Serial Port -1649 SofTec Microsystems - 0102 uDART In-Circuit Debugger - 0200 SpYder USBSPYDER08 -164a ChipX -164c Matrix Vision GmbH - 0101 mvBlueFOX camera (no firmware) - 0103 mvBlueFOX camera -1657 Struck Innovative Systeme GmbH - 3150 SIS3150 USB2.0 to VME interface -165b Frontier Design Group - 8101 Tranzport Control Surface - fad1 Alphatrack Control Surface -1660 Creatix Polymedia GmbH -1668 Actiontec Electronics, Inc. [hex] - 0009 Gateway - 0333 Modem - 0358 InternetPhoneWizard - 0405 Gateway - 0408 Prism2.5 802.11b Adapter - 0413 Gateway - 0421 Prism2.5 802.11b Adapter - 0441 IBM Integrated Bluetooth II - 0500 BTM200B BlueTooth Adapter - 1050 802UIG-1 802.11g Wireless Mini Adapter [Intersil ISL3887] - 1200 802AIN Wireless N Network Adapter [Atheros AR9001U] - 1441 IBM Integrated Bluetooth II - 2441 BMDC-2 IBM Bluetooth III w.56k - 3441 IBM Integrated Bluetooth III - 6010 Gateway - 6097 802.11b Wireless Adapter - 6106 ROPEX FreeLan 802.11b - 7605 UAT1 Wireless Ethernet Adapter -1669 PiKRON Ltd. [hex] - 1001 uLan2USB Converter - PS1 protocol -1677 China Huada Integrated Circuit Design (Group) Co., Ltd. (CIDC Group) - 0103 Token -1679 Total Phase - 2001 Beagle Protocol Analyzer - 2002 Cheetah SPI Host Adapter -1680 Golden Bridge Electech Inc. - a332 DVB-T Dongle [RTL2832U] -1681 Prevo Technologies, Inc. - 0001 Tuner's Dashboard -1682 Maxwise Production Enterprise Ltd. -1684 Godspeed Computer Corp. -1685 Delock - 0200 Infrared adapter -1686 ZOOM Corporation - 0045 H4 Digital Recorder -1687 Kingmax Digital Inc. - 5289 FlashDisk - 6211 FlashDisk -1688 Saab AB -168c Atheros Communications - 0001 AR5523 - 0002 AR5523 (no firmware) -1690 Askey Computer Corp. [hex] - 0101 Creative Modem Blaster DE5670 - 0102 V1456 VQE-R2 Modem [conexant] - 0103 1456 VQE-R3 Modem [conexant] - 0104 HCF V90 Data Fax RTAD Modem - 0107 HCF V.90 Data,Fax,RTAD Modem - 0109 MagicXpress V.90 Pocket Modem [conexant] - 0203 Voyager ADSL Modem Loader - 0204 Voyager ADSL Modem - 0205 DSL Modem - 0206 GlobeSpan ADSL WAN Modem - 0208 DSL Modem - 0209 Voyager 100 ADSL Modem - 0211 Globespan Virata ADSL LAN Modem - 0212 DSL Modem - 0213 HM121d DSL Modem - 0214 HM121d DSL Modem - 0215 Voyager 105 ADSL Modem - 0701 WLAN - 0710 SMCWUSBT-G - 0711 SMCWUSBT-G (no firmware) - 0712 AR5523 - 0713 AR5523 (no firmware) - 0715 Name: Voyager 1055 Laptop 802.11g Adapter [Broadcom 4320] - 0722 RT2573 - 0726 Wi-Fi Wireless LAN Adapter - 0740 802.11n Wireless LAN Card - 0901 Voyager 205 ADSL Router -1696 Hitachi Video and Information System, Inc. -1697 VTec Test, Inc. -16a5 Shenzhen Zhengerya Cable Co., Ltd. -16a6 Unigraf - 3000 VTG-3xxx Video Test Generator family - 4000 VTG-4xxx Video Test Generator family - 5000 VTG-5xxx Video Test Generator family - 5001 VTG-5xxx Special (update) mode of VTG-5xxx family -16ab Global Sun Technology - 7801 AR5523 - 7802 AR5523 (no firmware) - 7811 AR5523 - 7812 AR5523 (no firmware) -16ac Dongguan ChingLung Wire & Cable Co., Ltd. -16b4 iStation - 0801 U43 -16b5 Persentec, Inc. - 0002 Otto driving companion -16c0 VOTI - 03e8 free for internal lab use 1000 - 03e9 free for internal lab use 1001 - 03ea free for internal lab use 1002 - 03eb free for internal lab use 1003 - 03ec free for internal lab use 1004 - 03ed free for internal lab use 1005 - 03ee free for internal lab use 1006 - 03ef free for internal lab use 1007 - 03f0 free for internal lab use 1008 - 03f1 free for internal lab use 1009 - 05dc shared ID for use with libusb - 05dd BlackcatUSB2 - 05e1 CDC-ACM class devices (modems) - 05e4 MIDI class devices - 076b OpenPCD 13.56MHz RFID Reader - 076c OpenPICC 13.56MHz RFID Simulator (native) - 08ac OpenBeacon USB stick - 08ca Alpermann+Velte Universal Display - 08cb Alpermann+Velte Studio Clock - 08cc Alpermann+Velte SAM7S MT Boot Loader - 08cd Alpermann+Velte SAM7X MT Boot Loader - 27da Mouse - 27db Keyboard - 27dc Joystick - 27dd CDC-ACM class devices (modems) - 27de MIDI class devices -16ca Wireless Cables, Inc. - 1502 Bluetooth Dongle -16cc silex technology, Inc. -16d0 GrauTec - 054b ReelBox OLED Display (external) -16d3 Frontline Test Equipment, Inc. -16d5 AnyDATA Corporation - 6202 CDMA/UMTS/GPRS modem - 6501 CDMA 2000 1xRTT/EV-DO Modem - 6502 CDMA/UMTS/GPRS modem -16d6 JABLOCOM s.r.o. - 8000 GDP-04 desktop phone - 8001 EYE-02 - 8003 GDP-04 modem - 8004 Bootloader - 8005 GDP-04i - 8007 BTP-06 modem -16d8 CMOTECH Co., Ltd. - 5141 CMOTECH CDMA Technologies modem - 5533 CCU-550 CDMA EV-DO modem - 5543 CDMA 2000 1xRTT/1xEVDO modem - 6280 CMOTECH CDMA Technologies modem - 6803 CNU-680 CDMA EV-DO modem - 8001 Gobi 2000 Wireless Modem (QDL mode) - 8002 Gobi 2000 Wireless Modem -16dc Wiener, Plein & Baus - 0001 CC - 000b VM -16df King Billion Electronics Co., Ltd. -16f0 GN ReSound A/S - 0003 Airlink Wireless Programming Interface -16f5 Futurelogic Inc. -1706 BlueView Technologies, Inc. -1707 ARTIMI -170b Swissonic - 0011 MIDI-USB 1x1 -170d Avnera -1725 Vitesse Semiconductor -1726 Axesstel, Inc. - 1000 wireless modem - 2000 wireless modem - 3000 wireless modem -172f Waltop International Corp. - 0022 Tablet - 0024 Tablet - 0025 Tablet - 0026 Tablet - 0031 Slim Tablet 12.1" - 0032 Slim Tablet 5.8" - 0034 Slim Tablet 12.1" - 0038 Genius G-Pen F509 - 0500 Media Tablet 14.1" - 0501 Media Tablet 10.6" - 0502 Sirius Battery Free Tablet -1733 Cellink Technology Co., Ltd - 0101 RF Wireless Optical Mouse OP-701 -1736 CANON IMAGING SYSTEM TECHNOLOGIES INC. -1737 Linksys - 0039 USB1000 - 0070 WUSB100 v1 RangePlus Wireless Network Adapter [Ralink RT2870] - 0071 WUSB600N v1 Dual-Band Wireless-N Network Adapter [Ralink RT2870] - 0073 WUSB54GC v2 802.11g Adapter [Realtek RTL8187B] - 0075 WUSB54GSC v2 802.11g Adapter - 0077 WUSB54GC v3 802.11g Adapter [Ralink RT2070L] - 0078 WUSB100 v2 RangePlus Wireless Network Adapter [Ralink RT3070] - 0079 WUSB600N v2 Dual-Band Wireless-N Network Adapter [Ralink RT3572] -1740 Senao - 0605 LevelOne WUA-0605 N_Max Wireless USB Adapter - 0615 LevelOne WUA-0615 N_Max Wireless USB Adapter - 2000 NUB-8301 802.11bg - 3701 EUB-3701 EXT 802.11g Wireless Adapter [Ralink RT2571W] - 9701 EnGenius 802.11n Wireless USB Adapter - 9702 EnGenius 802.11n Wireless USB Adapter - 9703 EnGenius 802.11n Wireless USB Adapter - 9705 EnGenius 802.11n Wireless USB Adapter - 9706 EUB9706 802.11n Wireless Adapter [Ralink RT3072] - 9801 EUB9801 802.11abgn Wireless Adapter [Ralink RT3572] -1743 General Atomics -174c ASMedia Technology Inc. -174f Syntek - 1105 SM-MS/Pro-MMC-XD Card Reader - 1403 Integrated Webcam - 1404 USB Camera device, 1.3 MPixel Web Cam - 5212 USB 2.0 UVC PC Camera - 5a11 PC Camera - 5a31 Sonix USB 2.0 Camera - 5a35 Sonix 1.3MPixel USB 2.0 Camera - 6a31 Web Cam - Asus A8J, F3S, F5R, VX2S, V1S - 6a33 Web Cam - Asus F3SA, F9J, F9S - 6a51 2.0MPixel Web Cam - Asus Z96J, Z96S, S96S - 6a54 Web Cam - 6d51 2.0Mpixel Web Cam - Eurocom D900C - 8a12 Syntek 0.3MPixel USB 2.0 UVC PC Camera - 8a33 Syntek USB 2.0 UVC PC Camera - a311 1.3MPixel Web Cam - Asus A3A, A6J, A6K, A6M, A6R, A6T, A6V, A7T, A7sv, A7U - a312 1.3MPixel Web Cam - a821 Web Cam - Packard Bell BU45, PB Easynote MX66-208W - aa11 Web Cam -1753 GERTEC Telecomunicacoes Ltda. - c901 PPC900 Pinpad Terminal -1759 LucidPort Technology, Inc. -1761 ASUSTek Computer, Inc. (wrong ID) - 0b05 802.11n Network Adapter (wrong ID - swapped vendor and device) -1772 System Level Solutions, Inc. -1776 Arowana - 501c 300K CMOS Camera -177f Sweex - 0153 LW153 802.11n Adapter [ralink rt3070] - 0313 LW313 802.11n Adapter [ralink rt2770 + rt2720] -1781 Multiple Vendors - 083e MetaGeek Wi-Spy - 083f MetaGeek Wi-Spy 2.4x - 0938 Iguanaworks USB IR Transceiver - 0c9f USBtiny -1782 Spreadtrum Communications Inc. -1784 TopSeed Technology Corp. - 0001 eHome Infrared Transceiver - 0004 RF Combo Device - 0006 eHome Infrared Transceiver - 0007 eHome Infrared Transceiver - 0008 eHome Infrared Transceiver - 000a eHome Infrared Transceiver -1787 ATI AIB -1788 ShenZhen Litkconn Technology Co., Ltd. -1796 Printrex, Inc. -1797 JALCO CO., LTD. -1799 Belkin Components - 7051 F5D7051 802.11g Adapter v1000 [Broadcom 4320] -179d Ricavision International, Inc. - 0010 Internal Infrared Transceiver -17a0 Samson Technologies Corp. - 0001 C01U condenser microphone - 0002 Q1U dynamic microphone - 0100 C03U multi-pattern microphone - 0101 UB1 boundary microphone - 0200 StudioDock monitors (internal hub) - 0201 StudioDock monitors (audio) - 0301 Q2U handheld microphone with XLR - 0302 GoMic compact condenser microphone -17a4 Concept2 - 0001 Performance Monitor 3 - 0002 Performance Monitor 4 -17a5 Advanced Connection Technology Inc. -17a7 MICOMSOFT CO., LTD. -17b3 Grey Innovation - 0004 Linux-USB Midi Gadget -17c3 Singim International Corp. -17cc Native Instruments - 041c Audio 2 DJ - 0808 Maschine Controller - 0815 Audio Kontrol 1 - 0839 Audio 4 DJ - 0d8d Guitarrig Mobile - 1915 Session I/O - 1940 RigKontrol3 - 1969 RigKontrol2 - 1978 Audio 8 DJ - 2305 Traktor Kontrol X1 - 4711 Kore Controller - 4712 Kore Controller 2 - baff Traktor Kontrol S4 -17cf Hip Hing Cable & Plug Mfy. Ltd. -17d0 Sanford L.P. -17d3 Korea Techtron Co., Ltd. -17e9 Newnham Research - 0051 USB VGA Adaptor -17eb Cornice, Inc. -17ef Lenovo - 1003 Integrated Smart Card Reader - 1004 Integrated Webcam - 100a ThinkPad Mini Dock Plus Series 3 - 3815 ChipsBnk 2GB USB Stick - 4802 Lenovo Vc0323+MI1310_SOC Camera - 4807 UVC Camera - 480c Integrated Webcam - 480d Integrated Webcam [R5U877] - 480e Integrated Webcam [R5U877] - 480f Integrated Webcam [R5U877] - 4810 Integrated Webcam [R5U877] - 4811 Integrated Webcam [R5U877] - 4812 Integrated Webcam [R5U877] - 4813 Integrated Webcam [R5U877] - 4814 Integrated Webcam [R5U877] - 4815 Integrated Webcam [R5U877] - 481c Integrated Webcam - 6009 ThinkPad Keyboard with TrackPoint -17f5 K.K. Rocky -17f6 Unicomp, Inc - 0709 Model M Keyboard -1809 Advantech - 4761 USB-4761 Portable Data Acquisition Module -1822 Twinhan - 3201 VisionDTV USB-Ter/HAMA USB DVB-T device cold - 3202 VisionDTV USB-Ter/HAMA USB DVB-T device warm -1831 Gwo Jinn Industries Co., Ltd. -1832 Huizhou Shenghua Industrial Co., Ltd. -183d VIVOphone - 0010 VoiceKey -1843 Vaisala -1849 ASRock Incorporation -1852 GYROCOM C&C Co., LTD - 7922 Audiotrak DR.DAC2 DX -1854 Memory Devices Ltd. -185b Compro - 3020 K100 Infrared Receiver - 3082 K100 Infrared Receiver v2 - d000 Compro Videomate DVB-U2000 - DVB-T USB cold - d001 Compro Videomate DVB-U2000 - DVB-T USB warm -1861 Tech Technology Industrial Company -1862 Teridian Semiconductor Corp. -1870 Nexio Co., Ltd - 0001 iNexio Touchscreen controller -1871 Aveo Technology Corp. - 0d01 USB2.0 Camera -187c Alienware Corporation - 0600 Dual Compatible Game Pad -187f Siano Mobile Silicon - 0010 Stallar Board - 0100 Stallar Board - 0200 Nova A - 0201 Nova B - 0202 Nice - 0300 Vega - 0301 VeNice -1892 Vast Technologies, Inc. -1894 Topseed - 5632 Atek Tote Remote - 5641 TSAM-004 Presentation Remote -1897 Evertop Wire Cable Co. -18a5 Verbatim, Ltd - 0214 Portable Hard Drive - 0216 External Hard Drive - 0218 External Hard Drive -18b1 Petalynx - 0037 Maxter Remote Control -18b4 e3C Technologies - 1001 DUTV007 - 1002 EC168 (v5) based USB DVB-T receiver - 1689 DUTV009 - fffa EC168 (v2) based USB DVB-T receiver - fffb EC168 (v3) based USB DVB-T receiver -18b6 Mikkon Technology Limited -18b7 Zotek Electronic Co., Ltd. -18c5 AMIT Technology, Inc. - 0002 CG-WLUSB2GO - 0008 CG-WLUSB2GNR Corega Wireless USB Adapter - 0012 CG-WLUSB10 Corega Wireless USB Adapter -18cd Ecamm - cafe Pico iMage -18d1 Google Inc. - 4e11 Nexus One - 4e12 Nexus One (debug) - 4e13 Nexus One (tether) - 4e21 Nexus S - 4e22 Nexus S (debug) -18d5 Starline International Group Limited -18d9 Kaba - 01a0 B-Net 91 07 -18dd Planon System Solutions Inc. - 1000 DocuPen RC800 -18e3 Fitipower Integrated Technology Inc - 7102 Multi Card Reader (Internal) - 9101 All-in-1 Card Reader - 9102 Multi Card Reader - 9512 Webcam -18e8 Qcom - 6196 RT2573 - 6229 RT2573 - 6232 Wireless 802.11g 54Mbps Network Adapter [RTL8187] -18ea Matrox Graphics, Inc. - 0002 DualHead2Go [Analog Edition] - 0004 TripleHead2Go [Digital Edition] -18ec Arkmicro Technologies Inc. - 3118 USB to IrDA adapter [ARK3116T] - 3188 ARK3188 UVC Webcam -18fd FineArch Inc. -1908 GEMBIRD - 1320 PhotoFrame PF-15-1 -190d Motorola GSG -1914 Alco Digital Devices Limited -1915 Nordic Semiconductor ASA - 2233 Linksys WUSB11 v2.8 802.11b Adapter [Atmel AT76C505] - 2234 Linksys WUSB54G v1 OEM 802.11g Adapter [Intersil ISL3886] - 2235 Linksys WUSB54GP v1 OEM 802.11g Adapter [Intersil ISL3886] - 2236 Linksys WUSB11 v3.0 802.11b Adapter [Intersil PRISM 3] -1926 NextWindow - 0003 1900 HID Touchscreen - 0006 1950 HID Touchscreen - 0064 1950 HID Touchscreen - 0065 1950 HID Touchscreen - 0066 1950 HID Touchscreen - 0067 1950 HID Touchscreen - 0068 1950 HID Touchscreen - 0069 1950 HID Touchscreen - 0071 1950 HID Touchscreen - 0072 1950 HID Touchscreen - 0073 1950 HID Touchscreen - 0074 1950 HID Touchscreen - 0075 1950 HID Touchscreen - 0076 1950 HID Touchscreen - 0077 1950 HID Touchscreen - 0078 1950 HID Touchscreen - 0079 1950 HID Touchscreen - 007a 1950 HID Touchscreen - 007e 1950 HID Touchscreen - 007f 1950 HID Touchscreen - 0080 1950 HID Touchscreen - 0081 1950 HID Touchscreen - 0082 1950 HID Touchscreen - 0083 1950 HID Touchscreen - 0084 1950 HID Touchscreen - 0085 1950 HID Touchscreen - 0086 1950 HID Touchscreen - 0087 1950 HID Touchscreen -192f Avago Technologies, Pte. - 0000 Mouse -1930 Shenzhen Xianhe Technology Co., Ltd. -1931 Ningbo Broad Telecommunication Co., Ltd. -1934 Feature Integration Technology Inc. (Fintek) - 0602 F71610 or F71612 Consumer Infrared Receiver/Transceiver - 0702 Integrated Consumer Infrared Receiver/Transceiver - 5168 F71610A or F71612A Consumer Infrared Receiver/Transceiver -1941 Dream Link - 8021 WH1080 Weather Station / USB Missile Launcher -1943 Sensoray Co., Inc. - 2250 Model 2250 MPEG and JPEG Capture Card - 2253 Model 2253 Audio/Video Codec Card - 2255 Model 2255 4 Channel Capture Card - 2257 Model 2257 4 Channel Capture Card - a250 Model 2250 MPEG and JPEG Capture Card (cold) - a253 Model 2253 Audio/Video Codec Card (cold) -1949 Lab126 - 0002 Amazon Kindle - 0004 Amazon Kindle 3 -1951 Hyperstone AG -1953 Ironkey Inc. -1954 Radiient Technologies -195d Itron Technology iONE - 7002 Libra-Q11 IR remote - 7006 Libra-Q26 / 1.0 Remote - 7777 Scorpius wireless keyboard - 7779 Scorpius-P20MT -1967 CASIO HITACHI Mobile Communications Co., Ltd. -196b Wispro Technology Inc. -1970 Dane-Elec Corp. USA -1975 Dongguan Guneetal Wire & Cable Co., Ltd. -1976 Chipsbrand Microelectronics (HK) Co., Ltd. -1977 T-Logic - 0111 TL203 MP3 Player and Voice Recorder -1989 Nuconn Technology Corp. -198f Beceem Communications Inc. - 0210 BCS200 WiMAX Adapter -1990 Acron Precision Industrial Co., Ltd. -1995 Trillium Technology Pty. Ltd. - 3202 REC-ADPT-USB (recorder) - 3203 REC-A-ADPT-USB (recorder) -199e The Imaging Source Europe GmbH - 8101 DFx 21BU04 Camera -199f Benica Corporation -19a8 Biforst Technology Inc. -19ab Bodelin - 1000 ProScope HR -19af S Life - 6611 Celestia VoIP Phone -19b2 Batronix - 0010 BX32 Batupo - 0011 BX32P Barlino - 0012 BX40 Bagero - 0013 BX48 Batego -19b4 Celestron - 0002 SkyScout Personal Planetarium - 0101 Handheld Digital Microscope 44302 -19b5 B & W Group -19b6 Infotech Logistic, LLC -19b9 Data Robotics - 8d20 Drobo Elite -19ca Mindtribe - 0001 Sandio 3D HID Mouse -19cf Parrot SA -19d2 ONDA Communication S.p.A. - 0002 ET502HS/MT505UP ZTE MF632 - 0007 ZTE TU25 WiMAX Adapter [Beceem BCS200] - 0031 ZTE MF110/MF636 - 0063 ZTE K3565-Z HSDPA - 0064 ZTE MF627 AU - 0083 ZTE MF190 - 0103 ZTE MF112 - 2000 ZTE MF627/MF628/MF628+/MF636+ HSDPA/HSUPA - fff2 Gobi Wireless Modem (QDL mode) - fff3 Gobi Wireless Modem -19e1 WeiDuan Electronic Accessory (S.Z.) Co., Ltd. -19e8 Industrial Technology Research Institute -19ef Pak Heng Technology (Shenzhen) Co., Ltd. -19f7 RODE Microphones - 0001 Podcaster -19fa Gampaq Co.Ltd - 0703 Steering Wheel -19ff Dynex - 0102 1.3MP Webcam - 0201 Rocketfish Wireless 2.4G Laser Mouse -1a08 Bellwood International, Inc. -1a0a USB-IF non-workshop - badd USB OTG Compliance test device -1a12 KES Co., Ltd. -1a25 Amphenol East Asia Ltd. -1a2a Seagate Branded Solutions -1a32 Quanta Microsystems, Inc. - 0304 802.11n Wireless LAN Card -1a36 Biwin Technology Ltd. -1a40 TERMINUS TECHNOLOGY INC. - 0101 USB-2.0 4-Port HUB -1a41 Action Electronics Co., Ltd. -1a44 VASCO Data Security International - 0001 Digipass 905 SmartCard Reader -1a4a Silicon Image -1a4b SafeBoot International B.V. -1a61 Abbott Diabetes Care -1a6a Spansion Inc. -1a6d SamYoung Electronics Co., Ltd -1a6e Global Unichip Corp. -1a6f Sagem Orga GmbH -1a79 Bayer Health Care LLC -1a7b Lumberg Connect GmbH & Co. KG -1a7c Evoluent - 0068 VerticalMouse 3 - 0168 VerticalMouse 3 Wireless - 0191 VerticalMouse 4 -1a86 QinHeng Electronics - 5523 CH341 in serial mode, usb to serial port converter - 5584 CH341 in parallel mode, usb to printer port converter - 7523 HL-340 USB-Serial adapter - 752d CH345 MIDI adapter - 7584 CH340S - e008 HID-based USB-serial converter, full-speed, similar to HE2325U -1a89 Dynalith Systems Co., Ltd. -1a8b SGS Taiwan Ltd. -1a8d BandRich, Inc. - 1002 BandLuxe 3.5G HSDPA Adapter - 1009 BandLuxe 3.5G HSPA Adapter -1a90 Corsair Voyager GT 16GB -1a98 Leica Camera AG -1aa4 Data Drive Thru, Inc. -1aa5 UBeacon Technologies, Inc. -1aa6 eFortune Technology Corp. -1acb Salcomp Plc -1ad1 Desay Wire Co., Ltd. -1ae4 ic-design Reinhard Gottinger GmbH -1ae7 X-TENSIONS - 0381 VS-DVB-T 380U (af9015 based) - 2001 SpeedLink SL-6825 -1aed High Top Precision Electronic Co., Ltd. -1aef Conntech Electronic (Suzhou) Corporation -1b04 Meilhaus Electronic GmBH - 0630 ME-630 - 0940 ME-94 - 0950 ME-95 - 0960 ME-96 - 1000 ME-1000 - 100a ME-1000 - 100b ME-1000 - 1400 ME-1400 - 140a ME-1400A - 140b ME-1400B - 140c ME-1400C - 140d ME-1400D - 140e ME-1400E - 14ea ME-1400EA - 14eb ME-1400EB - 1604 ME-1600/4U - 1608 ME-1600/8U - 160c ME-1600/12U - 160f ME-1600/16U - 168f ME-1600/16U8I - 4610 ME-4610 - 4650 ME-4650 - 4660 ME-4660 - 4661 ME-4660I - 4662 ME-4660 - 4663 ME-4660I - 4670 ME-4670 - 4671 ME-4670I - 4672 ME-4670S - 4673 ME-4670IS - 4680 ME-4680 - 4681 ME-4680I - 4682 ME-4680S - 4683 ME-4680IS - 6004 ME-6000/4 - 6008 ME-6000/8 - 600f ME-6000/16 - 6014 ME-6000I/4 - 6018 ME-6000I/8 - 601f ME-6000I/16 - 6034 ME-6000ISLE/4 - 6038 ME-6000ISLE/8 - 603f ME-6000ISLE/16 - 6044 ME-6000/4/DIO - 6048 ME-6000/8/DIO - 604f ME-6000/16/DIO - 6054 ME-6000I/4/DIO - 6058 ME-6000I/8/DIO - 605f ME-6000I/16/DIO - 6074 ME-6000ISLE/4/DIO - 6078 ME-6000ISLE/8/DIO - 607f ME-6000ISLE/16/DIO - 6104 ME-6100/4 - 6108 ME-6100/8 - 610f ME-6100/16 - 6114 ME-6100I/4 - 6118 ME-6100I/8 - 611f ME-6100I/16 - 6134 ME-6100ISLE/4 - 6138 ME-6100ISLE/8 - 613f ME-6100ISLE/16 - 6144 ME-6100/4/DIO - 6148 ME-6100/8/DIO - 614f ME-6100/16/DIO - 6154 ME-6100I/4/DIO - 6158 ME-6100I/8/DIO - 615f ME-6100I/16/DIO - 6174 ME-6100ISLE/4/DIO - 6178 ME-6100ISLE/8/DIO - 617f ME-6100ISLE/16/DIO - 6259 ME-6200I/9/DIO - 6359 ME-6300I/9/DIO - 810a ME-8100A - 810b ME-8100B - 820a ME-8200A - 820b ME-8200B -1b20 MStar Semiconductor, Inc. -1b22 WiLinx Corp. -1b26 Cellex Power Products, Inc. -1b27 Current Electronics Inc. -1b28 NAVIsis Inc. -1b32 Ugobe Life Forms, Inc. - 0064 Pleo robotic dinosaur -1b36 ViXS Systems, Inc. -1b3b iPassion Technology Inc. - 2933 PC Camera/Webcam controller - 2935 PC Camera/Webcam controller - 2936 PC Camera/Webcam controller - 2937 PC Camera/Webcam controller - 2938 PC Camera/Webcam controller - 2939 PC Camera/Webcam controller - 2950 PC Camera/Webcam controller - 2951 PC Camera/Webcam controller - 2952 PC Camera/Webcam controller - 2953 PC Camera/Webcam controller - 2955 PC Camera/Webcam controller - 2956 PC Camera/Webcam controller - 2957 PC Camera/Webcam controller - 2958 PC Camera/Webcam controller - 2959 PC Camera/Webcam controller - 2960 PC Camera/Webcam controller - 2961 PC Camera/Webcam controller - 2962 PC Camera/Webcam controller - 2963 PC Camera/Webcam controller - 2965 PC Camera/Webcam controller - 2966 PC Camera/Webcam controller - 2967 PC Camera/Webcam controller - 2968 PC Camera/Webcam controller - 2969 PC Camera/Webcam controller -1b3f Generalplus Technology Inc. -1b47 Energizer Holdings, Inc. - 0001 CHUSB Duo Charger (NiMH AA/AAA USB smart charger) -1b48 Plastron Precision Co., Ltd. -1b59 K.S. Terminals Inc. -1b5a Chao Zhou Kai Yuan Electric Co., Ltd. -1b65 The Hong Kong Standards and Testing Centre Ltd. -1b72 ATERGI TECHNOLOGY CO., LTD. -1b73 Fresco Logic - 1000 xHC1 Controller -1b75 Ovislink Corp. - 3072 AirLive WN-360USB adapter -1b76 Legend Silicon Corp. -1b80 Afatech - c810 MC810 [af9015] - d393 DVB-T receiver [RTL2832U] - d396 UB396-T [RTL2832U] - d397 DVB-T receiver [RTL2832U] - d398 DVB-T receiver [RTL2832U] - d700 FM Radio SnapMusic Mobile 700 (FM700) - e383 DVB-T UB383-T [af9015] - e385 DVB-T UB385-T [af9015] - e386 DVB-T UB385-T [af9015] - e39a DVB-T395U [af9015] - e39b DVB-T395U [af9015] - e409 IT9137FN Dual DVB-T [KWorld UB499-2T] -1b86 Dongguan Guanshang Electronics Co., Ltd. -1b88 ShenMing Electron (Dong Guan) Co., Ltd. -1b8c Altium Limited -1b8d e-MOVE Technology Co., Ltd. -1b8e Amlogic, Inc. -1b8f MA LABS, Inc. -1b96 N-Trig - 0001 Duosense Transparent Electromagnetic Digitizer -1b98 YMax Communications Corp. -1b99 Shenzhen Yuanchuan Electronic -1ba1 JINQ CHERN ENTERPRISE CO., LTD. -1ba2 Lite Metals & Plastic (Shenzhen) Co., Ltd. -1ba4 Ember Corporation - 0001 InSight USB Link -1ba6 Abilis Systems -1ba8 China Telecommunication Technology Labs -1bad Harmonix Music - 0002 Guitar for Xbox 360 - 0003 Drum Kit for Xbox 360 -1bae Vuzix Corporation - 0002 VR920 Immersive Eyewear -1bbb T & A Mobile Phones -1bc4 Ford Motor Co. -1bc5 AVIXE Technology (China) Ltd. -1bce Contac Cable Industrial Limited -1bcf Sunplus Innovation Technology Inc. - 0007 Optical Mouse - 05c5 SPRF2413A [2.4GHz Wireless Keyboard/Mouse Receiver] - 05cf Micro keyboard & mouse receiver -1bd0 Hangzhou Riyue Electronic Co., Ltd. -1bde P-TWO INDUSTRIES, INC. -1bef Shenzhen Tongyuan Network-Communication Cables Co., Ltd -1bf0 RealVision Inc. -1bf5 Extranet Systems Inc. -1bf6 Orient Semiconductor Electronics, Ltd. -1bfd TouchPack - 1268 Touch Screen - 1368 Touch Screen - 1568 Capacitive Touch Screen - 1668 IR Touch Screen - 1688 Resistive Touch Screen - 2968 Touch Screen - 5968 Touch Screen - 6968 Touch Screen -1c02 Kreton Corporation -1c04 QNAP System Inc. -1c0d Relm Wireless -1c10 Lanterra Industrial Co., Ltd. -1c13 ALECTRONIC LIMITED -1c1a Datel Electronics Ltd. -1c1b Volkswagen of America, Inc. -1c1f Goldvish S.A. -1c20 Fuji Electric Device Technology Co., Ltd. -1c21 ADDMM LLC -1c22 ZHONGSHAN CHIANG YU ELECTRIC CO., LTD. -1c26 Shanghai Haiying Electronics Co., Ltd. -1c27 HuiYang D & S Cable Co., Ltd. -1c31 LS Cable Ltd. -1c34 SpringCard - 7241 Prox'N'Roll RFID Scanner -1c37 Authorizer Technologies, Inc. -1c3d NONIN MEDICAL INC. -1c3e Wep Peripherals -1c49 Cherng Weei Technology Corp. -1c4f SiGma Micro - 0003 HID controller - 3000 Micro USB Web Camera -1c6b Philips & Lite-ON Digital Solutions Corporation -1c6c Skydigital Inc. -1c73 AMT - 861f Anysee E30 USB 2.0 DVB-T Receiver -1c77 Kaetat Industrial Co., Ltd. -1c78 Datascope Corp. -1c79 Unigen Corporation -1c7a LighTuning Technology Inc. -1c7b LUXSHARE PRECISION INDUSTRY (SHENZHEN) CO., LTD. -1c87 2N TELEKOMUNIKACE a.s. -1c88 Somagic, Inc. -1c89 HONGKONG WEIDIDA ELECTRON LIMITED -1c8e ASTRON INTERNATIONAL CORP. -1c98 ALPINE ELECTRONICS, INC. -1ca0 ACCARIO Inc. -1cac Kinstone - a332 C8 Webcam - b288 C18 Webcam -1cb3 Aces Electronic Co., Ltd. -1cb4 OPEX CORPORATION -1cbe Luminary Micro Inc. -1cbf FORTAT SKYMARK INDUSTRIAL COMPANY -1cc0 PlantSense -1cca NextWave Broadband Inc. -1ccd Bodatong Technology (Shenzhen) Co., Ltd. -1cd4 adp corporation -1cd5 Firecomms Ltd. -1cd6 Antonio Precise Products Manufactory Ltd. -1cde Telecommunications Technology Association (TTA) -1cdf WonTen Technology Co., Ltd. -1ce0 EDIMAX TECHNOLOGY CO., LTD. -1ce1 Amphenol KAE -1cfc ANDES TECHNOLOGY CORPORATION -1cfd Flextronics Digital Design Japan, LTD. -1d07 Solid-Motion -1d08 NINGBO HENTEK DRAGON ELECTRONICS CO., LTD. -1d09 TechFaith Wireless Technology Limited - 1026 HSUPA Modem FLYING-LARK46-VER0.07 [Flying Angel] -1d0a Johnson Controls, Inc. The Automotive Business Unit -1d0b HAN HUA CABLE & WIRE TECHNOLOGY (J.X.) CO., LTD. -1d14 ALPHA-SAT TECHNOLOGY LIMITED -1d17 C-Thru Music Ltd. - 0001 AXiS-49 Harmonic Table MIDI Keyboard -1d19 Dexatek Technology Ltd. - 1101 DK DVB-T Dongle - 1102 DK mini DVB-T Dongle - 1103 DK 5217 DVB-T Dongle - 6105 Video grabber - 8202 DK DVBC/T DONGLE -1d1f Diostech Co., Ltd. -1d20 SAMTACK INC. -1d4d PEGATRON CORPORATION - 0002 Ralink RT2770/2720 802.11b/g/n Wireless LAN Mini-USB Device - 000c Ralink RT3070 802.11b/g/n Wireless Lan USB Device - 000e Ralink RT3070 802.11b/g/n Wireless Lan USB Device -1d50 OpenMoko, Inc. - 5119 GTA01/GTA02 U-Boot Bootloader -1d5b Smartronix, Inc. -1d6b Linux Foundation - 0001 1.1 root hub - 0002 2.0 root hub - 0003 3.0 root hub - 0100 PTP Gadget - 0101 Audio Gadget - 0102 EEM Gadget - 0103 NCM (Ethernet) Gadget - 0104 Multifunction Composite Gadget - 0105 FunctionFS Gadget - 0200 Qemu Audio Device -1e0e Qualcomm / Option -1e10 Point Grey Research, Inc. - 2004 Sony 1.3MP 1/3" ICX445 IIDC video camera [Chameleon] -1e1d Lumension Security - 0165 Secure Pen drive -1e1f INVIA -1e29 Festo AG & Co. KG - 0101 CPX Adapter - 0102 CPX Adapter >=HW10.09 [CP2102] - 0401 iL3-TP [AT90USB646] - 0402 FTDI232 [EasyPort] - 0403 FTDI232 [EasyPort Mini] - 0404 FTDI232 [Netzteil-GL] - 0405 FTDI232 [MotorPrüfstand] - 0406 STM32F103 [EasyKit] - 0407 LPC2378 [Robotino] - 0408 LPC2378 [Robotino-Arm] - 0409 LPC2378 [Robotino-Arm Bootloader] - 040a LPC2378 [Robotino Bootloader] - 0501 CP2102 [CMSP] - 0601 CMMP-AS -1e41 Cleverscope - 0001 CS328A PC Oscilloscope -1e54 TypeMatrix - 2030 2030 USB Keyboard -1e68 TrekStor GmbH & Co. KG - 001b DataStation maxi g.u -1e71 NZXT - 0001 Avatar Optical Mouse -1e74 Coby Electronics Corporation - 6511 MP705-8G MP3 player - 6512 MP705-4G -1e7d ROCCAT - 2c24 Pyra Mouse (wired) - 2ced Kone Mouse - 2d51 Kone+ Mouse - 30d4 Arvo Keyboard -1ebb NuCORE Technology, Inc. -1eda AirTies Wireless Networks - 2310 802.11n USB Wireless LAN Card -1ef6 EADS Deutschland GmbH -1f28 Cal-Comp - 0020 CDMA USB Modem A600 - 0021 CD INSTALLER USB Device -1f4d G-Tek Electronics Group - b803 Lifeview LV5TDLX DVB-T [RTL2832U] -1f82 TANDBERG - 0001 PrecisionHD Camera -1f84 Alere, Inc. -1f87 Stantum - 0002 Multi-touch HID Controller -1fbd Delphin Technology AG - 0001 Expert Key - Data aquisition system -1fc9 NXP Semiconductors -1fe7 Vertex Wireless Co., Ltd. - 1000 VW100 series CDMA EV-DO Rev.A modem -2001 D-Link Corp. - 0001 DWL-120 WIRELESS ADAPTER - 0201 DHN-120 10Mb Home Phoneline Adapter - 1a00 10/100 Ethernet - 200c 10/100 Ethernet - 3200 DWL-120 802.11b Wireless Adapter(rev.E1) [Atmel at76c503a] - 3301 DWA-130 802.11n Wireless N Adapter(rev.C1) [Realtek RTL8192U] - 3500 Elitegroup Computer Systems WLAN card WL-162 - 3700 DWL-122 802.11b [Intersil Prism 3] - 3701 DWL-G120 Spinnaker 802.11g [Intersil ISL3886] - 3702 DWL-120 802.11b Wireless Adapter(rev.F) [Intersil ISL3871] - 3703 AirPlus G DWL-G122 Wireless Adapter [Intersil ISL3886] - 3704 AirPlus G DWL-G122 Wireless Adapter(rev.A2) [Intersil ISL3887] - 3705 AirPlus G DWL-G120 Wireless Adapter(rev.C) [Intersil ISL3887] - 3761 IEEE 802.11g USB2.0 Wireless Network Adapter-PN - 3a00 DWL-AG132 [Atheros AR5523] - 3a01 DWL-AG132 (no firmware) [Atheros AR5523] - 3a02 DWL-G132 [Atheros AR5523] - 3a03 DWL-G132 (no firmware) [Atheros AR5523] - 3a04 DWL-AG122 [Atheros AR5523] - 3a05 DWL-AG122 (no firmware) [Atheros AR5523] - 3a80 AirPlus Xtreme G DWL-G132 Wireless Adapter - 3a81 predator Bootloader Download - 3a82 AirPremier AG DWL-AG132 Wireless Adapter - 3a83 predator Bootloader Download - 3b00 AirPlus DWL-120+ Wireless Adapter [Texas Instruments ACX100USB] - 3b01 WLAN Boot Device - 3c00 AirPlus G DWL-G122 Wireless Adapter(rev.B1) [Ralink RT2500USB] - 3c01 AirPlus AG DWL-AG122 Wireless Adapter - 3c02 AirPlus G DWL-G122 Wireless Adapter - 3c05 DUB-E100 Fast Ethernet [asix] - 4000 DSB-650C Ethernet [klsi] - 4001 DSB-650TX Ethernet [pegasus] - 4002 DSB-650TX Ethernet [pegasus] - 4003 DSB-650TX-PNA Ethernet [pegasus] - 400b 10/100 Ethernet - 4102 10/100 Ethernet - 5100 DSL-200 ADSL ATM Modem - 5102 DSL-200 ADSL Loader - 5b00 Remote NDIS Network Device - 9414 Cable Modem - 9b00 Broadband Cable Modem Remote NDIS Device - abc1 DSB-650 Ethernet [pegasus] - f013 DLink 7 port USB2.0 Hub - f103 DUB-H7 7-port USB 2.0 hub - f10d Accent Communications Modem - f110 DUB-AV300 A/V Capture - f111 DBT-122 Bluetooth adapter - f112 DUB-T210 Audio Device - f116 Formosa 2 - f117 Formosa 3 - f118 Formosa 4 -2013 Unknown (Pinnacle?) - 0245 PCTV 73ESE - 0246 PCTV 74E - 0248 PCTV 282E -2019 PLANEX - 3220 GW-US11S WLAN [Atmel AT76C503A] - 5303 GW-US54GXS 802.11bg - 5304 GWUS300 802.11n - ab01 GW-US54HP - ab24 GW-US300MiniS - ab25 GW-USMini2N 802.11n Wireless Adapter [Ralink RT2870] - ab28 GW-USNano - ab29 GW-USMicro300 - ab50 GW-US54Mini2 - c002 GW-US54SG - c007 GW-US54GZL - ed02 GW-USMM - ed06 802.11n Wireless LAN Adapter - ed10 GW-US300Mini2 - ed14 GW-USMicroN - ed17 GW-USValue-EZ -2040 Hauppauge - 0c80 Windham - 0c90 Windham - 1700 CataMount - 1800 Okemo A - 1801 Okemo B - 2000 Tiger Minicard - 2009 Tiger Minicard R2 - 200a Tiger Minicard - 2010 Tiger Minicard - 2011 WinTV MiniCard [Dell Digital TV Receiver] - 2019 Tiger Minicard - 2400 WinTV PVR USB2 (Model 24019) - 4700 WinTV Nova-S-USB2 - 4902 HD PVR - 4982 HD PVR - 5500 Windham - 5510 Windham - 5520 Windham - 5530 Windham - 5580 Windham - 5590 Windham - 6500 WinTV HVR-900 - 6502 WinTV HVR-900 - 6503 WinTV HVR-930 - 6513 WinTV HVR-980 - 7050 Nova-T Stick - 7060 Nova-T Stick 2 - 7070 Nova-T Stick 3 - 7240 WinTV HVR-850 - 8400 WinTV Nova-T-500 - 9300 WinTV NOVA-T USB2 (cold) - 9301 WinTV NOVA-T USB2 (warm) - 9941 WinTV Nova-T-500 - 9950 WinTV Nova-T-500 - b910 Windham - b980 Windham - b990 Windham - c000 Windham - c010 Windham -2047 Texas Instruments - 0200 MSP430 USB HID Bootstrap Loader -2080 Barnes & Noble - 0001 nook - 0002 NOOKcolor -2087 Cando - 0a01 Multi Touch Panel - 0a02 Multi Touch Panel - 0b03 Multi Touch Panel -20a0 Clay Logic - 414a MDE SPI Interface -20b1 XMOS Ltd - 10ad XUSB Loader - f7d1 XTAG2 - JTAG Adapter -20b3 Hanvon - 0a18 10.1 Touch screen overlay -20b7 Qi Hardware - 0713 Milkymist JTAG/serial - 1540 ben-wpan, AT86RF230-based - 1db5 IDBG in DFU mode - 1db6 IDBG in normal mode - c25b C2 Dongle - cb72 ben-wpan, cntr -20df Simtec Electronics - 0001 Entropy Key [UDEKEY01] -2101 ActionStar - 0201 SIIG 4-to-2 Printer Switch -2162 Creative (?) - 2031 Network Blaster Wireless Adapter - 500c DE5771 Modem Blaster - 8001 Broadxent BritePort DSL Bridge 8010U -2184 GW Instek - 0005 GDS-3000 Oscilloscope - 0006 GDS-3000 Oscilloscope - 0011 AFG Function Generator (CDC) -21a1 Emotiv Systems Pty. Ltd. - 0001 EPOC Consumer Headset Wireless Dongle -21d6 Agecodagis SARL - 0002 Seismic recorder [Tellus] -2222 MacAlly - 0004 iWebKey Keyboard - 2520 Mini Tablet - 4050 AirStick joystick -2227 SAMWOO Enterprise - 3105 SKYDATA SKD-U100 -2233 RadioShack Corporation - 6323 USB Electronic Scale -2237 Kobo Inc. - 4161 eReader White -22a6 Pie Digital, Inc. - ffff PieKey "beta" 4GB model 4E4F41482E4F5247 (SM3251Q BB) -22b8 Motorola PCS - 0001 Wally 2.2 chipset - 0002 Wally 2.4 chipset - 0005 V.60c/V.60i GSM Phone - 0830 2386C-HT820 - 0833 2386C-HT820 [Flash Mode] - 0850 Bluetooth Device - 1001 Patriot 1.0 (GSM) chipset - 1002 Patriot 2.0 chipset - 1005 T280e GSM/GPRS Phone - 1101 Patriot 1.0 (TDMA) chipset - 1801 Rainbow chipset flash - 2035 Bluetooth Device - 2805 GSM Modem - 2821 T720 GSM Phone - 2822 V.120e GSM Phone - 2823 Flash Interface - 2a01 MSM6050 chipset - 2a02 CDMA modem - 2a03 MSM6050 chipset flash - 2a21 V710 GSM Phone (P2K) - 2a22 V710 GSM Phone (AT) - 2a23 MSM6100 chipset flash - 2a41 MSM6300 chipset - 2a42 Usb Modem - 2a43 MSM6300 chipset flash - 2a61 E815 GSM Phone (P2K) - 2a62 E815 GSM Phone (AT) - 2a63 MSM6500 chipset flash - 2a81 MSM6025 chipset - 2a83 MSM6025 chipset flash - 2ac1 MSM6100 chipset - 2ac3 MSM6100 chipset flash - 2d78 XT300[SPICE] - 3001 A835/E1000 GSM Phone (P2K) - 3002 A835/E1000 GSM Phone (AT) - 3801 C350L/C450 (P2K) - 3802 C330/C350L/C450/EZX GSM Phone (AT) - 3803 Neptune LT chipset flash - 4001 OMAP 1.0 chipset - 4002 A920/A925 UMTS Phone - 4003 OMAP 1.0 chipset flash - 4008 OMAP 1.0 chipset RDL - 41d6 Droid X (Windows media mode) - 41d9 Droid/Milestone - 41db Droid/Milestone (Debug mode) - 41de Droid X (PC mode) - 4204 MPx200 Smartphone - 4214 MPc GSM - 4224 MPx220 Smartphone - 4234 MPc CDMA - 4244 MPx100 Smartphone - 4285 Droid X (Mass storage) - 4801 Neptune LTS chipset - 4803 Neptune LTS chipset flash - 4810 Triplet GSM Phone (storage) - 4901 Triplet GSM Phone (P2K) - 4902 Triplet GSM Phone (AT) - 4903 Neptune LTE chipset flash - 4a01 Neptune LTX chipset - 4a03 Neptune LTX chipset flash - 4a32 L6-imode Phone - 5801 Neptune ULS chipset - 5803 Neptune ULS chipset flash - 5901 Neptune VLT chipset - 5903 Neptune VLT chipset flash - 6001 Dalhart EZX - 6003 Dalhart flash - 6004 EZX GSM Phone (CDC Net) - 6006 MOTOROKR E6 - 6008 Dalhart RDL - 6009 EZX GSM Phone (P2K) - 600a Dalhart EZX config 17 - 600b Dalhart EZX config 18 - 600c EZX GSM Phone (USBLAN) - 6021 JUIX chipset - 6023 JUIX chipset flash - 6026 Flash RAM Downloader/miniOS - 6027 USBLAN - 604c EZX GSM Phone (Storage) - 6101 Talon integrated chipset - 6401 Argon chipset - 6403 Argon chipset flash - 6415 ROKR Z6 (MTP mode) - 6604 Washington CDMA Phone - 6631 CDC Modem - 7001 Q Smartphone - fe01 StarTAC III MS900 -22b9 eTurboTouch Technology, Inc. - 0006 Touch Screen -22ba Technology Innovation Holdings, Ltd -2304 Pinnacle Systems, Inc. - 0109 Studio PCTV USB (SECAM) - 0110 Studio PCTV USB (PAL) - 0111 Miro PCTV USB - 0112 Studio PCTV USB (NTSC) with FM radio - 0201 Systems MovieBox Device - 0204 MovieBox USB_B - 0205 DVC 150B - 0206 Systems MovieBox Deluxe Device - 0207 Dazzle DVC90 Video Device - 0208 Studio PCTV USB2 - 020e PCTV 200e - 020f PCTV 400e BDA Device - 0210 Studio PCTV USB (PAL) with FM radio - 0212 Studio PCTV USB (NTSC) - 0213 500-USB Device - 0214 Studio PCTV USB (PAL) with FM radio - 0216 PCTV 60e - 0219 PCTV 260e - 021a Dazzle DVC100 Audio Device - 021b Dazzle DVC130/DVC170 - 021d Dazzle DVC130 - 021e Dazzle DVC170 - 021f PCTV Sat HDTV Pro BDA Device - 0222 PCTV Sat Pro BDA Device - 0223 DazzleTV Sat BDA Device - 0225 Remote Kit Infrared Transceiver - 0226 PCTV 330e - 0227 PCTV for Mac, HD Stick - 0228 PCTV DVB-T Flash Stick - 0229 PCTV Dual DVB-T 2001e - 022a PCTV 160e - 022b PCTV 71e [Afatech AF9015] - 0232 PCTV 170e - 0236 PCTV 72e [DiBcom DiB7000PC] - 0237 PCTV 73e [DiBcom DiB7000PC] - 023a PCTV 801e - 023b PCTV 801e SE - 023d PCTV 340e - 023e PCTV 340e SE - 0300 Studio Linx Video input cable (NTSC) - 0301 Studio Linx Video input cable (PAL) - 0302 Dazzle DVC120 - 0419 PCTV Bungee USB (PAL) with FM radio - 061d PCTV Deluxe (NTSC) Device - 061e PCTV Deluxe (PAL) Device -2318 Shining Technologies, Inc. [hex] - 0011 CitiDISK Jr. IDE Enclosure -2373 Pumatronix Ltda - 0001 5 MegaPixel Digital Still Camera [DSC5M] -2375 Digit@lway, Inc. - 0001 Digital Audio Player -2406 SANHO Digital Electronics Co., Ltd. - 6688 PD7X Portable Storage -2478 Tripp-Lite - 2008 U209-000-R Serial Port -2632 TwinMOS - 3209 7-in-1 Card Reader -2650 Electronics For Imaging, Inc. [hex] -2730 Citizen - 200f CT-S310 Label printer -2735 DigitalWay - 0003 MPIO HS100 - 1001 MPIO FY200 - 1002 MPIO FL100 - 1003 MPIO FD100 - 1004 MPIO HD200 - 1005 MPIO HD300 - 1006 MPIO FG100 - 1007 MPIO FG130 - 1008 MPIO FY300 - 1009 MPIO FY400 - 100a MPIO FL300 - 100b MPIO HS200 - 100c MPIO FL350 - 100d MPIO FY500 - 100e MPIO FY500 - 100f MPIO FY600 - 1012 MPIO FL400 - 1013 MPIO HD400 - 1014 MPIO HD400 - 1016 MPIO FY700 - 1017 MPIO FY700 - 1018 MPIO FY800 - 1019 MPIO FY800 - 101a MPIO FY900 - 101b MPIO FY900 - 102b MPIO FL500 - 102c MPIO FL500 - 103f MPIO FY570 - 1040 MPIO FY570 - 1041 MPIO FY670 - 1042 MPIO FY670 - 1043 HCT HMD-180A - 1044 HCT HMD-180A -2770 NHJ, Ltd - 0a01 ScanJet 4600 series - 905c Che-Ez Snap SNAP-U/Digigr8/Soundstar TDC-35 - 9060 A130 - 9120 Che-ez! Snap / iClick Tiny VGA Digital Camera - 9130 TCG 501 - 913c Argus DC-1730 - 9150 Mini Cam - 9153 iClick 5X - 915d Cyberpix S-210S / Little Tikes My Real Digital Camera - 930b CCD Webcam(PC370R) - 930c CCD Webcam(PC370R) -2821 ASUSTek Computer Inc. - 0161 WL-161 802.11b Wireless Adapter [SiS 162U] - 160f WL-160g 802.11g Wireless Adapter [Envara WiND512] - 3300 WL-140 / Hawking HWU36D 802.11b Wireless Adapter [Intersil PRISM 3] -2899 Toptronic Industrial Co., Ltd - 012c Camera Device -2c02 Planex Communications - 14ea GW-US11H WLAN -2c1a Dolphin Peripherals - 0000 Wireless Optical Mouse -2fb2 Fujitsu, Ltd -3125 Eagletron - 0001 TrackerPod Camera Stand -3176 Whanam Electronics Co., Ltd -3275 VidzMedia Pte Ltd - 4fb1 MonsterTV P2H -3334 AEI - 1701 Fast Ethernet -3340 Yakumo - 043a Mio A701 DigiWalker PPCPhone - 0e3a Pocket PC 300 GPS SL / Typhoon MyGuide 3500 - a0a3 deltaX 5 BT (D) PDA -3504 Micro Star - f110 Security Key -3538 Power Quotient International Co., Ltd - 0001 Travel Flash - 0015 Mass Storge Device - 0022 Hi-Speed Mass Storage Device - 0042 Cool Drive U339 Flash Disk - 0054 Flash Drive (2GB) -3579 DIVA - 6901 Media Reader -3636 InVibro -3838 WEM - 0001 5-in-1 Card Reader -3923 National Instruments Corp. - 12c0 DAQPad-6020E - 12d0 DAQPad-6507 - 12e0 NI 4350 - 12f0 NI 5102 - 1750 DAQPad-6508 - 17b0 USB-ISA-Bridge - 1820 DAQPad-6020E (68 pin I/O) - 1830 DAQPad-6020E (BNC) - 1f00 DAQPad-6024E - 1f10 DAQPad-6024E - 1f20 DAQPad-6025E - 1f30 DAQPad-6025E - 1f40 DAQPad-6036E - 1f50 DAQPad-6036E - 2f80 DAQPad-6052E - 2f90 DAQPad-6052E - 702b GPIB-USB-B - 703c USB-485 RS485 Cable - 709b GPIB-USB-HS - 7254 NI MIO (data acquisition card) firmware updater - 729e USB-6251 (OEM) data acquisition card -40bb I-O Data - 0a09 USB2.0-SCSI Bridge USB2-SC -4101 i-rocks - 1301 IR-2510 usb phone -4102 iRiver, Ltd. - 1001 iFP-100 series mp3 player - 1003 iFP-300 series mp3 player - 1005 iFP-500 series mp3 player - 1007 iFP-700 series mp3/ogg vorbis player - 1008 iFP-800 series mp3/ogg vorbis player - 100a iFP-1000 series mp3/ogg vorbis player - 1014 T20 series mp3/ogg vorbis player (ums firmware) - 1019 T30 - 1034 T60 - 1040 M1Player - 1041 E100 (ums) - 1101 iFP-100 series mp3 player (ums firmware) - 1103 iFP-300 series mp3 player (ums firmware) - 1105 iFP-500 series mp3 player (ums firmware) - 1113 T10 (alternate) - 1117 T10 - 1119 T30 series mp3/ogg/wma player - 1141 E100 (mtp) - 2002 H10 6GB - 2101 H10 20GB (mtp) - 2102 H10 5GB (mtp) - 2105 H10 5/6GB (mtp) -413c Dell Computer Corp. - 0000 DRAC 5 Virtual Keyboard and Mouse - 0001 DRAC 5 Virtual Media - 0058 Port Replicator - 1001 Keyboard Hub - 1002 Keyboard Hub - 1003 Keyboard Hub - 1005 Multimedia Pro Keyboard Hub - 2001 Keyboard HID Support - 2002 SK-8125 Keyboard - 2003 Keyboard - 2005 RT7D50 Keyboard - 2010 Keyboard - 2011 Multimedia Pro Keyboard - 2100 SK-3106 Keyboard - 2101 SmartCard Reader Keyboard - 2105 Model L100 Keyboard - 2106 Dell QuietKey Keyboard - 2500 DRAC4 Remote Access Card - 2513 internal USB Hub of E-Port Replicator - 3010 Optical Wheel Mouse - 3012 Optical Wheel Mouse - 3016 Optical 5-Button Wheel Mouse - 3200 Mouse - 4001 Axim X5 - 4002 Axim X3 - 4003 Axim X30 - 4004 Axim Sync - 4005 Axim Sync - 4006 Axim Sync - 4007 Axim Sync - 4008 Axim Sync - 4009 Axim Sync - 4011 Axim X51v - 5103 AIO Printer A940 - 5105 AIO Printer A920 - 5107 AIO Printer A960 - 5109 Photo AIO Printer 922 - 5110 Photo AIO Printer 962 - 5111 Photo AIO Printer 942 - 5112 Photo AIO Printer 924 - 5113 Photo AIO Printer 944 - 5114 Photo AIO Printer 964 - 5115 Photo AIO Printer 926 - 5116 AIO Printer 946 - 5117 Photo AIO Printer 966 - 5118 AIO 810 - 5124 Laser MFP 1815 - 5128 Photo AIO 928 - 5200 Laser Printer - 5202 Printing Support - 5203 Printing Support - 5210 Printing Support - 5211 1110 Laser Printer - 5220 Laser MFP 1600n - 5225 Printing Support - 5226 Printing Support - 5300 Laser Printer - 5400 Laser Printer - 5401 Laser Printer - 5513 WLA3310 Wireless Adapter [Intersil ISL3887] - 5601 Laser Printer 3100cn - 5602 Laser Printer 3000cn - 5631 Laser Printer 5100cn - 5905 Printing Support - 8000 BC02 Bluetooth Adapter - 8010 TrueMobile Bluetooth Module in - 8100 TrueMobile 1180 802.11b Adapter [Intersil PRISM 3] - 8102 TrueMobile 1300 802.11g Wireless Adapter [Intersil ISL3880] - 8103 Wireless 350 Bluetooth - 8104 Wireless 1450 Dual-band (802.11a/b/g) Adapter [Intersil ISL3887] - 8105 U2 in HID - Driver - 8106 Wireless 350 Bluetooth Internal Card in - 8110 Wireless 3xx Bluetooth Internal Card - 8111 Wireless 3xx Bluetooth Internal Card in - 8114 Wireless 5700 Mobile Broadband (CDMA EV-DO) Minicard Modem - 8115 Wireless 5500 Mobile Broadband (3G HSDPA) Minicard Modem - 8116 Wireless 5505 Mobile Broadband (3G HSDPA) Minicard Modem - 8117 Wireless 5700 Mobile Broadband (CDMA EV-DO) Expresscard Modem - 8118 Wireless 5510 Mobile Broadband (3G HSDPA) Expresscard Status Port - 8120 Bluetooth adapter - 8121 Eastfold in HID - 8122 Eastfold in DFU - 8123 eHome Infrared Receiver - 8124 eHome Infrared Receiver - 8126 Wireless 355 Bluetooth - 8127 Wireless 355 Module with Bluetooth 2.0 + EDR Technology. - 8128 Wireless 5700-Sprint Mobile Broadband (CDMA EV-DO) Mini-Card Status Port - 8129 Wireless 5700-Telus Mobile Broadband (CDMA EV-DO) Mini-Card Status Port - 8131 Wireless 360 Bluetooth 2.0 + EDR module. - 8133 Wireless 5720 VZW Mobile Broadband (EVDO Rev-A) Minicard GPS Port - 8134 Wireless 5720 Sprint Mobile Broadband (EVDO Rev-A) Minicard Status Port - 8135 Wireless 5720 TELUS Mobile Broadband (EVDO Rev-A) Minicard Diagnostics Port - 8136 Wireless 5520 Cingular Mobile Broadband (3G HSDPA) Minicard Diagnostics Port - 8137 Wireless 5520 Voda L Mobile Broadband (3G HSDPA) Minicard Status Port - 8138 Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard EAP-SIM Port - 8140 Wireless 360 Bluetooth - 8142 Mobile 360 in DFU - 8147 F3507g Mobile Broadband Module - 8156 Wireless 370 Bluetooth Mini-card - 8157 Integrated Keyboard - 8158 Integrated Touchpad / Trackstick - 8160 Wireless 365 Bluetooth - 8161 Integrated Keyboard - 8162 Integrated Touchpad [Synaptics] - 8171 Gobi Wireless Modem (QDL mode) - 8172 Gobi Wireless Modem - 8183 F3607gw Mobile Broadband Module - 8184 F3607gw v2 Mobile Broadband Module - 8185 Gobi 2000 Wireless Modem (QDL mode) - 8186 Gobi 2000 Wireless Modem - 8187 DW375 Bluetooth Module - 8501 Bluetooth Adapter - 9500 USB CP210x UART Bridge Controller [DW700] - a001 Hub - a005 Internal 2.0 Hub - a700 Hub (in 1905FP LCD Monitor) -4146 USBest Technology - 9281 Iomega Micro Mini 128MB Flash Drive - ba01 Intuix Flash Drive -4242 USB Design by Example - 4201 Buttons and Lights HID device - 4220 Echo 1 Camera -4317 Broadcom Corp. - 0700 U.S. Robotics USR5426 802.11g Adapter - 0701 U.S. Robotics USR5425 Wireless MAXg Adapter - 0711 Belkin F5D7051 v3000 802.11g - 0720 Dynex DX-BUSB -4348 WinChipHead - 5523 USB->RS 232 adapter with Prolifec PL 2303 chipset - 5537 13.56Mhz RFID Card Reader and Writer - 5584 CH34x printer adapter cable -4572 Shuttle, Inc. - 4572 Shuttle PN31 Remote -4586 Panram - 1026 Crystal Bar Flash Drive -4670 EMS Production - 9394 Game Cube USB Memory Adaptor 64M -4752 Miditech - 0011 Midistart-2 -4757 GW Instek - 2009 PEL-2000 Series Electronic Load (CDC) - 2010 PEL-2000 Series Electronic Load (CDC) -4766 Aceeca - 0001 MEZ1000 RDA -4855 Memorex - 7288 Ultra Traveldrive 160G 2.5" HDD -4971 SimpleTech - cb01 SP-U25/120G - ce17 1TB SimpleDrive II USB External Hard Drive -5032 Grandtec - 0bb8 Grandtec USB1.1 DVB-T (cold) - 0bb9 Grandtec USB1.1 DVB-T (warm) - 0fa0 Grandtec USB1.1 DVB-T (cold) - 0fa1 Grandtec USB1.1 DVB-T (warm) -5041 Linksys (?) - 2234 WUSB54G v1 802.11g Adapter [Intersil ISL3886] - 2235 WUSB54GP v1 802.11g Adapter [Intersil ISL3886] -50c2 Averatec (?) - 4013 WLAN Adapter -5173 Sweex - 1809 ZD1211 -5219 I-Tetra - 1001 Cetus CDC Device -5345 Owon - 1234 PDS6062T Oscilloscope -544d Transmeta Corp. -5543 UC-Logic Technology Corp. - 0002 SuperPen WP3325U Tablet - 0003 Tablet WP4030U - 0004 Tablet WP5540U - 0005 Tablet WP8060U - 0041 Genius PenSketch 6x8 Tablet - 0042 Tablet PF1209 - 0064 Aiptek HyperPen 10000U -5555 Epiphan Systems Inc. - 1110 VGA2USB - 1120 KVM2USB - 2222 DVI2USB - 3333 VGA2USB Pro - 3337 KVM2USB Pro - 3340 VGA2USB LR - 3344 KVM2USB LR - 3411 DVI2USB Solo - 3422 DVI2USB Duo -55aa OnSpec Electronic, Inc. - 0015 Hard Drive - 0102 SuperDisk - 0103 IDE Hard Drive - 0201 DDI to Reader-19 - 1234 ATAPI Bridge - a103 Sandisk SDDR-55 SmartMedia Card Reader - b000 USB to CompactFlash Card Reader - b004 OnSpec MMC/SD Reader/Writer - b00b USB to Memory Stick Card Reader - b00c USB to SmartMedia Card Reader - b012 Mitsumi FA402M 8-in-2 Card Reader - b200 Compact Flash Reader - b204 MMC/ SD Reader - b207 Memory Stick Reader -5656 Uni-Trend Group Limited - 0832 UT2000/UT3000 Digital Storage Oscilloscope -595a IRTOUCHSYSTEMS Co. Ltd. - 0001 Touchscreen -5986 Acer, Inc - 0100 Orbicam - 0101 USB2.0 Camera - 0102 Crystal Eye Webcam - 01a6 Lenovo Integrated Webcam - 01a7 Lenovo Integrated Webcam - 01a9 Lenovo Integrated Webcam - 0200 OrbiCam - 0203 BisonCam NB Pro 1300 - 0241 BisonCam, NB Pro - 02d0 Lenovo Integrated Webcam [R5U877] - 03d0 Lenovo Integrated Webcam [R5U877] -5a57 Zinwell - 0260 RT2570 - 0280 802.11a/b/g/n USB Wireless LAN Card - 0282 802.11b/g/n USB Wireless LAN Card - 0283 802.11b/g/n USB Wireless LAN Card - 0284 802.11a/b/g/n USB Wireless LAN Card - 0290 ZW-N290 802.11n [Realtek RTL8192SU] - 5257 Metronic 495257 wifi 802.11ng -6000 Beholder International Ltd. - dec0 TV Wander - dec1 TV Voyage -601a Ingenic Semiconductor Ltd. - 4740 XBurst Jz4740 boot mode -6189 Sitecom - 182d USB 2.0 Ethernet - 2068 USB to serial cable (v2) -6253 TwinHan Technology Co., Ltd - 0100 Ir reciver f. remote control -636c CoreLogic, Inc. -6472 Unknown (Sony?) - 01c8 PlayStation Portable [Mass Storage] -6547 Arkmicro Technologies Inc. - 0232 ARK3116 Serial -6615 IRTOUCHSYSTEMS Co. Ltd. - 0001 Touchscreen -6666 Prototype product Vendor ID - 0667 WiseGroup Smart Joy PSX, PS-PC Smart JoyPad - 2667 JCOP BlueZ Smartcard reader - 8802 SmartJoy Dual Plus PS2 converter - 8804 WiseGroup SuperJoy Box 5 -6677 WiseGroup, Ltd. - 8802 SmartJoy Dual Plus PS2 converter - 8811 Deluxe Dance Mat -6891 3Com - a727 3CRUSB10075 802.11bg [ZyDAS ZD1211] -695c Opera1 - 3829 Opera1 DVB-S (warm state) -6993 Yealink Network Technology Co., Ltd. - b001 VoIP Phone -6a75 Shanghai Jujo Electronics Co., Ltd -7104 CME (Central Music Co.) - 2202 UF5/UF6/UF7/UF8 MIDI Master Keyboard -726c StackFoundry LLC - 2149 EntropyKing Random Number Generator -734c TBS Technologies China - 5920 Q-Box II DVB-S2 HD - 5928 Q-Box II DVB-S2 HD -7392 Edimax Technology Co., Ltd - 7711 EW-7711UTn nLite Wireless Adapter [Ralink RT2870] - 7717 EW-7717UN 802.11n Wireless Adapter [Ralink RT2870] - 7718 EW-7718UN 802.11n Wireless Adapter [Ralink RT2870] - 7722 EW-7722UTn 802.11n Wireless Adapter [Ralink RT307x] - 7811 EW-7811Un 802.11n Wireless Adapter [Realtek RTL8188CUS] -8086 Intel Corp. - 0001 AnyPoint (TM) Home Network 1.6 Mbps Wireless Adapter - 0044 CPU DRAM Controller - 0046 HD Graphics - 0100 Personal Audio Player 3000 - 0101 Personal Audio Player 3000 - 0110 Easy PC Camera - 0120 PC Camera CS120 - 0180 WiMAX Connection 2400m - 0181 WiMAX Connection 2400m - 0182 WiMAX Connection 2400m - 0186 WiMAX Connection 2400m - 0188 WiMAX Connection 2400m - 0200 AnyPoint(TM) Wireless II Network 11Mbps Adapter [Atmel AT76C503A] - 0431 Intel Pro Video PC Camera - 0510 Digital Movie Creator - 0630 Pocket PC Camera - 0780 CS780 Microphone Input - 07d3 BLOB boot loader firmware - 0dad Cherry MiniatureCard Keyboard - 1010 AnyPoint(TM) Home Network 10 Mbps Phoneline Adapter - 110a Bluetooth Controller from (Ericsson P4A) - 110b Bluetooth Controller from (Intel/CSR) - 1110 PRO/Wireless LAN Module - 1111 PRO/Wireless 2011B 802.11b Adapter [Intersil PRISM 2.5] - 1134 Hollister Mobile Monitor - 1139 In-Target Probe (ITP) - 1234 Prototype Reader/Writer - 1403 WiMAX Connection 2400m - 1405 WiMAX Connection 2400m - 1406 WiMAX Connection 2400m - 2448 82801 PCI Bridge - 3100 PRO/DSL 3220 Modem - WAN - 3101 PRO/DSL 3220 Modem - 3240 AnyPoint® 3240 Modem - WAN - 3241 AnyPoint® 3240 Modem - 8602 Miniature Card Slot - 9303 Intel 8x930Hx Hub - 9500 CE 9500 DVB-T - 9890 82930 Test Board - beef SCM Miniature Card Reader/Writer - c013 Wireless HID Station - f001 XScale PXA27x Bulverde flash - f1a5 Z-U130 [Value Solid State Drive] -8087 Intel Corp. - 0020 Integrated Rate Matching Hub - 0024 Integrated Rate Matching Hub -80ee VirtualBox - 0021 USB Tablet -8282 Keio - 3201 Retro Adapter - 3301 Retro Adapter Mouse -8341 EGO Systems, Inc. - 2000 Flashdisk -9016 Sitecom - 182d WL-022 802.11b Adapter -9022 TeVii Technology Ltd. - d630 DVB-S S630 - d650 DVB-S2 S650 - d660 DVB-S2 S660 -9148 GeoLab, Ltd -# All of GeoLab's devices share the same ID 0004. - 0004 R3 Compatible Device -9710 MosChip Semiconductor - 7703 MCS7703 Serial Port Adapter - 7705 MCS7705 Parallel port adapter - 7715 MCS7715 Parallel and serial port adapter - 7717 MCS7717 3-port hub with serial and parallel adapter - 7720 MCS7720 Dual serial port adapter - 7730 MCS7730 10/100 Mbps Ethernet adapter - 7780 MCS7780 4Mbps Fast IrDA Adapter - 7830 MCS7830 10/100 Mbps Ethernet adapter - 7832 MCS7832 10/100 Mbps Ethernet adapter - 7840 MCS7820/MCS7840 2/4 port serial adapter -99fa Grandtec - 8988 V.cap Camera Device -9ac4 J. Westhues - 4b8f ProxMark-3 RFID Instrument -a128 AnMo Electronics Corp. / Dino-Lite (?) - 0610 Dino-Lite Digital Microscope (SN9C201 + HV7131R) - 0611 Dino-Lite Digital Microscope (SN9C201 + HV7131R) - 0612 Dino-Lite Digital Microscope (SN9C120 + HV7131R) - 0613 Dino-Lite Digital Microscope (SN9C201 + HV7131R) - 0614 Dino-Lite Digital Microscope (SN9C201 + MI1310/MT9M111) - 0615 Dino-Lite Digital Microscope (SN9C201 + MI1310/MT9M111) - 0616 Dino-Lite Digital Microscope (SN9C120 + HV7131R) - 0617 Dino-Lite Digital Microscope (SN9C201 + MI1310/MT9M111) - 0618 Dino-Lite Digital Microscope (SN9C201 + HV7131R) -a168 AnMo Electronics Corporation - 0610 Dino-Lite Digital Microscope - 0611 Dino-Lite Digital Microscope - 0613 Dino-Lite Digital Microscope - 0614 Dino-Lite Pro Digital Microscope - 0615 Dino-Lite Pro Digital Microscope - 0617 Dino-Lite Pro Digital Microscope - 0618 Dino-Lite Digital Microscope -a600 Asix - e110 OK1ZIA Davac 4.x -a727 3Com - 6893 3CRUSB20075 OfficeConnect Wireless 108Mbps 11g Adapter [Atheros AR5523] - 6895 AR5523 - 6897 AR5523 -abcd Unknown - cdee Petcam -c251 Keil Software, Inc. - 2710 ULink -cace CACE Technologies Inc. - 0002 AirPCAP Classic 802.11 packet capture adapter - 0300 AirPcap NX [Atheros AR9001U-(2)NG] -d209 Ultimarc - 0301 I-PAC Arcade Control Interface - 0501 Ultra-Stik Ultimarc Ultra-Stik Player 1 -e4e4 Xorcom Ltd. - 1130 Astribank series - 1131 Astribank series - 1132 Astribank series - 1140 Astribank series - 1141 Astribank series - 1142 Astribank series - 1150 Astribank series - 1151 Astribank series - 1152 Astribank series - 1160 Astribank 2 series - 1161 Astribank 2 series - 1162 Astribank 2 series -eb03 MakingThings - 0920 Make Controller Kit -eb1a eMPIA Technology, Inc. - 17de KWorld V-Stream XPERT DTV - DVB-T USB cold - 17df KWorld V-Stream XPERT DTV - DVB-T USB warm - 2571 M035 Compact Web Cam - 2710 SilverCrest Webcam - 2750 ECS Elitegroup G220 integrated Webcam - 2761 EeePC 701 integrated Webcam - 2776 Combined audio and video input device - 2800 Terratec Cinergy 200 - 2801 GrabBeeX+ Video Encoder - 2863 Video Grabber - 2870 Pinnacle PCTV Stick - 2881 EM2881 Video Controller - 50a3 Gadmei UTV380 TV Box - 50a6 Gadmei UTV330 TV Box - e355 KWorld DVB-T 355U Digital TV Dongle -eb2a KWorld -f003 Hewlett Packard - 6002 PhotoSmart C500 -f4ec Atten Electronics / Siglent Technologies - ee38 Digital Storage Oscilloscope - -# List of known device classes, subclasses and protocols - -# Syntax: -# C class class_name -# subclass subclass_name <-- single tab -# protocol protocol_name <-- two tabs - -C 00 (Defined at Interface level) -C 01 Audio - 01 Control Device - 02 Streaming - 03 MIDI Streaming -C 02 Communications - 01 Direct Line - 02 Abstract (modem) - 00 None - 01 AT-commands (v.25ter) - 02 AT-commands (PCCA101) - 03 AT-commands (PCCA101 + wakeup) - 04 AT-commands (GSM) - 05 AT-commands (3G) - 06 AT-commands (CDMA) - fe Defined by command set descriptor - ff Vendor Specific (MSFT RNDIS?) - 03 Telephone - 04 Multi-Channel - 05 CAPI Control - 06 Ethernet Networking - 07 ATM Networking - 08 Wireless Handset Control - 09 Device Management - 0a Mobile Direct Line - 0b OBEX - 0c Ethernet Emulation - 07 Ethernet Emulation (EEM) -C 03 Human Interface Device - 00 No Subclass - 00 None - 01 Keyboard - 02 Mouse - 01 Boot Interface Subclass - 00 None - 01 Keyboard - 02 Mouse -C 05 Physical Interface Device -C 06 Imaging - 01 Still Image Capture - 01 Picture Transfer Protocol (PIMA 15470) -C 07 Printer - 01 Printer - 00 Reserved/Undefined - 01 Unidirectional - 02 Bidirectional - 03 IEEE 1284.4 compatible bidirectional - ff Vendor Specific -C 08 Mass Storage - 01 RBC (typically Flash) - 00 Control/Bulk/Interrupt - 01 Control/Bulk - 50 Bulk (Zip) - 02 SFF-8020i, MMC-2 (ATAPI) - 03 QIC-157 - 04 Floppy (UFI) - 00 Control/Bulk/Interrupt - 01 Control/Bulk - 50 Bulk (Zip) - 05 SFF-8070i - 06 SCSI - 00 Control/Bulk/Interrupt - 01 Control/Bulk - 50 Bulk (Zip) -C 09 Hub - 00 Unused - 00 Full speed (or root) hub - 01 Single TT - 02 TT per port -C 0a CDC Data - 00 Unused - 30 I.430 ISDN BRI - 31 HDLC - 32 Transparent - 50 Q.921M - 51 Q.921 - 52 Q.921TM - 90 V.42bis - 91 Q.932 EuroISDN - 92 V.120 V.24 rate ISDN - 93 CAPI 2.0 - fd Host Based Driver - fe CDC PUF - ff Vendor specific -C 0b Chip/SmartCard -C 0d Content Security -C 0e Video - 00 Undefined - 01 Video Control - 02 Video Streaming - 03 Video Interface Collection -C 58 Xbox - 42 Controller -C dc Diagnostic - 01 Reprogrammable Diagnostics - 01 USB2 Compliance -C e0 Wireless - 01 Radio Frequency - 01 Bluetooth - 02 Ultra WideBand Radio Control - 03 RNDIS - 02 Wireless USB Wire Adapter - 01 Host Wire Adapter Control/Data Streaming - 02 Device Wire Adapter Control/Data Streaming - 03 Device Wire Adapter Isochronous Streaming -C ef Miscellaneous Device - 01 ? - 01 Microsoft ActiveSync - 02 Palm Sync - 02 ? - 01 Interface Association - 02 Wire Adapter Multifunction Peripheral - 03 ? - 01 Cable Based Association -C fe Application Specific Interface - 01 Device Firmware Update - 02 IRDA Bridge - 03 Test and Measurement - 01 TMC - 02 USB488 -C ff Vendor Specific Class - ff Vendor Specific Subclass - ff Vendor Specific Protocol - -# List of Audio Class Terminal Types - -# Syntax: -# AT terminal_type terminal_type_name - -AT 0100 USB Undefined -AT 0101 USB Streaming -AT 01ff USB Vendor Specific -AT 0200 Input Undefined -AT 0201 Microphone -AT 0202 Desktop Microphone -AT 0203 Personal Microphone -AT 0204 Omni-directional Microphone -AT 0205 Microphone Array -AT 0206 Processing Microphone Array -AT 0300 Output Undefined -AT 0301 Speaker -AT 0302 Headphones -AT 0303 Head Mounted Display Audio -AT 0304 Desktop Speaker -AT 0305 Room Speaker -AT 0306 Communication Speaker -AT 0307 Low Frequency Effects Speaker -AT 0400 Bidirectional Undefined -AT 0401 Handset -AT 0402 Headset -AT 0403 Speakerphone, no echo reduction -AT 0404 Echo-suppressing speakerphone -AT 0405 Echo-canceling speakerphone -AT 0500 Telephony Undefined -AT 0501 Phone line -AT 0502 Telephone -AT 0503 Down Line Phone -AT 0600 External Undefined -AT 0601 Analog Connector -AT 0602 Digital Audio Interface -AT 0603 Line Connector -AT 0604 Legacy Audio Connector -AT 0605 SPDIF interface -AT 0606 1394 DA stream -AT 0607 1394 DV stream soundtrack -AT 0700 Embedded Undefined -AT 0701 Level Calibration Noise Source -AT 0702 Equalization Noise -AT 0703 CD Player -AT 0704 DAT -AT 0705 DCC -AT 0706 MiniDisc -AT 0707 Analog Tape -AT 0708 Phonograph -AT 0709 VCR Audio -AT 070a Video Disc Audio -AT 070b DVD Audio -AT 070c TV Tuner Audio -AT 070d Satellite Receiver Audio -AT 070e Cable Tuner Audio -AT 070f DSS Audio -AT 0710 Radio Receiver -AT 0711 Radio Transmitter -AT 0712 Multitrack Recorder -AT 0713 Synthesizer - -# List of HID Descriptor Types - -# Syntax: -# HID descriptor_type descriptor_type_name - -HID 21 HID -HID 22 Report -HID 23 Physical - -# List of HID Descriptor Item Types -# Note: 2 bits LSB encode data length following - -# Syntax: -# R item_type item_type_name - -R 04 Usage Page -R 08 Usage -R 14 Logical Minimum -R 18 Usage Minimum -R 24 Logical Maximum -R 28 Usage Maximum -R 34 Physical Minimum -R 38 Designator Index -R 44 Physical Maximum -R 48 Designator Minimum -R 54 Unit Exponent -R 58 Designator Maximum -R 64 Unit -R 74 Report Size -R 78 String Index -R 80 Input -R 84 Report ID -R 88 String Minimum -R 90 Output -R 94 Report Count -R 98 String Maximum -R a0 Collection -R a4 Push -R a8 Delimiter -R b0 Feature -R b4 Pop -R c0 End Collection - -# List of Physical Descriptor Bias Types - -# Syntax: -# BIAS item_type item_type_name - -BIAS 0 Not Applicable -BIAS 1 Right Hand -BIAS 2 Left Hand -BIAS 3 Both Hands -BIAS 4 Either Hand - -# List of Physical Descriptor Item Types - -# Syntax: -# PHY item_type item_type_name - -PHY 00 None -PHY 01 Hand -PHY 02 Eyeball -PHY 03 Eyebrow -PHY 04 Eyelid -PHY 05 Ear -PHY 06 Nose -PHY 07 Mouth -PHY 08 Upper Lip -PHY 09 Lower Lip -PHY 0a Jaw -PHY 0b Neck -PHY 0c Upper Arm -PHY 0d Elbow -PHY 0e Forearm -PHY 0f Wrist -PHY 10 Palm -PHY 11 Thumb -PHY 12 Index Finger -PHY 13 Middle Finger -PHY 14 Ring Finger -PHY 15 Little Finger -PHY 16 Head -PHY 17 Shoulder -PHY 18 Hip -PHY 19 Waist -PHY 1a Thigh -PHY 1b Knee -PHY 1c calf -PHY 1d Ankle -PHY 1e Foot -PHY 1f Heel -PHY 20 Ball of Foot -PHY 21 Big Toe -PHY 22 Second Toe -PHY 23 Third Toe -PHY 24 Fourth Toe -PHY 25 Fifth Toe -PHY 26 Brow -PHY 27 Cheek - -# List of HID Usages - -# Syntax: -# HUT hi _usage_page hid_usage_page_name -# hid_usage hid_usage_name - -HUT 00 Undefined -HUT 01 Generic Desktop Controls - 000 Undefined - 001 Pointer - 002 Mouse - 004 Joystick - 005 Gamepad - 006 Keyboard - 007 Keypad - 008 Multi-Axis Controller - 030 Direction-X - 031 Direction-Y - 032 Direction-Z - 033 Rotate-X - 034 Rotate-Y - 035 Rotate-Z - 036 Slider - 037 Dial - 038 Wheel - 039 Hat Switch - 03a Counted Buffer - 03b Byte Count - 03c Motion Wakeup - 03d Start - 03e Select - 040 Vector-X - 041 Vector-Y - 042 Vector-Z - 043 Vector-X relative Body - 044 Vector-Y relative Body - 045 Vector-Z relative Body - 046 Vector - 080 System Control - 081 System Power Down - 082 System Sleep - 083 System Wake Up - 084 System Context Menu - 085 System Main Menu - 086 System App Menu - 087 System Menu Help - 088 System Menu Exit - 089 System Menu Select - 08a System Menu Right - 08b System Menu Left - 08c System Menu Up - 08d System Menu Down - 090 Direction Pad Up - 091 Direction Pad Down - 092 Direction Pad Right - 093 Direction Pad Left -HUT 02 Simulation Controls - 000 Undefined - 001 Flight Simulation Device - 002 Automobile Simulation Device - 003 Tank Simulation Device - 004 Spaceship Simulation Device - 005 Submarine Simulation Device - 006 Sailing Simulation Device - 007 Motorcycle Simulation Device - 008 Sports Simulation Device - 009 Airplane Simualtion Device - 00a Helicopter Simulation Device - 00b Magic Carpet Simulation Device - 00c Bicycle Simulation Device - 020 Flight Control Stick - 021 Flight Stick - 022 Cyclic Control - 023 Cyclic Trim - 024 Flight Yoke - 025 Track Control - 0b0 Aileron - 0b1 Aileron Trim - 0b2 Anti-Torque Control - 0b3 Autopilot Enable - 0b4 Chaff Release - 0b5 Collective Control - 0b6 Dive Break - 0b7 Electronic Countermeasures - 0b8 Elevator - 0b9 Elevator Trim - 0ba Rudder - 0bb Throttle - 0bc Flight COmmunications - 0bd Flare Release - 0be Landing Gear - 0bf Toe Break - 0c0 Trigger - 0c1 Weapon Arm - 0c2 Weapons Select - 0c3 Wing Flaps - 0c4 Accelerator - 0c5 Brake - 0c6 Clutch - 0c7 Shifter - 0c8 Steering - 0c9 Turret Direction - 0ca Barrel Elevation - 0cb Drive Plane - 0cc Ballast - 0cd Bicylce Crank - 0ce Handle Bars - 0cf Front Brake - 0d0 Rear Brake -HUT 03 VR Controls - 000 Unidentified - 001 Belt - 002 Body Suit - 003 Flexor - 004 Glove - 005 Head Tracker - 006 Head Mounted Display - 007 Hand Tracker - 008 Oculometer - 009 Vest - 00a Animatronic Device - 020 Stereo Enable - 021 Display Enable -HUT 04 Sport Controls - 000 Unidentified - 001 Baseball Bat - 002 Golf Club - 003 Rowing Machine - 004 Treadmill - 030 Oar - 031 Slope - 032 Rate - 033 Stick Speed - 034 Stick Face Angle - 035 Stick Heel/Toe - 036 Stick Follow Through - 038 Stick Type - 039 Stick Height - 047 Stick Temp - 050 Putter - 051 1 Iron - 052 2 Iron - 053 3 Iron - 054 4 Iron - 055 5 Iron - 056 6 Iron - 057 7 Iron - 058 8 Iron - 059 9 Iron - 05a 10 Iron - 05b 11 Iron - 05c Sand Wedge - 05d Loft Wedge - 05e Power Wedge - 05f 1 Wood - 060 3 Wood - 061 5 Wood - 062 7 Wood - 063 9 Wood -HUT 05 Game Controls - 000 Undefined - 001 3D Game Controller - 002 Pinball Device - 003 Gun Device - 020 Point Of View - 021 Turn Right/Left - 022 Pitch Right/Left - 023 Roll Forward/Backward - 024 Move Right/Left - 025 Move Forward/Backward - 026 Move Up/Down - 027 Lean Right/Left - 028 Lean Forward/Backward - 029 Height of POV - 02a Flipper - 02b Secondary Flipper - 02c Bump - 02d New Game - 02e Shoot Ball - 02f Player - 030 Gun Bolt - 031 Gun Clip - 032 Gun Selector - 033 Gun Single Shot - 034 Gun Burst - 035 Gun Automatic - 036 Gun Safety - 037 Gamepad Fire/Jump - 038 Gamepad Fun - 039 Gamepad Trigger -HUT 07 Keyboard - 000 No Event - 001 Keyboard ErrorRollOver - 002 Keyboard POSTfail - 003 Keyboard Error Undefined - 004 A - 005 B - 006 C - 007 D - 008 E - 009 F - 00a G - 00b H - 00c I - 00d J - 00e K - 00f L - 010 M - 011 N - 012 O - 013 P - 014 Q - 015 R - 016 S - 017 T - 018 U - 019 V - 01a W - 01b X - 01c Y - 01d Z - 01e 1 and ! (One and Exclamation) - 01f 2 and @ (2 and at) - 020 3 and # (3 and Hash) - 021 4 and $ (4 and Dollar Sign) - 022 5 and % (5 and Percent Sign) - 023 6 and ^ (6 and circumflex) - 024 7 and & (Seven and Ampersand) - 025 8 and * (Eight and asterisk) - 026 9 and ( (Nine and Parenthesis Left) - 027 0 and ) (Zero and Parenthesis Right) - 028 Return (Enter) - 029 Escape - 02a Delete (Backspace) - 02b Tab - 02c Space Bar - 02d - and _ (Minus and underscore) - 02e = and + (Equal and Plus) - 02f [ and { (Bracket and Braces Left) - 030 ] and } (Bracket and Braces Right) - 031 \ and | (Backslash and Bar) - 032 # and ~ (Hash and Tilde, Non-US Keyboard near right shift) - 033 ; and : (Semicolon and Colon) - 034 ´ and " (Accent Acute and Double Quotes) - 035 ` and ~ (Accent Grace and Tilde) - 036 , and < (Comma and Less) - 037 . and > (Period and Greater) - 038 / and ? (Slash and Question Mark) - 039 Caps Lock - 03a F1 - 03b F2 - 03c F3 - 03d F4 - 03e F5 - 03f F6 - 040 F7 - 041 F8 - 042 F9 - 043 F10 - 044 F11 - 045 F12 - 046 Print Screen - 047 Scroll Lock - 048 Pause - 049 Insert - 04a Home - 04b Page Up - 04c Delete Forward (without Changing Position) - 04d End - 04e Page Down - 04f Right Arrow - 050 Left Arrow - 051 Down Arrow - 052 Up Arrow - 053 Num Lock and Clear - 054 Keypad / (Division Sign) - 055 Keypad * (Multiplication Sign) - 056 Keypad - (Subtraction Sign) - 057 Keypad + (Addition Sign) - 058 Keypad Enter - 059 Keypad 1 and END - 05a Keypad 2 and Down Arrow - 05b Keypad 3 and Page Down - 05c Keypad 4 and Left Arrow - 05d Keypad 5 (Tactilei Raised) - 05f Keypad 6 and Right Arrow - 060 Keypad 7 and Home - 061 Keypad 8 and Up Arrow - 062 Keypad 8 and Page Up - 063 Keypad . (decimal delimiter) and Delete - 064 \ and | (Backslash and Bar, UK and Non-US Keyboard near left shift) - 065 Keyboard Application (Windows Key for Win95 or Compose) - 066 Power (not a key) - 067 Keypad = (Equal Sign) - 068 F13 - 069 F14 - 06a F15 - 06b F16 - 06c F17 - 06d F18 - 06e F19 - 06f F20 - 070 F21 - 071 F22 - 072 F23 - 073 F24 - 074 Execute - 075 Help - 076 Menu - 077 Select - 078 Stop - 079 Again - 07a Undo - 07b Cut - 07c Copy - 07d Paste - 07e Find - 07f Mute - 080 Volume Up - 081 Volume Down - 082 Locking Caps Lock - 083 Locking Num Lock - 084 Locking Scroll Lock - 085 Keypad Comma - 086 Keypad Equal Sign (AS/400) - 087 International 1 (PC98) - 088 International 2 (PC98) - 089 International 3 (PC98) - 08a International 4 (PC98) - 08b International 5 (PC98) - 08c International 6 (PC98) - 08d International 7 (Toggle Single/Double Byte Mode) - 08e International 8 - 08f International 9 - 090 LANG 1 (Hangul/English Toggle, Korea) - 091 LANG 2 (Hanja Conversion, Korea) - 092 LANG 3 (Katakana, Japan) - 093 LANG 4 (Hiragana, Japan) - 094 LANG 5 (Zenkaku/Hankaku, Japan) - 095 LANG 6 - 096 LANG 7 - 097 LANG 8 - 098 LANG 9 - 099 Alternate Erase - 09a SysReq/Attention - 09b Cancel - 09c Clear - 09d Prior - 09e Return - 09f Separator - 0a0 Out - 0a1 Open - 0a2 Clear/Again - 0a3 CrSel/Props - 0a4 ExSel - 0e0 Control Left - 0e1 Shift Left - 0e2 Alt Left - 0e3 GUI Left - 0e4 Control Right - 0e5 Shift Right - 0e6 Alt Rigth - 0e7 GUI Right -HUT 08 LEDs - 000 Undefined - 001 NumLock - 002 CapsLock - 003 Scroll Lock - 004 Compose - 005 Kana - 006 Power - 007 Shift - 008 Do not disturb - 009 Mute - 00a Tone Enabke - 00b High Cut Filter - 00c Low Cut Filter - 00d Equalizer Enable - 00e Sound Field ON - 00f Surround On - 010 Repeat - 011 Stereo - 012 Sampling Rate Detect - 013 Spinning - 014 CAV - 015 CLV - 016 Recording Format Detect - 017 Off-Hook - 018 Ring - 019 Message Waiting - 01a Data Mode - 01b Battery Operation - 01c Battery OK - 01d Battery Low - 01e Speaker - 01f Head Set - 020 Hold - 021 Microphone - 022 Coverage - 023 Night Mode - 024 Send Calls - 025 Call Pickup - 026 Conference - 027 Stand-by - 028 Camera On - 029 Camera Off - 02a On-Line - 02b Off-Line - 02c Busy - 02d Ready - 02e Paper-Out - 02f Paper-Jam - 030 Remote - 031 Forward - 032 Reverse - 033 Stop - 034 Rewind - 035 Fast Forward - 036 Play - 037 Pause - 038 Record - 039 Error - 03a Usage Selected Indicator - 03b Usage In Use Indicator - 03c Usage Multi Indicator - 03d Indicator On - 03e Indicator Flash - 03f Indicator Slow Blink - 040 Indicator Fast Blink - 041 Indicator Off - 042 Flash On Time - 043 Slow Blink On Time - 044 Slow Blink Off Time - 045 Fast Blink On Time - 046 Fast Blink Off Time - 047 Usage Color Indicator - 048 Indicator Red - 049 Indicator Green - 04a Indicator Amber - 04b Generic Indicator - 04c System Suspend - 04d External Power Connected -HUT 09 Buttons - 000 No Button Pressed - 001 Button 1 (Primary) - 002 Button 2 (Secondary) - 003 Button 3 (Tertiary) - 004 Button 4 - 005 Button 5 -HUT 0a Ordinal - 001 Instance 1 - 002 Instance 2 - 003 Instance 3 -HUT 0b Telephony - 000 Unassigned - 001 Phone - 002 Answering Machine - 003 Message Controls - 004 Handset - 005 Headset - 006 Telephony Key Pad - 007 Programmable Button - 020 Hook Switch - 021 Flash - 022 Feature - 023 Hold - 024 Redial - 025 Transfer - 026 Drop - 027 Park - 028 Forward Calls - 029 Alternate Function - 02a Line - 02b Speaker Phone - 02c Conference - 02d Ring Enable - 02e Ring Select - 02f Phone Mute - 030 Caller ID - 050 Speed Dial - 051 Store Number - 052 Recall Number - 053 Phone Directory - 070 Voice Mail - 071 Screen Calls - 072 Do Not Disturb - 073 Message - 074 Answer On/Offf - 090 Inside Dial Tone - 091 Outside Dial Tone - 092 Inside Ring Tone - 093 Outside Ring Tone - 094 Priority Ring Tone - 095 Inside Ringback - 096 Priority Ringback - 097 Line Busy Tone - 098 Recorder Tone - 099 Call Waiting Tone - 09a Confirmation Tone 1 - 09b Confirmation Tone 2 - 09c Tones Off - 09d Outside Ringback - 0b0 Key 1 - 0b1 Key 2 - 0b3 Key 3 - 0b4 Key 4 - 0b5 Key 5 - 0b6 Key 6 - 0b7 Key 7 - 0b8 Key 8 - 0b9 Key 9 - 0ba Key Star - 0bb Key Pound - 0bc Key A - 0bd Key B - 0be Key C - 0bf Key D -HUT 0c Consumer - 000 Unassigned - 001 Consumer Control - 002 Numeric Key Pad - 003 Programmable Buttons - 020 +10 - 021 +100 - 022 AM/PM - 030 Power - 031 Reset - 032 Sleep - 033 Sleep After - 034 Sleep Mode - 035 Illumination - 036 Function Buttons - 040 Menu - 041 Menu Pick - 042 Menu Up - 043 Menu Down - 044 Menu Left - 045 Menu Right - 046 Menu Escape - 047 Menu Value Increase - 048 Menu Value Decrease - 060 Data on Screen - 061 Closed Caption - 062 Closed Caption Select - 063 VCR/TV - 064 Broadcast Mode - 065 Snapshot - 066 Still - 080 Selection - 081 Assign Selection - 082 Mode Step - 083 Recall Last - 084 Enter Channel - 085 Order Movie - 086 Channel - 087 Media Selection - 088 Media Select Computer - 089 Media Select TV - 08a Media Select WWW - 08b Media Select DVD - 08c Media Select Telephone - 08d Media Select Program Guide - 08e Media Select Video Phone - 08f Media Select Games - 090 Media Select Messages - 091 Media Select CD - 092 Media Select VCR - 093 Media Select Tuner - 094 Quit - 095 Help - 096 Media Select Tape - 097 Media Select Cable - 098 Media Select Satellite - 099 Media Select Security - 09a Media Select Home - 09b Media Select Call - 09c Channel Increment - 09d Channel Decrement - 09e Media Select SAP - 0a0 VCR Plus - 0a1 Once - 0a2 Daily - 0a3 Weekly - 0a4 Monthly - 0b0 Play - 0b1 Pause - 0b2 Record - 0b3 Fast Forward - 0b4 Rewind - 0b5 Scan Next Track - 0b6 Scan Previous Track - 0b7 Stop - 0b8 Eject - 0b9 Random Play - 0ba Select Disc - 0bb Enter Disc - 0bc Repeat - 0bd Tracking - 0be Track Normal - 0bf Slow Tracking - 0c0 Frame Forward - 0c1 Frame Back - 0c2 Mark - 0c3 Clear Mark - 0c4 Repeat from Mark - 0c5 Return to Mark - 0c6 Search Mark Forward - 0c7 Search Mark Backward - 0c8 Counter Reset - 0c9 Show Counter - 0ca Tracking Increment - 0cb Tracking Decrement - 0cc Stop/Eject - 0cd Play/Pause - 0ce Play/Skip - 0e0 Volume - 0e1 Balance - 0e2 Mute - 0e3 Bass - 0e4 Treble - 0e5 Bass Boost - 0e6 Surround Mode - 0e7 Loudness - 0e8 MPX - 0e9 Volume Increment - 0ea Volume Decrement - 0f0 Speed Select - 0f1 Playback Speed - 0f2 Standard Play - 0f3 Long Play - 0f4 Extended Play - 0f5 Slow - 100 Fan Enable - 101 Fan Speed - 102 Light Enable - 103 Light Illumination Level - 104 Climate Control Enable - 105 Room Temperature - 106 Security Enable - 107 Fire Alarm - 108 Police Alarm - 150 Balance Right - 151 Balance Left - 152 Bass Increment - 153 Bass Decrement - 154 Treble Increment - 155 Treble Decrement - 160 Speaker System - 161 Channel Left - 162 Channel Right - 163 Channel Center - 164 Channel Front - 165 Channel Center Front - 166 Channel Side - 167 Channel Surround - 168 Channel Low Frequency Enhancement - 169 Channel Top - 16a Channel Unknown - 170 Sub-Channel - 171 Sub-Channel Increment - 172 Sub-Channel Decrement - 173 Alternative Audio Increment - 174 Alternative Audio Decrement - 180 Application Launch Buttons - 181 AL Launch Button Configuration Tool - 182 AL Launch Button Configuration - 183 AL Consumer Control Configuration - 184 AL Word Processor - 185 AL Text Editor - 186 AL Spreadsheet - 187 AL Graphics Editor - 188 AL Presentation App - 189 AL Database App - 18a AL Email Reader - 18b AL Newsreader - 18c AL Voicemail - 18d AL Contacts/Address Book - 18e AL Calendar/Schedule - 18f AL Task/Project Manager - 190 AL Log/Jounal/Timecard - 191 AL Checkbook/Finance - 192 AL Calculator - 193 AL A/V Capture/Playback - 194 AL Local Machine Browser - 195 AL LAN/Wan Browser - 196 AL Internet Browser - 197 AL Remote Networking/ISP Connect - 198 AL Network Conference - 199 AL Network Chat - 19a AL Telephony/Dialer - 19b AL Logon - 19c AL Logoff - 19d AL Logon/Logoff - 19e AL Terminal Local/Screensaver - 19f AL Control Panel - 1a0 AL Command Line Processor/Run - 1a1 AL Process/Task Manager - 1a2 AL Select Task/Application - 1a3 AL Next Task/Application - 1a4 AL Previous Task/Application - 1a5 AL Preemptive Halt Task/Application - 200 Generic GUI Application Controls - 201 AC New - 202 AC Open - 203 AC CLose - 204 AC Exit - 205 AC Maximize - 206 AC Minimize - 207 AC Save - 208 AC Print - 209 AC Properties - 21a AC Undo - 21b AC Copy - 21c AC Cut - 21d AC Paste - 21e AC Select All - 21f AC Find - 220 AC Find and Replace - 221 AC Search - 222 AC Go To - 223 AC Home - 224 AC Back - 225 AC Forward - 226 AC Stop - 227 AC Refresh - 228 AC Previous Link - 229 AC Next Link - 22b AC History - 22c AC Subscriptions - 22d AC Zoom In - 22e AC Zoom Out - 22f AC Zoom - 230 AC Full Screen View - 231 AC Normal View - 232 AC View Toggle - 233 AC Scroll Up - 234 AC Scroll Down - 235 AC Scroll - 236 AC Pan Left - 237 AC Pan Right - 238 AC Pan - 239 AC New Window - 23a AC Tile Horizontally - 23b AC Tile Vertically - 23c AC Format -HUT 0d Digitizer - 000 Undefined - 001 Digitizer - 002 Pen - 003 Light Pen - 004 Touch Screen - 005 Touch Pad - 006 White Board - 007 Coordinate Measuring Machine - 008 3D Digitizer - 009 Stereo Plotter - 00a Articulated Arm - 00b Armature - 00c Multiple Point Digitizer - 00d Free Space Wand - 020 Stylus - 021 Puck - 022 Finger - 030 Tip Pressure - 031 Barrel Pressure - 032 In Range - 033 Touch - 034 Untouch - 035 Tap - 036 Quality - 037 Data Valid - 038 Transducer Index - 039 Tablet Function Keys - 03a Program Change Keys - 03b Battery Strength - 03c Invert - 03d X Tilt - 03e Y Tilt - 03f Azimuth - 040 Altitude - 041 Twist - 042 Tip Switch - 043 Secondary Tip Switch - 044 Barrel Switch - 045 Eraser - 046 Tablet Pick - 047 Confidence - 048 Width - 049 Height - 051 Contact ID - 052 Input Mode - 053 Device Index - 054 Contact Count - 055 Maximum Contact Number -HUT 0f PID Page - 000 Undefined - 001 Physical Interface Device - 020 Normal - 021 Set Effect Report - 022 Effect Block Index - 023 Parameter Block Offset - 024 ROM Flag - 025 Effect Type - 026 ET Constant Force - 027 ET Ramp - 028 ET Custom Force Data - 030 ET Square - 031 ET Sine - 032 ET Triangle - 033 ET Sawtooth Up - 034 ET Sawtooth Down - 040 ET Spring - 041 ET Damper - 042 ET Inertia - 043 ET Friction - 050 Duration - 051 Sample Period - 052 Gain - 053 Trigger Button - 054 Trigger Repeat Interval - 055 Axes Enable - 056 Direction Enable - 057 Direction - 058 Type Specific Block Offset - 059 Block Type - 05A Set Envelope Report - 05B Attack Level - 05C Attack Time - 05D Fade Level - 05E Fade Time - 05F Set Condition Report - 060 CP Offset - 061 Positive Coefficient - 062 Negative Coefficient - 063 Positive Saturation - 064 Negative Saturation - 065 Dead Band - 066 Download Force Sample - 067 Isoch Custom Force Enable - 068 Custom Force Data Report - 069 Custom Force Data - 06A Custom Force Vendor Defined Data - 06B Set Custom Force Report - 06C Custom Force Data Offset - 06D Sample Count - 06E Set Periodic Report - 06F Offset - 070 Magnitude - 071 Phase - 072 Period - 073 Set Constant Force Report - 074 Set Ramp Force Report - 075 Ramp Start - 076 Ramp End - 077 Effect Operation Report - 078 Effect Operation - 079 Op Effect Start - 07A Op Effect Start Solo - 07B Op Effect Stop - 07C Loop Count - 07D Device Gain Report - 07E Device Gain - 07F PID Pool Report - 080 RAM Pool Size - 081 ROM Pool Size - 082 ROM Effect Block Count - 083 Simultaneous Effects Max - 084 Pool Alignment - 085 PID Pool Move Report - 086 Move Source - 087 Move Destination - 088 Move Length - 089 PID Block Load Report - 08B Block Load Status - 08C Block Load Success - 08D Block Load Full - 08E Block Load Error - 08F Block Handle - 090 PID Block Free Report - 091 Type Specific Block Handle - 092 PID State Report - 094 Effect Playing - 095 PID Device Control Report - 096 PID Device Control - 097 DC Enable Actuators - 098 DC Disable Actuators - 099 DC Stop All Effects - 09A DC Device Reset - 09B DC Device Pause - 09C DC Device Continue - 09F Device Paused - 0A0 Actuators Enabled - 0A4 Safety Switch - 0A5 Actuator Override Switch - 0A6 Actuator Power - 0A7 Start Delay - 0A8 Parameter Block Size - 0A9 Device Managed Pool - 0AA Shared Parameter Blocks - 0AB Create New Effect Report - 0AC RAM Pool Available -HUT 10 Unicode -HUT 14 Alphanumeric Display - 000 Undefined - 001 Alphanumeric Display - 020 Display Attributes Report - 021 ASCII Character Set - 022 Data Read Back - 023 Font Read Back - 024 Display Control Report - 025 Clear Display - 026 Display Enable - 027 Screen Saver Delay - 028 Screen Saver Enable - 029 Vertical Scroll - 02a Horizontal Scroll - 02b Character Report - 02c Display Data - 02d Display Status - 02e Stat Not Ready - 02f Stat Ready - 030 Err Not a loadable Character - 031 Err Font Data Cannot Be Read - 032 Cursur Position Report - 033 Row - 034 Column - 035 Rows - 036 Columns - 037 Cursor Pixel Positioning - 038 Cursor Mode - 039 Cursor Enable - 03a Cursor Blink - 03b Font Report - 03c Font Data - 03d Character Width - 03e Character Height - 03f Character Spacing Horizontal - 040 Character Spacing Vertical - 041 Unicode Character Set -HUT 80 USB Monitor - 001 Monitor Control - 002 EDID Information - 003 VDIF Information - 004 VESA Version -HUT 81 USB Monitor Enumerated Values -HUT 82 Monitor VESA Virtual Controls - 001 Degauss - 010 Brightness - 012 Contrast - 016 Red Video Gain - 018 Green Video Gain - 01a Blue Video Gain - 01c Focus - 020 Horizontal Position - 022 Horizontal Size - 024 Horizontal Pincushion - 026 Horizontal Pincushion Balance - 028 Horizontal Misconvergence - 02a Horizontal Linearity - 02c Horizontal Linearity Balance - 030 Vertical Position - 032 Vertical Size - 034 Vertical Pincushion - 036 Vertical Pincushion Balance - 038 Vertical Misconvergence - 03a Vertical Linearity - 03c Vertical Linearity Balance - 040 Parallelogram Balance (Key Distortion) - 042 Trapezoidal Distortion (Key) - 044 Tilt (Rotation) - 046 Top Corner Distortion Control - 048 Top Corner Distortion Balance - 04a Bottom Corner Distortion Control - 04c Bottom Corner Distortion Balance - 056 Horizontal Moire - 058 Vertical Moire - 05e Input Level Select - 060 Input Source Select - 06c Red Video Black Level - 06e Green Video Black Level - 070 Blue Video Black Level - 0a2 Auto Size Center - 0a4 Polarity Horizontal Sychronization - 0a6 Polarity Vertical Synchronization - 0aa Screen Orientation - 0ac Horizontal Frequency in Hz - 0ae Vertical Frequency in 0.1 Hz - 0b0 Settings - 0ca On Screen Display (OSD) - 0d4 Stereo Mode -HUT 84 Power Device Page - 000 Undefined - 001 iName - 002 Present Status - 003 Changed Status - 004 UPS - 005 Power Supply - 010 Battery System - 011 Battery System ID - 012 Battery - 013 Battery ID - 014 Charger - 015 Charger ID - 016 Power Converter - 017 Power Converter ID - 018 Outlet System - 019 Outlet System ID - 01a Input - 01b Input ID - 01c Output - 01d Output ID - 01e Flow - 01f Flow ID - 020 Outlet - 021 Outlet ID - 022 Gang - 023 Gang ID - 024 Power Summary - 025 Power Summary ID - 030 Voltage - 031 Current - 032 Frequency - 033 Apparent Power - 034 Active Power - 035 Percent Load - 036 Temperature - 037 Humidity - 038 Bad Count - 040 Config Voltage - 041 Config Current - 042 Config Frequency - 043 Config Apparent Power - 044 Config Active Power - 045 Config Percent Load - 046 Config Temperature - 047 Config Humidity - 050 Switch On Control - 051 Switch Off Control - 052 Toggle Control - 053 Low Voltage Transfer - 054 High Voltage Transfer - 055 Delay Before Reboot - 056 Delay Before Startup - 057 Delay Before Shutdown - 058 Test - 059 Module Reset - 05a Audible Alarm Control - 060 Present - 061 Good - 062 Internal Failure - 063 Voltage out of range - 064 Frequency out of range - 065 Overload - 066 Over Charged - 067 Over Temperature - 068 Shutdown Requested - 069 Shutdown Imminent - 06a Reserved - 06b Switch On/Off - 06c Switchable - 06d Used - 06e Boost - 06f Buck - 070 Initialized - 071 Tested - 072 Awaiting Power - 073 Communication Lost - 0fd iManufacturer - 0fe iProduct - 0ff iSerialNumber -HUT 85 Battery System Page - 000 Undefined - 001 SMB Battery Mode - 002 SMB Battery Status - 003 SMB Alarm Warning - 004 SMB Charger Mode - 005 SMB Charger Status - 006 SMB Charger Spec Info - 007 SMB Selector State - 008 SMB Selector Presets - 009 SMB Selector Info - 010 Optional Mfg. Function 1 - 011 Optional Mfg. Function 2 - 012 Optional Mfg. Function 3 - 013 Optional Mfg. Function 4 - 014 Optional Mfg. Function 5 - 015 Connection to SMBus - 016 Output Connection - 017 Charger Connection - 018 Battery Insertion - 019 Use Next - 01a OK to use - 01b Battery Supported - 01c SelectorRevision - 01d Charging Indicator - 028 Manufacturer Access - 029 Remaining Capacity Limit - 02a Remaining Time Limit - 02b At Rate - 02c Capacity Mode - 02d Broadcast To Charger - 02e Primary Battery - 02f Charge Controller - 040 Terminate Charge - 041 Terminate Discharge - 042 Below Remaining Capacity Limit - 043 Remaining Time Limit Expired - 044 Charging - 045 Discharging - 046 Fully Charged - 047 Fully Discharged - 048 Conditioning Flag - 049 At Rate OK - 04a SMB Error Code - 04b Need Replacement - 060 At Rate Time To Full - 061 At Rate Time To Empty - 062 Average Current - 063 Max Error - 064 Relative State Of Charge - 065 Absolute State Of Charge - 066 Remaining Capacity - 067 Full Charge Capacity - 068 Run Time To Empty - 069 Average Time To Empty - 06a Average Time To Full - 06b Cycle Count - 080 Batt. Pack Model Level - 081 Internal Charge Controller - 082 Primary Battery Support - 083 Design Capacity - 084 Specification Info - 085 Manufacturer Date - 086 Serial Number - 087 iManufacturerName - 088 iDeviceName - 089 iDeviceChemistry - 08a Manufacturer Data - 08b Rechargeable - 08c Warning Capacity Limit - 08d Capacity Granularity 1 - 08e Capacity Granularity 2 - 08f iOEMInformation - 0c0 Inhibit Charge - 0c1 Enable Polling - 0c2 Reset To Zero - 0d0 AC Present - 0d1 Battery Present - 0d2 Power Fail - 0d3 Alarm Inhibited - 0d4 Thermistor Under Range - 0d5 Thermistor Hot - 0d6 Thermistor Cold - 0d7 Thermistor Over Range - 0d8 Voltage Out Of Range - 0d9 Current Out Of Range - 0da Current Not Regulated - 0db Voltage Not Regulated - 0dc Master Mode - 0f0 Charger Selector Support - 0f1 Charger Spec - 0f2 Level 2 - 0f3 Level 3 -HUT 86 Power Pages -HUT 87 Power Pages -HUT 8c Bar Code Scanner Page (POS) -HUT 8d Scale Page (POS) -HUT 90 Camera Control Page -HUT 91 Arcade Control Page -HUT f0 Cash Device - 0f1 Cash Drawer - 0f2 Cash Drawer Number - 0f3 Cash Drawer Set - 0f4 Cash Drawer Status -HUT ff Vendor Specific - -# List of Languages - -# Syntax: -# L language_id language_name -# dialect_id dialect_name - -L 0001 Arabic - 01 Saudi Arabia - 02 Iraq - 03 Egypt - 04 Libya - 05 Algeria - 06 Morocco - 07 Tunesia - 08 Oman - 09 Yemen - 0a Syria - 0b Jordan - 0c Lebanon - 0d Kuwait - 0e U.A.E - 0f Bahrain - 10 Qatar -L 0002 Bulgarian -L 0003 Catalan -L 0004 Chinese - 01 Traditional - 02 Simplified - 03 Hongkong SAR, PRC - 04 Singapore - 05 Macau SAR -L 0005 Czech -L 0006 Danish -L 0007 German - 01 German - 02 Swiss - 03 Austrian - 04 Luxembourg - 05 Liechtenstein -L 0008 Greek -L 0009 English - 01 US - 02 UK - 03 Australian - 04 Canadian - 05 New Zealand - 06 Ireland - 07 South Africa - 08 Jamaica - 09 Carribean - 0a Belize - 0b Trinidad - 0c Zimbabwe - 0d Philippines -L 000a Spanish - 01 Castilian - 02 Mexican - 03 Modern - 04 Guatemala - 05 Costa Rica - 06 Panama - 07 Dominican Republic - 08 Venzuela - 09 Colombia - 0a Peru - 0b Argentina - 0c Ecuador - 0d Chile - 0e Uruguay - 0f Paraguay - 10 Bolivia - 11 El Salvador - 12 Honduras - 13 Nicaragua - 14 Puerto Rico -L 000b Finnish -L 000c French - 01 French - 02 Belgian - 03 Canadian - 04 Swiss - 05 Luxembourg - 06 Monaco -L 000d Hebrew -L 000e Hungarian -L 000f Idelandic -L 0010 Italian - 01 Italian - 02 Swiss -L 0011 Japanese -L 0012 Korean - 01 Korean -L 0013 Dutch - 01 Dutch - 02 Belgian -L 0014 Norwegian - 01 Bokmal - 02 Nynorsk -L 0015 Polish -L 0016 Portuguese - 01 Portuguese - 02 Brazilian -L 0017 forgotten -L 0018 Romanian -L 0019 Russian -L 001a Serbian - 01 Croatian - 02 Latin - 03 Cyrillic -L 001b Slovak -L 001c Albanian -L 001d Swedish - 01 Swedish - 02 Finland -L 001e Thai -L 001f Turkish -L 0020 Urdu - 01 Pakistan - 02 India -L 0021 Indonesian -L 0022 Ukrainian -L 0023 Belarusian -L 0024 Slovenian -L 0025 Estonian -L 0026 Latvian -L 0027 Lithuanian - 01 Lithuanian -L 0028 forgotten -L 0029 Farsi -L 002a Vietnamese -L 002b Armenian -L 002c Azeri - 01 Cyrillic - 02 Latin -L 002d Basque -L 002e forgotten -L 002f Macedonian -L 0036 Afrikaans -L 0037 Georgian -L 0038 Faeroese -L 0039 Hindi -L 003e Malay - 01 Malaysia - 02 Brunei Darassalam -L 003f Kazak -L 0041 Awahili -L 0043 Uzbek - 01 Latin - 02 Cyrillic -L 0044 Tatar -L 0045 Bengali -L 0046 Punjabi -L 0047 Gujarati -L 0048 Oriya -L 0049 Tamil -L 004a Telugu -L 004b Kannada -L 004c Malayalam -L 004d Assamese -L 004e Marathi -L 004f Sanskrit -L 0057 Konkani -L 0058 Manipuri -L 0059 Sindhi -L 0060 Kashmiri - 02 India -L 0061 Nepali - 02 India - -# HID Descriptor bCountryCode -# HID Specification 1.11 (2001-06-27) page 23 -# -# Syntax: -# HCC country_code keymap_type - -HCC 00 Not supported -HCC 01 Arabic -HCC 02 Belgian -HCC 03 Canadian-Bilingual -HCC 04 Canadian-French -HCC 05 Czech Republic -HCC 06 Danish -HCC 07 Finnish -HCC 08 French -HCC 09 German -HCC 10 Greek -HCC 11 Hebrew -HCC 12 Hungary -HCC 13 International (ISO) -HCC 14 Italian -HCC 15 Japan (Katakana) -HCC 16 Korean -HCC 17 Latin American -HCC 18 Netherlands/Dutch -HCC 19 Norwegian -HCC 20 Persian (Farsi) -HCC 21 Poland -HCC 22 Portuguese -HCC 23 Russia -HCC 24 Slovakia -HCC 25 Spanish -HCC 26 Swedish -HCC 27 Swiss/French -HCC 28 Swiss/German -HCC 29 Switzerland -HCC 30 Taiwan -HCC 31 Turkish-Q -HCC 32 UK -HCC 33 US -HCC 34 Yugoslavia -HCC 35 Turkish-F - -# List of Video Class Terminal Types - -# Syntax: -# VT terminal_type terminal_type_name - -VT 0100 USB Vendor Specific -VT 0101 USB Streaming -VT 0200 Input Vendor Specific -VT 0201 Camera Sensor -VT 0202 Sequential Media -VT 0300 Output Vendor Specific -VT 0301 Generic Display -VT 0302 Sequential Media -VT 0400 External Vendor Specific -VT 0401 Composite Video -VT 0402 S-Video -VT 0403 Component Video diff --git a/core/vpnc/PKGBUILD b/core/vpnc/PKGBUILD deleted file mode 100644 index d14842636..000000000 --- a/core/vpnc/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 100076 2010-11-20 04:16:25Z pierre $ -# Maintainer: Thomas Baechler <thomas@archlinux.org> - -pkgname=vpnc -pkgver=0.5.3 -pkgrel=3 -pkgdesc="VPN client for cisco3000 VPN Concentrators" -url="http://www.unix-ag.uni-kl.de/~massar/vpnc/" -license=('GPL') -depends=('libgcrypt' 'openssl' 'iproute2') -arch=('i686' 'x86_64') -source=("http://www.unix-ag.uni-kl.de/~massar/vpnc/$pkgname-$pkgver.tar.gz" - 'vpnc.conf' 'vpnc.rc') -backup=('etc/vpnc/default.conf') -md5sums=('4378f9551d5b077e1770bbe09995afb3' - 'a3f4e0cc682f437e310a1c86ae198e45' - 'c5885162ac198eaa36da9a01e7c0c55b') - -build() { - cd $srcdir/$pkgname-$pkgver - - # Build hybrid support - sed -i 's|^#OPENSSL|OPENSSL|g' Makefile - - make PREFIX=/usr -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir PREFIX=/usr install - - install -D -m644 $srcdir/vpnc.conf $pkgdir/etc/vpnc/default.conf - install -D -m755 $srcdir/vpnc.rc $pkgdir/etc/rc.d/vpnc - rm -f $pkgdir/etc/vpnc/vpnc.conf -} diff --git a/core/vpnc/vpnc.conf b/core/vpnc/vpnc.conf deleted file mode 100644 index 914f827fd..000000000 --- a/core/vpnc/vpnc.conf +++ /dev/null @@ -1,17 +0,0 @@ -# example vpnc configuration file -# see vpnc --long-help for details - -#Interface name tun0 -#IKE DH Group dh2 -#Perfect Forward Secrecy nopfs - -# You may replace this script with something better -#Script /etc/vpnc/vpnc-script -# Enable this option for NAT traversal -#UDP Encapsulate - -#IPSec gateway my.gateway.com -#IPSec ID someid -#IPSec secret somesecret -#Xauth username myusername -#Xauth password mypassword diff --git a/core/vpnc/vpnc.rc b/core/vpnc/vpnc.rc deleted file mode 100644 index 972ed3211..000000000 --- a/core/vpnc/vpnc.rc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Connecting to VPN" - /usr/sbin/vpnc - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon vpnc - stat_done - fi - ;; - stop) - stat_busy "Disconnecting from VPN" - /usr/sbin/vpnc-disconnect - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon vpnc - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/bind/notools.patch b/extra/bind/notools.patch deleted file mode 100644 index 0ad083a01..000000000 --- a/extra/bind/notools.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/bin/Makefile.in new/bin/Makefile.in ---- old/bin/Makefile.in 2011-05-27 10:12:59.392416094 +0200 -+++ new/bin/Makefile.in 2011-05-27 10:13:12.372521984 +0200 -@@ -19,7 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -+SUBDIRS = named rndc dnssec tests tools \ - check confgen @PKCS11_TOOLS@ - TARGETS = - diff --git a/extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch b/extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch deleted file mode 100644 index efc06a472..000000000 --- a/extra/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Nur claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_popup.c claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_popup.c ---- claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_popup.c 2009-04-26 03:05:05.000000000 +0200 -+++ claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_popup.c 2010-11-12 13:39:02.363909583 +0100 -@@ -339,7 +339,7 @@ - break; - } - -- ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL); -+ ppopup->notification = notify_notification_new(summary, utf8_str, NULL); - g_free(utf8_str); - if(ppopup->notification == NULL) { - debug_print("Notification Plugin: Failed to create a new " -diff -Nur claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_trayicon.c claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_trayicon.c ---- claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_trayicon.c 2010-03-25 09:56:34.000000000 +0100 -+++ claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_trayicon.c 2010-11-12 13:38:30.809340907 +0100 -@@ -589,8 +589,7 @@ - summary = notification_trayicon_popup_assemble_summary(); - utf8_str = notification_trayicon_popup_assemble_body(msginfo); - -- popup.notification = notify_notification_new(summary, utf8_str, NULL, NULL); -- notify_notification_attach_to_status_icon(popup.notification, trayicon); -+ popup.notification = notify_notification_new(summary, utf8_str, NULL); - - g_free(summary); - g_free(utf8_str); diff --git a/extra/claws-mail/claws-notify-crash.patch b/extra/claws-mail/claws-notify-crash.patch deleted file mode 100644 index e1d4eb686..000000000 --- a/extra/claws-mail/claws-notify-crash.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: src/main.c -=================================================================== -RCS file: //claws/src/main.c,v -retrieving revision 1.115.2.237 -retrieving revision 1.115.2.238 -diff -u -r1.115.2.237 -r1.115.2.238 ---- src/main.c 10 Apr 2011 17:19:04 -0000 1.115.2.237 -+++ src/main.c 30 Apr 2011 19:27:15 -0000 1.115.2.238 -@@ -331,7 +331,7 @@ - gtk_widget_show(hack); - } - -- xdisplay = gdk_display_get_default(); -+ xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); - sn_display = sn_display_new(xdisplay, - sn_error_trap_push, - sn_error_trap_pop); - diff --git a/extra/eject/eject-2.1.5-handle-spaces.patch b/extra/eject/eject-2.1.5-handle-spaces.patch deleted file mode 100644 index 692368fa5..000000000 --- a/extra/eject/eject-2.1.5-handle-spaces.patch +++ /dev/null @@ -1,57 +0,0 @@ -http://bugs.gentoo.org/151257 - ---- eject.c -+++ eject.c -@@ -370,6 +370,30 @@ static int FileExists(const char *name, - - - /* -+ * Linux mangles spaces in mount points by changing them to an octal string -+ * of '\040'. So lets scan the mount point and fix it up by replacing all -+ * occurrences off '\0##' with the ASCII value of 0##. Requires a writable -+ * string as input as we mangle in place. Some of this was taken from the -+ * util-linux package. -+ */ -+#define octalify(a) ((a) & 7) -+#define tooctal(s) (64*octalify(s[1]) + 8*octalify(s[2]) + octalify(s[3])) -+#define isoctal(a) (((a) & ~7) == '0') -+static char *DeMangleMount(char *s) -+{ -+ char *tmp = s; -+ while ((tmp = strchr(tmp, '\\')) != NULL) { -+ if (isoctal(tmp[1]) && isoctal(tmp[2]) && isoctal(tmp[3])) { -+ tmp[0] = tooctal(tmp); -+ memmove(tmp+1, tmp+4, strlen(tmp)-3); -+ } -+ ++tmp; -+ } -+ return s; -+} -+ -+ -+/* - * Given name, such as foo, see if any of the following exist: - * - * foo (if foo starts with '.' or '/') -@@ -884,8 +908,8 @@ static int MountedDevice(const char *nam - if (((strcmp(s1, name) == 0) || (strcmp(s2, name) == 0)) || - ((maj != -1) && (maj == mtabmaj) && (min == mtabmin))) { - FCLOSE(fp); -- *deviceName = strdup(s1); -- *mountName = strdup(s2); -+ *deviceName = DeMangleMount(strdup(s1)); -+ *mountName = DeMangleMount(strdup(s2)); - return 1; - } - } -@@ -928,8 +952,8 @@ static int MountableDevice(const char *n - rc = sscanf(line, "%1023s %1023s", s1, s2); - if (rc >= 2 && s1[0] != '#' && strcmp(s2, name) == 0) { - FCLOSE(fp); -- *deviceName = strdup(s1); -- *mountName = strdup(s2); -+ *deviceName = DeMangleMount(strdup(s1)); -+ *mountName = DeMangleMount(strdup(s2)); - return 1; - } - } diff --git a/extra/ekiga/fix-generation-po.patch b/extra/ekiga/fix-generation-po.patch deleted file mode 100644 index ebec28433..000000000 --- a/extra/ekiga/fix-generation-po.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ebd9de96878c224145c0b1d7bf21c7151c0563bf Mon Sep 17 00:00:00 2001 -From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr> -Date: Tue, 19 Jul 2011 08:15:52 +0000 -Subject: Fix generation of po translation files - -Bug introduced by commit 2bfaf29. ---- -diff --git a/configure.ac b/configure.ac -index 63d8685..eefae22 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -770,7 +770,9 @@ AM_CONDITIONAL(DEBUG, test "x$has_debug" = "xyes") - dnl ######################################################################### - dnl Support for internationalization - dnl ######################################################################## --AC_DEFINE(GETTEXT_PACKAGE, "[AC_PACKAGE_NAME]",[fix]) -+GETTEXT_PACKAGE=AC_PACKAGE_NAME -+AC_SUBST(GETTEXT_PACKAGE) # needed by gettext in po directory -+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[fix]) - AM_GLIB_GNU_GETTEXT - - --- -cgit v0.9 diff --git a/extra/evilwm/evilwm.desktop b/extra/evilwm/evilwm.desktop deleted file mode 100644 index e12f6ca43..000000000 --- a/extra/evilwm/evilwm.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Evilwm -Comment=The evilwm window manager -Exec=evilwm -# no icon yet, only the top three are currently used -Icon= -Type=Application diff --git a/extra/fam/PKGBUILD b/extra/fam/PKGBUILD deleted file mode 100644 index f8398bbe2..000000000 --- a/extra/fam/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 136014 2011-08-21 14:26:17Z eric $ -# Maintainer: -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=fam -pkgver=2.7.0 -pkgrel=16 -pkgdesc="File Alteration Monitor" -arch=('i686' 'x86_64') -license=('LGPL' 'GPL') -depends=('rpcbind' 'gcc-libs' 'bash') -url="http://oss.sgi.com/projects/fam/" -backup=('etc/fam/fam.conf') -options=('!makeflags' 'libtool') -source=(ftp://oss.sgi.com/projects/fam/download/stable/${pkgname}-${pkgver}.tar.gz - fam-2.7.0-dnotify.patch - fam-2.7.0-largefiles.patch - fam-2.7.0-limits.patch - fam-2.7.0-buildfixes.patch - fam) -md5sums=('1bf3ae6c0c58d3201afc97c6a4834e39' - '073d1763318344635ea316293390205c' - '47b41e0b0498793af004696a096d7da1' - '2638b8ffacb9f03b6e438e08ea7b290a' - 'fc0cabc0ac4f819680401eb3090c29c9' - 'ec50139679bc31508a843cafa47cd298') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/fam-2.7.0-dnotify.patch - patch -p1 -i "${srcdir}"/fam-2.7.0-largefiles.patch - patch -p0 -i "${srcdir}"/fam-2.7.0-limits.patch - patch -p1 -i "${srcdir}"/fam-2.7.0-buildfixes.patch - - chmod 755 configure - - autoheader - aclocal - automake -a -c - autoconf - libtoolize --copy --force - - ./configure --prefix=/usr --sysconfdir=/etc/fam - make -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - install -D -m755 "${srcdir}"/fam "${pkgdir}"/etc/rc.d/fam -} diff --git a/extra/fam/fam b/extra/fam/fam deleted file mode 100755 index 69a049730..000000000 --- a/extra/fam/fam +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/famd` -case "$1" in - start) - stat_busy "Starting File Alteration Monitor" - if ck_daemon rpcbind; then - echo "ERROR: Refusing to start fam without rpcbind running!" >&2 - stat_die - fi - if [ -z "$PID" ]; then - /usr/sbin/famd -T 0 -c /etc/fam/fam.conf - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon fam - stat_done - fi - ;; - stop) - stat_busy "Stopping File Alteration Monitor" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon fam - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/fam/fam-2.7.0-buildfixes.patch b/extra/fam/fam-2.7.0-buildfixes.patch deleted file mode 100644 index abc78883d..000000000 --- a/extra/fam/fam-2.7.0-buildfixes.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -Naur fam-2.7.0-old/include/BTree.h fam-2.7.0/include/BTree.h ---- fam-2.7.0-old/include/BTree.h 2003-01-20 14:22:30.000000000 +1000 -+++ fam-2.7.0/include/BTree.h 2009-06-14 21:21:41.000000000 +1000 -@@ -24,6 +24,7 @@ - #define BTree_included - - #include "Boolean.h" -+#include <cstdlib> - - // This is an in-core B-Tree implementation. - // -diff -Naur fam-2.7.0-old/lib/Client.c++ fam-2.7.0/lib/Client.c++ ---- fam-2.7.0-old/lib/Client.c++ 2003-01-19 00:18:12.000000000 +1000 -+++ fam-2.7.0/lib/Client.c++ 2009-06-14 21:22:33.000000000 +1000 -@@ -34,7 +34,7 @@ - #include <syslog.h> - #include <errno.h> - --#include <iostream.h> -+#include <iostream> - - #include "fam.h" - #include "Client.h" -diff -Naur fam-2.7.0-old/src/DNotify.c++ fam-2.7.0/src/DNotify.c++ ---- fam-2.7.0-old/src/DNotify.c++ 2009-06-14 21:14:34.000000000 +1000 -+++ fam-2.7.0/src/DNotify.c++ 2009-06-14 21:23:23.000000000 +1000 -@@ -31,6 +31,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <libgen.h> -+#include <cstdlib> - - #include "DNotify.h" - -diff -Naur fam-2.7.0-old/src/IMon.c++ fam-2.7.0/src/IMon.c++ ---- fam-2.7.0-old/src/IMon.c++ 2003-01-19 00:18:12.000000000 +1000 -+++ fam-2.7.0/src/IMon.c++ 2009-06-14 21:24:11.000000000 +1000 -@@ -40,7 +40,7 @@ - #include "Interest.h" - #include "Log.h" - #include "Scheduler.h" --#include "alloc.h" -+#include <memory> - - int IMon::imonfd = -2; - IMon::EventHandler IMon::ehandler = NULL; -diff -Naur fam-2.7.0-old/src/Interest.h fam-2.7.0/src/Interest.h ---- fam-2.7.0-old/src/Interest.h 2009-06-14 21:14:34.000000000 +1000 -+++ fam-2.7.0/src/Interest.h 2009-06-14 21:25:25.000000000 +1000 -@@ -29,6 +29,7 @@ - #include <netinet/in.h> // for in_addr - - #include "Boolean.h" -+#include <cstdlib> - - class Event; - class FileSystem; -diff -Naur fam-2.7.0-old/src/NFSFileSystem.c++ fam-2.7.0/src/NFSFileSystem.c++ ---- fam-2.7.0-old/src/NFSFileSystem.c++ 2003-01-19 00:18:12.000000000 +1000 -+++ fam-2.7.0/src/NFSFileSystem.c++ 2009-06-14 21:26:16.000000000 +1000 -@@ -97,7 +97,7 @@ - - attr_cache_timeout = ACREGMAX; - -- char * p; -+ const char * p; - - if (strstr(opt, "noac")) { - f_noac = true; diff --git a/extra/fam/fam-2.7.0-dnotify.patch b/extra/fam/fam-2.7.0-dnotify.patch deleted file mode 100644 index 1d8910efb..000000000 --- a/extra/fam/fam-2.7.0-dnotify.patch +++ /dev/null @@ -1,975 +0,0 @@ ---- fam-2.7.0/src/DNotify.c++ 2004-01-30 00:00:00.000000000 +0100 -+++ fam-2.7.0.dnotify/src/DNotify.c++ 2004-01-30 00:00:00.000000000 +0100 -@@ -0,0 +1,582 @@ -+// Copyright (C) 2001 Red Hat, Inc. All Rights Reserved. -+// Copyright (C) 1999 Silicon Graphics, Inc. All Rights Reserved. -+// -+// This program is free software; you can redistribute it and/or modify it -+// under the terms of version 2 of the GNU General Public License as -+// published by the Free Software Foundation. -+// -+// This program is distributed in the hope that it would be useful, but -+// WITHOUT ANY WARRANTY; without even the implied warranty of -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Further, any -+// license provided herein, whether implied or otherwise, is limited to -+// this program in accordance with the express provisions of the GNU -+// General Public License. Patent licenses, if any, provided herein do not -+// apply to combinations of this program with other product or programs, or -+// any other product whatsoever. This program is distributed without any -+// warranty that the program is delivered free of the rightful claim of any -+// third person by way of infringement or the like. See the GNU General -+// Public License for more details. -+// -+// You should have received a copy of the GNU General Public License along -+// with this program; if not, write the Free Software Foundation, Inc., 59 -+// Temple Place - Suite 330, Boston MA 02111-1307, USA. -+ -+#define _GNU_SOURCE -+#include <fcntl.h> -+ -+#include <string.h> -+#include <signal.h> -+#include <stdio.h> -+#include <unistd.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <libgen.h> -+ -+#include "DNotify.h" -+ -+#include "Interest.h" -+#include "Log.h" -+#include "Scheduler.h" -+#include <memory> -+ -+ -+int DNotify::pipe_write_fd = -2; -+int DNotify::pipe_read_fd = -2; -+volatile sig_atomic_t DNotify::queue_overflowed = 0; -+volatile sig_atomic_t DNotify::queue_changed = 0; -+int DNotify::change_queue[QUEUESIZE]; -+volatile int DNotify::queue_head = 0; // Only modified by read handler -+volatile int DNotify::queue_tail = 0; // Only modified by signal handler -+DNotify::EventHandler DNotify::ehandler; -+ -+DNotify::DirWatch *DNotify::dir_hash[DIR_HASHSIZE]; -+DNotify::FileWatch *DNotify::file_hash[FILE_HASHSIZE]; -+ -+struct DNotify::FileWatch -+{ -+ DirWatch *dir_watch; -+ dev_t file_dev; -+ ino_t file_ino; -+ FileWatch *next; // The DirWatch.watches list -+ FileWatch *hash_link; -+}; -+ -+struct DNotify::DirWatch -+{ -+ int fd; -+ dev_t dir_dev; -+ ino_t dir_ino; -+ -+ DirWatch *hash_link; -+ FileWatch *watches; -+}; -+ -+struct DNotify::ChangeEventData -+{ -+ dev_t file_dev; -+ ino_t file_ino; -+}; -+ -+DNotify::DNotify(EventHandler h) -+{ -+ assert(ehandler == NULL); -+ ehandler = h; -+} -+ -+DNotify::~DNotify() -+{ -+ if (pipe_read_fd >= 0) -+ { -+ // Tell the scheduler. -+ -+ (void) Scheduler::remove_read_handler(pipe_read_fd); -+ -+ // Close the pipe. -+ -+ if (close(pipe_read_fd) < 0) -+ Log::perror("can't pipe read end"); -+ else -+ Log::debug("closed pipe read end"); -+ -+ if (close(pipe_write_fd) < 0) -+ Log::perror("can't pipe write end"); -+ else -+ Log::debug("closed pipe write end"); -+ pipe_read_fd = -1; -+ } -+ ehandler = NULL; -+} -+ -+void -+DNotify::overflow_signal_handler(int sig, siginfo_t *si, void *data) -+{ -+ char c = 'x'; -+ -+ { -+ char *str = "*************** overflow sigqueue ***********************\n"; -+ write (STDERR_FILENO, str, strlen(str)); -+ } -+ -+ if (!queue_overflowed) -+ { -+ queue_overflowed = 1; -+ // Trigger the read handler -+ write(pipe_write_fd, &c, 1); -+ } -+} -+ -+void -+DNotify::signal_handler(int sig, siginfo_t *si, void *data) -+{ -+ int left; -+ char c = 'x'; -+ -+ if (queue_head <= queue_tail) -+ left = (QUEUESIZE + queue_head) - queue_tail; -+ else -+ left = queue_head - queue_tail; -+ -+ // Must leave at least one item unused to see difference -+ // Betweeen empty and full -+ if (left <= 1) -+ { -+ queue_overflowed = 1; -+ { -+ char *str = "*************** overflow famqueue ****************\n"; -+ write (STDERR_FILENO, str, strlen(str)); -+ } -+ } -+ else -+ { -+ change_queue[queue_tail] = si->si_fd; -+ queue_tail = (queue_tail + 1) % QUEUESIZE; -+ } -+ -+ if (!queue_changed) -+ { -+ queue_changed = 1; -+ // Trigger the read handler -+ write(pipe_write_fd, &c, 1); -+ } -+} -+ -+bool -+DNotify::is_active() -+{ -+ if (pipe_read_fd == -2) -+ { -+ int filedes[2]; -+ int res; -+ -+ res = pipe (filedes); -+ if (res >= 0) -+ { Log::debug("opened pipe"); -+ pipe_read_fd = filedes[0]; -+ pipe_write_fd = filedes[1]; -+ -+ // Setup signal handler: -+ struct sigaction act; -+ -+ act.sa_sigaction = signal_handler; -+ sigemptyset(&act.sa_mask); -+ act.sa_flags = SA_SIGINFO; -+ sigaction(SIGRTMIN, &act, NULL); -+ -+ // When the RT queue overflows we get a SIGIO -+ act.sa_sigaction = overflow_signal_handler; -+ sigemptyset(&act.sa_mask); -+ sigaction(SIGIO, &act, NULL); -+ -+ (void) Scheduler::install_read_handler(pipe_read_fd, read_handler, NULL); -+ } -+ } -+ return pipe_read_fd >= 0; -+} -+ -+DNotify::DirWatch * -+DNotify::lookup_dirwatch (int fd) -+{ -+ DirWatch **p; -+ DirWatch *w; -+ -+ p = dir_hashchain (fd); -+ -+ while (*p) -+ { -+ w = *p; -+ -+ if (w->fd == fd) -+ return w; -+ -+ p = &w->hash_link; -+ } -+ -+ return *p; -+} -+ -+// This colud be made faster by using another hash table. -+// But it's not that bad, since it is only used by express/revoke -+DNotify::DirWatch * -+DNotify::lookup_dirwatch (dev_t dir_dev, ino_t dir_ino) -+{ -+ DirWatch *p; -+ int i; -+ -+ for (i=0;i<DIR_HASHSIZE;i++) -+ { -+ p = dir_hash[i]; -+ -+ while (p) -+ { -+ if (p->dir_dev == dir_dev && p->dir_ino == dir_ino) -+ return p; -+ -+ p = p->hash_link; -+ } -+ } -+ -+ return NULL; -+} -+ -+DNotify::FileWatch * -+DNotify::lookup_filewatch (dev_t dev, ino_t ino) -+{ -+ FileWatch **p; -+ FileWatch *w; -+ -+ p = file_hashchain (dev, ino); -+ -+ while (*p) -+ { -+ w = *p; -+ -+ if (w->file_dev == dev && w->file_ino == ino) -+ return w; -+ -+ p = &w->hash_link; -+ } -+ -+ return *p; -+} -+ -+// Make sure w is not already in the hash table before calling -+// this function. -+void -+DNotify::hash_dirwatch(DirWatch *w) -+{ -+ DirWatch **p; -+ p = dir_hashchain (w->fd); -+ w->hash_link = *p; -+ *p = w; -+} -+ -+// Make sure w is not already in the hash table before calling -+// this function. -+void -+DNotify::hash_filewatch(FileWatch *w) -+{ -+ FileWatch **p; -+ p = file_hashchain (w->file_dev, w->file_ino); -+ w->hash_link = *p; -+ *p = w; -+} -+ -+void -+DNotify::unhash_dirwatch(DirWatch *w) -+{ -+ DirWatch **p; -+ -+ p = dir_hashchain (w->fd); -+ -+ while (*p) -+ { -+ if (*p == w) -+ { -+ *p = w->hash_link; -+ break; -+ } -+ p = &(*p)->hash_link; -+ } -+ w->hash_link = NULL; -+} -+ -+void -+DNotify::unhash_filewatch(FileWatch *w) -+{ -+ FileWatch **p; -+ -+ p = file_hashchain (w->file_dev, w->file_ino); -+ -+ while (*p) -+ { -+ if (*p == w) -+ { -+ *p = w->hash_link; -+ break; -+ } -+ p = &(*p)->hash_link; -+ } -+ w->hash_link = NULL; -+} -+ -+DNotify::Status -+DNotify::watch_dir(const char *notify_dir, dev_t file_dev, ino_t file_ino) -+{ -+ struct stat stat; -+ dev_t dir_dev; -+ ino_t dir_ino; -+ DirWatch *dwatch; -+ FileWatch *fw; -+ -+ if (lstat (notify_dir, &stat) == -1) -+ return BAD; -+ -+ dwatch = lookup_dirwatch(stat.st_dev, stat.st_ino); -+ if (!dwatch) -+ { -+ Log::debug ("New DirWatch for %s (%x %x)\n", -+ notify_dir, (int)stat.st_dev, (int)stat.st_ino); -+ dwatch = new DirWatch; -+ dwatch->watches = NULL; -+ dwatch->hash_link = NULL; -+ dwatch->dir_dev = stat.st_dev; -+ dwatch->dir_ino = stat.st_ino; -+ -+ dwatch->fd = open(notify_dir, O_RDONLY); -+ fcntl (dwatch->fd, F_SETSIG, SIGRTMIN); -+ if (fcntl (dwatch->fd, F_NOTIFY, -+ (DN_MODIFY|DN_CREATE|DN_DELETE|DN_RENAME|DN_ATTRIB) -+ | DN_MULTISHOT) == -1) { -+ return BAD; -+ } -+ hash_dirwatch (dwatch); -+ } -+ -+ fw = lookup_filewatch (file_dev, file_ino); -+ if (fw && fw->dir_watch == dwatch) -+ return OK; -+ -+ // No old FileWatch, need to add one: -+ Log::debug("New FileWatch for %x %x\n", (int)file_dev, (int)file_ino); -+ fw = new FileWatch; -+ fw->next = dwatch->watches; -+ dwatch->watches = fw; -+ fw->file_dev = file_dev; -+ fw->file_ino = file_ino; -+ fw->dir_watch = dwatch; -+ hash_filewatch(fw); -+ return OK; -+} -+ -+char * -+dirname_dup (const char *name) -+{ -+ char *copy = strdup(name); -+ char *res = dirname(copy); -+ res = strdup(res); -+ free (copy); -+ return res; -+} -+ -+DNotify::Status -+DNotify::express(const char *name, struct stat *status) -+{ -+ struct stat stat; -+ char *notify_dir; -+ int res; -+ Status s; -+ dev_t dev; -+ ino_t ino; -+ -+ Log::debug("express() name: %s\n", name); -+ -+ if (!is_active()) -+ return BAD; -+ -+ if (::lstat (name, &stat) == -1) -+ return BAD; -+ -+ dev = stat.st_dev; -+ ino = stat.st_ino; -+ -+ if ((stat.st_mode & S_IFMT) != S_IFDIR) -+ notify_dir = dirname_dup (name); -+ else -+ notify_dir = (char *)name; -+ -+ s = watch_dir (notify_dir, dev, ino); -+ if (notify_dir != name) -+ free (notify_dir); -+ if (s) -+ return s; -+ -+ // Check for a race condition; if someone removed or changed the -+ // file at the same time that we are expressing interest in it, -+ // revoke the interest so we don't get notifications about changes -+ // to a recycled inode that we don't otherwise care about. -+ // -+ struct stat st; -+ if (status == NULL) { -+ status = &st; -+ } -+ if (::lstat(name, status) == -1) { -+ Log::perror("stat on \"%s\" failed", name); -+ revoke(name, stat.st_dev, stat.st_ino); -+ return BAD; -+ } -+ if (status->st_dev != stat.st_dev -+ || status->st_ino != stat.st_ino) { -+ Log::error("File \"%s\" changed between express and stat", -+ name); -+ revoke(name, stat.st_dev, stat.st_ino); -+ return BAD; -+ } -+ -+ Log::debug("told dnotify to monitor \"%s\" = dev %d/%d, ino %d", name, -+ major(status->st_dev), minor(status->st_dev), -+ status->st_ino); -+ return OK; -+} -+ -+DNotify::Status -+DNotify::revoke(const char *name, dev_t dev, ino_t ino) -+{ -+ FileWatch *fwatch; -+ DirWatch *dwatch; -+ -+ Log::debug("revoke() name: %s, dev: %x, ino: %x\n", name, dev, ino); -+ -+ if (!is_active()) -+ return BAD; -+ -+ // Lookup FileWatch by dev:ino, and its DirWatch. -+ fwatch = lookup_filewatch (dev, ino); -+ if (fwatch == NULL) -+ return BAD; -+ -+ dwatch = fwatch->dir_watch; -+ -+ // delete FileWatch, if last FileWatch: close fd, delete DirWatch -+ Log::debug ("Destroying FileWatch for (%x %x)\n", -+ (int)fwatch->file_dev, (int)fwatch->file_ino); -+ FileWatch **p; -+ for (p=&dwatch->watches; *p; p=&(*p)->next) -+ { -+ if (*p == fwatch) -+ { -+ *p = (*p)->next; -+ break; -+ } -+ } -+ unhash_filewatch(fwatch); -+ delete fwatch; -+ if (dwatch->watches == NULL) -+ { -+ Log::debug ("Destroying DirWatch for (%x %x)\n", -+ (int)dwatch->dir_dev, (int)dwatch->dir_ino); -+ close(dwatch->fd); -+ unhash_dirwatch(dwatch); -+ delete dwatch; -+ } -+ -+ return OK; -+} -+ -+ -+void -+DNotify::all_watches_changed(void) -+{ -+ int i; -+ FileWatch *fw; -+ -+ for (i=0; i<FILE_HASHSIZE; i++) -+ { -+ fw = file_hash[i]; -+ while (fw) -+ { -+ (*ehandler)(fw->file_dev, fw->file_ino, CHANGE); -+ -+ fw = fw->hash_link; -+ } -+ } -+} -+ -+ -+void -+DNotify::read_handler(int fd, void *) -+{ -+ static char readbuf[5000]; -+ DirWatch *dw; -+ FileWatch *fw; -+ int snap_queue_tail; -+ int last_fd; -+ -+ int rc = read(fd, readbuf, sizeof readbuf); -+ queue_changed = 0; -+ if (rc < 0) -+ Log::perror("pipe read"); -+ else if (queue_overflowed) -+ { -+ // There is a *slight* race condition here. Between reading -+ // the queue_overflow flag and resetting it. But it doesn't -+ // matter, since I'm gonna handle the overflow after reseting -+ // anyway. -+ queue_overflowed = false; -+ -+ // We're soon gonna check all watches anyway, so -+ // get rid of the current queue -+ queue_head = queue_tail; -+ -+ all_watches_changed (); -+ } -+ else -+ { -+ // Don't read events that happen later than -+ // the initial read. (Otherwise skipping fd's -+ // might miss some changes). -+ snap_queue_tail = queue_tail; -+ last_fd = -1; -+ while (queue_head != snap_queue_tail) -+ { -+ fd = change_queue[queue_head]; -+ queue_head = (queue_head + 1) % QUEUESIZE; -+ -+ // Skip multiple changes to the same fd -+ if (fd != last_fd) -+ { -+ dw = lookup_dirwatch (fd); -+ if (dw) -+ { -+ int n_watches, i; -+ ChangeEventData *data; -+ -+ Log::debug("dnotify said dev %d/%d, ino %ld changed", -+ major(dw->dir_dev), minor(dw->dir_dev), dw->dir_ino); -+ -+ n_watches = 0; -+ for (fw=dw->watches; fw; fw=fw->next) -+ n_watches++; -+ -+ data = new ChangeEventData[n_watches]; -+ -+ i = 0; -+ for (fw=dw->watches; fw; fw=fw->next) -+ { -+ data[i].file_dev = fw->file_dev; -+ data[i].file_ino = fw->file_ino; -+ i++; -+ } -+ -+ for (i = 0; i < n_watches; i++) -+ { -+ (*ehandler)(data[i].file_dev, data[i].file_ino, CHANGE); -+ } -+ -+ delete[] data; -+ } -+ } -+ last_fd = fd; -+ } -+ } -+} -+ ---- fam-2.7.0/src/DNotify.h 2004-01-30 00:00:00.000000000 +0100 -+++ fam-2.7.0.dnotify/src/DNotify.h 2004-01-30 00:00:00.000000000 +0100 -@@ -0,0 +1,98 @@ -+// Copyright (C) 2001 Red Hat, Inc. All Rights Reserved. -+// Copyright (C) 1999 Silicon Graphics, Inc. All Rights Reserved. -+// -+// This program is free software; you can redistribute it and/or modify it -+// under the terms of version 2 of the GNU General Public License as -+// published by the Free Software Foundation. -+// -+// This program is distributed in the hope that it would be useful, but -+// WITHOUT ANY WARRANTY; without even the implied warranty of -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Further, any -+// license provided herein, whether implied or otherwise, is limited to -+// this program in accordance with the express provisions of the GNU -+// General Public License. Patent licenses, if any, provided herein do not -+// apply to combinations of this program with other product or programs, or -+// any other product whatsoever. This program is distributed without any -+// warranty that the program is delivered free of the rightful claim of any -+// third person by way of infringement or the like. See the GNU General -+// Public License for more details. -+// -+// You should have received a copy of the GNU General Public License along -+// with this program; if not, write the Free Software Foundation, Inc., 59 -+// Temple Place - Suite 330, Boston MA 02111-1307, USA. -+ -+#ifndef DNotify_included -+#define DNotify_included -+ -+#include "config.h" -+#include "Monitor.h" -+#include <signal.h> -+ -+// DNotify is an object encapsulating the dnotify linux fcntl. -+// It "emulates" the IMon interface. -+// There can only be one instantiation of the DNotify object. -+// -+// The user of this object uses express() and revoke() to -+// express/revoke interest in a file. There is also -+// a callback, the EventHandler. When an dnotify event comes in, -+// the EventHandler is called. -+// -+// The user of the DNotify object is the Interest class. -+ -+class DNotify : public Monitor { -+public: -+ DNotify(EventHandler h); -+ ~DNotify(); -+ -+ static bool is_active(); -+ -+ virtual Status express(const char *name, struct stat *stat_return); -+ virtual Status revoke(const char *name, dev_t dev, ino_t ino); -+ -+private: -+ struct FileWatch; -+ struct DirWatch; -+ struct ChangeEventData; -+ -+ // Class Variables -+ enum { QUEUESIZE = 1024 }; -+ static int pipe_write_fd; -+ static int pipe_read_fd; -+ static int change_queue[QUEUESIZE]; -+ static volatile sig_atomic_t queue_overflowed; -+ static volatile sig_atomic_t queue_changed; -+ static volatile int queue_head; // Only modified by read handler -+ static volatile int queue_tail; // Only modified by signal handler -+ static EventHandler ehandler; -+ static void overflow_signal_handler(int sig, siginfo_t *si, void *data); -+ static void signal_handler(int sig, siginfo_t *si, void *data); -+ static void read_handler(int fd, void *closure); -+ -+ enum { DIR_HASHSIZE = 367 }; -+ static DirWatch *dir_hash[DIR_HASHSIZE]; -+ enum { FILE_HASHSIZE = 823 }; -+ static FileWatch *file_hash[FILE_HASHSIZE]; -+ -+ static DirWatch **dir_hashchain(int fd) -+ { return &dir_hash[(unsigned) (fd) % DIR_HASHSIZE]; } -+ static FileWatch **file_hashchain(dev_t d, ino_t i) -+ { return &file_hash[(unsigned) (d+i) % FILE_HASHSIZE]; } -+ -+ static DirWatch *lookup_dirwatch (int fd); -+ static DirWatch *lookup_dirwatch (dev_t dir_dev, ino_t dir_ino); -+ static FileWatch *lookup_filewatch (dev_t file_dev, ino_t file_ino); -+ static void hash_dirwatch(DirWatch *w); -+ static void hash_filewatch(FileWatch *w); -+ static void unhash_dirwatch(DirWatch *w); -+ static void unhash_filewatch(FileWatch *w); -+ static Status watch_dir(const char *notify_dir, dev_t file_dev, ino_t file_ino); -+ -+ static void all_watches_changed(void); -+ -+ DNotify(const DNotify&); // Do not copy -+ DNotify & operator = (const DNotify&); // or assign. -+}; -+ -+#endif /* !IMon_included */ -+ -+ ---- fam-2.7.0/src/Interest.c++ 2004-01-30 00:00:00.000000000 +0100 -+++ fam-2.7.0.dnotify/src/Interest.c++ 2004-01-30 00:00:00.000000000 +0100 -@@ -42,12 +42,21 @@ - #include "Event.h" - #include "FileSystem.h" - #include "IMon.h" -+#include "DNotify.h" - #include "Log.h" - #include "Pollster.h" - #include "timeval.h" - - Interest *Interest::hashtable[]; --IMon Interest::imon(imon_handler); -+ -+#ifdef USE_DNOTIFY -+static DNotify dnotify(Interest::monitor_handler); -+Monitor * Interest::monitor = &dnotify; -+#else -+static IMon imon(Interest::monitor_handler); -+Monitor * Interest::monitor = &imon; -+#endif -+ - bool Interest::xtab_verification = true; - - Interest::Interest(const char *name, FileSystem *fs, in_addr host, ExportVerification ev) -@@ -60,10 +69,10 @@ - mypath_exported_to_host(ev == NO_VERIFY_EXPORTED) - { - memset(&old_stat, 0, sizeof(old_stat)); -- IMon::Status s = IMon::BAD; - -- s = imon.express(name, &old_stat); -- if (s != IMon::OK) -+ Monitor::Status s = Monitor::BAD; -+ s = monitor->express(name, &old_stat); -+ if (s != Monitor::OK) - { int rc = lstat(name, &old_stat); - if (rc < 0) - { Log::info("can't lstat %s", name); -@@ -100,7 +109,7 @@ - } - #endif - -- if (exported_to_host()) fs->ll_monitor(this, s == IMon::OK); -+ if (exported_to_host()) fs->ll_monitor(this, s == Monitor::OK); - } - - Interest::~Interest() -@@ -128,7 +137,7 @@ - pp = &p->hashlink; // move to next element - } - if (!found_same) -- (void) imon.revoke(name(), dev, ino); -+ (void) monitor->revoke(name(), dev, ino); - } - } - -@@ -147,7 +156,7 @@ - - // Express interest. - IMon::Status s = IMon::BAD; -- s = imon.express(name(), NULL); -+ s = monitor->express(name(), NULL); - if (s != IMon::OK) { - return true; - } -@@ -248,23 +257,23 @@ - } - - void --Interest::imon_handler(dev_t device, ino_t inumber, int event) -+Interest::monitor_handler(dev_t device, ino_t inumber, int event) - { - assert(device || inumber); - - for (Interest *p = *hashchain(device, inumber), *next = p; p; p = next) - { next = p->hashlink; - if (p->ino == inumber && p->dev == device) -- { if (event == IMon::EXEC) -+ { if (event == Monitor::EXEC) - { p->cur_exec_state = EXECUTING; - (void) p->report_exec_state(); - } -- else if (event == IMon::EXIT) -+ else if (event == Monitor::EXIT) - { p->cur_exec_state = NOT_EXECUTING; - (void) p->report_exec_state(); - } - else -- { assert(event == IMon::CHANGE); -+ { assert(event == Monitor::CHANGE); - p->scan(); - } - } ---- fam-2.7.0/config.h.in 2003-01-20 01:40:15.000000000 +0100 -+++ fam-2.7.0.dnotify/config.h.in 2004-01-30 13:50:33.000000000 +0100 -@@ -180,3 +180,6 @@ - - /* Define to `int' if <sys/types.h> doesn't define. */ - #undef uid_t -+ -+/* Define to 1 if you have F_NOTIFY fcntl */ -+#undef USE_DNOTIFY ---- fam-2.7.0/configure.ac 2003-11-26 20:47:59.000000000 +0100 -+++ fam-2.7.0.dnotify/configure.ac 2004-01-30 13:50:33.000000000 +0100 -@@ -34,7 +34,26 @@ - AC_HEADER_DIRENT - AC_CHECK_HEADERS([fcntl.h limits.h linux/imon.h netinet/in.h rpc/rpc.h rpcsvc/mount.h stddef.h stdlib.h string.h syslog.h sys/imon.h sys/param.h sys/select.h sys/statvfs.h sys/syssgi.h sys/time.h sys/types.h sys/un.h unistd.h]) - --if test "$have_sys_imon_h"; then -+# Test for the linux dnotify fcntl -+AC_MSG_CHECKING([for dnotify fcntl support]) -+AC_TRY_COMPILE([ -+#define _GNU_SOURCE -+#include <fcntl.h> -+#include <unistd.h> -+], -+[ int fd = 1; -+ fcntl (fd, F_NOTIFY, (DN_MODIFY|DN_CREATE|DN_DELETE|DN_RENAME|DN_ATTRIB) -+ |DN_MULTISHOT); -+], have_dnotify=yes, have_dnotify=no) -+ -+use_dnotify=false -+AC_MSG_RESULT($have_dnotify) -+ -+if test "$have_dnotify"; then -+ MONITOR_FUNCS=IMonNone -+ AC_DEFINE([USE_DNOTIFY], [], [Use dnotify]) -+ use_dnotify=true -+elif test "$have_sys_imon_h"; then - MONITOR_FUNCS=IMonIRIX - elif test "$have_linux_imon_h"; then - MONITOR_FUNCS=IMonLinux -@@ -42,6 +62,7 @@ - MONITOR_FUNCS=IMonNone - fi - AC_SUBST(MONITOR_FUNCS) -+AM_CONDITIONAL(USE_DNOTIFY, $use_dnotify) - - # Checks for typedefs, structures, and compiler characteristics. - AC_HEADER_STDBOOL ---- fam-2.7.0/src/IMon.h 2004-01-30 00:00:00.000000000 +0200 -+++ fam-2.7.0.dnotify/src/IMon.h 2004-01-30 00:00:00.000000000 +0200 -@@ -24,10 +24,7 @@ - #define IMon_included - - #include "config.h" --#include <sys/stat.h> --#include <sys/types.h> -- --#include "Boolean.h" -+#include "Monitor.h" - - struct stat; - -@@ -41,25 +38,18 @@ - // - // The user of the IMon object is the Interest class. - --class IMon { -+class IMon : public Monitor { - - public: -- -- enum Status { OK = 0, BAD = -1 }; -- enum Event { EXEC, EXIT, CHANGE }; -- -- typedef void (*EventHandler)(dev_t, ino_t, int event); -- - IMon(EventHandler h); - ~IMon(); - - static bool is_active(); - -- Status express(const char *name, struct stat *stat_return); -- Status revoke(const char *name, dev_t dev, ino_t ino); -+ virtual Status express(const char *name, struct stat *stat_return); -+ virtual Status revoke(const char *name, dev_t dev, ino_t ino); - - private: -- - // Class Variables - - static int imonfd; ---- fam-2.7.0/src/Interest.h 2004-01-30 00:00:00.000000000 +0200 -+++ fam-2.7.0.dnotify/src/Interest.h 2004-01-30 00:00:00.000000000 +0200 -@@ -32,7 +32,7 @@ - - class Event; - class FileSystem; --class IMon; -+class Monitor; - struct stat; - - // Interest -- abstract base class for filesystem entities of interest. -@@ -74,7 +74,7 @@ - - // Public Class Method - -- static void imon_handler(dev_t, ino_t, int event); -+ static void monitor_handler(dev_t, ino_t, int event); - - static void enable_xtab_verification(bool enable); - -@@ -121,7 +121,7 @@ - - // Class Variables - -- static IMon imon; -+ static Monitor *monitor; - static Interest *hashtable[HASHSIZE]; - static bool xtab_verification; - ---- fam-2.7.0/src/Makefile.am 2003-01-19 13:00:17.000000000 +0100 -+++ fam-2.7.0.dnotify/src/Makefile.am 2004-01-30 13:50:38.000000000 +0100 -@@ -71,7 +71,11 @@ - main.c++ \ - timeval.c++ \ - timeval.h \ -- @MONITOR_FUNCS@.c++ -+ Monitor.h \ -+ DNotify.h \ -+ DNotify.c++ \ -+ @MONITOR_FUNCS@.c++ - --EXTRA_famd_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++ -+EXTRA_famd_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++ DNotify.c++ \ -+ DNotify.h Monitor.h - ---- fam-2.7.0/src/Monitor.h 2004-01-30 00:00:00.000000000 +0200 -+++ fam-2.7.0.dnotify/src/Monitor.h 2004-01-30 00:00:00.000000000 +0200 -@@ -0,0 +1,57 @@ -+// Copyright (C) 2001 Red Hat, Inc. All Rights Reserved. -+// Copyright (C) 1999 Silicon Graphics, Inc. All Rights Reserved. -+// -+// This program is free software; you can redistribute it and/or modify it -+// under the terms of version 2 of the GNU General Public License as -+// published by the Free Software Foundation. -+// -+// This program is distributed in the hope that it would be useful, but -+// WITHOUT ANY WARRANTY; without even the implied warranty of -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Further, any -+// license provided herein, whether implied or otherwise, is limited to -+// this program in accordance with the express provisions of the GNU -+// General Public License. Patent licenses, if any, provided herein do not -+// apply to combinations of this program with other product or programs, or -+// any other product whatsoever. This program is distributed without any -+// warranty that the program is delivered free of the rightful claim of any -+// third person by way of infringement or the like. See the GNU General -+// Public License for more details. -+// -+// You should have received a copy of the GNU General Public License along -+// with this program; if not, write the Free Software Foundation, Inc., 59 -+// Temple Place - Suite 330, Boston MA 02111-1307, USA. -+ -+#ifndef Monitor_included -+#define Monitor_included -+ -+#include "config.h" -+#include <sys/stat.h> -+#include <sys/types.h> -+ -+struct stat; -+ -+// Monitor is an abstract baseclass for differend file monitoring -+// systems. The original system used was IMon, and the Montor API -+// is heavily influenced by that. -+// There can only be one instantiation of the Monitor object. -+// -+// The user of this object uses express() and revoke() to -+// express/revoke interest in a file to imon. There is also -+// a callback, the EventHandler. When an event comes in, -+// the EventHandler is called. -+// -+// The main implementers of the Monitor class is IMon and DNotify -+ -+class Monitor { -+public: -+ -+ enum Status { OK = 0, BAD = -1 }; -+ enum Event { EXEC, EXIT, CHANGE }; -+ -+ typedef void (*EventHandler)(dev_t, ino_t, int event); -+ -+ virtual Status express(const char *name, struct stat *stat_return) = 0; -+ virtual Status revoke(const char *name, dev_t dev, ino_t ino) = 0; -+}; -+ -+#endif /* !Monitor_included */ diff --git a/extra/fam/fam-2.7.0-largefiles.patch b/extra/fam/fam-2.7.0-largefiles.patch deleted file mode 100644 index 60de9a494..000000000 --- a/extra/fam/fam-2.7.0-largefiles.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- fam-2.7.0/common.am 2003-01-19 06:09:08.000000000 -0600 -+++ fam-2.7.0.largefile/common.am 2005-01-12 19:08:06.462113110 -0600 -@@ -1,2 +1,5 @@ --INCLUDES = @FAM_INC@ -DFAM_CONF=\"@FAM_CONF@\" -+INCLUDES = @FAM_INC@ -DFAM_CONF=\"@FAM_CONF@\" \ -+ -D_FILE_OFFSET_BITS=64 \ -+ -D_LARGEFILE64_SOURCE -+ diff --git a/extra/fam/fam-2.7.0-limits.patch b/extra/fam/fam-2.7.0-limits.patch deleted file mode 100644 index 424895719..000000000 --- a/extra/fam/fam-2.7.0-limits.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- include/fam.h.orig 2005-05-25 09:26:38.000000000 +0000 -+++ include/fam.h 2005-05-25 09:27:04.000000000 +0000 -@@ -41,7 +41,7 @@ - *****************************************************************************/ - - /* For NAME_MAX - maximum # of chars in a filename */ --#include "limits.h" -+#include <limits.h> - - - diff --git a/extra/gimp-devel/uri-backend-libcurl.patch b/extra/gimp-devel/uri-backend-libcurl.patch deleted file mode 100644 index d3217a292..000000000 --- a/extra/gimp-devel/uri-backend-libcurl.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -aur gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c ---- gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c 2010-07-03 00:51:59.000000000 +0200 -+++ gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c 2011-06-23 19:15:30.000000000 +0200 -@@ -24,7 +23,6 @@ - #include <errno.h> - - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - - #include <glib/gstdio.h> -@@ -63,7 +61,7 @@ - - vinfo = curl_version_info (CURLVERSION_NOW); - -- protocols = g_string_new ("http:,ftp:"); -+ protocols = g_string_new ("http:,ftp:,gopher:"); - - if (vinfo->features & CURL_VERSION_SSL) - { -@@ -153,7 +151,7 @@ - FILE *out_file; - CURL *curl_handle; - CURLcode result; -- gint response_code; -+ glong response_code; - - gimp_progress_init (_("Connecting to server")); - -@@ -195,12 +193,12 @@ - - curl_easy_getinfo (curl_handle, CURLINFO_RESPONSE_CODE, &response_code); - -- if (response_code != 200) -+ if (response_code != 200 && response_code != 226 && response_code != 0) - { - fclose (out_file); - g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Opening '%s' for reading resulted in HTTP " -- "response code: %d"), -+ "response code: %ld"), - uri, response_code); - curl_easy_cleanup (curl_handle); - return FALSE; diff --git a/extra/gnutls/align.patch b/extra/gnutls/align.patch deleted file mode 100644 index dce5cf408..000000000 --- a/extra/gnutls/align.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/lib/accelerated/intel/aes-x86.c b/lib/accelerated/intel/aes-x86.c -index 6801e7e..ff5b714 100644 ---- a/lib/accelerated/intel/aes-x86.c -+++ b/lib/accelerated/intel/aes-x86.c -@@ -40,6 +40,10 @@ struct aes_ctx - uint8_t iv[16]; - }; - -+#define AESNI_MIN_ALIGN 16 -+#define AESNI_ALIGN(x) \ -+ ((void *)(((size_t)(x)+AESNI_MIN_ALIGN-1)&~(AESNI_MIN_ALIGN-1))) -+ - static int - aes_cipher_init (gnutls_cipher_algorithm_t algorithm, void **_ctx) - { -@@ -69,11 +73,11 @@ aes_cipher_setkey (void *_ctx, const void *userkey, size_t keysize) - struct aes_ctx *ctx = _ctx; - int ret; - -- ret = aesni_set_encrypt_key (userkey, keysize * 8, &ctx->expanded_key); -+ ret = aesni_set_encrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key)); - if (ret != 0) - return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED); - -- ret = aesni_set_decrypt_key (userkey, keysize * 8, &ctx->expanded_key_dec); -+ ret = aesni_set_decrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key_dec)); - if (ret != 0) - return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED); - -@@ -95,7 +99,7 @@ aes_encrypt (void *_ctx, const void *src, size_t src_size, - { - struct aes_ctx *ctx = _ctx; - -- aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key, ctx->iv, 1); -+ aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key), ctx->iv, 1); - return 0; - } - -@@ -105,7 +109,7 @@ aes_decrypt (void *_ctx, const void *src, size_t src_size, - { - struct aes_ctx *ctx = _ctx; - -- aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key_dec, ctx->iv, 0); -+ aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key_dec), ctx->iv, 0); - - return 0; - } -diff --git a/lib/accelerated/intel/aes-x86.h b/lib/accelerated/intel/aes-x86.h -index 8f49ff3..20a169e 100644 ---- a/lib/accelerated/intel/aes-x86.h -+++ b/lib/accelerated/intel/aes-x86.h -@@ -11,10 +11,11 @@ void register_x86_crypto (void); - # define ALIGN16 - #endif - -+#define AES_KEY_ALIGN_SIZE 8 - #define AES_MAXNR 14 - typedef struct - { -- uint32_t ALIGN16 rd_key[4 * (AES_MAXNR + 1)]; -+ uint32_t rd_key[4 * (AES_MAXNR + 1)+AES_KEY_ALIGN_SIZE]; - int rounds; - } AES_KEY; - diff --git a/extra/gpsd/LICENSE b/extra/gpsd/LICENSE deleted file mode 100644 index 076538678..000000000 --- a/extra/gpsd/LICENSE +++ /dev/null @@ -1,38 +0,0 @@ - COPYRIGHTS - -Compilation copyright is held by the GPSD project. All rights reserved. - -GPSD project copyrights are assigned to the project lead, currently -Eric S. Raymond. Other portions of the GPSD code are Copyright (c) -1997, 1998, 1999, 2000, 2001, 2002 by Remco Treffkorn, and others -Copyright (c) 2005 by Eric S. Raymond. For other copyrights, see -individual files. - - BSD LICENSE - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met:<P> - -Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer.<P> - -Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution.<P> - -Neither name of the GPSD project nor the names of its contributors -may be used to endorse or promote products derived from this software -without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/extra/gtk2/gdk_Make_background_changes_queue_a_repaint.patch b/extra/gtk2/gdk_Make_background_changes_queue_a_repaint.patch deleted file mode 100644 index 40aa187e6..000000000 --- a/extra/gtk2/gdk_Make_background_changes_queue_a_repaint.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 254b9a4c540e3dff1dcd17db2ceea6a9fa5df973 Mon Sep 17 00:00:00 2001 -From: Benjamin Otte <otte@redhat.com> -Date: Thu, 09 Jun 2011 04:29:45 +0000 -Subject: gdk: Make background changes queue a repaint - -For client-side windows, we need to queue a repaint when the background -changes. For native windows, the windowing system does take care of it, -but client-side windows are our own, so we gotta do it manually. - -https://bugzilla.gnome.org/show_bug.cgi?id=652102 ---- -diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c -index f058570..10d83ab 100644 ---- a/gdk/gdkwindow.c -+++ b/gdk/gdkwindow.c -@@ -8004,11 +8004,15 @@ gdk_window_set_background (GdkWindow *window, - } - - if (!GDK_WINDOW_DESTROYED (window) && -- gdk_window_has_impl (private) && - !private->input_only) - { -- impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl); -- impl_iface->set_background (window, &private->bg_color); -+ if (gdk_window_has_impl (private)) -+ { -+ impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl); -+ impl_iface->set_background (window, &private->bg_color); -+ } -+ else -+ gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL); - } - } - -@@ -8077,11 +8081,15 @@ gdk_window_set_back_pixmap (GdkWindow *window, - private->bg_pixmap = GDK_NO_BG; - - if (!GDK_WINDOW_DESTROYED (window) && -- gdk_window_has_impl (private) && - !private->input_only) - { -- impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl); -- impl_iface->set_back_pixmap (window, private->bg_pixmap); -+ if (gdk_window_has_impl (private)) -+ { -+ impl_iface = GDK_WINDOW_IMPL_GET_IFACE (private->impl); -+ impl_iface->set_back_pixmap (window, private->bg_pixmap); -+ } -+ else -+ gdk_window_invalidate_rect_full (window, NULL, TRUE, CLEAR_BG_ALL); - } - } - --- -cgit v0.9 diff --git a/extra/kdeedu-marble/gpsd-2.96.patch b/extra/kdeedu-marble/gpsd-2.96.patch deleted file mode 100644 index e27702181..000000000 --- a/extra/kdeedu-marble/gpsd-2.96.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp -+++ marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp -@@ -18,6 +18,9 @@ using namespace Marble; - - GpsdConnection::GpsdConnection( QObject* parent ) - : QObject( parent ), -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ m_gpsd("localhost", DEFAULT_GPSD_PORT), -+#endif - m_timer( 0 ) - { - connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) ); -@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject* - void GpsdConnection::initialize() - { - m_timer.stop(); -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ gps_data_t* data; -+#else - gps_data_t* data = m_gpsd.open(); -+#endif - if ( data ) { - m_status = PositionProviderStatusAcquiring; - emit statusChanged( m_status ); -@@ -73,8 +80,16 @@ void GpsdConnection::initialize() - void GpsdConnection::update() - { - #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET ) -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ if ( m_gpsd.waiting(0) ) { -+#else - if ( m_gpsd.waiting() ) { -+#endif -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ gps_data_t* data = m_gpsd.read(); -+#else - gps_data_t* data = m_gpsd.poll(); -+#endif - if ( data && data->set & PACKET_SET ) { - emit gpsdInfo( *data ); - } diff --git a/extra/kdiff3/docbook.patch b/extra/kdiff3/docbook.patch deleted file mode 100644 index b957e51fd..000000000 --- a/extra/kdiff3/docbook.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -r --unified kdiff3-0.9.95/doc/de/index.docbook kdiff3-0.9.95-neu/doc/de/index.docbook ---- kdiff3-0.9.95/doc/de/index.docbook 2010-10-11 23:51:27.575286877 +0200 -+++ kdiff3-0.9.95-neu/doc/de/index.docbook 2010-10-11 23:52:40.138829992 +0200 -@@ -1,5 +1,5 @@ - <?xml version="1.0" ?> --<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ -+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kdiff3 "<application - >KDiff3</application - >"> -diff -r --unified kdiff3-0.9.95/doc/fr/index.docbook kdiff3-0.9.95-neu/doc/fr/index.docbook ---- kdiff3-0.9.95/doc/fr/index.docbook 2010-10-11 23:51:27.610931550 +0200 -+++ kdiff3-0.9.95-neu/doc/fr/index.docbook 2010-10-11 23:52:23.739728901 +0200 -@@ -1,5 +1,5 @@ - <?xml version="1.0" ?> --<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ -+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kdiff3 "<application - >KDiff3</application - >"> -diff -r --unified kdiff3-0.9.95/doc/it/index.docbook kdiff3-0.9.95-neu/doc/it/index.docbook ---- kdiff3-0.9.95/doc/it/index.docbook 2010-10-11 23:51:27.580378903 +0200 -+++ kdiff3-0.9.95-neu/doc/it/index.docbook 2010-10-11 23:52:32.462829209 +0200 -@@ -1,5 +1,5 @@ - <?xml version="1.0" ?> --<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ -+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kdiff3 "<application - >KDiff3</application - >"> -diff -r --unified kdiff3-0.9.95/doc/nl/index.docbook kdiff3-0.9.95-neu/doc/nl/index.docbook ---- kdiff3-0.9.95/doc/nl/index.docbook 2010-10-11 23:51:27.575286877 +0200 -+++ kdiff3-0.9.95-neu/doc/nl/index.docbook 2010-10-11 23:52:45.371829602 +0200 -@@ -1,5 +1,5 @@ - <?xml version="1.0" ?> --<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ -+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kdiff3 "<application - >KDiff3</application - >"> diff --git a/extra/libfwbuilder/PKGBUILD b/extra/libfwbuilder/PKGBUILD deleted file mode 100644 index d84df7014..000000000 --- a/extra/libfwbuilder/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 112491 2011-03-05 04:49:27Z eric $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=libfwbuilder -pkgver=4.1.3 -pkgrel=2 -pkgdesc="Support libraries for fwbuilder" -url="http://www.fwbuilder.org/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libxslt' 'net-snmp' 'gcc-libs') -makedepends=('qt') -source=("http://downloads.sourceforge.net/fwbuilder/${pkgname}-${pkgver}.tar.gz") -md5sums=('810e832a3cadc625917403f4b191fda2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make INSTALL_ROOT="${pkgdir}" install -} diff --git a/extra/opencv/pypkgpath_nondebian.patch b/extra/opencv/pypkgpath_nondebian.patch deleted file mode 100644 index 7c2d44b09..000000000 --- a/extra/opencv/pypkgpath_nondebian.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -aur OpenCV-2.3.0.orig/CMakeLists.txt OpenCV-2.3.0/CMakeLists.txt ---- OpenCV-2.3.0.orig/CMakeLists.txt 2011-07-07 17:31:35.656946629 +0800 -+++ OpenCV-2.3.0/CMakeLists.txt 2011-07-07 17:40:34.110696242 +0800 -@@ -620,11 +620,7 @@ - string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}") - if(UNIX) - set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv) -- if(APPLE) -- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.") -- else() #debian based assumed, install to the dist-packages. -- set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages CACHE PATH "Where to install the python packages.") -- endif() -+ set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages CACHE PATH "Where to install the python packages.") - endif() - if(WIN32) - get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE) diff --git a/extra/php/suhosin-patch-5.3.6-0.9.10.patch.gz b/extra/php/suhosin-patch-5.3.6-0.9.10.patch.gz Binary files differdeleted file mode 100644 index 7167ce2d0..000000000 --- a/extra/php/suhosin-patch-5.3.6-0.9.10.patch.gz +++ /dev/null diff --git a/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch b/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch deleted file mode 100644 index bf0966891..000000000 --- a/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch +++ /dev/null @@ -1,17 +0,0 @@ -# -# -# patch "libpurple/conversation.c" -# from [cd6817f4863abafef969359f65cc025f9483b401] -# to [19aac10ceebae1ee28788b6f0c02bcfcff0c8803] -# -============================================================ ---- libpurple/conversation.c cd6817f4863abafef969359f65cc025f9483b401 -+++ libpurple/conversation.c 19aac10ceebae1ee28788b6f0c02bcfcff0c8803 -@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC - } - - g_hash_table_remove_all(chat->users); -- chat->users = NULL; - - g_list_free(users); - chat->in_room = NULL; diff --git a/extra/polkit/CVE-2011-1485.patch b/extra/polkit/CVE-2011-1485.patch deleted file mode 100644 index f7054a63a..000000000 --- a/extra/polkit/CVE-2011-1485.patch +++ /dev/null @@ -1,908 +0,0 @@ -From dd848a42a64a3b22a0cc60f6657b56ce9b6010ae Mon Sep 17 00:00:00 2001 -From: David Zeuthen <davidz@redhat.com> -Date: Thu, 31 Mar 2011 16:59:09 +0000 -Subject: PolkitUnixProcess: Clarify that the real uid is returned, not the effective one - -On Linux, also switch to parsing /proc/<pid>/status instead of relying -on the st_uid returned by stat(2) to be the uid we want. - -This was pointed out by Neel Mehta <nmehta@google.com>. Thanks! - -Signed-off-by: David Zeuthen <davidz@redhat.com> ---- -diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c -index d95a1d4..876da69 100644 ---- a/src/polkit/polkitunixprocess.c -+++ b/src/polkit/polkitunixprocess.c -@@ -24,9 +24,7 @@ - #endif - - #include <sys/types.h> --#ifndef HAVE_FREEBSD --#include <sys/stat.h> --#else -+#ifdef HAVE_FREEBSD - #include <sys/param.h> - #include <sys/sysctl.h> - #include <sys/user.h> -@@ -34,6 +32,7 @@ - #include <stdlib.h> - #include <string.h> - #include <errno.h> -+#include <stdio.h> - - #include "polkitunixprocess.h" - #include "polkitsubject.h" -@@ -208,6 +207,8 @@ polkit_unix_process_get_pid (PolkitUnixProcess *process) - * - * Gets the uid of the owner of @process. - * -+ * Note that this returns the real user-id (not the effective user-id) of @process. -+ * - * Returns: The UNIX user id of the owner for @process or 0 if @error is set. - **/ - gint -@@ -215,17 +216,21 @@ polkit_unix_process_get_owner (PolkitUnixProcess *process, - GError **error) - { - gint result; -+ gchar *contents; -+ gchar **lines; - #ifdef HAVE_FREEBSD - struct kinfo_proc p; - #else -- struct stat statbuf; -- char procbuf[32]; -+ gchar filename[64]; -+ guint n; - #endif - - g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0); - g_return_val_if_fail (error == NULL || *error == NULL, 0); - - result = 0; -+ lines = NULL; -+ contents = NULL; - - #ifdef HAVE_FREEBSD - if (get_kinfo_proc (process->pid, &p) == 0) -@@ -241,23 +246,52 @@ polkit_unix_process_get_owner (PolkitUnixProcess *process, - - result = p.ki_uid; - #else -- g_snprintf (procbuf, sizeof procbuf, "/proc/%d", process->pid); -- if (stat (procbuf, &statbuf) != 0) -+ -+ /* see 'man proc' for layout of the status file -+ * -+ * Uid, Gid: Real, effective, saved set, and file system UIDs (GIDs). -+ */ -+ g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid); -+ if (!g_file_get_contents (filename, -+ &contents, -+ NULL, -+ error)) - { -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "stat() failed for /proc/%d: %s", -- process->pid, -- g_strerror (errno)); - goto out; - } -+ lines = g_strsplit (contents, "\n", -1); -+ for (n = 0; lines != NULL && lines[n] != NULL; n++) -+ { -+ gint real_uid, effective_uid; -+ if (!g_str_has_prefix (lines[n], "Uid:")) -+ continue; -+ if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2) -+ { -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Unexpected line `%s' in file %s", -+ lines[n], -+ filename); -+ goto out; -+ } -+ else -+ { -+ result = real_uid; -+ goto out; -+ } -+ } - -- result = statbuf.st_uid; -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Didn't find any line starting with `Uid:' in file %s", -+ filename); - #endif - -- out: -- -+out: -+ g_strfreev (lines); -+ g_free (contents); - return result; - } - --- -cgit v0.8.3-6-g21f6 -From 129b6223a19e7fb2753f8cad7957ac5402394076 Mon Sep 17 00:00:00 2001 -From: David Zeuthen <davidz@redhat.com> -Date: Fri, 01 Apr 2011 16:09:45 +0000 -Subject: Make PolkitUnixProcess also record the uid of the process - -This is needed to avoid possible TOCTTOU issues since a process can -change both its real uid and effective uid. - -Signed-off-by: David Zeuthen <davidz@redhat.com> ---- -diff --git a/docs/polkit/polkit-1-sections.txt b/docs/polkit/polkit-1-sections.txt -index 12141e3..9f4fcf8 100644 ---- a/docs/polkit/polkit-1-sections.txt -+++ b/docs/polkit/polkit-1-sections.txt -@@ -145,10 +145,13 @@ POLKIT_UNIX_SESSION_GET_CLASS - PolkitUnixProcess - polkit_unix_process_new - polkit_unix_process_new_full -+polkit_unix_process_new_for_owner -+polkit_unix_process_set_pid - polkit_unix_process_get_pid -+polkit_unix_process_set_start_time - polkit_unix_process_get_start_time --polkit_unix_process_set_pid --polkit_unix_process_get_owner -+polkit_unix_process_set_uid -+polkit_unix_process_get_uid - <SUBSECTION Standard> - PolkitUnixProcessClass - POLKIT_UNIX_PROCESS -diff --git a/src/polkit/polkitsubject.c b/src/polkit/polkitsubject.c -index 577afec..d2c4c20 100644 ---- a/src/polkit/polkitsubject.c -+++ b/src/polkit/polkitsubject.c -@@ -238,13 +238,18 @@ polkit_subject_from_string (const gchar *str, - { - gint scanned_pid; - guint64 scanned_starttime; -- if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2) -+ gint scanned_uid; -+ if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT ":%d", &scanned_pid, &scanned_starttime, &scanned_uid) == 3) -+ { -+ subject = polkit_unix_process_new_for_owner (scanned_pid, scanned_starttime, scanned_uid); -+ } -+ else if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2) - { - subject = polkit_unix_process_new_full (scanned_pid, scanned_starttime); - } - else if (sscanf (str, "unix-process:%d", &scanned_pid) == 1) - { -- subject = polkit_unix_process_new_full (scanned_pid, 0); -+ subject = polkit_unix_process_new (scanned_pid); - if (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) == 0) - { - g_object_unref (subject); -@@ -297,6 +302,8 @@ polkit_subject_to_gvariant (PolkitSubject *subject) - g_variant_new_uint32 (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)))); - g_variant_builder_add (&builder, "{sv}", "start-time", - g_variant_new_uint64 (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)))); -+ g_variant_builder_add (&builder, "{sv}", "uid", -+ g_variant_new_int32 (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)))); - } - else if (POLKIT_IS_UNIX_SESSION (subject)) - { -@@ -395,6 +402,7 @@ polkit_subject_new_for_gvariant (GVariant *variant, - GVariant *v; - guint32 pid; - guint64 start_time; -+ gint32 uid; - - v = lookup_asv (details_gvariant, "pid", G_VARIANT_TYPE_UINT32, error); - if (v == NULL) -@@ -414,7 +422,18 @@ polkit_subject_new_for_gvariant (GVariant *variant, - start_time = g_variant_get_uint64 (v); - g_variant_unref (v); - -- ret = polkit_unix_process_new_full (pid, start_time); -+ v = lookup_asv (details_gvariant, "uid", G_VARIANT_TYPE_INT32, error); -+ if (v != NULL) -+ { -+ uid = g_variant_get_int32 (v); -+ g_variant_unref (v); -+ } -+ else -+ { -+ uid = -1; -+ } -+ -+ ret = polkit_unix_process_new_for_owner (pid, start_time, uid); - } - else if (g_strcmp0 (kind, "unix-session") == 0) - { -diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c -index 876da69..913be3a 100644 ---- a/src/polkit/polkitunixprocess.c -+++ b/src/polkit/polkitunixprocess.c -@@ -62,6 +62,7 @@ struct _PolkitUnixProcess - - gint pid; - guint64 start_time; -+ gint uid; - }; - - struct _PolkitUnixProcessClass -@@ -74,6 +75,7 @@ enum - PROP_0, - PROP_PID, - PROP_START_TIME, -+ PROP_UID - }; - - static void subject_iface_init (PolkitSubjectIface *subject_iface); -@@ -81,6 +83,9 @@ static void subject_iface_init (PolkitSubjectIface *subject_iface); - static guint64 get_start_time_for_pid (gint pid, - GError **error); - -+static gint _polkit_unix_process_get_owner (PolkitUnixProcess *process, -+ GError **error); -+ - #ifdef HAVE_FREEBSD - static gboolean get_kinfo_proc (gint pid, struct kinfo_proc *p); - #endif -@@ -92,6 +97,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixProcess, polkit_unix_process, G_TYPE_OBJECT, - static void - polkit_unix_process_init (PolkitUnixProcess *unix_process) - { -+ unix_process->uid = -1; - } - - static void -@@ -108,6 +114,10 @@ polkit_unix_process_get_property (GObject *object, - g_value_set_int (value, unix_process->pid); - break; - -+ case PROP_UID: -+ g_value_set_int (value, unix_process->uid); -+ break; -+ - case PROP_START_TIME: - g_value_set_uint64 (value, unix_process->start_time); - break; -@@ -132,6 +142,14 @@ polkit_unix_process_set_property (GObject *object, - polkit_unix_process_set_pid (unix_process, g_value_get_int (value)); - break; - -+ case PROP_UID: -+ polkit_unix_process_set_uid (unix_process, g_value_get_int (value)); -+ break; -+ -+ case PROP_START_TIME: -+ polkit_unix_process_set_start_time (unix_process, g_value_get_uint64 (value)); -+ break; -+ - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; -@@ -139,12 +157,39 @@ polkit_unix_process_set_property (GObject *object, - } - - static void -+polkit_unix_process_constructed (GObject *object) -+{ -+ PolkitUnixProcess *process = POLKIT_UNIX_PROCESS (object); -+ -+ /* sets start_time and uid in case they are unset */ -+ -+ if (process->start_time == 0) -+ process->start_time = get_start_time_for_pid (process->pid, NULL); -+ -+ if (process->uid == -1) -+ { -+ GError *error; -+ error = NULL; -+ process->uid = _polkit_unix_process_get_owner (process, &error); -+ if (error != NULL) -+ { -+ process->uid = -1; -+ g_error_free (error); -+ } -+ } -+ -+ if (G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed != NULL) -+ G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed (object); -+} -+ -+static void - polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - { - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->get_property = polkit_unix_process_get_property; - gobject_class->set_property = polkit_unix_process_set_property; -+ gobject_class->constructed = polkit_unix_process_constructed; - - /** - * PolkitUnixProcess:pid: -@@ -156,7 +201,7 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - g_param_spec_int ("pid", - "Process ID", - "The UNIX process ID", -- -1, -+ 0, - G_MAXINT, - 0, - G_PARAM_CONSTRUCT | -@@ -166,6 +211,27 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - G_PARAM_STATIC_NICK)); - - /** -+ * PolkitUnixProcess:uid: -+ * -+ * The UNIX user id of the process or -1 if unknown. -+ * -+ * Note that this is the real user-id, not the effective user-id. -+ */ -+ g_object_class_install_property (gobject_class, -+ PROP_UID, -+ g_param_spec_int ("uid", -+ "User ID", -+ "The UNIX user ID", -+ -1, -+ G_MAXINT, -+ -1, -+ G_PARAM_CONSTRUCT | -+ G_PARAM_READWRITE | -+ G_PARAM_STATIC_NAME | -+ G_PARAM_STATIC_BLURB | -+ G_PARAM_STATIC_NICK)); -+ -+ /** - * PolkitUnixProcess:start-time: - * - * The start time of the process. -@@ -178,7 +244,8 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - 0, - G_MAXUINT64, - 0, -- G_PARAM_READABLE | -+ G_PARAM_CONSTRUCT | -+ G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_BLURB | - G_PARAM_STATIC_NICK)); -@@ -186,113 +253,50 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - } - - /** -- * polkit_unix_process_get_pid: -+ * polkit_unix_process_get_uid: - * @process: A #PolkitUnixProcess. - * -- * Gets the process id for @process. -+ * Gets the user id for @process. Note that this is the real user-id, -+ * not the effective user-id. - * -- * Returns: The process id for @process. -+ * Returns: The user id for @process or -1 if unknown. - */ - gint --polkit_unix_process_get_pid (PolkitUnixProcess *process) -+polkit_unix_process_get_uid (PolkitUnixProcess *process) - { -- g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0); -- return process->pid; -+ g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), -1); -+ return process->uid; - } - - /** -- * polkit_unix_process_get_owner: -+ * polkit_unix_process_set_uid: - * @process: A #PolkitUnixProcess. -- * @error: (allow-none): Return location for error or %NULL. -+ * @uid: The user id to set for @process or -1 to unset it. - * -- * Gets the uid of the owner of @process. -+ * Sets the (real, not effective) user id for @process. -+ */ -+void -+polkit_unix_process_set_uid (PolkitUnixProcess *process, -+ gint uid) -+{ -+ g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process)); -+ g_return_if_fail (uid >= -1); -+ process->uid = uid; -+} -+ -+/** -+ * polkit_unix_process_get_pid: -+ * @process: A #PolkitUnixProcess. - * -- * Note that this returns the real user-id (not the effective user-id) of @process. -+ * Gets the process id for @process. - * -- * Returns: The UNIX user id of the owner for @process or 0 if @error is set. -- **/ -+ * Returns: The process id for @process. -+ */ - gint --polkit_unix_process_get_owner (PolkitUnixProcess *process, -- GError **error) -+polkit_unix_process_get_pid (PolkitUnixProcess *process) - { -- gint result; -- gchar *contents; -- gchar **lines; --#ifdef HAVE_FREEBSD -- struct kinfo_proc p; --#else -- gchar filename[64]; -- guint n; --#endif -- - g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0); -- g_return_val_if_fail (error == NULL || *error == NULL, 0); -- -- result = 0; -- lines = NULL; -- contents = NULL; -- --#ifdef HAVE_FREEBSD -- if (get_kinfo_proc (process->pid, &p) == 0) -- { -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "get_kinfo_proc() failed for pid %d: %s", -- process->pid, -- g_strerror (errno)); -- goto out; -- } -- -- result = p.ki_uid; --#else -- -- /* see 'man proc' for layout of the status file -- * -- * Uid, Gid: Real, effective, saved set, and file system UIDs (GIDs). -- */ -- g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid); -- if (!g_file_get_contents (filename, -- &contents, -- NULL, -- error)) -- { -- goto out; -- } -- lines = g_strsplit (contents, "\n", -1); -- for (n = 0; lines != NULL && lines[n] != NULL; n++) -- { -- gint real_uid, effective_uid; -- if (!g_str_has_prefix (lines[n], "Uid:")) -- continue; -- if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2) -- { -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "Unexpected line `%s' in file %s", -- lines[n], -- filename); -- goto out; -- } -- else -- { -- result = real_uid; -- goto out; -- } -- } -- -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "Didn't find any line starting with `Uid:' in file %s", -- filename); --#endif -- --out: -- g_strfreev (lines); -- g_free (contents); -- return result; -+ return process->pid; - } - - /** -@@ -311,6 +315,21 @@ polkit_unix_process_get_start_time (PolkitUnixProcess *process) - } - - /** -+ * polkit_unix_process_set_start_time: -+ * @process: A #PolkitUnixProcess. -+ * @start_time: The start time for @pid. -+ * -+ * Set the start time of @process. -+ */ -+void -+polkit_unix_process_set_start_time (PolkitUnixProcess *process, -+ guint64 start_time) -+{ -+ g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process)); -+ process->start_time = start_time; -+} -+ -+/** - * polkit_unix_process_set_pid: - * @process: A #PolkitUnixProcess. - * @pid: A process id. -@@ -323,18 +342,17 @@ polkit_unix_process_set_pid (PolkitUnixProcess *process, - { - g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process)); - process->pid = pid; -- if (pid != (gint) -1) -- process->start_time = get_start_time_for_pid (pid, NULL); - } - - /** - * polkit_unix_process_new: - * @pid: The process id. - * -- * Creates a new #PolkitUnixProcess for @pid. The start time of the -- * process will be looked up in using e.g. the -- * <filename>/proc</filename> filesystem depending on the platform in -- * use. -+ * Creates a new #PolkitUnixProcess for @pid. -+ * -+ * The uid and start time of the process will be looked up in using -+ * e.g. the <filename>/proc</filename> filesystem depending on the -+ * platform in use. - * - * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref(). - */ -@@ -353,22 +371,42 @@ polkit_unix_process_new (gint pid) - * - * Creates a new #PolkitUnixProcess object for @pid and @start_time. - * -+ * The uid of the process will be looked up in using e.g. the -+ * <filename>/proc</filename> filesystem depending on the platform in -+ * use. -+ * - * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref(). - */ - PolkitSubject * - polkit_unix_process_new_full (gint pid, - guint64 start_time) - { -- PolkitUnixProcess *process; -- -- process = POLKIT_UNIX_PROCESS (polkit_unix_process_new ((gint) -1)); -- process->pid = pid; -- if (start_time != 0) -- process->start_time = start_time; -- else -- process->start_time = get_start_time_for_pid (pid, NULL); -+ return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS, -+ "pid", pid, -+ "start_time", start_time, -+ NULL)); -+} - -- return POLKIT_SUBJECT (process); -+/** -+ * polkit_unix_process_new_for_owner: -+ * @pid: The process id. -+ * @start_time: The start time for @pid or 0 to look it up in e.g. <filename>/proc</filename>. -+ * @uid: The (real, not effective) uid of the owner of @pid or -1 to look it up in e.g. <filename>/proc</filename>. -+ * -+ * Creates a new #PolkitUnixProcess object for @pid, @start_time and @uid. -+ * -+ * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref(). -+ */ -+PolkitSubject * -+polkit_unix_process_new_for_owner (gint pid, -+ guint64 start_time, -+ gint uid) -+{ -+ return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS, -+ "pid", pid, -+ "start_time", start_time, -+ "uid", uid, -+ NULL)); - } - - static guint -@@ -616,3 +654,95 @@ out: - - return start_time; - } -+ -+static gint -+_polkit_unix_process_get_owner (PolkitUnixProcess *process, -+ GError **error) -+{ -+ gint result; -+ gchar *contents; -+ gchar **lines; -+#ifdef HAVE_FREEBSD -+ struct kinfo_proc p; -+#else -+ gchar filename[64]; -+ guint n; -+#endif -+ -+ g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0); -+ g_return_val_if_fail (error == NULL || *error == NULL, 0); -+ -+ result = 0; -+ lines = NULL; -+ contents = NULL; -+ -+#ifdef HAVE_FREEBSD -+ if (get_kinfo_proc (process->pid, &p) == 0) -+ { -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "get_kinfo_proc() failed for pid %d: %s", -+ process->pid, -+ g_strerror (errno)); -+ goto out; -+ } -+ -+ result = p.ki_uid; -+#else -+ -+ /* see 'man proc' for layout of the status file -+ * -+ * Uid, Gid: Real, effective, saved set, and file system UIDs (GIDs). -+ */ -+ g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid); -+ if (!g_file_get_contents (filename, -+ &contents, -+ NULL, -+ error)) -+ { -+ goto out; -+ } -+ lines = g_strsplit (contents, "\n", -1); -+ for (n = 0; lines != NULL && lines[n] != NULL; n++) -+ { -+ gint real_uid, effective_uid; -+ if (!g_str_has_prefix (lines[n], "Uid:")) -+ continue; -+ if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2) -+ { -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Unexpected line `%s' in file %s", -+ lines[n], -+ filename); -+ goto out; -+ } -+ else -+ { -+ result = real_uid; -+ goto out; -+ } -+ } -+ -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Didn't find any line starting with `Uid:' in file %s", -+ filename); -+#endif -+ -+out: -+ g_strfreev (lines); -+ g_free (contents); -+ return result; -+} -+ -+/* deprecated public method */ -+gint -+polkit_unix_process_get_owner (PolkitUnixProcess *process, -+ GError **error) -+{ -+ return _polkit_unix_process_get_owner (process, error); -+} -diff --git a/src/polkit/polkitunixprocess.h b/src/polkit/polkitunixprocess.h -index b88cd03..531a57d 100644 ---- a/src/polkit/polkitunixprocess.h -+++ b/src/polkit/polkitunixprocess.h -@@ -47,16 +47,24 @@ typedef struct _PolkitUnixProcess PolkitUnixProcess; - typedef struct _PolkitUnixProcessClass PolkitUnixProcessClass; - - GType polkit_unix_process_get_type (void) G_GNUC_CONST; --PolkitSubject *polkit_unix_process_new (gint pid); --PolkitSubject *polkit_unix_process_new_full (gint pid, -- guint64 start_time); -- -+PolkitSubject *polkit_unix_process_new (gint pid); -+PolkitSubject *polkit_unix_process_new_full (gint pid, -+ guint64 start_time); -+PolkitSubject *polkit_unix_process_new_for_owner (gint pid, -+ guint64 start_time, -+ gint uid); - gint polkit_unix_process_get_pid (PolkitUnixProcess *process); - guint64 polkit_unix_process_get_start_time (PolkitUnixProcess *process); -+gint polkit_unix_process_get_uid (PolkitUnixProcess *process); - void polkit_unix_process_set_pid (PolkitUnixProcess *process, - gint pid); -+void polkit_unix_process_set_uid (PolkitUnixProcess *process, -+ gint uid); -+void polkit_unix_process_set_start_time (PolkitUnixProcess *process, -+ guint64 start_time); -+ - gint polkit_unix_process_get_owner (PolkitUnixProcess *process, -- GError **error); -+ GError **error) G_GNUC_DEPRECATED_FOR (polkit_unix_process_get_uid); - - G_END_DECLS - --- -cgit v0.8.3-6-g21f6 -From c23d74447c7615dc74dae259f0fc3688ec988867 Mon Sep 17 00:00:00 2001 -From: David Zeuthen <davidz@redhat.com> -Date: Fri, 01 Apr 2011 16:12:27 +0000 -Subject: Use polkit_unix_process_get_uid() to get the owner of a process - -This avoids a TOCTTOU problem. - -Signed-off-by: David Zeuthen <davidz@redhat.com> ---- -diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c -index 495f752..9c331b6 100644 ---- a/src/polkitbackend/polkitbackendsessionmonitor.c -+++ b/src/polkitbackend/polkitbackendsessionmonitor.c -@@ -293,14 +293,15 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor - - if (POLKIT_IS_UNIX_PROCESS (subject)) - { -- local_error = NULL; -- uid = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject), &local_error); -- if (local_error != NULL) -+ uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)); -+ if ((gint) uid == -1) - { -- g_propagate_prefixed_error (error, local_error, "Error getting user for process: "); -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Unix process subject does not have uid set"); - goto out; - } -- - ret = polkit_unix_user_new (uid); - } - else if (POLKIT_IS_SYSTEM_BUS_NAME (subject)) --- -cgit v0.8.3-6-g21f6 -From 3b12cfac29dddd27f1f166a7574d8374cc1dccf2 Mon Sep 17 00:00:00 2001 -From: David Zeuthen <davidz@redhat.com> -Date: Fri, 01 Apr 2011 16:13:15 +0000 -Subject: pkexec: Avoid TOCTTOU problems with parent process - -In a nutshell, the parent process may change its uid (either real- or -effective uid) after launching pkexec. It can do this by exec()'ing -e.g. a setuid root program. - -To avoid this problem, just use the uid the parent process had when it -executed pkexec. This happens to be the same uid of the pkexec process -itself. - -Additionally, remove some dubious code that allowed pkexec to continue -when the parent process died as there is no reason to support -something like that. Also ensure that the pkexec process is killed if -the parent process dies. - -This problem was pointed out by Neel Mehta <nmehta@google.com>. - -Signed-off-by: David Zeuthen <davidz@redhat.com> ---- -diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c -index 9217954..3e656be 100644 ---- a/src/programs/pkexec.c -+++ b/src/programs/pkexec.c -@@ -35,6 +35,10 @@ - #include <pwd.h> - #include <errno.h> - -+#ifdef __linux__ -+#include <sys/prctl.h> -+#endif -+ - #include <glib/gi18n.h> - - #ifdef POLKIT_AUTHFW_PAM -@@ -423,7 +427,6 @@ main (int argc, char *argv[]) - GPtrArray *saved_env; - gchar *opt_user; - pid_t pid_of_caller; -- uid_t uid_of_caller; - gpointer local_agent_handle; - - ret = 127; -@@ -598,40 +601,49 @@ main (int argc, char *argv[]) - */ - g_type_init (); - -- /* now check if the program that invoked us is authorized */ -+ /* make sure we are nuked if the parent process dies */ -+#ifdef __linux__ -+ if (prctl (PR_SET_PDEATHSIG, SIGTERM) != 0) -+ { -+ g_printerr ("prctl(PR_SET_PDEATHSIG, SIGTERM) failed: %s\n", g_strerror (errno)); -+ goto out; -+ } -+#else -+#warning "Please add OS specific code to catch when the parent dies" -+#endif -+ -+ /* Figure out the parent process */ - pid_of_caller = getppid (); - if (pid_of_caller == 1) - { - /* getppid() can return 1 if the parent died (meaning that we are reaped -- * by /sbin/init); get process group leader instead - for example, this -- * happens when launching via gnome-panel (alt+f2, then 'pkexec gedit'). -+ * by /sbin/init); In that case we simpy bail. - */ -- pid_of_caller = getpgrp (); -- } -- -- subject = polkit_unix_process_new (pid_of_caller); -- if (subject == NULL) -- { -- g_printerr ("No such process for pid %d: %s\n", (gint) pid_of_caller, error->message); -- g_error_free (error); -+ g_printerr ("Refusing to render service to dead parents.\n"); - goto out; - } - -- /* paranoia: check that the uid of pid_of_caller matches getuid() */ -- error = NULL; -- uid_of_caller = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject), -- &error); -- if (error != NULL) -- { -- g_printerr ("Error determing pid of caller (pid %d): %s\n", (gint) pid_of_caller, error->message); -- g_error_free (error); -- goto out; -- } -- if (uid_of_caller != getuid ()) -- { -- g_printerr ("User of caller (%d) does not match our uid (%d)\n", uid_of_caller, getuid ()); -- goto out; -- } -+ /* This process we want to check an authorization for is the process -+ * that launched us - our parent process. -+ * -+ * At the time the parent process fork()'ed and exec()'ed us, the -+ * process had the same real-uid that we have now. So we use this -+ * real-uid instead of of looking it up to avoid TOCTTOU issues -+ * (consider the parent process exec()'ing a setuid helper). -+ * -+ * On the other hand, the monotonic process start-time is guaranteed -+ * to never change so it's safe to look that up given only the PID -+ * since we are guaranteed to be nuked if the parent goes away -+ * (cf. the prctl(2) call above). -+ */ -+ subject = polkit_unix_process_new_for_owner (pid_of_caller, -+ 0, /* 0 means "look up start-time in /proc" */ -+ getuid ()); -+ /* really double-check the invariants guaranteed by the PolkitUnixProcess class */ -+ g_assert (subject != NULL); -+ g_assert (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)) == pid_of_caller); -+ g_assert (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)) >= 0); -+ g_assert (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) > 0); - - error = NULL; - authority = polkit_authority_get_sync (NULL /* GCancellable* */, &error); --- -cgit v0.8.3-6-g21f6 diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD deleted file mode 100644 index 388e9fb69..000000000 --- a/extra/pygobject/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# $Id: PKGBUILD 133523 2011-07-28 20:25:13Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=pygobject -pkgname=(pygobject py3gobject pygobject-devel) -pkgver=2.28.6 -pkgrel=1 -arch=('i686' 'x86_64') -license=('LGPL') -depends=('glib2' 'gobject-introspection') -makedepends=(python python2 python-cairo python2-cairo) -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz - python3-fix-build.patch - python3-fix-maketrans.patch) -options=('!libtool') -url="http://www.pygtk.org/" -sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8' - 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca' - '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a') - -build() { - cd "${srcdir}" - cp -a "${pkgbase}-${pkgver}" python2-build - mkdir devel - - ( - cd python2-build - export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr - make - ) - - ( - cd "${pkgbase}-${pkgver}" - #patches available in 2.28 branch but unreleased. - patch -Np1 -i "${srcdir}/python3-fix-build.patch" - patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" - - ./configure --prefix=/usr - make - ) -} - -package_pygobject() { - pkgdesc="Python 2 bindings for GObject" - depends+=('python2' 'python2-cairo' 'pygobject-devel') - - cd "${srcdir}/python2-build" - make DESTDIR="${pkgdir}" install - - find "$pkgdir"/usr/share/pygobject -name '*.py' | \ - xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" - - # Split devel stuff - mv "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} \ - "$srcdir/devel/" -} - -package_py3gobject() { - pkgdesc="Python 3 bindings for GObject" - depends+=('python' 'python-cairo' 'pygobject-devel') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # Delete devel stuff - rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} -} - -package_pygobject-devel() { - pkgdesc="Development files for the pygobject bindings" - depends=(python2) - - cd "${srcdir}/devel" - mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject/2.0} - - mv bin "$pkgdir/usr/" - mv include "$pkgdir/usr/" - mv pkgconfig "$pkgdir/usr/lib/" - mv gtk-doc "$pkgdir/usr/share/" - mv codegen "$pkgdir/usr/share/pygobject/2.0/" - mv xsl "$pkgdir/usr/share/pygobject/" -} diff --git a/extra/pygobject/python3-fix-build.patch b/extra/pygobject/python3-fix-build.patch deleted file mode 100644 index 4cb8cfe57..000000000 --- a/extra/pygobject/python3-fix-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro <icq@gnome.org> -Date: Thu, 21 Apr 2011 14:52:20 +0000 -Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore - ---- -diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c -index 81b9865..edf52d7 100644 ---- a/gi/pygi-foreign-cairo.c -+++ b/gi/pygi-foreign-cairo.c -@@ -30,7 +30,7 @@ - #include <pycairo/py3cairo.h> - #endif - --Pycairo_CAPI_t *Pycairo_CAPI; -+static Pycairo_CAPI_t *Pycairo_CAPI; - - #include "pygi-foreign.h" - -@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_info, - static PyMethodDef _gi_cairo_functions[] = {0,}; - PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo") - { -+#if PY_VERSION_HEX < 0x03000000 - Pycairo_IMPORT; -+#else -+ Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI"); -+#endif -+ - if (Pycairo_CAPI == NULL) - return PYGLIB_MODULE_ERROR_RETURN; - --- -cgit v0.9 diff --git a/extra/pygobject/python3-fix-maketrans.patch b/extra/pygobject/python3-fix-maketrans.patch deleted file mode 100644 index f5bc0e77c..000000000 --- a/extra/pygobject/python3-fix-maketrans.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martin.pitt@ubuntu.com> -Date: Wed, 13 Jul 2011 06:42:22 +0000 -Subject: [python3] Fix maketrans import - -Python3 moved the maketrans() function from the string module to a str method. -This unbreaks gi/module.py for Python 3 again. ---- -diff --git a/gi/module.py b/gi/module.py -index 70df76c..d56bdaf 100644 ---- a/gi/module.py -+++ b/gi/module.py -@@ -24,7 +24,11 @@ from __future__ import absolute_import - - import os - import gobject --import string -+try: -+ maketrans = ''.maketrans -+except AttributeError: -+ # fallback for Python 2 -+ from string import maketrans - - import gi - from .overrides import registry -@@ -124,7 +128,7 @@ class IntrospectionModule(object): - # Don't use upper() here to avoid locale specific - # identifier conversion (e. g. in Turkish 'i'.upper() == 'i') - # see https://bugzilla.gnome.org/show_bug.cgi?id=649165 -- ascii_upper_trans = string.maketrans( -+ ascii_upper_trans = maketrans( - 'abcdefgjhijklmnopqrstuvwxyz', - 'ABCDEFGJHIJKLMNOPQRSTUVWXYZ') - for value_info in info.get_values(): --- -cgit v0.9 diff --git a/extra/qt/qtbug-16292.patch b/extra/qt/qtbug-16292.patch deleted file mode 100644 index 9728e28f5..000000000 --- a/extra/qt/qtbug-16292.patch +++ /dev/null @@ -1,62 +0,0 @@ -From e340844bd614add505a39a3a6b915632476f6305 Mon Sep 17 00:00:00 2001 -From: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> -Date: Tue, 15 Feb 2011 11:19:26 +0100 -Subject: [PATCH] Fix crash in KPackageKit - -QTreeViewPrivate::itemHeight() may refer to an invalid QModelIndex -after calling QTreeView::indexRowSizeHint(). - -Same thing inside QTreeView::indexRowSizeHint(), since -QHeaderView::count() will call -QAbstractItemViewPrivate::executePostedLayout() which may invalidate -all the QModelIndex. - -Reviewed-by: Olivier -Task-number: QTBUG-16292 ---- - src/gui/itemviews/qtreeview.cpp | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp -index f1f3236..c0573bb 100644 ---- a/src/gui/itemviews/qtreeview.cpp -+++ b/src/gui/itemviews/qtreeview.cpp -@@ -2753,6 +2753,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const - - int start = -1; - int end = -1; -+ int indexRow = index.row(); - int count = d->header->count(); - bool emptyHeader = (count == 0); - QModelIndex parent = index.parent(); -@@ -2789,7 +2790,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const - int logicalColumn = emptyHeader ? column : d->header->logicalIndex(column); - if (d->header->isSectionHidden(logicalColumn)) - continue; -- QModelIndex idx = d->model->index(index.row(), logicalColumn, parent); -+ QModelIndex idx = d->model->index(indexRow, logicalColumn, parent); - if (idx.isValid()) { - QWidget *editor = d->editorForIndex(idx).editor; - if (editor && d->persistent.contains(editor)) { -@@ -3224,14 +3225,14 @@ int QTreeViewPrivate::itemHeight(int item) const - if (viewItems.isEmpty()) - return 0; - const QModelIndex &index = viewItems.at(item).index; -+ if (!index.isValid()) -+ return 0; - int height = viewItems.at(item).height; -- if (height <= 0 && index.isValid()) { -+ if (height <= 0) { - height = q_func()->indexRowSizeHint(index); - viewItems[item].height = height; - } -- if (!index.isValid() || height < 0) -- return 0; -- return height; -+ return qMax(height, 0); - } - - --- -1.6.1 - diff --git a/extra/soundtouch/ChangeLog b/extra/soundtouch/ChangeLog deleted file mode 100644 index 06d96ba3b..000000000 --- a/extra/soundtouch/ChangeLog +++ /dev/null @@ -1,10 +0,0 @@ -2010-02-06 Eric Belanger <eric@archlinux.org> - - * soundtouch 1.5.0-1 - * Upstream update - * Added shared libs - -2008-12-12 Eric Belanger <eric@archlinux.org> - - * soundtouch 1.3.1-3 - * Added to [extra] repo diff --git a/extra/udisks/01-mkfs-tempdir.patch b/extra/udisks/01-mkfs-tempdir.patch deleted file mode 100644 index 976108264..000000000 --- a/extra/udisks/01-mkfs-tempdir.patch +++ /dev/null @@ -1,17 +0,0 @@ -# Description: Daemon does not create /var/run/udisks/, so mkfs jobs fail. -# Just create the directory in /tmp, this is what /tmp is for, after all. -# Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=24265 - -Index: udisks/src/helpers/job-mkfs.c -=================================================================== ---- udisks.orig/src/helpers/job-mkfs.c 2010-12-05 23:08:54.587881164 +0100 -+++ udisks/src/helpers/job-mkfs.c 2010-12-05 23:09:12.399889312 +0100 -@@ -546,7 +546,7 @@ - /* take ownership of the device if requested */ - if (take_ownership_uid != 0 || take_ownership_gid != 0) - { -- char dir[256] = PACKAGE_LOCALSTATE_DIR "/run/udisks/job-mkfs-XXXXXX"; -+ char dir[256] = "/tmp/job-mkfs-XXXXXX"; - - if (mkdtemp (dir) == NULL) - { diff --git a/extra/udisks/fix_well_known_filesystems.patch b/extra/udisks/fix_well_known_filesystems.patch deleted file mode 100644 index 77eee26ba..000000000 --- a/extra/udisks/fix_well_known_filesystems.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur udisks-1.0.3.orig/src/device.c udisks-1.0.3/src/device.c ---- udisks-1.0.3.orig/src/device.c 2011-04-05 13:16:00.000000000 -0700 -+++ udisks-1.0.3/src/device.c 2011-05-03 13:27:39.064679418 -0700 -@@ -5902,7 +5902,7 @@ - "msdos", - "umsdos", - "vfat", -- "exfat" -+ "exfat", - "ntfs", - NULL, - }; diff --git a/extra/xfce4-sensors-plugin/git.patch b/extra/xfce4-sensors-plugin/git.patch deleted file mode 100644 index 0e2140765..000000000 --- a/extra/xfce4-sensors-plugin/git.patch +++ /dev/null @@ -1,13319 +0,0 @@ -From 4b280a23c2a26a77f616efef86ce9784ab513d23 Mon Sep 17 00:00:00 2001 -From: Fabian Nowak <nowak@kit.edu> -Date: Tue, 10 May 2011 09:18:53 +0000 -Subject: False -> FALSE - ---- -diff --git a/lib/sensors-interface.c b/lib/sensors-interface.c -index f501a54..1485e34 100644 ---- a/lib/sensors-interface.c -+++ b/lib/sensors-interface.c -@@ -484,7 +484,7 @@ init_widgets (t_sensors_dialog *sd) - iter, - 0, chipfeature->name, - 1, "0.0", /* chipfeature->formatted_value */ -- 2, False, /* chipfeature->show */ -+ 2, FALSE, /* chipfeature->show */ - 3, "#000000", /* chipfeature->color */ - 4, 0.0, /* chipfeature->min_value */ - 5, 0.0, /* chipfeature->max_value */ --- -cgit -From 2329169a8528ae02486c8703aed03e41b843d081 Mon Sep 17 00:00:00 2001 -From: Fabian Nowak <nowak@kit.edu> -Date: Tue, 10 May 2011 10:02:57 +0000 -Subject: substitute more libxfcegui4 by libxfce4ui; newer ltmain.sh - ---- -diff --git a/README b/README -index 54d05da..fa6b695 100644 ---- a/README -+++ b/README -@@ -10,12 +10,12 @@ Licence: GPL version 2 (or later at your option) - - Description: Reads your hardware sensor values and displays them in your panel - --Dependencies: libxfcegui4-4, libxfce4util-i4, libgtk2.0-0, -+Dependencies: libxfce4ui, libxfce4util, libgtk2.0-0, - xfce4-panel -- libxfcegui4-dev, libxfce4util-dev, libgtk2.0-dev, -+ libxfce4ui-dev, libxfce4util-dev, libgtk2.0-dev, - xfce4-panel-dev - --Optional: hddtemp, netcat, lmsensors3, working ACPI library -+Optional: hddtemp, netcat, lmsensors3, working ACPI library, libnotify, nvidia-utils/xnvctrl - - Installation: ./configure && make && [sudo] make install - -diff --git a/ltmain.sh b/ltmain.sh -index 6f650ae..7ed280b 100755 ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -1,9 +1,9 @@ -+# Generated from ltmain.m4sh. - --# libtool (GNU libtool) 2.4 -+# ltmain.sh (GNU libtool) 2.2.6b - # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 - --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, --# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. - # This is free software; see the source for copying conditions. There is NO - # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -@@ -32,56 +32,50 @@ - # - # Provide generalized library-building support services. - # --# --config show all configuration variables --# --debug enable verbose shell tracing --# -n, --dry-run display commands without modifying any files --# --features display basic configuration information and exit --# --mode=MODE use operation mode MODE --# --preserve-dup-deps don't remove duplicate dependency libraries --# --quiet, --silent don't print informational messages --# --no-quiet, --no-silent --# print informational messages (default) --# --tag=TAG use configuration variables from tag TAG --# -v, --verbose print more informational messages than default --# --no-verbose don't print the extra informational messages --# --version print version information --# -h, --help, --help-all print short, long, or detailed help message -+# --config show all configuration variables -+# --debug enable verbose shell tracing -+# -n, --dry-run display commands without modifying any files -+# --features display basic configuration information and exit -+# --mode=MODE use operation mode MODE -+# --preserve-dup-deps don't remove duplicate dependency libraries -+# --quiet, --silent don't print informational messages -+# --tag=TAG use configuration variables from tag TAG -+# -v, --verbose print informational messages (default) -+# --version print version information -+# -h, --help print short or long help message - # - # MODE must be one of the following: - # --# clean remove files from the build directory --# compile compile a source file into a libtool object --# execute automatically set library path, then run a program --# finish complete the installation of libtool libraries --# install install libraries or executables --# link create a library or an executable --# uninstall remove libraries from an installed directory -+# clean remove files from the build directory -+# compile compile a source file into a libtool object -+# execute automatically set library path, then run a program -+# finish complete the installation of libtool libraries -+# install install libraries or executables -+# link create a library or an executable -+# uninstall remove libraries from an installed directory - # --# MODE-ARGS vary depending on the MODE. When passed as first option, --# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -+# MODE-ARGS vary depending on the MODE. - # Try `$progname --help --mode=MODE' for a more detailed description of MODE. - # - # When reporting a bug, please describe a test case to reproduce it and - # include the following information: - # --# host-triplet: $host --# shell: $SHELL --# compiler: $LTCC --# compiler flags: $LTCFLAGS --# linker: $LD (gnu? $with_gnu_ld) --# $progname: (GNU libtool) 2.4 Debian-2.4-2 --# automake: $automake_version --# autoconf: $autoconf_version -+# host-triplet: $host -+# shell: $SHELL -+# compiler: $LTCC -+# compiler flags: $LTCFLAGS -+# linker: $LD (gnu? $with_gnu_ld) -+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 -+# automake: $automake_version -+# autoconf: $autoconf_version - # - # Report bugs to <bug-libtool@gnu.org>. --# GNU libtool home page: <http://www.gnu.org/software/libtool/>. --# General help using GNU software: <http://www.gnu.org/gethelp/>. - --PROGRAM=libtool -+PROGRAM=ltmain.sh - PACKAGE=libtool --VERSION="2.4 Debian-2.4-2" -+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" - TIMESTAMP="" --package_revision=1.3293 -+package_revision=1.3017 - - # Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -@@ -97,15 +91,10 @@ fi - BIN_SH=xpg4; export BIN_SH # for Tru64 - DUALCASE=1; export DUALCASE # for MKS sh - --# A function that is used when there is no print builtin or printf. --func_fallback_echo () --{ -- eval 'cat <<_LTECHO_EOF --$1 --_LTECHO_EOF' --} -- - # NLS nuisances: We save the old values to restore during execute mode. -+# Only set LANG and LC_ALL to C if already set. -+# These must not be set unconditionally because not all systems understand -+# e.g. LANG=C (notably SCO). - lt_user_locale= - lt_safe_locale= - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -@@ -118,24 +107,15 @@ do - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" - done --LC_ALL=C --LANGUAGE=C --export LANGUAGE LC_ALL - - $lt_unset CDPATH - - --# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh --# is ksh but when the shell is invoked as "sh" and the current value of --# the _XPG environment variable is not equal to 1 (one), the special --# positional parameter $0, within a function call, is the name of the --# function. --progpath="$0" - - - - : ${CP="cp -f"} --test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -+: ${ECHO="echo"} - : ${EGREP="/bin/grep -E"} - : ${FGREP="/bin/grep -F"} - : ${GREP="/bin/grep"} -@@ -164,27 +144,6 @@ IFS=" $lt_nl" - dirname="s,/[^/]*$,," - basename="s,^.*/,," - --# func_dirname file append nondir_replacement --# Compute the dirname of FILE. If nonempty, add APPEND to the result, --# otherwise set result to NONDIR_REPLACEMENT. --func_dirname () --{ -- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi --} # func_dirname may be replaced by extended shell implementation -- -- --# func_basename file --func_basename () --{ -- func_basename_result=`$ECHO "${1}" | $SED "$basename"` --} # func_basename may be replaced by extended shell implementation -- -- - # func_dirname_and_basename file append nondir_replacement - # perform func_basename and func_dirname in a single function - # call: -@@ -199,183 +158,33 @@ func_basename () - # those functions but instead duplicate the functionality here. - func_dirname_and_basename () - { -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi -- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` --} # func_dirname_and_basename may be replaced by extended shell implementation -- -- --# func_stripname prefix suffix name --# strip PREFIX and SUFFIX off of NAME. --# PREFIX and SUFFIX must not contain globbing or regex special --# characters, hashes, percent signs, but SUFFIX may contain a leading --# dot (in which case that matches only a dot). --# func_strip_suffix prefix name --func_stripname () --{ -- case ${2} in -- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -- esac --} # func_stripname may be replaced by extended shell implementation -- -- --# These SED scripts presuppose an absolute path with a trailing slash. --pathcar='s,^/\([^/]*\).*$,\1,' --pathcdr='s,^/[^/]*,,' --removedotparts=':dotsl -- s@/\./@/@g -- t dotsl -- s,/\.$,/,' --collapseslashes='s@/\{1,\}@/@g' --finalslash='s,/*$,/,' -- --# func_normal_abspath PATH --# Remove doubled-up and trailing slashes, "." path components, --# and cancel out any ".." path components in PATH after making --# it an absolute path. --# value returned in "$func_normal_abspath_result" --func_normal_abspath () --{ -- # Start from root dir and reassemble the path. -- func_normal_abspath_result= -- func_normal_abspath_tpath=$1 -- func_normal_abspath_altnamespace= -- case $func_normal_abspath_tpath in -- "") -- # Empty path, that just means $cwd. -- func_stripname '' '/' "`pwd`" -- func_normal_abspath_result=$func_stripname_result -- return -- ;; -- # The next three entries are used to spot a run of precisely -- # two leading slashes without using negated character classes; -- # we take advantage of case's first-match behaviour. -- ///*) -- # Unusual form of absolute path, do nothing. -- ;; -- //*) -- # Not necessarily an ordinary path; POSIX reserves leading '//' -- # and for example Cygwin uses it to access remote file shares -- # over CIFS/SMB, so we conserve a leading double slash if found. -- func_normal_abspath_altnamespace=/ -- ;; -- /*) -- # Absolute path, do nothing. -- ;; -- *) -- # Relative path, prepend $cwd. -- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath -- ;; -- esac -- # Cancel out all the simple stuff to save iterations. We also want -- # the path to end with a slash for ease of parsing, so make sure -- # there is one (and only one) here. -- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ -- -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` -- while :; do -- # Processed it all yet? -- if test "$func_normal_abspath_tpath" = / ; then -- # If we ascended to the root using ".." the result may be empty now. -- if test -z "$func_normal_abspath_result" ; then -- func_normal_abspath_result=/ -- fi -- break -- fi -- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ -- -e "$pathcar"` -- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ -- -e "$pathcdr"` -- # Figure out what to do with it -- case $func_normal_abspath_tcomponent in -- "") -- # Trailing empty path component, ignore it. -- ;; -- ..) -- # Parent dir; strip last assembled component from result. -- func_dirname "$func_normal_abspath_result" -- func_normal_abspath_result=$func_dirname_result -- ;; -- *) -- # Actual path component, append it. -- func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent -- ;; -- esac -- done -- # Restore leading double-slash if one was found on entry. -- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` - } - --# func_relative_path SRCDIR DSTDIR --# generates a relative path from SRCDIR to DSTDIR, with a trailing --# slash if non-empty, suitable for immediately appending a filename --# without needing to append a separator. --# value returned in "$func_relative_path_result" --func_relative_path () --{ -- func_relative_path_result= -- func_normal_abspath "$1" -- func_relative_path_tlibdir=$func_normal_abspath_result -- func_normal_abspath "$2" -- func_relative_path_tbindir=$func_normal_abspath_result -- -- # Ascend the tree starting from libdir -- while :; do -- # check if we have found a prefix of bindir -- case $func_relative_path_tbindir in -- $func_relative_path_tlibdir) -- # found an exact match -- func_relative_path_tcancelled= -- break -- ;; -- $func_relative_path_tlibdir*) -- # found a matching prefix -- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" -- func_relative_path_tcancelled=$func_stripname_result -- if test -z "$func_relative_path_result"; then -- func_relative_path_result=. -- fi -- break -- ;; -- *) -- func_dirname $func_relative_path_tlibdir -- func_relative_path_tlibdir=${func_dirname_result} -- if test "x$func_relative_path_tlibdir" = x ; then -- # Have to descend all the way to the root! -- func_relative_path_result=../$func_relative_path_result -- func_relative_path_tcancelled=$func_relative_path_tbindir -- break -- fi -- func_relative_path_result=../$func_relative_path_result -- ;; -- esac -- done -- -- # Now calculate path; take care to avoid doubling-up slashes. -- func_stripname '' '/' "$func_relative_path_result" -- func_relative_path_result=$func_stripname_result -- func_stripname '/' '/' "$func_relative_path_tcancelled" -- if test "x$func_stripname_result" != x ; then -- func_relative_path_result=${func_relative_path_result}/${func_stripname_result} -- fi -+# Generated shell functions inserted here. - -- # Normalisation. If bindir is libdir, return empty string, -- # else relative path ending with a slash; either way, target -- # file name can be directly appended. -- if test ! -z "$func_relative_path_result"; then -- func_stripname './' '' "$func_relative_path_result/" -- func_relative_path_result=$func_stripname_result -- fi --} -+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -+# is ksh but when the shell is invoked as "sh" and the current value of -+# the _XPG environment variable is not equal to 1 (one), the special -+# positional parameter $0, within a function call, is the name of the -+# function. -+progpath="$0" - - # The name of this program: -+# In the unlikely event $progname began with a '-', it would play havoc with -+# func_echo (imagine progname=-n), so we prepend ./ in that case: - func_dirname_and_basename "$progpath" - progname=$func_basename_result -+case $progname in -+ -*) progname=./$progname ;; -+esac - - # Make sure we have an absolute path for reexecution: - case $progpath in -@@ -406,15 +215,6 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - # Same as above, but do not quote variable references. - double_quote_subst='s/\(["`\\]\)/\\\1/g' - --# Sed substitution that turns a string into a regex matching for the --# string literally. --sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -- --# Sed substitution that converts a w32 file name or path --# which contains forward slashes, into one that contains --# (escaped) backslashes. A very naive implementation. --lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- - # Re-`\' parameter expansions in output of double_quote_subst that were - # `\'-ed in input to the same. If an odd number of `\' preceded a '$' - # in input to double_quote_subst, that '$' was protected from expansion. -@@ -443,7 +243,7 @@ opt_warning=: - # name if it has been set yet. - func_echo () - { -- $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -+ $ECHO "$progname${mode+: }$mode: $*" - } - - # func_verbose arg... -@@ -458,25 +258,18 @@ func_verbose () - : - } - --# func_echo_all arg... --# Invoke $ECHO with all args, space-separated. --func_echo_all () --{ -- $ECHO "$*" --} -- - # func_error arg... - # Echo program name prefixed message to standard error. - func_error () - { -- $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -+ $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 - } - - # func_warning arg... - # Echo program name prefixed warning message to standard error. - func_warning () - { -- $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 -+ $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -@@ -533,9 +326,9 @@ func_mkdir_p () - case $my_directory_path in */*) ;; *) break ;; esac - - # ...otherwise throw away the child directory and loop -- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` -+ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` - done -- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` -+ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` - - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do -@@ -585,7 +378,7 @@ func_mktempdir () - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi - -- $ECHO "$my_tmpdir" -+ $ECHO "X$my_tmpdir" | $Xsed - } - - -@@ -599,7 +392,7 @@ func_quote_for_eval () - { - case $1 in - *[\\\`\"\$]*) -- func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; -+ func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac -@@ -626,7 +419,7 @@ func_quote_for_expand () - { - case $1 in - *[\\\`\"]*) -- my_arg=`$ECHO "$1" | $SED \ -+ my_arg=`$ECHO "X$1" | $Xsed \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; -@@ -695,39 +488,15 @@ func_show_eval_locale () - fi - } - --# func_tr_sh --# Turn $1 into a string suitable for a shell variable name. --# Result is stored in $func_tr_sh_result. All characters --# not in the set a-zA-Z0-9_ are replaced with '_'. Further, --# if $1 begins with a digit, a '_' is prepended as well. --func_tr_sh () --{ -- case $1 in -- [0-9]* | *[!a-zA-Z0-9_]*) -- func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` -- ;; -- * ) -- func_tr_sh_result=$1 -- ;; -- esac --} -+ -+ - - - # func_version - # Echo version message to standard output and exit. - func_version () - { -- $opt_debug -- -- $SED -n '/(C)/!b go -- :more -- /\./!{ -- N -- s/\n# / / -- b more -- } -- :go -- /^# '$PROGRAM' (GNU /,/# warranty; / { -+ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ -@@ -740,28 +509,22 @@ func_version () - # Echo short help message to standard output and exit. - func_usage () - { -- $opt_debug -- -- $SED -n '/^# Usage:/,/^# *.*--help/ { -+ $SED -n '/^# Usage:/,/# -h/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" -- echo -+ $ECHO - $ECHO "run \`$progname --help | more' for full usage" - exit $? - } - --# func_help [NOEXIT] --# Echo long help message to standard output and exit, --# unless 'noexit' is passed as argument. -+# func_help -+# Echo long help message to standard output and exit. - func_help () - { -- $opt_debug -- - $SED -n '/^# Usage:/,/# Report bugs to/ { -- :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* -@@ -774,15 +537,8 @@ func_help () - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ - p -- d -- } -- /^# .* home page:/b print -- /^# General help using/b print -- ' < "$progpath" -- ret=$? -- if test -z "$1"; then -- exit $ret -- fi -+ }' < "$progpath" -+ exit $? - } - - # func_missing_arg argname -@@ -790,106 +546,63 @@ func_help () - # exit_cmd. - func_missing_arg () - { -- $opt_debug -- -- func_error "missing argument for $1." -+ func_error "missing argument for $1" - exit_cmd=exit - } - -+exit_cmd=: - --# func_split_short_opt shortopt --# Set func_split_short_opt_name and func_split_short_opt_arg shell --# variables after splitting SHORTOPT after the 2nd character. --func_split_short_opt () --{ -- my_sed_short_opt='1s/^\(..\).*$/\1/;q' -- my_sed_short_rest='1s/^..\(.*\)$/\1/;q' -- -- func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` -- func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` --} # func_split_short_opt may be replaced by extended shell implementation -- -- --# func_split_long_opt longopt --# Set func_split_long_opt_name and func_split_long_opt_arg shell --# variables after splitting LONGOPT at the `=' sign. --func_split_long_opt () --{ -- my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' -- my_sed_long_arg='1s/^--[^=]*=//' -- -- func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` -- func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` --} # func_split_long_opt may be replaced by extended shell implementation - --exit_cmd=: - - - -+# Check that we have a working $ECHO. -+if test "X$1" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. -+ shift -+elif test "X$1" = X--fallback-echo; then -+ # Avoid inline document here, it may be left over -+ : -+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then -+ # Yippee, $ECHO works! -+ : -+else -+ # Restart under the correct shell, and then maybe $ECHO will work. -+ exec $SHELL "$progpath" --no-reexec ${1+"$@"} -+fi - -+if test "X$1" = X--fallback-echo; then -+ # used as fallback echo -+ shift -+ cat <<EOF -+$* -+EOF -+ exit $EXIT_SUCCESS -+fi - - magic="%%%MAGIC variable%%%" - magic_exe="%%%MAGIC EXE variable%%%" - - # Global variables. -+# $mode is unset - nonopt= -+execute_dlfiles= - preserve_args= - lo2o="s/\\.lo\$/.${objext}/" - o2lo="s/\\.${objext}\$/.lo/" - extracted_archives= - extracted_serial=0 - -+opt_dry_run=false -+opt_duplicate_deps=false -+opt_silent=false -+opt_debug=: -+ - # If this variable is set in any of the actions, the command in it - # will be execed at the end. This prevents here-documents from being - # left over by shells. - exec_cmd= - --# func_append var value --# Append VALUE to the end of shell variable VAR. --func_append () --{ -- eval "${1}=\$${1}\${2}" --} # func_append may be replaced by extended shell implementation -- --# func_append_quoted var value --# Quote VALUE and append to the end of shell variable VAR, separated --# by a space. --func_append_quoted () --{ -- func_quote_for_eval "${2}" -- eval "${1}=\$${1}\\ \$func_quote_for_eval_result" --} # func_append_quoted may be replaced by extended shell implementation -- -- --# func_arith arithmetic-term... --func_arith () --{ -- func_arith_result=`expr "${@}"` --} # func_arith may be replaced by extended shell implementation -- -- --# func_len string --# STRING may not start with a hyphen. --func_len () --{ -- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` --} # func_len may be replaced by extended shell implementation -- -- --# func_lo2o object --func_lo2o () --{ -- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` --} # func_lo2o may be replaced by extended shell implementation -- -- --# func_xform libobj-or-source --func_xform () --{ -- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` --} # func_xform may be replaced by extended shell implementation -- -- - # func_fatal_configuration arg... - # Echo program name prefixed message to standard error, followed by - # a configuration failure hint, and exit. -@@ -923,16 +636,16 @@ func_config () - # Display the features supported by this script. - func_features () - { -- echo "host: $host" -+ $ECHO "host: $host" - if test "$build_libtool_libs" = yes; then -- echo "enable shared libraries" -+ $ECHO "enable shared libraries" - else -- echo "disable shared libraries" -+ $ECHO "disable shared libraries" - fi - if test "$build_old_libs" = yes; then -- echo "enable static libraries" -+ $ECHO "enable static libraries" - else -- echo "disable static libraries" -+ $ECHO "disable static libraries" - fi - - exit $? -@@ -979,204 +692,117 @@ func_enable_tag () - esac - } - --# func_check_version_match --# Ensure that we are using m4 macros, and libtool script from the same --# release of libtool. --func_check_version_match () -+# Parse options once, thoroughly. This comes as soon as possible in -+# the script to make things like `libtool --version' happen quickly. - { -- if test "$package_revision" != "$macro_revision"; then -- if test "$VERSION" != "$macro_version"; then -- if test -z "$macro_version"; then -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from an older release. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- fi -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, --$progname: but the definition of this LT_INIT comes from revision $macro_revision. --$progname: You should recreate aclocal.m4 with macros from revision $package_revision --$progname: of $PACKAGE $VERSION and run autoconf again. --_LT_EOF -- fi -- -- exit $EXIT_MISMATCH -- fi --} -- -- --# Shorthand for --mode=foo, only valid as the first argument --case $1 in --clean|clea|cle|cl) -- shift; set dummy --mode clean ${1+"$@"}; shift -- ;; --compile|compil|compi|comp|com|co|c) -- shift; set dummy --mode compile ${1+"$@"}; shift -- ;; --execute|execut|execu|exec|exe|ex|e) -- shift; set dummy --mode execute ${1+"$@"}; shift -- ;; --finish|finis|fini|fin|fi|f) -- shift; set dummy --mode finish ${1+"$@"}; shift -- ;; --install|instal|insta|inst|ins|in|i) -- shift; set dummy --mode install ${1+"$@"}; shift -- ;; --link|lin|li|l) -- shift; set dummy --mode link ${1+"$@"}; shift -- ;; --uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -- shift; set dummy --mode uninstall ${1+"$@"}; shift -- ;; --esac -- -- -- --# Option defaults: --opt_debug=: --opt_dry_run=false --opt_config=false --opt_preserve_dup_deps=false --opt_features=false --opt_finish=false --opt_help=false --opt_help_all=false --opt_silent=: --opt_verbose=: --opt_silent=false --opt_verbose=false - -+ # Shorthand for --mode=foo, only valid as the first argument -+ case $1 in -+ clean|clea|cle|cl) -+ shift; set dummy --mode clean ${1+"$@"}; shift -+ ;; -+ compile|compil|compi|comp|com|co|c) -+ shift; set dummy --mode compile ${1+"$@"}; shift -+ ;; -+ execute|execut|execu|exec|exe|ex|e) -+ shift; set dummy --mode execute ${1+"$@"}; shift -+ ;; -+ finish|finis|fini|fin|fi|f) -+ shift; set dummy --mode finish ${1+"$@"}; shift -+ ;; -+ install|instal|insta|inst|ins|in|i) -+ shift; set dummy --mode install ${1+"$@"}; shift -+ ;; -+ link|lin|li|l) -+ shift; set dummy --mode link ${1+"$@"}; shift -+ ;; -+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -+ shift; set dummy --mode uninstall ${1+"$@"}; shift -+ ;; -+ esac - --# Parse options once, thoroughly. This comes as soon as possible in the --# script to make things like `--version' happen as quickly as we can. --{ -- # this just eases exit handling -- while test $# -gt 0; do -+ # Parse non-mode specific arguments: -+ while test "$#" -gt 0; do - opt="$1" - shift -+ - case $opt in -- --debug|-x) opt_debug='set -x' -+ --config) func_config ;; -+ -+ --debug) preserve_args="$preserve_args $opt" - func_echo "enabling shell trace mode" -+ opt_debug='set -x' - $opt_debug - ;; -- --dry-run|--dryrun|-n) -- opt_dry_run=: -- ;; -- --config) -- opt_config=: --func_config -- ;; -- --dlopen|-dlopen) -- optarg="$1" -- opt_dlopen="${opt_dlopen+$opt_dlopen --}$optarg" -+ -+ -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break -+ execute_dlfiles="$execute_dlfiles $1" - shift - ;; -- --preserve-dup-deps) -- opt_preserve_dup_deps=: -- ;; -- --features) -- opt_features=: --func_features -- ;; -- --finish) -- opt_finish=: --set dummy --mode finish ${1+"$@"}; shift -- ;; -- --help) -- opt_help=: -- ;; -- --help-all) -- opt_help_all=: --opt_help=': help-all' -- ;; -- --mode) -- test $# = 0 && func_missing_arg $opt && break -- optarg="$1" -- opt_mode="$optarg" --case $optarg in -- # Valid mode arguments: -- clean|compile|execute|finish|install|link|relink|uninstall) ;; -- -- # Catch anything else as an error -- *) func_error "invalid argument for $opt" -- exit_cmd=exit -- break -- ;; --esac -+ -+ --dry-run | -n) opt_dry_run=: ;; -+ --features) func_features ;; -+ --finish) mode="finish" ;; -+ -+ --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break -+ case $1 in -+ # Valid mode arguments: -+ clean) ;; -+ compile) ;; -+ execute) ;; -+ finish) ;; -+ install) ;; -+ link) ;; -+ relink) ;; -+ uninstall) ;; -+ -+ # Catch anything else as an error -+ *) func_error "invalid argument for $opt" -+ exit_cmd=exit -+ break -+ ;; -+ esac -+ -+ mode="$1" - shift - ;; -- --no-silent|--no-quiet) -- opt_silent=false --func_append preserve_args " $opt" -- ;; -- --no-verbose) -- opt_verbose=false --func_append preserve_args " $opt" -- ;; -- --silent|--quiet) -+ -+ --preserve-dup-deps) -+ opt_duplicate_deps=: ;; -+ -+ --quiet|--silent) preserve_args="$preserve_args $opt" - opt_silent=: --func_append preserve_args " $opt" -- opt_verbose=false - ;; -- --verbose|-v) -- opt_verbose=: --func_append preserve_args " $opt" --opt_silent=false -+ -+ --verbose| -v) preserve_args="$preserve_args $opt" -+ opt_silent=false - ;; -- --tag) -- test $# = 0 && func_missing_arg $opt && break -- optarg="$1" -- opt_tag="$optarg" --func_append preserve_args " $opt $optarg" --func_enable_tag "$optarg" -+ -+ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break -+ preserve_args="$preserve_args $opt $1" -+ func_enable_tag "$1" # tagname is set here - shift - ;; - -- -\?|-h) func_usage ;; -- --help) func_help ;; -- --version) func_version ;; -- - # Separate optargs to long options: -- --*=*) -- func_split_long_opt "$opt" -- set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} -+ -dlopen=*|--mode=*|--tag=*) -+ func_opt_split "$opt" -+ set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} - shift - ;; - -- # Separate non-argument short options: -- -\?*|-h*|-n*|-v*) -- func_split_short_opt "$opt" -- set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} -- shift -- ;; -+ -\?|-h) func_usage ;; -+ --help) opt_help=: ;; -+ --version) func_version ;; -+ -+ -*) func_fatal_help "unrecognized option \`$opt'" ;; - -- --) break ;; -- -*) func_fatal_help "unrecognized option \`$opt'" ;; -- *) set dummy "$opt" ${1+"$@"}; shift; break ;; -+ *) nonopt="$opt" -+ break -+ ;; - esac - done - -- # Validate options: -- -- # save first non-option argument -- if test "$#" -gt 0; then -- nonopt="$opt" -- shift -- fi -- -- # preserve --debug -- test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) -@@ -1184,44 +810,82 @@ func_enable_tag "$optarg" - opt_duplicate_compiler_generated_deps=: - ;; - *) -- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps -+ opt_duplicate_compiler_generated_deps=$opt_duplicate_deps - ;; - esac - -- $opt_help || { -- # Sanity checks first: -- func_check_version_match -+ # Having warned about all mis-specified options, bail out if -+ # anything was wrong. -+ $exit_cmd $EXIT_FAILURE -+} - -- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -- func_fatal_configuration "not configured to build any kind of library" -+# func_check_version_match -+# Ensure that we are using m4 macros, and libtool script from the same -+# release of libtool. -+func_check_version_match () -+{ -+ if test "$package_revision" != "$macro_revision"; then -+ if test "$VERSION" != "$macro_version"; then -+ if test -z "$macro_version"; then -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from an older release. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ fi -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -+$progname: but the definition of this LT_INIT comes from revision $macro_revision. -+$progname: You should recreate aclocal.m4 with macros from revision $package_revision -+$progname: of $PACKAGE $VERSION and run autoconf again. -+_LT_EOF - fi - -- # Darwin sucks -- eval std_shrext=\"$shrext_cmds\" -+ exit $EXIT_MISMATCH -+ fi -+} -+ - -- # Only execute mode is allowed to have -dlopen flags. -- if test -n "$opt_dlopen" && test "$opt_mode" != execute; then -- func_error "unrecognized option \`-dlopen'" -- $ECHO "$help" 1>&2 -- exit $EXIT_FAILURE -- fi -+## ----------- ## -+## Main. ## -+## ----------- ## - -- # Change the help message to a mode-specific one. -- generic_help="$help" -- help="Try \`$progname --help --mode=$opt_mode' for more information." -- } -+$opt_help || { -+ # Sanity checks first: -+ func_check_version_match - -+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -+ func_fatal_configuration "not configured to build any kind of library" -+ fi - -- # Bail if the options were screwed -- $exit_cmd $EXIT_FAILURE --} -+ test -z "$mode" && func_fatal_error "error: you must specify a MODE." - - -+ # Darwin sucks -+ eval std_shrext=\"$shrext_cmds\" - - --## ----------- ## --## Main. ## --## ----------- ## -+ # Only execute mode is allowed to have -dlopen flags. -+ if test -n "$execute_dlfiles" && test "$mode" != execute; then -+ func_error "unrecognized option \`-dlopen'" -+ $ECHO "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi -+ -+ # Change the help message to a mode-specific one. -+ generic_help="$help" -+ help="Try \`$progname --help --mode=$mode' for more information." -+} -+ - - # func_lalib_p file - # True iff FILE is a libtool `.la' library or `.lo' object file. -@@ -1286,9 +950,12 @@ func_ltwrapper_executable_p () - # temporary ltwrapper_script. - func_ltwrapper_scriptname () - { -- func_dirname_and_basename "$1" "" "." -- func_stripname '' '.exe' "$func_basename_result" -- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -+ func_ltwrapper_scriptname_result="" -+ if func_ltwrapper_executable_p "$1"; then -+ func_dirname_and_basename "$1" "" "." -+ func_stripname '' '.exe' "$func_basename_result" -+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -+ fi - } - - # func_ltwrapper_p file -@@ -1334,37 +1001,6 @@ func_source () - } - - --# func_resolve_sysroot PATH --# Replace a leading = in PATH with a sysroot. Store the result into --# func_resolve_sysroot_result --func_resolve_sysroot () --{ -- func_resolve_sysroot_result=$1 -- case $func_resolve_sysroot_result in -- =*) -- func_stripname '=' '' "$func_resolve_sysroot_result" -- func_resolve_sysroot_result=$lt_sysroot$func_stripname_result -- ;; -- esac --} -- --# func_replace_sysroot PATH --# If PATH begins with the sysroot, replace it with = and --# store the result into func_replace_sysroot_result. --func_replace_sysroot () --{ -- case "$lt_sysroot:$1" in -- ?*:"$lt_sysroot"*) -- func_stripname "$lt_sysroot" '' "$1" -- func_replace_sysroot_result="=$func_stripname_result" -- ;; -- *) -- # Including no sysroot. -- func_replace_sysroot_result=$1 -- ;; -- esac --} -- - # func_infer_tag arg - # Infer tagged configuration to use if any are available and - # if one wasn't chosen via the "--tag" command line option. -@@ -1377,15 +1013,13 @@ func_infer_tag () - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do -- func_append_quoted CC_quoted "$arg" -+ func_quote_for_eval "$arg" -+ CC_quoted="$CC_quoted $func_quote_for_eval_result" - done -- CC_expanded=`func_echo_all $CC` -- CC_quoted_expanded=`func_echo_all $CC_quoted` - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. -- " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ -- " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; -+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) -@@ -1396,13 +1030,11 @@ func_infer_tag () - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. -- func_append_quoted CC_quoted "$arg" -+ func_quote_for_eval "$arg" -+ CC_quoted="$CC_quoted $func_quote_for_eval_result" - done -- CC_expanded=`func_echo_all $CC` -- CC_quoted_expanded=`func_echo_all $CC_quoted` - case "$@ " in -- " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ -- " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) -+ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. -@@ -1465,486 +1097,6 @@ EOF - } - } - -- --################################################## --# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # --################################################## -- --# func_convert_core_file_wine_to_w32 ARG --# Helper function used by file name conversion functions when $build is *nix, --# and $host is mingw, cygwin, or some other w32 environment. Relies on a --# correctly configured wine environment available, with the winepath program --# in $build's $PATH. --# --# ARG is the $build file name to be converted to w32 format. --# Result is available in $func_convert_core_file_wine_to_w32_result, and will --# be empty on error (or when ARG is empty) --func_convert_core_file_wine_to_w32 () --{ -- $opt_debug -- func_convert_core_file_wine_to_w32_result="$1" -- if test -n "$1"; then -- # Unfortunately, winepath does not exit with a non-zero error code, so we -- # are forced to check the contents of stdout. On the other hand, if the -- # command is not found, the shell will set an exit code of 127 and print -- # *an error message* to stdout. So we must check for both error code of -- # zero AND non-empty stdout, which explains the odd construction: -- func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` -- if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then -- func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | -- $SED -e "$lt_sed_naive_backslashify"` -- else -- func_convert_core_file_wine_to_w32_result= -- fi -- fi --} --# end: func_convert_core_file_wine_to_w32 -- -- --# func_convert_core_path_wine_to_w32 ARG --# Helper function used by path conversion functions when $build is *nix, and --# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly --# configured wine environment available, with the winepath program in $build's --# $PATH. Assumes ARG has no leading or trailing path separator characters. --# --# ARG is path to be converted from $build format to win32. --# Result is available in $func_convert_core_path_wine_to_w32_result. --# Unconvertible file (directory) names in ARG are skipped; if no directory names --# are convertible, then the result may be empty. --func_convert_core_path_wine_to_w32 () --{ -- $opt_debug -- # unfortunately, winepath doesn't convert paths, only file names -- func_convert_core_path_wine_to_w32_result="" -- if test -n "$1"; then -- oldIFS=$IFS -- IFS=: -- for func_convert_core_path_wine_to_w32_f in $1; do -- IFS=$oldIFS -- func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" -- if test -n "$func_convert_core_file_wine_to_w32_result" ; then -- if test -z "$func_convert_core_path_wine_to_w32_result"; then -- func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" -- else -- func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" -- fi -- fi -- done -- IFS=$oldIFS -- fi --} --# end: func_convert_core_path_wine_to_w32 -- -- --# func_cygpath ARGS... --# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when --# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) --# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or --# (2), returns the Cygwin file name or path in func_cygpath_result (input --# file name or path is assumed to be in w32 format, as previously converted --# from $build's *nix or MSYS format). In case (3), returns the w32 file name --# or path in func_cygpath_result (input file name or path is assumed to be in --# Cygwin format). Returns an empty string on error. --# --# ARGS are passed to cygpath, with the last one being the file name or path to --# be converted. --# --# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH --# environment variable; do not put it in $PATH. --func_cygpath () --{ -- $opt_debug -- if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then -- func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` -- if test "$?" -ne 0; then -- # on failure, ensure result is empty -- func_cygpath_result= -- fi -- else -- func_cygpath_result= -- func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" -- fi --} --#end: func_cygpath -- -- --# func_convert_core_msys_to_w32 ARG --# Convert file name or path ARG from MSYS format to w32 format. Return --# result in func_convert_core_msys_to_w32_result. --func_convert_core_msys_to_w32 () --{ -- $opt_debug -- # awkward: cmd appends spaces to result -- func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | -- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` --} --#end: func_convert_core_msys_to_w32 -- -- --# func_convert_file_check ARG1 ARG2 --# Verify that ARG1 (a file name in $build format) was converted to $host --# format in ARG2. Otherwise, emit an error message, but continue (resetting --# func_to_host_file_result to ARG1). --func_convert_file_check () --{ -- $opt_debug -- if test -z "$2" && test -n "$1" ; then -- func_error "Could not determine host file name corresponding to" -- func_error " \`$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback: -- func_to_host_file_result="$1" -- fi --} --# end func_convert_file_check -- -- --# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH --# Verify that FROM_PATH (a path in $build format) was converted to $host --# format in TO_PATH. Otherwise, emit an error message, but continue, resetting --# func_to_host_file_result to a simplistic fallback value (see below). --func_convert_path_check () --{ -- $opt_debug -- if test -z "$4" && test -n "$3"; then -- func_error "Could not determine the host path corresponding to" -- func_error " \`$3'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback. This is a deliberately simplistic "conversion" and -- # should not be "improved". See libtool.info. -- if test "x$1" != "x$2"; then -- lt_replace_pathsep_chars="s|$1|$2|g" -- func_to_host_path_result=`echo "$3" | -- $SED -e "$lt_replace_pathsep_chars"` -- else -- func_to_host_path_result="$3" -- fi -- fi --} --# end func_convert_path_check -- -- --# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG --# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT --# and appending REPL if ORIG matches BACKPAT. --func_convert_path_front_back_pathsep () --{ -- $opt_debug -- case $4 in -- $1 ) func_to_host_path_result="$3$func_to_host_path_result" -- ;; -- esac -- case $4 in -- $2 ) func_append func_to_host_path_result "$3" -- ;; -- esac --} --# end func_convert_path_front_back_pathsep -- -- --################################################## --# $build to $host FILE NAME CONVERSION FUNCTIONS # --################################################## --# invoked via `$to_host_file_cmd ARG' --# --# In each case, ARG is the path to be converted from $build to $host format. --# Result will be available in $func_to_host_file_result. -- -- --# func_to_host_file ARG --# Converts the file name ARG from $build format to $host format. Return result --# in func_to_host_file_result. --func_to_host_file () --{ -- $opt_debug -- $to_host_file_cmd "$1" --} --# end func_to_host_file -- -- --# func_to_tool_file ARG LAZY --# converts the file name ARG from $build format to toolchain format. Return --# result in func_to_tool_file_result. If the conversion in use is listed --# in (the comma separated) LAZY, no conversion takes place. --func_to_tool_file () --{ -- $opt_debug -- case ,$2, in -- *,"$to_tool_file_cmd",*) -- func_to_tool_file_result=$1 -- ;; -- *) -- $to_tool_file_cmd "$1" -- func_to_tool_file_result=$func_to_host_file_result -- ;; -- esac --} --# end func_to_tool_file -- -- --# func_convert_file_noop ARG --# Copy ARG to func_to_host_file_result. --func_convert_file_noop () --{ -- func_to_host_file_result="$1" --} --# end func_convert_file_noop -- -- --# func_convert_file_msys_to_w32 ARG --# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic --# conversion to w32 is not available inside the cwrapper. Returns result in --# func_to_host_file_result. --func_convert_file_msys_to_w32 () --{ -- $opt_debug -- func_to_host_file_result="$1" -- if test -n "$1"; then -- func_convert_core_msys_to_w32 "$1" -- func_to_host_file_result="$func_convert_core_msys_to_w32_result" -- fi -- func_convert_file_check "$1" "$func_to_host_file_result" --} --# end func_convert_file_msys_to_w32 -- -- --# func_convert_file_cygwin_to_w32 ARG --# Convert file name ARG from Cygwin to w32 format. Returns result in --# func_to_host_file_result. --func_convert_file_cygwin_to_w32 () --{ -- $opt_debug -- func_to_host_file_result="$1" -- if test -n "$1"; then -- # because $build is cygwin, we call "the" cygpath in $PATH; no need to use -- # LT_CYGPATH in this case. -- func_to_host_file_result=`cygpath -m "$1"` -- fi -- func_convert_file_check "$1" "$func_to_host_file_result" --} --# end func_convert_file_cygwin_to_w32 -- -- --# func_convert_file_nix_to_w32 ARG --# Convert file name ARG from *nix to w32 format. Requires a wine environment --# and a working winepath. Returns result in func_to_host_file_result. --func_convert_file_nix_to_w32 () --{ -- $opt_debug -- func_to_host_file_result="$1" -- if test -n "$1"; then -- func_convert_core_file_wine_to_w32 "$1" -- func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" -- fi -- func_convert_file_check "$1" "$func_to_host_file_result" --} --# end func_convert_file_nix_to_w32 -- -- --# func_convert_file_msys_to_cygwin ARG --# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. --# Returns result in func_to_host_file_result. --func_convert_file_msys_to_cygwin () --{ -- $opt_debug -- func_to_host_file_result="$1" -- if test -n "$1"; then -- func_convert_core_msys_to_w32 "$1" -- func_cygpath -u "$func_convert_core_msys_to_w32_result" -- func_to_host_file_result="$func_cygpath_result" -- fi -- func_convert_file_check "$1" "$func_to_host_file_result" --} --# end func_convert_file_msys_to_cygwin -- -- --# func_convert_file_nix_to_cygwin ARG --# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed --# in a wine environment, working winepath, and LT_CYGPATH set. Returns result --# in func_to_host_file_result. --func_convert_file_nix_to_cygwin () --{ -- $opt_debug -- func_to_host_file_result="$1" -- if test -n "$1"; then -- # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. -- func_convert_core_file_wine_to_w32 "$1" -- func_cygpath -u "$func_convert_core_file_wine_to_w32_result" -- func_to_host_file_result="$func_cygpath_result" -- fi -- func_convert_file_check "$1" "$func_to_host_file_result" --} --# end func_convert_file_nix_to_cygwin -- -- --############################################# --# $build to $host PATH CONVERSION FUNCTIONS # --############################################# --# invoked via `$to_host_path_cmd ARG' --# --# In each case, ARG is the path to be converted from $build to $host format. --# The result will be available in $func_to_host_path_result. --# --# Path separators are also converted from $build format to $host format. If --# ARG begins or ends with a path separator character, it is preserved (but --# converted to $host format) on output. --# --# All path conversion functions are named using the following convention: --# file name conversion function : func_convert_file_X_to_Y () --# path conversion function : func_convert_path_X_to_Y () --# where, for any given $build/$host combination the 'X_to_Y' value is the --# same. If conversion functions are added for new $build/$host combinations, --# the two new functions must follow this pattern, or func_init_to_host_path_cmd --# will break. -- -- --# func_init_to_host_path_cmd --# Ensures that function "pointer" variable $to_host_path_cmd is set to the --# appropriate value, based on the value of $to_host_file_cmd. --to_host_path_cmd= --func_init_to_host_path_cmd () --{ -- $opt_debug -- if test -z "$to_host_path_cmd"; then -- func_stripname 'func_convert_file_' '' "$to_host_file_cmd" -- to_host_path_cmd="func_convert_path_${func_stripname_result}" -- fi --} -- -- --# func_to_host_path ARG --# Converts the path ARG from $build format to $host format. Return result --# in func_to_host_path_result. --func_to_host_path () --{ -- $opt_debug -- func_init_to_host_path_cmd -- $to_host_path_cmd "$1" --} --# end func_to_host_path -- -- --# func_convert_path_noop ARG --# Copy ARG to func_to_host_path_result. --func_convert_path_noop () --{ -- func_to_host_path_result="$1" --} --# end func_convert_path_noop -- -- --# func_convert_path_msys_to_w32 ARG --# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic --# conversion to w32 is not available inside the cwrapper. Returns result in --# func_to_host_path_result. --func_convert_path_msys_to_w32 () --{ -- $opt_debug -- func_to_host_path_result="$1" -- if test -n "$1"; then -- # Remove leading and trailing path separator characters from ARG. MSYS -- # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; -- # and winepath ignores them completely. -- func_stripname : : "$1" -- func_to_host_path_tmp1=$func_stripname_result -- func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -- func_to_host_path_result="$func_convert_core_msys_to_w32_result" -- func_convert_path_check : ";" \ -- "$func_to_host_path_tmp1" "$func_to_host_path_result" -- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -- fi --} --# end func_convert_path_msys_to_w32 -- -- --# func_convert_path_cygwin_to_w32 ARG --# Convert path ARG from Cygwin to w32 format. Returns result in --# func_to_host_file_result. --func_convert_path_cygwin_to_w32 () --{ -- $opt_debug -- func_to_host_path_result="$1" -- if test -n "$1"; then -- # See func_convert_path_msys_to_w32: -- func_stripname : : "$1" -- func_to_host_path_tmp1=$func_stripname_result -- func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` -- func_convert_path_check : ";" \ -- "$func_to_host_path_tmp1" "$func_to_host_path_result" -- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -- fi --} --# end func_convert_path_cygwin_to_w32 -- -- --# func_convert_path_nix_to_w32 ARG --# Convert path ARG from *nix to w32 format. Requires a wine environment and --# a working winepath. Returns result in func_to_host_file_result. --func_convert_path_nix_to_w32 () --{ -- $opt_debug -- func_to_host_path_result="$1" -- if test -n "$1"; then -- # See func_convert_path_msys_to_w32: -- func_stripname : : "$1" -- func_to_host_path_tmp1=$func_stripname_result -- func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -- func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" -- func_convert_path_check : ";" \ -- "$func_to_host_path_tmp1" "$func_to_host_path_result" -- func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -- fi --} --# end func_convert_path_nix_to_w32 -- -- --# func_convert_path_msys_to_cygwin ARG --# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. --# Returns result in func_to_host_file_result. --func_convert_path_msys_to_cygwin () --{ -- $opt_debug -- func_to_host_path_result="$1" -- if test -n "$1"; then -- # See func_convert_path_msys_to_w32: -- func_stripname : : "$1" -- func_to_host_path_tmp1=$func_stripname_result -- func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -- func_cygpath -u -p "$func_convert_core_msys_to_w32_result" -- func_to_host_path_result="$func_cygpath_result" -- func_convert_path_check : : \ -- "$func_to_host_path_tmp1" "$func_to_host_path_result" -- func_convert_path_front_back_pathsep ":*" "*:" : "$1" -- fi --} --# end func_convert_path_msys_to_cygwin -- -- --# func_convert_path_nix_to_cygwin ARG --# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a --# a wine environment, working winepath, and LT_CYGPATH set. Returns result in --# func_to_host_file_result. --func_convert_path_nix_to_cygwin () --{ -- $opt_debug -- func_to_host_path_result="$1" -- if test -n "$1"; then -- # Remove leading and trailing path separator characters from -- # ARG. msys behavior is inconsistent here, cygpath turns them -- # into '.;' and ';.', and winepath ignores them completely. -- func_stripname : : "$1" -- func_to_host_path_tmp1=$func_stripname_result -- func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -- func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" -- func_to_host_path_result="$func_cygpath_result" -- func_convert_path_check : : \ -- "$func_to_host_path_tmp1" "$func_to_host_path_result" -- func_convert_path_front_back_pathsep ":*" "*:" : "$1" -- fi --} --# end func_convert_path_nix_to_cygwin -- -- - # func_mode_compile arg... - func_mode_compile () - { -@@ -1985,12 +1137,12 @@ func_mode_compile () - ;; - - -pie | -fpie | -fPIE) -- func_append pie_flag " $arg" -+ pie_flag="$pie_flag $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) -- func_append later " $arg" -+ later="$later $arg" - continue - ;; - -@@ -2011,14 +1163,15 @@ func_mode_compile () - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" -- func_append_quoted lastarg "$arg" -+ func_quote_for_eval "$arg" -+ lastarg="$lastarg $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. -- func_append base_compile " $lastarg" -+ base_compile="$base_compile $lastarg" - continue - ;; - -@@ -2034,7 +1187,8 @@ func_mode_compile () - esac # case $arg_mode - - # Aesthetically quote the previous argument. -- func_append_quoted base_compile "$lastarg" -+ func_quote_for_eval "$lastarg" -+ base_compile="$base_compile $func_quote_for_eval_result" - done # for arg - - case $arg_mode in -@@ -2059,7 +1213,7 @@ func_mode_compile () - *.[cCFSifmso] | \ - *.ada | *.adb | *.ads | *.asm | \ - *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ -- *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) -+ *.[fF][09]? | *.for | *.java | *.obj | *.sx) - func_xform "$libobj" - libobj=$func_xform_result - ;; -@@ -2134,7 +1288,7 @@ func_mode_compile () - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then -- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} -+ output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - else - output_obj= -@@ -2165,16 +1319,17 @@ compiler." - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi -- func_append removelist " $output_obj" -+ removelist="$removelist $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist -- func_append removelist " $lockfile" -+ removelist="$removelist $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - -- func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 -- srcfile=$func_to_tool_file_result -+ if test -n "$fix_srcfile_path"; then -+ eval srcfile=\"$fix_srcfile_path\" -+ fi - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - -@@ -2194,7 +1349,7 @@ compiler." - - if test -z "$output_obj"; then - # Place PIC objects in $objdir -- func_append command " -o $lobj" -+ command="$command -o $lobj" - fi - - func_show_eval_locale "$command" \ -@@ -2241,11 +1396,11 @@ compiler." - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then -- func_append command " -o $obj" -+ command="$command -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. -- func_append command "$suppress_output" -+ command="$command$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - -@@ -2290,13 +1445,13 @@ compiler." - } - - $opt_help || { -- test "$opt_mode" = compile && func_mode_compile ${1+"$@"} -+test "$mode" = compile && func_mode_compile ${1+"$@"} - } - - func_mode_help () - { - # We need to display help for each of the modes. -- case $opt_mode in -+ case $mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. -@@ -2327,11 +1482,10 @@ This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes -- -prefer-pic try to build PIC objects only -- -prefer-non-pic try to build non-PIC objects only -+ -prefer-pic try to building PIC objects only -+ -prefer-non-pic try to building non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking -- -Wc,FLAG pass FLAG directly to the compiler - - COMPILE-COMMAND is a command to be used in creating a \`standard' object file - from the given SOURCEFILE. -@@ -2384,7 +1538,7 @@ either the \`install' or \`cp' program. - - The following components of INSTALL-COMMAND are treated specially: - -- -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation -+ -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation - - The rest of the components are interpreted as arguments to that command (only - BSD-compatible install options are recognized)." -@@ -2404,8 +1558,6 @@ The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible -- -bindir BINDIR specify path to binaries directory (for systems where -- libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -@@ -2434,11 +1586,6 @@ The following components of LINK-COMMAND are treated specially: - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -weak LIBNAME declare that the target provides the LIBNAME interface -- -Wc,FLAG -- -Xcompiler FLAG pass linker-specific FLAG directly to the compiler -- -Wl,FLAG -- -Xlinker FLAG pass linker-specific FLAG directly to the linker -- -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) - - All other options (arguments beginning with \`-') are ignored. - -@@ -2472,44 +1619,18 @@ Otherwise, only FILE itself is deleted using RM." - ;; - - *) -- func_fatal_help "invalid operation mode \`$opt_mode'" -+ func_fatal_help "invalid operation mode \`$mode'" - ;; - esac - -- echo -+ $ECHO - $ECHO "Try \`$progname --help' for more information about other modes." -+ -+ exit $? - } - --# Now that we've collected a possible --mode arg, show help if necessary --if $opt_help; then -- if test "$opt_help" = :; then -- func_mode_help -- else -- { -- func_help noexit -- for opt_mode in compile link execute install finish uninstall clean; do -- func_mode_help -- done -- } | sed -n '1p; 2,$s/^Usage:/ or: /p' -- { -- func_help noexit -- for opt_mode in compile link execute install finish uninstall clean; do -- echo -- func_mode_help -- done -- } | -- sed '1d -- /^When reporting/,/^Report/{ -- H -- d -- } -- $x -- /information about other modes/d -- /more detailed .*MODE/d -- s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' -- fi -- exit $? --fi -+ # Now that we've collected a possible --mode arg, show help if necessary -+ $opt_help && func_mode_help - - - # func_mode_execute arg... -@@ -2522,16 +1643,13 @@ func_mode_execute () - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. -- for file in $opt_dlopen; do -+ for file in $execute_dlfiles; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) -- func_resolve_sysroot "$file" -- file=$func_resolve_sysroot_result -- - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" -@@ -2553,7 +1671,7 @@ func_mode_execute () - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then -- func_append dir "/$objdir" -+ dir="$dir/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" -@@ -2594,7 +1712,7 @@ func_mode_execute () - for file - do - case $file in -- -* | *.la | *.lo ) ;; -+ -*) ;; - *) - # Do a test to see if this is really a libtool program. - if func_ltwrapper_script_p "$file"; then -@@ -2610,7 +1728,8 @@ func_mode_execute () - ;; - esac - # Quote arguments (to preserve shell metacharacters). -- func_append_quoted args "$file" -+ func_quote_for_eval "$file" -+ args="$args $func_quote_for_eval_result" - done - - if test "X$opt_dry_run" = Xfalse; then -@@ -2635,66 +1754,29 @@ func_mode_execute () - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" -- echo "export $shlibpath_var" -+ $ECHO "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS - fi - } - --test "$opt_mode" = execute && func_mode_execute ${1+"$@"} -+test "$mode" = execute && func_mode_execute ${1+"$@"} - - - # func_mode_finish arg... - func_mode_finish () - { - $opt_debug -- libs= -- libdirs= -+ libdirs="$nonopt" - admincmds= - -- for opt in "$nonopt" ${1+"$@"} -- do -- if test -d "$opt"; then -- func_append libdirs " $opt" -- -- elif test -f "$opt"; then -- if func_lalib_unsafe_p "$opt"; then -- func_append libs " $opt" -- else -- func_warning "\`$opt' is not a valid libtool archive" -- fi -- -- else -- func_fatal_error "invalid argument \`$opt'" -- fi -- done -- -- if test -n "$libs"; then -- if test -n "$lt_sysroot"; then -- sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` -- sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" -- else -- sysroot_cmd= -- fi -- -- # Remove sysroot references -- if $opt_dry_run; then -- for lib in $libs; do -- echo "removing references to $lt_sysroot and \`=' prefixes from $lib" -- done -- else -- tmpdir=`func_mktempdir` -- for lib in $libs; do -- sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ -- > $tmpdir/tmp-la -- mv -f $tmpdir/tmp-la $lib -- done -- ${RM}r "$tmpdir" -- fi -- fi -- - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -+ for dir -+ do -+ libdirs="$libdirs $dir" -+ done -+ - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. -@@ -2704,7 +1786,7 @@ func_mode_finish () - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" -- $opt_dry_run || eval "$cmds" || func_append admincmds " -+ $opt_dry_run || eval "$cmds" || admincmds="$admincmds - $cmds" - fi - done -@@ -2713,55 +1795,53 @@ func_mode_finish () - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - -- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -- echo "----------------------------------------------------------------------" -- echo "Libraries have been installed in:" -- for libdir in $libdirs; do -- $ECHO " $libdir" -- done -- echo -- echo "If you ever happen to want to link against installed libraries" -- echo "in a given directory, LIBDIR, you must either use libtool, and" -- echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -- echo "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -- echo " during execution" -- fi -- if test -n "$runpath_var"; then -- echo " - add LIBDIR to the \`$runpath_var' environment variable" -- echo " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -- -- $ECHO " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- $ECHO " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- echo -+ $ECHO "X----------------------------------------------------------------------" | $Xsed -+ $ECHO "Libraries have been installed in:" -+ for libdir in $libdirs; do -+ $ECHO " $libdir" -+ done -+ $ECHO -+ $ECHO "If you ever happen to want to link against installed libraries" -+ $ECHO "in a given directory, LIBDIR, you must either use libtool, and" -+ $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" -+ $ECHO "flag during linking and do at least one of the following:" -+ if test -n "$shlibpath_var"; then -+ $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" -+ $ECHO " during execution" -+ fi -+ if test -n "$runpath_var"; then -+ $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" -+ $ECHO " during linking" -+ fi -+ if test -n "$hardcode_libdir_flag_spec"; then -+ libdir=LIBDIR -+ eval flag=\"$hardcode_libdir_flag_spec\" - -- echo "See any operating system documentation about shared libraries for" -- case $host in -- solaris2.[6789]|solaris2.1[0-9]) -- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -- echo "pages." -- ;; -- *) -- echo "more information, such as the ld(1) and ld.so(8) manual pages." -- ;; -- esac -- echo "----------------------------------------------------------------------" -+ $ECHO " - use the \`$flag' linker flag" - fi -+ if test -n "$admincmds"; then -+ $ECHO " - have your system administrator run these commands:$admincmds" -+ fi -+ if test -f /etc/ld.so.conf; then -+ $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ fi -+ $ECHO -+ -+ $ECHO "See any operating system documentation about shared libraries for" -+ case $host in -+ solaris2.[6789]|solaris2.1[0-9]) -+ $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" -+ $ECHO "pages." -+ ;; -+ *) -+ $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." -+ ;; -+ esac -+ $ECHO "X----------------------------------------------------------------------" | $Xsed - exit $EXIT_SUCCESS - } - --test "$opt_mode" = finish && func_mode_finish ${1+"$@"} -+test "$mode" = finish && func_mode_finish ${1+"$@"} - - - # func_mode_install arg... -@@ -2772,7 +1852,7 @@ func_mode_install () - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. -- case $nonopt in *shtool*) :;; *) false;; esac; then -+ $ECHO "X$nonopt" | $GREP shtool >/dev/null; then - # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " -@@ -2786,12 +1866,7 @@ func_mode_install () - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" -- func_append install_prog "$func_quote_for_eval_result" -- install_shared_prog=$install_prog -- case " $install_prog " in -- *[\\\ /]cp\ *) install_cp=: ;; -- *) install_cp=false ;; -- esac -+ install_prog="$install_prog$func_quote_for_eval_result" - - # We need to accept at least all the BSD install flags. - dest= -@@ -2801,12 +1876,10 @@ func_mode_install () - install_type= - isdir=no - stripme= -- no_mode=: - for arg - do -- arg2= - if test -n "$dest"; then -- func_append files " $dest" -+ files="$files $dest" - dest=$arg - continue - fi -@@ -2814,9 +1887,10 @@ func_mode_install () - case $arg in - -d) isdir=yes ;; - -f) -- if $install_cp; then :; else -- prev=$arg -- fi -+ case " $install_prog " in -+ *[\\\ /]cp\ *) ;; -+ *) prev=$arg ;; -+ esac - ;; - -g | -m | -o) - prev=$arg -@@ -2830,10 +1904,6 @@ func_mode_install () - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then -- if test "x$prev" = x-m && test -n "$install_override_mode"; then -- arg2=$install_override_mode -- no_mode=false -- fi - prev= - else - dest=$arg -@@ -2844,11 +1914,7 @@ func_mode_install () - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" -- func_append install_prog " $func_quote_for_eval_result" -- if test -n "$arg2"; then -- func_quote_for_eval "$arg2" -- fi -- func_append install_shared_prog " $func_quote_for_eval_result" -+ install_prog="$install_prog $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ -@@ -2857,13 +1923,6 @@ func_mode_install () - test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" - -- if test -n "$install_override_mode" && $no_mode; then -- if $install_cp; then :; else -- func_quote_for_eval "$install_override_mode" -- func_append install_shared_prog " -m $func_quote_for_eval_result" -- fi -- fi -- - if test -z "$files"; then - if test -z "$dest"; then - func_fatal_help "no file or destination specified" -@@ -2918,13 +1977,10 @@ func_mode_install () - case $file in - *.$libext) - # Do the static libraries later. -- func_append staticlibs " $file" -+ staticlibs="$staticlibs $file" - ;; - - *.la) -- func_resolve_sysroot "$file" -- file=$func_resolve_sysroot_result -- - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" -@@ -2938,23 +1994,23 @@ func_mode_install () - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; -- *) func_append current_libdirs " $libdir" ;; -+ *) current_libdirs="$current_libdirs $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; -- *) func_append future_libdirs " $libdir" ;; -+ *) future_libdirs="$future_libdirs $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" -- func_append dir "$objdir" -+ dir="$dir$objdir" - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. -- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` -+ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that -@@ -2967,9 +2023,9 @@ func_mode_install () - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. -- relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` -+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` - else -- relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` -+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` - fi - - func_warning "relinking \`$file'" -@@ -2987,7 +2043,7 @@ func_mode_install () - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. -- func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ -+ func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ - 'exit $?' - tstripme="$stripme" - case $host_os in -@@ -3027,7 +2083,7 @@ func_mode_install () - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. -- test -n "$old_library" && func_append staticlibs " $dir/$old_library" -+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" - ;; - - *.lo) -@@ -3127,7 +2183,7 @@ func_mode_install () - if test -f "$lib"; then - func_source "$lib" - fi -- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test -+ libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no -@@ -3146,7 +2202,7 @@ func_mode_install () - file="$func_basename_result" - outputname="$tmpdir/$file" - # Replace the output file specification. -- relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` -+ relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` - - $opt_silent || { - func_quote_for_expand "$relink_command" -@@ -3165,7 +2221,7 @@ func_mode_install () - } - else - # Install the binary that we compiled earlier. -- file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` -+ file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - -@@ -3224,7 +2280,7 @@ func_mode_install () - fi - } - --test "$opt_mode" = install && func_mode_install ${1+"$@"} -+test "$mode" = install && func_mode_install ${1+"$@"} - - - # func_generate_dlsyms outputname originator pic_p -@@ -3267,22 +2323,6 @@ func_generate_dlsyms () - extern \"C\" { - #endif - --#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) --#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" --#endif -- --/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ --#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) --/* DATA imports from DLLs on WIN32 con't be const, because runtime -- relocations are performed -- see ld's documentation on pseudo-relocs. */ --# define LT_DLSYM_CONST --#elif defined(__osf__) --/* This system does not cope well with relocations in const data. */ --# define LT_DLSYM_CONST --#else --# define LT_DLSYM_CONST const --#endif -- - /* External symbol declarations for the compiler. */\ - " - -@@ -3292,11 +2332,10 @@ extern \"C\" { - $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. -- progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` -+ progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - for progfile in $progfiles; do -- func_to_tool_file "$progfile" func_convert_file_msys_to_w32 -- func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" -- $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" -+ func_verbose "extracting global C symbols from \`$progfile'" -+ $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then -@@ -3332,7 +2371,7 @@ extern \"C\" { - eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - case $host in -- *cygwin* | *mingw* | *cegcc* ) -+ *cygwin | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; -@@ -3345,52 +2384,10 @@ extern \"C\" { - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" -- case $host in -- *cygwin* | *mingw* | *cegcc* ) -- # if an import library, we need to obtain dlname -- if func_win32_import_lib_p "$dlprefile"; then -- func_tr_sh "$dlprefile" -- eval "curr_lafile=\$libfile_$func_tr_sh_result" -- dlprefile_dlbasename="" -- if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then -- # Use subshell, to avoid clobbering current variable values -- dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` -- if test -n "$dlprefile_dlname" ; then -- func_basename "$dlprefile_dlname" -- dlprefile_dlbasename="$func_basename_result" -- else -- # no lafile. user explicitly requested -dlpreopen <import library>. -- $sharedlib_from_linklib_cmd "$dlprefile" -- dlprefile_dlbasename=$sharedlib_from_linklib_result -- fi -- fi -- $opt_dry_run || { -- if test -n "$dlprefile_dlbasename" ; then -- eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' -- else -- func_warning "Could not compute DLL name from $name" -- eval '$ECHO ": $name " >> "$nlist"' -- fi -- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | -- $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" -- } -- else # not an import lib -- $opt_dry_run || { -- eval '$ECHO ": $name " >> "$nlist"' -- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -- } -- fi -- ;; -- *) -- $opt_dry_run || { -- eval '$ECHO ": $name " >> "$nlist"' -- func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -- eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -- } -- ;; -- esac -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } - done - - $opt_dry_run || { -@@ -3418,19 +2415,36 @@ extern \"C\" { - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' - else -- echo '/* NONE */' >> "$output_objdir/$my_dlsyms" -+ $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" - fi - -- echo >> "$output_objdir/$my_dlsyms" "\ -+ $ECHO >> "$output_objdir/$my_dlsyms" "\ - - /* The mapping between symbol names and symbols. */ - typedef struct { - const char *name; - void *address; - } lt_dlsymlist; --extern LT_DLSYM_CONST lt_dlsymlist -+" -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ $ECHO >> "$output_objdir/$my_dlsyms" "\ -+/* DATA imports from DLLs on WIN32 con't be const, because -+ runtime relocations are performed -- see ld's documentation -+ on pseudo-relocs. */" -+ lt_dlsym_const= ;; -+ *osf5*) -+ echo >> "$output_objdir/$my_dlsyms" "\ -+/* This system does not cope well with relocations in const data */" -+ lt_dlsym_const= ;; -+ *) -+ lt_dlsym_const=const ;; -+ esac -+ -+ $ECHO >> "$output_objdir/$my_dlsyms" "\ -+extern $lt_dlsym_const lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[]; --LT_DLSYM_CONST lt_dlsymlist -+$lt_dlsym_const lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[] = - {\ - { \"$my_originator\", (void *) 0 }," -@@ -3443,7 +2457,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] = - eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - esac -- echo >> "$output_objdir/$my_dlsyms" "\ -+ $ECHO >> "$output_objdir/$my_dlsyms" "\ - {0, (void *) 0} - }; - -@@ -3486,7 +2500,7 @@ static const void *lt_preloaded_setup() { - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; -- *) func_append symtab_cflags " $arg" ;; -+ *) symtab_cflags="$symtab_cflags $arg" ;; - esac - done - -@@ -3501,16 +2515,16 @@ static const void *lt_preloaded_setup() { - case $host in - *cygwin* | *mingw* | *cegcc* ) - if test -f "$output_objdir/$my_outputname.def"; then -- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - else -- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` -- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` -+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - fi - ;; - *) -- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` -- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` -+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - ;; - esac - ;; -@@ -3524,8 +2538,8 @@ static const void *lt_preloaded_setup() { - # really was required. - - # Nullify the symbol file. -- compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` -- finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` -+ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` -+ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` - fi - } - -@@ -3535,7 +2549,6 @@ static const void *lt_preloaded_setup() { - # Need a lot of goo to handle *both* DLLs and import libs - # Has to be a shell function in order to 'eat' the argument - # that is supplied when $file_magic_command is called. --# Despite the name, also deal with 64 bit binaries. - func_win32_libid () - { - $opt_debug -@@ -3546,11 +2559,9 @@ func_win32_libid () - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static -- # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | -- $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -- func_to_tool_file "$1" func_convert_file_msys_to_w32 -- win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | -+ $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then -+ win32_nmres=`eval $NM -f posix -A $1 | - $SED -n -e ' - 1,100{ - / I /{ -@@ -3579,131 +2590,6 @@ func_win32_libid () - $ECHO "$win32_libid_type" - } - --# func_cygming_dll_for_implib ARG --# --# Platform-specific function to extract the --# name of the DLL associated with the specified --# import library ARG. --# Invoked by eval'ing the libtool variable --# $sharedlib_from_linklib_cmd --# Result is available in the variable --# $sharedlib_from_linklib_result --func_cygming_dll_for_implib () --{ -- $opt_debug -- sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` --} -- --# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs --# --# The is the core of a fallback implementation of a --# platform-specific function to extract the name of the --# DLL associated with the specified import library LIBNAME. --# --# SECTION_NAME is either .idata$6 or .idata$7, depending --# on the platform and compiler that created the implib. --# --# Echos the name of the DLL associated with the --# specified import library. --func_cygming_dll_for_implib_fallback_core () --{ -- $opt_debug -- match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` -- $OBJDUMP -s --section "$1" "$2" 2>/dev/null | -- $SED '/^Contents of section '"$match_literal"':/{ -- # Place marker at beginning of archive member dllname section -- s/.*/====MARK====/ -- p -- d -- } -- # These lines can sometimes be longer than 43 characters, but -- # are always uninteresting -- /:[ ]*file format pe[i]\{,1\}-/d -- /^In archive [^:]*:/d -- # Ensure marker is printed -- /^====MARK====/p -- # Remove all lines with less than 43 characters -- /^.\{43\}/!d -- # From remaining lines, remove first 43 characters -- s/^.\{43\}//' | -- $SED -n ' -- # Join marker and all lines until next marker into a single line -- /^====MARK====/ b para -- H -- $ b para -- b -- :para -- x -- s/\n//g -- # Remove the marker -- s/^====MARK====// -- # Remove trailing dots and whitespace -- s/[\. \t]*$// -- # Print -- /./p' | -- # we now have a list, one entry per line, of the stringified -- # contents of the appropriate section of all members of the -- # archive which possess that section. Heuristic: eliminate -- # all those which have a first or second character that is -- # a '.' (that is, objdump's representation of an unprintable -- # character.) This should work for all archives with less than -- # 0x302f exports -- but will fail for DLLs whose name actually -- # begins with a literal '.' or a single character followed by -- # a '.'. -- # -- # Of those that remain, print the first one. -- $SED -e '/^\./d;/^.\./d;q' --} -- --# func_cygming_gnu_implib_p ARG --# This predicate returns with zero status (TRUE) if --# ARG is a GNU/binutils-style import library. Returns --# with nonzero status (FALSE) otherwise. --func_cygming_gnu_implib_p () --{ -- $opt_debug -- func_to_tool_file "$1" func_convert_file_msys_to_w32 -- func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` -- test -n "$func_cygming_gnu_implib_tmp" --} -- --# func_cygming_ms_implib_p ARG --# This predicate returns with zero status (TRUE) if --# ARG is an MS-style import library. Returns --# with nonzero status (FALSE) otherwise. --func_cygming_ms_implib_p () --{ -- $opt_debug -- func_to_tool_file "$1" func_convert_file_msys_to_w32 -- func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` -- test -n "$func_cygming_ms_implib_tmp" --} -- --# func_cygming_dll_for_implib_fallback ARG --# Platform-specific function to extract the --# name of the DLL associated with the specified --# import library ARG. --# --# This fallback implementation is for use when $DLLTOOL --# does not support the --identify-strict option. --# Invoked by eval'ing the libtool variable --# $sharedlib_from_linklib_cmd --# Result is available in the variable --# $sharedlib_from_linklib_result --func_cygming_dll_for_implib_fallback () --{ -- $opt_debug -- if func_cygming_gnu_implib_p "$1" ; then -- # binutils import library -- sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` -- elif func_cygming_ms_implib_p "$1" ; then -- # ms-generated import library -- sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` -- else -- # unknown -- sharedlib_from_linklib_result="" -- fi --} - - - # func_extract_an_archive dir oldlib -@@ -3712,18 +2598,7 @@ func_extract_an_archive () - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" -- if test "$lock_old_archive_extraction" = yes; then -- lockfile=$f_ex_an_ar_oldlib.lock -- until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do -- func_echo "Waiting for $lockfile to be removed" -- sleep 2 -- done -- fi -- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ -- 'stat=$?; rm -f "$lockfile"; exit $stat' -- if test "$lock_old_archive_extraction" = yes; then -- $opt_dry_run || rm -f "$lockfile" -- fi -+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else -@@ -3794,7 +2669,7 @@ func_extract_archives () - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do -- darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` -+ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ -@@ -3809,30 +2684,25 @@ func_extract_archives () - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac -- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" - } - - --# func_emit_wrapper [arg=no] --# --# Emit a libtool wrapper script on stdout. --# Don't directly open a file because we may want to --# incorporate the script contents within a cygwin/mingw --# wrapper executable. Must ONLY be called from within --# func_mode_link because it depends on a number of variables --# set therein. -+ -+# func_emit_wrapper_part1 [arg=no] - # --# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR --# variable will take. If 'yes', then the emitted script --# will assume that the directory in which it is stored is --# the $objdir directory. This is a cygwin/mingw-specific --# behavior. --func_emit_wrapper () -+# Emit the first part of a libtool wrapper script on stdout. -+# For more information, see the description associated with -+# func_emit_wrapper(), below. -+func_emit_wrapper_part1 () - { -- func_emit_wrapper_arg1=${1-no} -+ func_emit_wrapper_part1_arg1=no -+ if test -n "$1" ; then -+ func_emit_wrapper_part1_arg1=$1 -+ fi - - $ECHO "\ - #! $SHELL -@@ -3848,6 +2718,7 @@ func_emit_wrapper () - - # Sed substitution that helps us do robust quoting. It backslashifies - # metacharacters that are still active within double-quoted strings. -+Xsed='${SED} -e 1s/^X//' - sed_quote_subst='$sed_quote_subst' - - # Be Bourne compatible -@@ -3878,132 +2749,31 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then - else - # When we are sourced in execute mode, \$file and \$ECHO are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then -- file=\"\$0\"" -- -- qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` -- $ECHO "\ -- --# A function that is used when there is no print builtin or printf. --func_fallback_echo () --{ -- eval 'cat <<_LTECHO_EOF --\$1 --_LTECHO_EOF' --} -- ECHO=\"$qECHO\" -- fi -- --# Very basic option parsing. These options are (a) specific to --# the libtool wrapper, (b) are identical between the wrapper --# /script/ and the wrapper /executable/ which is used only on --# windows platforms, and (c) all begin with the string "--lt-" --# (application programs are unlikely to have options which match --# this pattern). --# --# There are only two supported options: --lt-debug and --# --lt-dump-script. There is, deliberately, no --lt-help. --# --# The first argument to this parsing function should be the --# script's $0 value, followed by "$@". --lt_option_debug= --func_parse_lt_options () --{ -- lt_script_arg0=\$0 -- shift -- for lt_opt -- do -- case \"\$lt_opt\" in -- --lt-debug) lt_option_debug=1 ;; -- --lt-dump-script) -- lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` -- test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. -- lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` -- cat \"\$lt_dump_D/\$lt_dump_F\" -- exit 0 -- ;; -- --lt-*) -- \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 -- exit 1 -- ;; -- esac -- done -- -- # Print the debug banner immediately: -- if test -n \"\$lt_option_debug\"; then -- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 -- fi --} -- --# Used when --lt-debug. Prints its arguments to stdout --# (redirection is the responsibility of the caller) --func_lt_dump_args () --{ -- lt_dump_args_N=1; -- for lt_arg -- do -- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" -- lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` -- done --} -- --# Core function for launching the target application --func_exec_program_core () --{ --" -- case $host in -- # Backslashes separate directories on plain windows -- *-*-mingw | *-*-os2* | *-cegcc*) -- $ECHO "\ -- if test -n \"\$lt_option_debug\"; then -- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 -- func_lt_dump_args \${1+\"\$@\"} 1>&2 -- fi -- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} --" -- ;; -- -- *) -- $ECHO "\ -- if test -n \"\$lt_option_debug\"; then -- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 -- func_lt_dump_args \${1+\"\$@\"} 1>&2 -- fi -- exec \"\$progdir/\$program\" \${1+\"\$@\"} -+ ECHO=\"$qecho\" -+ file=\"\$0\" -+ # Make sure echo works. -+ if test \"X\$1\" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. -+ shift -+ elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then -+ # Yippee, \$ECHO works! -+ : -+ else -+ # Restart under the correct shell, and then maybe \$ECHO will work. -+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} -+ fi -+ fi\ - " -- ;; -- esac -- $ECHO "\ -- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -- exit 1 --} -- --# A function to encapsulate launching the target application --# Strips options in the --lt-* namespace from \$@ and --# launches target application with the remaining arguments. --func_exec_program () --{ -- for lt_wr_arg -- do -- case \$lt_wr_arg in -- --lt-*) ;; -- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; -- esac -- shift -- done -- func_exec_program_core \${1+\"\$@\"} --} -- -- # Parse options -- func_parse_lt_options \"\$0\" \${1+\"\$@\"} -+ $ECHO "\ - - # Find the directory that this script lives in. -- thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` -+ thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. -- file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` -+ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` - while test -n \"\$file\"; do -- destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` -+ destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then -@@ -4013,13 +2783,30 @@ func_exec_program () - esac - fi - -- file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` -- file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` -+ file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` -+ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` - done -+" -+} -+# end: func_emit_wrapper_part1 -+ -+# func_emit_wrapper_part2 [arg=no] -+# -+# Emit the second part of a libtool wrapper script on stdout. -+# For more information, see the description associated with -+# func_emit_wrapper(), below. -+func_emit_wrapper_part2 () -+{ -+ func_emit_wrapper_part2_arg1=no -+ if test -n "$1" ; then -+ func_emit_wrapper_part2_arg1=$1 -+ fi -+ -+ $ECHO "\ - - # Usually 'no', except on cygwin/mingw when embedded into - # the cwrapper. -- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 -+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 - if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then - # special case for '.' - if test \"\$thisdir\" = \".\"; then -@@ -4027,7 +2814,7 @@ func_exec_program () - fi - # remove .libs from thisdir - case \"\$thisdir\" in -- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; -+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; - $objdir ) thisdir=. ;; - esac - fi -@@ -4082,18 +2869,6 @@ func_exec_program () - - if test -f \"\$progdir/\$program\"; then" - -- # fixup the dll searchpath if we need to. -- # -- # Fix the DLL searchpath if we need to. Do this before prepending -- # to shlibpath, because on Windows, both are PATH and uninstalled -- # libraries must come first. -- if test -n "$dllsearchpath"; then -- $ECHO "\ -- # Add the dll search path components to the executable PATH -- PATH=$dllsearchpath:\$PATH --" -- fi -- - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ -@@ -4102,28 +2877,253 @@ func_exec_program () - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed -- $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` -+ $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` - - export $shlibpath_var - " - fi - -+ # fixup the dll searchpath if we need to. -+ if test -n "$dllsearchpath"; then -+ $ECHO "\ -+ # Add the dll search path components to the executable PATH -+ PATH=$dllsearchpath:\$PATH -+" -+ fi -+ - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. -- func_exec_program \${1+\"\$@\"} -+" -+ case $host in -+ # Backslashes separate directories on plain windows -+ *-*-mingw | *-*-os2* | *-cegcc*) -+ $ECHO "\ -+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -+" -+ ;; -+ -+ *) -+ $ECHO "\ -+ exec \"\$progdir/\$program\" \${1+\"\$@\"} -+" -+ ;; -+ esac -+ $ECHO "\ -+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -+ exit 1 - fi - else - # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 -- \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 -+ $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi - fi\ - " - } -+# end: func_emit_wrapper_part2 -+ -+ -+# func_emit_wrapper [arg=no] -+# -+# Emit a libtool wrapper script on stdout. -+# Don't directly open a file because we may want to -+# incorporate the script contents within a cygwin/mingw -+# wrapper executable. Must ONLY be called from within -+# func_mode_link because it depends on a number of variables -+# set therein. -+# -+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -+# variable will take. If 'yes', then the emitted script -+# will assume that the directory in which it is stored is -+# the $objdir directory. This is a cygwin/mingw-specific -+# behavior. -+func_emit_wrapper () -+{ -+ func_emit_wrapper_arg1=no -+ if test -n "$1" ; then -+ func_emit_wrapper_arg1=$1 -+ fi -+ -+ # split this up so that func_emit_cwrapperexe_src -+ # can call each part independently. -+ func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" -+ func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" -+} -+ -+ -+# func_to_host_path arg -+# -+# Convert paths to host format when used with build tools. -+# Intended for use with "native" mingw (where libtool itself -+# is running under the msys shell), or in the following cross- -+# build environments: -+# $build $host -+# mingw (msys) mingw [e.g. native] -+# cygwin mingw -+# *nix + wine mingw -+# where wine is equipped with the `winepath' executable. -+# In the native mingw case, the (msys) shell automatically -+# converts paths for any non-msys applications it launches, -+# but that facility isn't available from inside the cwrapper. -+# Similar accommodations are necessary for $host mingw and -+# $build cygwin. Calling this function does no harm for other -+# $host/$build combinations not listed above. -+# -+# ARG is the path (on $build) that should be converted to -+# the proper representation for $host. The result is stored -+# in $func_to_host_path_result. -+func_to_host_path () -+{ -+ func_to_host_path_result="$1" -+ if test -n "$1" ; then -+ case $host in -+ *mingw* ) -+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -+ case $build in -+ *mingw* ) # actually, msys -+ # awkward: cmd appends spaces to result -+ lt_sed_strip_trailing_spaces="s/[ ]*\$//" -+ func_to_host_path_tmp1=`( cmd //c echo "$1" |\ -+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` -+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -+ $SED -e "$lt_sed_naive_backslashify"` -+ ;; -+ *cygwin* ) -+ func_to_host_path_tmp1=`cygpath -w "$1"` -+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -+ $SED -e "$lt_sed_naive_backslashify"` -+ ;; -+ * ) -+ # Unfortunately, winepath does not exit with a non-zero -+ # error code, so we are forced to check the contents of -+ # stdout. On the other hand, if the command is not -+ # found, the shell will set an exit code of 127 and print -+ # *an error message* to stdout. So we must check for both -+ # error code of zero AND non-empty stdout, which explains -+ # the odd construction: -+ func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` -+ if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then -+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -+ $SED -e "$lt_sed_naive_backslashify"` -+ else -+ # Allow warning below. -+ func_to_host_path_result="" -+ fi -+ ;; -+ esac -+ if test -z "$func_to_host_path_result" ; then -+ func_error "Could not determine host path corresponding to" -+ func_error " '$1'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback: -+ func_to_host_path_result="$1" -+ fi -+ ;; -+ esac -+ fi -+} -+# end: func_to_host_path - -+# func_to_host_pathlist arg -+# -+# Convert pathlists to host format when used with build tools. -+# See func_to_host_path(), above. This function supports the -+# following $build/$host combinations (but does no harm for -+# combinations not listed here): -+# $build $host -+# mingw (msys) mingw [e.g. native] -+# cygwin mingw -+# *nix + wine mingw -+# -+# Path separators are also converted from $build format to -+# $host format. If ARG begins or ends with a path separator -+# character, it is preserved (but converted to $host format) -+# on output. -+# -+# ARG is a pathlist (on $build) that should be converted to -+# the proper representation on $host. The result is stored -+# in $func_to_host_pathlist_result. -+func_to_host_pathlist () -+{ -+ func_to_host_pathlist_result="$1" -+ if test -n "$1" ; then -+ case $host in -+ *mingw* ) -+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -+ # Remove leading and trailing path separator characters from -+ # ARG. msys behavior is inconsistent here, cygpath turns them -+ # into '.;' and ';.', and winepath ignores them completely. -+ func_to_host_pathlist_tmp2="$1" -+ # Once set for this call, this variable should not be -+ # reassigned. It is used in tha fallback case. -+ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ -+ $SED -e 's|^:*||' -e 's|:*$||'` -+ case $build in -+ *mingw* ) # Actually, msys. -+ # Awkward: cmd appends spaces to result. -+ lt_sed_strip_trailing_spaces="s/[ ]*\$//" -+ func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ -+ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` -+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ -+ $SED -e "$lt_sed_naive_backslashify"` -+ ;; -+ *cygwin* ) -+ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` -+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ -+ $SED -e "$lt_sed_naive_backslashify"` -+ ;; -+ * ) -+ # unfortunately, winepath doesn't convert pathlists -+ func_to_host_pathlist_result="" -+ func_to_host_pathlist_oldIFS=$IFS -+ IFS=: -+ for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do -+ IFS=$func_to_host_pathlist_oldIFS -+ if test -n "$func_to_host_pathlist_f" ; then -+ func_to_host_path "$func_to_host_pathlist_f" -+ if test -n "$func_to_host_path_result" ; then -+ if test -z "$func_to_host_pathlist_result" ; then -+ func_to_host_pathlist_result="$func_to_host_path_result" -+ else -+ func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" -+ fi -+ fi -+ fi -+ IFS=: -+ done -+ IFS=$func_to_host_pathlist_oldIFS -+ ;; -+ esac -+ if test -z "$func_to_host_pathlist_result" ; then -+ func_error "Could not determine the host path(s) corresponding to" -+ func_error " '$1'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback. This may break if $1 contains DOS-style drive -+ # specifications. The fix is not to complicate the expression -+ # below, but for the user to provide a working wine installation -+ # with winepath so that path translation in the cross-to-mingw -+ # case works properly. -+ lt_replace_pathsep_nix_to_dos="s|:|;|g" -+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ -+ $SED -e "$lt_replace_pathsep_nix_to_dos"` -+ fi -+ # Now, add the leading and trailing path separators back -+ case "$1" in -+ :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" -+ ;; -+ esac -+ case "$1" in -+ *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" -+ ;; -+ esac -+ ;; -+ esac -+ fi -+} -+# end: func_to_host_pathlist - - # func_emit_cwrapperexe_src - # emit the source code for a wrapper executable on stdout -@@ -4141,23 +3141,31 @@ func_emit_cwrapperexe_src () - - This wrapper executable should never be moved out of the build directory. - If it is, it will not operate correctly. -+ -+ Currently, it simply execs the wrapper *script* "$SHELL $output", -+ but could eventually absorb all of the scripts functionality and -+ exec $objdir/$outputname directly. - */ - EOF - cat <<"EOF" --#ifdef _MSC_VER --# define _CRT_SECURE_NO_DEPRECATE 1 --#endif - #include <stdio.h> - #include <stdlib.h> - #ifdef _MSC_VER - # include <direct.h> - # include <process.h> - # include <io.h> -+# define setmode _setmode - #else - # include <unistd.h> - # include <stdint.h> - # ifdef __CYGWIN__ - # include <io.h> -+# define HAVE_SETENV -+# ifdef __STRICT_ANSI__ -+char *realpath (const char *, char *); -+int putenv (char *); -+int setenv (const char *, const char *, int); -+# endif - # endif - #endif - #include <malloc.h> -@@ -4169,44 +3177,6 @@ EOF - #include <fcntl.h> - #include <sys/stat.h> - --/* declarations of non-ANSI functions */ --#if defined(__MINGW32__) --# ifdef __STRICT_ANSI__ --int _putenv (const char *); --# endif --#elif defined(__CYGWIN__) --# ifdef __STRICT_ANSI__ --char *realpath (const char *, char *); --int putenv (char *); --int setenv (const char *, const char *, int); --# endif --/* #elif defined (other platforms) ... */ --#endif -- --/* portability defines, excluding path handling macros */ --#if defined(_MSC_VER) --# define setmode _setmode --# define stat _stat --# define chmod _chmod --# define getcwd _getcwd --# define putenv _putenv --# define S_IXUSR _S_IEXEC --# ifndef _INTPTR_T_DEFINED --# define _INTPTR_T_DEFINED --# define intptr_t int --# endif --#elif defined(__MINGW32__) --# define setmode _setmode --# define stat _stat --# define chmod _chmod --# define getcwd _getcwd --# define putenv _putenv --#elif defined(__CYGWIN__) --# define HAVE_SETENV --# define FOPEN_WB "wb" --/* #elif defined (other platforms) ... */ --#endif -- - #if defined(PATH_MAX) - # define LT_PATHMAX PATH_MAX - #elif defined(MAXPATHLEN) -@@ -4222,7 +3192,14 @@ int setenv (const char *, const char *, int); - # define S_IXGRP 0 - #endif - --/* path handling portability macros */ -+#ifdef _MSC_VER -+# define S_IXUSR _S_IEXEC -+# define stat _stat -+# ifndef _INTPTR_T_DEFINED -+# define intptr_t int -+# endif -+#endif -+ - #ifndef DIR_SEPARATOR - # define DIR_SEPARATOR '/' - # define PATH_SEPARATOR ':' -@@ -4253,6 +3230,10 @@ int setenv (const char *, const char *, int); - # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) - #endif /* PATH_SEPARATOR_2 */ - -+#ifdef __CYGWIN__ -+# define FOPEN_WB "wb" -+#endif -+ - #ifndef FOPEN_WB - # define FOPEN_WB "w" - #endif -@@ -4265,13 +3246,22 @@ int setenv (const char *, const char *, int); - if (stale) { free ((void *) stale); stale = 0; } \ - } while (0) - --#if defined(LT_DEBUGWRAPPER) --static int lt_debug = 1; -+#undef LTWRAPPER_DEBUGPRINTF -+#if defined DEBUGWRAPPER -+# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args -+static void -+ltwrapper_debugprintf (const char *fmt, ...) -+{ -+ va_list args; -+ va_start (args, fmt); -+ (void) vfprintf (stderr, fmt, args); -+ va_end (args); -+} - #else --static int lt_debug = 0; -+# define LTWRAPPER_DEBUGPRINTF(args) - #endif - --const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ -+const char *program_name = NULL; - - void *xmalloc (size_t num); - char *xstrdup (const char *string); -@@ -4281,27 +3271,41 @@ char *chase_symlinks (const char *pathspec); - int make_executable (const char *path); - int check_executable (const char *path); - char *strendzap (char *str, const char *pat); --void lt_debugprintf (const char *file, int line, const char *fmt, ...); --void lt_fatal (const char *file, int line, const char *message, ...); --static const char *nonnull (const char *s); --static const char *nonempty (const char *s); -+void lt_fatal (const char *message, ...); - void lt_setenv (const char *name, const char *value); - char *lt_extend_str (const char *orig_value, const char *add, int to_end); -+void lt_opt_process_env_set (const char *arg); -+void lt_opt_process_env_prepend (const char *arg); -+void lt_opt_process_env_append (const char *arg); -+int lt_split_name_value (const char *arg, char** name, char** value); - void lt_update_exe_path (const char *name, const char *value); - void lt_update_lib_path (const char *name, const char *value); --char **prepare_spawn (char **argv); --void lt_dump_script (FILE *f); -+ -+static const char *script_text_part1 = - EOF - -+ func_emit_wrapper_part1 yes | -+ $SED -e 's/\([\\"]\)/\\\1/g' \ -+ -e 's/^/ "/' -e 's/$/\\n"/' -+ echo ";" - cat <<EOF --volatile const char * MAGIC_EXE = "$magic_exe"; -+ -+static const char *script_text_part2 = -+EOF -+ func_emit_wrapper_part2 yes | -+ $SED -e 's/\([\\"]\)/\\\1/g' \ -+ -e 's/^/ "/' -e 's/$/\\n"/' -+ echo ";" -+ -+ cat <<EOF -+const char * MAGIC_EXE = "$magic_exe"; - const char * LIB_PATH_VARNAME = "$shlibpath_var"; - EOF - - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then -- func_to_host_path "$temp_rpath" -+ func_to_host_pathlist "$temp_rpath" - cat <<EOF --const char * LIB_PATH_VALUE = "$func_to_host_path_result"; -+const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result"; - EOF - else - cat <<"EOF" -@@ -4310,10 +3314,10 @@ EOF - fi - - if test -n "$dllsearchpath"; then -- func_to_host_path "$dllsearchpath:" -+ func_to_host_pathlist "$dllsearchpath:" - cat <<EOF - const char * EXE_PATH_VARNAME = "PATH"; --const char * EXE_PATH_VALUE = "$func_to_host_path_result"; -+const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result"; - EOF - else - cat <<"EOF" -@@ -4336,10 +3340,24 @@ EOF - cat <<"EOF" - - #define LTWRAPPER_OPTION_PREFIX "--lt-" -+#define LTWRAPPER_OPTION_PREFIX_LENGTH 5 - -+static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH; - static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX; -+ - static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; --static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug"; -+ -+static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7; -+static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set"; -+ /* argument is putenv-style "foo=bar", value of foo is set to bar */ -+ -+static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11; -+static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend"; -+ /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */ -+ -+static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10; -+static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append"; -+ /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */ - - int - main (int argc, char *argv[]) -@@ -4356,13 +3374,10 @@ main (int argc, char *argv[]) - int i; - - program_name = (char *) xstrdup (base_name (argv[0])); -- newargz = XMALLOC (char *, argc + 1); -+ LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); -+ LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); - -- /* very simple arg parsing; don't want to rely on getopt -- * also, copy all non cwrapper options to newargz, except -- * argz[0], which is handled differently -- */ -- newargc=0; -+ /* very simple arg parsing; don't want to rely on getopt */ - for (i = 1; i < argc; i++) - { - if (strcmp (argv[i], dumpscript_opt) == 0) -@@ -4376,57 +3391,25 @@ EOF - esac - - cat <<"EOF" -- lt_dump_script (stdout); -+ printf ("%s", script_text_part1); -+ printf ("%s", script_text_part2); - return 0; - } -- if (strcmp (argv[i], debug_opt) == 0) -- { -- lt_debug = 1; -- continue; -- } -- if (strcmp (argv[i], ltwrapper_option_prefix) == 0) -- { -- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX -- namespace, but it is not one of the ones we know about and -- have already dealt with, above (inluding dump-script), then -- report an error. Otherwise, targets might begin to believe -- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX -- namespace. The first time any user complains about this, we'll -- need to make LTWRAPPER_OPTION_PREFIX a configure-time option -- or a configure.ac-settable value. -- */ -- lt_fatal (__FILE__, __LINE__, -- "unrecognized %s option: '%s'", -- ltwrapper_option_prefix, argv[i]); -- } -- /* otherwise ... */ -- newargz[++newargc] = xstrdup (argv[i]); - } -- newargz[++newargc] = NULL; -- --EOF -- cat <<EOF -- /* The GNU banner must be the first non-error debug message */ -- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n"); --EOF -- cat <<"EOF" -- lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]); -- lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name); - -+ newargz = XMALLOC (char *, argc + 1); - tmp_pathspec = find_executable (argv[0]); - if (tmp_pathspec == NULL) -- lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]); -- lt_debugprintf (__FILE__, __LINE__, -- "(main) found exe (before symlink chase) at: %s\n", -- tmp_pathspec); -+ lt_fatal ("Couldn't find %s", argv[0]); -+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", -+ tmp_pathspec)); - - actual_cwrapper_path = chase_symlinks (tmp_pathspec); -- lt_debugprintf (__FILE__, __LINE__, -- "(main) found exe (after symlink chase) at: %s\n", -- actual_cwrapper_path); -+ LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", -+ actual_cwrapper_path)); - XFREE (tmp_pathspec); - -- actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path)); -+ actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); - strendzap (actual_cwrapper_path, actual_cwrapper_name); - - /* wrapper name transforms */ -@@ -4444,9 +3427,8 @@ EOF - target_name = tmp_pathspec; - tmp_pathspec = 0; - -- lt_debugprintf (__FILE__, __LINE__, -- "(main) libtool target name: %s\n", -- target_name); -+ LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", -+ target_name)); - EOF - - cat <<EOF -@@ -4496,19 +3478,80 @@ EOF - - lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ - lt_setenv ("DUALCASE", "1"); /* for MSK sh */ -- /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must -- be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath) -- because on Windows, both *_VARNAMEs are PATH but uninstalled -- libraries must come first. */ -- lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); - lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); -+ lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); - -- lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", -- nonnull (lt_argv_zero)); -+ newargc=0; -+ for (i = 1; i < argc; i++) -+ { -+ if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0) -+ { -+ if (argv[i][env_set_opt_len] == '=') -+ { -+ const char *p = argv[i] + env_set_opt_len + 1; -+ lt_opt_process_env_set (p); -+ } -+ else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc) -+ { -+ lt_opt_process_env_set (argv[++i]); /* don't copy */ -+ } -+ else -+ lt_fatal ("%s missing required argument", env_set_opt); -+ continue; -+ } -+ if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0) -+ { -+ if (argv[i][env_prepend_opt_len] == '=') -+ { -+ const char *p = argv[i] + env_prepend_opt_len + 1; -+ lt_opt_process_env_prepend (p); -+ } -+ else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc) -+ { -+ lt_opt_process_env_prepend (argv[++i]); /* don't copy */ -+ } -+ else -+ lt_fatal ("%s missing required argument", env_prepend_opt); -+ continue; -+ } -+ if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0) -+ { -+ if (argv[i][env_append_opt_len] == '=') -+ { -+ const char *p = argv[i] + env_append_opt_len + 1; -+ lt_opt_process_env_append (p); -+ } -+ else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc) -+ { -+ lt_opt_process_env_append (argv[++i]); /* don't copy */ -+ } -+ else -+ lt_fatal ("%s missing required argument", env_append_opt); -+ continue; -+ } -+ if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) -+ { -+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX -+ namespace, but it is not one of the ones we know about and -+ have already dealt with, above (inluding dump-script), then -+ report an error. Otherwise, targets might begin to believe -+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX -+ namespace. The first time any user complains about this, we'll -+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option -+ or a configure.ac-settable value. -+ */ -+ lt_fatal ("Unrecognized option in %s namespace: '%s'", -+ ltwrapper_option_prefix, argv[i]); -+ } -+ /* otherwise ... */ -+ newargz[++newargc] = xstrdup (argv[i]); -+ } -+ newargz[++newargc] = NULL; -+ -+ LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); - for (i = 0; i < newargc; i++) - { -- lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", -- i, nonnull (newargz[i])); -+ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); - } - - EOF -@@ -4517,14 +3560,11 @@ EOF - mingw*) - cat <<"EOF" - /* execv doesn't actually work on mingw as expected on unix */ -- newargz = prepare_spawn (newargz); - rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); - if (rval == -1) - { - /* failed to start process */ -- lt_debugprintf (__FILE__, __LINE__, -- "(main) failed to launch target \"%s\": %s\n", -- lt_argv_zero, nonnull (strerror (errno))); -+ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); - return 127; - } - return rval; -@@ -4546,7 +3586,7 @@ xmalloc (size_t num) - { - void *p = (void *) malloc (num); - if (!p) -- lt_fatal (__FILE__, __LINE__, "memory exhausted"); -+ lt_fatal ("Memory exhausted"); - - return p; - } -@@ -4580,8 +3620,8 @@ check_executable (const char *path) - { - struct stat st; - -- lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", -- nonempty (path)); -+ LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", -+ path ? (*path ? path : "EMPTY!") : "NULL!")); - if ((!path) || (!*path)) - return 0; - -@@ -4598,8 +3638,8 @@ make_executable (const char *path) - int rval = 0; - struct stat st; - -- lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", -- nonempty (path)); -+ LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", -+ path ? (*path ? path : "EMPTY!") : "NULL!")); - if ((!path) || (!*path)) - return 0; - -@@ -4625,8 +3665,8 @@ find_executable (const char *wrapper) - int tmp_len; - char *concat_name; - -- lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", -- nonempty (wrapper)); -+ LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", -+ wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; -@@ -4679,8 +3719,7 @@ find_executable (const char *wrapper) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -- nonnull (strerror (errno))); -+ lt_fatal ("getcwd failed"); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); -@@ -4705,8 +3744,7 @@ find_executable (const char *wrapper) - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -- nonnull (strerror (errno))); -+ lt_fatal ("getcwd failed"); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); -@@ -4732,9 +3770,8 @@ chase_symlinks (const char *pathspec) - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { -- lt_debugprintf (__FILE__, __LINE__, -- "checking path component for symlinks: %s\n", -- tmp_pathspec); -+ LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", -+ tmp_pathspec)); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) -@@ -4756,9 +3793,8 @@ chase_symlinks (const char *pathspec) - } - else - { -- lt_fatal (__FILE__, __LINE__, -- "error accessing file \"%s\": %s", -- tmp_pathspec, nonnull (strerror (errno))); -+ char *errstr = strerror (errno); -+ lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); - } - } - XFREE (tmp_pathspec); -@@ -4771,8 +3807,7 @@ chase_symlinks (const char *pathspec) - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { -- lt_fatal (__FILE__, __LINE__, -- "could not follow symlinks for %s", pathspec); -+ lt_fatal ("Could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); - #endif -@@ -4798,25 +3833,11 @@ strendzap (char *str, const char *pat) - return str; - } - --void --lt_debugprintf (const char *file, int line, const char *fmt, ...) --{ -- va_list args; -- if (lt_debug) -- { -- (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); -- va_start (args, fmt); -- (void) vfprintf (stderr, fmt, args); -- va_end (args); -- } --} -- - static void --lt_error_core (int exit_status, const char *file, -- int line, const char *mode, -+lt_error_core (int exit_status, const char *mode, - const char *message, va_list ap) - { -- fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); -+ fprintf (stderr, "%s: %s: ", program_name, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - -@@ -4825,32 +3846,20 @@ lt_error_core (int exit_status, const char *file, - } - - void --lt_fatal (const char *file, int line, const char *message, ...) -+lt_fatal (const char *message, ...) - { - va_list ap; - va_start (ap, message); -- lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); -+ lt_error_core (EXIT_FAILURE, "FATAL", message, ap); - va_end (ap); - } - --static const char * --nonnull (const char *s) --{ -- return s ? s : "(null)"; --} -- --static const char * --nonempty (const char *s) --{ -- return (s && !*s) ? "(empty)" : nonnull (s); --} -- - void - lt_setenv (const char *name, const char *value) - { -- lt_debugprintf (__FILE__, __LINE__, -- "(lt_setenv) setting '%s' to '%s'\n", -- nonnull (name), nonnull (value)); -+ LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", -+ (name ? name : "<NULL>"), -+ (value ? value : "<NULL>"))); - { - #ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ -@@ -4895,12 +3904,95 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) - return new_value; - } - -+int -+lt_split_name_value (const char *arg, char** name, char** value) -+{ -+ const char *p; -+ int len; -+ if (!arg || !*arg) -+ return 1; -+ -+ p = strchr (arg, (int)'='); -+ -+ if (!p) -+ return 1; -+ -+ *value = xstrdup (++p); -+ -+ len = strlen (arg) - strlen (*value); -+ *name = XMALLOC (char, len); -+ strncpy (*name, arg, len-1); -+ (*name)[len - 1] = '\0'; -+ -+ return 0; -+} -+ -+void -+lt_opt_process_env_set (const char *arg) -+{ -+ char *name = NULL; -+ char *value = NULL; -+ -+ if (lt_split_name_value (arg, &name, &value) != 0) -+ { -+ XFREE (name); -+ XFREE (value); -+ lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); -+ } -+ -+ lt_setenv (name, value); -+ XFREE (name); -+ XFREE (value); -+} -+ -+void -+lt_opt_process_env_prepend (const char *arg) -+{ -+ char *name = NULL; -+ char *value = NULL; -+ char *new_value = NULL; -+ -+ if (lt_split_name_value (arg, &name, &value) != 0) -+ { -+ XFREE (name); -+ XFREE (value); -+ lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); -+ } -+ -+ new_value = lt_extend_str (getenv (name), value, 0); -+ lt_setenv (name, new_value); -+ XFREE (new_value); -+ XFREE (name); -+ XFREE (value); -+} -+ -+void -+lt_opt_process_env_append (const char *arg) -+{ -+ char *name = NULL; -+ char *value = NULL; -+ char *new_value = NULL; -+ -+ if (lt_split_name_value (arg, &name, &value) != 0) -+ { -+ XFREE (name); -+ XFREE (value); -+ lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); -+ } -+ -+ new_value = lt_extend_str (getenv (name), value, 1); -+ lt_setenv (name, new_value); -+ XFREE (new_value); -+ XFREE (name); -+ XFREE (value); -+} -+ - void - lt_update_exe_path (const char *name, const char *value) - { -- lt_debugprintf (__FILE__, __LINE__, -- "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -- nonnull (name), nonnull (value)); -+ LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -+ (name ? name : "<NULL>"), -+ (value ? value : "<NULL>"))); - - if (name && *name && value && *value) - { -@@ -4919,9 +4011,9 @@ lt_update_exe_path (const char *name, const char *value) - void - lt_update_lib_path (const char *name, const char *value) - { -- lt_debugprintf (__FILE__, __LINE__, -- "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -- nonnull (name), nonnull (value)); -+ LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -+ (name ? name : "<NULL>"), -+ (value ? value : "<NULL>"))); - - if (name && *name && value && *value) - { -@@ -4931,152 +4023,11 @@ lt_update_lib_path (const char *name, const char *value) - } - } - --EOF -- case $host_os in -- mingw*) -- cat <<"EOF" -- --/* Prepares an argument vector before calling spawn(). -- Note that spawn() does not by itself call the command interpreter -- (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : -- ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); -- GetVersionEx(&v); -- v.dwPlatformId == VER_PLATFORM_WIN32_NT; -- }) ? "cmd.exe" : "command.com"). -- Instead it simply concatenates the arguments, separated by ' ', and calls -- CreateProcess(). We must quote the arguments since Win32 CreateProcess() -- interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a -- special way: -- - Space and tab are interpreted as delimiters. They are not treated as -- delimiters if they are surrounded by double quotes: "...". -- - Unescaped double quotes are removed from the input. Their only effect is -- that within double quotes, space and tab are treated like normal -- characters. -- - Backslashes not followed by double quotes are not special. -- - But 2*n+1 backslashes followed by a double quote become -- n backslashes followed by a double quote (n >= 0): -- \" -> " -- \\\" -> \" -- \\\\\" -> \\" -- */ --#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" --#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" --char ** --prepare_spawn (char **argv) --{ -- size_t argc; -- char **new_argv; -- size_t i; -- -- /* Count number of arguments. */ -- for (argc = 0; argv[argc] != NULL; argc++) -- ; -- -- /* Allocate new argument vector. */ -- new_argv = XMALLOC (char *, argc + 1); -- -- /* Put quoted arguments into the new argument vector. */ -- for (i = 0; i < argc; i++) -- { -- const char *string = argv[i]; -- -- if (string[0] == '\0') -- new_argv[i] = xstrdup ("\"\""); -- else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) -- { -- int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); -- size_t length; -- unsigned int backslashes; -- const char *s; -- char *quoted_string; -- char *p; -- -- length = 0; -- backslashes = 0; -- if (quote_around) -- length++; -- for (s = string; *s != '\0'; s++) -- { -- char c = *s; -- if (c == '"') -- length += backslashes + 1; -- length++; -- if (c == '\\') -- backslashes++; -- else -- backslashes = 0; -- } -- if (quote_around) -- length += backslashes + 1; - -- quoted_string = XMALLOC (char, length + 1); -- -- p = quoted_string; -- backslashes = 0; -- if (quote_around) -- *p++ = '"'; -- for (s = string; *s != '\0'; s++) -- { -- char c = *s; -- if (c == '"') -- { -- unsigned int j; -- for (j = backslashes + 1; j > 0; j--) -- *p++ = '\\'; -- } -- *p++ = c; -- if (c == '\\') -- backslashes++; -- else -- backslashes = 0; -- } -- if (quote_around) -- { -- unsigned int j; -- for (j = backslashes; j > 0; j--) -- *p++ = '\\'; -- *p++ = '"'; -- } -- *p = '\0'; -- -- new_argv[i] = quoted_string; -- } -- else -- new_argv[i] = (char *) string; -- } -- new_argv[argc] = NULL; -- -- return new_argv; --} --EOF -- ;; -- esac -- -- cat <<"EOF" --void lt_dump_script (FILE* f) --{ --EOF -- func_emit_wrapper yes | -- $SED -e 's/\([\\"]\)/\\\1/g' \ -- -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' -- -- cat <<"EOF" --} - EOF - } - # end: func_emit_cwrapperexe_src - --# func_win32_import_lib_p ARG --# True if ARG is an import lib, as indicated by $file_magic_cmd --func_win32_import_lib_p () --{ -- $opt_debug -- case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in -- *import*) : ;; -- *) false ;; -- esac --} -- - # func_mode_link arg... - func_mode_link () - { -@@ -5121,7 +4072,6 @@ func_mode_link () - new_inherited_linker_flags= - - avoid_version=no -- bindir= - dlfiles= - dlprefiles= - dlself=no -@@ -5214,11 +4164,6 @@ func_mode_link () - esac - - case $prev in -- bindir) -- bindir="$arg" -- prev= -- continue -- ;; - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. -@@ -5250,9 +4195,9 @@ func_mode_link () - ;; - *) - if test "$prev" = dlfiles; then -- func_append dlfiles " $arg" -+ dlfiles="$dlfiles $arg" - else -- func_append dlprefiles " $arg" -+ dlprefiles="$dlprefiles $arg" - fi - prev= - continue -@@ -5276,7 +4221,7 @@ func_mode_link () - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; -- *) func_append deplibs " $qarg.ltframework" # this is fixed later -+ *) deplibs="$deplibs $qarg.ltframework" # this is fixed later - ;; - esac - ;; -@@ -5295,7 +4240,7 @@ func_mode_link () - moreargs= - for fil in `cat "$save_arg"` - do --# func_append moreargs " $fil" -+# moreargs="$moreargs $fil" - arg=$fil - # A libtool-controlled object. - -@@ -5324,7 +4269,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- func_append dlfiles " $pic_object" -+ dlfiles="$dlfiles $pic_object" - prev= - continue - else -@@ -5336,7 +4281,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- func_append dlprefiles " $pic_object" -+ dlprefiles="$dlprefiles $pic_object" - prev= - fi - -@@ -5406,12 +4351,12 @@ func_mode_link () - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; -- *) func_append rpath " $arg" ;; -+ *) rpath="$rpath $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; -- *) func_append xrpath " $arg" ;; -+ *) xrpath="$xrpath $arg" ;; - esac - fi - prev= -@@ -5423,28 +4368,28 @@ func_mode_link () - continue - ;; - weak) -- func_append weak_libs " $arg" -+ weak_libs="$weak_libs $arg" - prev= - continue - ;; - xcclinker) -- func_append linker_flags " $qarg" -- func_append compiler_flags " $qarg" -+ linker_flags="$linker_flags $qarg" -+ compiler_flags="$compiler_flags $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) -- func_append compiler_flags " $qarg" -+ compiler_flags="$compiler_flags $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) -- func_append linker_flags " $qarg" -- func_append compiler_flags " $wl$qarg" -+ linker_flags="$linker_flags $qarg" -+ compiler_flags="$compiler_flags $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" -@@ -5480,11 +4425,6 @@ func_mode_link () - continue - ;; - -- -bindir) -- prev=bindir -- continue -- ;; -- - -dlopen) - prev=dlfiles - continue -@@ -5535,16 +4475,15 @@ func_mode_link () - ;; - - -L*) -- func_stripname "-L" '' "$arg" -- if test -z "$func_stripname_result"; then -+ func_stripname '-L' '' "$arg" -+ dir=$func_stripname_result -+ if test -z "$dir"; then - if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" - else - func_fatal_error "need path for \`-L' option" - fi - fi -- func_resolve_sysroot "$func_stripname_result" -- dir=$func_resolve_sysroot_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -@@ -5556,30 +4495,24 @@ func_mode_link () - ;; - esac - case "$deplibs " in -- *" -L$dir "* | *" $arg "*) -- # Will only happen for absolute or sysroot arguments -- ;; -+ *" -L$dir "*) ;; - *) -- # Preserve sysroot, but never include relative directories -- case $dir in -- [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; -- *) func_append deplibs " -L$dir" ;; -- esac -- func_append lib_search_path " $dir" -+ deplibs="$deplibs -L$dir" -+ lib_search_path="$lib_search_path $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -- testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` -+ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; -- *) func_append dllsearchpath ":$dir";; -+ *) dllsearchpath="$dllsearchpath:$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) func_append dllsearchpath ":$testbindir";; -+ *) dllsearchpath="$dllsearchpath:$testbindir";; - esac - ;; - esac -@@ -5589,7 +4522,7 @@ func_mode_link () - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) - # These systems don't actually have a C or math library (as such) - continue - ;; -@@ -5603,7 +4536,7 @@ func_mode_link () - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework -- func_append deplibs " System.ltframework" -+ deplibs="$deplibs System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) -@@ -5623,7 +4556,7 @@ func_mode_link () - ;; - esac - fi -- func_append deplibs " $arg" -+ deplibs="$deplibs $arg" - continue - ;; - -@@ -5635,8 +4568,8 @@ func_mode_link () - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. -- -model|-arch|-isysroot|--sysroot) -- func_append compiler_flags " $arg" -+ -model|-arch|-isysroot) -+ compiler_flags="$compiler_flags $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler -@@ -5644,12 +4577,12 @@ func_mode_link () - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -- func_append compiler_flags " $arg" -+ compiler_flags="$compiler_flags $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; -- * ) func_append new_inherited_linker_flags " $arg" ;; -+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; - esac - continue - ;; -@@ -5716,17 +4649,13 @@ func_mode_link () - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -- =*) -- func_stripname '=' '' "$dir" -- dir=$lt_sysroot$func_stripname_result -- ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; -- *) func_append xrpath " $dir" ;; -+ *) xrpath="$xrpath $dir" ;; - esac - continue - ;; -@@ -5779,8 +4708,8 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- func_append arg " $func_quote_for_eval_result" -- func_append compiler_flags " $func_quote_for_eval_result" -+ arg="$arg $wl$func_quote_for_eval_result" -+ compiler_flags="$compiler_flags $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -5795,9 +4724,9 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- func_append arg " $wl$func_quote_for_eval_result" -- func_append compiler_flags " $wl$func_quote_for_eval_result" -- func_append linker_flags " $func_quote_for_eval_result" -+ arg="$arg $wl$func_quote_for_eval_result" -+ compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" -+ linker_flags="$linker_flags $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -5825,27 +4754,23 @@ func_mode_link () - arg="$func_quote_for_eval_result" - ;; - -- # Flags to be passed through unchanged, with rationale: -- # -64, -mips[0-9] enable 64-bit mode for the SGI compiler -- # -r[0-9][0-9]* specify processor for the SGI compiler -- # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler -- # +DA*, +DD* enable 64-bit mode for the HP compiler -- # -q* compiler args for the IBM compiler -- # -m*, -t[45]*, -txscale* architecture-specific flags for GCC -- # -F/path path to uninstalled frameworks, gcc on darwin -- # -p, -pg, --coverage, -fprofile-* profiling flags for GCC -- # @file GCC response files -- # -tp=* Portland pgcc target processor selection -- # --sysroot=* for sysroot support -- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -+ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler -+ # -r[0-9][0-9]* specifies the processor on the SGI compiler -+ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler -+ # +DA*, +DD* enable 64-bit mode on the HP compiler -+ # -q* pass through compiler args for the IBM compiler -+ # -m*, -t[45]*, -txscale* pass through architecture-specific -+ # compiler args for GCC -+ # -F/path gives path to uninstalled frameworks, gcc on darwin -+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC -+ # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" -- func_append compiler_flags " $arg" -+ compiler_flags="$compiler_flags $arg" - continue - ;; - -@@ -5857,7 +4782,7 @@ func_mode_link () - - *.$objext) - # A standard object. -- func_append objs " $arg" -+ objs="$objs $arg" - ;; - - *.lo) -@@ -5888,7 +4813,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- func_append dlfiles " $pic_object" -+ dlfiles="$dlfiles $pic_object" - prev= - continue - else -@@ -5900,7 +4825,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- func_append dlprefiles " $pic_object" -+ dlprefiles="$dlprefiles $pic_object" - prev= - fi - -@@ -5945,25 +4870,24 @@ func_mode_link () - - *.$libext) - # An archive. -- func_append deplibs " $arg" -- func_append old_deplibs " $arg" -+ deplibs="$deplibs $arg" -+ old_deplibs="$old_deplibs $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - -- func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. -- func_append dlfiles " $func_resolve_sysroot_result" -+ dlfiles="$dlfiles $arg" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. -- func_append dlprefiles " $func_resolve_sysroot_result" -+ dlprefiles="$dlprefiles $arg" - prev= - else -- func_append deplibs " $func_resolve_sysroot_result" -+ deplibs="$deplibs $arg" - fi - continue - ;; -@@ -6001,7 +4925,7 @@ func_mode_link () - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var -- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` -+ eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` - else - shlib_search_path= - fi -@@ -6010,8 +4934,6 @@ func_mode_link () - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" -- func_to_tool_file "$output_objdir/" -- tool_output_objdir=$func_to_tool_file_result - # Create the object directory. - func_mkdir_p "$output_objdir" - -@@ -6032,12 +4954,12 @@ func_mode_link () - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do -- if $opt_preserve_dup_deps ; then -+ if $opt_duplicate_deps ; then - case "$libs " in -- *" $deplib "*) func_append specialdeplibs " $deplib" ;; -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi -- func_append libs " $deplib" -+ libs="$libs $deplib" - done - - if test "$linkmode" = lib; then -@@ -6050,9 +4972,9 @@ func_mode_link () - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in -- *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; -+ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; - esac -- func_append pre_post_deps " $pre_post_dep" -+ pre_post_deps="$pre_post_deps $pre_post_dep" - done - fi - pre_post_deps= -@@ -6122,19 +5044,17 @@ func_mode_link () - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= -- func_resolve_sysroot "$lib" - case $lib in -- *.la) func_source "$func_resolve_sysroot_result" ;; -+ *.la) func_source "$lib" ;; - esac - - # Collect preopened libtool deplibs, except any this library - # has declared as weak libs - for deplib in $dependency_libs; do -- func_basename "$deplib" -- deplib_base=$func_basename_result -+ deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` - case " $weak_libs " in - *" $deplib_base "*) ;; -- *) func_append deplibs " $deplib" ;; -+ *) deplibs="$deplibs $deplib" ;; - esac - done - done -@@ -6155,11 +5075,11 @@ func_mode_link () - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- func_append compiler_flags " $deplib" -+ compiler_flags="$compiler_flags $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) func_append new_inherited_linker_flags " $deplib" ;; -+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; - esac - fi - fi -@@ -6244,7 +5164,7 @@ func_mode_link () - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) func_append new_inherited_linker_flags " $deplib" ;; -+ * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; - esac - fi - fi -@@ -6257,8 +5177,7 @@ func_mode_link () - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" -- func_resolve_sysroot "$func_stripname_result" -- func_append newlib_search_path " $func_resolve_sysroot_result" -+ newlib_search_path="$newlib_search_path $func_stripname_result" - ;; - prog) - if test "$pass" = conv; then -@@ -6272,8 +5191,7 @@ func_mode_link () - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" -- func_resolve_sysroot "$func_stripname_result" -- func_append newlib_search_path " $func_resolve_sysroot_result" -+ newlib_search_path="$newlib_search_path $func_stripname_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" -@@ -6284,21 +5202,17 @@ func_mode_link () - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" -- func_resolve_sysroot "$func_stripname_result" -- dir=$func_resolve_sysroot_result -+ dir=$func_stripname_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; -- *) func_append xrpath " $dir" ;; -+ *) xrpath="$xrpath $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; -- *.la) -- func_resolve_sysroot "$deplib" -- lib=$func_resolve_sysroot_result -- ;; -+ *.la) lib="$deplib" ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" -@@ -6316,7 +5230,7 @@ func_mode_link () - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` -- if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ -+ if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi -@@ -6326,15 +5240,15 @@ func_mode_link () - ;; - esac - if test "$valid_a_lib" != yes; then -- echo -+ $ECHO - $ECHO "*** Warning: Trying to link with static lib archive $deplib." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have" -- echo "*** because the file extensions .$libext of this argument makes me believe" -- echo "*** that it is just a static archive that I should not use here." -+ $ECHO "*** I have the capability to make that library automatically link in when" -+ $ECHO "*** you link to this library. But I can only do this if you have a" -+ $ECHO "*** shared version of the library, which you do not appear to have" -+ $ECHO "*** because the file extensions .$libext of this argument makes me believe" -+ $ECHO "*** that it is just a static archive that I should not use here." - else -- echo -+ $ECHO - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" -@@ -6361,11 +5275,11 @@ func_mode_link () - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. -- func_append newdlprefiles " $deplib" -+ newdlprefiles="$newdlprefiles $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- func_append newdlfiles " $deplib" -+ newdlfiles="$newdlfiles $deplib" - fi - fi - continue -@@ -6407,20 +5321,20 @@ func_mode_link () - - # Convert "-framework foo" to "foo.ltframework" - if test -n "$inherited_linker_flags"; then -- tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` -+ tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; -- *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; -+ *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; - esac - done - fi -- dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then -- test -n "$dlopen" && func_append dlfiles " $dlopen" -- test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" -+ test -n "$dlopen" && dlfiles="$dlfiles $dlopen" -+ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" - fi - - if test "$pass" = conv; then -@@ -6431,17 +5345,17 @@ func_mode_link () - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. -- func_append convenience " $ladir/$objdir/$old_library" -- func_append old_convenience " $ladir/$objdir/$old_library" -+ convenience="$convenience $ladir/$objdir/$old_library" -+ old_convenience="$old_convenience $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" -- if $opt_preserve_dup_deps ; then -+ if $opt_duplicate_deps ; then - case "$tmp_libs " in -- *" $deplib "*) func_append specialdeplibs " $deplib" ;; -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi -- func_append tmp_libs " $deplib" -+ tmp_libs="$tmp_libs $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" -@@ -6452,15 +5366,9 @@ func_mode_link () - - # Get the name of the library we link against. - linklib= -- if test -n "$old_library" && -- { test "$prefer_static_libs" = yes || -- test "$prefer_static_libs,$installed" = "built,no"; }; then -- linklib=$old_library -- else -- for l in $old_library $library_names; do -- linklib="$l" -- done -- fi -+ for l in $old_library $library_names; do -+ linklib="$l" -+ done - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi -@@ -6477,9 +5385,9 @@ func_mode_link () - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. -- func_append dlprefiles " $lib $dependency_libs" -+ dlprefiles="$dlprefiles $lib $dependency_libs" - else -- func_append newdlfiles " $lib" -+ newdlfiles="$newdlfiles $lib" - fi - continue - fi # $pass = dlopen -@@ -6501,14 +5409,14 @@ func_mode_link () - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then -- if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else -- dir="$lt_sysroot$libdir" -- absdir="$lt_sysroot$libdir" -+ dir="$libdir" -+ absdir="$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -@@ -6516,12 +5424,12 @@ func_mode_link () - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later -- func_append notinst_path " $abs_ladir" -+ notinst_path="$notinst_path $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later -- func_append notinst_path " $abs_ladir" -+ notinst_path="$notinst_path $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" -@@ -6532,46 +5440,20 @@ func_mode_link () - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi -- case "$host" in -- # special handling for platforms with PE-DLLs. -- *cygwin* | *mingw* | *cegcc* ) -- # Linker will automatically link against shared library if both -- # static and shared are present. Therefore, ensure we extract -- # symbols from the import library if a shared library is present -- # (otherwise, the dlopen module name will be incorrect). We do -- # this by putting the import library name into $newdlprefiles. -- # We recover the dlopen module name by 'saving' the la file -- # name in a special purpose variable, and (later) extracting the -- # dlname from the la file. -- if test -n "$dlname"; then -- func_tr_sh "$dir/$linklib" -- eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" -- func_append newdlprefiles " $dir/$linklib" -- else -- func_append newdlprefiles " $dir/$old_library" -- # Keep a list of preopened convenience libraries to check -- # that they are being used correctly in the link pass. -- test -z "$libdir" && \ -- func_append dlpreconveniencelibs " $dir/$old_library" -- fi -- ;; -- * ) -- # Prefer using a static library (so that no silly _DYNAMIC symbols -- # are required to link). -- if test -n "$old_library"; then -- func_append newdlprefiles " $dir/$old_library" -- # Keep a list of preopened convenience libraries to check -- # that they are being used correctly in the link pass. -- test -z "$libdir" && \ -- func_append dlpreconveniencelibs " $dir/$old_library" -- # Otherwise, use the dlname, so that lt_dlopen finds it. -- elif test -n "$dlname"; then -- func_append newdlprefiles " $dir/$dlname" -- else -- func_append newdlprefiles " $dir/$linklib" -- fi -- ;; -- esac -+ # Prefer using a static library (so that no silly _DYNAMIC symbols -+ # are required to link). -+ if test -n "$old_library"; then -+ newdlprefiles="$newdlprefiles $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" -+ # Otherwise, use the dlname, so that lt_dlopen finds it. -+ elif test -n "$dlname"; then -+ newdlprefiles="$newdlprefiles $dir/$dlname" -+ else -+ newdlprefiles="$newdlprefiles $dir/$linklib" -+ fi - fi # $pass = dlpreopen - - if test -z "$libdir"; then -@@ -6589,7 +5471,7 @@ func_mode_link () - - - if test "$linkmode" = prog && test "$pass" != link; then -- func_append newlib_search_path " $ladir" -+ newlib_search_path="$newlib_search_path $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no -@@ -6602,8 +5484,7 @@ func_mode_link () - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" -- func_resolve_sysroot "$func_stripname_result" -- func_append newlib_search_path " $func_resolve_sysroot_result" -+ newlib_search_path="$newlib_search_path $func_stripname_result" - ;; - esac - # Need to link against all dependency_libs? -@@ -6614,12 +5495,12 @@ func_mode_link () - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi -- if $opt_preserve_dup_deps ; then -+ if $opt_duplicate_deps ; then - case "$tmp_libs " in -- *" $deplib "*) func_append specialdeplibs " $deplib" ;; -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi -- func_append tmp_libs " $deplib" -+ tmp_libs="$tmp_libs $deplib" - done # for deplib - continue - fi # $linkmode = prog... -@@ -6634,7 +5515,7 @@ func_mode_link () - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; -- *) func_append temp_rpath "$absdir:" ;; -+ *) temp_rpath="$temp_rpath$absdir:" ;; - esac - fi - -@@ -6646,7 +5527,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) func_append compile_rpath " $absdir" ;; -+ *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac -@@ -6655,7 +5536,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) func_append finalize_rpath " $libdir" ;; -+ *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac -@@ -6680,12 +5561,12 @@ func_mode_link () - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded -- func_append notinst_deplibs " $lib" -+ notinst_deplibs="$notinst_deplibs $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then -- func_append notinst_deplibs " $lib" -+ notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - fi - ;; -@@ -6702,7 +5583,7 @@ func_mode_link () - fi - done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then -- echo -+ $ECHO - if test "$linkmode" = prog; then - $ECHO "*** Warning: Linking the executable $output against the loadable module" - else -@@ -6720,7 +5601,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) func_append compile_rpath " $absdir" ;; -+ *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac -@@ -6729,7 +5610,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) func_append finalize_rpath " $libdir" ;; -+ *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac -@@ -6783,7 +5664,7 @@ func_mode_link () - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - -- if test "$linkmode" = prog || test "$opt_mode" != relink; then -+ if test "$linkmode" = prog || test "$mode" != relink; then - add_shlibpath= - add_dir= - add= -@@ -6805,9 +5686,9 @@ func_mode_link () - if test "X$dlopenmodule" != "X$lib"; then - $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then -- echo -- echo "*** And there doesn't seem to be a static archive available" -- echo "*** The link will probably fail, sorry" -+ $ECHO -+ $ECHO "*** And there doesn't seem to be a static archive available" -+ $ECHO "*** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi -@@ -6839,7 +5720,7 @@ func_mode_link () - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- func_append add_dir " -L$inst_prefix_dir$libdir" -+ add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -6861,7 +5742,7 @@ func_mode_link () - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; -- *) func_append compile_shlibpath "$add_shlibpath:" ;; -+ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then -@@ -6875,13 +5756,13 @@ func_mode_link () - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) func_append finalize_shlibpath "$libdir:" ;; -+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - fi - fi - fi - -- if test "$linkmode" = prog || test "$opt_mode" = relink; then -+ if test "$linkmode" = prog || test "$mode" = relink; then - add_shlibpath= - add_dir= - add= -@@ -6895,7 +5776,7 @@ func_mode_link () - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) func_append finalize_shlibpath "$libdir:" ;; -+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then -@@ -6912,7 +5793,7 @@ func_mode_link () - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- func_append add_dir " -L$inst_prefix_dir$libdir" -+ add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -6947,21 +5828,21 @@ func_mode_link () - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. -- echo -+ $ECHO - $ECHO "*** Warning: This system can not link to static lib archive $lib." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have." -+ $ECHO "*** I have the capability to make that library automatically link in when" -+ $ECHO "*** you link to this library. But I can only do this if you have a" -+ $ECHO "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then -- echo "*** But as you try to build a module library, libtool will still create " -- echo "*** a static module, that should work as long as the dlopening application" -- echo "*** is linked with the -dlopen flag to resolve symbols at runtime." -+ $ECHO "*** But as you try to build a module library, libtool will still create " -+ $ECHO "*** a static module, that should work as long as the dlopening application" -+ $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then -- echo -- echo "*** However, this would only work if libtool was able to extract symbol" -- echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -- echo "*** not find such a program. So, this module is probably useless." -- echo "*** \`nm' from GNU binutils and a full rebuild may help." -+ $ECHO -+ $ECHO "*** However, this would only work if libtool was able to extract symbol" -+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ $ECHO "*** not find such a program. So, this module is probably useless." -+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module -@@ -6989,33 +5870,27 @@ func_mode_link () - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; -- *) func_append xrpath " $temp_xrpath";; -+ *) xrpath="$xrpath $temp_xrpath";; - esac;; -- *) func_append temp_deplibs " $libdir";; -+ *) temp_deplibs="$temp_deplibs $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - -- func_append newlib_search_path " $absdir" -+ newlib_search_path="$newlib_search_path $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" -- case $deplib in -- -L*) func_stripname '-L' '' "$deplib" -- func_resolve_sysroot "$func_stripname_result";; -- *) func_resolve_sysroot "$deplib" ;; -- esac -- if $opt_preserve_dup_deps ; then -+ if $opt_duplicate_deps ; then - case "$tmp_libs " in -- *" $func_resolve_sysroot_result "*) -- func_append specialdeplibs " $func_resolve_sysroot_result" ;; -+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi -- func_append tmp_libs " $func_resolve_sysroot_result" -+ tmp_libs="$tmp_libs $deplib" - done - - if test "$link_all_deplibs" != no; then -@@ -7025,10 +5900,8 @@ func_mode_link () - case $deplib in - -L*) path="$deplib" ;; - *.la) -- func_resolve_sysroot "$deplib" -- deplib=$func_resolve_sysroot_result - func_dirname "$deplib" "" "." -- dir=$func_dirname_result -+ dir="$func_dirname_result" - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; -@@ -7055,8 +5928,8 @@ func_mode_link () - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi -- func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -- func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" -+ compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -+ linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi -@@ -7089,7 +5962,7 @@ func_mode_link () - compile_deplibs="$new_inherited_linker_flags $compile_deplibs" - finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" - else -- compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - fi - fi - dependency_libs="$newdependency_libs" -@@ -7106,7 +5979,7 @@ func_mode_link () - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; -- *) func_append lib_search_path " $dir" ;; -+ *) lib_search_path="$lib_search_path $dir" ;; - esac - done - newlib_search_path= -@@ -7164,10 +6037,10 @@ func_mode_link () - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; -- *) func_append tmp_libs " $deplib" ;; -+ *) tmp_libs="$tmp_libs $deplib" ;; - esac - ;; -- *) func_append tmp_libs " $deplib" ;; -+ *) tmp_libs="$tmp_libs $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" -@@ -7183,7 +6056,7 @@ func_mode_link () - ;; - esac - if test -n "$i" ; then -- func_append tmp_libs " $i" -+ tmp_libs="$tmp_libs $i" - fi - done - dependency_libs=$tmp_libs -@@ -7224,7 +6097,7 @@ func_mode_link () - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" -- func_append objs "$old_deplibs" -+ objs="$objs$old_deplibs" - ;; - - lib) -@@ -7257,10 +6130,10 @@ func_mode_link () - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" - else -- echo -+ $ECHO - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" -- func_append libobjs " $objs" -+ libobjs="$libobjs $objs" - fi - fi - -@@ -7325,7 +6198,7 @@ func_mode_link () - age="$number_minor" - revision="$number_revision" - ;; -- freebsd-aout|freebsd-elf|qnx|sunos) -+ freebsd-aout|freebsd-elf|sunos) - current="$number_major" - revision="$number_minor" - age="0" -@@ -7461,7 +6334,7 @@ func_mode_link () - done - - # Make executables depend on our current version. -- func_append verstring ":${current}.0" -+ verstring="$verstring:${current}.0" - ;; - - qnx) -@@ -7529,10 +6402,10 @@ func_mode_link () - fi - - func_generate_dlsyms "$libname" "$libname" "yes" -- func_append libobjs " $symfileobj" -+ libobjs="$libobjs $symfileobj" - test "X$libobjs" = "X " && libobjs= - -- if test "$opt_mode" != relink; then -+ if test "$mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= -@@ -7548,7 +6421,7 @@ func_mode_link () - continue - fi - fi -- func_append removelist " $p" -+ removelist="$removelist $p" - ;; - *) ;; - esac -@@ -7559,28 +6432,27 @@ func_mode_link () - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -- func_append oldlibs " $output_objdir/$libname.$libext" -+ oldlibs="$oldlibs $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. -- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` -+ oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - #for path in $notinst_path; do -- # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` -- # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` -- # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` -+ # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` -+ # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` -+ # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` - #done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do -- func_replace_sysroot "$libdir" -- func_append temp_xrpath " -R$func_replace_sysroot_result" -+ temp_xrpath="$temp_xrpath -R$libdir" - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) func_append finalize_rpath " $libdir" ;; -+ *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then -@@ -7594,7 +6466,7 @@ func_mode_link () - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; -- *) func_append dlfiles " $lib" ;; -+ *) dlfiles="$dlfiles $lib" ;; - esac - done - -@@ -7604,19 +6476,19 @@ func_mode_link () - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; -- *) func_append dlprefiles " $lib" ;; -+ *) dlprefiles="$dlprefiles $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework -- func_append deplibs " System.ltframework" -+ deplibs="$deplibs System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. -@@ -7633,7 +6505,7 @@ func_mode_link () - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -- func_append deplibs " -lc" -+ deplibs="$deplibs -lc" - fi - ;; - esac -@@ -7682,7 +6554,7 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- func_append newdeplibs " $i" -+ newdeplibs="$newdeplibs $i" - i="" - ;; - esac -@@ -7693,21 +6565,21 @@ EOF - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- func_append newdeplibs " $i" -+ newdeplibs="$newdeplibs $i" - else - droppeddeps=yes -- echo -+ $ECHO - $ECHO "*** Warning: dynamic linker does not accept needed library $i." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which I believe you do not have" -- echo "*** because a test_compile did reveal that the linker did not use it for" -- echo "*** its dynamic dependency list that programs get resolved with at runtime." -+ $ECHO "*** I have the capability to make that library automatically link in when" -+ $ECHO "*** you link to this library. But I can only do this if you have a" -+ $ECHO "*** shared version of the library, which I believe you do not have" -+ $ECHO "*** because a test_compile did reveal that the linker did not use it for" -+ $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." - fi - fi - ;; - *) -- func_append newdeplibs " $i" -+ newdeplibs="$newdeplibs $i" - ;; - esac - done -@@ -7725,7 +6597,7 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- func_append newdeplibs " $i" -+ newdeplibs="$newdeplibs $i" - i="" - ;; - esac -@@ -7736,29 +6608,29 @@ EOF - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- func_append newdeplibs " $i" -+ newdeplibs="$newdeplibs $i" - else - droppeddeps=yes -- echo -+ $ECHO - $ECHO "*** Warning: dynamic linker does not accept needed library $i." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have" -- echo "*** because a test_compile did reveal that the linker did not use this one" -- echo "*** as a dynamic dependency that programs can get resolved with at runtime." -+ $ECHO "*** I have the capability to make that library automatically link in when" -+ $ECHO "*** you link to this library. But I can only do this if you have a" -+ $ECHO "*** shared version of the library, which you do not appear to have" -+ $ECHO "*** because a test_compile did reveal that the linker did not use this one" -+ $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." - fi - fi - else - droppeddeps=yes -- echo -+ $ECHO - $ECHO "*** Warning! Library $i is needed by this library but I was not able to" -- echo "*** make it link in! You will probably need to install it or some" -- echo "*** library that it depends on before this library will be fully" -- echo "*** functional. Installing it before continuing would be even better." -+ $ECHO "*** make it link in! You will probably need to install it or some" -+ $ECHO "*** library that it depends on before this library will be fully" -+ $ECHO "*** functional. Installing it before continuing would be even better." - fi - ;; - *) -- func_append newdeplibs " $i" -+ newdeplibs="$newdeplibs $i" - ;; - esac - done -@@ -7775,27 +6647,15 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- func_append newdeplibs " $a_deplib" -+ newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval "\\$ECHO \"$libname_spec\""` -- if test -n "$file_magic_glob"; then -- libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` -- else -- libnameglob=$libname -- fi -- test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- if test "$want_nocaseglob" = yes; then -- shopt -s nocaseglob -- potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -- $nocaseglob -- else -- potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -- fi -+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | -@@ -7812,13 +6672,13 @@ EOF - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; -- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; -+ *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then -- func_append newdeplibs " $a_deplib" -+ newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi -@@ -7827,12 +6687,12 @@ EOF - fi - if test -n "$a_deplib" ; then - droppeddeps=yes -- echo -+ $ECHO - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have" -- echo "*** because I did check the linker path looking for a file starting" -+ $ECHO "*** I have the capability to make that library automatically link in when" -+ $ECHO "*** you link to this library. But I can only do this if you have a" -+ $ECHO "*** shared version of the library, which you do not appear to have" -+ $ECHO "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for file magic test)" - else -@@ -7843,7 +6703,7 @@ EOF - ;; - *) - # Add a -L argument. -- func_append newdeplibs " $a_deplib" -+ newdeplibs="$newdeplibs $a_deplib" - ;; - esac - done # Gone through all deplibs. -@@ -7859,7 +6719,7 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- func_append newdeplibs " $a_deplib" -+ newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - ;; - esac -@@ -7870,9 +6730,9 @@ EOF - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test -- if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ -+ if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then -- func_append newdeplibs " $a_deplib" -+ newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi -@@ -7881,12 +6741,12 @@ EOF - fi - if test -n "$a_deplib" ; then - droppeddeps=yes -- echo -+ $ECHO - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." -- echo "*** I have the capability to make that library automatically link in when" -- echo "*** you link to this library. But I can only do this if you have a" -- echo "*** shared version of the library, which you do not appear to have" -- echo "*** because I did check the linker path looking for a file starting" -+ $ECHO "*** I have the capability to make that library automatically link in when" -+ $ECHO "*** you link to this library. But I can only do this if you have a" -+ $ECHO "*** shared version of the library, which you do not appear to have" -+ $ECHO "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" - else -@@ -7897,32 +6757,32 @@ EOF - ;; - *) - # Add a -L argument. -- func_append newdeplibs " $a_deplib" -+ newdeplibs="$newdeplibs $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" -- tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` -+ tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ -+ -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' -- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` -+ tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` - done - fi -- case $tmp_deplibs in -- *[!\ \ ]*) -- echo -+ if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | -+ $GREP . >/dev/null; then -+ $ECHO - if test "X$deplibs_check_method" = "Xnone"; then -- echo "*** Warning: inter-library dependencies are not supported in this platform." -+ $ECHO "*** Warning: inter-library dependencies are not supported in this platform." - else -- echo "*** Warning: inter-library dependencies are not known to be supported." -+ $ECHO "*** Warning: inter-library dependencies are not known to be supported." - fi -- echo "*** All declared inter-library dependencies are being dropped." -+ $ECHO "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes -- ;; -- esac -+ fi - ;; - esac - versuffix=$versuffix_save -@@ -7934,23 +6794,23 @@ EOF - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library with the System framework -- newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` -+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then -- echo -- echo "*** Warning: libtool could not satisfy all declared inter-library" -+ $ECHO -+ $ECHO "*** Warning: libtool could not satisfy all declared inter-library" - $ECHO "*** dependencies of module $libname. Therefore, libtool will create" -- echo "*** a static module, that should work as long as the dlopening" -- echo "*** application is linked with the -dlopen flag." -+ $ECHO "*** a static module, that should work as long as the dlopening" -+ $ECHO "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then -- echo -- echo "*** However, this would only work if libtool was able to extract symbol" -- echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -- echo "*** not find such a program. So, this module is probably useless." -- echo "*** \`nm' from GNU binutils and a full rebuild may help." -+ $ECHO -+ $ECHO "*** However, this would only work if libtool was able to extract symbol" -+ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ $ECHO "*** not find such a program. So, this module is probably useless." -+ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" -@@ -7960,16 +6820,16 @@ EOF - build_libtool_libs=no - fi - else -- echo "*** The inter-library dependencies that have been dropped here will be" -- echo "*** automatically added whenever a program is linked with this library" -- echo "*** or is declared to -dlopen it." -+ $ECHO "*** The inter-library dependencies that have been dropped here will be" -+ $ECHO "*** automatically added whenever a program is linked with this library" -+ $ECHO "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then -- echo -- echo "*** Since this library must not contain undefined symbols," -- echo "*** because either the platform does not support them or" -- echo "*** it was explicitly requested with -no-undefined," -- echo "*** libtool will only create a static version of it." -+ $ECHO -+ $ECHO "*** Since this library must not contain undefined symbols," -+ $ECHO "*** because either the platform does not support them or" -+ $ECHO "*** it was explicitly requested with -no-undefined," -+ $ECHO "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module -@@ -7986,9 +6846,9 @@ EOF - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - case $host in - *-*-darwin*) -- newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -- new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -- deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - -@@ -8001,7 +6861,7 @@ EOF - *) - case " $deplibs " in - *" -L$path/$objdir "*) -- func_append new_libs " -L$path/$objdir" ;; -+ new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac -@@ -8011,10 +6871,10 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) func_append new_libs " $deplib" ;; -+ *) new_libs="$new_libs $deplib" ;; - esac - ;; -- *) func_append new_libs " $deplib" ;; -+ *) new_libs="$new_libs $deplib" ;; - esac - done - deplibs="$new_libs" -@@ -8031,12 +6891,10 @@ EOF - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" -- test "$opt_mode" != relink && rpath="$compile_rpath$rpath" -+ test "$mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then -- func_replace_sysroot "$libdir" -- libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else -@@ -8045,18 +6903,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" -- func_append dep_rpath " $flag" -+ dep_rpath="$dep_rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) func_apped perm_rpath " $libdir" ;; -+ *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - done -@@ -8074,7 +6932,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- func_append rpath "$dir:" -+ rpath="$rpath$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi -@@ -8082,7 +6940,7 @@ EOF - fi - - shlibpath="$finalize_shlibpath" -- test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" -+ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi -@@ -8108,18 +6966,18 @@ EOF - linknames= - for link - do -- func_append linknames " $link" -+ linknames="$linknames $link" - done - - # Use standard objects if they are pic -- test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` -+ test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - test "X$libobjs" = "X " && libobjs= - - delfiles= - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" -- func_append delfiles " $export_symbols" -+ delfiles="$delfiles $export_symbols" - fi - - orig_export_symbols= -@@ -8150,45 +7008,13 @@ EOF - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' -- for cmd1 in $cmds; do -+ for cmd in $cmds; do - IFS="$save_ifs" -- # Take the normal branch if the nm_file_list_spec branch -- # doesn't work or if tool conversion is not needed. -- case $nm_file_list_spec~$to_tool_file_cmd in -- *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) -- try_normal_branch=yes -- eval cmd=\"$cmd1\" -- func_len " $cmd" -- len=$func_len_result -- ;; -- *) -- try_normal_branch=no -- ;; -- esac -- if test "$try_normal_branch" = yes \ -- && { test "$len" -lt "$max_cmd_len" \ -- || test "$max_cmd_len" -le -1; } -- then -- func_show_eval "$cmd" 'exit $?' -- skipped_export=false -- elif test -n "$nm_file_list_spec"; then -- func_basename "$output" -- output_la=$func_basename_result -- save_libobjs=$libobjs -- save_output=$output -- output=${output_objdir}/${output_la}.nm -- func_to_tool_file "$output" -- libobjs=$nm_file_list_spec$func_to_tool_file_result -- func_append delfiles " $output" -- func_verbose "creating $NM input file list: $output" -- for obj in $save_libobjs; do -- func_to_tool_file "$obj" -- $ECHO "$func_to_tool_file_result" -- done > "$output" -- eval cmd=\"$cmd1\" -+ eval cmd=\"$cmd\" -+ func_len " $cmd" -+ len=$func_len_result -+ if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - func_show_eval "$cmd" 'exit $?' -- output=$save_output -- libobjs=$save_libobjs - skipped_export=false - else - # The command line is too long to execute in one step. -@@ -8210,7 +7036,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' -+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then -@@ -8222,7 +7048,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- func_append delfiles " $export_symbols $output_objdir/$libname.filter" -+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -8232,7 +7058,7 @@ EOF - case " $convenience " in - *" $test_deplib "*) ;; - *) -- func_append tmp_deplibs " $test_deplib" -+ tmp_deplibs="$tmp_deplibs $test_deplib" - ;; - esac - done -@@ -8252,21 +7078,21 @@ EOF - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" -- func_append generated " $gentop" -+ generated="$generated $gentop" - - func_extract_archives $gentop $convenience -- func_append libobjs " $func_extract_archives_result" -+ libobjs="$libobjs $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" -- func_append linker_flags " $flag" -+ linker_flags="$linker_flags $flag" - fi - - # Make a backup of the uninstalled library when relinking -- if test "$opt_mode" = relink; then -+ if test "$mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - -@@ -8311,8 +7137,7 @@ EOF - save_libobjs=$libobjs - fi - save_output=$output -- func_basename "$output" -- output_la=$func_basename_result -+ output_la=`$ECHO "X$output" | $Xsed -e "$basename"` - - # Clear the reloadable object creation command queue and - # initialize k to one. -@@ -8325,16 +7150,13 @@ EOF - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript - func_verbose "creating GNU ld script: $output" -- echo 'INPUT (' > $output -+ $ECHO 'INPUT (' > $output - for obj in $save_libobjs - do -- func_to_tool_file "$obj" -- $ECHO "$func_to_tool_file_result" >> $output -+ $ECHO "$obj" >> $output - done -- echo ')' >> $output -- func_append delfiles " $output" -- func_to_tool_file "$output" -- output=$func_to_tool_file_result -+ $ECHO ')' >> $output -+ delfiles="$delfiles $output" - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" -@@ -8348,12 +7170,10 @@ EOF - fi - for obj - do -- func_to_tool_file "$obj" -- $ECHO "$func_to_tool_file_result" >> $output -+ $ECHO "$obj" >> $output - done -- func_append delfiles " $output" -- func_to_tool_file "$output" -- output=$firstobj\"$file_list_spec$func_to_tool_file_result\" -+ delfiles="$delfiles $output" -+ output=$firstobj\"$file_list_spec$output\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." -@@ -8377,19 +7197,17 @@ EOF - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. -- reload_objs=$objlist -- eval concat_cmds=\"$reload_cmds\" -+ eval concat_cmds=\"$reload_cmds $objlist $last_robj\" - else - # All subsequent reloadable object files will link in - # the last one created. -- reload_objs="$objlist $last_robj" -- eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" -+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 - k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext -- objlist=" $obj" -+ objlist=$obj - func_len " $last_robj" - func_arith $len0 + $func_len_result - len=$func_arith_result -@@ -8399,12 +7217,11 @@ EOF - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- reload_objs="$objlist $last_robj" -- eval concat_cmds=\"\${concat_cmds}$reload_cmds\" -+ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" - if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi -- func_append delfiles " $output" -+ delfiles="$delfiles $output" - - else - output= -@@ -8438,7 +7255,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$opt_mode" = relink; then -+ if test "$mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -8459,7 +7276,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' -+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then -@@ -8471,7 +7288,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- func_append delfiles " $export_symbols $output_objdir/$libname.filter" -+ delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -8512,10 +7329,10 @@ EOF - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- func_append generated " $gentop" -+ generated="$generated $gentop" - - func_extract_archives $gentop $dlprefiles -- func_append libobjs " $func_extract_archives_result" -+ libobjs="$libobjs $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - -@@ -8531,7 +7348,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$opt_mode" = relink; then -+ if test "$mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -8543,7 +7360,7 @@ EOF - IFS="$save_ifs" - - # Restore the uninstalled library and exit -- if test "$opt_mode" = relink; then -+ if test "$mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then -@@ -8624,21 +7441,18 @@ EOF - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" -- reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` -+ reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` - else - gentop="$output_objdir/${obj}x" -- func_append generated " $gentop" -+ generated="$generated $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - -- # If we're not building shared, we need to use non_pic_objs -- test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" -- - # Create the old-style object. -- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test -+ reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - func_execute_cmds "$reload_cmds" 'exit $?' -@@ -8698,8 +7512,8 @@ EOF - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework -- compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` -- finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` -+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` -+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` - ;; - esac - -@@ -8710,14 +7524,14 @@ EOF - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) -- func_append compile_command " ${wl}-bind_at_load" -- func_append finalize_command " ${wl}-bind_at_load" -+ compile_command="$compile_command ${wl}-bind_at_load" -+ finalize_command="$finalize_command ${wl}-bind_at_load" - ;; - esac - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" -- compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -- finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - -@@ -8731,7 +7545,7 @@ EOF - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) -- func_append new_libs " -L$path/$objdir" ;; -+ new_libs="$new_libs -L$path/$objdir" ;; - esac - ;; - esac -@@ -8741,17 +7555,17 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) func_append new_libs " $deplib" ;; -+ *) new_libs="$new_libs $deplib" ;; - esac - ;; -- *) func_append new_libs " $deplib" ;; -+ *) new_libs="$new_libs $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - -- func_append compile_command " $compile_deplibs" -- func_append finalize_command " $finalize_deplibs" -+ compile_command="$compile_command $compile_deplibs" -+ finalize_command="$finalize_command $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. -@@ -8759,7 +7573,7 @@ EOF - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) func_append finalize_rpath " $libdir" ;; -+ *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - fi -@@ -8778,18 +7592,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" -- func_append rpath " $flag" -+ rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) func_append perm_rpath " $libdir" ;; -+ *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - case $host in -@@ -8798,12 +7612,12 @@ EOF - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; -- *) func_append dllsearchpath ":$libdir";; -+ *) dllsearchpath="$dllsearchpath:$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) func_append dllsearchpath ":$testbindir";; -+ *) dllsearchpath="$dllsearchpath:$testbindir";; - esac - ;; - esac -@@ -8829,18 +7643,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" -+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" -- func_append rpath " $flag" -+ rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; -- *) func_append finalize_perm_rpath " $libdir" ;; -+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; - esac - fi - done -@@ -8854,8 +7668,8 @@ EOF - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. -- compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` -- finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` -+ compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - fi - - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" -@@ -8867,15 +7681,15 @@ EOF - - wrappers_required=yes - case $host in -- *cegcc* | *mingw32ce*) -- # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. -- wrappers_required=no -- ;; - *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; -+ *cegcc) -+ # Disable wrappers for cegcc, we are cross compiling anyway. -+ wrappers_required=no -+ ;; - *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no -@@ -8884,19 +7698,13 @@ EOF - esac - if test "$wrappers_required" = no; then - # Replace the output file specification. -- compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` -+ compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - -- if test -n "$postlink_cmds"; then -- func_to_tool_file "$output" -- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -- func_execute_cmds "$postlink_cmds" 'exit $?' -- fi -- - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' -@@ -8919,7 +7727,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- func_append rpath "$dir:" -+ rpath="$rpath$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -8927,7 +7735,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do -- func_append rpath "$dir:" -+ rpath="$rpath$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -8937,18 +7745,11 @@ EOF - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. -- link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` -+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' -- -- if test -n "$postlink_cmds"; then -- func_to_tool_file "$output" -- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -- func_execute_cmds "$postlink_cmds" 'exit $?' -- fi -- - exit $EXIT_SUCCESS - fi - -@@ -8963,7 +7764,7 @@ EOF - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then -- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` -+ relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= -@@ -8975,19 +7776,13 @@ EOF - fi - - # Replace the output file specification. -- link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` -+ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - - func_show_eval "$link_command" 'exit $?' - -- if test -n "$postlink_cmds"; then -- func_to_tool_file "$output_objdir/$outputname" -- postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -- func_execute_cmds "$postlink_cmds" 'exit $?' -- fi -- - # Now create the wrapper script. - func_verbose "creating $output" - -@@ -9005,7 +7800,18 @@ EOF - fi - done - relink_command="(cd `pwd`; $relink_command)" -- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` -+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` -+ fi -+ -+ # Quote $ECHO for shipping. -+ if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then -+ case $progpath in -+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; -+ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; -+ esac -+ qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` -+ else -+ qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` - fi - - # Only actually do things if not in dry run mode. -@@ -9085,7 +7891,7 @@ EOF - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then -- func_append oldobjs " $symfileobj" -+ oldobjs="$oldobjs $symfileobj" - fi - fi - addlibs="$old_convenience" -@@ -9093,10 +7899,10 @@ EOF - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" -- func_append generated " $gentop" -+ generated="$generated $gentop" - - func_extract_archives $gentop $addlibs -- func_append oldobjs " $func_extract_archives_result" -+ oldobjs="$oldobjs $func_extract_archives_result" - fi - - # Do each command in the archive commands. -@@ -9107,10 +7913,10 @@ EOF - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- func_append generated " $gentop" -+ generated="$generated $gentop" - - func_extract_archives $gentop $dlprefiles -- func_append oldobjs " $func_extract_archives_result" -+ oldobjs="$oldobjs $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have -@@ -9126,9 +7932,9 @@ EOF - done | sort | sort -uc >/dev/null 2>&1); then - : - else -- echo "copying selected object files to avoid basename conflicts..." -+ $ECHO "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" -- func_append generated " $gentop" -+ generated="$generated $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= -@@ -9152,9 +7958,9 @@ EOF - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -- func_append oldobjs " $gentop/$newobj" -+ oldobjs="$oldobjs $gentop/$newobj" - ;; -- *) func_append oldobjs " $obj" ;; -+ *) oldobjs="$oldobjs $obj" ;; - esac - done - fi -@@ -9164,16 +7970,6 @@ EOF - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds -- elif test -n "$archiver_list_spec"; then -- func_verbose "using command file archive linking..." -- for obj in $oldobjs -- do -- func_to_tool_file "$obj" -- $ECHO "$func_to_tool_file_result" -- done > $output_objdir/$libname.libcmd -- func_to_tool_file "$output_objdir/$libname.libcmd" -- oldobjs=" $archiver_list_spec$func_to_tool_file_result" -- cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." -@@ -9247,7 +8043,7 @@ EOF - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" -- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` -+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi -@@ -9270,19 +8066,9 @@ EOF - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" -- func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" -- ;; -- -L*) -- func_stripname -L '' "$deplib" -- func_replace_sysroot "$func_stripname_result" -- func_append newdependency_libs " -L$func_replace_sysroot_result" -- ;; -- -R*) -- func_stripname -R '' "$deplib" -- func_replace_sysroot "$func_stripname_result" -- func_append newdependency_libs " -R$func_replace_sysroot_result" -+ newdependency_libs="$newdependency_libs $libdir/$name" - ;; -- *) func_append newdependency_libs " $deplib" ;; -+ *) newdependency_libs="$newdependency_libs $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" -@@ -9296,9 +8082,9 @@ EOF - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" -+ newdlfiles="$newdlfiles $libdir/$name" - ;; -- *) func_append newdlfiles " $lib" ;; -+ *) newdlfiles="$newdlfiles $lib" ;; - esac - done - dlfiles="$newdlfiles" -@@ -9315,7 +8101,7 @@ EOF - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" -+ newdlprefiles="$newdlprefiles $libdir/$name" - ;; - esac - done -@@ -9327,7 +8113,7 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- func_append newdlfiles " $abs" -+ newdlfiles="$newdlfiles $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= -@@ -9336,33 +8122,15 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- func_append newdlprefiles " $abs" -+ newdlprefiles="$newdlprefiles $abs" - done - dlprefiles="$newdlprefiles" - fi - $RM $output - # place dlname in correct position for cygwin -- # In fact, it would be nice if we could use this code for all target -- # systems that can't hard-code library paths into their executables -- # and that have no shared library path variable independent of PATH, -- # but it turns out we can't easily determine that from inspecting -- # libtool variables, so we have to hard-code the OSs to which it -- # applies here; at the moment, that means platforms that use the PE -- # object format with DLL files. See the long comment at the top of -- # tests/bindir.at for full details. - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in -- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) -- # If a -bindir argument was supplied, place the dll there. -- if test "x$bindir" != x ; -- then -- func_relative_path "$install_libdir" "$bindir" -- tdlname=$func_relative_path_result$dlname -- else -- # Otherwise fall back on heuristic. -- tdlname=../bin/$dlname -- fi -- ;; -+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac - $ECHO > $output "\ - # $outputname - a libtool library file -@@ -9421,7 +8189,7 @@ relink_command=\"$relink_command\"" - exit $EXIT_SUCCESS - } - --{ test "$opt_mode" = link || test "$opt_mode" = relink; } && -+{ test "$mode" = link || test "$mode" = relink; } && - func_mode_link ${1+"$@"} - - -@@ -9441,9 +8209,9 @@ func_mode_uninstall () - for arg - do - case $arg in -- -f) func_append RM " $arg"; rmforce=yes ;; -- -*) func_append RM " $arg" ;; -- *) func_append files " $arg" ;; -+ -f) RM="$RM $arg"; rmforce=yes ;; -+ -*) RM="$RM $arg" ;; -+ *) files="$files $arg" ;; - esac - done - -@@ -9452,23 +8220,24 @@ func_mode_uninstall () - - rmdirs= - -+ origobjdir="$objdir" - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then -- odir="$objdir" -+ objdir="$origobjdir" - else -- odir="$dir/$objdir" -+ objdir="$dir/$origobjdir" - fi - func_basename "$file" - name="$func_basename_result" -- test "$opt_mode" = uninstall && odir="$dir" -+ test "$mode" = uninstall && objdir="$dir" - -- # Remember odir for removal later, being careful to avoid duplicates -- if test "$opt_mode" = clean; then -+ # Remember objdir for removal later, being careful to avoid duplicates -+ if test "$mode" = clean; then - case " $rmdirs " in -- *" $odir "*) ;; -- *) func_append rmdirs " $odir" ;; -+ *" $objdir "*) ;; -+ *) rmdirs="$rmdirs $objdir" ;; - esac - fi - -@@ -9494,17 +8263,18 @@ func_mode_uninstall () - - # Delete the libtool libraries and symlinks. - for n in $library_names; do -- func_append rmfiles " $odir/$n" -+ rmfiles="$rmfiles $objdir/$n" - done -- test -n "$old_library" && func_append rmfiles " $odir/$old_library" -+ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - -- case "$opt_mode" in -+ case "$mode" in - clean) -- case " $library_names " in -+ case " $library_names " in -+ # " " in the beginning catches empty $dlname - *" $dlname "*) ;; -- *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; -+ *) rmfiles="$rmfiles $objdir/$dlname" ;; - esac -- test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" -+ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then -@@ -9532,19 +8302,19 @@ func_mode_uninstall () - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then -- func_append rmfiles " $dir/$pic_object" -+ rmfiles="$rmfiles $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then -- func_append rmfiles " $dir/$non_pic_object" -+ rmfiles="$rmfiles $dir/$non_pic_object" - fi - fi - ;; - - *) -- if test "$opt_mode" = clean ; then -+ if test "$mode" = clean ; then - noexename=$name - case $file in - *.exe) -@@ -9554,7 +8324,7 @@ func_mode_uninstall () - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe -- func_append rmfiles " $file" -+ rmfiles="$rmfiles $file" - ;; - esac - # Do a test to see if this is a libtool program. -@@ -9563,7 +8333,7 @@ func_mode_uninstall () - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result -- func_append rmfiles " $func_ltwrapper_scriptname_result" -+ rmfiles="$rmfiles $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename -@@ -9571,12 +8341,12 @@ func_mode_uninstall () - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles -- func_append rmfiles " $odir/$name $odir/${name}S.${objext}" -+ rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then -- func_append rmfiles " $odir/lt-$name" -+ rmfiles="$rmfiles $objdir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then -- func_append rmfiles " $odir/lt-${noexename}.c" -+ rmfiles="$rmfiles $objdir/lt-${noexename}.c" - fi - fi - fi -@@ -9584,6 +8354,7 @@ func_mode_uninstall () - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done -+ objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do -@@ -9595,16 +8366,16 @@ func_mode_uninstall () - exit $exit_status - } - --{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && -+{ test "$mode" = uninstall || test "$mode" = clean; } && - func_mode_uninstall ${1+"$@"} - --test -z "$opt_mode" && { -+test -z "$mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" - } - - test -z "$exec_cmd" && \ -- func_fatal_help "invalid operation mode \`$opt_mode'" -+ func_fatal_help "invalid operation mode \`$mode'" - - if test -n "$exec_cmd"; then - eval exec "$exec_cmd" -diff --git a/src/actions.c b/src/actions.c -index 600a70e..723b7a5 100644 ---- a/src/actions.c -+++ b/src/actions.c -@@ -28,7 +28,8 @@ - #include <gtk/gtk.h> - - /* Xfce includes */ --#include <libxfcegui4/libxfcegui4.h> -+//#include <libxfcegui4/libxfcegui4.h> -+#include <libxfce4ui/libxfce4ui.h> - - /* Package includes */ - #include <middlelayer.h> -diff --git a/src/callbacks.c b/src/callbacks.c -index fa87b39..8681f13 100644 ---- a/src/callbacks.c -+++ b/src/callbacks.c -@@ -27,7 +27,8 @@ - #include <stdlib.h> - - /* Xfce includes */ --#include <libxfcegui4/libxfcegui4.h> -+//#include <libxfcegui4/libxfcegui4.h> -+#include <libxfce4ui/libxfce4ui.h> - - /* Package includes */ - #include <sensors-interface.h> -diff --git a/src/interface.c b/src/interface.c -index a81bef7..0799848 100644 ---- a/src/interface.c -+++ b/src/interface.c -@@ -24,7 +24,8 @@ - #endif - - /* Xfce includes */ --#include <libxfcegui4/libxfcegui4.h> -+//#include <libxfcegui4/libxfcegui4.h> -+#include <libxfce4ui/libxfce4ui.h> - - /* Package includes */ - #include <cpu.h> --- -cgit -From d3e83a4991876bcfadf90e8c781f0bb82c30230d Mon Sep 17 00:00:00 2001 -From: Fabian Nowak <nowak@kit.edu> -Date: Tue, 10 May 2011 09:24:31 +0000 -Subject: try replacing #elseif with #elif because the former does no longer seem to be supported on some compilers - ---- -diff --git a/lib/hddtemp.c b/lib/hddtemp.c -index ba70ab4..052f943 100644 ---- a/lib/hddtemp.c -+++ b/lib/hddtemp.c -@@ -117,7 +117,7 @@ void quick_message_notify (gchar *message) - - #ifdef HAVE_LIBNOTIFY7 - nn = notify_notification_new (summary, body, icon); --#elseif HAVE_LIBNOTIFY4 -+#elif HAVE_LIBNOTIFY4 - nn = notify_notification_new (summary, body, icon, NULL); - #endif - /* FIXME: Use channels or propagate private object or use static global variable */ -diff --git a/lib/sensors-interface.c b/lib/sensors-interface.c -index 1485e34..3ae927c 100644 ---- a/lib/sensors-interface.c -+++ b/lib/sensors-interface.c -@@ -108,7 +108,7 @@ fill_gtkTreeStore (GtkTreeStore *model, t_chip *chip, t_tempscale scale, t_senso - - #ifdef HAVE_LIBNOTIFY7 - nn = notify_notification_new (summary, body, icon); --#elseif HAVE_LIBNOTIFY4 -+#elif HAVE_LIBNOTIFY4 - nn = notify_notification_new (summary, body, icon, NULL); - #endif - notify_notification_show(nn, &error); --- -cgit -From eecce36b535fb189bc2a7e4da19a6be3221235de Mon Sep 17 00:00:00 2001 -From: Fabian <timystery@arcor.de> -Date: Mon, 09 May 2011 22:05:45 +0000 -Subject: remove libxfcegui4 from sensors-interface-common - ---- -diff --git a/lib/sensors-interface.c b/lib/sensors-interface.c -index b0e40c1..f501a54 100644 ---- a/lib/sensors-interface.c -+++ b/lib/sensors-interface.c -@@ -34,7 +34,8 @@ - #include <gtk/gtk.h> - - /* Xfce includes */ --#include <libxfcegui4/libxfcegui4.h> -+//#include <libxfcegui4/libxfcegui4.h> -+#include <libxfce4ui/libxfce4ui.h> - - /* Package includes */ - #include <sensors-interface-common.h> --- -cgit -From e8037664c3ea24df9bb4c4ef03707e64ab6cfa48 Mon Sep 17 00:00:00 2001 -From: Fabian <timystery@arcor.de> -Date: Wed, 11 May 2011 21:11:24 +0000 -Subject: use old debian ltmain.sh again - ---- -diff --git a/ltmain.sh b/ltmain.sh -index 7ed280b..6f650ae 100755 ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -1,9 +1,9 @@ --# Generated from ltmain.m4sh. - --# ltmain.sh (GNU libtool) 2.2.6b -+# libtool (GNU libtool) 2.4 - # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 - --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. - # This is free software; see the source for copying conditions. There is NO - # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -@@ -32,50 +32,56 @@ - # - # Provide generalized library-building support services. - # --# --config show all configuration variables --# --debug enable verbose shell tracing --# -n, --dry-run display commands without modifying any files --# --features display basic configuration information and exit --# --mode=MODE use operation mode MODE --# --preserve-dup-deps don't remove duplicate dependency libraries --# --quiet, --silent don't print informational messages --# --tag=TAG use configuration variables from tag TAG --# -v, --verbose print informational messages (default) --# --version print version information --# -h, --help print short or long help message -+# --config show all configuration variables -+# --debug enable verbose shell tracing -+# -n, --dry-run display commands without modifying any files -+# --features display basic configuration information and exit -+# --mode=MODE use operation mode MODE -+# --preserve-dup-deps don't remove duplicate dependency libraries -+# --quiet, --silent don't print informational messages -+# --no-quiet, --no-silent -+# print informational messages (default) -+# --tag=TAG use configuration variables from tag TAG -+# -v, --verbose print more informational messages than default -+# --no-verbose don't print the extra informational messages -+# --version print version information -+# -h, --help, --help-all print short, long, or detailed help message - # - # MODE must be one of the following: - # --# clean remove files from the build directory --# compile compile a source file into a libtool object --# execute automatically set library path, then run a program --# finish complete the installation of libtool libraries --# install install libraries or executables --# link create a library or an executable --# uninstall remove libraries from an installed directory -+# clean remove files from the build directory -+# compile compile a source file into a libtool object -+# execute automatically set library path, then run a program -+# finish complete the installation of libtool libraries -+# install install libraries or executables -+# link create a library or an executable -+# uninstall remove libraries from an installed directory - # --# MODE-ARGS vary depending on the MODE. -+# MODE-ARGS vary depending on the MODE. When passed as first option, -+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. - # Try `$progname --help --mode=MODE' for a more detailed description of MODE. - # - # When reporting a bug, please describe a test case to reproduce it and - # include the following information: - # --# host-triplet: $host --# shell: $SHELL --# compiler: $LTCC --# compiler flags: $LTCFLAGS --# linker: $LD (gnu? $with_gnu_ld) --# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 --# automake: $automake_version --# autoconf: $autoconf_version -+# host-triplet: $host -+# shell: $SHELL -+# compiler: $LTCC -+# compiler flags: $LTCFLAGS -+# linker: $LD (gnu? $with_gnu_ld) -+# $progname: (GNU libtool) 2.4 Debian-2.4-2 -+# automake: $automake_version -+# autoconf: $autoconf_version - # - # Report bugs to <bug-libtool@gnu.org>. -+# GNU libtool home page: <http://www.gnu.org/software/libtool/>. -+# General help using GNU software: <http://www.gnu.org/gethelp/>. - --PROGRAM=ltmain.sh -+PROGRAM=libtool - PACKAGE=libtool --VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" -+VERSION="2.4 Debian-2.4-2" - TIMESTAMP="" --package_revision=1.3017 -+package_revision=1.3293 - - # Be Bourne compatible - if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -@@ -91,10 +97,15 @@ fi - BIN_SH=xpg4; export BIN_SH # for Tru64 - DUALCASE=1; export DUALCASE # for MKS sh - -+# A function that is used when there is no print builtin or printf. -+func_fallback_echo () -+{ -+ eval 'cat <<_LTECHO_EOF -+$1 -+_LTECHO_EOF' -+} -+ - # NLS nuisances: We save the old values to restore during execute mode. --# Only set LANG and LC_ALL to C if already set. --# These must not be set unconditionally because not all systems understand --# e.g. LANG=C (notably SCO). - lt_user_locale= - lt_safe_locale= - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES -@@ -107,15 +118,24 @@ do - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" - fi" - done -+LC_ALL=C -+LANGUAGE=C -+export LANGUAGE LC_ALL - - $lt_unset CDPATH - - -+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -+# is ksh but when the shell is invoked as "sh" and the current value of -+# the _XPG environment variable is not equal to 1 (one), the special -+# positional parameter $0, within a function call, is the name of the -+# function. -+progpath="$0" - - - - : ${CP="cp -f"} --: ${ECHO="echo"} -+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} - : ${EGREP="/bin/grep -E"} - : ${FGREP="/bin/grep -F"} - : ${GREP="/bin/grep"} -@@ -144,6 +164,27 @@ IFS=" $lt_nl" - dirname="s,/[^/]*$,," - basename="s,^.*/,," - -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+} # func_dirname may be replaced by extended shell implementation -+ -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result=`$ECHO "${1}" | $SED "$basename"` -+} # func_basename may be replaced by extended shell implementation -+ -+ - # func_dirname_and_basename file append nondir_replacement - # perform func_basename and func_dirname in a single function - # call: -@@ -158,33 +199,183 @@ basename="s,^.*/,," - # those functions but instead duplicate the functionality here. - func_dirname_and_basename () - { -- # Extract subdirectory from the argument. -- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -- if test "X$func_dirname_result" = "X${1}"; then -- func_dirname_result="${3}" -- else -- func_dirname_result="$func_dirname_result${2}" -- fi -- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+ func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -+} # func_dirname_and_basename may be replaced by extended shell implementation -+ -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# func_strip_suffix prefix name -+func_stripname () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; -+ esac -+} # func_stripname may be replaced by extended shell implementation -+ -+ -+# These SED scripts presuppose an absolute path with a trailing slash. -+pathcar='s,^/\([^/]*\).*$,\1,' -+pathcdr='s,^/[^/]*,,' -+removedotparts=':dotsl -+ s@/\./@/@g -+ t dotsl -+ s,/\.$,/,' -+collapseslashes='s@/\{1,\}@/@g' -+finalslash='s,/*$,/,' -+ -+# func_normal_abspath PATH -+# Remove doubled-up and trailing slashes, "." path components, -+# and cancel out any ".." path components in PATH after making -+# it an absolute path. -+# value returned in "$func_normal_abspath_result" -+func_normal_abspath () -+{ -+ # Start from root dir and reassemble the path. -+ func_normal_abspath_result= -+ func_normal_abspath_tpath=$1 -+ func_normal_abspath_altnamespace= -+ case $func_normal_abspath_tpath in -+ "") -+ # Empty path, that just means $cwd. -+ func_stripname '' '/' "`pwd`" -+ func_normal_abspath_result=$func_stripname_result -+ return -+ ;; -+ # The next three entries are used to spot a run of precisely -+ # two leading slashes without using negated character classes; -+ # we take advantage of case's first-match behaviour. -+ ///*) -+ # Unusual form of absolute path, do nothing. -+ ;; -+ //*) -+ # Not necessarily an ordinary path; POSIX reserves leading '//' -+ # and for example Cygwin uses it to access remote file shares -+ # over CIFS/SMB, so we conserve a leading double slash if found. -+ func_normal_abspath_altnamespace=/ -+ ;; -+ /*) -+ # Absolute path, do nothing. -+ ;; -+ *) -+ # Relative path, prepend $cwd. -+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath -+ ;; -+ esac -+ # Cancel out all the simple stuff to save iterations. We also want -+ # the path to end with a slash for ease of parsing, so make sure -+ # there is one (and only one) here. -+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ -+ -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` -+ while :; do -+ # Processed it all yet? -+ if test "$func_normal_abspath_tpath" = / ; then -+ # If we ascended to the root using ".." the result may be empty now. -+ if test -z "$func_normal_abspath_result" ; then -+ func_normal_abspath_result=/ -+ fi -+ break -+ fi -+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ -+ -e "$pathcar"` -+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ -+ -e "$pathcdr"` -+ # Figure out what to do with it -+ case $func_normal_abspath_tcomponent in -+ "") -+ # Trailing empty path component, ignore it. -+ ;; -+ ..) -+ # Parent dir; strip last assembled component from result. -+ func_dirname "$func_normal_abspath_result" -+ func_normal_abspath_result=$func_dirname_result -+ ;; -+ *) -+ # Actual path component, append it. -+ func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent -+ ;; -+ esac -+ done -+ # Restore leading double-slash if one was found on entry. -+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result - } - --# Generated shell functions inserted here. -+# func_relative_path SRCDIR DSTDIR -+# generates a relative path from SRCDIR to DSTDIR, with a trailing -+# slash if non-empty, suitable for immediately appending a filename -+# without needing to append a separator. -+# value returned in "$func_relative_path_result" -+func_relative_path () -+{ -+ func_relative_path_result= -+ func_normal_abspath "$1" -+ func_relative_path_tlibdir=$func_normal_abspath_result -+ func_normal_abspath "$2" -+ func_relative_path_tbindir=$func_normal_abspath_result -+ -+ # Ascend the tree starting from libdir -+ while :; do -+ # check if we have found a prefix of bindir -+ case $func_relative_path_tbindir in -+ $func_relative_path_tlibdir) -+ # found an exact match -+ func_relative_path_tcancelled= -+ break -+ ;; -+ $func_relative_path_tlibdir*) -+ # found a matching prefix -+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" -+ func_relative_path_tcancelled=$func_stripname_result -+ if test -z "$func_relative_path_result"; then -+ func_relative_path_result=. -+ fi -+ break -+ ;; -+ *) -+ func_dirname $func_relative_path_tlibdir -+ func_relative_path_tlibdir=${func_dirname_result} -+ if test "x$func_relative_path_tlibdir" = x ; then -+ # Have to descend all the way to the root! -+ func_relative_path_result=../$func_relative_path_result -+ func_relative_path_tcancelled=$func_relative_path_tbindir -+ break -+ fi -+ func_relative_path_result=../$func_relative_path_result -+ ;; -+ esac -+ done - --# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh --# is ksh but when the shell is invoked as "sh" and the current value of --# the _XPG environment variable is not equal to 1 (one), the special --# positional parameter $0, within a function call, is the name of the --# function. --progpath="$0" -+ # Now calculate path; take care to avoid doubling-up slashes. -+ func_stripname '' '/' "$func_relative_path_result" -+ func_relative_path_result=$func_stripname_result -+ func_stripname '/' '/' "$func_relative_path_tcancelled" -+ if test "x$func_stripname_result" != x ; then -+ func_relative_path_result=${func_relative_path_result}/${func_stripname_result} -+ fi -+ -+ # Normalisation. If bindir is libdir, return empty string, -+ # else relative path ending with a slash; either way, target -+ # file name can be directly appended. -+ if test ! -z "$func_relative_path_result"; then -+ func_stripname './' '' "$func_relative_path_result/" -+ func_relative_path_result=$func_stripname_result -+ fi -+} - - # The name of this program: --# In the unlikely event $progname began with a '-', it would play havoc with --# func_echo (imagine progname=-n), so we prepend ./ in that case: - func_dirname_and_basename "$progpath" - progname=$func_basename_result --case $progname in -- -*) progname=./$progname ;; --esac - - # Make sure we have an absolute path for reexecution: - case $progpath in -@@ -215,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - # Same as above, but do not quote variable references. - double_quote_subst='s/\(["`\\]\)/\\\1/g' - -+# Sed substitution that turns a string into a regex matching for the -+# string literally. -+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -+ -+# Sed substitution that converts a w32 file name or path -+# which contains forward slashes, into one that contains -+# (escaped) backslashes. A very naive implementation. -+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -+ - # Re-`\' parameter expansions in output of double_quote_subst that were - # `\'-ed in input to the same. If an odd number of `\' preceded a '$' - # in input to double_quote_subst, that '$' was protected from expansion. -@@ -243,7 +443,7 @@ opt_warning=: - # name if it has been set yet. - func_echo () - { -- $ECHO "$progname${mode+: }$mode: $*" -+ $ECHO "$progname: ${opt_mode+$opt_mode: }$*" - } - - # func_verbose arg... -@@ -258,18 +458,25 @@ func_verbose () - : - } - -+# func_echo_all arg... -+# Invoke $ECHO with all args, space-separated. -+func_echo_all () -+{ -+ $ECHO "$*" -+} -+ - # func_error arg... - # Echo program name prefixed message to standard error. - func_error () - { -- $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 -+ $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 - } - - # func_warning arg... - # Echo program name prefixed warning message to standard error. - func_warning () - { -- $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 -+ $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 - - # bash bug again: - : -@@ -326,9 +533,9 @@ func_mkdir_p () - case $my_directory_path in */*) ;; *) break ;; esac - - # ...otherwise throw away the child directory and loop -- my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` -+ my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` - done -- my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` -+ my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` - - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do -@@ -378,7 +585,7 @@ func_mktempdir () - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi - -- $ECHO "X$my_tmpdir" | $Xsed -+ $ECHO "$my_tmpdir" - } - - -@@ -392,7 +599,7 @@ func_quote_for_eval () - { - case $1 in - *[\\\`\"\$]*) -- func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; -+ func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac -@@ -419,7 +626,7 @@ func_quote_for_expand () - { - case $1 in - *[\\\`\"]*) -- my_arg=`$ECHO "X$1" | $Xsed \ -+ my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; -@@ -488,15 +695,39 @@ func_show_eval_locale () - fi - } - -- -- -+# func_tr_sh -+# Turn $1 into a string suitable for a shell variable name. -+# Result is stored in $func_tr_sh_result. All characters -+# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -+# if $1 begins with a digit, a '_' is prepended as well. -+func_tr_sh () -+{ -+ case $1 in -+ [0-9]* | *[!a-zA-Z0-9_]*) -+ func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` -+ ;; -+ * ) -+ func_tr_sh_result=$1 -+ ;; -+ esac -+} - - - # func_version - # Echo version message to standard output and exit. - func_version () - { -- $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { -+ $opt_debug -+ -+ $SED -n '/(C)/!b go -+ :more -+ /\./!{ -+ N -+ s/\n# / / -+ b more -+ } -+ :go -+ /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ -@@ -509,22 +740,28 @@ func_version () - # Echo short help message to standard output and exit. - func_usage () - { -- $SED -n '/^# Usage:/,/# -h/ { -+ $opt_debug -+ -+ $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" -- $ECHO -+ echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? - } - --# func_help --# Echo long help message to standard output and exit. -+# func_help [NOEXIT] -+# Echo long help message to standard output and exit, -+# unless 'noexit' is passed as argument. - func_help () - { -+ $opt_debug -+ - $SED -n '/^# Usage:/,/# Report bugs to/ { -+ :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* -@@ -537,8 +774,15 @@ func_help () - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ - p -- }' < "$progpath" -- exit $? -+ d -+ } -+ /^# .* home page:/b print -+ /^# General help using/b print -+ ' < "$progpath" -+ ret=$? -+ if test -z "$1"; then -+ exit $ret -+ fi - } - - # func_missing_arg argname -@@ -546,63 +790,106 @@ func_help () - # exit_cmd. - func_missing_arg () - { -- func_error "missing argument for $1" -+ $opt_debug -+ -+ func_error "missing argument for $1." - exit_cmd=exit - } - --exit_cmd=: - -+# func_split_short_opt shortopt -+# Set func_split_short_opt_name and func_split_short_opt_arg shell -+# variables after splitting SHORTOPT after the 2nd character. -+func_split_short_opt () -+{ -+ my_sed_short_opt='1s/^\(..\).*$/\1/;q' -+ my_sed_short_rest='1s/^..\(.*\)$/\1/;q' -+ -+ func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` -+ func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -+} # func_split_short_opt may be replaced by extended shell implementation - - -+# func_split_long_opt longopt -+# Set func_split_long_opt_name and func_split_long_opt_arg shell -+# variables after splitting LONGOPT at the `=' sign. -+func_split_long_opt () -+{ -+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' -+ my_sed_long_arg='1s/^--[^=]*=//' -+ -+ func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` -+ func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -+} # func_split_long_opt may be replaced by extended shell implementation -+ -+exit_cmd=: -+ - - --# Check that we have a working $ECHO. --if test "X$1" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift --elif test "X$1" = X--fallback-echo; then -- # Avoid inline document here, it may be left over -- : --elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then -- # Yippee, $ECHO works! -- : --else -- # Restart under the correct shell, and then maybe $ECHO will work. -- exec $SHELL "$progpath" --no-reexec ${1+"$@"} --fi - --if test "X$1" = X--fallback-echo; then -- # used as fallback echo -- shift -- cat <<EOF --$* --EOF -- exit $EXIT_SUCCESS --fi - - magic="%%%MAGIC variable%%%" - magic_exe="%%%MAGIC EXE variable%%%" - - # Global variables. --# $mode is unset - nonopt= --execute_dlfiles= - preserve_args= - lo2o="s/\\.lo\$/.${objext}/" - o2lo="s/\\.${objext}\$/.lo/" - extracted_archives= - extracted_serial=0 - --opt_dry_run=false --opt_duplicate_deps=false --opt_silent=false --opt_debug=: -- - # If this variable is set in any of the actions, the command in it - # will be execed at the end. This prevents here-documents from being - # left over by shells. - exec_cmd= - -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "${1}=\$${1}\${2}" -+} # func_append may be replaced by extended shell implementation -+ -+# func_append_quoted var value -+# Quote VALUE and append to the end of shell variable VAR, separated -+# by a space. -+func_append_quoted () -+{ -+ func_quote_for_eval "${2}" -+ eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -+} # func_append_quoted may be replaced by extended shell implementation -+ -+ -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=`expr "${@}"` -+} # func_arith may be replaced by extended shell implementation -+ -+ -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -+} # func_len may be replaced by extended shell implementation -+ -+ -+# func_lo2o object -+func_lo2o () -+{ -+ func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -+} # func_lo2o may be replaced by extended shell implementation -+ -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -+} # func_xform may be replaced by extended shell implementation -+ -+ - # func_fatal_configuration arg... - # Echo program name prefixed message to standard error, followed by - # a configuration failure hint, and exit. -@@ -636,16 +923,16 @@ func_config () - # Display the features supported by this script. - func_features () - { -- $ECHO "host: $host" -+ echo "host: $host" - if test "$build_libtool_libs" = yes; then -- $ECHO "enable shared libraries" -+ echo "enable shared libraries" - else -- $ECHO "disable shared libraries" -+ echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then -- $ECHO "enable static libraries" -+ echo "enable static libraries" - else -- $ECHO "disable static libraries" -+ echo "disable static libraries" - fi - - exit $? -@@ -692,117 +979,204 @@ func_enable_tag () - esac - } - --# Parse options once, thoroughly. This comes as soon as possible in --# the script to make things like `libtool --version' happen quickly. -+# func_check_version_match -+# Ensure that we are using m4 macros, and libtool script from the same -+# release of libtool. -+func_check_version_match () - { -+ if test "$package_revision" != "$macro_revision"; then -+ if test "$VERSION" != "$macro_version"; then -+ if test -z "$macro_version"; then -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from an older release. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -+$progname: and run autoconf again. -+_LT_EOF -+ fi -+ else -+ cat >&2 <<_LT_EOF -+$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -+$progname: but the definition of this LT_INIT comes from revision $macro_revision. -+$progname: You should recreate aclocal.m4 with macros from revision $package_revision -+$progname: of $PACKAGE $VERSION and run autoconf again. -+_LT_EOF -+ fi - -- # Shorthand for --mode=foo, only valid as the first argument -- case $1 in -- clean|clea|cle|cl) -- shift; set dummy --mode clean ${1+"$@"}; shift -- ;; -- compile|compil|compi|comp|com|co|c) -- shift; set dummy --mode compile ${1+"$@"}; shift -- ;; -- execute|execut|execu|exec|exe|ex|e) -- shift; set dummy --mode execute ${1+"$@"}; shift -- ;; -- finish|finis|fini|fin|fi|f) -- shift; set dummy --mode finish ${1+"$@"}; shift -- ;; -- install|instal|insta|inst|ins|in|i) -- shift; set dummy --mode install ${1+"$@"}; shift -- ;; -- link|lin|li|l) -- shift; set dummy --mode link ${1+"$@"}; shift -- ;; -- uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -- shift; set dummy --mode uninstall ${1+"$@"}; shift -- ;; -- esac -+ exit $EXIT_MISMATCH -+ fi -+} -+ -+ -+# Shorthand for --mode=foo, only valid as the first argument -+case $1 in -+clean|clea|cle|cl) -+ shift; set dummy --mode clean ${1+"$@"}; shift -+ ;; -+compile|compil|compi|comp|com|co|c) -+ shift; set dummy --mode compile ${1+"$@"}; shift -+ ;; -+execute|execut|execu|exec|exe|ex|e) -+ shift; set dummy --mode execute ${1+"$@"}; shift -+ ;; -+finish|finis|fini|fin|fi|f) -+ shift; set dummy --mode finish ${1+"$@"}; shift -+ ;; -+install|instal|insta|inst|ins|in|i) -+ shift; set dummy --mode install ${1+"$@"}; shift -+ ;; -+link|lin|li|l) -+ shift; set dummy --mode link ${1+"$@"}; shift -+ ;; -+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) -+ shift; set dummy --mode uninstall ${1+"$@"}; shift -+ ;; -+esac - -- # Parse non-mode specific arguments: -- while test "$#" -gt 0; do -+ -+ -+# Option defaults: -+opt_debug=: -+opt_dry_run=false -+opt_config=false -+opt_preserve_dup_deps=false -+opt_features=false -+opt_finish=false -+opt_help=false -+opt_help_all=false -+opt_silent=: -+opt_verbose=: -+opt_silent=false -+opt_verbose=false -+ -+ -+# Parse options once, thoroughly. This comes as soon as possible in the -+# script to make things like `--version' happen as quickly as we can. -+{ -+ # this just eases exit handling -+ while test $# -gt 0; do - opt="$1" - shift -- - case $opt in -- --config) func_config ;; -- -- --debug) preserve_args="$preserve_args $opt" -+ --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" -- opt_debug='set -x' - $opt_debug - ;; -- -- -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break -- execute_dlfiles="$execute_dlfiles $1" -- shift -+ --dry-run|--dryrun|-n) -+ opt_dry_run=: - ;; -- -- --dry-run | -n) opt_dry_run=: ;; -- --features) func_features ;; -- --finish) mode="finish" ;; -- -- --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break -- case $1 in -- # Valid mode arguments: -- clean) ;; -- compile) ;; -- execute) ;; -- finish) ;; -- install) ;; -- link) ;; -- relink) ;; -- uninstall) ;; -- -- # Catch anything else as an error -- *) func_error "invalid argument for $opt" -- exit_cmd=exit -- break -- ;; -- esac -- -- mode="$1" -+ --config) -+ opt_config=: -+func_config -+ ;; -+ --dlopen|-dlopen) -+ optarg="$1" -+ opt_dlopen="${opt_dlopen+$opt_dlopen -+}$optarg" - shift - ;; -- - --preserve-dup-deps) -- opt_duplicate_deps=: ;; -- -- --quiet|--silent) preserve_args="$preserve_args $opt" -- opt_silent=: -+ opt_preserve_dup_deps=: - ;; -- -- --verbose| -v) preserve_args="$preserve_args $opt" -+ --features) -+ opt_features=: -+func_features -+ ;; -+ --finish) -+ opt_finish=: -+set dummy --mode finish ${1+"$@"}; shift -+ ;; -+ --help) -+ opt_help=: -+ ;; -+ --help-all) -+ opt_help_all=: -+opt_help=': help-all' -+ ;; -+ --mode) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_mode="$optarg" -+case $optarg in -+ # Valid mode arguments: -+ clean|compile|execute|finish|install|link|relink|uninstall) ;; -+ -+ # Catch anything else as an error -+ *) func_error "invalid argument for $opt" -+ exit_cmd=exit -+ break -+ ;; -+esac -+ shift -+ ;; -+ --no-silent|--no-quiet) - opt_silent=false -+func_append preserve_args " $opt" - ;; -- -- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break -- preserve_args="$preserve_args $opt $1" -- func_enable_tag "$1" # tagname is set here -+ --no-verbose) -+ opt_verbose=false -+func_append preserve_args " $opt" -+ ;; -+ --silent|--quiet) -+ opt_silent=: -+func_append preserve_args " $opt" -+ opt_verbose=false -+ ;; -+ --verbose|-v) -+ opt_verbose=: -+func_append preserve_args " $opt" -+opt_silent=false -+ ;; -+ --tag) -+ test $# = 0 && func_missing_arg $opt && break -+ optarg="$1" -+ opt_tag="$optarg" -+func_append preserve_args " $opt $optarg" -+func_enable_tag "$optarg" - shift - ;; - -+ -\?|-h) func_usage ;; -+ --help) func_help ;; -+ --version) func_version ;; -+ - # Separate optargs to long options: -- -dlopen=*|--mode=*|--tag=*) -- func_opt_split "$opt" -- set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} -+ --*=*) -+ func_split_long_opt "$opt" -+ set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - -- -\?|-h) func_usage ;; -- --help) opt_help=: ;; -- --version) func_version ;; -- -- -*) func_fatal_help "unrecognized option \`$opt'" ;; -- -- *) nonopt="$opt" -- break -+ # Separate non-argument short options: -+ -\?*|-h*|-n*|-v*) -+ func_split_short_opt "$opt" -+ set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} -+ shift - ;; -+ -+ --) break ;; -+ -*) func_fatal_help "unrecognized option \`$opt'" ;; -+ *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - -+ # Validate options: -+ -+ # save first non-option argument -+ if test "$#" -gt 0; then -+ nonopt="$opt" -+ shift -+ fi -+ -+ # preserve --debug -+ test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) -@@ -810,82 +1184,44 @@ func_enable_tag () - opt_duplicate_compiler_generated_deps=: - ;; - *) -- opt_duplicate_compiler_generated_deps=$opt_duplicate_deps -+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - -- # Having warned about all mis-specified options, bail out if -- # anything was wrong. -- $exit_cmd $EXIT_FAILURE --} -+ $opt_help || { -+ # Sanity checks first: -+ func_check_version_match - --# func_check_version_match --# Ensure that we are using m4 macros, and libtool script from the same --# release of libtool. --func_check_version_match () --{ -- if test "$package_revision" != "$macro_revision"; then -- if test "$VERSION" != "$macro_version"; then -- if test -z "$macro_version"; then -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from an older release. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, but the --$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. --$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION --$progname: and run autoconf again. --_LT_EOF -- fi -- else -- cat >&2 <<_LT_EOF --$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, --$progname: but the definition of this LT_INIT comes from revision $macro_revision. --$progname: You should recreate aclocal.m4 with macros from revision $package_revision --$progname: of $PACKAGE $VERSION and run autoconf again. --_LT_EOF -+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -+ func_fatal_configuration "not configured to build any kind of library" - fi - -- exit $EXIT_MISMATCH -- fi --} -- -- --## ----------- ## --## Main. ## --## ----------- ## -+ # Darwin sucks -+ eval std_shrext=\"$shrext_cmds\" - --$opt_help || { -- # Sanity checks first: -- func_check_version_match -+ # Only execute mode is allowed to have -dlopen flags. -+ if test -n "$opt_dlopen" && test "$opt_mode" != execute; then -+ func_error "unrecognized option \`-dlopen'" -+ $ECHO "$help" 1>&2 -+ exit $EXIT_FAILURE -+ fi - -- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then -- func_fatal_configuration "not configured to build any kind of library" -- fi -+ # Change the help message to a mode-specific one. -+ generic_help="$help" -+ help="Try \`$progname --help --mode=$opt_mode' for more information." -+ } - -- test -z "$mode" && func_fatal_error "error: you must specify a MODE." - -+ # Bail if the options were screwed -+ $exit_cmd $EXIT_FAILURE -+} - -- # Darwin sucks -- eval std_shrext=\"$shrext_cmds\" - - -- # Only execute mode is allowed to have -dlopen flags. -- if test -n "$execute_dlfiles" && test "$mode" != execute; then -- func_error "unrecognized option \`-dlopen'" -- $ECHO "$help" 1>&2 -- exit $EXIT_FAILURE -- fi -- -- # Change the help message to a mode-specific one. -- generic_help="$help" -- help="Try \`$progname --help --mode=$mode' for more information." --} - -+## ----------- ## -+## Main. ## -+## ----------- ## - - # func_lalib_p file - # True iff FILE is a libtool `.la' library or `.lo' object file. -@@ -950,12 +1286,9 @@ func_ltwrapper_executable_p () - # temporary ltwrapper_script. - func_ltwrapper_scriptname () - { -- func_ltwrapper_scriptname_result="" -- if func_ltwrapper_executable_p "$1"; then -- func_dirname_and_basename "$1" "" "." -- func_stripname '' '.exe' "$func_basename_result" -- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -- fi -+ func_dirname_and_basename "$1" "" "." -+ func_stripname '' '.exe' "$func_basename_result" -+ func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - } - - # func_ltwrapper_p file -@@ -1001,6 +1334,37 @@ func_source () - } - - -+# func_resolve_sysroot PATH -+# Replace a leading = in PATH with a sysroot. Store the result into -+# func_resolve_sysroot_result -+func_resolve_sysroot () -+{ -+ func_resolve_sysroot_result=$1 -+ case $func_resolve_sysroot_result in -+ =*) -+ func_stripname '=' '' "$func_resolve_sysroot_result" -+ func_resolve_sysroot_result=$lt_sysroot$func_stripname_result -+ ;; -+ esac -+} -+ -+# func_replace_sysroot PATH -+# If PATH begins with the sysroot, replace it with = and -+# store the result into func_replace_sysroot_result. -+func_replace_sysroot () -+{ -+ case "$lt_sysroot:$1" in -+ ?*:"$lt_sysroot"*) -+ func_stripname "$lt_sysroot" '' "$1" -+ func_replace_sysroot_result="=$func_stripname_result" -+ ;; -+ *) -+ # Including no sysroot. -+ func_replace_sysroot_result=$1 -+ ;; -+ esac -+} -+ - # func_infer_tag arg - # Infer tagged configuration to use if any are available and - # if one wasn't chosen via the "--tag" command line option. -@@ -1013,13 +1377,15 @@ func_infer_tag () - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done -+ CC_expanded=`func_echo_all $CC` -+ CC_quoted_expanded=`func_echo_all $CC_quoted` - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. -- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; -+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ -+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) -@@ -1030,11 +1396,13 @@ func_infer_tag () - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. -- func_quote_for_eval "$arg" -- CC_quoted="$CC_quoted $func_quote_for_eval_result" -+ func_append_quoted CC_quoted "$arg" - done -+ CC_expanded=`func_echo_all $CC` -+ CC_quoted_expanded=`func_echo_all $CC_quoted` - case "$@ " in -- " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) -+ " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ -+ " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. -@@ -1097,6 +1465,486 @@ EOF - } - } - -+ -+################################################## -+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # -+################################################## -+ -+# func_convert_core_file_wine_to_w32 ARG -+# Helper function used by file name conversion functions when $build is *nix, -+# and $host is mingw, cygwin, or some other w32 environment. Relies on a -+# correctly configured wine environment available, with the winepath program -+# in $build's $PATH. -+# -+# ARG is the $build file name to be converted to w32 format. -+# Result is available in $func_convert_core_file_wine_to_w32_result, and will -+# be empty on error (or when ARG is empty) -+func_convert_core_file_wine_to_w32 () -+{ -+ $opt_debug -+ func_convert_core_file_wine_to_w32_result="$1" -+ if test -n "$1"; then -+ # Unfortunately, winepath does not exit with a non-zero error code, so we -+ # are forced to check the contents of stdout. On the other hand, if the -+ # command is not found, the shell will set an exit code of 127 and print -+ # *an error message* to stdout. So we must check for both error code of -+ # zero AND non-empty stdout, which explains the odd construction: -+ func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` -+ if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then -+ func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | -+ $SED -e "$lt_sed_naive_backslashify"` -+ else -+ func_convert_core_file_wine_to_w32_result= -+ fi -+ fi -+} -+# end: func_convert_core_file_wine_to_w32 -+ -+ -+# func_convert_core_path_wine_to_w32 ARG -+# Helper function used by path conversion functions when $build is *nix, and -+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -+# configured wine environment available, with the winepath program in $build's -+# $PATH. Assumes ARG has no leading or trailing path separator characters. -+# -+# ARG is path to be converted from $build format to win32. -+# Result is available in $func_convert_core_path_wine_to_w32_result. -+# Unconvertible file (directory) names in ARG are skipped; if no directory names -+# are convertible, then the result may be empty. -+func_convert_core_path_wine_to_w32 () -+{ -+ $opt_debug -+ # unfortunately, winepath doesn't convert paths, only file names -+ func_convert_core_path_wine_to_w32_result="" -+ if test -n "$1"; then -+ oldIFS=$IFS -+ IFS=: -+ for func_convert_core_path_wine_to_w32_f in $1; do -+ IFS=$oldIFS -+ func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" -+ if test -n "$func_convert_core_file_wine_to_w32_result" ; then -+ if test -z "$func_convert_core_path_wine_to_w32_result"; then -+ func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" -+ else -+ func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" -+ fi -+ fi -+ done -+ IFS=$oldIFS -+ fi -+} -+# end: func_convert_core_path_wine_to_w32 -+ -+ -+# func_cygpath ARGS... -+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -+# (2), returns the Cygwin file name or path in func_cygpath_result (input -+# file name or path is assumed to be in w32 format, as previously converted -+# from $build's *nix or MSYS format). In case (3), returns the w32 file name -+# or path in func_cygpath_result (input file name or path is assumed to be in -+# Cygwin format). Returns an empty string on error. -+# -+# ARGS are passed to cygpath, with the last one being the file name or path to -+# be converted. -+# -+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -+# environment variable; do not put it in $PATH. -+func_cygpath () -+{ -+ $opt_debug -+ if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then -+ func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` -+ if test "$?" -ne 0; then -+ # on failure, ensure result is empty -+ func_cygpath_result= -+ fi -+ else -+ func_cygpath_result= -+ func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" -+ fi -+} -+#end: func_cygpath -+ -+ -+# func_convert_core_msys_to_w32 ARG -+# Convert file name or path ARG from MSYS format to w32 format. Return -+# result in func_convert_core_msys_to_w32_result. -+func_convert_core_msys_to_w32 () -+{ -+ $opt_debug -+ # awkward: cmd appends spaces to result -+ func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | -+ $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -+} -+#end: func_convert_core_msys_to_w32 -+ -+ -+# func_convert_file_check ARG1 ARG2 -+# Verify that ARG1 (a file name in $build format) was converted to $host -+# format in ARG2. Otherwise, emit an error message, but continue (resetting -+# func_to_host_file_result to ARG1). -+func_convert_file_check () -+{ -+ $opt_debug -+ if test -z "$2" && test -n "$1" ; then -+ func_error "Could not determine host file name corresponding to" -+ func_error " \`$1'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback: -+ func_to_host_file_result="$1" -+ fi -+} -+# end func_convert_file_check -+ -+ -+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -+# Verify that FROM_PATH (a path in $build format) was converted to $host -+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -+# func_to_host_file_result to a simplistic fallback value (see below). -+func_convert_path_check () -+{ -+ $opt_debug -+ if test -z "$4" && test -n "$3"; then -+ func_error "Could not determine the host path corresponding to" -+ func_error " \`$3'" -+ func_error "Continuing, but uninstalled executables may not work." -+ # Fallback. This is a deliberately simplistic "conversion" and -+ # should not be "improved". See libtool.info. -+ if test "x$1" != "x$2"; then -+ lt_replace_pathsep_chars="s|$1|$2|g" -+ func_to_host_path_result=`echo "$3" | -+ $SED -e "$lt_replace_pathsep_chars"` -+ else -+ func_to_host_path_result="$3" -+ fi -+ fi -+} -+# end func_convert_path_check -+ -+ -+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -+# and appending REPL if ORIG matches BACKPAT. -+func_convert_path_front_back_pathsep () -+{ -+ $opt_debug -+ case $4 in -+ $1 ) func_to_host_path_result="$3$func_to_host_path_result" -+ ;; -+ esac -+ case $4 in -+ $2 ) func_append func_to_host_path_result "$3" -+ ;; -+ esac -+} -+# end func_convert_path_front_back_pathsep -+ -+ -+################################################## -+# $build to $host FILE NAME CONVERSION FUNCTIONS # -+################################################## -+# invoked via `$to_host_file_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# Result will be available in $func_to_host_file_result. -+ -+ -+# func_to_host_file ARG -+# Converts the file name ARG from $build format to $host format. Return result -+# in func_to_host_file_result. -+func_to_host_file () -+{ -+ $opt_debug -+ $to_host_file_cmd "$1" -+} -+# end func_to_host_file -+ -+ -+# func_to_tool_file ARG LAZY -+# converts the file name ARG from $build format to toolchain format. Return -+# result in func_to_tool_file_result. If the conversion in use is listed -+# in (the comma separated) LAZY, no conversion takes place. -+func_to_tool_file () -+{ -+ $opt_debug -+ case ,$2, in -+ *,"$to_tool_file_cmd",*) -+ func_to_tool_file_result=$1 -+ ;; -+ *) -+ $to_tool_file_cmd "$1" -+ func_to_tool_file_result=$func_to_host_file_result -+ ;; -+ esac -+} -+# end func_to_tool_file -+ -+ -+# func_convert_file_noop ARG -+# Copy ARG to func_to_host_file_result. -+func_convert_file_noop () -+{ -+ func_to_host_file_result="$1" -+} -+# end func_convert_file_noop -+ -+ -+# func_convert_file_msys_to_w32 ARG -+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_file_result. -+func_convert_file_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_msys_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_w32 -+ -+ -+# func_convert_file_cygwin_to_w32 ARG -+# Convert file name ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_file_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # because $build is cygwin, we call "the" cygpath in $PATH; no need to use -+ # LT_CYGPATH in this case. -+ func_to_host_file_result=`cygpath -m "$1"` -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_cygwin_to_w32 -+ -+ -+# func_convert_file_nix_to_w32 ARG -+# Convert file name ARG from *nix to w32 format. Requires a wine environment -+# and a working winepath. Returns result in func_to_host_file_result. -+func_convert_file_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_file_wine_to_w32 "$1" -+ func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_w32 -+ -+ -+# func_convert_file_msys_to_cygwin ARG -+# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_file_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ func_convert_core_msys_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_msys_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_msys_to_cygwin -+ -+ -+# func_convert_file_nix_to_cygwin ARG -+# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -+# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -+# in func_to_host_file_result. -+func_convert_file_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_file_result="$1" -+ if test -n "$1"; then -+ # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. -+ func_convert_core_file_wine_to_w32 "$1" -+ func_cygpath -u "$func_convert_core_file_wine_to_w32_result" -+ func_to_host_file_result="$func_cygpath_result" -+ fi -+ func_convert_file_check "$1" "$func_to_host_file_result" -+} -+# end func_convert_file_nix_to_cygwin -+ -+ -+############################################# -+# $build to $host PATH CONVERSION FUNCTIONS # -+############################################# -+# invoked via `$to_host_path_cmd ARG' -+# -+# In each case, ARG is the path to be converted from $build to $host format. -+# The result will be available in $func_to_host_path_result. -+# -+# Path separators are also converted from $build format to $host format. If -+# ARG begins or ends with a path separator character, it is preserved (but -+# converted to $host format) on output. -+# -+# All path conversion functions are named using the following convention: -+# file name conversion function : func_convert_file_X_to_Y () -+# path conversion function : func_convert_path_X_to_Y () -+# where, for any given $build/$host combination the 'X_to_Y' value is the -+# same. If conversion functions are added for new $build/$host combinations, -+# the two new functions must follow this pattern, or func_init_to_host_path_cmd -+# will break. -+ -+ -+# func_init_to_host_path_cmd -+# Ensures that function "pointer" variable $to_host_path_cmd is set to the -+# appropriate value, based on the value of $to_host_file_cmd. -+to_host_path_cmd= -+func_init_to_host_path_cmd () -+{ -+ $opt_debug -+ if test -z "$to_host_path_cmd"; then -+ func_stripname 'func_convert_file_' '' "$to_host_file_cmd" -+ to_host_path_cmd="func_convert_path_${func_stripname_result}" -+ fi -+} -+ -+ -+# func_to_host_path ARG -+# Converts the path ARG from $build format to $host format. Return result -+# in func_to_host_path_result. -+func_to_host_path () -+{ -+ $opt_debug -+ func_init_to_host_path_cmd -+ $to_host_path_cmd "$1" -+} -+# end func_to_host_path -+ -+ -+# func_convert_path_noop ARG -+# Copy ARG to func_to_host_path_result. -+func_convert_path_noop () -+{ -+ func_to_host_path_result="$1" -+} -+# end func_convert_path_noop -+ -+ -+# func_convert_path_msys_to_w32 ARG -+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -+# conversion to w32 is not available inside the cwrapper. Returns result in -+# func_to_host_path_result. -+func_convert_path_msys_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from ARG. MSYS -+ # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; -+ # and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_msys_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_msys_to_w32 -+ -+ -+# func_convert_path_cygwin_to_w32 ARG -+# Convert path ARG from Cygwin to w32 format. Returns result in -+# func_to_host_file_result. -+func_convert_path_cygwin_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_cygwin_to_w32 -+ -+ -+# func_convert_path_nix_to_w32 ARG -+# Convert path ARG from *nix to w32 format. Requires a wine environment and -+# a working winepath. Returns result in func_to_host_file_result. -+func_convert_path_nix_to_w32 () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" -+ func_convert_path_check : ";" \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" -+ fi -+} -+# end func_convert_path_nix_to_w32 -+ -+ -+# func_convert_path_msys_to_cygwin ARG -+# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -+# Returns result in func_to_host_file_result. -+func_convert_path_msys_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # See func_convert_path_msys_to_w32: -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_msys_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_msys_to_cygwin -+ -+ -+# func_convert_path_nix_to_cygwin ARG -+# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -+# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -+# func_to_host_file_result. -+func_convert_path_nix_to_cygwin () -+{ -+ $opt_debug -+ func_to_host_path_result="$1" -+ if test -n "$1"; then -+ # Remove leading and trailing path separator characters from -+ # ARG. msys behavior is inconsistent here, cygpath turns them -+ # into '.;' and ';.', and winepath ignores them completely. -+ func_stripname : : "$1" -+ func_to_host_path_tmp1=$func_stripname_result -+ func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" -+ func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" -+ func_to_host_path_result="$func_cygpath_result" -+ func_convert_path_check : : \ -+ "$func_to_host_path_tmp1" "$func_to_host_path_result" -+ func_convert_path_front_back_pathsep ":*" "*:" : "$1" -+ fi -+} -+# end func_convert_path_nix_to_cygwin -+ -+ - # func_mode_compile arg... - func_mode_compile () - { -@@ -1137,12 +1985,12 @@ func_mode_compile () - ;; - - -pie | -fpie | -fPIE) -- pie_flag="$pie_flag $arg" -+ func_append pie_flag " $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) -- later="$later $arg" -+ func_append later " $arg" - continue - ;; - -@@ -1163,15 +2011,14 @@ func_mode_compile () - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" -- func_quote_for_eval "$arg" -- lastarg="$lastarg $func_quote_for_eval_result" -+ func_append_quoted lastarg "$arg" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. -- base_compile="$base_compile $lastarg" -+ func_append base_compile " $lastarg" - continue - ;; - -@@ -1187,8 +2034,7 @@ func_mode_compile () - esac # case $arg_mode - - # Aesthetically quote the previous argument. -- func_quote_for_eval "$lastarg" -- base_compile="$base_compile $func_quote_for_eval_result" -+ func_append_quoted base_compile "$lastarg" - done # for arg - - case $arg_mode in -@@ -1213,7 +2059,7 @@ func_mode_compile () - *.[cCFSifmso] | \ - *.ada | *.adb | *.ads | *.asm | \ - *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ -- *.[fF][09]? | *.for | *.java | *.obj | *.sx) -+ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) - func_xform "$libobj" - libobj=$func_xform_result - ;; -@@ -1288,7 +2134,7 @@ func_mode_compile () - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then -- output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} -+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - else - output_obj= -@@ -1319,17 +2165,16 @@ compiler." - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi -- removelist="$removelist $output_obj" -+ func_append removelist " $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist -- removelist="$removelist $lockfile" -+ func_append removelist " $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - -- if test -n "$fix_srcfile_path"; then -- eval srcfile=\"$fix_srcfile_path\" -- fi -+ func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 -+ srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - -@@ -1349,7 +2194,7 @@ compiler." - - if test -z "$output_obj"; then - # Place PIC objects in $objdir -- command="$command -o $lobj" -+ func_append command " -o $lobj" - fi - - func_show_eval_locale "$command" \ -@@ -1396,11 +2241,11 @@ compiler." - command="$base_compile $qsrcfile $pic_flag" - fi - if test "$compiler_c_o" = yes; then -- command="$command -o $obj" -+ func_append command " -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. -- command="$command$suppress_output" -+ func_append command "$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - -@@ -1445,13 +2290,13 @@ compiler." - } - - $opt_help || { --test "$mode" = compile && func_mode_compile ${1+"$@"} -+ test "$opt_mode" = compile && func_mode_compile ${1+"$@"} - } - - func_mode_help () - { - # We need to display help for each of the modes. -- case $mode in -+ case $opt_mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. -@@ -1482,10 +2327,11 @@ This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes -- -prefer-pic try to building PIC objects only -- -prefer-non-pic try to building non-PIC objects only -+ -prefer-pic try to build PIC objects only -+ -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking -+ -Wc,FLAG pass FLAG directly to the compiler - - COMPILE-COMMAND is a command to be used in creating a \`standard' object file - from the given SOURCEFILE. -@@ -1538,7 +2384,7 @@ either the \`install' or \`cp' program. - - The following components of INSTALL-COMMAND are treated specially: - -- -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation -+ -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation - - The rest of the components are interpreted as arguments to that command (only - BSD-compatible install options are recognized)." -@@ -1558,6 +2404,8 @@ The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible -+ -bindir BINDIR specify path to binaries directory (for systems where -+ libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -@@ -1586,6 +2434,11 @@ The following components of LINK-COMMAND are treated specially: - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -weak LIBNAME declare that the target provides the LIBNAME interface -+ -Wc,FLAG -+ -Xcompiler FLAG pass linker-specific FLAG directly to the compiler -+ -Wl,FLAG -+ -Xlinker FLAG pass linker-specific FLAG directly to the linker -+ -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) - - All other options (arguments beginning with \`-') are ignored. - -@@ -1619,18 +2472,44 @@ Otherwise, only FILE itself is deleted using RM." - ;; - - *) -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - ;; - esac - -- $ECHO -+ echo - $ECHO "Try \`$progname --help' for more information about other modes." -- -- exit $? - } - -- # Now that we've collected a possible --mode arg, show help if necessary -- $opt_help && func_mode_help -+# Now that we've collected a possible --mode arg, show help if necessary -+if $opt_help; then -+ if test "$opt_help" = :; then -+ func_mode_help -+ else -+ { -+ func_help noexit -+ for opt_mode in compile link execute install finish uninstall clean; do -+ func_mode_help -+ done -+ } | sed -n '1p; 2,$s/^Usage:/ or: /p' -+ { -+ func_help noexit -+ for opt_mode in compile link execute install finish uninstall clean; do -+ echo -+ func_mode_help -+ done -+ } | -+ sed '1d -+ /^When reporting/,/^Report/{ -+ H -+ d -+ } -+ $x -+ /information about other modes/d -+ /more detailed .*MODE/d -+ s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' -+ fi -+ exit $? -+fi - - - # func_mode_execute arg... -@@ -1643,13 +2522,16 @@ func_mode_execute () - func_fatal_help "you must specify a COMMAND" - - # Handle -dlopen flags immediately. -- for file in $execute_dlfiles; do -+ for file in $opt_dlopen; do - test -f "$file" \ - || func_fatal_help "\`$file' is not a file" - - dir= - case $file in - *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" -@@ -1671,7 +2553,7 @@ func_mode_execute () - dir="$func_dirname_result" - - if test -f "$dir/$objdir/$dlname"; then -- dir="$dir/$objdir" -+ func_append dir "/$objdir" - else - if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" -@@ -1712,7 +2594,7 @@ func_mode_execute () - for file - do - case $file in -- -*) ;; -+ -* | *.la | *.lo ) ;; - *) - # Do a test to see if this is really a libtool program. - if func_ltwrapper_script_p "$file"; then -@@ -1728,8 +2610,7 @@ func_mode_execute () - ;; - esac - # Quote arguments (to preserve shell metacharacters). -- func_quote_for_eval "$file" -- args="$args $func_quote_for_eval_result" -+ func_append_quoted args "$file" - done - - if test "X$opt_dry_run" = Xfalse; then -@@ -1754,29 +2635,66 @@ func_mode_execute () - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" -- $ECHO "export $shlibpath_var" -+ echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS - fi - } - --test "$mode" = execute && func_mode_execute ${1+"$@"} -+test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - - # func_mode_finish arg... - func_mode_finish () - { - $opt_debug -- libdirs="$nonopt" -+ libs= -+ libdirs= - admincmds= - -- if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -- for dir -- do -- libdirs="$libdirs $dir" -- done -+ for opt in "$nonopt" ${1+"$@"} -+ do -+ if test -d "$opt"; then -+ func_append libdirs " $opt" -+ -+ elif test -f "$opt"; then -+ if func_lalib_unsafe_p "$opt"; then -+ func_append libs " $opt" -+ else -+ func_warning "\`$opt' is not a valid libtool archive" -+ fi -+ -+ else -+ func_fatal_error "invalid argument \`$opt'" -+ fi -+ done -+ -+ if test -n "$libs"; then -+ if test -n "$lt_sysroot"; then -+ sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` -+ sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" -+ else -+ sysroot_cmd= -+ fi -+ -+ # Remove sysroot references -+ if $opt_dry_run; then -+ for lib in $libs; do -+ echo "removing references to $lt_sysroot and \`=' prefixes from $lib" -+ done -+ else -+ tmpdir=`func_mktempdir` -+ for lib in $libs; do -+ sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ -+ > $tmpdir/tmp-la -+ mv -f $tmpdir/tmp-la $lib -+ done -+ ${RM}r "$tmpdir" -+ fi -+ fi - -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. -@@ -1786,7 +2704,7 @@ func_mode_finish () - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" -- $opt_dry_run || eval "$cmds" || admincmds="$admincmds -+ $opt_dry_run || eval "$cmds" || func_append admincmds " - $cmds" - fi - done -@@ -1795,53 +2713,55 @@ func_mode_finish () - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - -- $ECHO "X----------------------------------------------------------------------" | $Xsed -- $ECHO "Libraries have been installed in:" -- for libdir in $libdirs; do -- $ECHO " $libdir" -- done -- $ECHO -- $ECHO "If you ever happen to want to link against installed libraries" -- $ECHO "in a given directory, LIBDIR, you must either use libtool, and" -- $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" -- $ECHO "flag during linking and do at least one of the following:" -- if test -n "$shlibpath_var"; then -- $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" -- $ECHO " during execution" -- fi -- if test -n "$runpath_var"; then -- $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" -- $ECHO " during linking" -- fi -- if test -n "$hardcode_libdir_flag_spec"; then -- libdir=LIBDIR -- eval flag=\"$hardcode_libdir_flag_spec\" -+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then -+ echo "----------------------------------------------------------------------" -+ echo "Libraries have been installed in:" -+ for libdir in $libdirs; do -+ $ECHO " $libdir" -+ done -+ echo -+ echo "If you ever happen to want to link against installed libraries" -+ echo "in a given directory, LIBDIR, you must either use libtool, and" -+ echo "specify the full pathname of the library, or use the \`-LLIBDIR'" -+ echo "flag during linking and do at least one of the following:" -+ if test -n "$shlibpath_var"; then -+ echo " - add LIBDIR to the \`$shlibpath_var' environment variable" -+ echo " during execution" -+ fi -+ if test -n "$runpath_var"; then -+ echo " - add LIBDIR to the \`$runpath_var' environment variable" -+ echo " during linking" -+ fi -+ if test -n "$hardcode_libdir_flag_spec"; then -+ libdir=LIBDIR -+ eval flag=\"$hardcode_libdir_flag_spec\" - -- $ECHO " - use the \`$flag' linker flag" -- fi -- if test -n "$admincmds"; then -- $ECHO " - have your system administrator run these commands:$admincmds" -- fi -- if test -f /etc/ld.so.conf; then -- $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -- fi -- $ECHO -+ $ECHO " - use the \`$flag' linker flag" -+ fi -+ if test -n "$admincmds"; then -+ $ECHO " - have your system administrator run these commands:$admincmds" -+ fi -+ if test -f /etc/ld.so.conf; then -+ echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" -+ fi -+ echo - -- $ECHO "See any operating system documentation about shared libraries for" -- case $host in -- solaris2.[6789]|solaris2.1[0-9]) -- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" -- $ECHO "pages." -- ;; -- *) -- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." -- ;; -- esac -- $ECHO "X----------------------------------------------------------------------" | $Xsed -+ echo "See any operating system documentation about shared libraries for" -+ case $host in -+ solaris2.[6789]|solaris2.1[0-9]) -+ echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" -+ echo "pages." -+ ;; -+ *) -+ echo "more information, such as the ld(1) and ld.so(8) manual pages." -+ ;; -+ esac -+ echo "----------------------------------------------------------------------" -+ fi - exit $EXIT_SUCCESS - } - --test "$mode" = finish && func_mode_finish ${1+"$@"} -+test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - - - # func_mode_install arg... -@@ -1852,7 +2772,7 @@ func_mode_install () - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. -- $ECHO "X$nonopt" | $GREP shtool >/dev/null; then -+ case $nonopt in *shtool*) :;; *) false;; esac; then - # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " -@@ -1866,7 +2786,12 @@ func_mode_install () - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" -- install_prog="$install_prog$func_quote_for_eval_result" -+ func_append install_prog "$func_quote_for_eval_result" -+ install_shared_prog=$install_prog -+ case " $install_prog " in -+ *[\\\ /]cp\ *) install_cp=: ;; -+ *) install_cp=false ;; -+ esac - - # We need to accept at least all the BSD install flags. - dest= -@@ -1876,10 +2801,12 @@ func_mode_install () - install_type= - isdir=no - stripme= -+ no_mode=: - for arg - do -+ arg2= - if test -n "$dest"; then -- files="$files $dest" -+ func_append files " $dest" - dest=$arg - continue - fi -@@ -1887,10 +2814,9 @@ func_mode_install () - case $arg in - -d) isdir=yes ;; - -f) -- case " $install_prog " in -- *[\\\ /]cp\ *) ;; -- *) prev=$arg ;; -- esac -+ if $install_cp; then :; else -+ prev=$arg -+ fi - ;; - -g | -m | -o) - prev=$arg -@@ -1904,6 +2830,10 @@ func_mode_install () - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then -+ if test "x$prev" = x-m && test -n "$install_override_mode"; then -+ arg2=$install_override_mode -+ no_mode=false -+ fi - prev= - else - dest=$arg -@@ -1914,7 +2844,11 @@ func_mode_install () - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" -- install_prog="$install_prog $func_quote_for_eval_result" -+ func_append install_prog " $func_quote_for_eval_result" -+ if test -n "$arg2"; then -+ func_quote_for_eval "$arg2" -+ fi -+ func_append install_shared_prog " $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ -@@ -1923,6 +2857,13 @@ func_mode_install () - test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" - -+ if test -n "$install_override_mode" && $no_mode; then -+ if $install_cp; then :; else -+ func_quote_for_eval "$install_override_mode" -+ func_append install_shared_prog " -m $func_quote_for_eval_result" -+ fi -+ fi -+ - if test -z "$files"; then - if test -z "$dest"; then - func_fatal_help "no file or destination specified" -@@ -1977,10 +2918,13 @@ func_mode_install () - case $file in - *.$libext) - # Do the static libraries later. -- staticlibs="$staticlibs $file" -+ func_append staticlibs " $file" - ;; - - *.la) -+ func_resolve_sysroot "$file" -+ file=$func_resolve_sysroot_result -+ - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" -@@ -1994,23 +2938,23 @@ func_mode_install () - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; -- *) current_libdirs="$current_libdirs $libdir" ;; -+ *) func_append current_libdirs " $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; -- *) future_libdirs="$future_libdirs $libdir" ;; -+ *) func_append future_libdirs " $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" -- dir="$dir$objdir" -+ func_append dir "$objdir" - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. -- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` -+ inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that -@@ -2023,9 +2967,9 @@ func_mode_install () - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. -- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` -+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` - else -- relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` -+ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` - fi - - func_warning "relinking \`$file'" -@@ -2043,7 +2987,7 @@ func_mode_install () - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. -- func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ -+ func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ - 'exit $?' - tstripme="$stripme" - case $host_os in -@@ -2083,7 +3027,7 @@ func_mode_install () - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. -- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -+ test -n "$old_library" && func_append staticlibs " $dir/$old_library" - ;; - - *.lo) -@@ -2183,7 +3127,7 @@ func_mode_install () - if test -f "$lib"; then - func_source "$lib" - fi -- libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test -+ libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no -@@ -2202,7 +3146,7 @@ func_mode_install () - file="$func_basename_result" - outputname="$tmpdir/$file" - # Replace the output file specification. -- relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` -+ relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - - $opt_silent || { - func_quote_for_expand "$relink_command" -@@ -2221,7 +3165,7 @@ func_mode_install () - } - else - # Install the binary that we compiled earlier. -- file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` -+ file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - -@@ -2280,7 +3224,7 @@ func_mode_install () - fi - } - --test "$mode" = install && func_mode_install ${1+"$@"} -+test "$opt_mode" = install && func_mode_install ${1+"$@"} - - - # func_generate_dlsyms outputname originator pic_p -@@ -2323,6 +3267,22 @@ func_generate_dlsyms () - extern \"C\" { - #endif - -+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) -+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" -+#endif -+ -+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -+/* DATA imports from DLLs on WIN32 con't be const, because runtime -+ relocations are performed -- see ld's documentation on pseudo-relocs. */ -+# define LT_DLSYM_CONST -+#elif defined(__osf__) -+/* This system does not cope well with relocations in const data. */ -+# define LT_DLSYM_CONST -+#else -+# define LT_DLSYM_CONST const -+#endif -+ - /* External symbol declarations for the compiler. */\ - " - -@@ -2332,10 +3292,11 @@ extern \"C\" { - $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. -- progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` - for progfile in $progfiles; do -- func_verbose "extracting global C symbols from \`$progfile'" -- $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" -+ func_to_tool_file "$progfile" func_convert_file_msys_to_w32 -+ func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" -+ $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then -@@ -2371,7 +3332,7 @@ extern \"C\" { - eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - case $host in -- *cygwin | *mingw* | *cegcc* ) -+ *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; -@@ -2384,10 +3345,52 @@ extern \"C\" { - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - name="$func_basename_result" -- $opt_dry_run || { -- eval '$ECHO ": $name " >> "$nlist"' -- eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" -- } -+ case $host in -+ *cygwin* | *mingw* | *cegcc* ) -+ # if an import library, we need to obtain dlname -+ if func_win32_import_lib_p "$dlprefile"; then -+ func_tr_sh "$dlprefile" -+ eval "curr_lafile=\$libfile_$func_tr_sh_result" -+ dlprefile_dlbasename="" -+ if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then -+ # Use subshell, to avoid clobbering current variable values -+ dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` -+ if test -n "$dlprefile_dlname" ; then -+ func_basename "$dlprefile_dlname" -+ dlprefile_dlbasename="$func_basename_result" -+ else -+ # no lafile. user explicitly requested -dlpreopen <import library>. -+ $sharedlib_from_linklib_cmd "$dlprefile" -+ dlprefile_dlbasename=$sharedlib_from_linklib_result -+ fi -+ fi -+ $opt_dry_run || { -+ if test -n "$dlprefile_dlbasename" ; then -+ eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' -+ else -+ func_warning "Could not compute DLL name from $name" -+ eval '$ECHO ": $name " >> "$nlist"' -+ fi -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | -+ $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" -+ } -+ else # not an import lib -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ fi -+ ;; -+ *) -+ $opt_dry_run || { -+ eval '$ECHO ": $name " >> "$nlist"' -+ func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 -+ eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" -+ } -+ ;; -+ esac - done - - $opt_dry_run || { -@@ -2415,36 +3418,19 @@ extern \"C\" { - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' - else -- $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" -+ echo '/* NONE */' >> "$output_objdir/$my_dlsyms" - fi - -- $ECHO >> "$output_objdir/$my_dlsyms" "\ -+ echo >> "$output_objdir/$my_dlsyms" "\ - - /* The mapping between symbol names and symbols. */ - typedef struct { - const char *name; - void *address; - } lt_dlsymlist; --" -- case $host in -- *cygwin* | *mingw* | *cegcc* ) -- $ECHO >> "$output_objdir/$my_dlsyms" "\ --/* DATA imports from DLLs on WIN32 con't be const, because -- runtime relocations are performed -- see ld's documentation -- on pseudo-relocs. */" -- lt_dlsym_const= ;; -- *osf5*) -- echo >> "$output_objdir/$my_dlsyms" "\ --/* This system does not cope well with relocations in const data */" -- lt_dlsym_const= ;; -- *) -- lt_dlsym_const=const ;; -- esac -- -- $ECHO >> "$output_objdir/$my_dlsyms" "\ --extern $lt_dlsym_const lt_dlsymlist -+extern LT_DLSYM_CONST lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[]; --$lt_dlsym_const lt_dlsymlist -+LT_DLSYM_CONST lt_dlsymlist - lt_${my_prefix}_LTX_preloaded_symbols[] = - {\ - { \"$my_originator\", (void *) 0 }," -@@ -2457,7 +3443,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] = - eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - esac -- $ECHO >> "$output_objdir/$my_dlsyms" "\ -+ echo >> "$output_objdir/$my_dlsyms" "\ - {0, (void *) 0} - }; - -@@ -2500,7 +3486,7 @@ static const void *lt_preloaded_setup() { - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; -- *) symtab_cflags="$symtab_cflags $arg" ;; -+ *) func_append symtab_cflags " $arg" ;; - esac - done - -@@ -2515,16 +3501,16 @@ static const void *lt_preloaded_setup() { - case $host in - *cygwin* | *mingw* | *cegcc* ) - if test -f "$output_objdir/$my_outputname.def"; then -- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` -+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - else -- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` -+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - fi - ;; - *) -- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` -+ compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` -+ finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - ;; - esac - ;; -@@ -2538,8 +3524,8 @@ static const void *lt_preloaded_setup() { - # really was required. - - # Nullify the symbol file. -- compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` -- finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` -+ compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` -+ finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` - fi - } - -@@ -2549,6 +3535,7 @@ static const void *lt_preloaded_setup() { - # Need a lot of goo to handle *both* DLLs and import libs - # Has to be a shell function in order to 'eat' the argument - # that is supplied when $file_magic_command is called. -+# Despite the name, also deal with 64 bit binaries. - func_win32_libid () - { - $opt_debug -@@ -2559,9 +3546,11 @@ func_win32_libid () - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static -+ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | -- $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then -- win32_nmres=`eval $NM -f posix -A $1 | -+ $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' - 1,100{ - / I /{ -@@ -2590,6 +3579,131 @@ func_win32_libid () - $ECHO "$win32_libid_type" - } - -+# func_cygming_dll_for_implib ARG -+# -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib () -+{ -+ $opt_debug -+ sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -+} -+ -+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -+# -+# The is the core of a fallback implementation of a -+# platform-specific function to extract the name of the -+# DLL associated with the specified import library LIBNAME. -+# -+# SECTION_NAME is either .idata$6 or .idata$7, depending -+# on the platform and compiler that created the implib. -+# -+# Echos the name of the DLL associated with the -+# specified import library. -+func_cygming_dll_for_implib_fallback_core () -+{ -+ $opt_debug -+ match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` -+ $OBJDUMP -s --section "$1" "$2" 2>/dev/null | -+ $SED '/^Contents of section '"$match_literal"':/{ -+ # Place marker at beginning of archive member dllname section -+ s/.*/====MARK====/ -+ p -+ d -+ } -+ # These lines can sometimes be longer than 43 characters, but -+ # are always uninteresting -+ /:[ ]*file format pe[i]\{,1\}-/d -+ /^In archive [^:]*:/d -+ # Ensure marker is printed -+ /^====MARK====/p -+ # Remove all lines with less than 43 characters -+ /^.\{43\}/!d -+ # From remaining lines, remove first 43 characters -+ s/^.\{43\}//' | -+ $SED -n ' -+ # Join marker and all lines until next marker into a single line -+ /^====MARK====/ b para -+ H -+ $ b para -+ b -+ :para -+ x -+ s/\n//g -+ # Remove the marker -+ s/^====MARK====// -+ # Remove trailing dots and whitespace -+ s/[\. \t]*$// -+ # Print -+ /./p' | -+ # we now have a list, one entry per line, of the stringified -+ # contents of the appropriate section of all members of the -+ # archive which possess that section. Heuristic: eliminate -+ # all those which have a first or second character that is -+ # a '.' (that is, objdump's representation of an unprintable -+ # character.) This should work for all archives with less than -+ # 0x302f exports -- but will fail for DLLs whose name actually -+ # begins with a literal '.' or a single character followed by -+ # a '.'. -+ # -+ # Of those that remain, print the first one. -+ $SED -e '/^\./d;/^.\./d;q' -+} -+ -+# func_cygming_gnu_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is a GNU/binutils-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_gnu_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` -+ test -n "$func_cygming_gnu_implib_tmp" -+} -+ -+# func_cygming_ms_implib_p ARG -+# This predicate returns with zero status (TRUE) if -+# ARG is an MS-style import library. Returns -+# with nonzero status (FALSE) otherwise. -+func_cygming_ms_implib_p () -+{ -+ $opt_debug -+ func_to_tool_file "$1" func_convert_file_msys_to_w32 -+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` -+ test -n "$func_cygming_ms_implib_tmp" -+} -+ -+# func_cygming_dll_for_implib_fallback ARG -+# Platform-specific function to extract the -+# name of the DLL associated with the specified -+# import library ARG. -+# -+# This fallback implementation is for use when $DLLTOOL -+# does not support the --identify-strict option. -+# Invoked by eval'ing the libtool variable -+# $sharedlib_from_linklib_cmd -+# Result is available in the variable -+# $sharedlib_from_linklib_result -+func_cygming_dll_for_implib_fallback () -+{ -+ $opt_debug -+ if func_cygming_gnu_implib_p "$1" ; then -+ # binutils import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` -+ elif func_cygming_ms_implib_p "$1" ; then -+ # ms-generated import library -+ sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` -+ else -+ # unknown -+ sharedlib_from_linklib_result="" -+ fi -+} - - - # func_extract_an_archive dir oldlib -@@ -2598,7 +3712,18 @@ func_extract_an_archive () - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" -- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' -+ if test "$lock_old_archive_extraction" = yes; then -+ lockfile=$f_ex_an_ar_oldlib.lock -+ until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do -+ func_echo "Waiting for $lockfile to be removed" -+ sleep 2 -+ done -+ fi -+ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ -+ 'stat=$?; rm -f "$lockfile"; exit $stat' -+ if test "$lock_old_archive_extraction" = yes; then -+ $opt_dry_run || rm -f "$lockfile" -+ fi - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else -@@ -2669,7 +3794,7 @@ func_extract_archives () - darwin_file= - darwin_files= - for darwin_file in $darwin_filelist; do -- darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` -+ darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ -@@ -2684,25 +3809,30 @@ func_extract_archives () - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac -- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` -+ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" - } - - -- --# func_emit_wrapper_part1 [arg=no] -+# func_emit_wrapper [arg=no] - # --# Emit the first part of a libtool wrapper script on stdout. --# For more information, see the description associated with --# func_emit_wrapper(), below. --func_emit_wrapper_part1 () -+# Emit a libtool wrapper script on stdout. -+# Don't directly open a file because we may want to -+# incorporate the script contents within a cygwin/mingw -+# wrapper executable. Must ONLY be called from within -+# func_mode_link because it depends on a number of variables -+# set therein. -+# -+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -+# variable will take. If 'yes', then the emitted script -+# will assume that the directory in which it is stored is -+# the $objdir directory. This is a cygwin/mingw-specific -+# behavior. -+func_emit_wrapper () - { -- func_emit_wrapper_part1_arg1=no -- if test -n "$1" ; then -- func_emit_wrapper_part1_arg1=$1 -- fi -+ func_emit_wrapper_arg1=${1-no} - - $ECHO "\ - #! $SHELL -@@ -2718,7 +3848,6 @@ func_emit_wrapper_part1 () - - # Sed substitution that helps us do robust quoting. It backslashifies - # metacharacters that are still active within double-quoted strings. --Xsed='${SED} -e 1s/^X//' - sed_quote_subst='$sed_quote_subst' - - # Be Bourne compatible -@@ -2749,31 +3878,132 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then - else - # When we are sourced in execute mode, \$file and \$ECHO are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then -- ECHO=\"$qecho\" -- file=\"\$0\" -- # Make sure echo works. -- if test \"X\$1\" = X--no-reexec; then -- # Discard the --no-reexec flag, and continue. -- shift -- elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then -- # Yippee, \$ECHO works! -- : -- else -- # Restart under the correct shell, and then maybe \$ECHO will work. -- exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} -- fi -- fi\ -+ file=\"\$0\"" -+ -+ qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` -+ $ECHO "\ -+ -+# A function that is used when there is no print builtin or printf. -+func_fallback_echo () -+{ -+ eval 'cat <<_LTECHO_EOF -+\$1 -+_LTECHO_EOF' -+} -+ ECHO=\"$qECHO\" -+ fi -+ -+# Very basic option parsing. These options are (a) specific to -+# the libtool wrapper, (b) are identical between the wrapper -+# /script/ and the wrapper /executable/ which is used only on -+# windows platforms, and (c) all begin with the string "--lt-" -+# (application programs are unlikely to have options which match -+# this pattern). -+# -+# There are only two supported options: --lt-debug and -+# --lt-dump-script. There is, deliberately, no --lt-help. -+# -+# The first argument to this parsing function should be the -+# script's $0 value, followed by "$@". -+lt_option_debug= -+func_parse_lt_options () -+{ -+ lt_script_arg0=\$0 -+ shift -+ for lt_opt -+ do -+ case \"\$lt_opt\" in -+ --lt-debug) lt_option_debug=1 ;; -+ --lt-dump-script) -+ lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` -+ test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. -+ lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` -+ cat \"\$lt_dump_D/\$lt_dump_F\" -+ exit 0 -+ ;; -+ --lt-*) -+ \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 -+ exit 1 -+ ;; -+ esac -+ done -+ -+ # Print the debug banner immediately: -+ if test -n \"\$lt_option_debug\"; then -+ echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 -+ fi -+} -+ -+# Used when --lt-debug. Prints its arguments to stdout -+# (redirection is the responsibility of the caller) -+func_lt_dump_args () -+{ -+ lt_dump_args_N=1; -+ for lt_arg -+ do -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" -+ lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` -+ done -+} -+ -+# Core function for launching the target application -+func_exec_program_core () -+{ - " -- $ECHO "\ -+ case $host in -+ # Backslashes separate directories on plain windows -+ *-*-mingw | *-*-os2* | *-cegcc*) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -+" -+ ;; -+ -+ *) -+ $ECHO "\ -+ if test -n \"\$lt_option_debug\"; then -+ \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 -+ func_lt_dump_args \${1+\"\$@\"} 1>&2 -+ fi -+ exec \"\$progdir/\$program\" \${1+\"\$@\"} -+" -+ ;; -+ esac -+ $ECHO "\ -+ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -+ exit 1 -+} -+ -+# A function to encapsulate launching the target application -+# Strips options in the --lt-* namespace from \$@ and -+# launches target application with the remaining arguments. -+func_exec_program () -+{ -+ for lt_wr_arg -+ do -+ case \$lt_wr_arg in -+ --lt-*) ;; -+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; -+ esac -+ shift -+ done -+ func_exec_program_core \${1+\"\$@\"} -+} -+ -+ # Parse options -+ func_parse_lt_options \"\$0\" \${1+\"\$@\"} - - # Find the directory that this script lives in. -- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` -+ thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. -- file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` -+ file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` - while test -n \"\$file\"; do -- destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` -+ destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then -@@ -2783,30 +4013,13 @@ else - esac - fi - -- file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` -- file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` -+ file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` -+ file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` - done --" --} --# end: func_emit_wrapper_part1 -- --# func_emit_wrapper_part2 [arg=no] --# --# Emit the second part of a libtool wrapper script on stdout. --# For more information, see the description associated with --# func_emit_wrapper(), below. --func_emit_wrapper_part2 () --{ -- func_emit_wrapper_part2_arg1=no -- if test -n "$1" ; then -- func_emit_wrapper_part2_arg1=$1 -- fi -- -- $ECHO "\ - - # Usually 'no', except on cygwin/mingw when embedded into - # the cwrapper. -- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 -+ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 - if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then - # special case for '.' - if test \"\$thisdir\" = \".\"; then -@@ -2814,7 +4027,7 @@ func_emit_wrapper_part2 () - fi - # remove .libs from thisdir - case \"\$thisdir\" in -- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; -+ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; - $objdir ) thisdir=. ;; - esac - fi -@@ -2869,6 +4082,18 @@ func_emit_wrapper_part2 () - - if test -f \"\$progdir/\$program\"; then" - -+ # fixup the dll searchpath if we need to. -+ # -+ # Fix the DLL searchpath if we need to. Do this before prepending -+ # to shlibpath, because on Windows, both are PATH and uninstalled -+ # libraries must come first. -+ if test -n "$dllsearchpath"; then -+ $ECHO "\ -+ # Add the dll search path components to the executable PATH -+ PATH=$dllsearchpath:\$PATH -+" -+ fi -+ - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ -@@ -2877,253 +4102,28 @@ func_emit_wrapper_part2 () - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed -- $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` -+ $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` - - export $shlibpath_var - " - fi - -- # fixup the dll searchpath if we need to. -- if test -n "$dllsearchpath"; then -- $ECHO "\ -- # Add the dll search path components to the executable PATH -- PATH=$dllsearchpath:\$PATH --" -- fi -- - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. --" -- case $host in -- # Backslashes separate directories on plain windows -- *-*-mingw | *-*-os2* | *-cegcc*) -- $ECHO "\ -- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} --" -- ;; -- -- *) -- $ECHO "\ -- exec \"\$progdir/\$program\" \${1+\"\$@\"} --" -- ;; -- esac -- $ECHO "\ -- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 -- exit 1 -+ func_exec_program \${1+\"\$@\"} - fi - else - # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 -- $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 -+ \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi - fi\ - " - } --# end: func_emit_wrapper_part2 -- -- --# func_emit_wrapper [arg=no] --# --# Emit a libtool wrapper script on stdout. --# Don't directly open a file because we may want to --# incorporate the script contents within a cygwin/mingw --# wrapper executable. Must ONLY be called from within --# func_mode_link because it depends on a number of variables --# set therein. --# --# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR --# variable will take. If 'yes', then the emitted script --# will assume that the directory in which it is stored is --# the $objdir directory. This is a cygwin/mingw-specific --# behavior. --func_emit_wrapper () --{ -- func_emit_wrapper_arg1=no -- if test -n "$1" ; then -- func_emit_wrapper_arg1=$1 -- fi -- -- # split this up so that func_emit_cwrapperexe_src -- # can call each part independently. -- func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" -- func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" --} -- -- --# func_to_host_path arg --# --# Convert paths to host format when used with build tools. --# Intended for use with "native" mingw (where libtool itself --# is running under the msys shell), or in the following cross- --# build environments: --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# where wine is equipped with the `winepath' executable. --# In the native mingw case, the (msys) shell automatically --# converts paths for any non-msys applications it launches, --# but that facility isn't available from inside the cwrapper. --# Similar accommodations are necessary for $host mingw and --# $build cygwin. Calling this function does no harm for other --# $host/$build combinations not listed above. --# --# ARG is the path (on $build) that should be converted to --# the proper representation for $host. The result is stored --# in $func_to_host_path_result. --func_to_host_path () --{ -- func_to_host_path_result="$1" -- if test -n "$1" ; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- case $build in -- *mingw* ) # actually, msys -- # awkward: cmd appends spaces to result -- lt_sed_strip_trailing_spaces="s/[ ]*\$//" -- func_to_host_path_tmp1=`( cmd //c echo "$1" |\ -- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` -- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_path_tmp1=`cygpath -w "$1"` -- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # Unfortunately, winepath does not exit with a non-zero -- # error code, so we are forced to check the contents of -- # stdout. On the other hand, if the command is not -- # found, the shell will set an exit code of 127 and print -- # *an error message* to stdout. So we must check for both -- # error code of zero AND non-empty stdout, which explains -- # the odd construction: -- func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` -- if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then -- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -- $SED -e "$lt_sed_naive_backslashify"` -- else -- # Allow warning below. -- func_to_host_path_result="" -- fi -- ;; -- esac -- if test -z "$func_to_host_path_result" ; then -- func_error "Could not determine host path corresponding to" -- func_error " '$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback: -- func_to_host_path_result="$1" -- fi -- ;; -- esac -- fi --} --# end: func_to_host_path - --# func_to_host_pathlist arg --# --# Convert pathlists to host format when used with build tools. --# See func_to_host_path(), above. This function supports the --# following $build/$host combinations (but does no harm for --# combinations not listed here): --# $build $host --# mingw (msys) mingw [e.g. native] --# cygwin mingw --# *nix + wine mingw --# --# Path separators are also converted from $build format to --# $host format. If ARG begins or ends with a path separator --# character, it is preserved (but converted to $host format) --# on output. --# --# ARG is a pathlist (on $build) that should be converted to --# the proper representation on $host. The result is stored --# in $func_to_host_pathlist_result. --func_to_host_pathlist () --{ -- func_to_host_pathlist_result="$1" -- if test -n "$1" ; then -- case $host in -- *mingw* ) -- lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -- # Remove leading and trailing path separator characters from -- # ARG. msys behavior is inconsistent here, cygpath turns them -- # into '.;' and ';.', and winepath ignores them completely. -- func_to_host_pathlist_tmp2="$1" -- # Once set for this call, this variable should not be -- # reassigned. It is used in tha fallback case. -- func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ -- $SED -e 's|^:*||' -e 's|:*$||'` -- case $build in -- *mingw* ) # Actually, msys. -- # Awkward: cmd appends spaces to result. -- lt_sed_strip_trailing_spaces="s/[ ]*\$//" -- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ -- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -- func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- * ) -- # unfortunately, winepath doesn't convert pathlists -- func_to_host_pathlist_result="" -- func_to_host_pathlist_oldIFS=$IFS -- IFS=: -- for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do -- IFS=$func_to_host_pathlist_oldIFS -- if test -n "$func_to_host_pathlist_f" ; then -- func_to_host_path "$func_to_host_pathlist_f" -- if test -n "$func_to_host_path_result" ; then -- if test -z "$func_to_host_pathlist_result" ; then -- func_to_host_pathlist_result="$func_to_host_path_result" -- else -- func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" -- fi -- fi -- fi -- IFS=: -- done -- IFS=$func_to_host_pathlist_oldIFS -- ;; -- esac -- if test -z "$func_to_host_pathlist_result" ; then -- func_error "Could not determine the host path(s) corresponding to" -- func_error " '$1'" -- func_error "Continuing, but uninstalled executables may not work." -- # Fallback. This may break if $1 contains DOS-style drive -- # specifications. The fix is not to complicate the expression -- # below, but for the user to provide a working wine installation -- # with winepath so that path translation in the cross-to-mingw -- # case works properly. -- lt_replace_pathsep_nix_to_dos="s|:|;|g" -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ -- $SED -e "$lt_replace_pathsep_nix_to_dos"` -- fi -- # Now, add the leading and trailing path separators back -- case "$1" in -- :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" -- ;; -- esac -- case "$1" in -- *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" -- ;; -- esac -- ;; -- esac -- fi --} --# end: func_to_host_pathlist - - # func_emit_cwrapperexe_src - # emit the source code for a wrapper executable on stdout -@@ -3141,31 +4141,23 @@ func_emit_cwrapperexe_src () - - This wrapper executable should never be moved out of the build directory. - If it is, it will not operate correctly. -- -- Currently, it simply execs the wrapper *script* "$SHELL $output", -- but could eventually absorb all of the scripts functionality and -- exec $objdir/$outputname directly. - */ - EOF - cat <<"EOF" -+#ifdef _MSC_VER -+# define _CRT_SECURE_NO_DEPRECATE 1 -+#endif - #include <stdio.h> - #include <stdlib.h> - #ifdef _MSC_VER - # include <direct.h> - # include <process.h> - # include <io.h> --# define setmode _setmode - #else - # include <unistd.h> - # include <stdint.h> - # ifdef __CYGWIN__ - # include <io.h> --# define HAVE_SETENV --# ifdef __STRICT_ANSI__ --char *realpath (const char *, char *); --int putenv (char *); --int setenv (const char *, const char *, int); --# endif - # endif - #endif - #include <malloc.h> -@@ -3177,6 +4169,44 @@ int setenv (const char *, const char *, int); - #include <fcntl.h> - #include <sys/stat.h> - -+/* declarations of non-ANSI functions */ -+#if defined(__MINGW32__) -+# ifdef __STRICT_ANSI__ -+int _putenv (const char *); -+# endif -+#elif defined(__CYGWIN__) -+# ifdef __STRICT_ANSI__ -+char *realpath (const char *, char *); -+int putenv (char *); -+int setenv (const char *, const char *, int); -+# endif -+/* #elif defined (other platforms) ... */ -+#endif -+ -+/* portability defines, excluding path handling macros */ -+#if defined(_MSC_VER) -+# define setmode _setmode -+# define stat _stat -+# define chmod _chmod -+# define getcwd _getcwd -+# define putenv _putenv -+# define S_IXUSR _S_IEXEC -+# ifndef _INTPTR_T_DEFINED -+# define _INTPTR_T_DEFINED -+# define intptr_t int -+# endif -+#elif defined(__MINGW32__) -+# define setmode _setmode -+# define stat _stat -+# define chmod _chmod -+# define getcwd _getcwd -+# define putenv _putenv -+#elif defined(__CYGWIN__) -+# define HAVE_SETENV -+# define FOPEN_WB "wb" -+/* #elif defined (other platforms) ... */ -+#endif -+ - #if defined(PATH_MAX) - # define LT_PATHMAX PATH_MAX - #elif defined(MAXPATHLEN) -@@ -3192,14 +4222,7 @@ int setenv (const char *, const char *, int); - # define S_IXGRP 0 - #endif - --#ifdef _MSC_VER --# define S_IXUSR _S_IEXEC --# define stat _stat --# ifndef _INTPTR_T_DEFINED --# define intptr_t int --# endif --#endif -- -+/* path handling portability macros */ - #ifndef DIR_SEPARATOR - # define DIR_SEPARATOR '/' - # define PATH_SEPARATOR ':' -@@ -3230,10 +4253,6 @@ int setenv (const char *, const char *, int); - # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) - #endif /* PATH_SEPARATOR_2 */ - --#ifdef __CYGWIN__ --# define FOPEN_WB "wb" --#endif -- - #ifndef FOPEN_WB - # define FOPEN_WB "w" - #endif -@@ -3246,22 +4265,13 @@ int setenv (const char *, const char *, int); - if (stale) { free ((void *) stale); stale = 0; } \ - } while (0) - --#undef LTWRAPPER_DEBUGPRINTF --#if defined DEBUGWRAPPER --# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args --static void --ltwrapper_debugprintf (const char *fmt, ...) --{ -- va_list args; -- va_start (args, fmt); -- (void) vfprintf (stderr, fmt, args); -- va_end (args); --} -+#if defined(LT_DEBUGWRAPPER) -+static int lt_debug = 1; - #else --# define LTWRAPPER_DEBUGPRINTF(args) -+static int lt_debug = 0; - #endif - --const char *program_name = NULL; -+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - - void *xmalloc (size_t num); - char *xstrdup (const char *string); -@@ -3271,41 +4281,27 @@ char *chase_symlinks (const char *pathspec); - int make_executable (const char *path); - int check_executable (const char *path); - char *strendzap (char *str, const char *pat); --void lt_fatal (const char *message, ...); -+void lt_debugprintf (const char *file, int line, const char *fmt, ...); -+void lt_fatal (const char *file, int line, const char *message, ...); -+static const char *nonnull (const char *s); -+static const char *nonempty (const char *s); - void lt_setenv (const char *name, const char *value); - char *lt_extend_str (const char *orig_value, const char *add, int to_end); --void lt_opt_process_env_set (const char *arg); --void lt_opt_process_env_prepend (const char *arg); --void lt_opt_process_env_append (const char *arg); --int lt_split_name_value (const char *arg, char** name, char** value); - void lt_update_exe_path (const char *name, const char *value); - void lt_update_lib_path (const char *name, const char *value); -- --static const char *script_text_part1 = -+char **prepare_spawn (char **argv); -+void lt_dump_script (FILE *f); - EOF - -- func_emit_wrapper_part1 yes | -- $SED -e 's/\([\\"]\)/\\\1/g' \ -- -e 's/^/ "/' -e 's/$/\\n"/' -- echo ";" - cat <<EOF -- --static const char *script_text_part2 = --EOF -- func_emit_wrapper_part2 yes | -- $SED -e 's/\([\\"]\)/\\\1/g' \ -- -e 's/^/ "/' -e 's/$/\\n"/' -- echo ";" -- -- cat <<EOF --const char * MAGIC_EXE = "$magic_exe"; -+volatile const char * MAGIC_EXE = "$magic_exe"; - const char * LIB_PATH_VARNAME = "$shlibpath_var"; - EOF - - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then -- func_to_host_pathlist "$temp_rpath" -+ func_to_host_path "$temp_rpath" - cat <<EOF --const char * LIB_PATH_VALUE = "$func_to_host_pathlist_result"; -+const char * LIB_PATH_VALUE = "$func_to_host_path_result"; - EOF - else - cat <<"EOF" -@@ -3314,10 +4310,10 @@ EOF - fi - - if test -n "$dllsearchpath"; then -- func_to_host_pathlist "$dllsearchpath:" -+ func_to_host_path "$dllsearchpath:" - cat <<EOF - const char * EXE_PATH_VARNAME = "PATH"; --const char * EXE_PATH_VALUE = "$func_to_host_pathlist_result"; -+const char * EXE_PATH_VALUE = "$func_to_host_path_result"; - EOF - else - cat <<"EOF" -@@ -3340,24 +4336,10 @@ EOF - cat <<"EOF" - - #define LTWRAPPER_OPTION_PREFIX "--lt-" --#define LTWRAPPER_OPTION_PREFIX_LENGTH 5 - --static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH; - static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX; -- - static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script"; -- --static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7; --static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set"; -- /* argument is putenv-style "foo=bar", value of foo is set to bar */ -- --static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11; --static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend"; -- /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */ -- --static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10; --static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append"; -- /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */ -+static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug"; - - int - main (int argc, char *argv[]) -@@ -3374,10 +4356,13 @@ main (int argc, char *argv[]) - int i; - - program_name = (char *) xstrdup (base_name (argv[0])); -- LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0])); -- LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name)); -+ newargz = XMALLOC (char *, argc + 1); - -- /* very simple arg parsing; don't want to rely on getopt */ -+ /* very simple arg parsing; don't want to rely on getopt -+ * also, copy all non cwrapper options to newargz, except -+ * argz[0], which is handled differently -+ */ -+ newargc=0; - for (i = 1; i < argc; i++) - { - if (strcmp (argv[i], dumpscript_opt) == 0) -@@ -3391,25 +4376,57 @@ EOF - esac - - cat <<"EOF" -- printf ("%s", script_text_part1); -- printf ("%s", script_text_part2); -+ lt_dump_script (stdout); - return 0; - } -+ if (strcmp (argv[i], debug_opt) == 0) -+ { -+ lt_debug = 1; -+ continue; -+ } -+ if (strcmp (argv[i], ltwrapper_option_prefix) == 0) -+ { -+ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX -+ namespace, but it is not one of the ones we know about and -+ have already dealt with, above (inluding dump-script), then -+ report an error. Otherwise, targets might begin to believe -+ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX -+ namespace. The first time any user complains about this, we'll -+ need to make LTWRAPPER_OPTION_PREFIX a configure-time option -+ or a configure.ac-settable value. -+ */ -+ lt_fatal (__FILE__, __LINE__, -+ "unrecognized %s option: '%s'", -+ ltwrapper_option_prefix, argv[i]); -+ } -+ /* otherwise ... */ -+ newargz[++newargc] = xstrdup (argv[i]); - } -+ newargz[++newargc] = NULL; -+ -+EOF -+ cat <<EOF -+ /* The GNU banner must be the first non-error debug message */ -+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n"); -+EOF -+ cat <<"EOF" -+ lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]); -+ lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name); - -- newargz = XMALLOC (char *, argc + 1); - tmp_pathspec = find_executable (argv[0]); - if (tmp_pathspec == NULL) -- lt_fatal ("Couldn't find %s", argv[0]); -- LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n", -- tmp_pathspec)); -+ lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(main) found exe (before symlink chase) at: %s\n", -+ tmp_pathspec); - - actual_cwrapper_path = chase_symlinks (tmp_pathspec); -- LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n", -- actual_cwrapper_path)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(main) found exe (after symlink chase) at: %s\n", -+ actual_cwrapper_path); - XFREE (tmp_pathspec); - -- actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path)); -+ actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path)); - strendzap (actual_cwrapper_path, actual_cwrapper_name); - - /* wrapper name transforms */ -@@ -3427,8 +4444,9 @@ EOF - target_name = tmp_pathspec; - tmp_pathspec = 0; - -- LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n", -- target_name)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(main) libtool target name: %s\n", -+ target_name); - EOF - - cat <<EOF -@@ -3478,80 +4496,19 @@ EOF - - lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */ - lt_setenv ("DUALCASE", "1"); /* for MSK sh */ -- lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); -+ /* Update the DLL searchpath. EXE_PATH_VALUE ($dllsearchpath) must -+ be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath) -+ because on Windows, both *_VARNAMEs are PATH but uninstalled -+ libraries must come first. */ - lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE); -+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE); - -- newargc=0; -- for (i = 1; i < argc; i++) -- { -- if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0) -- { -- if (argv[i][env_set_opt_len] == '=') -- { -- const char *p = argv[i] + env_set_opt_len + 1; -- lt_opt_process_env_set (p); -- } -- else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc) -- { -- lt_opt_process_env_set (argv[++i]); /* don't copy */ -- } -- else -- lt_fatal ("%s missing required argument", env_set_opt); -- continue; -- } -- if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0) -- { -- if (argv[i][env_prepend_opt_len] == '=') -- { -- const char *p = argv[i] + env_prepend_opt_len + 1; -- lt_opt_process_env_prepend (p); -- } -- else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc) -- { -- lt_opt_process_env_prepend (argv[++i]); /* don't copy */ -- } -- else -- lt_fatal ("%s missing required argument", env_prepend_opt); -- continue; -- } -- if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0) -- { -- if (argv[i][env_append_opt_len] == '=') -- { -- const char *p = argv[i] + env_append_opt_len + 1; -- lt_opt_process_env_append (p); -- } -- else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc) -- { -- lt_opt_process_env_append (argv[++i]); /* don't copy */ -- } -- else -- lt_fatal ("%s missing required argument", env_append_opt); -- continue; -- } -- if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0) -- { -- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX -- namespace, but it is not one of the ones we know about and -- have already dealt with, above (inluding dump-script), then -- report an error. Otherwise, targets might begin to believe -- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX -- namespace. The first time any user complains about this, we'll -- need to make LTWRAPPER_OPTION_PREFIX a configure-time option -- or a configure.ac-settable value. -- */ -- lt_fatal ("Unrecognized option in %s namespace: '%s'", -- ltwrapper_option_prefix, argv[i]); -- } -- /* otherwise ... */ -- newargz[++newargc] = xstrdup (argv[i]); -- } -- newargz[++newargc] = NULL; -- -- LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>"))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", -+ nonnull (lt_argv_zero)); - for (i = 0; i < newargc; i++) - { -- LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>"))); -+ lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", -+ i, nonnull (newargz[i])); - } - - EOF -@@ -3560,11 +4517,14 @@ EOF - mingw*) - cat <<"EOF" - /* execv doesn't actually work on mingw as expected on unix */ -+ newargz = prepare_spawn (newargz); - rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); - if (rval == -1) - { - /* failed to start process */ -- LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(main) failed to launch target \"%s\": %s\n", -+ lt_argv_zero, nonnull (strerror (errno))); - return 127; - } - return rval; -@@ -3586,7 +4546,7 @@ xmalloc (size_t num) - { - void *p = (void *) malloc (num); - if (!p) -- lt_fatal ("Memory exhausted"); -+ lt_fatal (__FILE__, __LINE__, "memory exhausted"); - - return p; - } -@@ -3620,8 +4580,8 @@ check_executable (const char *path) - { - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3638,8 +4598,8 @@ make_executable (const char *path) - int rval = 0; - struct stat st; - -- LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", -- path ? (*path ? path : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", -+ nonempty (path)); - if ((!path) || (!*path)) - return 0; - -@@ -3665,8 +4625,8 @@ find_executable (const char *wrapper) - int tmp_len; - char *concat_name; - -- LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", -- wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); -+ lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", -+ nonempty (wrapper)); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; -@@ -3719,7 +4679,8 @@ find_executable (const char *wrapper) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); -@@ -3744,7 +4705,8 @@ find_executable (const char *wrapper) - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) -- lt_fatal ("getcwd failed"); -+ lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", -+ nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); -@@ -3770,8 +4732,9 @@ chase_symlinks (const char *pathspec) - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { -- LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", -- tmp_pathspec)); -+ lt_debugprintf (__FILE__, __LINE__, -+ "checking path component for symlinks: %s\n", -+ tmp_pathspec); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) -@@ -3793,8 +4756,9 @@ chase_symlinks (const char *pathspec) - } - else - { -- char *errstr = strerror (errno); -- lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); -+ lt_fatal (__FILE__, __LINE__, -+ "error accessing file \"%s\": %s", -+ tmp_pathspec, nonnull (strerror (errno))); - } - } - XFREE (tmp_pathspec); -@@ -3807,7 +4771,8 @@ chase_symlinks (const char *pathspec) - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { -- lt_fatal ("Could not follow symlinks for %s", pathspec); -+ lt_fatal (__FILE__, __LINE__, -+ "could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); - #endif -@@ -3833,11 +4798,25 @@ strendzap (char *str, const char *pat) - return str; - } - -+void -+lt_debugprintf (const char *file, int line, const char *fmt, ...) -+{ -+ va_list args; -+ if (lt_debug) -+ { -+ (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); -+ va_start (args, fmt); -+ (void) vfprintf (stderr, fmt, args); -+ va_end (args); -+ } -+} -+ - static void --lt_error_core (int exit_status, const char *mode, -+lt_error_core (int exit_status, const char *file, -+ int line, const char *mode, - const char *message, va_list ap) - { -- fprintf (stderr, "%s: %s: ", program_name, mode); -+ fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - -@@ -3846,20 +4825,32 @@ lt_error_core (int exit_status, const char *mode, - } - - void --lt_fatal (const char *message, ...) -+lt_fatal (const char *file, int line, const char *message, ...) - { - va_list ap; - va_start (ap, message); -- lt_error_core (EXIT_FAILURE, "FATAL", message, ap); -+ lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); - va_end (ap); - } - -+static const char * -+nonnull (const char *s) -+{ -+ return s ? s : "(null)"; -+} -+ -+static const char * -+nonempty (const char *s) -+{ -+ return (s && !*s) ? "(empty)" : nonnull (s); -+} -+ - void - lt_setenv (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", -- (name ? name : "<NULL>"), -- (value ? value : "<NULL>"))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_setenv) setting '%s' to '%s'\n", -+ nonnull (name), nonnull (value)); - { - #ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ -@@ -3904,95 +4895,12 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) - return new_value; - } - --int --lt_split_name_value (const char *arg, char** name, char** value) --{ -- const char *p; -- int len; -- if (!arg || !*arg) -- return 1; -- -- p = strchr (arg, (int)'='); -- -- if (!p) -- return 1; -- -- *value = xstrdup (++p); -- -- len = strlen (arg) - strlen (*value); -- *name = XMALLOC (char, len); -- strncpy (*name, arg, len-1); -- (*name)[len - 1] = '\0'; -- -- return 0; --} -- --void --lt_opt_process_env_set (const char *arg) --{ -- char *name = NULL; -- char *value = NULL; -- -- if (lt_split_name_value (arg, &name, &value) != 0) -- { -- XFREE (name); -- XFREE (value); -- lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); -- } -- -- lt_setenv (name, value); -- XFREE (name); -- XFREE (value); --} -- --void --lt_opt_process_env_prepend (const char *arg) --{ -- char *name = NULL; -- char *value = NULL; -- char *new_value = NULL; -- -- if (lt_split_name_value (arg, &name, &value) != 0) -- { -- XFREE (name); -- XFREE (value); -- lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); -- } -- -- new_value = lt_extend_str (getenv (name), value, 0); -- lt_setenv (name, new_value); -- XFREE (new_value); -- XFREE (name); -- XFREE (value); --} -- --void --lt_opt_process_env_append (const char *arg) --{ -- char *name = NULL; -- char *value = NULL; -- char *new_value = NULL; -- -- if (lt_split_name_value (arg, &name, &value) != 0) -- { -- XFREE (name); -- XFREE (value); -- lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); -- } -- -- new_value = lt_extend_str (getenv (name), value, 1); -- lt_setenv (name, new_value); -- XFREE (new_value); -- XFREE (name); -- XFREE (value); --} -- - void - lt_update_exe_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -- (name ? name : "<NULL>"), -- (value ? value : "<NULL>"))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4011,9 +4919,9 @@ lt_update_exe_path (const char *name, const char *value) - void - lt_update_lib_path (const char *name, const char *value) - { -- LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -- (name ? name : "<NULL>"), -- (value ? value : "<NULL>"))); -+ lt_debugprintf (__FILE__, __LINE__, -+ "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", -+ nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { -@@ -4023,11 +4931,152 @@ lt_update_lib_path (const char *name, const char *value) - } - } - -+EOF -+ case $host_os in -+ mingw*) -+ cat <<"EOF" -+ -+/* Prepares an argument vector before calling spawn(). -+ Note that spawn() does not by itself call the command interpreter -+ (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : -+ ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); -+ GetVersionEx(&v); -+ v.dwPlatformId == VER_PLATFORM_WIN32_NT; -+ }) ? "cmd.exe" : "command.com"). -+ Instead it simply concatenates the arguments, separated by ' ', and calls -+ CreateProcess(). We must quote the arguments since Win32 CreateProcess() -+ interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a -+ special way: -+ - Space and tab are interpreted as delimiters. They are not treated as -+ delimiters if they are surrounded by double quotes: "...". -+ - Unescaped double quotes are removed from the input. Their only effect is -+ that within double quotes, space and tab are treated like normal -+ characters. -+ - Backslashes not followed by double quotes are not special. -+ - But 2*n+1 backslashes followed by a double quote become -+ n backslashes followed by a double quote (n >= 0): -+ \" -> " -+ \\\" -> \" -+ \\\\\" -> \\" -+ */ -+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -+char ** -+prepare_spawn (char **argv) -+{ -+ size_t argc; -+ char **new_argv; -+ size_t i; -+ -+ /* Count number of arguments. */ -+ for (argc = 0; argv[argc] != NULL; argc++) -+ ; -+ -+ /* Allocate new argument vector. */ -+ new_argv = XMALLOC (char *, argc + 1); -+ -+ /* Put quoted arguments into the new argument vector. */ -+ for (i = 0; i < argc; i++) -+ { -+ const char *string = argv[i]; -+ -+ if (string[0] == '\0') -+ new_argv[i] = xstrdup ("\"\""); -+ else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) -+ { -+ int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); -+ size_t length; -+ unsigned int backslashes; -+ const char *s; -+ char *quoted_string; -+ char *p; -+ -+ length = 0; -+ backslashes = 0; -+ if (quote_around) -+ length++; -+ for (s = string; *s != '\0'; s++) -+ { -+ char c = *s; -+ if (c == '"') -+ length += backslashes + 1; -+ length++; -+ if (c == '\\') -+ backslashes++; -+ else -+ backslashes = 0; -+ } -+ if (quote_around) -+ length += backslashes + 1; - -+ quoted_string = XMALLOC (char, length + 1); -+ -+ p = quoted_string; -+ backslashes = 0; -+ if (quote_around) -+ *p++ = '"'; -+ for (s = string; *s != '\0'; s++) -+ { -+ char c = *s; -+ if (c == '"') -+ { -+ unsigned int j; -+ for (j = backslashes + 1; j > 0; j--) -+ *p++ = '\\'; -+ } -+ *p++ = c; -+ if (c == '\\') -+ backslashes++; -+ else -+ backslashes = 0; -+ } -+ if (quote_around) -+ { -+ unsigned int j; -+ for (j = backslashes; j > 0; j--) -+ *p++ = '\\'; -+ *p++ = '"'; -+ } -+ *p = '\0'; -+ -+ new_argv[i] = quoted_string; -+ } -+ else -+ new_argv[i] = (char *) string; -+ } -+ new_argv[argc] = NULL; -+ -+ return new_argv; -+} -+EOF -+ ;; -+ esac -+ -+ cat <<"EOF" -+void lt_dump_script (FILE* f) -+{ -+EOF -+ func_emit_wrapper yes | -+ $SED -e 's/\([\\"]\)/\\\1/g' \ -+ -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' -+ -+ cat <<"EOF" -+} - EOF - } - # end: func_emit_cwrapperexe_src - -+# func_win32_import_lib_p ARG -+# True if ARG is an import lib, as indicated by $file_magic_cmd -+func_win32_import_lib_p () -+{ -+ $opt_debug -+ case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in -+ *import*) : ;; -+ *) false ;; -+ esac -+} -+ - # func_mode_link arg... - func_mode_link () - { -@@ -4072,6 +5121,7 @@ func_mode_link () - new_inherited_linker_flags= - - avoid_version=no -+ bindir= - dlfiles= - dlprefiles= - dlself=no -@@ -4164,6 +5214,11 @@ func_mode_link () - esac - - case $prev in -+ bindir) -+ bindir="$arg" -+ prev= -+ continue -+ ;; - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. -@@ -4195,9 +5250,9 @@ func_mode_link () - ;; - *) - if test "$prev" = dlfiles; then -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $arg" - else -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $arg" - fi - prev= - continue -@@ -4221,7 +5276,7 @@ func_mode_link () - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; -- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later -+ *) func_append deplibs " $qarg.ltframework" # this is fixed later - ;; - esac - ;; -@@ -4240,7 +5295,7 @@ func_mode_link () - moreargs= - for fil in `cat "$save_arg"` - do --# moreargs="$moreargs $fil" -+# func_append moreargs " $fil" - arg=$fil - # A libtool-controlled object. - -@@ -4269,7 +5324,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -4281,7 +5336,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -4351,12 +5406,12 @@ func_mode_link () - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; -- *) rpath="$rpath $arg" ;; -+ *) func_append rpath " $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; -- *) xrpath="$xrpath $arg" ;; -+ *) func_append xrpath " $arg" ;; - esac - fi - prev= -@@ -4368,28 +5423,28 @@ func_mode_link () - continue - ;; - weak) -- weak_libs="$weak_libs $arg" -+ func_append weak_libs " $arg" - prev= - continue - ;; - xcclinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) -- compiler_flags="$compiler_flags $qarg" -+ func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) -- linker_flags="$linker_flags $qarg" -- compiler_flags="$compiler_flags $wl$qarg" -+ func_append linker_flags " $qarg" -+ func_append compiler_flags " $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" -@@ -4425,6 +5480,11 @@ func_mode_link () - continue - ;; - -+ -bindir) -+ prev=bindir -+ continue -+ ;; -+ - -dlopen) - prev=dlfiles - continue -@@ -4475,15 +5535,16 @@ func_mode_link () - ;; - - -L*) -- func_stripname '-L' '' "$arg" -- dir=$func_stripname_result -- if test -z "$dir"; then -+ func_stripname "-L" '' "$arg" -+ if test -z "$func_stripname_result"; then - if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" - else - func_fatal_error "need path for \`-L' option" - fi - fi -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -@@ -4495,24 +5556,30 @@ func_mode_link () - ;; - esac - case "$deplibs " in -- *" -L$dir "*) ;; -+ *" -L$dir "* | *" $arg "*) -+ # Will only happen for absolute or sysroot arguments -+ ;; - *) -- deplibs="$deplibs -L$dir" -- lib_search_path="$lib_search_path $dir" -+ # Preserve sysroot, but never include relative directories -+ case $dir in -+ [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; -+ *) func_append deplibs " -L$dir" ;; -+ esac -+ func_append lib_search_path " $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) -- testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` -+ testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; -- *) dllsearchpath="$dllsearchpath:$dir";; -+ *) func_append dllsearchpath ":$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -4522,7 +5589,7 @@ func_mode_link () - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) - # These systems don't actually have a C or math library (as such) - continue - ;; -@@ -4536,7 +5603,7 @@ func_mode_link () - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) -@@ -4556,7 +5623,7 @@ func_mode_link () - ;; - esac - fi -- deplibs="$deplibs $arg" -+ func_append deplibs " $arg" - continue - ;; - -@@ -4568,8 +5635,8 @@ func_mode_link () - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. -- -model|-arch|-isysroot) -- compiler_flags="$compiler_flags $arg" -+ -model|-arch|-isysroot|--sysroot) -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler -@@ -4577,12 +5644,12 @@ func_mode_link () - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; -+ * ) func_append new_inherited_linker_flags " $arg" ;; - esac - continue - ;; -@@ -4649,13 +5716,17 @@ func_mode_link () - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; -+ =*) -+ func_stripname '=' '' "$dir" -+ dir=$lt_sysroot$func_stripname_result -+ ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - continue - ;; -@@ -4708,8 +5779,8 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $wl$func_quote_for_eval_result" -- compiler_flags="$compiler_flags $func_quote_for_eval_result" -+ func_append arg " $func_quote_for_eval_result" -+ func_append compiler_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4724,9 +5795,9 @@ func_mode_link () - for flag in $args; do - IFS="$save_ifs" - func_quote_for_eval "$flag" -- arg="$arg $wl$func_quote_for_eval_result" -- compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" -- linker_flags="$linker_flags $func_quote_for_eval_result" -+ func_append arg " $wl$func_quote_for_eval_result" -+ func_append compiler_flags " $wl$func_quote_for_eval_result" -+ func_append linker_flags " $func_quote_for_eval_result" - done - IFS="$save_ifs" - func_stripname ' ' '' "$arg" -@@ -4754,23 +5825,27 @@ func_mode_link () - arg="$func_quote_for_eval_result" - ;; - -- # -64, -mips[0-9] enable 64-bit mode on the SGI compiler -- # -r[0-9][0-9]* specifies the processor on the SGI compiler -- # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler -- # +DA*, +DD* enable 64-bit mode on the HP compiler -- # -q* pass through compiler args for the IBM compiler -- # -m*, -t[45]*, -txscale* pass through architecture-specific -- # compiler args for GCC -- # -F/path gives path to uninstalled frameworks, gcc on darwin -- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC -- # @file GCC response files -+ # Flags to be passed through unchanged, with rationale: -+ # -64, -mips[0-9] enable 64-bit mode for the SGI compiler -+ # -r[0-9][0-9]* specify processor for the SGI compiler -+ # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler -+ # +DA*, +DD* enable 64-bit mode for the HP compiler -+ # -q* compiler args for the IBM compiler -+ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC -+ # -F/path path to uninstalled frameworks, gcc on darwin -+ # -p, -pg, --coverage, -fprofile-* profiling flags for GCC -+ # @file GCC response files -+ # -tp=* Portland pgcc target processor selection -+ # --sysroot=* for sysroot support -+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" -- compiler_flags="$compiler_flags $arg" -+ func_append compiler_flags " $arg" - continue - ;; - -@@ -4782,7 +5857,7 @@ func_mode_link () - - *.$objext) - # A standard object. -- objs="$objs $arg" -+ func_append objs " $arg" - ;; - - *.lo) -@@ -4813,7 +5888,7 @@ func_mode_link () - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then -- dlfiles="$dlfiles $pic_object" -+ func_append dlfiles " $pic_object" - prev= - continue - else -@@ -4825,7 +5900,7 @@ func_mode_link () - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. -- dlprefiles="$dlprefiles $pic_object" -+ func_append dlprefiles " $pic_object" - prev= - fi - -@@ -4870,24 +5945,25 @@ func_mode_link () - - *.$libext) - # An archive. -- deplibs="$deplibs $arg" -- old_deplibs="$old_deplibs $arg" -+ func_append deplibs " $arg" -+ func_append old_deplibs " $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - -+ func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. -- dlfiles="$dlfiles $arg" -+ func_append dlfiles " $func_resolve_sysroot_result" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. -- dlprefiles="$dlprefiles $arg" -+ func_append dlprefiles " $func_resolve_sysroot_result" - prev= - else -- deplibs="$deplibs $arg" -+ func_append deplibs " $func_resolve_sysroot_result" - fi - continue - ;; -@@ -4925,7 +6001,7 @@ func_mode_link () - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var -- eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` -+ eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` - else - shlib_search_path= - fi -@@ -4934,6 +6010,8 @@ func_mode_link () - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" -+ func_to_tool_file "$output_objdir/" -+ tool_output_objdir=$func_to_tool_file_result - # Create the object directory. - func_mkdir_p "$output_objdir" - -@@ -4954,12 +6032,12 @@ func_mode_link () - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- libs="$libs $deplib" -+ func_append libs " $deplib" - done - - if test "$linkmode" = lib; then -@@ -4972,9 +6050,9 @@ func_mode_link () - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in -- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; -+ *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; - esac -- pre_post_deps="$pre_post_deps $pre_post_dep" -+ func_append pre_post_deps " $pre_post_dep" - done - fi - pre_post_deps= -@@ -5044,17 +6122,19 @@ func_mode_link () - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= -+ func_resolve_sysroot "$lib" - case $lib in -- *.la) func_source "$lib" ;; -+ *.la) func_source "$func_resolve_sysroot_result" ;; - esac - - # Collect preopened libtool deplibs, except any this library - # has declared as weak libs - for deplib in $dependency_libs; do -- deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` -+ func_basename "$deplib" -+ deplib_base=$func_basename_result - case " $weak_libs " in - *" $deplib_base "*) ;; -- *) deplibs="$deplibs $deplib" ;; -+ *) func_append deplibs " $deplib" ;; - esac - done - done -@@ -5075,11 +6155,11 @@ func_mode_link () - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- compiler_flags="$compiler_flags $deplib" -+ func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5164,7 +6244,7 @@ func_mode_link () - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; -- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; -+ * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi -@@ -5177,7 +6257,8 @@ func_mode_link () - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - prog) - if test "$pass" = conv; then -@@ -5191,7 +6272,8 @@ func_mode_link () - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" -@@ -5202,17 +6284,21 @@ func_mode_link () - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" -- dir=$func_stripname_result -+ func_resolve_sysroot "$func_stripname_result" -+ dir=$func_resolve_sysroot_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; -- *) xrpath="$xrpath $dir" ;; -+ *) func_append xrpath " $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; -- *.la) lib="$deplib" ;; -+ *.la) -+ func_resolve_sysroot "$deplib" -+ lib=$func_resolve_sysroot_result -+ ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" -@@ -5230,7 +6316,7 @@ func_mode_link () - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` -- if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ -+ if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes - fi -@@ -5240,15 +6326,15 @@ func_mode_link () - ;; - esac - if test "$valid_a_lib" != yes; then -- $ECHO -+ echo - $ECHO "*** Warning: Trying to link with static lib archive $deplib." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have" -- $ECHO "*** because the file extensions .$libext of this argument makes me believe" -- $ECHO "*** that it is just a static archive that I should not use here." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because the file extensions .$libext of this argument makes me believe" -+ echo "*** that it is just a static archive that I should not use here." - else -- $ECHO -+ echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" -@@ -5275,11 +6361,11 @@ func_mode_link () - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. -- newdlprefiles="$newdlprefiles $deplib" -+ func_append newdlprefiles " $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else -- newdlfiles="$newdlfiles $deplib" -+ func_append newdlfiles " $deplib" - fi - fi - continue -@@ -5321,20 +6407,20 @@ func_mode_link () - - # Convert "-framework foo" to "foo.ltframework" - if test -n "$inherited_linker_flags"; then -- tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` -+ tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; -- *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; -+ *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; - esac - done - fi -- dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then -- test -n "$dlopen" && dlfiles="$dlfiles $dlopen" -- test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" -+ test -n "$dlopen" && func_append dlfiles " $dlopen" -+ test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - - if test "$pass" = conv; then -@@ -5345,17 +6431,17 @@ func_mode_link () - func_fatal_error "cannot find name of link library for \`$lib'" - fi - # It is a libtool convenience library, so add in its objects. -- convenience="$convenience $ladir/$objdir/$old_library" -- old_convenience="$old_convenience $ladir/$objdir/$old_library" -+ func_append convenience " $ladir/$objdir/$old_library" -+ func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" -@@ -5366,9 +6452,15 @@ func_mode_link () - - # Get the name of the library we link against. - linklib= -- for l in $old_library $library_names; do -- linklib="$l" -- done -+ if test -n "$old_library" && -+ { test "$prefer_static_libs" = yes || -+ test "$prefer_static_libs,$installed" = "built,no"; }; then -+ linklib=$old_library -+ else -+ for l in $old_library $library_names; do -+ linklib="$l" -+ done -+ fi - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi -@@ -5385,9 +6477,9 @@ func_mode_link () - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. -- dlprefiles="$dlprefiles $lib $dependency_libs" -+ func_append dlprefiles " $lib $dependency_libs" - else -- newdlfiles="$newdlfiles $lib" -+ func_append newdlfiles " $lib" - fi - continue - fi # $pass = dlopen -@@ -5409,14 +6501,14 @@ func_mode_link () - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then -- if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then -+ if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else -- dir="$libdir" -- absdir="$libdir" -+ dir="$lt_sysroot$libdir" -+ absdir="$lt_sysroot$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -@@ -5424,12 +6516,12 @@ func_mode_link () - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later -- notinst_path="$notinst_path $abs_ladir" -+ func_append notinst_path " $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" -@@ -5440,20 +6532,46 @@ func_mode_link () - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" - fi -- # Prefer using a static library (so that no silly _DYNAMIC symbols -- # are required to link). -- if test -n "$old_library"; then -- newdlprefiles="$newdlprefiles $dir/$old_library" -- # Keep a list of preopened convenience libraries to check -- # that they are being used correctly in the link pass. -- test -z "$libdir" && \ -- dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" -- # Otherwise, use the dlname, so that lt_dlopen finds it. -- elif test -n "$dlname"; then -- newdlprefiles="$newdlprefiles $dir/$dlname" -- else -- newdlprefiles="$newdlprefiles $dir/$linklib" -- fi -+ case "$host" in -+ # special handling for platforms with PE-DLLs. -+ *cygwin* | *mingw* | *cegcc* ) -+ # Linker will automatically link against shared library if both -+ # static and shared are present. Therefore, ensure we extract -+ # symbols from the import library if a shared library is present -+ # (otherwise, the dlopen module name will be incorrect). We do -+ # this by putting the import library name into $newdlprefiles. -+ # We recover the dlopen module name by 'saving' the la file -+ # name in a special purpose variable, and (later) extracting the -+ # dlname from the la file. -+ if test -n "$dlname"; then -+ func_tr_sh "$dir/$linklib" -+ eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" -+ func_append newdlprefiles " $dir/$linklib" -+ else -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ fi -+ ;; -+ * ) -+ # Prefer using a static library (so that no silly _DYNAMIC symbols -+ # are required to link). -+ if test -n "$old_library"; then -+ func_append newdlprefiles " $dir/$old_library" -+ # Keep a list of preopened convenience libraries to check -+ # that they are being used correctly in the link pass. -+ test -z "$libdir" && \ -+ func_append dlpreconveniencelibs " $dir/$old_library" -+ # Otherwise, use the dlname, so that lt_dlopen finds it. -+ elif test -n "$dlname"; then -+ func_append newdlprefiles " $dir/$dlname" -+ else -+ func_append newdlprefiles " $dir/$linklib" -+ fi -+ ;; -+ esac - fi # $pass = dlpreopen - - if test -z "$libdir"; then -@@ -5471,7 +6589,7 @@ func_mode_link () - - - if test "$linkmode" = prog && test "$pass" != link; then -- newlib_search_path="$newlib_search_path $ladir" -+ func_append newlib_search_path " $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no -@@ -5484,7 +6602,8 @@ func_mode_link () - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" -- newlib_search_path="$newlib_search_path $func_stripname_result" -+ func_resolve_sysroot "$func_stripname_result" -+ func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - esac - # Need to link against all dependency_libs? -@@ -5495,12 +6614,12 @@ func_mode_link () - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi -- if $opt_duplicate_deps ; then -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $deplib" - done # for deplib - continue - fi # $linkmode = prog... -@@ -5515,7 +6634,7 @@ func_mode_link () - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; -- *) temp_rpath="$temp_rpath$absdir:" ;; -+ *) func_append temp_rpath "$absdir:" ;; - esac - fi - -@@ -5527,7 +6646,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5536,7 +6655,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5561,12 +6680,12 @@ func_mode_link () - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then -- notinst_deplibs="$notinst_deplibs $lib" -+ func_append notinst_deplibs " $lib" - need_relink=yes - fi - ;; -@@ -5583,7 +6702,7 @@ func_mode_link () - fi - done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then -- $ECHO -+ echo - if test "$linkmode" = prog; then - $ECHO "*** Warning: Linking the executable $output against the loadable module" - else -@@ -5601,7 +6720,7 @@ func_mode_link () - *) - case "$compile_rpath " in - *" $absdir "*) ;; -- *) compile_rpath="$compile_rpath $absdir" -+ *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac -@@ -5610,7 +6729,7 @@ func_mode_link () - *) - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" -+ *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac -@@ -5664,7 +6783,7 @@ func_mode_link () - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - -- if test "$linkmode" = prog || test "$mode" != relink; then -+ if test "$linkmode" = prog || test "$opt_mode" != relink; then - add_shlibpath= - add_dir= - add= -@@ -5686,9 +6805,9 @@ func_mode_link () - if test "X$dlopenmodule" != "X$lib"; then - $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then -- $ECHO -- $ECHO "*** And there doesn't seem to be a static archive available" -- $ECHO "*** The link will probably fail, sorry" -+ echo -+ echo "*** And there doesn't seem to be a static archive available" -+ echo "*** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi -@@ -5720,7 +6839,7 @@ func_mode_link () - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -5742,7 +6861,7 @@ func_mode_link () - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; -- *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; -+ *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then -@@ -5756,13 +6875,13 @@ func_mode_link () - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - fi - fi - fi - -- if test "$linkmode" = prog || test "$mode" = relink; then -+ if test "$linkmode" = prog || test "$opt_mode" = relink; then - add_shlibpath= - add_dir= - add= -@@ -5776,7 +6895,7 @@ func_mode_link () - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; -- *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; -+ *) func_append finalize_shlibpath "$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then -@@ -5793,7 +6912,7 @@ func_mode_link () - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi -@@ -5828,21 +6947,21 @@ func_mode_link () - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. -- $ECHO -+ echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then -- $ECHO "*** But as you try to build a module library, libtool will still create " -- $ECHO "*** a static module, that should work as long as the dlopening application" -- $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." -+ echo "*** But as you try to build a module library, libtool will still create " -+ echo "*** a static module, that should work as long as the dlopening application" -+ echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then -- $ECHO -- $ECHO "*** However, this would only work if libtool was able to extract symbol" -- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" -- $ECHO "*** not find such a program. So, this module is probably useless." -- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." -+ echo -+ echo "*** However, this would only work if libtool was able to extract symbol" -+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ echo "*** not find such a program. So, this module is probably useless." -+ echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module -@@ -5870,27 +6989,33 @@ func_mode_link () - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; -- *) xrpath="$xrpath $temp_xrpath";; -+ *) func_append xrpath " $temp_xrpath";; - esac;; -- *) temp_deplibs="$temp_deplibs $libdir";; -+ *) func_append temp_deplibs " $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - -- newlib_search_path="$newlib_search_path $absdir" -+ func_append newlib_search_path " $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" -- if $opt_duplicate_deps ; then -+ case $deplib in -+ -L*) func_stripname '-L' '' "$deplib" -+ func_resolve_sysroot "$func_stripname_result";; -+ *) func_resolve_sysroot "$deplib" ;; -+ esac -+ if $opt_preserve_dup_deps ; then - case "$tmp_libs " in -- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -+ *" $func_resolve_sysroot_result "*) -+ func_append specialdeplibs " $func_resolve_sysroot_result" ;; - esac - fi -- tmp_libs="$tmp_libs $deplib" -+ func_append tmp_libs " $func_resolve_sysroot_result" - done - - if test "$link_all_deplibs" != no; then -@@ -5900,8 +7025,10 @@ func_mode_link () - case $deplib in - -L*) path="$deplib" ;; - *.la) -+ func_resolve_sysroot "$deplib" -+ deplib=$func_resolve_sysroot_result - func_dirname "$deplib" "" "." -- dir="$func_dirname_result" -+ dir=$func_dirname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; -@@ -5928,8 +7055,8 @@ func_mode_link () - if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` - fi -- compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -- linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" -+ func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" -+ func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" - path= - fi - fi -@@ -5962,7 +7089,7 @@ func_mode_link () - compile_deplibs="$new_inherited_linker_flags $compile_deplibs" - finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" - else -- compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - fi - fi - dependency_libs="$newdependency_libs" -@@ -5979,7 +7106,7 @@ func_mode_link () - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; -- *) lib_search_path="$lib_search_path $dir" ;; -+ *) func_append lib_search_path " $dir" ;; - esac - done - newlib_search_path= -@@ -6037,10 +7164,10 @@ func_mode_link () - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - ;; -- *) tmp_libs="$tmp_libs $deplib" ;; -+ *) func_append tmp_libs " $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" -@@ -6056,7 +7183,7 @@ func_mode_link () - ;; - esac - if test -n "$i" ; then -- tmp_libs="$tmp_libs $i" -+ func_append tmp_libs " $i" - fi - done - dependency_libs=$tmp_libs -@@ -6097,7 +7224,7 @@ func_mode_link () - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" -- objs="$objs$old_deplibs" -+ func_append objs "$old_deplibs" - ;; - - lib) -@@ -6130,10 +7257,10 @@ func_mode_link () - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" - else -- $ECHO -+ echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" -- libobjs="$libobjs $objs" -+ func_append libobjs " $objs" - fi - fi - -@@ -6198,7 +7325,7 @@ func_mode_link () - age="$number_minor" - revision="$number_revision" - ;; -- freebsd-aout|freebsd-elf|sunos) -+ freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" -@@ -6334,7 +7461,7 @@ func_mode_link () - done - - # Make executables depend on our current version. -- verstring="$verstring:${current}.0" -+ func_append verstring ":${current}.0" - ;; - - qnx) -@@ -6402,10 +7529,10 @@ func_mode_link () - fi - - func_generate_dlsyms "$libname" "$libname" "yes" -- libobjs="$libobjs $symfileobj" -+ func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - -- if test "$mode" != relink; then -+ if test "$opt_mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= -@@ -6421,7 +7548,7 @@ func_mode_link () - continue - fi - fi -- removelist="$removelist $p" -+ func_append removelist " $p" - ;; - *) ;; - esac -@@ -6432,27 +7559,28 @@ func_mode_link () - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then -- oldlibs="$oldlibs $output_objdir/$libname.$libext" -+ func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. -- oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` -+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - #for path in $notinst_path; do -- # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` -- # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` -- # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` -+ # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` -+ # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` -+ # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` - #done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do -- temp_xrpath="$temp_xrpath -R$libdir" -+ func_replace_sysroot "$libdir" -+ func_append temp_xrpath " -R$func_replace_sysroot_result" - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then -@@ -6466,7 +7594,7 @@ func_mode_link () - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; -- *) dlfiles="$dlfiles $lib" ;; -+ *) func_append dlfiles " $lib" ;; - esac - done - -@@ -6476,19 +7604,19 @@ func_mode_link () - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; -- *) dlprefiles="$dlprefiles $lib" ;; -+ *) func_append dlprefiles " $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in -- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) -+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework -- deplibs="$deplibs System.ltframework" -+ func_append deplibs " System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. -@@ -6505,7 +7633,7 @@ func_mode_link () - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -- deplibs="$deplibs -lc" -+ func_append deplibs " -lc" - fi - ;; - esac -@@ -6554,7 +7682,7 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac -@@ -6565,21 +7693,21 @@ EOF - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes -- $ECHO -+ echo - $ECHO "*** Warning: dynamic linker does not accept needed library $i." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which I believe you do not have" -- $ECHO "*** because a test_compile did reveal that the linker did not use it for" -- $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which I believe you do not have" -+ echo "*** because a test_compile did reveal that the linker did not use it for" -+ echo "*** its dynamic dependency list that programs get resolved with at runtime." - fi - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6597,7 +7725,7 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $i "*) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - i="" - ;; - esac -@@ -6608,29 +7736,29 @@ EOF - set dummy $deplib_matches; shift - deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - else - droppeddeps=yes -- $ECHO -+ echo - $ECHO "*** Warning: dynamic linker does not accept needed library $i." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have" -- $ECHO "*** because a test_compile did reveal that the linker did not use this one" -- $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because a test_compile did reveal that the linker did not use this one" -+ echo "*** as a dynamic dependency that programs can get resolved with at runtime." - fi - fi - else - droppeddeps=yes -- $ECHO -+ echo - $ECHO "*** Warning! Library $i is needed by this library but I was not able to" -- $ECHO "*** make it link in! You will probably need to install it or some" -- $ECHO "*** library that it depends on before this library will be fully" -- $ECHO "*** functional. Installing it before continuing would be even better." -+ echo "*** make it link in! You will probably need to install it or some" -+ echo "*** library that it depends on before this library will be fully" -+ echo "*** functional. Installing it before continuing would be even better." - fi - ;; - *) -- newdeplibs="$newdeplibs $i" -+ func_append newdeplibs " $i" - ;; - esac - done -@@ -6647,15 +7775,27 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval "\\$ECHO \"$libname_spec\""` -+ if test -n "$file_magic_glob"; then -+ libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` -+ else -+ libnameglob=$libname -+ fi -+ test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do -- potential_libs=`ls $i/$libname[.-]* 2>/dev/null` -+ if test "$want_nocaseglob" = yes; then -+ shopt -s nocaseglob -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ $nocaseglob -+ else -+ potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` -+ fi - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | -@@ -6672,13 +7812,13 @@ EOF - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; -- *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; -+ *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | - $SED -e 10q | - $EGREP "$file_magic_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6687,12 +7827,12 @@ EOF - fi - if test -n "$a_deplib" ; then - droppeddeps=yes -- $ECHO -+ echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have" -- $ECHO "*** because I did check the linker path looking for a file starting" -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for file magic test)" - else -@@ -6703,7 +7843,7 @@ EOF - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. -@@ -6719,7 +7859,7 @@ EOF - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac -@@ -6730,9 +7870,9 @@ EOF - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test -- if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ -+ if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi -@@ -6741,12 +7881,12 @@ EOF - fi - if test -n "$a_deplib" ; then - droppeddeps=yes -- $ECHO -+ echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." -- $ECHO "*** I have the capability to make that library automatically link in when" -- $ECHO "*** you link to this library. But I can only do this if you have a" -- $ECHO "*** shared version of the library, which you do not appear to have" -- $ECHO "*** because I did check the linker path looking for a file starting" -+ echo "*** I have the capability to make that library automatically link in when" -+ echo "*** you link to this library. But I can only do this if you have a" -+ echo "*** shared version of the library, which you do not appear to have" -+ echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" - else -@@ -6757,32 +7897,32 @@ EOF - ;; - *) - # Add a -L argument. -- newdeplibs="$newdeplibs $a_deplib" -+ func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" -- tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ -- -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` -+ tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' -- tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` -+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` - done - fi -- if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | -- $GREP . >/dev/null; then -- $ECHO -+ case $tmp_deplibs in -+ *[!\ \ ]*) -+ echo - if test "X$deplibs_check_method" = "Xnone"; then -- $ECHO "*** Warning: inter-library dependencies are not supported in this platform." -+ echo "*** Warning: inter-library dependencies are not supported in this platform." - else -- $ECHO "*** Warning: inter-library dependencies are not known to be supported." -+ echo "*** Warning: inter-library dependencies are not known to be supported." - fi -- $ECHO "*** All declared inter-library dependencies are being dropped." -+ echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes -- fi -+ ;; -+ esac - ;; - esac - versuffix=$versuffix_save -@@ -6794,23 +7934,23 @@ EOF - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library with the System framework -- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` -+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then -- $ECHO -- $ECHO "*** Warning: libtool could not satisfy all declared inter-library" -+ echo -+ echo "*** Warning: libtool could not satisfy all declared inter-library" - $ECHO "*** dependencies of module $libname. Therefore, libtool will create" -- $ECHO "*** a static module, that should work as long as the dlopening" -- $ECHO "*** application is linked with the -dlopen flag." -+ echo "*** a static module, that should work as long as the dlopening" -+ echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then -- $ECHO -- $ECHO "*** However, this would only work if libtool was able to extract symbol" -- $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" -- $ECHO "*** not find such a program. So, this module is probably useless." -- $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." -+ echo -+ echo "*** However, this would only work if libtool was able to extract symbol" -+ echo "*** lists from a program, using \`nm' or equivalent, but libtool could" -+ echo "*** not find such a program. So, this module is probably useless." -+ echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" -@@ -6820,16 +7960,16 @@ EOF - build_libtool_libs=no - fi - else -- $ECHO "*** The inter-library dependencies that have been dropped here will be" -- $ECHO "*** automatically added whenever a program is linked with this library" -- $ECHO "*** or is declared to -dlopen it." -+ echo "*** The inter-library dependencies that have been dropped here will be" -+ echo "*** automatically added whenever a program is linked with this library" -+ echo "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then -- $ECHO -- $ECHO "*** Since this library must not contain undefined symbols," -- $ECHO "*** because either the platform does not support them or" -- $ECHO "*** it was explicitly requested with -no-undefined," -- $ECHO "*** libtool will only create a static version of it." -+ echo -+ echo "*** Since this library must not contain undefined symbols," -+ echo "*** because either the platform does not support them or" -+ echo "*** it was explicitly requested with -no-undefined," -+ echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module -@@ -6846,9 +7986,9 @@ EOF - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - case $host in - *-*-darwin*) -- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -- new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -- deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - -@@ -6861,7 +8001,7 @@ EOF - *) - case " $deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -6871,10 +8011,10 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - deplibs="$new_libs" -@@ -6891,10 +8031,12 @@ EOF - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" -- test "$mode" != relink && rpath="$compile_rpath$rpath" -+ test "$opt_mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then -+ func_replace_sysroot "$libdir" -+ libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else -@@ -6903,18 +8045,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" -- dep_rpath="$dep_rpath $flag" -+ func_append dep_rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_apped perm_rpath " $libdir" ;; - esac - fi - done -@@ -6932,7 +8074,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi -@@ -6940,7 +8082,7 @@ EOF - fi - - shlibpath="$finalize_shlibpath" -- test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" -+ test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi -@@ -6966,18 +8108,18 @@ EOF - linknames= - for link - do -- linknames="$linknames $link" -+ func_append linknames " $link" - done - - # Use standard objects if they are pic -- test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` - test "X$libobjs" = "X " && libobjs= - - delfiles= - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" -- delfiles="$delfiles $export_symbols" -+ func_append delfiles " $export_symbols" - fi - - orig_export_symbols= -@@ -7008,13 +8150,45 @@ EOF - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' -- for cmd in $cmds; do -+ for cmd1 in $cmds; do - IFS="$save_ifs" -- eval cmd=\"$cmd\" -- func_len " $cmd" -- len=$func_len_result -- if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then -+ # Take the normal branch if the nm_file_list_spec branch -+ # doesn't work or if tool conversion is not needed. -+ case $nm_file_list_spec~$to_tool_file_cmd in -+ *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) -+ try_normal_branch=yes -+ eval cmd=\"$cmd1\" -+ func_len " $cmd" -+ len=$func_len_result -+ ;; -+ *) -+ try_normal_branch=no -+ ;; -+ esac -+ if test "$try_normal_branch" = yes \ -+ && { test "$len" -lt "$max_cmd_len" \ -+ || test "$max_cmd_len" -le -1; } -+ then -+ func_show_eval "$cmd" 'exit $?' -+ skipped_export=false -+ elif test -n "$nm_file_list_spec"; then -+ func_basename "$output" -+ output_la=$func_basename_result -+ save_libobjs=$libobjs -+ save_output=$output -+ output=${output_objdir}/${output_la}.nm -+ func_to_tool_file "$output" -+ libobjs=$nm_file_list_spec$func_to_tool_file_result -+ func_append delfiles " $output" -+ func_verbose "creating $NM input file list: $output" -+ for obj in $save_libobjs; do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > "$output" -+ eval cmd=\"$cmd1\" - func_show_eval "$cmd" 'exit $?' -+ output=$save_output -+ libobjs=$save_libobjs - skipped_export=false - else - # The command line is too long to execute in one step. -@@ -7036,7 +8210,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then -@@ -7048,7 +8222,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7058,7 +8232,7 @@ EOF - case " $convenience " in - *" $test_deplib "*) ;; - *) -- tmp_deplibs="$tmp_deplibs $test_deplib" -+ func_append tmp_deplibs " $test_deplib" - ;; - esac - done -@@ -7078,21 +8252,21 @@ EOF - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" -- linker_flags="$linker_flags $flag" -+ func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? - fi - -@@ -7137,7 +8311,8 @@ EOF - save_libobjs=$libobjs - fi - save_output=$output -- output_la=`$ECHO "X$output" | $Xsed -e "$basename"` -+ func_basename "$output" -+ output_la=$func_basename_result - - # Clear the reloadable object creation command queue and - # initialize k to one. -@@ -7150,13 +8325,16 @@ EOF - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript - func_verbose "creating GNU ld script: $output" -- $ECHO 'INPUT (' > $output -+ echo 'INPUT (' > $output - for obj in $save_libobjs - do -- $ECHO "$obj" >> $output -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output - done -- $ECHO ')' >> $output -- delfiles="$delfiles $output" -+ echo ')' >> $output -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" -@@ -7170,10 +8348,12 @@ EOF - fi - for obj - do -- $ECHO "$obj" >> $output -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" >> $output - done -- delfiles="$delfiles $output" -- output=$firstobj\"$file_list_spec$output\" -+ func_append delfiles " $output" -+ func_to_tool_file "$output" -+ output=$firstobj\"$file_list_spec$func_to_tool_file_result\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." -@@ -7197,17 +8377,19 @@ EOF - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. -- eval concat_cmds=\"$reload_cmds $objlist $last_robj\" -+ reload_objs=$objlist -+ eval concat_cmds=\"$reload_cmds\" - else - # All subsequent reloadable object files will link in - # the last one created. -- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" -+ reload_objs="$objlist $last_robj" -+ eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 - k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext -- objlist=$obj -+ objlist=" $obj" - func_len " $last_robj" - func_arith $len0 + $func_len_result - len=$func_arith_result -@@ -7217,11 +8399,12 @@ EOF - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ -- eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" -+ reload_objs="$objlist $last_robj" -+ eval concat_cmds=\"\${concat_cmds}$reload_cmds\" - if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi -- delfiles="$delfiles $output" -+ func_append delfiles " $output" - - else - output= -@@ -7255,7 +8438,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7276,7 +8459,7 @@ EOF - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" -- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' -+ $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test -n "$orig_export_symbols"; then -@@ -7288,7 +8471,7 @@ EOF - # global variables. join(1) would be nice here, but unfortunately - # isn't a blessed tool. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter -- delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" -+ func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi -@@ -7329,10 +8512,10 @@ EOF - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- libobjs="$libobjs $func_extract_archives_result" -+ func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - -@@ -7348,7 +8531,7 @@ EOF - lt_exit=$? - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) -@@ -7360,7 +8543,7 @@ EOF - IFS="$save_ifs" - - # Restore the uninstalled library and exit -- if test "$mode" = relink; then -+ if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then -@@ -7441,18 +8624,21 @@ EOF - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" -- reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` -+ reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` - else - gentop="$output_objdir/${obj}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - -+ # If we're not building shared, we need to use non_pic_objs -+ test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" -+ - # Create the old-style object. -- reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test -+ reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - func_execute_cmds "$reload_cmds" 'exit $?' -@@ -7512,8 +8698,8 @@ EOF - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework -- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` -- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` -+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` -+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - -@@ -7524,14 +8710,14 @@ EOF - if test "$tagname" = CXX ; then - case ${MACOSX_DEPLOYMENT_TARGET-10.0} in - 10.[0123]) -- compile_command="$compile_command ${wl}-bind_at_load" -- finalize_command="$finalize_command ${wl}-bind_at_load" -+ func_append compile_command " ${wl}-bind_at_load" -+ func_append finalize_command " ${wl}-bind_at_load" - ;; - esac - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" -- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` -+ compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` -+ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - -@@ -7545,7 +8731,7 @@ EOF - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) -- new_libs="$new_libs -L$path/$objdir" ;; -+ func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac -@@ -7555,17 +8741,17 @@ EOF - -L*) - case " $new_libs " in - *" $deplib "*) ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - ;; -- *) new_libs="$new_libs $deplib" ;; -+ *) func_append new_libs " $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - -- compile_command="$compile_command $compile_deplibs" -- finalize_command="$finalize_command $finalize_deplibs" -+ func_append compile_command " $compile_deplibs" -+ func_append finalize_command " $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. -@@ -7573,7 +8759,7 @@ EOF - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; -- *) finalize_rpath="$finalize_rpath $libdir" ;; -+ *) func_append finalize_rpath " $libdir" ;; - esac - done - fi -@@ -7592,18 +8778,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" -- rpath="$rpath $flag" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; -- *) perm_rpath="$perm_rpath $libdir" ;; -+ *) func_append perm_rpath " $libdir" ;; - esac - fi - case $host in -@@ -7612,12 +8798,12 @@ EOF - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; -- *) dllsearchpath="$dllsearchpath:$libdir";; -+ *) func_append dllsearchpath ":$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; -- *) dllsearchpath="$dllsearchpath:$testbindir";; -+ *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac -@@ -7643,18 +8829,18 @@ EOF - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) -- hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" -+ func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" -- rpath="$rpath $flag" -+ func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; -- *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; -+ *) func_append finalize_perm_rpath " $libdir" ;; - esac - fi - done -@@ -7668,8 +8854,8 @@ EOF - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. -- compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -- finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` -+ compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` -+ finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - fi - - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" -@@ -7681,15 +8867,15 @@ EOF - - wrappers_required=yes - case $host in -+ *cegcc* | *mingw32ce*) -+ # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. -+ wrappers_required=no -+ ;; - *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; -- *cegcc) -- # Disable wrappers for cegcc, we are cross compiling anyway. -- wrappers_required=no -- ;; - *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no -@@ -7698,13 +8884,19 @@ EOF - esac - if test "$wrappers_required" = no; then - # Replace the output file specification. -- compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -+ compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' -@@ -7727,7 +8919,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7735,7 +8927,7 @@ EOF - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do -- rpath="$rpath$dir:" -+ func_append rpath "$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi -@@ -7745,11 +8937,18 @@ EOF - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. -- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' -+ -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - exit $EXIT_SUCCESS - fi - -@@ -7764,7 +8963,7 @@ EOF - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then -- relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` -+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= -@@ -7776,13 +8975,19 @@ EOF - fi - - # Replace the output file specification. -- link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` -+ link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - - func_show_eval "$link_command" 'exit $?' - -+ if test -n "$postlink_cmds"; then -+ func_to_tool_file "$output_objdir/$outputname" -+ postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` -+ func_execute_cmds "$postlink_cmds" 'exit $?' -+ fi -+ - # Now create the wrapper script. - func_verbose "creating $output" - -@@ -7800,18 +9005,7 @@ EOF - fi - done - relink_command="(cd `pwd`; $relink_command)" -- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` -- fi -- -- # Quote $ECHO for shipping. -- if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then -- case $progpath in -- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; -- *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; -- esac -- qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` -- else -- qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` -+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - fi - - # Only actually do things if not in dry run mode. -@@ -7891,7 +9085,7 @@ EOF - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then -- oldobjs="$oldobjs $symfileobj" -+ func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" -@@ -7899,10 +9093,10 @@ EOF - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $addlibs -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # Do each command in the archive commands. -@@ -7913,10 +9107,10 @@ EOF - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles -- oldobjs="$oldobjs $func_extract_archives_result" -+ func_append oldobjs " $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have -@@ -7932,9 +9126,9 @@ EOF - done | sort | sort -uc >/dev/null 2>&1); then - : - else -- $ECHO "copying selected object files to avoid basename conflicts..." -+ echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" -- generated="$generated $gentop" -+ func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= -@@ -7958,9 +9152,9 @@ EOF - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" -- oldobjs="$oldobjs $gentop/$newobj" -+ func_append oldobjs " $gentop/$newobj" - ;; -- *) oldobjs="$oldobjs $obj" ;; -+ *) func_append oldobjs " $obj" ;; - esac - done - fi -@@ -7970,6 +9164,16 @@ EOF - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds -+ elif test -n "$archiver_list_spec"; then -+ func_verbose "using command file archive linking..." -+ for obj in $oldobjs -+ do -+ func_to_tool_file "$obj" -+ $ECHO "$func_to_tool_file_result" -+ done > $output_objdir/$libname.libcmd -+ func_to_tool_file "$output_objdir/$libname.libcmd" -+ oldobjs=" $archiver_list_spec$func_to_tool_file_result" -+ cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." -@@ -8043,7 +9247,7 @@ EOF - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" -- relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` -+ relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi -@@ -8066,9 +9270,19 @@ EOF - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" -- newdependency_libs="$newdependency_libs $libdir/$name" -+ func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" -+ ;; -+ -L*) -+ func_stripname -L '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -L$func_replace_sysroot_result" -+ ;; -+ -R*) -+ func_stripname -R '' "$deplib" -+ func_replace_sysroot "$func_stripname_result" -+ func_append newdependency_libs " -R$func_replace_sysroot_result" - ;; -- *) newdependency_libs="$newdependency_libs $deplib" ;; -+ *) func_append newdependency_libs " $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" -@@ -8082,9 +9296,9 @@ EOF - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlfiles="$newdlfiles $libdir/$name" -+ func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" - ;; -- *) newdlfiles="$newdlfiles $lib" ;; -+ *) func_append newdlfiles " $lib" ;; - esac - done - dlfiles="$newdlfiles" -@@ -8101,7 +9315,7 @@ EOF - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" -- newdlprefiles="$newdlprefiles $libdir/$name" -+ func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" - ;; - esac - done -@@ -8113,7 +9327,7 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlfiles="$newdlfiles $abs" -+ func_append newdlfiles " $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= -@@ -8122,15 +9336,33 @@ EOF - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac -- newdlprefiles="$newdlprefiles $abs" -+ func_append newdlprefiles " $abs" - done - dlprefiles="$newdlprefiles" - fi - $RM $output - # place dlname in correct position for cygwin -+ # In fact, it would be nice if we could use this code for all target -+ # systems that can't hard-code library paths into their executables -+ # and that have no shared library path variable independent of PATH, -+ # but it turns out we can't easily determine that from inspecting -+ # libtool variables, so we have to hard-code the OSs to which it -+ # applies here; at the moment, that means platforms that use the PE -+ # object format with DLL files. See the long comment at the top of -+ # tests/bindir.at for full details. - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in -- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; -+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) -+ # If a -bindir argument was supplied, place the dll there. -+ if test "x$bindir" != x ; -+ then -+ func_relative_path "$install_libdir" "$bindir" -+ tdlname=$func_relative_path_result$dlname -+ else -+ # Otherwise fall back on heuristic. -+ tdlname=../bin/$dlname -+ fi -+ ;; - esac - $ECHO > $output "\ - # $outputname - a libtool library file -@@ -8189,7 +9421,7 @@ relink_command=\"$relink_command\"" - exit $EXIT_SUCCESS - } - --{ test "$mode" = link || test "$mode" = relink; } && -+{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} - - -@@ -8209,9 +9441,9 @@ func_mode_uninstall () - for arg - do - case $arg in -- -f) RM="$RM $arg"; rmforce=yes ;; -- -*) RM="$RM $arg" ;; -- *) files="$files $arg" ;; -+ -f) func_append RM " $arg"; rmforce=yes ;; -+ -*) func_append RM " $arg" ;; -+ *) func_append files " $arg" ;; - esac - done - -@@ -8220,24 +9452,23 @@ func_mode_uninstall () - - rmdirs= - -- origobjdir="$objdir" - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then -- objdir="$origobjdir" -+ odir="$objdir" - else -- objdir="$dir/$origobjdir" -+ odir="$dir/$objdir" - fi - func_basename "$file" - name="$func_basename_result" -- test "$mode" = uninstall && objdir="$dir" -+ test "$opt_mode" = uninstall && odir="$dir" - -- # Remember objdir for removal later, being careful to avoid duplicates -- if test "$mode" = clean; then -+ # Remember odir for removal later, being careful to avoid duplicates -+ if test "$opt_mode" = clean; then - case " $rmdirs " in -- *" $objdir "*) ;; -- *) rmdirs="$rmdirs $objdir" ;; -+ *" $odir "*) ;; -+ *) func_append rmdirs " $odir" ;; - esac - fi - -@@ -8263,18 +9494,17 @@ func_mode_uninstall () - - # Delete the libtool libraries and symlinks. - for n in $library_names; do -- rmfiles="$rmfiles $objdir/$n" -+ func_append rmfiles " $odir/$n" - done -- test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" -+ test -n "$old_library" && func_append rmfiles " $odir/$old_library" - -- case "$mode" in -+ case "$opt_mode" in - clean) -- case " $library_names " in -- # " " in the beginning catches empty $dlname -+ case " $library_names " in - *" $dlname "*) ;; -- *) rmfiles="$rmfiles $objdir/$dlname" ;; -+ *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; - esac -- test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" -+ test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" - ;; - uninstall) - if test -n "$library_names"; then -@@ -8302,19 +9532,19 @@ func_mode_uninstall () - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then -- rmfiles="$rmfiles $dir/$pic_object" -+ func_append rmfiles " $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then -- rmfiles="$rmfiles $dir/$non_pic_object" -+ func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) -- if test "$mode" = clean ; then -+ if test "$opt_mode" = clean ; then - noexename=$name - case $file in - *.exe) -@@ -8324,7 +9554,7 @@ func_mode_uninstall () - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe -- rmfiles="$rmfiles $file" -+ func_append rmfiles " $file" - ;; - esac - # Do a test to see if this is a libtool program. -@@ -8333,7 +9563,7 @@ func_mode_uninstall () - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result -- rmfiles="$rmfiles $func_ltwrapper_scriptname_result" -+ func_append rmfiles " $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename -@@ -8341,12 +9571,12 @@ func_mode_uninstall () - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles -- rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" -+ func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then -- rmfiles="$rmfiles $objdir/lt-$name" -+ func_append rmfiles " $odir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then -- rmfiles="$rmfiles $objdir/lt-${noexename}.c" -+ func_append rmfiles " $odir/lt-${noexename}.c" - fi - fi - fi -@@ -8354,7 +9584,6 @@ func_mode_uninstall () - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done -- objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do -@@ -8366,16 +9595,16 @@ func_mode_uninstall () - exit $exit_status - } - --{ test "$mode" = uninstall || test "$mode" = clean; } && -+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} - --test -z "$mode" && { -+test -z "$opt_mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" - } - - test -z "$exec_cmd" && \ -- func_fatal_help "invalid operation mode \`$mode'" -+ func_fatal_help "invalid operation mode \`$opt_mode'" - - if test -n "$exec_cmd"; then - eval exec "$exec_cmd" --- -cgit diff --git a/extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch b/extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch deleted file mode 100644 index d2b5a2926..000000000 --- a/extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -dur xfce4-sensors-plugin-1.0.0.orig/lib/hddtemp.c xfce4-sensors-plugin-1.0.0/lib/hddtemp.c ---- xfce4-sensors-plugin-1.0.0.orig/lib/hddtemp.c 2010-03-27 16:11:48.000000000 +0100 -+++ xfce4-sensors-plugin-1.0.0/lib/hddtemp.c 2010-11-06 20:50:11.717022222 +0100 -@@ -102,7 +102,7 @@ - if (!notify_is_initted()) - notify_init(PACKAGE); /* NOTIFY_APPNAME */ - -- nn = notify_notification_new (summary, body, icon, NULL); -+ nn = notify_notification_new (summary, body, icon); - /* FIXME: Use channels or propagate private object or use static global variable */ - //notify_notification_add_action (nn, - //"confirmed", -diff -dur xfce4-sensors-plugin-1.0.0.orig/lib/sensors-interface.c xfce4-sensors-plugin-1.0.0/lib/sensors-interface.c ---- xfce4-sensors-plugin-1.0.0.orig/lib/sensors-interface.c 2010-03-27 16:11:48.000000000 +0100 -+++ xfce4-sensors-plugin-1.0.0/lib/sensors-interface.c 2010-11-06 20:50:24.360007993 +0100 -@@ -105,7 +105,7 @@ - if (!notify_is_initted()) - notify_init(PACKAGE); /* NOTIFY_APPNAME */ - -- nn = notify_notification_new(summary, body, icon, NULL); -+ nn = notify_notification_new(summary, body, icon); - notify_notification_show(nn, &error); - #else - DBG("%s\n%s", summary, body); - diff --git a/extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-underlink.patch b/extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-underlink.patch deleted file mode 100644 index 2a19d1d8b..000000000 --- a/extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-underlink.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.am 2011-01-14 15:40:24.065537723 +0000 -+++ xfce4-sensors-plugin-1.0.0/panel-plugin/Makefile.am.new 2011-01-14 15:41:48.248960397 +0000 -@@ -20,6 +20,7 @@ - - xfce4_sensors_plugin_CFLAGS = \ - @LIBXFCE4PANEL_CFLAGS@ \ -+ @LIBXFCEGUI4_CFLAGS@ \ - @PLATFORM_CFLAGS@ \ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - @LIBSENSORS_CFLAGS@ -@@ -30,6 +31,7 @@ - xfce4_sensors_plugin_LDFLAGS = \ - $(top_builddir)/lib/libxfce4sensors.la \ - @LIBXFCE4PANEL_LIBS@ \ -+ @LIBXFCEGUI4_LIBS@ \ - @SOLLIBS@ \ - @LIBSENSORS_LDFLAGS@ \ - @LIBM@ ---- xfce4-sensors-plugin-1.0.0/src/Makefile.am 2009-11-06 11:02:11.000000000 +0000 -+++ xfce4-sensors-plugin-1.0.0/src/Makefile.am.new 2011-01-14 16:19:09.777636193 +0000 -@@ -27,6 +27,7 @@ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - @LIBSENSORS_CFLAGS@ \ - @LIBXFCE4UTIL_CFLAGS@ \ -+ @LIBXFCE4PANEL_CFLAGS@ \ - @LIBXFCEGUI4_CFLAGS@ - - # @GTK_CFLAGS@ \ -@@ -41,6 +42,7 @@ - $(top_builddir)/lib/libxfce4sensors.la \ - @LIBSENSORS_LDFLAGS@ \ - @LIBXFCE4UTIL_LIBS@ \ -+ @LIBXFCE4PANEL_LIBS@ \ - @LIBXFCEGUI4_LIBS@ - - # @GTK_LIBS@ \ diff --git a/extra/xpdf/xpdf-3.00-xfont.patch b/extra/xpdf/xpdf-3.00-xfont.patch deleted file mode 100644 index 50dcec2bb..000000000 --- a/extra/xpdf/xpdf-3.00-xfont.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xpdf-3.00/xpdf/XPDFViewer.cc.orig 2004-10-12 12:24:57.055068037 +0200 -+++ xpdf-3.00/xpdf/XPDFViewer.cc 2004-10-12 12:24:47.707449614 +0200 -@@ -1742,7 +1742,7 @@ - aboutBigFont = - createFontList("-*-times-bold-i-normal--20-*-*-*-*-*-iso8859-1"); - aboutVersionFont = -- createFontList("-*-times-medium-r-normal--16-*-*-*-*-*-iso8859-1"); -+ createFontList("-*-times-medium-r-normal--14-*-*-*-*-*-iso8859-1"); - aboutFixedFont = - createFontList("-*-courier-medium-r-normal--12-*-*-*-*-*-iso8859-1"); - diff --git a/extra/xpdf/xpdf.desktop b/extra/xpdf/xpdf.desktop deleted file mode 100644 index 06830ecda..000000000 --- a/extra/xpdf/xpdf.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Xpdf -Comment=Views Adobe PDF (acrobat) files -Exec=xpdf -Terminal=false -Type=Application -Icon=xpdf -Categories=Office; -MimeType=application/pdf; diff --git a/extra/xpdf/xpdf.install b/extra/xpdf/xpdf.install deleted file mode 100644 index e111ef946..000000000 --- a/extra/xpdf/xpdf.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/gnome-unstable/gdm/2.91_fix_external_program_directories.patch b/gnome-unstable/gdm/2.91_fix_external_program_directories.patch deleted file mode 100644 index 912b5cdae..000000000 --- a/gnome-unstable/gdm/2.91_fix_external_program_directories.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Nur gdm-2.91.91.orig/daemon/gdm-server.c gdm-2.91.91/daemon/gdm-server.c ---- gdm-2.91.91.orig/daemon/gdm-server.c 2011-02-17 19:27:53.000000000 -0800 -+++ gdm-2.91.91/daemon/gdm-server.c 2011-02-27 16:56:51.283347074 -0800 -@@ -131,7 +131,7 @@ - g_return_val_if_fail (GDM_IS_SERVER (server), NULL); - - error = NULL; -- command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s", -+ command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s", - server->priv->display_name); - - g_debug ("GdmServer: Running helper %s", command); -diff -Nur gdm-2.91.91.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in gdm-2.91.91/data/greeter-autostart/gnome-settings-daemon.desktop.in.in ---- gdm-2.91.91.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2011-02-17 19:27:53.000000000 -0800 -+++ gdm-2.91.91/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2011-02-26 08:43:28.700009251 -0800 -@@ -1,8 +1,8 @@ - [Desktop Entry] - Type=Application - _Name=GNOME Settings Daemon --TryExec=@LIBEXECDIR@/gnome-settings-daemon --Exec=@LIBEXECDIR@/gnome-settings-daemon -+TryExec=/usr/bin/gnome-settings-daemon -+Exec=/usr/bin/gnome-settings-daemon - OnlyShowIn=GNOME; - X-GNOME-Autostart-Phase=Initialization - X-GNOME-Autostart-Notify=true -diff -Nur gdm-2.91.91.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in gdm-2.91.91/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in ---- gdm-2.91.91.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in 2011-02-17 19:27:53.000000000 -0800 -+++ gdm-2.91.91/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in 2011-02-26 08:44:06.810009153 -0800 -@@ -1,5 +1,5 @@ - [Desktop Entry] - Type=Application - _Name=PolicyKit Authentication Agent --Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1 -+Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 - OnlyShowIn=GNOME; -diff -Nur gdm-2.91.91.orig/gui/simple-chooser/gdm-chooser-session.c gdm-2.91.91/gui/simple-chooser/gdm-chooser-session.c ---- gdm-2.91.91.orig/gui/simple-chooser/gdm-chooser-session.c 2011-02-17 19:27:53.000000000 -0800 -+++ gdm-2.91.91/gui/simple-chooser/gdm-chooser-session.c 2011-02-26 08:45:01.946675918 -0800 -@@ -131,7 +131,7 @@ - ret = FALSE; - - error = NULL; -- g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error); -+ g_spawn_command_line_async ("/usr/bin/gnome-settings-daemon", &error); - if (error != NULL) { - g_warning ("Error starting settings daemon: %s", error->message); - g_error_free (error); diff --git a/gnome-unstable/gdm/gdm-vt-allocation-hack.patch b/gnome-unstable/gdm/gdm-vt-allocation-hack.patch deleted file mode 100644 index 56fa5a151..000000000 --- a/gnome-unstable/gdm/gdm-vt-allocation-hack.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c -index 39def47..03488fd 100644 ---- a/daemon/gdm-server.c -+++ b/daemon/gdm-server.c -@@ -33,6 +33,8 @@ - #include <grp.h> - #include <signal.h> - #include <sys/resource.h> -+#include <sys/ioctl.h> -+#include <sys/vt.h> - - #include <glib.h> - #include <glib/gi18n.h> -@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server) - return out; - } - -+#ifndef O_NOCTTY -+# define O_NOCTTY 0 -+#endif -+ -+static int -+open_vt (int vtno) -+{ -+ char *vtname; -+ int fd; -+ -+ vtname = g_strdup_printf ("/dev/tty%d", vtno); -+ -+ do { -+ errno = 0; -+ fd = open (vtname, O_RDWR | O_NOCTTY, 0); -+ } while (errno == EINTR); -+ -+ g_free (vtname); -+ return fd; -+} -+ -+static gint -+find_first_probably_free_vt (void) -+{ -+ int fd, fdv; -+ int vtno; -+ unsigned short vtmask; -+ struct vt_stat vtstat; -+ guint v_state; -+ -+ fdv = -1; -+ -+ do { -+ errno = 0; -+ fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0); -+ } while (errno == EINTR); -+ -+ if (fd >= 0) { -+ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) { -+ v_state = vtstat.v_state; -+ } else { -+ close (fd); -+ v_state = 0; -+ fd = -1; -+ } -+ } else { -+ v_state = 0; -+ } -+ -+ if (fd < 0) { -+ do { -+ errno = 0; -+ fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0); -+ } while (errno == EINTR); -+ -+ if (fd >= 0) { -+ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) -+ v_state = vtstat.v_state; -+ } -+ } -+ -+ for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) { -+ /* Is this console in use? */ -+ if (v_state & vtmask) -+ continue; -+ -+ /* No, try to open it */ -+ fdv = open_vt (vtno); -+ if (fdv >= 0) -+ break; -+ -+ /* If we're here, kernel indicated that the console was free, -+ * but we failed to open it. Just go on to higher VTs. */ -+ } -+ -+ if (fdv >= 0) -+ close (fdv); -+ else -+ vtno = -1; -+ -+ if (fd >= 0) -+ close (fd); -+ -+ return vtno; -+} -+ - char * - gdm_server_get_display_device (GdmServer *server) - { -@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer *server, - - if (vtarg != NULL && ! gotvtarg) { - argv[len++] = g_strdup (vtarg); -+ } else if (!query_in_arglist && !gotvtarg) { -+ gint vtnum = find_first_probably_free_vt (); -+ -+ if (vtnum > 0) -+ argv [len++] = g_strdup_printf ("vt%d", vtnum); - } - - argv[len++] = NULL; diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD deleted file mode 100644 index 2007b690b..000000000 --- a/multilib-testing/binutils-multilib/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 54236 2011-08-15 03:34:39Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -pkgname=binutils-multilib -pkgver=2.21.1 -pkgrel=2 -_date=20110627 -pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib" -arch=('x86_64') -url="http://www.gnu.org/software/binutils/" -license=('GPL') -groups=('multilib-devel') -provides=("binutils=$pkgver-$pkgrel") -conflicts=('binutils') -depends=('glibc>=2.14' 'zlib') -makedepends=('dejagnu' 'gcc-multilib') # Make sure we compile this with gcc-multilib -options=('!libtool' '!distcc' '!ccache') -install=binutils.install -source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2) -md5sums=('2face559e80d649ba148e42bb2d1fb0f') - -build() { - cd ${srcdir} - mkdir binutils-build && cd binutils-build - - ${srcdir}/binutils/configure --prefix=/usr \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --enable-shared \ - --enable-64-bit-bfd --enable-multilib - - # check the host environment and makes sure all the necessary tools are available - make configure-host - - make tooldir=${pkgdir}/usr -} - -check() { - cd ${srcdir}/binutils-build - - # do not abort on errors - manually check log files - make -k -j1 check || true -} - -package() { - cd ${srcdir}/binutils-build - make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - - # Add some useful headers - install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include - install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include - - # Rebuild libiberty.a with -fPIC - make -C libiberty clean - make CFLAGS="$CFLAGS -fPIC" -C libiberty - install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib - - # Rebuild libbfd.a with -fPIC - make -C bfd clean - # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API - make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd - install -m644 bfd/libbfd.a ${pkgdir}/usr/lib - - # Remove Windows/Novell specific man pages - rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* - - # Remove these symlinks, they are not ABI stable. - # Programs should compile static to the .a file. - rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so - echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so - echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so -} diff --git a/multilib-testing/binutils-multilib/binutils.install b/multilib-testing/binutils-multilib/binutils.install deleted file mode 100644 index 8bf9f3a47..000000000 --- a/multilib-testing/binutils-multilib/binutils.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD deleted file mode 100644 index 57314eaa5..000000000 --- a/multilib-testing/gcc-multilib/PKGBUILD +++ /dev/null @@ -1,303 +0,0 @@ -# $Id: PKGBUILD 54676 2011-08-23 01:55:41Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: libtool requires rebuilt with each new gcc version - -pkgbase='gcc-multilib' -pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') -pkgver=4.6.1 -pkgrel=4 -_snapshot=4.6-20110819 -_libstdcppmanver=20110814 # Note: check source directory name when updating this -pkgdesc="The GNU Compiler Collection for multilib" -arch=('x86_64') -license=('GPL' 'LGPL' 'FDL' 'custom') -url="http://gcc.gnu.org" -makedepends=('binutils-multilib>=2.21.1' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' - 'lib32-glibc>=2.14') -checkdepends=('dejagnu') -options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 - gcc_pure64.patch - gcc-hash-style-both.patch) -md5sums=('b14d22730f9085eab7fd927039e68d28' - 'ce920d2550ff7e042b9f091d27764d8f' - '22cec272f9cc2801d3cd348feaca888b' - '4df25b623799b148a0703eaeec8fdf3f') - -if [ -n "${_snapshot}" ]; then - _basedir="${srcdir}/gcc-${_snapshot}" -else - _basedir="${srcdir}/gcc-${pkgver}" -fi - -build() { - cd ${_basedir} - - # Do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - patch -Np1 -i ${srcdir}/gcc_pure64.patch - patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch - - echo ${pkgver} > gcc/BASE-VER - - cd ${srcdir} - mkdir gcc-build && cd gcc-build - - ${_basedir}/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --with-bugurl=https://bugs.archlinux.org/ \ - --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ - --enable-shared --enable-threads=posix \ - --with-system-zlib --enable-__cxa_atexit \ - --disable-libunwind-exceptions --enable-clocale=gnu \ - --enable-gnu-unique-object --enable-linker-build-id \ - --with-ppl --enable-cloog-backend=isl \ - --enable-lto --enable-gold --enable-ld=default \ - --enable-plugin --with-plugin-ld=ld.gold \ - --enable-multilib --disable-libssp --disable-libstdcxx-pch \ - --enable-checking=release - make -} - -check() { - cd gcc-build - - # increase stack size to prevent test failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 - ulimit -s 32768 - - # do not abort on error as some are "expected" - make -k check || true - ${_basedir}/contrib/test_summary -} - -package_gcc-libs-multilib() -{ - pkgdesc="Runtime libraries shipped by GCC for multilib" - depends=('glibc>=2.14' "lib32-gcc-libs=$pkgver-$pkgrel") - provides=("gcc-libs=$pkgver-$pkgrel") - conflicts=('gcc-libs') - install=gcc-libs.install - - cd gcc-build - make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src; do - make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install - make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} - - # remove stuff in lib32-gcc-libs - rm -rf ${pkgdir}/usr/lib32 - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_lib32-gcc-libs() -{ - pkgdesc="Runtime libraries shipped by GCC (32-bit)" - depends=('lib32-glibc>=2.14' "gcc-libs>=$pkgver") - - cd gcc-build - make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src; do - make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm ${pkgdir}/usr/lib32/libgfortran.spec - - # remove stuff in gcc-libs-multilib - rm -rf ${pkgdir}/usr/lib - rm -rf ${pkgdir}/usr/share/info - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-multilib() -{ - pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib" - depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.21.1' 'libmpc' 'cloog' 'ppl') - groups=('multilib-devel') - provides=("gcc=$pkgver-$pkgrel") - conflicts=('gcc') - install=gcc.install - - cd gcc-build - - # unfortunately it is much, much easier to install the lot and clean-up the mess... - make -j1 DESTDIR=${pkgdir} install - rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} - rm $pkgdir/usr/lib{,32}/*.so* - rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a - rm $pkgdir/usr/lib{,32}/libgfortran.spec - rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,{,32/}libgfortranbegin.a} - rm -r $pkgdir/usr/lib{,32}/go - rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info - rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 - rm $pkgdir/usr/share/man/man3/ffi* - - # many packages require these symlinks - install -dm755 ${pkgdir}/lib - ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp - ln -sf gcc ${pkgdir}/usr/bin/cc - ln -sf g++ ${pkgdir}/usr/bin/c++ - - # install gengtype for plugin support - install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ - install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ - - # POSIX conformance launcher scripts for c89 and c99 - cat > $pkgdir/usr/bin/c89 <<"EOF" -#!/bin/sh -fl="-std=c89" -for opt; do - case "$opt" in - -ansi|-std=c89|-std=iso9899:1990) fl="";; - -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - cat > $pkgdir/usr/bin/c99 <<"EOF" -#!/bin/sh -fl="-std=c99" -for opt; do - case "$opt" in - -std=c99|-std=iso9899:1999) fl="";; - -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - chmod 755 $pkgdir/usr/bin/c{8,9}9 - - # install the libstdc++ man pages - install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/ - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-fortran-multilib() -{ - pkgdesc="Fortran front-end for GCC for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-fortran=$pkgver-$pkgrel") - conflicts=('gcc-fortran') - install=gcc-fortran.install - - cd gcc-build - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=$pkgdir install-target-libgfortran - make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS - make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} - install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so* - rm ${pkgdir}/usr/share/info/libquadmath.info - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-objc-multilib() -{ - pkgdesc="Objective-C front-end for GCC for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-objc=$pkgver-$pkgrel") - conflicts=('gcc-objc') - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libobjc - install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib{,32}/libobjc.so* - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-objc-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-ada-multilib() -{ - pkgdesc="Ada front-end for GCC (GNAT) for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-ada=$pkgver-$pkgrel") - conflicts=('gcc-ada') - install=gcc-ada.install - - cd gcc-build/gcc - make -j1 DESTDIR=$pkgdir ada.install-{common,info} - install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver - - cd ../$CHOST/32/libada - make -j1 DESTDIR=${pkgdir} INSTALL="install" \ - INSTALL_DATA="install -m644" install-gnatlib - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-go-multilib() -{ - pkgdesc="Go front-end for GCC for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-go=$pkgver-$pkgrel") - conflicts=('gcc-go') - install=gcc-go.install - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libgo - make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} - install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION -} diff --git a/multilib-testing/gcc-multilib/gcc-ada.install b/multilib-testing/gcc-multilib/gcc-ada.install deleted file mode 100644 index df0553a4f..000000000 --- a/multilib-testing/gcc-multilib/gcc-ada.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gnat-style.info gnat_rm.info gnat_ugn.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/multilib-testing/gcc-multilib/gcc-fortran.install b/multilib-testing/gcc-multilib/gcc-fortran.install deleted file mode 100644 index b15d89a97..000000000 --- a/multilib-testing/gcc-multilib/gcc-fortran.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -file="gfortran.info" - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} diff --git a/multilib-testing/gcc-multilib/gcc-go.install b/multilib-testing/gcc-multilib/gcc-go.install deleted file mode 100644 index 7dc50dee5..000000000 --- a/multilib-testing/gcc-multilib/gcc-go.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gccgo.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch b/multilib-testing/gcc-multilib/gcc-hash-style-both.patch deleted file mode 100644 index 8b59f4535..000000000 --- a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000 -@@ -41,7 +41,7 @@ - - #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER - --#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ -+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \ - %{O*:-O3} %{!O*:-O1} \ - %{shared:-shared} \ - %{!shared: \ ---- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000 -+++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000 -@@ -78,7 +78,7 @@ - %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" - - #undef LINK_SPEC --#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ -+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000 -+++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -104,7 +104,7 @@ - { "dynamic_linker", LINUX_DYNAMIC_LINKER } - - #undef LINK_SPEC --#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ -+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ ---- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -64,7 +64,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "\ -+#define LINK_SPEC "--hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000 -+++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000 -@@ -389,11 +389,11 @@ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) - - --#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}" - --#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}" - ---- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000 -+++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000 -@@ -830,7 +830,7 @@ - #define LINUX_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) - --#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER "}}" - ---- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -77,7 +77,7 @@ - - #undef LINK_SPEC - #define LINK_SPEC \ -- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ -+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{static:-static} \ ---- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000 -+++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000 -@@ -113,7 +113,7 @@ - { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ - { "link_arch", LINK_ARCH_SPEC }, - --#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ -+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -121,7 +121,7 @@ - %{static:-static}} \ - " - --#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -193,7 +193,7 @@ - #else /* !SPARC_BI_ARCH */ - - #undef LINK_SPEC --#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ ---- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000 -+++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -74,7 +74,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ -+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ - %{!mno-relax:%{!r:-relax}} \ - %{!shared: \ - %{!static: \ diff --git a/multilib-testing/gcc-multilib/gcc-libs.install b/multilib-testing/gcc-multilib/gcc-libs.install deleted file mode 100644 index 23553b8f0..000000000 --- a/multilib-testing/gcc-multilib/gcc-libs.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -filelist=(libgomp.info libquadmath.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/multilib-testing/gcc-multilib/gcc.install b/multilib-testing/gcc-multilib/gcc.install deleted file mode 100644 index 3407a5e1f..000000000 --- a/multilib-testing/gcc-multilib/gcc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/multilib-testing/gcc-multilib/gcc_pure64.patch b/multilib-testing/gcc-multilib/gcc_pure64.patch deleted file mode 100644 index 8c6b08171..000000000 --- a/multilib-testing/gcc-multilib/gcc_pure64.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h ---- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400 -@@ -49,7 +49,7 @@ - done. */ - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - - #undef LINK_SPEC - #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64 ---- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400 -@@ -6,7 +6,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = ../lib ../lib32 - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD deleted file mode 100644 index 59d2be1b5..000000000 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ /dev/null @@ -1,167 +0,0 @@ -# $Id: PKGBUILD 54235 2011-08-15 03:34:11Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: valgrind requires rebuild with each new glibc version - -_pkgbasename=glibc -pkgname=lib32-$_pkgbasename -pkgver=2.14 -pkgrel=5 -_glibcdate=20110617 -pkgdesc="GNU C Library for multilib" -arch=('x86_64') -url="http://www.gnu.org/software/libc" -license=('GPL' 'LGPL') -depends=("glibc>=$pkgver") -makedepends=('gcc-multilib>=4.6') -options=('!strip' '!emptydirs') -source=(http://mirrors.kernel.org/archlinux/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz - glibc-2.10-dont-build-timezone.patch - glibc-2.10-bz4781.patch - glibc-__i686.patch - glibc-2.12.1-static-shared-getpagesize.patch - glibc-2.12.2-ignore-origin-of-privileged-program.patch - glibc-2.13-futex.patch - glibc-2.14-libdl-crash.patch - #glibc-2.14-fix-resolver-crash-typo.patch - glibc-2.14-revert-4462fad3.patch - glibc-2.14-reexport-rpc-interface.patch - glibc-2.14-reinstall-nis-rpc-headers.patch - lib32-glibc.conf) -md5sums=('e441d745609d93c907b72548ba646dad' - '4dadb9203b69a3210d53514bb46f41c3' - '0c5540efc51c0b93996c51b57a8540ae' - '40cd342e21f71f5e49e32622b25acc52' - 'a3ac6f318d680347bb6e2805d42b73b2' - 'b042647ea7d6f22ad319e12e796bd13e' - '7d0154b7e17ea218c9fa953599d24cc4' - 'cea62cc6b903d222c5f26e05a3c0e0e6' - '46e56492cccb1c9172ed3a235cf43c6c' - 'c5de2a946215d647c8af5432ec4b0da0' - '55febbb72139ac7b65757df085024b83' - '6e052f1cb693d5d3203f50f9d4e8c33b') - -build() { - cd ${srcdir}/glibc - - # timezone data is in separate package (tzdata) - patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781 - patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411 - # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html - patch -Np1 -i ${srcdir}/glibc-__i686.patch - - # http://sourceware.org/bugzilla/show_bug.cgi?id=11929 - # using Fedora "fix" as patch in that bug report causes breakages... - patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch - - # http://www.exploit-db.com/exploits/15274/ - # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch - - # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 - patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch - - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...) - # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html - patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch - - # This fixes the main segfault but not the assert fail (FS#24615) - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 - #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch - # resort to reverting the bad commit completely for the moment - patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch - - # re-export RPC interface until libtirpc is ready as a replacement - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch - - cd ${srcdir} - mkdir glibc-build - cd glibc-build - - export CC="gcc -m32" - - # Hack to fix NPTL issues with Xen, only required on 32bit platforms - export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" - - echo "slibdir=/usr/lib32" >> configparms - - # remove hardening options from CFLAGS for building libraries - CFLAGS=${CFLAGS/-fstack-protector/} - CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} - - ${srcdir}/glibc/configure --prefix=/usr \ - --libdir=/usr/lib32 --libexecdir=/usr/lib32 \ - --with-headers=/usr/include \ - --enable-add-ons=nptl,libidn \ - --enable-kernel=2.6.27 \ - --with-tls --with-__thread \ - --enable-bind-now --without-gd \ - --without-cvs --disable-profile \ - --disable-multi-arch i686-unknown-linux-gnu - - # build libraries with hardening disabled - echo "build-programs=no" >> configparms - make - - # re-enable hardening for programs - sed -i "s#=no#=yes#" configparms - echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms - echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms - make - - # remove harding in preparation to run test-suite - sed -i '2,4d' configparms -} - -check() { - cd ${srcdir}/glibc-build - - # some errors are expected - manually check log files - make -k check || true -} - -package() { - cd ${srcdir}/glibc-build - make install_root=${pkgdir} install - - rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share}} - - # We need one 32 bit specific header file - find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete - - # manually strip files as stripping libpthread-*.so and libthread_db.so - # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks - # valgrind on x86_64 - - cd $pkgdir - strip $STRIP_BINARIES usr/lib32/getconf/* - - strip $STRIP_STATIC usr/lib32/*.a \ - usr/lib32/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so - - strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \ - usr/lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ - usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ - usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \ - usr/lib32/{pt_chown,{audit,gconv}/*.so} - - # Dynamic linker - install -d -m755 ${pkgdir}/lib - ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/lib/ - - # Add /usr/lib32 to the default library search path - install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf" - - # Symlink /usr/lib32/locale to /usr/lib/locale - ln -s ../lib/locale "$pkgdir/usr/lib32/locale" -} diff --git a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch b/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch deleted file mode 100644 index cf1a97a18..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -120,9 +120,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (eip); - /* Note: %esi is zero. */ - movl %esi,%ebp /* terminate the stack frame */ - #ifdef RESET_PID -@@ -155,7 +152,6 @@ - jmp L(haspid) - .previous - #endif -- cfi_endproc; - - cfi_startproc - PSEUDO_END (BP_SYM (__clone)) -diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -89,9 +89,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (rip); - /* Clear the frame pointer. The ABI suggests this be done, to mark - the outermost frame obviously. */ - xorl %ebp, %ebp -@@ -116,7 +113,6 @@ - /* Call exit with return value from function call. */ - movq %rax, %rdi - call HIDDEN_JUMPTARGET (_exit) -- cfi_endproc; - - cfi_startproc; - PSEUDO_END (BP_SYM (__clone)) diff --git a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch b/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch deleted file mode 100644 index d3abeff17..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch +++ /dev/null @@ -1,13 +0,0 @@ -timezone data has been split into the package sys-libs/timezone-data - ---- glibc-2.4/Makeconfig -+++ glibc-2.4/Makeconfig -@@ -931,7 +931,7 @@ - stdlib stdio-common libio malloc string wcsmbs time dirent \ - grp pwd posix io termios resource misc socket sysvipc gmon \ - gnulib iconv iconvdata wctype manual shadow gshadow po argp \ -- crypt nss localedata timezone rt conform debug \ -+ crypt nss localedata rt conform debug \ - $(add-on-subdirs) $(dlfcn) $(binfmt-subdir) - - ifndef avoid-generated diff --git a/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch b/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch deleted file mode 100644 index e84754279..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c -+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c -@@ -28,7 +28,7 @@ - int - __getpagesize () - { --#ifdef __ASSUME_AT_PAGESIZE -+#if 0 && defined __ASSUME_AT_PAGESIZE - assert (GLRO(dl_pagesize) != 0); - return GLRO(dl_pagesize); - #else diff --git a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch deleted file mode 100644 index ce089b49c..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Thu, 9 Dec 2010 15:00:59 +0100 -Subject: [PATCH 1/1] Ignore origin of privileged program - ---- - ChangeLog | 5 +++++ - elf/dl-object.c | 3 +++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/elf/dl-object.c b/elf/dl-object.c -index 22a1635..7674d49 100644 ---- a/elf/dl-object.c -+++ b/elf/dl-object.c -@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type, - out: - new->l_origin = origin; - } -+ else if (INTUSE(__libc_enable_secure) && type == lt_executable) -+ /* The origin of a privileged program cannot be trusted. */ -+ new->l_origin = (char *) -1; - - return new; - } --- -1.7.2 diff --git a/multilib-testing/lib32-glibc/glibc-2.13-futex.patch b/multilib-testing/lib32-glibc/glibc-2.13-futex.patch deleted file mode 100644 index 9b9c3ac45..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.13-futex.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S -+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S -@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: - cfi_restore(%r12) - retq - --#ifdef __ASSUME_PRIVATE_FUTEX -+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME - cfi_adjust_cfa_offset(16) - cfi_rel_offset(%r12, 8) - cfi_rel_offset(%r13, 0) ---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S -+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S -@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: - - 7: movq %rdx, %rax - --#ifndef __ASSUME_PRIVATE_FUTEX -+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME - addq $16, %rsp - cfi_adjust_cfa_offset(-16) - popq %r14 -@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: - cfi_restore(%r12) - retq - --#ifdef __ASSUME_PRIVATE_FUTEX -+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME - cfi_adjust_cfa_offset(16) - cfi_rel_offset(%r12, 8) - cfi_rel_offset(%r13, 0) diff --git a/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch b/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch deleted file mode 100644 index b5d86c7d2..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/resolv/res_send.c b/resolv/res_send.c -index 97142b7..a001c1e 100644 ---- a/resolv/res_send.c -+++ b/resolv/res_send.c -@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ns, ansp, ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) - goto next_ns; - } else { - /* Use datagrams. */ -@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) - goto next_ns; - if (v_circuit) - // XXX Check whether both requests failed or diff --git a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch b/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch deleted file mode 100644 index ee29f8c20..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff --git a/elf/dl-close.c b/elf/dl-close.c -index 73b2a2f..9bd91e3 100644 ---- a/elf/dl-close.c -+++ b/elf/dl-close.c -@@ -1,5 +1,5 @@ - /* Close a shared object opened by `_dl_open'. -- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) - if (map->l_direct_opencount > 0 || map->l_type != lt_loaded - || dl_close_state != not_pending) - { -- if (map->l_direct_opencount == 0) -- { -- if (map->l_type == lt_loaded) -- dl_close_state = rerun; -- else if (map->l_type == lt_library) -- { -- struct link_map **oldp = map->l_initfini; -- map->l_initfini = map->l_orig_initfini; -- _dl_scope_free (oldp); -- } -- } -+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) -+ dl_close_state = rerun; - - /* There are still references to this object. Do nothing more. */ - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) -diff --git a/elf/dl-deps.c b/elf/dl-deps.c -index 9e30594..3890d00 100644 ---- a/elf/dl-deps.c -+++ b/elf/dl-deps.c -@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, - nneeded * sizeof needed[0]); - atomic_write_barrier (); - l->l_initfini = l_initfini; -+ l->l_free_initfini = 1; - } - - /* If we have no auxiliary objects just go on to the next map. */ -@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING")); - l_initfini[nlist] = NULL; - atomic_write_barrier (); - map->l_initfini = l_initfini; -+ map->l_free_initfini = 1; - if (l_reldeps != NULL) - { - atomic_write_barrier (); -@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING")); - _dl_scope_free (old_l_reldeps); - } - if (old_l_initfini != NULL) -- map->l_orig_initfini = old_l_initfini; -+ _dl_scope_free (old_l_initfini); - } -diff --git a/elf/dl-libc.c b/elf/dl-libc.c -index 7be9483..a13fce3 100644 ---- a/elf/dl-libc.c -+++ b/elf/dl-libc.c -@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) - - for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) - { -- /* Remove all additional names added to the objects. */ - for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next) - { - struct libname_list *lnp = l->l_libname->next; - - l->l_libname->next = NULL; - -+ /* Remove all additional names added to the objects. */ - while (lnp != NULL) - { - struct libname_list *old = lnp; -@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem) - if (! old->dont_free) - free (old); - } -+ -+ /* Free the initfini dependency list. */ -+ if (l->l_free_initfini) -+ free (l->l_initfini); - } - - if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 -diff --git a/elf/rtld.c b/elf/rtld.c -index 4a9109e..617e30e 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - lnp->dont_free = 1; - lnp = lnp->next; - } -+ l->l_free_initfini = 0; - - if (l != &GL(dl_rtld_map)) - _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, -diff --git a/include/link.h b/include/link.h -index e877104..051b99a 100644 ---- a/include/link.h -+++ b/include/link.h -@@ -1,6 +1,6 @@ - /* Data structure for communication from the run-time dynamic linker for - loaded ELF shared objects. -- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -192,6 +192,9 @@ struct link_map - during LD_TRACE_PRELINKING=1 - contains any DT_SYMBOLIC - libraries. */ -+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be -+ freed, ie. not allocated with -+ the dummy malloc in ld.so. */ - - /* Collected information about own RPATH directories. */ - struct r_search_path_struct l_rpath_dirs; -@@ -240,9 +243,6 @@ struct link_map - - /* List of object in order of the init and fini calls. */ - struct link_map **l_initfini; -- /* The init and fini list generated at startup, saved when the -- object is also loaded dynamically. */ -- struct link_map **l_orig_initfini; - - /* List of the dependencies introduced through symbol binding. */ - struct link_map_reldeps diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch b/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch deleted file mode 100644 index e2beea881..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/include/libc-symbols.h b/include/libc-symbols.h -index 67e1ca2..5e7cca5 100644 ---- a/include/libc-symbols.h -+++ b/include/libc-symbols.h -@@ -635,7 +635,7 @@ for linking") - # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) - # define libc_hidden_def(name) hidden_def (name) - # define libc_hidden_weak(name) hidden_weak (name) --# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) -+# define libc_hidden_nolink(name, version) hidden_def (name) - # define libc_hidden_ver(local, name) hidden_ver (local, name) - # define libc_hidden_data_def(name) hidden_data_def (name) - # define libc_hidden_data_weak(name) hidden_data_weak (name) -diff --git a/sunrpc/Makefile b/sunrpc/Makefile -index 5134ce9..40c73d1 100644 ---- a/sunrpc/Makefile -+++ b/sunrpc/Makefile -@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ - des_crypt.h) - headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ - $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h --headers = rpc/netdb.h -+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc) - install-others = $(inst_sysconfdir)/rpc - generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ - $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch deleted file mode 100644 index eb0fd822d..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Tue, 17 May 2011 17:42:30 +0200 -Subject: [PATCH] Reinstall NIS RPC headers - ---- - nis/Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nis/Makefile b/nis/Makefile -index b5c9609..d2934d9 100644 ---- a/nis/Makefile -+++ b/nis/Makefile -@@ -23,9 +23,9 @@ subdir := nis - - aux := nis_hash - -+headers := $(wildcard rpcsvc/*.[hx]) - distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ -- nisplus-parser.h nis_xdr.h nss \ -- $(wildcard rpcsvc/*.[hx]) -+ nisplus-parser.h nis_xdr.h nss - - # These are the databases available for the nis (and perhaps later nisplus) - # service. This must be a superset of the services in nss. --- -1.7.5.4 - diff --git a/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch b/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch deleted file mode 100644 index d71e37492..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c ---- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 -+++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 -@@ -549,7 +549,7 @@ - ns, ansp, ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - } else { - /* Use datagrams. */ -@@ -559,7 +559,7 @@ - ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - if (v_circuit) - // XXX Check whether both requests failed or -@@ -1275,14 +1275,10 @@ - (*thisresplenp > *thisanssizp) - ? *thisanssizp : *thisresplenp); - -- if (recvresp1 || (buf2 != NULL && recvresp2)) { -- *resplen2 = 0; -+ if (recvresp1 || (buf2 != NULL && recvresp2)) - return resplen; -- } - if (buf2 != NULL) - { -- /* No data from the first reply. */ -- resplen = 0; - /* We are waiting for a possible second reply. */ - if (hp->id == anhp->id) - recvresp1 = 1; diff --git a/multilib-testing/lib32-glibc/glibc-__i686.patch b/multilib-testing/lib32-glibc/glibc-__i686.patch deleted file mode 100644 index 28d5dd424..000000000 --- a/multilib-testing/lib32-glibc/glibc-__i686.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile ---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 -+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 -@@ -1,6 +1,7 @@ - # The mpn functions need a #define for asm syntax flavor. --# Every i386 port in use uses gas syntax (I think). --asm-CPPFLAGS += -DGAS_SYNTAX -+# Every i386 port in use uses gas syntax (I think). Don't replace -+# __i686 in __i686.get_pc_thunk.bx. -+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 - - # The i386 `long double' is a distinct type we support. - long-double-fcts = yes diff --git a/multilib-testing/lib32-glibc/lib32-glibc.conf b/multilib-testing/lib32-glibc/lib32-glibc.conf deleted file mode 100644 index 9b08c3f43..000000000 --- a/multilib-testing/lib32-glibc/lib32-glibc.conf +++ /dev/null @@ -1 +0,0 @@ -/usr/lib32 diff --git a/multilib-testing/lib32-keyutils/PKGBUILD b/multilib-testing/lib32-keyutils/PKGBUILD deleted file mode 100644 index c77347239..000000000 --- a/multilib-testing/lib32-keyutils/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 116950 2011-03-26 15:07:29Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -_pkgbasename=keyutils -pkgname=lib32-$_pkgbasename -pkgver=1.5.1 -pkgrel=1 -pkgdesc="Linux Key Management Utilities (32-bit)" -arch=(x86_64) -url="http://www.kernel.org" -license=('GPL2' 'LGPL2.1') -depends=(lib32-glibc $_pkgbasename) -makedepends=(gcc-multilib) -source=(http://people.redhat.com/~dhowells/$_pkgbasename/$_pkgbasename-$pkgver.tar.bz2) - -build() { - cd "$srcdir/$_pkgbasename-$pkgver" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - sed -i -e '/CFLAGS/s|:= -g -O2|+=|' Makefile - sed -i -e 's/^\(USR\)\?LIBDIR\s*:=.*$/\1LIBDIR=\/usr\/lib32/' Makefile - make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -package() { - cd "$srcdir/$_pkgbasename-$pkgver" - make DESTDIR="$pkgdir" install - - rm -rf "${pkgdir}"/{usr/{include,share,bin,sbin},etc,{s,}bin} -} -md5sums=('3ab62455a37a20f73b2d6cc794aaba13') diff --git a/multilib-testing/lib32-udev/PKGBUILD b/multilib-testing/lib32-udev/PKGBUILD deleted file mode 100644 index 13c6614d0..000000000 --- a/multilib-testing/lib32-udev/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id$ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=('lib32-udev') -pkgver=172 -pkgrel=1 -arch=('x86_64') -pkgdesc="The userspace dev tools (udev) (32-bit)" -url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" -license=('GPL') -options=(!makeflags !libtool) -depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'udev') -makedepends=('gcc-multilib' 'coreutils' 'util-linux' 'pciutils' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') -source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.bz2) -md5sums=('bd122d04cf758441f498aad0169a454f') - -build() { - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd $srcdir/udev-$pkgver - - ./configure --libdir=/usr/lib32 - make -} - -package() { - - cd $srcdir/udev-$pkgver - - make DESTDIR=${pkgdir} install - rm -rf ${pkgdir}/usr/{etc,include,lib,libexec,sbin,share} - rm -rf ${pkgdir}/usr/lib32/girepository* -} diff --git a/staging/cloog/PKGBUILD b/staging/cloog/PKGBUILD deleted file mode 100644 index 392921e6c..000000000 --- a/staging/cloog/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 135964 2011-08-21 02:51:57Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -pkgname=cloog -pkgver=0.16.3 -pkgrel=1 -pkgdesc="Library that generates loops for scanning polyhedra" -arch=('i686' 'x86_64') -url="http://www.bastoul.net/cloog/" -license=('GPL') -depends=('isl' 'gmp') -conflicts=('cloog-ppl<0.15.10-2') -options=('!libtool') -source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz) -md5sums=('a0f8a241cd1c4f103f8d2c91642b3498') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --with-isl=system --with-gmp=system - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} diff --git a/staging/gcc/PKGBUILD b/staging/gcc/PKGBUILD deleted file mode 100644 index de5781ab3..000000000 --- a/staging/gcc/PKGBUILD +++ /dev/null @@ -1,254 +0,0 @@ -# $Id: PKGBUILD 135972 2011-08-21 03:00:57Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: libtool requires rebuilt with each new gcc version - -pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') -pkgver=4.6.1 -pkgrel=4 -_snapshot=4.6-20110819 -_libstdcppmanver=20110814 # Note: check source directory name when updating this -pkgdesc="The GNU Compiler Collection" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL' 'custom') -url="http://gcc.gnu.org" -makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada') -checkdepends=('dejagnu') -options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 - gcc_pure64.patch - gcc-hash-style-both.patch) -md5sums=('b14d22730f9085eab7fd927039e68d28' - 'ce920d2550ff7e042b9f091d27764d8f' - '4030ee1c08dd1e843c0225b772360e76' - '4df25b623799b148a0703eaeec8fdf3f') - -if [ -n "${_snapshot}" ]; then - _basedir="${srcdir}/gcc-${_snapshot}" -else - _basedir="${srcdir}/gcc-${pkgver}" -fi - -build() { - cd ${_basedir} - - # Do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - if [ "${CARCH}" = "x86_64" ]; then - patch -Np1 -i ${srcdir}/gcc_pure64.patch - fi - patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch - - echo ${pkgver} > gcc/BASE-VER - - cd ${srcdir} - mkdir gcc-build && cd gcc-build - - ${_basedir}/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --with-bugurl=https://bugs.archlinux.org/ \ - --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ - --enable-shared --enable-threads=posix \ - --with-system-zlib --enable-__cxa_atexit \ - --disable-libunwind-exceptions --enable-clocale=gnu \ - --enable-gnu-unique-object --enable-linker-build-id \ - --with-ppl --enable-cloog-backend=isl \ - --enable-lto --enable-gold --enable-ld=default \ - --enable-plugin --with-plugin-ld=ld.gold \ - --disable-multilib --disable-libssp --disable-libstdcxx-pch \ - --enable-checking=release - make -} - -check() { - cd gcc-build - - # increase stack size to prevent test failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 - ulimit -s 32768 - - # do not abort on error as some are "expected" - make -k check || true - ${_basedir}/contrib/test_summary -} - -package_gcc-libs() -{ - pkgdesc="Runtime libraries shipped by GCC" - groups=('base') - depends=('glibc>=2.14') - install=gcc-libs.install - - cd gcc-build - make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src; do - make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install - make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc() -{ - pkgdesc="The GNU Compiler Collection - C and C++ frontends" - depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.21.1' 'libmpc' 'cloog' 'ppl') - groups=('base-devel') - install=gcc.install - - cd gcc-build - - # unfortunately it is much, much easier to install the lot and clean-up the mess... - make -j1 DESTDIR=${pkgdir} install - rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} - rm $pkgdir/usr/lib/*.so* - rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a - rm $pkgdir/usr/lib/libgfortran.spec - rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a} - rm -r $pkgdir/usr/lib/go - rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info - rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 - rm $pkgdir/usr/share/man/man3/ffi* - - # many packages require these symlinks - install -dm755 ${pkgdir}/lib - ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp - ln -sf gcc ${pkgdir}/usr/bin/cc - ln -sf g++ ${pkgdir}/usr/bin/c++ - - # install gengtype for plugin support - install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ - install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ - - # POSIX conformance launcher scripts for c89 and c99 - cat > $pkgdir/usr/bin/c89 <<"EOF" -#!/bin/sh -fl="-std=c89" -for opt; do - case "$opt" in - -ansi|-std=c89|-std=iso9899:1990) fl="";; - -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - cat > $pkgdir/usr/bin/c99 <<"EOF" -#!/bin/sh -fl="-std=c99" -for opt; do - case "$opt" in - -std=c99|-std=iso9899:1999) fl="";; - -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - chmod 755 $pkgdir/usr/bin/c{8,9}9 - - # install the libstdc++ man pages - install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/ - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-fortran() -{ - pkgdesc="Fortran front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-fortran.install - - cd gcc-build - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=$pkgdir install-target-libgfortran - make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS - make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} - install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so* - rm ${pkgdir}/usr/share/info/libquadmath.info - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-objc() -{ - pkgdesc="Objective-C front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libobjc - install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib/libobjc.so* - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-ada() -{ - pkgdesc="Ada front-end for GCC (GNAT)" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-ada.install - - cd gcc-build/gcc - make -j1 DESTDIR=$pkgdir ada.install-{common,info} - install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-go() -{ - pkgdesc="Go front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-go.install - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libgo - make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} - install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION -} diff --git a/staging/gcc/gcc-ada.install b/staging/gcc/gcc-ada.install deleted file mode 100644 index df0553a4f..000000000 --- a/staging/gcc/gcc-ada.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gnat-style.info gnat_rm.info gnat_ugn.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/staging/gcc/gcc-fortran.install b/staging/gcc/gcc-fortran.install deleted file mode 100644 index b15d89a97..000000000 --- a/staging/gcc/gcc-fortran.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -file="gfortran.info" - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} diff --git a/staging/gcc/gcc-go.install b/staging/gcc/gcc-go.install deleted file mode 100644 index 7dc50dee5..000000000 --- a/staging/gcc/gcc-go.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gccgo.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/staging/gcc/gcc-hash-style-both.patch b/staging/gcc/gcc-hash-style-both.patch deleted file mode 100644 index 8b59f4535..000000000 --- a/staging/gcc/gcc-hash-style-both.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000 -@@ -41,7 +41,7 @@ - - #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER - --#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ -+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \ - %{O*:-O3} %{!O*:-O1} \ - %{shared:-shared} \ - %{!shared: \ ---- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000 -+++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000 -@@ -78,7 +78,7 @@ - %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" - - #undef LINK_SPEC --#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ -+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000 -+++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -104,7 +104,7 @@ - { "dynamic_linker", LINUX_DYNAMIC_LINKER } - - #undef LINK_SPEC --#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ -+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ ---- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -64,7 +64,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "\ -+#define LINK_SPEC "--hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000 -+++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000 -@@ -389,11 +389,11 @@ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) - - --#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}" - --#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}" - ---- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000 -+++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000 -@@ -830,7 +830,7 @@ - #define LINUX_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) - --#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER "}}" - ---- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -77,7 +77,7 @@ - - #undef LINK_SPEC - #define LINK_SPEC \ -- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ -+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{static:-static} \ ---- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000 -+++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000 -@@ -113,7 +113,7 @@ - { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ - { "link_arch", LINK_ARCH_SPEC }, - --#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ -+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -121,7 +121,7 @@ - %{static:-static}} \ - " - --#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -193,7 +193,7 @@ - #else /* !SPARC_BI_ARCH */ - - #undef LINK_SPEC --#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ ---- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000 -+++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -74,7 +74,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ -+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ - %{!mno-relax:%{!r:-relax}} \ - %{!shared: \ - %{!static: \ diff --git a/staging/gcc/gcc-libs.install b/staging/gcc/gcc-libs.install deleted file mode 100644 index 23553b8f0..000000000 --- a/staging/gcc/gcc-libs.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -filelist=(libgomp.info libquadmath.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/staging/gcc/gcc.install b/staging/gcc/gcc.install deleted file mode 100644 index 3407a5e1f..000000000 --- a/staging/gcc/gcc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/staging/gcc/gcc_pure64.patch b/staging/gcc/gcc_pure64.patch deleted file mode 100644 index 8c0baf8e2..000000000 --- a/staging/gcc/gcc_pure64.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h ---- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400 -@@ -49,8 +49,8 @@ - When the -shared link option is used a final link is not being - done. */ - --#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - - #undef LINK_SPEC - #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64 ---- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400 -@@ -6,7 +6,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = ../lib ../lib32 - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib diff --git a/staging/isl/PKGBUILD b/staging/isl/PKGBUILD deleted file mode 100644 index 553af2b6f..000000000 --- a/staging/isl/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 135962 2011-08-21 02:50:34Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -pkgname=isl -pkgver=0.07 -pkgrel=1 -pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" -arch=('i686' 'x86_64') -url="http://www.kotnet.org/~skimo/isl/" -license=('LGPL2.1') -options=('!libtool') -source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) -md5sums=('0d1a38db9f1c7d526758092b985827ea') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make -j1 DESTDIR="$pkgdir/" install - - # this seems a better place for this file... - install -dm755 $pkgdir/usr/share/gdb/auto-load/ - mv $pkgdir/usr/{lib,share/gdb/auto-load}/libisl.so.7.0.0-gdb.py -} diff --git a/staging/xf86-input-acecad/PKGBUILD b/staging/xf86-input-acecad/PKGBUILD deleted file mode 100644 index 4e0bc3f24..000000000 --- a/staging/xf86-input-acecad/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 135117 2011-08-10 11:45:03Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-acecad -pkgver=1.5.0 -pkgrel=2 -pkgdesc="X.Org acecad tablet input driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('sysfsutils') -makedepends=('xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - assign-local-private-after-allocating.patch) -sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1' - '9301020b0ef3c6f2081e957481a88d2e187a7973') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/assign-local-private-after-allocating.patch" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-input-acecad/assign-local-private-after-allocating.patch b/staging/xf86-input-acecad/assign-local-private-after-allocating.patch deleted file mode 100644 index e3e635a6f..000000000 --- a/staging/xf86-input-acecad/assign-local-private-after-allocating.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ec2c4ead497133ef20d5ef5a9b481b38e1e0f7a2 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon, 27 Jun 2011 03:13:54 +0000 -Subject: Assign local->private after allocating. - -It is detrimental to the user experience when the driver tries to derefernce -null pointers. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/src/acecad.c b/src/acecad.c -index ad6d793..604fe91 100644 ---- a/src/acecad.c -+++ b/src/acecad.c -@@ -343,6 +343,7 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags) - return BadAlloc; - - memset(priv, 0, sizeof(AceCadPrivateRec)); -+ local->private = priv; - - local->device_control = DeviceControl; - --- -cgit v0.8.3-6-g21f6 diff --git a/staging/xf86-input-aiptek/PKGBUILD b/staging/xf86-input-aiptek/PKGBUILD deleted file mode 100644 index 1e853db48..000000000 --- a/staging/xf86-input-aiptek/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 135120 2011-08-10 11:53:06Z jgc $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-aiptek -pkgver=1.4.1 -pkgrel=2 -pkgdesc="X.Org Aiptek USB Digital Tablet input driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('pkgconfig' 'xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('55ea7d12d3e24fd72eacc966a59262864dce7769') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-input-evdev/PKGBUILD b/staging/xf86-input-evdev/PKGBUILD deleted file mode 100644 index b90e8ffb2..000000000 --- a/staging/xf86-input-evdev/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 135091 2011-08-10 08:40:38Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <Alexander@archlinux.org - -pkgname=xf86-input-evdev -pkgver=2.6.0 -pkgrel=4 -pkgdesc="X.org evdev input driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') -options=('!libtool' '!makeflags') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('fb6f7a6f5168ae07efe890e4ace9fb8af1d4e1e0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-input-joystick/50-joystick.conf b/staging/xf86-input-joystick/50-joystick.conf deleted file mode 100644 index 95a295ab0..000000000 --- a/staging/xf86-input-joystick/50-joystick.conf +++ /dev/null @@ -1,6 +0,0 @@ -Section "InputClass" - Identifier "joystick catchall" - MatchIsJoystick "on" - MatchDevicePath "/dev/input/event*" - Driver "joystick" -EndSection diff --git a/staging/xf86-input-joystick/PKGBUILD b/staging/xf86-input-joystick/PKGBUILD deleted file mode 100644 index a2a3693f4..000000000 --- a/staging/xf86-input-joystick/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 135123 2011-08-10 12:03:42Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-joystick -pkgver=1.6.0 -pkgrel=2 -pkgdesc="X.Org Joystick input driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - 50-joystick.conf) -sha1sums=('3b9aed1b8128e1fbd947fdcdd5e16efccad1c780' - 'e1ff3699a0470c6bb78a53f718df9d8521621e11') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" - install -m644 "${srcdir}/50-joystick.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-input-keyboard/PKGBUILD b/staging/xf86-input-keyboard/PKGBUILD deleted file mode 100644 index 9b6d5eaa9..000000000 --- a/staging/xf86-input-keyboard/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 135126 2011-08-10 12:13:02Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-keyboard -pkgver=1.6.0 -pkgrel=3 -pkgdesc="X.Org keyboard input driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('8e845086749f8c4b64fdfa852b4b26cf7bb62dc9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-input-mouse/PKGBUILD b/staging/xf86-input-mouse/PKGBUILD deleted file mode 100644 index 04ef5c7c1..000000000 --- a/staging/xf86-input-mouse/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 135129 2011-08-10 12:23:33Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-mouse -pkgver=1.7.1 -pkgrel=2 -pkgdesc="X.org mouse input driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('11a6402e82d65bda5fb559c5e9bc72f3fd7af2ed') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-input-synaptics/10-synaptics.conf b/staging/xf86-input-synaptics/10-synaptics.conf deleted file mode 100644 index 81a90fb81..000000000 --- a/staging/xf86-input-synaptics/10-synaptics.conf +++ /dev/null @@ -1,9 +0,0 @@ -Section "InputClass" - Identifier "touchpad catchall" - Driver "synaptics" - MatchIsTouchpad "on" - MatchDevicePath "/dev/input/event*" - Option "TapButton1" "1" - Option "TapButton2" "2" - Option "TapButton3" "3" -EndSection diff --git a/staging/xf86-input-synaptics/PKGBUILD b/staging/xf86-input-synaptics/PKGBUILD deleted file mode 100644 index 378bdcc8a..000000000 --- a/staging/xf86-input-synaptics/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 135132 2011-08-10 12:38:31Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Thomas Bächler <thomas@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-input-synaptics -pkgver=1.4.1 -pkgrel=2 -pkgdesc="Synaptics driver for notebook touchpads" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('libxtst') -makedepends=('xorg-server-devel>=1.10.99.902' 'libxi' 'libx11') -conflicts=('xorg-server<1.10.99.902') -replaces=('synaptics') -provides=('synaptics') -conflicts=('synaptics') -groups=('xorg-drivers' 'xorg') -options=(!libtool) -backup=('etc/X11/xorg.conf.d/10-synaptics.conf') -source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - 10-synaptics.conf) -sha1sums=('e41201476f4bc8658291808d2d6ef2e0535179ae' - '68e1f4ef5e1038231d210eb422fa4d18c5922f0f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" - install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" - - rm -rf "${pkgdir}/usr/share/X11" -} diff --git a/staging/xf86-input-void/PKGBUILD b/staging/xf86-input-void/PKGBUILD deleted file mode 100644 index 71bedbf61..000000000 --- a/staging/xf86-input-void/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 135172 2011-08-10 18:12:49Z jgc $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-input-void -pkgver=1.4.0 -pkgrel=2 -pkgdesc="X.org void input driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('49b462d3acb16337eaf78202d4074f19d5e20b29') - - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-input-wacom/70-wacom.rules b/staging/xf86-input-wacom/70-wacom.rules deleted file mode 100644 index f6aa20835..000000000 --- a/staging/xf86-input-wacom/70-wacom.rules +++ /dev/null @@ -1,12 +0,0 @@ -ACTION!="add|change", GOTO="wacom_end" - -# Match all serial wacom tablets with a serial ID starting with WACf -# Notes: We assign NAME though we shouldn't, but currently the server requires it -# We assign the lot to subsystem pnp too because server reads NAME from -# the parent device. Once all that's fixed, as simple SUBSYSTEM="tty" -# will do and the ENV{NAME} can be removed. -SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" -SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" - -LABEL="wacom_end" - diff --git a/staging/xf86-input-wacom/PKGBUILD b/staging/xf86-input-wacom/PKGBUILD deleted file mode 100644 index 9f693c3c5..000000000 --- a/staging/xf86-input-wacom/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 135212 2011-08-11 07:18:08Z jgc $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: M Rawash <mrawash@gmail.com> - -pkgname=xf86-input-wacom -pkgver=0.11.1 -pkgrel=3 -pkgdesc="X.Org Wacom tablet driver" -arch=('i686' 'x86_64') -url="http://linuxwacom.sourceforge.net/" -license=('GPL') -backup=('etc/X11/xorg.conf.d/50-wacom.conf') -depends=('libxi' 'libxrandr') -makedepends=('xorg-server-devel>=1.10.99.902' 'libxext' 'libxi') -conflicts=('xorg-server<1.10.99.902') -options=(!libtool) -source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - 70-wacom.rules) -md5sums=('0aec4a338cc583ed497b6af68d6d80ab' - '10db4f8272286690255c1bcc18bfdd92') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/lib/udev/rules.d" - install -m644 "${srcdir}/70-wacom.rules" "${pkgdir}/lib/udev/rules.d/" -} diff --git a/staging/xf86-video-apm/PKGBUILD b/staging/xf86-video-apm/PKGBUILD deleted file mode 100644 index 6b2a895c1..000000000 --- a/staging/xf86-video-apm/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 136408 2011-08-29 07:40:55Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-apm -pkgver=1.2.3 -pkgrel=4 -pkgdesc="X.org Alliance ProMotion video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.0') -conflicts=('xorg-server<1.11.0') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('1fa7180cf985a74132f8d5b39a0bf9df08713fac') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-ark/PKGBUILD b/staging/xf86-video-ark/PKGBUILD deleted file mode 100644 index cc9de161e..000000000 --- a/staging/xf86-video-ark/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 136410 2011-08-29 07:45:07Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-ark -pkgver=0.7.3 -pkgrel=4 -pkgdesc="X.org ark video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.0') -conflicts=('xorg-server<1.11.0') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch) -sha1sums=('56901ec6097a83433689f208268281f9c98c238b' - 'f62cdc7995e9b64c9105382ccfa842732fa81309') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-ark/git-fixes.patch b/staging/xf86-video-ark/git-fixes.patch deleted file mode 100644 index 2de0f64be..000000000 --- a/staging/xf86-video-ark/git-fixes.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 9d3769bed020e9796e51411c63de337da5073bb4 Mon Sep 17 00:00:00 2001 -From: Ondrej Zary <linux@rainbow-software.org> -Date: Sat, 04 Dec 2010 00:23:51 +0000 -Subject: Don't assume that FB address registers are initialized properly - -https://bugs.freedesktop.org/show_bug.cgi?id=28249 - -ark driver does not work with Hercules Stingray 64 card (ark2000pv). -X fails to start with: - -[...] -(II) ark(0): vgaHWGetIOBase: hwp->IOBase is 0x03d0, hwp->PIOOffset is -0x0000 -(II) ark(0): Creating default Display subsection in Screen section - "Default Screen Section" for depth/fbbpp 24/32 -(==) ark(0): Depth 24, (--) framebuffer bpp 32 -(==) ark(0): RGB weight 888 -(==) ark(0): Default visual is TrueColor -(**) ark(0): Chipset: "ark2000pv" -(--) ark(0): Framebuffer @ 0xe5e50000 -(==) ark(0): Using gamma correction (1.0, 1.0, 1.0) -(--) ark(0): Detected 2048 bytes video ram -[...] -Fatal server error: -AddScreen/ScreenInit failed for driver 0 - -Comparing with lspci, the framebuffer address is wrong: -00:0f.0 VGA compatible controller: ARK Logic Inc 2000PV [Stingray] (prog-if 00 [VGA controller]) - Flags: medium devsel - Memory at e5000000 (32-bit, prefetchable) [size=4M] - [virtual] Expansion ROM at 1c000000 [disabled] [size=64K] - -Reviewed-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/ark.h b/src/ark.h -index de301dc..077f93b 100644 ---- a/src/ark.h -+++ b/src/ark.h -@@ -34,7 +34,6 @@ typedef struct _ARKRec { - #endif - EntityInfoPtr pEnt; - CARD32 IOAddress; -- CARD32 FBAddress; - unsigned char * FBBase; - unsigned char * MMIOBase; - unsigned long videoRam; -diff --git a/src/ark_driver.c b/src/ark_driver.c -index 5de3b9a..fec3e1a 100644 ---- a/src/ark_driver.c -+++ b/src/ark_driver.c -@@ -363,14 +363,14 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags) - outb(hwp->PIOOffset + hwp->IOBase + 5, tmp & 0x7f); - modinx(hwp->PIOOffset + 0x3c4, 0x1d, 0x01, 0x01); - -- /* use membase's later on ??? */ -- pARK->FBAddress = (rdinx(hwp->PIOOffset + 0x3c4, 0x13) << 16) + -- (rdinx(hwp->PIOOffset + 0x3c4, 0x14) << 24); -- -- pScrn->memPhysBase = pARK->FBAddress; -+#ifndef XSERVER_LIBPCIACCESS -+ pScrn->memPhysBase = pARK->PciInfo->memBase[0]; -+#else -+ pScrn->memPhysBase = pARK->PciInfo->regions[0].base_addr; -+#endif - - xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%lx\n", -- (unsigned long)pARK->FBAddress); -+ (unsigned long)pScrn->memPhysBase); - - if (!xf86SetGamma(pScrn, gzeros)) - return FALSE; -@@ -748,8 +748,13 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) - new->sr10 = rdinx(isaIOBase + 0x3c4, 0x10) & ~0x1f; - new->sr10 |= 0x1f; - -- new->sr13 = pARK->FBAddress >> 16; -- new->sr14 = pARK->FBAddress >> 24; -+#ifndef XSERVER_LIBPCIACCESS -+ new->sr13 = pARK->PciInfo->memBase[0] >> 16; -+ new->sr14 = pARK->PciInfo->memBase[0] >> 24; -+#else -+ new->sr13 = pARK->PciInfo->regions[0].base_addr >> 16; -+ new->sr14 = pARK->PciInfo->regions[0].base_addr >> 24; -+#endif - - new->sr12 = rdinx(isaIOBase + 0x3c4, 0x12) & ~0x03; - switch (pScrn->videoRam) { -@@ -1022,7 +1027,7 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn) - pARK->PciTag, 0xb8000, 0x8000); - - pARK->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER, -- pARK->PciTag, pARK->FBAddress, -+ pARK->PciTag, pARK->PciInfo->memBase[0], - pScrn->videoRam * 1024); - #else - -@@ -1032,14 +1037,17 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn) - { - void** result = (void**)&pARK->FBBase; - int err = pci_device_map_range(pARK->PciInfo, -- pARK->FBAddress, -+ pARK->PciInfo->regions[0].base_addr, - pScrn->videoRam * 1024, - PCI_DEV_MAP_FLAG_WRITABLE | - PCI_DEV_MAP_FLAG_WRITE_COMBINE, - result); - -- if (err) -+ if (err) { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Cound not map framebuffer: %d\n", err); - return FALSE; -+ } - } - #endif - --- -cgit v0.9.0.2-2-gbebe diff --git a/staging/xf86-video-ast/PKGBUILD b/staging/xf86-video-ast/PKGBUILD deleted file mode 100644 index f2e8c9db6..000000000 --- a/staging/xf86-video-ast/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 136412 2011-08-29 07:50:30Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-ast -pkgver=0.93.9 -pkgrel=1 -pkgdesc="X.org ASPEED AST Graphics video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.0') -conflicts=('xorg-server<1.11.0') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('424cc93d0300e49a882199c0546425f223b3b4bd') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-ati/PKGBUILD b/staging/xf86-video-ati/PKGBUILD deleted file mode 100644 index 1f13fede6..000000000 --- a/staging/xf86-video-ati/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 136416 2011-08-29 08:02:09Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-video-ati -pkgver=6.14.2 -pkgrel=2 -pkgdesc="X.org ati video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=(libpciaccess libdrm udev pixman ati-dri) -makedepends=('xorg-server-devel>=1.11.0' 'libdrm' 'xf86driproto' 'mesa' 'glproto') -conflicts=('xorg-server<1.11.0') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('2733b3c126ad9e082ea18b7e7663d6d87fce4d49') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-dri - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make "DESTDIR=${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-chips/PKGBUILD b/staging/xf86-video-chips/PKGBUILD deleted file mode 100644 index 597c2ef4e..000000000 --- a/staging/xf86-video-chips/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 136418 2011-08-29 08:15:40Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-video-chips -pkgver=1.2.4 -pkgrel=3 -pkgdesc="X.org Chips and Technologies video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=(glibc) -makedepends=('xorg-server-devel>=1.11.0') -conflicts=('xorg-server<1.11.0') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - gut-overlay-8-16-support-from-driver.patch) -sha1sums=('71f474335d05f93b2451a7a0750c4409669641a4' - 'f6a635196118dacb73fad980571b390849963b3d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/gut-overlay-8-16-support-from-driver.patch" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch b/staging/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch deleted file mode 100644 index b9c832238..000000000 --- a/staging/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch +++ /dev/null @@ -1,580 +0,0 @@ -From e4bd864898fd276a62dac05cdfff394e98434f02 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Tue, 29 Mar 2011 03:53:31 +0000 -Subject: chips: gut the overlay 8/16 support from driver. - -This driver is for chips that were bought by Intel in 1997, -this feature means maintaining a lot of code in the X server -for little gain. - -Drop it like its hot. - -Signed-off-by: Dave Airlie <airlied@redhat.com> -Reviewed-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/man/chips.man b/man/chips.man -index 740af38..0c022ee 100644 ---- a/man/chips.man -+++ b/man/chips.man -@@ -165,9 +165,6 @@ Force the use of memory mapped IO where it can be used. Default: off - Force driver to leave centering and stretching registers alone. This - can fix some laptop suspend/resume problems. Default: off - .TP --.BI "Option \*qOverlay\*q" --Enable 8+24 overlay mode. Only appropriate for depth 24. Default: off. --.TP - .BI "Option \*qColorKey\*q \*q" integer \*q - Set the colormap index used for the transparency key for the depth 8 plane - when operating in 8+16 overlay mode. The value must be in the range -diff --git a/src/ct_accel.c b/src/ct_accel.c -index 3920b0a..4b5776a 100644 ---- a/src/ct_accel.c -+++ b/src/ct_accel.c -@@ -428,19 +428,7 @@ chips_imagewrite: - infoPtr->ImageWriteFlags |= NO_PLANEMASK; - #endif - -- --#ifdef CHIPS_HIQV -- if (XAAInit(pScreen, infoPtr)) { -- if (cPtr->Flags & ChipsOverlay8plus16) -- return(XAAInitDualFramebufferOverlay(pScreen, -- CTNAME(DepthChange))); -- else -- return TRUE; -- } else -- return FALSE; --#else - return(XAAInit(pScreen, infoPtr)); --#endif - } - - #ifdef CHIPS_HIQV -@@ -1243,11 +1231,6 @@ CTNAME(SubsequentScreenToScreenColorExpandFill)(ScrnInfoPtr pScrn, - #endif - w *= cAcl->BytesPerPixel; - ctBLTWAIT; --#ifdef CHIPS_HIQV -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16) && -- (pScrn->depth == 8)) -- ctSETPITCH(cAcl->PitchInBytes << 1, cAcl->PitchInBytes); --#endif - ctSETSRCADDR(srcaddr); - ctSETDSTADDR(destaddr); - #ifdef CHIPS_HIQV -@@ -1271,10 +1254,6 @@ CTNAME(SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty, - patternaddr = (paty * pScrn->displayWidth + - (patx & ~0x3F)) * cAcl->BytesPerPixel; - cAcl->patternyrot = (patx & 0x3F) >> 3; --#ifdef CHIPS_HIQV -- if (cPtr->Flags & ChipsOverlay8plus16) -- patternaddr += cPtr->FbOffset16; --#endif - - ctBLTWAIT; - ctSETPATSRCADDR(patternaddr); -@@ -1338,10 +1317,7 @@ CTNAME(SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty, - - #ifdef CHIPS_HIQV - patternaddr = paty * pScrn->displayWidth + patx; -- if (cPtr->Flags & ChipsOverlay8plus16) -- patternaddr = patternaddr * 2 + cPtr->FbOffset16; -- else -- patternaddr *= cAcl->BytesPerPixel; -+ patternaddr *= cAcl->BytesPerPixel; - #else - patternaddr = (paty * pScrn->displayWidth + patx) * cAcl->BytesPerPixel; - #endif -@@ -1593,10 +1569,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, - dwords = (((skipleft + bytesPerLine + 0x7) & ~0x7)) >> 2; - destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); - destpitch = pScrn->displayWidth * (bpp >> 3); -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) -- destaddr += cPtr->FbOffset16; -- else -- destaddr += cAcl->FbOffset; -+ destaddr += cAcl->FbOffset; - - ctBLTWAIT; - -@@ -1681,10 +1654,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, - y++; - - destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) -- destaddr += cPtr->FbOffset16; -- else -- destaddr += cAcl->FbOffset; -+ destaddr += cAcl->FbOffset; - - ctBLTWAIT; - ctSETDSTADDR(destaddr); -@@ -1717,10 +1687,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, - dwords = (((bytesPerLine + 0x7) & ~0x7)) >> 2; - srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); - srcpitch = pScrn->displayWidth * (bpp >> 3); -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) -- srcaddr += cPtr->FbOffset16; -- else -- srcaddr += cAcl->FbOffset; -+ srcaddr += cAcl->FbOffset; - - ctBLTWAIT; - ctSETROP( ctDSTSYSTEM | ctLEFT2RIGHT | ctTOP2BOTTOM | -@@ -1755,10 +1722,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, - dst += dstwidth; - y++; - srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); -- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) -- srcaddr += cPtr->FbOffset16; -- else -- srcaddr += cAcl->FbOffset; -+ srcaddr += cAcl->FbOffset; - ctBLTWAIT; - ctSETSRCADDR(srcaddr); - ctSETHEIGHTWIDTHGO(h, bytesPerLine); -diff --git a/src/ct_driver.c b/src/ct_driver.c -index 6624b79..08df050 100644 ---- a/src/ct_driver.c -+++ b/src/ct_driver.c -@@ -1639,55 +1639,15 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) - } - } - -- if ((s = xf86GetOptValString(cPtr->Options, OPTION_OVERLAY))) { -- if (!*s || !xf86NameCmp(s, "8,16") || !xf86NameCmp(s, "16,8")) { -- if (pScrn->bitsPerPixel == 16) { -- if (cPtr->Flags & ChipsLinearSupport) { -- cPtr->Flags |= ChipsOverlay8plus16; -- if(!xf86GetOptValInteger( -- cPtr->Options, OPTION_COLOR_KEY, &(pScrn->colorKey))) -- pScrn->colorKey = TRANSPARENCY_KEY; -- pScrn->overlayFlags = OVERLAY_8_16_DUALFB; -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, -- "PseudoColor overlay enabled.\n"); -- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_STRETCH)) -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- " - Forcing option \"Stretch\" \"ON\".\n"); -- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_CENTER)) -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- " - Forcing option \"LcdCenter\" \"OFF\".\n"); -- if (cPtr->Flags & ChipsShadowFB) { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- " - Disabling \"Shadow Framebuffer\".\n"); -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- " Not support with option \"8Plus16\".\n"); -- cPtr->Flags &= ~ChipsShadowFB; -- cPtr->Rotate = 0; -- } -- } else { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Option \"Overlay\" ignored. Not supported without linear addressing\n"); -- } -- } else { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- "Option \"Overlay\" is not supported in this configuration\n"); -- } -- } else { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, -- "\"%s\" is not a valid value for Option \"Overlay\"\n", s); -- } -- } -- -- if (!(cPtr->Flags & ChipsOverlay8plus16)) { -- if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY, -- &(cPtr->videoKey))) { -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n", -+ if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY, -+ &(cPtr->videoKey))) { -+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n", - cPtr->videoKey); -- } else { -- cPtr->videoKey = (1 << pScrn->offset.red) | -+ } else { -+ cPtr->videoKey = (1 << pScrn->offset.red) | - (1 << pScrn->offset.green) | - (((pScrn->mask.blue >> pScrn->offset.blue) - 1) - << pScrn->offset.blue); -- } - } - - if (cPtr->Flags & ChipsShadowFB) { -@@ -2335,28 +2295,16 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) - /* and 32bits on the others. Thus multiply by a suitable factor */ - if (cPtr->Flags & Chips64BitMemory) { - if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD)) -- if (cPtr->Flags & ChipsOverlay8plus16 ) -- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 4); -- else - cPtr->MaxClock = min(cPtr->MaxClock, - MemClk->Clk * 8 * 0.7 / (bytesPerPixel + 1)); - else -- if (cPtr->Flags & ChipsOverlay8plus16) -- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 3); -- else - cPtr->MaxClock = min(cPtr->MaxClock, - MemClk->Clk * 8 * 0.7 / bytesPerPixel); - } else { - if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD)) -- if (cPtr->Flags & ChipsOverlay8plus16 ) -- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 4); -- else - cPtr->MaxClock = min(cPtr->MaxClock, - MemClk->Clk * 4 * 0.7 / (bytesPerPixel + 1)); - else -- if (cPtr->Flags & ChipsOverlay8plus16) -- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 3); -- else - cPtr->MaxClock = min(cPtr->MaxClock, - MemClk->Clk * 4 * 0.7 / bytesPerPixel); - } -@@ -3736,8 +3684,7 @@ CHIPSEnterVT(int scrnIndex, int flags) - /* Should we re-save the text mode on each VT enter? */ - if(!chipsModeInit(pScrn, pScrn->currentMode)) - return FALSE; -- if ((!(cPtr->Flags & ChipsOverlay8plus16)) -- && (cPtr->Flags & ChipsVideoSupport) -+ if ((cPtr->Flags & ChipsVideoSupport) - && (cPtr->Flags & ChipsLinearSupport)) - CHIPSResetVideo(pScrn); - -@@ -3788,8 +3735,7 @@ chipsLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, - int i, index, shift ; - CHIPSEntPtr cPtrEnt; - -- shift = ((pScrn->depth == 15) && -- (!(cPtr->Flags & ChipsOverlay8plus16))) ? 3 : 0; -+ shift = (pScrn->depth == 15) ? 3 : 0; - - if (cPtr->UseDualChannel) { - cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0], -@@ -3895,18 +3841,6 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices, - hwp->disablePalette(hwp); - } - --static Bool --cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8, -- int xsize, int ysize, int dpix, int dpiy, -- int width16, int width8) --{ -- return -- (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize, -- dpix, dpiy, width16, width8, 16, 8) && -- fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize, -- dpix, dpiy, width16, width8, 16, 8, 16, 8)); --} -- - /* Mandatory */ - static Bool - CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) -@@ -3947,22 +3881,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - if (!chipsMapMem(pScrn)) - return FALSE; - -- /* Setup a pointer to the overlay if needed */ -- if (cPtr->Flags & ChipsOverlay8plus16) { -- cPtr->FbOffset16 = pScrn->displayWidth * pScrn->virtualY; -- cPtr->FbSize16 = (pScrn->displayWidth << 1) * pScrn->virtualY; -- if (cPtr->FbSize16 > (cPtr->FbMapSize - cPtr->FrameBufferSize)) { -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, -- "Too little memory for overlay. Disabling.\n"); -- cPtr->Flags &= ~ChipsOverlay8plus16; -- } -- if ((pScrn->displayWidth > 1024) || (pScrn->virtualY > 1024)) { -- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, -- "Max overlay Width/Height 1024 pixels. Disabling.\n"); -- cPtr->Flags &= ~ChipsOverlay8plus16; -- } -- } -- - /* Setup the MMIO register access functions if need */ - if (cPtr->UseFullMMIO && cPtr->MMIOBaseVGA) { - CHIPSSetMmioExtFuncs(cPtr); -@@ -4035,18 +3953,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - miClearVisualTypes(); - - /* Setup the visuals we support. */ -- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)){ -- if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask, -- pScrn->rgbBits, PseudoColor)) -- return FALSE; -- if (!miSetVisualTypes(16, TrueColorMask, pScrn->rgbBits, TrueColor)) -- return FALSE; -- } else { -- if (!miSetVisualTypes(pScrn->depth, -+ if (!miSetVisualTypes(pScrn->depth, - miGetDefaultVisualMask(pScrn->depth), - pScrn->rgbBits, pScrn->defaultVisual)) -- return FALSE; -- } -+ return FALSE; - miSetPixmapDepths (); - - /* -@@ -4090,13 +4000,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - break; - #endif - case 16: -- if (cPtr->Flags & ChipsOverlay8plus16) { -- ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart + -- cPtr->FbOffset16, FBStart, width, -- height, pScrn->xDpi, pScrn->yDpi, -- displayWidth, displayWidth); -- break; -- } - default: - ret = fbScreenInit(pScreen, FBStart, - width,height, -@@ -4244,9 +4147,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - if (pScrn->bitsPerPixel < 8) - freespace = allocatebase - pScrn->displayWidth * - pScrn->virtualY / 2; -- else if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) -- freespace = allocatebase - pScrn->displayWidth * -- pScrn->virtualY - cPtr->FbSize16; - else - freespace = allocatebase - pScrn->displayWidth * - pScrn->virtualY * (pScrn->bitsPerPixel >> 3); -@@ -4369,9 +4269,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - AvailFBArea.y2 = cAcl->CacheEnd / - (pScrn->displayWidth * (pScrn->bitsPerPixel >> 3)); - -- if (!(cPtr->Flags & ChipsOverlay8plus16)) { -- xf86InitFBManager(pScreen, &AvailFBArea); -- } -+ xf86InitFBManager(pScreen, &AvailFBArea); - } - if (cPtr->Flags & ChipsAccelSupport) { - if (IS_HiQV(cPtr)) { -@@ -4425,16 +4323,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - if (!miCreateDefColormap(pScreen)) - return FALSE; - -- if ((cPtr->Flags & ChipsOverlay8plus16) && (pScrn->bitsPerPixel == 16)) { -- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, chipsLoadPalette, -- NULL, CMAP_RELOAD_ON_MODE_SWITCH)) -- return FALSE; -- } else { -- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, -+ if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, - (pScrn->depth == 16 ? chipsLoadPalette16 : chipsLoadPalette), - NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR)) -- return FALSE; -- } -+ return FALSE; - - #ifndef XSERVER_LIBPCIACCESS - racflag = RAC_COLORMAP; -@@ -4448,8 +4340,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - xf86SetSilkenMouse(pScreen); - #endif - -- if ((!(cPtr->Flags & ChipsOverlay8plus16)) -- && (cPtr->Flags & ChipsVideoSupport) -+ if ((cPtr->Flags & ChipsVideoSupport) - && (cPtr->Flags & ChipsLinearSupport)) { - CHIPSInitVideo(pScreen); - } -@@ -4522,10 +4413,7 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags) - Base >>= 3; - break; - case 16: -- if (!(cPtr->Flags & ChipsOverlay8plus16)) -- Base >>= 1; -- else -- Base >>= 2; -+ Base >>= 1; - break; - case 24: - if (!IS_HiQV(cPtr)) -@@ -4581,14 +4469,6 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags) - cPtr->writeMSS(cPtr, hwp, MSS); - } - -- if (cPtr->Flags & ChipsOverlay8plus16) { -- Base = (Base << 3) & ~(unsigned long)0xF; -- -- cPtr->writeMR(cPtr, 0x22, (cPtr->FbOffset16 + Base) & 0xF8); -- cPtr->writeMR(cPtr, 0x23, ((cPtr->FbOffset16 + Base) >> 8) & 0xFF); -- cPtr->writeMR(cPtr, 0x24, ((cPtr->FbOffset16 + Base) >> 16) & 0xFF); -- } -- - } - - /* Mandatory */ -@@ -4652,13 +4532,6 @@ CHIPSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; - CHIPSPtr cPtr = CHIPSPTR(pScrn); - -- if (flags & MODECHECK_FINAL) { -- /* Don't subtract FrambufferSize here as it should be subtracted already */ -- if ((cPtr->Flags & ChipsOverlay8plus16) -- && ((pScrn->videoRam<<10) - pScrn->displayWidth * 3 * pScrn->virtualY -- < 0)) -- return MODE_MEM; -- } - /* The tests here need to be expanded */ - if ((mode->Flags & V_INTERLACE) && (cPtr->PanelType & ChipsLCD)) - return MODE_NO_INTERLACE; -@@ -5544,12 +5417,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - } else { - ChipsStd->Attribute[0x10] = 0x01; /* mode */ - } -- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) { -- /* Make sure that the overlay isn't visible in the overscan region */ -- if (ChipsStd->Attribute[0x11] == pScrn->colorKey) -- ChipsStd->Attribute[0x11] = pScrn->colorKey - 1; -- } else -- ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */ -+ ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */ - ChipsStd->Attribute[0x12] = 0x0F; /* enable all color planes */ - ChipsStd->Attribute[0x13] = 0x00; /* horiz pixel panning 0 */ - -@@ -5558,8 +5426,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - /* set virtual screen width */ - tmp = pScrn->displayWidth >> 3; - if (pScrn->bitsPerPixel == 16) { -- if (!(cPtr->Flags & ChipsOverlay8plus16)) -- tmp <<= 1; /* double the width of the buffer */ -+ tmp <<= 1; /* double the width of the buffer */ - } else if (pScrn->bitsPerPixel == 24) { - tmp += tmp << 1; - } else if (pScrn->bitsPerPixel == 32) { -@@ -5688,8 +5555,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - - /* centering/stretching */ - if (!xf86ReturnOptValBool(cPtr->Options, OPTION_SUSPEND_HACK, FALSE)) { -- if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE) || -- (cPtr->Flags & ChipsOverlay8plus16)) { -+ if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE)) { - ChipsNew->FR[0x40] &= 0xDF; /* Disable Horizontal stretching */ - ChipsNew->FR[0x48] &= 0xFB; /* Disable vertical stretching */ - ChipsNew->XR[0xA0] = 0x10; /* Disable cursor stretching */ -@@ -5709,8 +5575,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - } - } - -- if ((xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) -- || (cPtr->Flags & ChipsOverlay8plus16)) { -+ if (xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) { - ChipsNew->FR[0x40] |= 0x3; /* Enable Horizontal centering */ - ChipsNew->FR[0x48] |= 0x3; /* Enable Vertical centering */ - } else { -@@ -5723,8 +5588,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - ChipsNew->XR[0x82] |=0x02; - - /* software mode flag */ -- ChipsNew->XR[0xE2] = chipsVideoMode(((cPtr->Flags & ChipsOverlay8plus16) ? -- 8 : pScrn->depth), (cPtr->PanelType & ChipsLCD) ? -+ ChipsNew->XR[0xE2] = chipsVideoMode((pScrn->depth), (cPtr->PanelType & ChipsLCD) ? - min(mode->CrtcHDisplay, cPtr->PanelSize.HDisplay) : - mode->CrtcHDisplay, mode->CrtcVDisplay); - #ifdef DEBUG -@@ -5762,7 +5626,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - } - } - /* bpp depend */ -- if ((pScrn->bitsPerPixel == 16) && (!(cPtr->Flags & ChipsOverlay8plus16))) { -+ if (pScrn->bitsPerPixel == 16) { - ChipsNew->XR[0x81] = (ChipsNew->XR[0x81] & 0xF0) | 0x4; - if (cPtr->Flags & ChipsGammaSupport) - ChipsNew->XR[0x82] |= 0x0C; -@@ -5915,60 +5779,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) - /* Turn off multimedia by default as it degrades performance */ - ChipsNew->XR[0xD0] &= 0x0f; - -- /* Setup the video/overlay */ -- if (cPtr->Flags & ChipsOverlay8plus16) { -- ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */ --#ifdef SAR04 -- ChipsNew->XR[0x4F] = 0x2A; /* SAR04 >352 pixel overlay width */ --#endif -- ChipsNew->MR[0x1E] &= 0xE0; /* Set Zoom and Direction */ -- if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE)) -- ChipsNew->MR[0x1E] |= 0x10; /* Interlace */ -- ChipsNew->MR[0x1F] &= 0x14; /* Mask reserved bits */ -- ChipsNew->MR[0x1F] |= 0x08; /* RGB 16bpp */ -- if (pScrn->weight.green == 5) -- ChipsNew->MR[0x1F] |= 0x01; /* RGB 15bpp */ -- -- ChipsNew->MR[0x20] &= 0x03; /* Mask reserved bits */ -- ChipsNew->MR[0x20] |= 0x80; /* Auto Centre, Use mem ptr1 */ -- ChipsNew->MR[0x22] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 1 */ -- ChipsNew->MR[0x23] = (cPtr->FbOffset16 >> 8) & 0xFF; -- ChipsNew->MR[0x24] = (cPtr->FbOffset16 >> 16) & 0xFF; -- ChipsNew->MR[0x25] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 2 */ -- ChipsNew->MR[0x26] = (cPtr->FbOffset16 >> 8) & 0xFF; -- ChipsNew->MR[0x27] = (cPtr->FbOffset16 >> 16) & 0xFF; -- ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */ -- ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1; -- -- /* Left Edge of Overlay */ -- ChipsNew->MR[0x2A] = cPtr->OverlaySkewX; -- ChipsNew->MR[0x2B] &= 0xF8; /* Mask reserved bits */ -- ChipsNew->MR[0x2B] |= ((cPtr->OverlaySkewX >> 8) & 0x7); -- /* Right Edge of Overlay */ -- ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth - -- 1) & 0xFF; -- ChipsNew->MR[0x2D] &= 0xF8; /* Mask reserved bits */ -- ChipsNew->MR[0x2D] |= ((cPtr->OverlaySkewX + pScrn->displayWidth - -- 1) >> 8) & 0x07; -- /* Top Edge of Overlay */ -- ChipsNew->MR[0x2E] = cPtr->OverlaySkewY; -- ChipsNew->MR[0x2F] &= 0xF8; -- ChipsNew->MR[0x2F] |= ((cPtr->OverlaySkewY >> 8) & 0x7); -- /* Bottom Edge of Overlay*/ -- ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF; -- ChipsNew->MR[0x31] &= 0xF8; /* Mask reserved bits */ -- ChipsNew->MR[0x31] |= ((cPtr->OverlaySkewY + pScrn->virtualY - -- 1 ) >> 8) & 0x07; -- -- ChipsNew->MR[0x3C] &= 0x18; /* Mask reserved bits */ -- ChipsNew->MR[0x3C] |= 0x07; /* Enable keyed overlay window */ -- ChipsNew->MR[0x3D] = 0x00; -- ChipsNew->MR[0x3E] = 0x00; -- ChipsNew->MR[0x3F] = pScrn->colorKey; /* 8bpp transparency key */ -- ChipsNew->MR[0x40] = 0xFF; -- ChipsNew->MR[0x41] = 0xFF; -- ChipsNew->MR[0x42] = 0x00; -- } else if (cPtr->Flags & ChipsVideoSupport) { -+ if (cPtr->Flags & ChipsVideoSupport) { - #if 0 /* if we do this even though video isn't playing we kill performance */ - ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */ - #endif -@@ -6877,8 +6688,7 @@ chipsRestoreExtendedRegs(ScrnInfoPtr pScrn, CHIPSRegPtr Regs) - } - - /* Set SAR04 multimedia register correctly */ -- if ((cPtr->Flags & ChipsOverlay8plus16) -- || (cPtr->Flags & ChipsVideoSupport)) { -+ if ((cPtr->Flags & ChipsVideoSupport)) { - #ifdef SAR04 - cPtr->writeXR(cPtr, 0x4E, 0x04); - if (cPtr->readXR(cPtr, 0x4F) != Regs->XR[0x4F]) -diff --git a/src/ct_driver.h b/src/ct_driver.h -index d8ce228..10a24d4 100644 ---- a/src/ct_driver.h -+++ b/src/ct_driver.h -@@ -114,7 +114,6 @@ typedef struct { - /* Options flags for the C&T chipsets */ - #define ChipsHWCursor 0x00001000 - #define ChipsShadowFB 0x00002000 --#define ChipsOverlay8plus16 0x00004000 - #define ChipsUseNewFB 0x00008000 - - /* Architecture type flags */ -diff --git a/src/ct_video.c b/src/ct_video.c -index a68acb9..c9e5bb4 100644 ---- a/src/ct_video.c -+++ b/src/ct_video.c -@@ -56,8 +56,7 @@ CHIPSInitVideo(ScreenPtr pScreen) - CHIPSPtr cPtr = CHIPSPTR(pScrn); - int num_adaptors; - -- if (!(cPtr->Flags & ChipsOverlay8plus16) && -- (cPtr->Flags & ChipsVideoSupport)) { -+ if ((cPtr->Flags & ChipsVideoSupport)) { - newAdaptor = CHIPSSetupImageVideo(pScreen); - CHIPSInitOffscreenImages(pScreen); - } --- -cgit v0.9.0.2-2-gbebe diff --git a/staging/xf86-video-cirrus/PKGBUILD b/staging/xf86-video-cirrus/PKGBUILD deleted file mode 100644 index 97cb832d3..000000000 --- a/staging/xf86-video-cirrus/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 136242 2011-08-25 07:33:51Z jgc $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-cirrus -pkgver=1.3.2 -pkgrel=7 -pkgdesc="X.org Cirrus Logic video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -md5sums=('8195d03ed0be0975c03441e66a9f53b3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-dummy/PKGBUILD b/staging/xf86-video-dummy/PKGBUILD deleted file mode 100644 index 059a046c1..000000000 --- a/staging/xf86-video-dummy/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 136251 2011-08-25 08:16:43Z jgc $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-dummy -pkgver=0.3.4 -pkgrel=5 -pkgdesc="X.org dummy video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902' 'xf86dgaproto') -conflicts=('xorg-server<1.10.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('876ed7165ea2821bbddd73232a1ce0b79c1f14ff') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-fbdev/PKGBUILD b/staging/xf86-video-fbdev/PKGBUILD deleted file mode 100644 index 27ea0d1b9..000000000 --- a/staging/xf86-video-fbdev/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 136257 2011-08-25 08:30:51Z jgc $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-fbdev -pkgver=0.4.2 -pkgrel=5 -pkgdesc="X.org framebuffer video driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('c8562f997d56c9fec50df6ca9892f39f43ff4c2c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-glint/PKGBUILD b/staging/xf86-video-glint/PKGBUILD deleted file mode 100644 index 5196ed928..000000000 --- a/staging/xf86-video-glint/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 136260 2011-08-25 08:51:06Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-glint -pkgver=1.2.5 -pkgrel=3 -pkgdesc="X.org GLINT/Permedia video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902' 'xf86dgaproto') -conflicts=('xorg-server<1.10.99.902') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch) -sha1sums=('28d54093c6485bf0055fa16be3d116f9107aaea7' - 'cc3a7b76e33755e8c9889ae1182ec468956dbc9c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - autoreconf -fi - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-i128/PKGBUILD b/staging/xf86-video-i128/PKGBUILD deleted file mode 100644 index d5fd925aa..000000000 --- a/staging/xf86-video-i128/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 136269 2011-08-25 09:19:54Z jgc $ -# Maintainer:Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-i128 -pkgver=1.3.4 -pkgrel=4 -pkgdesc="X.org Number 9 I128 video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('d5f755dc964eaa067b4efcafafd00814a60df775') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-i740/PKGBUILD b/staging/xf86-video-i740/PKGBUILD deleted file mode 100644 index c996027c7..000000000 --- a/staging/xf86-video-i740/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 136275 2011-08-25 09:31:54Z jgc $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-i740 -pkgver=1.3.2 -pkgrel=7 -pkgdesc="X.org Intel i740 video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('aadd2168153f780c487778e5fdda5473ed4b243d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-intel/PKGBUILD b/staging/xf86-video-intel/PKGBUILD deleted file mode 100644 index 2a00d7c4b..000000000 --- a/staging/xf86-video-intel/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 135088 2011-08-10 08:35:25Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-intel -pkgver=2.16.0 -pkgrel=1 -pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev) -makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender') -conflicts=('xorg-server<1.10.99.902' 'xf86-video-i810' 'xf86-video-intel-legacy') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('53441ea4d4335b501d32809b6b92593cbb1f79cf') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --enable-dri - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-mach64/PKGBUILD b/staging/xf86-video-mach64/PKGBUILD deleted file mode 100644 index 10f8babfa..000000000 --- a/staging/xf86-video-mach64/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 136287 2011-08-25 09:47:27Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-mach64 -pkgver=6.9.0 -pkgrel=2 -pkgdesc="X.org mach64 video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc' 'mach64-dri') -makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto') -conflicts=('xorg-server<1.10.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('95a7ec9761fe11dadbcd9078c55148198a91b2f1') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-dri - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-mga/PKGBUILD b/staging/xf86-video-mga/PKGBUILD deleted file mode 100644 index c08e47520..000000000 --- a/staging/xf86-video-mga/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 136293 2011-08-25 10:21:59Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-mga -pkgver=1.4.13 -pkgrel=4 -pkgdesc="X.org mga video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc' 'mga-dri') -makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto') -conflicts=('xorg-server<1.10.99.902') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch) -sha1sums=('55aa185cf381def4b5905c8b93694b8dfbd5c378' - '74782a39533ef475bd02b8b4645775879494e568') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - ./configure --prefix=/usr --enable-dri - make - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-neomagic/PKGBUILD b/staging/xf86-video-neomagic/PKGBUILD deleted file mode 100644 index 33637f4a0..000000000 --- a/staging/xf86-video-neomagic/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 136420 2011-08-29 08:17:07Z jgc $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-neomagic -pkgver=1.2.5 -pkgrel=5 -pkgdesc="X.org neomagic video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto') -conflicts=('xorg-server<1.11.0') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-nouveau/PKGBUILD b/staging/xf86-video-nouveau/PKGBUILD deleted file mode 100644 index eb970fd63..000000000 --- a/staging/xf86-video-nouveau/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 136432 2011-08-29 08:59:19Z ibiru $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: buddabrod <buddabrod@gmail.com> - -pkgname=xf86-video-nouveau -_gitdate=20110829 -pkgver=0.0.16_git${_gitdate} # see configure.ac -pkgrel=1 -pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)" -arch=('i686' 'x86_64') -url="http://nouveau.freedesktop.org/wiki/" -license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e -depends=('libdrm' 'udev') -optdepends=('nouveau-dri: experimental gallium3d features') -makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto') -conflicts=('xorg-server<1.11.0') -options=('!libtool') -install=${pkgname}.install -source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2) -md5sums=('8f484f6602a3711f4adfbce74fd886c1') - -# source PKGBUILD && mksource -mksource() { - mkdir /tmp/${pkgname}-${_gitdate} - pushd /tmp/${pkgname}-${_gitdate} - git clone -v --depth 1 git://anongit.freedesktop.org/nouveau/xf86-video-nouveau - cd xf86-video-nouveau - git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/${pkgname}-${_gitdate}/${pkgname}-${_gitdate}.tar.bz2 - popd -} - -build() { - cd ${srcdir}/xf86-video-nouveau-${_gitdate} - ./autogen.sh --prefix=/usr - make -} - -package() { - cd ${srcdir}/xf86-video-nouveau-${_gitdate} - make DESTDIR=${pkgdir} install -} diff --git a/staging/xf86-video-nouveau/xf86-video-nouveau.install b/staging/xf86-video-nouveau/xf86-video-nouveau.install deleted file mode 100644 index 027154ff3..000000000 --- a/staging/xf86-video-nouveau/xf86-video-nouveau.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install () { - cat << _EOF - ==> make sure you use KernelModeSetting (KMS) - ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more -_EOF -} - -post_upgrade() { - if [ "`vercmp $2 0.0.15_git20100117-1`" -lt 0 ]; then - cat << _EOF - ==> ATTENTION: Usermode support has been dropped - ==> make sure you use KernelModeSetting (KMS) - ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more -_EOF - fi -} diff --git a/staging/xf86-video-nv/PKGBUILD b/staging/xf86-video-nv/PKGBUILD deleted file mode 100644 index c752fe8b2..000000000 --- a/staging/xf86-video-nv/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 136430 2011-08-29 08:54:52Z jgc $ -# Maintainer:Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-nv -pkgver=2.1.18 -pkgrel=4 -pkgdesc="X.org nv video driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.0') -conflicts=('xorg-server<1.11.0') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('d35b2fa5a26a507a9cc95b69243d9fd0c0f32aa2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-openchrome/PKGBUILD b/staging/xf86-video-openchrome/PKGBUILD deleted file mode 100644 index 10153833b..000000000 --- a/staging/xf86-video-openchrome/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 136434 2011-08-29 09:20:09Z jgc $ -# Contributor: Paul Mattal <paul@mattal.com> -# Maintainer: Juergen Hoetzel <juergen@hoetzel.info> - -pkgname=xf86-video-openchrome -pkgver=0.2.904 -_svnver=r933 -pkgrel=6 -pkgdesc="X.Org Openchrome drivers" -arch=(i686 x86_64) -license=('custom') -url="http://www.openchrome.org" -depends=('libdrm' 'libxvmc' 'unichrome-dri') -makedepends=('xorg-server-devel>=1.11.0' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc' 'glproto') -replaces=('openchrome' 'xf86-video-via') -options=('!libtool' '!makeflags') -conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.11.0') -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-${_svnver}.tar.bz2) -md5sums=('d661460276a31d3d012d8cdb1a0a73c1') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-r128/PKGBUILD b/staging/xf86-video-r128/PKGBUILD deleted file mode 100644 index 214c11051..000000000 --- a/staging/xf86-video-r128/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 136428 2011-08-29 08:48:55Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-r128 -pkgver=6.8.1 -pkgrel=7 -pkgdesc="X.org ati Rage128 video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc' 'r128-dri') -makedepends=('xorg-server-devel>=1.11.0' 'xf86driproto' 'libdrm' 'mesa' 'glproto') -conflicts=('xorg-server<1.11.0') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch) -md5sums=('2b90854a62a4d45d652062f582dc8d13' - '3937776d4427861d0797e47119ac327d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - - autoreconf -fi - ./configure --prefix=/usr --enable-dri - make - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-r128/git-fixes.patch b/staging/xf86-video-r128/git-fixes.patch deleted file mode 100644 index 933e8fb2a..000000000 --- a/staging/xf86-video-r128/git-fixes.patch +++ /dev/null @@ -1,842 +0,0 @@ -diff --git a/COPYING b/COPYING -index 7f33cbf..05bcb74 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,12 +1,91 @@ --This is a stub file. This package has not yet had its complete licensing --information compiled. Please see the individual source files for details on --your rights to use and modify this software. -+Copyright 2007 George Sapountzis - --Please submit updated COPYING files to the Xorg bugzilla: -+Permission is hereby granted, free of charge, to any person obtaining a -+copy of this software and associated documentation files (the "Software"), -+to deal in the Software without restriction, including without limitation -+the rights to use, copy, modify, merge, publish, distribute, sublicense, -+and/or sell copies of the Software, and to permit persons to whom the -+Software is furnished to do so, subject to the following conditions: - --https://bugs.freedesktop.org/enter_bug.cgi?product=xorg -+The above copyright notice and this permission notice (including the next -+paragraph) shall be included in all copies or substantial portions of the -+Software. - --All licensing questions regarding this software should be directed at the --Xorg mailing list: -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+ -+Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario, -+ Precision Insight, Inc., Cedar Park, Texas, and -+ VA Linux Systems Inc., Fremont, California. -+ -+All Rights Reserved. -+ -+Permission is hereby granted, free of charge, to any person obtaining -+a copy of this software and associated documentation files (the -+"Software"), to deal in the Software without restriction, including -+without limitation on the rights to use, copy, modify, merge, -+publish, distribute, sublicense, and/or sell copies of the Software, -+and to permit persons to whom the Software is furnished to do so, -+subject to the following conditions: -+ -+The above copyright notice and this permission notice (including the -+next paragraph) shall be included in all copies or substantial -+portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+NON-INFRINGEMENT. IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX -+SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+OTHER DEALINGS IN THE SOFTWARE. -+ -+Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. -+Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas. -+All Rights Reserved. -+ -+Permission is hereby granted, free of charge, to any person obtaining a -+copy of this software and associated documentation files (the "Software"), -+to deal in the Software without restriction, including without limitation -+the rights to use, copy, modify, merge, publish, distribute, sublicense, -+and/or sell copies of the Software, and to permit persons to whom the -+Software is furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice (including the next -+paragraph) shall be included in all copies or substantial portions of the -+Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+DEALINGS IN THE SOFTWARE. -+ -+Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org -+ -+Permission to use, copy, modify, distribute, and sell this software and its -+documentation for any purpose is hereby granted without fee, provided that -+the above copyright notice appear in all copies and that both that copyright -+notice and this permission notice appear in supporting documentation, and -+that the name of Marc Aurele La France not be used in advertising or -+publicity pertaining to distribution of the software without specific, -+written prior permission. Marc Aurele La France makes no representations -+about the suitability of this software for any purpose. It is provided -+"as-is" without express or implied warranty. -+ -+MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO -+EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+PERFORMANCE OF THIS SOFTWARE. - --http://lists.freedesktop.org/mailman/listinfo/xorg -diff --git a/Makefile.am b/Makefile.am -index 1f4c3c4..4c278ba 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,21 +18,15 @@ - # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --AUTOMAKE_OPTIONS = foreign - SUBDIRS = src man -+MAINTAINERCLEANFILES = ChangeLog INSTALL - --if BUILD_LINUXDOC --README.r128: README.r128.sgml -- $(MAKE_TEXT) README.r128.sgml && mv README.r128.txt README.r128 -+.PHONY: ChangeLog INSTALL - --endif -- --EXTRA_DIST = README.r128 README.r128.sgml ChangeLog --CLEANFILES = ChangeLog -- --.PHONY: ChangeLog -+INSTALL: -+ $(INSTALL_CMD) - - ChangeLog: - $(CHANGELOG_CMD) - --dist-hook: ChangeLog -+dist-hook: ChangeLog INSTALL -diff --git a/README b/README -index cb61870..5c6f59d 100644 ---- a/README -+++ b/README -@@ -1,4 +1,161 @@ --xf86-video-r128 - ATI Rage 128 video driver for the Xorg X server -+ Information for ATI Rage 128 Users -+ Precision Insight, Inc., SuSE GmbH -+ 13 June 2000 -+ ____________________________________________________________ -+ -+ Table of Contents -+ -+ -+ 1. Supported Hardware -+ 2. Features -+ 3. Technical Notes -+ 4. Reported Working Video Cards -+ 5. Configuration -+ 6. Driver Options -+ 7. Known Limitations -+ 8. Authors -+ -+ -+ ______________________________________________________________________ -+ -+ 1. Supported Hardware -+ -+ -+ o ATI Rage 128 based cards -+ -+ -+ -+ 2. Features -+ -+ -+ o Full support (including hardware accelerated 2D drawing) for 8, 15, -+ 16, 24 bit pixel depths. -+ -+ o Hardware cursor support to reduce sprite flicker. -+ -+ o Support for high resolution video modes up to 1800x1440 @ 70Hz. -+ -+ o Support for doublescan video modes (e.g., 320x200 and 320x240). -+ -+ o Support for gamma correction at all pixel depths. -+ -+ o Fully programmable clock supported. -+ -+ o Robust text mode restore for VT switching. -+ -+ -+ -+ 3. Technical Notes -+ -+ -+ o None -+ -+ -+ -+ 4. Reported Working Video Cards -+ -+ -+ o Rage Fury AGP 32MB -+ -+ o XPERT 128 AGP 16MB -+ -+ o XPERT 99 AGP 8MB -+ -+ -+ -+ 5. Configuration -+ -+ The driver auto-detects all device information necessary to initialize -+ the card. The only lines you need in the "Device" section of your -+ xorg.conf file are: -+ -+ Section "Device" -+ Identifier "Rage 128" -+ Driver "r128" -+ EndSection -+ -+ -+ or let xorgconfig do this for you. -+ -+ However, if you have problems with auto-detection, you can specify: -+ -+ o VideoRam - in kilobytes -+ -+ o MemBase - physical address of the linear framebuffer -+ -+ o IOBase - physical address of the memory mapped IO registers -+ -+ o ChipID - PCI DEVICE ID -+ -+ -+ -+ 6. Driver Options -+ -+ -+ o "hw_cursor" - request hardware cursor (default) -+ -+ o "sw_cursor" - software cursor only -+ -+ o "no_accel" - software rendering only -+ -+ o "dac_8_bit" - use color weight 888 in 8 bpp mode (default) -+ -+ o "dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation) -+ -+ -+ -+ 7. Known Limitations -+ -+ -+ o None -+ -+ -+ -+ 8. Authors -+ -+ The X11R7.5 driver was originally part of XFree86 4.4 rc2. -+ -+ The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by: -+ -+ o Rickard E. (Rik) Faith <mailto:faith@precisioninsight.com> -+ -+ o Kevin E. Martin <mailto:kevin@precisioninsight.com> -+ -+ The XFree86 4 driver was funded by ATI and was donated to The XFree86 -+ Project by: -+ -+ Precision Insight, Inc. -+ Cedar Park, TX -+ USA -+ -+ -+ The XFree86 3.3.x driver used for the port was written by: -+ -+ o Rickard E. (Rik) Faith <mailto:faith@precisioninsight.com> -+ -+ o Kevin E. Martin <mailto:kevin@precisioninsight.com> -+ -+ The XFree86 3.3.x driver was funded by ATI and was donated to The -+ XFree86 Project by Precision Insight, Inc. It was based in part on -+ an earlier driver that was written by: -+ -+ o Alan Hourihane <mailto:alanh@fairlite.demon.co.uk> -+ -+ o Dirk Hohndel <mailto:hohndel@suse.de> -+ -+ This early driver was funded and donated to The XFree86 Project by: -+ -+ SuSE GmbH -+ Schanzaekerstr. 10 -+ 90443 Nuernberg -+ Germany -+ -+ -+ -+ http://www.precisioninsight.com -+ -+ http://www.suse.com -+ - - Please submit bugs & patches to the Xorg bugzilla: - -diff --git a/README.r128 b/README.r128 -deleted file mode 100644 -index dcc2715..0000000 ---- a/README.r128 -+++ /dev/null -@@ -1,160 +0,0 @@ -- Information for ATI Rage 128 Users -- Precision Insight, Inc., SuSE GmbH -- 13 June 2000 -- ____________________________________________________________ -- -- Table of Contents -- -- -- 1. Supported Hardware -- 2. Features -- 3. Technical Notes -- 4. Reported Working Video Cards -- 5. Configuration -- 6. Driver Options -- 7. Known Limitations -- 8. Authors -- -- -- ______________________________________________________________________ -- -- [1m1. Supported Hardware[0m -- -- -- +o ATI Rage 128 based cards -- -- -- -- [1m2. Features[0m -- -- -- +o Full support (including hardware accelerated 2D drawing) for 8, 15, -- 16, 24 bit pixel depths. -- -- +o Hardware cursor support to reduce sprite flicker. -- -- +o Support for high resolution video modes up to 1800x1440 @ 70Hz. -- -- +o Support for doublescan video modes (e.g., 320x200 and 320x240). -- -- +o Support for gamma correction at all pixel depths. -- -- +o Fully programmable clock supported. -- -- +o Robust text mode restore for VT switching. -- -- -- -- [1m3. Technical Notes[0m -- -- -- +o None -- -- -- -- [1m4. Reported Working Video Cards[0m -- -- -- +o Rage Fury AGP 32MB -- -- +o XPERT 128 AGP 16MB -- -- +o XPERT 99 AGP 8MB -- -- -- -- [1m5. Configuration[0m -- -- The driver auto-detects all device information necessary to initialize -- the card. The only lines you need in the "Device" section of your -- xorg.conf file are: -- -- Section "Device" -- Identifier "Rage 128" -- Driver "r128" -- EndSection -- -- -- or let xorgconfig do this for you. -- -- However, if you have problems with auto-detection, you can specify: -- -- +o VideoRam - in kilobytes -- -- +o MemBase - physical address of the linear framebuffer -- -- +o IOBase - physical address of the memory mapped IO registers -- -- +o ChipID - PCI DEVICE ID -- -- -- -- [1m6. Driver Options[0m -- -- -- +o "hw_cursor" - request hardware cursor (default) -- -- +o "sw_cursor" - software cursor only -- -- +o "no_accel" - software rendering only -- -- +o "dac_8_bit" - use color weight 888 in 8 bpp mode (default) -- -- +o "dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation) -- -- -- -- [1m7. Known Limitations[0m -- -- -- +o None -- -- -- -- [1m8. Authors[0m -- -- The X11R6.8 driver was originally part of XFree86 4.4 rc2. -- -- The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by: -- -- +o Rickard E. (Rik) Faith <faith@precisioninsight.com> -- -- +o Kevin E. Martin <kevin@precisioninsight.com> -- -- The XFree86 4 driver was funded by ATI and was donated to The XFree86 -- Project by: -- -- Precision Insight, Inc. -- Cedar Park, TX -- USA -- -- -- The XFree86 3.3.x driver used for the port was written by: -- -- +o Rickard E. (Rik) Faith <faith@precisioninsight.com> -- -- +o Kevin E. Martin <kevin@precisioninsight.com> -- -- The XFree86 3.3.x driver was funded by ATI and was donated to The -- XFree86 Project by Precision Insight, Inc. It was based in part on -- an earlier driver that was written by: -- -- +o Alan Hourihane <alanh@fairlite.demon.co.uk> -- -- +o Dirk Hohndel <hohndel@suse.de> -- -- This early driver was funded and donated to The XFree86 Project by: -- -- SuSE GmbH -- Schanzaekerstr. 10 -- 90443 Nuernberg -- Germany -- -- -- -- http://www.precisioninsight.com -- -- http://www.suse.com -- -- -- -diff --git a/README.r128.sgml b/README.r128.sgml -deleted file mode 100644 -index 8d7f448..0000000 ---- a/README.r128.sgml -+++ /dev/null -@@ -1,138 +0,0 @@ --<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[ --<!ENTITY % defs SYSTEM "defs.ent"> %defs; --]> -- --<article> --<title>Information for ATI Rage 128 Users --<author>Precision Insight, Inc., SuSE GmbH --<date>13 June 2000 -- --<ident> --</ident> -- --<toc> -- --<sect>Supported Hardware --<p> --<itemize> -- <item>ATI Rage 128 based cards --</itemize> -- -- --<sect>Features --<p> --<itemize> -- <item>Full support (including hardware accelerated 2D drawing) for 8, 15, -- 16, 24 bit pixel depths. -- <item>Hardware cursor support to reduce sprite flicker. -- <item>Support for high resolution video modes up to 1800x1440 @ 70Hz. -- <item>Support for doublescan video modes (e.g., 320x200 and 320x240). -- <item>Support for gamma correction at all pixel depths. -- <item>Fully programmable clock supported. -- <item>Robust text mode restore for VT switching. --</itemize> -- -- --<sect>Technical Notes --<p> --<itemize> -- <item>None --</itemize> -- -- --<sect>Reported Working Video Cards --<p> --<itemize> -- <item>Rage Fury AGP 32MB -- <item>XPERT 128 AGP 16MB -- <item>XPERT 99 AGP 8MB --</itemize> -- -- --<sect>Configuration --<p> --The driver auto-detects all device information necessary to --initialize the card. The only lines you need in the "Device" --section of your xorg.conf file are: --<verb> -- Section "Device" -- Identifier "Rage 128" -- Driver "r128" -- EndSection --</verb> --or let <tt>xorgconfig</tt> do this for you. -- --However, if you have problems with auto-detection, you can specify: --<itemize> -- <item>VideoRam - in kilobytes -- <item>MemBase - physical address of the linear framebuffer -- <item>IOBase - physical address of the memory mapped IO registers -- <item>ChipID - PCI DEVICE ID --</itemize> -- -- --<sect>Driver Options --<p> --<itemize> -- <item>"hw_cursor" - request hardware cursor (default) -- <item>"sw_cursor" - software cursor only -- <item>"no_accel" - software rendering only -- <item>"dac_8_bit" - use color weight 888 in 8 bpp mode (default) -- <item>"dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation) --</itemize> -- -- --<sect>Known Limitations --<p> --<itemize> -- <item>None --</itemize> -- -- --<sect>Authors --<p> --The X11R&relvers; driver was originally part of XFree86 4.4 rc2. -- --The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by: --<itemize> -- <item>Rickard E. (Rik) Faith <email>faith@precisioninsight.com</email> -- <item>Kevin E. Martin <email>kevin@precisioninsight.com</email> --</itemize> --<p> --The XFree86 4 driver was funded by ATI and was donated to The XFree86 --Project by: --<verb> -- Precision Insight, Inc. -- Cedar Park, TX -- USA --</verb> --<p> --The XFree86 3.3.x driver used for the port was written by: --<itemize> -- <item>Rickard E. (Rik) Faith <email>faith@precisioninsight.com</email> -- <item>Kevin E. Martin <email>kevin@precisioninsight.com</email> --</itemize> --The XFree86 3.3.x driver was funded by ATI and was donated to The XFree86 --Project by Precision Insight, Inc. It was based in part on an earlier --driver that was written by: --<itemize> -- <item>Alan Hourihane <email>alanh@fairlite.demon.co.uk</email> -- <item>Dirk Hohndel <email>hohndel@suse.de</email> --</itemize> --<p>This early driver was funded and donated to The XFree86 Project by: --<verb> -- SuSE GmbH -- Schanzaekerstr. 10 -- 90443 Nuernberg -- Germany --</verb> -- --<p> --<htmlurl name="http://www.precisioninsight.com" -- url="http://www.precisioninsight.com"> --<p> --<htmlurl name="http://www.suse.com" -- url="http://www.suse.com"> -- -- --</article> -diff --git a/configure.ac b/configure.ac -index 4e0f463..d5a0821 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,28 +20,30 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-r128], -- 6.8.1, -+ [6.8.1], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-r128) -- -+ [xf86-video-r128]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - --AM_INIT_AUTOMAKE([dist-bzip2]) -+# Initialize Automake -+AM_INIT_AUTOMAKE([foreign dist-bzip2]) - --# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG --m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) --XORG_MACROS_VERSION(1.2) -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -+m4_ifndef([XORG_MACROS_VERSION], -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) -+XORG_DEFAULT_OPTIONS - - AM_MAINTAINER_MODE - --# Checks for programs. -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC - - if test "x$GCC" = "xyes"; then - CPPFLAGS="$CPPFLAGS -Wall" -@@ -49,38 +51,35 @@ fi - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) - --AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri], -+AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], - [Disable DRI support [[default=auto]]]), - [DRI="$enableval"], - [DRI=auto]) - --# Checks for extensions --XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) - XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - --# Checks for pkg-config packages -+# Obtain compiler/linker options for the driver dependencies - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES]) - PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], - HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), - HAVE_XEXTPROTO_71="no") - AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) --sdkdir=$(pkg-config --variable=sdkdir xorg-server) -+sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` - - # Checks for libraries. - --# Checks for header files. --AC_HEADER_STDC -- - if test "$DRI" != no; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) -@@ -126,26 +125,20 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then - fi - AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - --AC_SUBST([XORG_CFLAGS]) --AC_SUBST([DRI_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=r128 - AC_SUBST([DRIVER_NAME]) - --XORG_MANPAGE_SECTIONS --XORG_RELEASE_VERSION --XORG_CHECK_LINUXDOC --XORG_CHANGELOG -- - AC_MSG_NOTICE( - [Please change the Driver line in xorg.conf from "ati" to "r128" or install] - [the ati wrapper as well:] - [ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ati] - ) - --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index 858ba62..4e22d61 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,27 +1,24 @@ - # - # Copyright 2005 Sun Microsystems, Inc. All rights reserved. --# --# Permission to use, copy, modify, distribute, and sell this software and its --# documentation for any purpose is hereby granted without fee, provided that --# the above copyright notice appear in all copies and that both that --# copyright notice and this permission notice appear in supporting --# documentation. --# --# The above copyright notice and this permission notice shall be included --# in all copies or substantial portions of the Software. --# --# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. --# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR --# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, --# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR --# OTHER DEALINGS IN THE SOFTWARE. --# --# Except as contained in this notice, the name of the copyright holders shall --# not be used in advertising or otherwise to promote the sale, use or --# other dealings in this Software without prior written authorization --# from the copyright holders. -+# -+# Permission is hereby granted, free of charge, to any person obtaining a -+# copy of this software and associated documentation files (the "Software"), -+# to deal in the Software without restriction, including without limitation -+# the rights to use, copy, modify, merge, publish, distribute, sublicense, -+# and/or sell copies of the Software, and to permit persons to whom the -+# Software is furnished to do so, subject to the following conditions: -+# -+# The above copyright notice and this permission notice (including the next -+# paragraph) shall be included in all copies or substantial portions of the -+# Software. -+# -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+# DEALINGS IN THE SOFTWARE. - # - - drivermandir = $(DRIVER_MAN_DIR) -@@ -34,25 +31,11 @@ EXTRA_DIST = r128.man - - CLEANFILES = $(driverman_DATA) - --SED = sed - --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure - --MAN_SUBSTS = \ -- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xservername__|Xorg|g' \ -- -e 's|__xconfigfile__|xorg.conf|g' \ -- -e 's|__projectroot__|$(prefix)|g' \ -- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - - .man.$(DRIVER_MAN_SUFFIX): -- sed $(MAN_SUBSTS) < $< > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -diff --git a/man/r128.man b/man/r128.man -index 5c7c4fe..4ba933d 100644 ---- a/man/r128.man -+++ b/man/r128.man -@@ -1,4 +1,3 @@ --.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128.man,v 1.3 2001/06/01 02:10:05 dawes Exp $ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' - .TH R128 __drivermansuffix__ __vendorversion__ -diff --git a/src/r128_driver.c b/src/r128_driver.c -index d6448b6..9d08d77 100644 ---- a/src/r128_driver.c -+++ b/src/r128_driver.c -@@ -938,14 +938,6 @@ static Bool R128PreInitConfig(ScrnInfoPtr pScrn) - /* BIOS */ - from = X_PROBED; - info->BIOSAddr = info->PciInfo->biosBase & 0xfffe0000; -- if (dev->BiosBase) { -- xf86DrvMsg(pScrn->scrnIndex, X_INFO, -- "BIOS address override, using 0x%08lx instead of 0x%08lx\n", -- dev->BiosBase, -- info->BIOSAddr); -- info->BIOSAddr = dev->BiosBase; -- from = X_CONFIG; -- } - if (info->BIOSAddr) { - xf86DrvMsg(pScrn->scrnIndex, from, - "BIOS at 0x%08lx\n", info->BIOSAddr); diff --git a/staging/xf86-video-rendition/PKGBUILD b/staging/xf86-video-rendition/PKGBUILD deleted file mode 100644 index 703577317..000000000 --- a/staging/xf86-video-rendition/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 136426 2011-08-29 08:41:36Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-rendition -pkgver=4.2.4 -pkgrel=5 -pkgdesc="X.org Rendition video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.0') -conflicts=('xorg-server<1.11.0') -options=('!libtool' '!strip') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('16148c25183f7829c22bc9dfdb588c1a16bf4565') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" - - strip --strip-unneeded "${pkgdir}/usr/lib/xorg/modules/drivers/rendition_drv.so" -} diff --git a/staging/xf86-video-s3/LICENSE b/staging/xf86-video-s3/LICENSE deleted file mode 100644 index a4c8d5dd4..000000000 --- a/staging/xf86-video-s3/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -This package was downloaded from -http://xorg.freedesktop.org/releases/individual/driver/ - - Copyright 2001 Ani Joshi <ajoshi@unixbox.com> - - XFree86 4.x driver for S3 chipsets - - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that copyright -notice and this permission notice appear in supporting documentation and -that the name of Ani Joshi not be used in advertising or -publicity pertaining to distribution of the software without specific, -written prior permission. Ani Joshi makes no representations -about the suitability of this software for any purpose. It is provided -"as-is" without express or implied warranty. - -ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. diff --git a/staging/xf86-video-s3/PKGBUILD b/staging/xf86-video-s3/PKGBUILD deleted file mode 100644 index 943a07d97..000000000 --- a/staging/xf86-video-s3/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 136424 2011-08-29 08:32:45Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-s3 -pkgver=0.6.3 -pkgrel=6 -pkgdesc="X.org S3 video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.0') -conflicts=('xorg-server<1.11.0') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch) -md5sums=('5eb06d88533fb327d067928faeb20860' - '77a455ce7e254c73b1cbd408c7f4ecf4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - autoreconf -fi - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/xf86-video-s3/git-fixes.patch b/staging/xf86-video-s3/git-fixes.patch deleted file mode 100644 index 712b3c9c0..000000000 --- a/staging/xf86-video-s3/git-fixes.patch +++ /dev/null @@ -1,458 +0,0 @@ -diff --git a/COPYING b/COPYING -index 7f33cbf..458ab5f 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,12 +1,70 @@ --This is a stub file. This package has not yet had its complete licensing --information compiled. Please see the individual source files for details on --your rights to use and modify this software. -+ Copyright 2001 Ani Joshi <ajoshi@unixbox.com> - --Please submit updated COPYING files to the Xorg bugzilla: -+ XFree86 4.x driver for S3 chipsets - --https://bugs.freedesktop.org/enter_bug.cgi?product=xorg - --All licensing questions regarding this software should be directed at the --Xorg mailing list: -+Permission to use, copy, modify, distribute, and sell this software and its -+documentation for any purpose is hereby granted without fee, provided that -+the above copyright notice appear in all copies and that both that copyright -+notice and this permission notice appear in supporting documentation and -+that the name of Ani Joshi not be used in advertising or -+publicity pertaining to distribution of the software without specific, -+written prior permission. Ani Joshi makes no representations -+about the suitability of this software for any purpose. It is provided -+"as-is" without express or implied warranty. -+ -+ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+PERFORMANCE OF THIS SOFTWARE. -+Copyright 2007 George Sapountzis -+ -+Permission is hereby granted, free of charge, to any person obtaining a -+copy of this software and associated documentation files (the "Software"), -+to deal in the Software without restriction, including without limitation -+the rights to use, copy, modify, merge, publish, distribute, sublicense, -+and/or sell copies of the Software, and to permit persons to whom the -+Software is furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice (including the next -+paragraph) shall be included in all copies or substantial portions of the -+Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -+SOFTWARE. -+ -+Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy of -+this software and associated documentation files (the "Software"), to deal in -+the Software without restriction, including without limitation the rights to -+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -+of the Software, and to permit persons to whom the Software is furnished to do -+so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in all -+copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ -+Except as contained in this notice, the name of the XFree86 Project shall not -+be used in advertising or otherwise to promote the sale, use or other dealings -+in this Software without prior written authorization from the XFree86 Project. -+ -+ -+Copyright 1995-1997 The XFree86 Project, Inc. -+Copyright (c) 1999,2000 The XFree86 Project Inc. - --http://lists.freedesktop.org/mailman/listinfo/xorg -diff --git a/ChangeLog b/ChangeLog -deleted file mode 100644 -index ad0b227..0000000 ---- a/ChangeLog -+++ /dev/null -@@ -1,133 +0,0 @@ --2009-06-25 Evgeny M. zubok <evgeny.zubok@tochka.ru> -- -- * src/s3_driver.c: -- Revert the old behaviour when the BIOS settings are used for -- intialization of DRAM/VRAM timings, i. e. we don't touch the -- timings during initialization phase until any memory option (like -- slow_edodram) is specified. -- -- Add manual page. -- --2009-05-25 Evgeny M. Zubok <evgeny.zubok@tochka.ru> -- -- * src/s3_driver.c: -- * src/s3_video.c: -- -- Enable Xv extension for Trio64V+ (thanks to Egor Ivanov for -- testing on real hardware) and Trio64UV+ (Tested only on Trio64V2 by -- overriding Chipset with "Trio64UV+" but not on real hardware). -- -- S3 Trio64V+ now using NewMMIO. Trio64V+ chips have the same ChipId -- as Trio32/64 but only with chip revision greater or eq 0x40. So if -- you have problems with NewMMIO, you may override ChipRev in "Device" -- section of your xorg.conf: "ChipRev" 0x00. Note: disabling the NewMMIO -- also disables overlay video (Xv) because it isn't implemented for -- Old MMIO yet. -- --2009-05-04 Evgeny M. Zubok <evgeny.zubok@tochka.ru> -- -- * src/s3_driver.c: -- * src/s3_shadow.c: -- -- Add shadowFB option. It can be used to speedup drawing when -- hardware acceleration is undesirable or unavailable (for colour depth -- 24 with 24 bpp framebuffer, for example). shadowFB is disabled by -- default. Enabling shadowFB option disables HW acceleration. Thanks -- to Egor Ivanov for initial porting of shadowFB from s3virge. -- -- Interlace mode support. -- -- Close bug #14999. -- --2008-07-06 Evgeny M. Zubok <evgeny.zubok@tochka.ru> -- -- * src/s3_video.c: -- -- Streams Processor initialization. -- -- XVideo support for 16, 24 and 32 bpp (only for TRIO64V2). -- -- * src/s3_driver.c: -- -- Add XVideo option (enabled by default). -- -- Replace "swcursor" by "hwcursor" option (HW cursor -- not implemented yet for all chipsets). -- -- Close bug #5527: 24-bit colour depth support (24bpp and -- 32bpp framebuffer) for TRIOs. Acceleration doesn't work -- with packed colour mode (24 bpp FB) but works with 32bpp -- framebuffer mode (hardware limitation? -- need data). -- -- Fix system hang-up when switching between console and X session. -- -- Some minor changes of driver messages. -- --2008-02-23 Evgeny M. Zubok <evgeny.zubok@tochka.ru> -- -- * src/s3_driver.c: Add DPMS support for S3 Trio64V2 and possibly -- others (need testing): S3 Trio64UV+. S3 Aurora64V+ and S3 Trio32/64 -- * src/s3_Trio64DAC: Change clocks for S3 Trio64V2 to make -- the 1024x768@16bpp mode work. -- Thanks to Richard Driscoll for these patches. -- --2006-04-07 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- * src/s3.h: -- Bump to 0.4.1 for Xv changes. -- --2006-04-07 Aaron Plattner <aplattner@nvidia.com> -- -- * src/s3_video.c: (S3PutImage): -- Add a DrawablePtr argument to the XV functions to pave the way for -- redirected video. -- --2006-04-07 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- * src/s3.h: -- * src/s3_IBMRGB.c: -- * src/s3_Ti.c: -- * src/s3_Trio64DAC.c: -- * src/s3_bios.c: -- * src/s3_cursor.c: -- * src/s3_dga.c: -- * src/s3_driver.c: -- * src/s3_video.c: -- Unlibcwrap. Bump server version requirement. Bump to 0.4.0. -- --2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version for X11R7 release. -- --2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for final X11R7 release candidate. -- --2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for X11R7 RC3 release. -- --2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Remove extraneous AC_MSG_RESULT. -- --2005-11-29 Adam Jackson <ajax@freedesktop.org> -- -- * configure.ac: -- Only build dlloader modules by default. -- --2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update package version number for X11R7 RC2 release. -- --2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> -- -- * configure.ac: -- Update pkgcheck dependencies to work with separate build roots. -diff --git a/Makefile.am b/Makefile.am -index 7052905..4c278ba 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,5 +18,15 @@ - # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --AUTOMAKE_OPTIONS = foreign - SUBDIRS = src man -+MAINTAINERCLEANFILES = ChangeLog INSTALL -+ -+.PHONY: ChangeLog INSTALL -+ -+INSTALL: -+ $(INSTALL_CMD) -+ -+ChangeLog: -+ $(CHANGELOG_CMD) -+ -+dist-hook: ChangeLog INSTALL -diff --git a/configure.ac b/configure.ac -index 0eecc87..0ac34f9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,42 +20,50 @@ - # - # Process this file with autoconf to produce a configure script - --AC_PREREQ(2.57) -+# Initialize Autoconf -+AC_PREREQ([2.60]) - AC_INIT([xf86-video-s3], -- 0.6.3, -+ [0.6.3], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], -- xf86-video-s3) -- -+ [xf86-video-s3]) - AC_CONFIG_SRCDIR([Makefile.am]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_AUX_DIR(.) - --AM_INIT_AUTOMAKE([dist-bzip2]) -- -+# Initialize Automake -+AM_INIT_AUTOMAKE([foreign dist-bzip2]) - AM_MAINTAINER_MODE - --# Checks for programs. -+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -+m4_ifndef([XORG_MACROS_VERSION], -+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -+XORG_MACROS_VERSION(1.8) -+XORG_DEFAULT_OPTIONS -+ -+# Initialize libtool - AC_DISABLE_STATIC - AC_PROG_LIBTOOL --AC_PROG_CC -+ -+# Checks for programs. -+AM_PROG_CC_C_O - - AH_TOP([#include "xorg-server.h"]) - -+# Define a configure option for an alternate module directory - AC_ARG_WITH(xorg-module-dir, -- AC_HELP_STRING([--with-xorg-module-dir=DIR], -+ AS_HELP_STRING([--with-xorg-module-dir=DIR], - [Default xorg module directory [[default=$libdir/xorg/modules]]]), - [moduledir="$withval"], - [moduledir="$libdir/xorg/modules"]) - --# Checks for extensions -+# Store the list of server defined optional extensions in REQUIRED_MODULES - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - --# Checks for pkg-config packages -+# Obtain compiler/linker options for the driver dependencies - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4 xproto fontsproto $REQUIRED_MODULES]) --sdkdir=$(pkg-config --variable=sdkdir xorg-server) - - # Checks for libraries. - SAVE_CPPFLAGS="$CPPFLAGS" -@@ -65,28 +73,20 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS, - [#include "xorg-server.h"]) - CPPFLAGS="$SAVE_CPPFLAGS" - --# Checks for header files. --AC_HEADER_STDC -- - if test "x$XSERVER_LIBPCIACCESS" = xyes; then - PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) - XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" - fi - AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) - --AC_SUBST([XORG_CFLAGS]) - AC_SUBST([moduledir]) - - DRIVER_NAME=s3 - AC_SUBST([DRIVER_NAME]) - --XORG_MANPAGE_SECTIONS --XORG_RELEASE_VERSION -- --XORG_CHECK_LINUXDOC -- --AC_OUTPUT([ -- Makefile -- src/Makefile -- man/Makefile -+AC_CONFIG_FILES([ -+ Makefile -+ src/Makefile -+ man/Makefile - ]) -+AC_OUTPUT -diff --git a/man/Makefile.am b/man/Makefile.am -index f0eb29b..b3688ce 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -1,27 +1,24 @@ - # - # Copyright 2005 Sun Microsystems, Inc. All rights reserved. --# --# Permission to use, copy, modify, distribute, and sell this software and its --# documentation for any purpose is hereby granted without fee, provided that --# the above copyright notice appear in all copies and that both that --# copyright notice and this permission notice appear in supporting --# documentation. --# --# The above copyright notice and this permission notice shall be included --# in all copies or substantial portions of the Software. --# --# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS --# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. --# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR --# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, --# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR --# OTHER DEALINGS IN THE SOFTWARE. --# --# Except as contained in this notice, the name of the copyright holders shall --# not be used in advertising or otherwise to promote the sale, use or --# other dealings in this Software without prior written authorization --# from the copyright holders. -+# -+# Permission is hereby granted, free of charge, to any person obtaining a -+# copy of this software and associated documentation files (the "Software"), -+# to deal in the Software without restriction, including without limitation -+# the rights to use, copy, modify, merge, publish, distribute, sublicense, -+# and/or sell copies of the Software, and to permit persons to whom the -+# Software is furnished to do so, subject to the following conditions: -+# -+# The above copyright notice and this permission notice (including the next -+# paragraph) shall be included in all copies or substantial portions of the -+# Software. -+# -+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+# DEALINGS IN THE SOFTWARE. - # - - drivermandir = $(DRIVER_MAN_DIR) -@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man - - CLEANFILES = $(driverman_DATA) - --SED = sed - --# Strings to replace in man pages --XORGRELSTRING = @PACKAGE_STRING@ -- XORGMANNAME = X Version 11 -+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure - --MAN_SUBSTS = \ -- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ -- -e 's|__xservername__|Xorg|g' \ -- -e 's|__xconfigfile__|xorg.conf|g' \ -- -e 's|__projectroot__|$(prefix)|g' \ -- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ -- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ -- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ -- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ -- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - - SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - - .man.$(DRIVER_MAN_SUFFIX): -- sed $(MAN_SUBSTS) < $< > $@ -+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -diff --git a/src/s3.h b/src/s3.h -index 49b8a54..0875fc9 100644 ---- a/src/s3.h -+++ b/src/s3.h -@@ -113,7 +113,6 @@ typedef struct _S3Rec { - XAAInfoRecPtr pXAA; - xf86CursorInfoPtr pCurs; - xf86Int10InfoPtr pInt10; -- vbeInfoPtr pVBE; - XF86VideoAdaptorPtr adaptor; - S3PortPrivPtr portPrivate; - -diff --git a/src/s3_driver.c b/src/s3_driver.c -index 29e343d..4519b33 100644 ---- a/src/s3_driver.c -+++ b/src/s3_driver.c -@@ -309,6 +309,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags) - S3Ptr pS3; - vgaHWPtr hwp; - ClockRangePtr clockRanges; -+ vbeInfoPtr pVBE; - rgb zeros = {0, 0, 0}; - Gamma gzeros = {0.0, 0.0, 0.0}; - int i, vgaCRIndex, vgaCRReg; -@@ -436,7 +437,8 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags) - } - - if (xf86LoadSubModule(pScrn, "vbe")) { -- pS3->pVBE = VBEInit(pS3->pInt10, pEnt->index); -+ pVBE = VBEInit(pS3->pInt10, pEnt->index); -+ vbeFree(pVBE); - } - - if (pS3->shadowFB) { diff --git a/staging/xf86-video-s3virge/PKGBUILD b/staging/xf86-video-s3virge/PKGBUILD deleted file mode 100644 index 439a7fbd1..000000000 --- a/staging/xf86-video-s3virge/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 136301 2011-08-25 11:06:05Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-video-s3virge -pkgver=1.10.4 -pkgrel=6 -pkgdesc="X.org S3 Virge video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('pkgconfig' 'xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') -options=(!libtool) -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - copyright.patch) -md5sums=('6517bbbf808c700502d51acdc44662f8' - 'f91fb259e3632fb9130fcbe69ecd9d6a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/copyright.patch" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-savage/PKGBUILD b/staging/xf86-video-savage/PKGBUILD deleted file mode 100644 index 4ac7bb78f..000000000 --- a/staging/xf86-video-savage/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 136248 2011-08-25 07:57:54Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-savage -pkgver=2.3.2 -pkgrel=3 -pkgdesc="X.org savage video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc' 'savage-dri') -makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa' 'glproto') -conflicts=('xorg-server<1.10.0') -options=(!libtool !makeflags) -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch) -sha1sums=('d675693d0b29cb24f624ef57c1fe2f271f6bf6c3' - '0ee1dd57cd48dad4d46ebcfe914b88027e44c3f1') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - ./configure --prefix=/usr --enable-dri - make - make DESTDIR="${pkgdir}" install - - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-siliconmotion/PKGBUILD b/staging/xf86-video-siliconmotion/PKGBUILD deleted file mode 100644 index e2f73f44c..000000000 --- a/staging/xf86-video-siliconmotion/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 136254 2011-08-25 08:23:49Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-video-siliconmotion -pkgver=1.7.5 -pkgrel=3 -pkgdesc="X.org siliconmotion video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('946acae0822d51da57abe8b7ed049691bd731589') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-sis/PKGBUILD b/staging/xf86-video-sis/PKGBUILD deleted file mode 100644 index a889a881e..000000000 --- a/staging/xf86-video-sis/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 136422 2011-08-29 08:27:06Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-sis -pkgver=0.10.3 -pkgrel=5 -pkgdesc="X.org SiS video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc' 'sis-dri') -makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto' 'libdrm' 'xf86driproto' 'mesa' 'glproto') -conflicts=('xorg-server<1.11.0') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('158673747e240b0c33499685a32d46bdaead7cd5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-dri - make - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-sisimedia/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch b/staging/xf86-video-sisimedia/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch deleted file mode 100644 index fd87b6c8c..000000000 --- a/staging/xf86-video-sisimedia/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e4f6a2fcd5712d0f994d3719b9c6c13f5b02bc7c Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri, 9 Jan 2009 16:34:01 -0800 -Subject: [PATCH 01/10] Remove xorgconfig & xorgcfg from See Also list in man page - ---- - man/sis.man | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/man/sis.man b/man/sis.man -index d743fe6..c321808 100644 ---- a/man/sis.man -+++ b/man/sis.man -@@ -429,7 +429,7 @@ The amount is to be specified in megabyte, the default is 8. - none. - .SH "SEE ALSO" - #ifdef __xservername__ --__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) -+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) - #else - XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__) - #endif --- -1.6.5.4 - diff --git a/staging/xf86-video-sisimedia/0002-Remove-XFree86-Misc-PassMessage-support.patch b/staging/xf86-video-sisimedia/0002-Remove-XFree86-Misc-PassMessage-support.patch deleted file mode 100644 index 860e593c6..000000000 --- a/staging/xf86-video-sisimedia/0002-Remove-XFree86-Misc-PassMessage-support.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff -p -up xf86-video-sis-0.9.1/configure.ac.orig xf86-video-sis-0.9.1/configure.ac ---- xf86-video-sis-0.9.1/configure.ac.orig 2010-01-27 15:34:26.000000000 -0500 -+++ xf86-video-sis-0.9.1/configure.ac 2010-01-27 15:34:43.000000000 -0500 -@@ -58,7 +58,6 @@ XORG_DRIVER_CHECK_EXT(XINERAMA, xinerama - XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - XORG_DRIVER_CHECK_EXT(RENDER, renderproto) - XORG_DRIVER_CHECK_EXT(XV, videoproto) --XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto) - XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - - # Checks for pkg-config packages -diff -p -up xf86-video-sis-0.9.1/src/sis_driver.c.orig xf86-video-sis-0.9.1/src/sis_driver.c ---- xf86-video-sis-0.9.1/src/sis_driver.c.orig 2010-01-27 15:35:05.000000000 -0500 -+++ xf86-video-sis-0.9.1/src/sis_driver.c 2010-01-27 15:35:39.000000000 -0500 -@@ -86,8 +86,6 @@ - #include "mibank.h" - #include "mipointer.h" - #include "mibstore.h" --#define _XF86MISC_SERVER_ --#include <X11/extensions/xf86misc.h> - #include "edid.h" - - #define SIS_NEED_inSISREG -@@ -506,11 +504,6 @@ xf86DrvMsg(0, X_INFO, " - pScrn->FreeScreen = SISFreeScreen; - pScrn->ValidMode = SISValidMode; - pScrn->PMEvent = SISPMEvent; /*add PM function for ACPI hotkey,Ivans*/ --#ifdef X_XF86MiscPassMessage --// if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) { --// pScrn->HandleMessage = SISHandleMessage; --// } --#endif - foundScreen = TRUE; - } - #ifdef SISDUALHEAD -diff -p -up xf86-video-sis-0.9.1/src/sis_driver.h.orig xf86-video-sis-0.9.1/src/sis_driver.h ---- xf86-video-sis-0.9.1/src/sis_driver.h.orig 2010-01-27 15:35:49.000000000 -0500 -+++ xf86-video-sis-0.9.1/src/sis_driver.h 2010-01-27 15:36:04.000000000 -0500 -@@ -791,10 +791,6 @@ static Bool SISHotkeySwitchMode(ScrnInfo - #ifdef SISDUALHEAD - static Bool SISSaveScreenDH(ScreenPtr pScreen, int mode); - #endif --#ifdef X_XF86MiscPassMessage --extern int SISHandleMessage(int scrnIndex, const char *msgtype, -- const char *msgval, char **retmsg); --#endif - static void SISFreeScreen(int scrnIndex, int flags); - static ModeStatus SISValidMode(int scrnIndex, DisplayModePtr mode, - Bool verbose, int flags); -diff -p -up xf86-video-sis-0.9.1/src/sis_utility.c.orig xf86-video-sis-0.9.1/src/sis_utility.c ---- xf86-video-sis-0.9.1/src/sis_utility.c.orig 2010-01-27 15:36:23.000000000 -0500 -+++ xf86-video-sis-0.9.1/src/sis_utility.c 2010-01-27 15:36:59.000000000 -0500 -@@ -40,8 +40,6 @@ - #define NEED_EVENTS - #include <X11/X.h> - #include "dixstruct.h" --#define _XF86MISC_SERVER_ --#include <X11/extensions/xf86misc.h> - - #include "sis_videostr.h" - -@@ -262,9 +260,6 @@ typedef struct { - int (*HandleSiSDirectCommand[SISCTRL_MAX_SCREENS])(xSiSCtrlCommandReply *); - } xSiSCtrlScreenTable; - --#ifdef X_XF86MiscPassMessage --int SISHandleMessage(int scrnIndex, const char *msgtype, const char *msgval, char **retmsg); --#endif - void SiSCtrlExtInit(ScrnInfoPtr pScrn); - void SiSCtrlExtUnregister(SISPtr pSiS, int index); - -@@ -975,19 +970,6 @@ unsigned int SISVGADetected(ScrnInfoPtr - } - - /*********************************** -- * MessageHandler interface * -- * (unused now; use extension) * -- ***********************************/ -- --#ifdef X_XF86MiscPassMessage --int --SISHandleMessage(int scrnIndex, const char *msgtype, const char *msgval, char **retmsg) --{ -- return BadMatch; --} --#endif -- --/*********************************** - * SiSCtrl extension interface * - ***********************************/ - diff --git a/staging/xf86-video-sisimedia/0003-Fix-build-with-Werror-format-security.patch b/staging/xf86-video-sisimedia/0003-Fix-build-with-Werror-format-security.patch deleted file mode 100644 index 4fc355bbb..000000000 --- a/staging/xf86-video-sisimedia/0003-Fix-build-with-Werror-format-security.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 9b010b7db7f0c6730c1a1b3cd473d49b01ed5b5f Mon Sep 17 00:00:00 2001 -From: Ander Conselvan de Oliveira <ander@mandriva.com.br> -Date: Mon, 22 Jun 2009 16:07:26 -0400 -Subject: [PATCH] Fix build with -Werror=format-security - ---- - src/sis_driver.c | 4 ++-- - src/sis_mergedfb.c | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/sis_driver.c b/src/sis_driver.c -index 5b91004..0a154db 100644 ---- a/src/sis_driver.c -+++ b/src/sis_driver.c -@@ -831,14 +831,14 @@ SISErrorLog(ScrnInfoPtr pScrn, const char *format, ...) - static const char *str = "**************************************************\n"; - - va_start(ap, format); -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str); - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - " ERROR:\n"); - xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap); - va_end(ap); - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - " END OF MESSAGE\n"); -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str); - } - - static void -diff --git a/src/sis_mergedfb.c b/src/sis_mergedfb.c -index 61b4255..feca024 100644 ---- a/src/sis_mergedfb.c -+++ b/src/sis_mergedfb.c -@@ -357,7 +357,7 @@ SiSCopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, - - strcat(printbuffer, namebuf1); - -- xf86DrvMsg(pScrn->scrnIndex, X_INFO, printbuffer); -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%s", printbuffer); - } - - mode->next = mode; -@@ -2137,7 +2137,7 @@ SiSUpdateXineramaScreenInfo(ScrnInfoPtr pScrn1) - if(infochanged && !usenonrect) { - xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, - "Current screen size does not match maximum display modes...\n"); -- xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, rectxine); -+ xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, "%s", rectxine); - } - - } else if(infochanged && usenonrect) { -@@ -2145,7 +2145,7 @@ SiSUpdateXineramaScreenInfo(ScrnInfoPtr pScrn1) - usenonrect = FALSE; - xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, - "Only clone modes available for this screen size...\n"); -- xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, rectxine); -+ xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, "%s", rectxine); - - } - --- -1.6.2.4 - diff --git a/staging/xf86-video-sisimedia/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch b/staging/xf86-video-sisimedia/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch deleted file mode 100644 index 68ec63138..000000000 --- a/staging/xf86-video-sisimedia/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 49c641b638ac36d2a559555c04a3bd2777c8d071 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri, 1 May 2009 16:52:10 -0700 -Subject: [PATCH 04/10] Make sisRegs3D4 big enough to hold all values written to it - -Increase size from 0xff to 0x100 since SiS315Save (sis_dac.c line 752) -writes values into sisRegs3D4[0x00..0xff] if ChipType >= XGI_20 - -[This bug was found by the Parfait bug checking tool. - For more information see http://research.sun.com/projects/parfait ] - -Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> ---- - src/sis.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/sis.h b/src/sis.h -index 9bafd4b..773f709 100644 ---- a/src/sis.h -+++ b/src/sis.h -@@ -747,7 +747,7 @@ typedef struct { - UChar sisRegsGR[10]; - UChar sisDAC[768]; - UChar sisRegs3C4[0x80]; -- UChar sisRegs3D4[0xff]; -+ UChar sisRegs3D4[0x100]; - UChar sisRegs3C2; - UChar sisCapt[0x60]; - UChar sisVid[0x50]; --- -1.6.5.4 - diff --git a/staging/xf86-video-sisimedia/0005-Correct-bounds-check-of-blitClip-array-access.patch b/staging/xf86-video-sisimedia/0005-Correct-bounds-check-of-blitClip-array-access.patch deleted file mode 100644 index 038322bf6..000000000 --- a/staging/xf86-video-sisimedia/0005-Correct-bounds-check-of-blitClip-array-access.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 933dd8f860883c613acb5bcdf6b66100dbdfa952 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri, 1 May 2009 16:57:22 -0700 -Subject: [PATCH 05/10] Correct bounds check of blitClip array access - -Array is defined as blitClip[NUM_BLIT_PORTS], so invalid indexes -are >= NUM_BLIT_PORTS, not just > NUM_BLIT_PORTS - -[This bug was found by the Parfait bug checking tool. - For more information see http://research.sun.com/projects/parfait ] - -Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> ---- - src/sis_video.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -Index: xf86-video-sis-0.9.1/src/sis_video.c -=================================================================== ---- xf86-video-sis-0.9.1.orig/src/sis_video.c -+++ xf86-video-sis-0.9.1/src/sis_video.c -@@ -4656,7 +4656,7 @@ SISStopVideoBlit(ScrnInfoPtr pScrn, ULon - * adapt->flags but we provide it anyway. - */ - -- if(index > NUM_BLIT_PORTS) return; -+ if(index >= NUM_BLIT_PORTS) return; - - REGION_EMPTY(pScrn->pScreen, &pPriv->blitClip[index]); - -@@ -4698,7 +4698,7 @@ SISPutImageBlit_671( - int xoffset = 0, yoffset = 0; - Bool first; - -- if(index > NUM_BLIT_PORTS) -+ if(index >= NUM_BLIT_PORTS) - return BadMatch; - - if(!height || !width) diff --git a/staging/xf86-video-sisimedia/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch b/staging/xf86-video-sisimedia/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch deleted file mode 100644 index f023c774e..000000000 --- a/staging/xf86-video-sisimedia/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 910073e0ab3a7bf9e5c9d97437a879d97edc2714 Mon Sep 17 00:00:00 2001 -From: root <root@greentea.conectiva> -Date: Wed, 1 Jul 2009 09:59:39 -0400 -Subject: [PATCH] Fix backlight off on SiS30x. video bridges. - ---- - src/init301.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/init301.c b/src/init301.c -index c179ae8..70a6aab 100644 ---- a/src/init301.c -+++ b/src/init301.c -@@ -9261,7 +9261,7 @@ void - SiS_SiS30xBLOff(struct SiS_Private *SiS_Pr) - { - /* Switch off LCD backlight on SiS30xLV */ -- SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x26,0xFE); -+ SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x26,0xFC); - SiS_DDC2Delay(SiS_Pr,0xff00); - } - --- -1.5.4.3 - diff --git a/staging/xf86-video-sisimedia/0006-Add-IgnoreHotkeyFlag-driver-option.patch b/staging/xf86-video-sisimedia/0006-Add-IgnoreHotkeyFlag-driver-option.patch deleted file mode 100644 index 8ebc799a7..000000000 --- a/staging/xf86-video-sisimedia/0006-Add-IgnoreHotkeyFlag-driver-option.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 072af02d180c1965f30246ea269d208292ed6f05 Mon Sep 17 00:00:00 2001 -From: root <root@greentea.conectiva> -Date: Wed, 1 Jul 2009 14:13:52 -0400 -Subject: [PATCH] Add IgnoreHotkeyFlag driver option. - -Some BIOSes do not set the hotkey flag correctly. Without this option -set, the driver won't change the mirroring state of LCD and VGA -connections if the BIOS did not set this flag. ---- - src/sis.h | 3 +++ - src/sis_driver.c | 2 +- - src/sis_opt.c | 13 ++++++++++++- - 3 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/src/sis.h b/src/sis.h -index c50690b..c82c302 100644 ---- a/src/sis.h -+++ b/src/sis.h -@@ -1565,6 +1565,9 @@ typedef struct { - - /* Enable special 1366x768x60hz mode of LVDS panel. Ivans@090109 */ - Bool EnablePanel_1366x768; -+ -+ /* Ignore hotkey flag on capability changed APM events */ -+ Bool IgnoreHotkeyFlag; - - } SISRec, *SISPtr; - -diff --git a/src/sis_driver.c b/src/sis_driver.c -index c935c11..2a5001c 100644 ---- a/src/sis_driver.c -+++ b/src/sis_driver.c -@@ -11370,7 +11370,7 @@ SISPMEvent(int scrnIndex, pmEvent event, Bool undo) - inSISIDXREG(SISCR,0x3d,hotkeyflag);/*check device switch flag from BIOS CR 0x3d bit[2].*/ - - -- if(hotkeyflag & 0x04) -+ if(pSiS->IgnoreHotkeyFlag || (hotkeyflag & 0x04)) - { - - SISCRT1PreInit(pScrn); /*redetecting CRT1, pSiS->CRT1detected will update.*/ -diff --git a/src/sis_opt.c b/src/sis_opt.c -index 4b79f7f..7f726ea 100644 ---- a/src/sis_opt.c -+++ b/src/sis_opt.c -@@ -159,7 +159,8 @@ typedef enum { - OPTION_PSEUDO, - OPTION_FUTRO_TIMING, /*chaoyu's modified: for Fuji-Siemans specail timing*/ - OPTION_TRACEVGAMISCW, -- OPTION_USETIMING1366 /*option of enable 1366x768 timing for LVDS panel. Ivans@090109*/ -+ OPTION_USETIMING1366, /*option of enable 1366x768 timing for LVDS panel. Ivans@090109*/ -+ OPTION_IGNOREHOTKEYFLAG - } SISOpts; - - static const OptionInfoRec SISOptions[] = { -@@ -305,6 +306,7 @@ static const OptionInfoRec SISOptions[] = { - { OPTION_FUTRO_TIMING, "FutroTiming", OPTV_BOOLEAN, {0}, FALSE },/*chaoyu's modified: for Fuji-seimans special timing*/ - { OPTION_TRACEVGAMISCW, "TraceVgaMISCW", OPTV_BOOLEAN, {0}, FALSE },/*Ivans added for helping detected CRT1 using BIOS setting.*/ - { OPTION_USETIMING1366, "UseTiming1366", OPTV_BOOLEAN, {0}, FALSE },/*enable 1366 timing on LVDS, Ivans@090109*/ -+ { OPTION_IGNOREHOTKEYFLAG, "IgnoreHotkeyFlag", OPTV_BOOLEAN, {0}, FALSE }, - { -1, NULL, OPTV_NONE, {0}, FALSE } - }; - -@@ -624,6 +626,7 @@ SiSOptions(ScrnInfoPtr pScrn) - pSiS->CRT2IsScrn0 = FALSE; - #endif - #endif -+ pSiS->IgnoreHotkeyFlag = FALSE; - - /* Chipset dependent defaults */ - -@@ -2419,6 +2422,14 @@ SiSOptions(ScrnInfoPtr pScrn) - pSiS->EnablePanel_1366x768 = TRUE; - } - } -+ /* Ignore hotkey flag for video switch, switch on every -+ * XF86_APM_CAPABILITY_CHANGED event */ -+ if(xf86GetOptValBool(pSiS->Options, OPTION_IGNOREHOTKEYFLAG, &val)){ -+ if(val){ -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,"Ignoring hotkey flag\n"); -+ pSiS->IgnoreHotkeyFlag = TRUE; -+ } -+ } - - } - --- -1.5.4.3 - diff --git a/staging/xf86-video-sisimedia/0007-Remove-useless-loader-symbol-lists.patch b/staging/xf86-video-sisimedia/0007-Remove-useless-loader-symbol-lists.patch deleted file mode 100644 index 395213375..000000000 --- a/staging/xf86-video-sisimedia/0007-Remove-useless-loader-symbol-lists.patch +++ /dev/null @@ -1,249 +0,0 @@ -From ae1a7dcebdac904c8068cc38fb77648c548f5075 Mon Sep 17 00:00:00 2001 -From: Paulo Ricardo Zanoni <pzanoni@mandriva.com> -Date: Thu, 22 Apr 2010 11:19:29 -0300 -Subject: [PATCH] Remove useless loader symbol lists - -Adaption of xf86-video-sis patch 74553b5ee476a0dd28e136f5a33a546ea0c3ef28 ---- - src/sis_driver.c | 150 +----------------------------------------------------- - 1 files changed, 1 insertions(+), 149 deletions(-) - -diff --git a/src/sis_driver.c b/src/sis_driver.c -index d56182f..96255d3 100644 ---- a/src/sis_driver.c -+++ b/src/sis_driver.c -@@ -227,126 +227,6 @@ static PciChipsets XGIPciChipsets[] = { - { -1, -1, RES_UNDEFINED } - }; - --#ifdef SIS_USE_XAA --static const char *xaaSymbols[] = { -- "XAACreateInfoRec", -- "XAADestroyInfoRec", -- "XAAHelpPatternROP", -- "XAAInit", -- NULL --}; --#endif -- --#ifdef SIS_USE_EXA --static const char *exaSymbols[] = { -- "exaGetVersion", -- "exaDriverInit", -- "exaDriverFini", -- "exaOffscreenAlloc", -- "exaOffscreenFree", -- NULL --}; --#endif -- --static const char *fbSymbols[] = { -- "fbPictureInit", -- "fbScreenInit", -- NULL --}; -- --static const char *shadowSymbols[] = { -- "ShadowFBInit", -- NULL --}; -- --static const char *ramdacSymbols[] = { -- "xf86CreateCursorInfoRec", -- "xf86DestroyCursorInfoRec", -- "xf86InitCursor", -- NULL --}; -- --static const char *ddcSymbols[] = { -- "xf86PrintEDID", -- "xf86InterpretEDID", -- NULL --}; -- --static const char *int10Symbols[] = { -- "xf86FreeInt10", -- "xf86InitInt10", -- NULL --}; -- --static const char *vbeSymbols[] = { --#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) -- "VBEInit", --#else -- "VBEExtendedInit", --#endif -- "vbeDoEDID", -- "vbeFree", -- "VBEGetVBEInfo", -- "VBEFreeVBEInfo", -- "VBEGetModeInfo", -- "VBEFreeModeInfo", -- "VBESaveRestore", -- "VBESetVBEMode", -- "VBEGetVBEMode", -- "VBESetDisplayStart", -- "VBESetGetLogicalScanlineLength", -- NULL --}; -- --#ifdef XF86DRI --static const char *drmSymbols[] = { -- "drmAddMap", -- "drmAgpAcquire", -- "drmAgpRelease", -- "drmAgpAlloc", -- "drmAgpFree", -- "drmAgpBase", -- "drmAgpBind", -- "drmAgpUnbind", -- "drmAgpEnable", -- "drmAgpGetMode", -- "drmCtlInstHandler", -- "drmCtlUninstHandler", -- "drmGetInterruptFromBusID", --#ifndef SISHAVEDRMWRITE -- "drmSiSAgpInit", --#else -- "drmCommandWrite", --#endif --#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) -- "drmGetVersion", -- "drmFreeVersion", --#endif -- NULL --}; -- --static const char *driSymbols[] = { -- "DRICreateInfoRec", -- "DRIScreenInit", -- "DRIFinishScreenInit", -- "DRIDestroyInfoRec", -- "DRICloseScreen", -- "DRIGetSAREAPrivate", -- "DRILock", -- "DRIUnlock", -- "DRIQueryVersion", -- "GlxSetVisualConfigs", -- NULL --}; -- --#ifdef XFree86LOADER --static const char *driRefSymbols[] = { -- "DRICreatePCIBusID", /* not REQUIRED, but eventually referenced */ -- NULL --}; --#endif --#endif /* XF86DRI */ -- - #ifdef XFree86LOADER - - static MODULESETUPPROTO(sisSetup); -@@ -382,19 +262,6 @@ sisSetup(pointer module, pointer opts, int *errmaj, int *errmin) - if(!setupDone) { - setupDone = TRUE; - xf86AddDriver(&SIS, module, SIS_HaveDriverFuncs); -- LoaderRefSymLists(fbSymbols, --#ifdef SIS_USE_XAA -- xaaSymbols, --#endif --#ifdef SIS_USE_EXA -- exaSymbols, --#endif -- shadowSymbols, ramdacSymbols, -- vbeSymbols, int10Symbols, --#ifdef XF86DRI -- drmSymbols, driSymbols, driRefSymbols, --#endif -- NULL); - return (pointer)TRUE; - } - -@@ -1068,7 +935,6 @@ SiS_LoadInitVBE(ScrnInfoPtr pScrn) - return; - - if(xf86LoadSubModule(pScrn, "vbe")) { -- xf86LoaderReqSymLists(vbeSymbols, NULL); - #if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) - pSiS->pVbe = VBEInit(pSiS->pInt, pSiS->pEnt->index); - #else -@@ -1092,7 +958,6 @@ SiSLoadInitDDCModule(ScrnInfoPtr pScrn) - return TRUE; - - if(xf86LoadSubModule(pScrn, "ddc")) { -- xf86LoaderReqSymLists(ddcSymbols, NULL); - pSiS->haveDDC = TRUE; - return TRUE; - } -@@ -3586,7 +3451,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Initializing adapter through int10\n"); - if(xf86LoadSubModule(pScrn, "int10")) { -- xf86LoaderReqSymLists(int10Symbols, NULL); - pSiS->pInt = xf86InitInt10(pSiS->pEnt->index); - } else { - SISErrorLog(pScrn, "Failed to load int10 module\n"); -@@ -3683,7 +3547,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - SISErrorLog(pScrn, "Could not load ramdac module\n"); - goto my_error_1; - } -- xf86LoaderReqSymLists(ramdacSymbols, NULL); - - /* Set pScrn->monitor */ - pScrn->monitor = pScrn->confScreen->monitor; -@@ -5868,22 +5731,18 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - SISErrorLog(pScrn, "Unsupported framebuffer bpp (%d)\n", pScrn->bitsPerPixel); - goto my_error_1; - } -- xf86LoaderReqSymLists(fbSymbols, NULL); - - /* Load XAA/EXA (if needed) */ - if(!pSiS->NoAccel) { - char *modName = NULL; -- const char **symNames = NULL; - #ifdef SIS_USE_XAA - if(!pSiS->useEXA) { - modName = "xaa"; -- symNames = xaaSymbols; - } - #endif - #ifdef SIS_USE_EXA - if(pSiS->useEXA) { - modName = "exa"; -- symNames = exaSymbols; - } - #endif - if(modName && (!xf86LoadSubModule(pScrn, modName))) { -@@ -5894,9 +5753,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - pSiS->NoXvideo = TRUE; - } - #endif -- } else if(symNames) { -- xf86LoaderReqSymLists(symNames, NULL); -- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled, modename %s\n",modName); - } - } - -@@ -5909,8 +5765,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - pSiS->ShadowFB = FALSE; - pSiS->Rotate = pSiS->Reflect = 0; - } -- } else { -- xf86LoaderReqSymLists(shadowSymbols, NULL); - } - } - -@@ -5920,9 +5774,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - if(!xf86LoaderCheckSymbol("DRIScreenInit")) { - if(xf86LoadSubModule(pScrn, "dri")) { - if(!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) { -- if(xf86LoadSubModule(pScrn, "glx")) { -- xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL); -- } else { -+ if(! xf86LoadSubModule(pScrn, "glx")) { - SISErrorLog(pScrn, "Failed to load glx module\n"); - } - } --- -1.6.4.4 - diff --git a/staging/xf86-video-sisimedia/0008-update-to-xextproto-7-1-support.patch b/staging/xf86-video-sisimedia/0008-update-to-xextproto-7-1-support.patch deleted file mode 100644 index 1dcbdf05c..000000000 --- a/staging/xf86-video-sisimedia/0008-update-to-xextproto-7-1-support.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 59ea80738d22c69a2850fd7ff89bd75330cc310b Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Thu, 16 Jul 2009 01:55:25 +0000 -Subject: Update to xextproto 7.1 support. - -DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers -need to include dpmsconst.h if xextproto 7.1 is available. - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/configure.ac b/configure.ac -index 089c5fa..f19c1b7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -62,6 +62,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - - # Checks for pkg-config packages - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES]) -+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], -+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), -+ HAVE_XEXTPROTO_71="no") -+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) - sdkdir=$(pkg-config --variable=sdkdir xorg-server) - - # Checks for libraries. -diff --git a/src/sis_driver.c b/src/sis_driver.c -index ef7b522..a1ced97 100644 ---- a/src/sis_driver.c -+++ b/src/sis_driver.c -@@ -78,8 +78,13 @@ - - #include "globals.h" - -+#ifdef HAVE_XEXTPROTO_71 -+#include <X11/extensions/dpmsconst.h> -+#else - #define DPMS_SERVER - #include <X11/extensions/dpms.h> -+#endif -+ - - #ifdef XF86DRI - #include "dri.h" --- -cgit v0.8.3-6-g21f6 diff --git a/staging/xf86-video-sisimedia/0009-update-for-rac-removal.patch b/staging/xf86-video-sisimedia/0009-update-for-rac-removal.patch deleted file mode 100644 index df1421798..000000000 --- a/staging/xf86-video-sisimedia/0009-update-for-rac-removal.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 9e1ebb9530bbb71be7fcab9e6f8f9a475be72efe Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Tue, 28 Jul 2009 03:32:37 +0000 -Subject: sis: update for resources/RAC API removal - ---- -diff --git a/src/sis.h b/src/sis.h -index 773f709..e859c78 100644 ---- a/src/sis.h -+++ b/src/sis.h -@@ -77,7 +77,9 @@ - #include "xf86Pci.h" - #include "xf86Priv.h" - #include "xf86_OSproc.h" -+#ifndef XSERVER_LIBPCIACCESS - #include "xf86Resources.h" -+#endif - #include "xf86.h" - #include "xf86PciInfo.h" - #include "xf86Cursor.h" -diff --git a/src/sis_driver.c b/src/sis_driver.c -index a1ced97..bb11cbb 100644 ---- a/src/sis_driver.c -+++ b/src/sis_driver.c -@@ -49,7 +49,9 @@ - - #include "sis.h" - -+#ifndef XSERVER_LIBPCIACCESS - #include "xf86RAC.h" -+#endif - #include "dixstruct.h" - #include "shadowfb.h" - #include "fb.h" -@@ -3552,6 +3554,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - SiS_MapVGAMem(pScrn); - #endif - -+#ifndef XSERVER_LIBPCIACCESS - /* Set operating state */ - - /* 1. memory */ -@@ -3581,6 +3584,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - /* Operations for which I/O access is required */ - pScrn->racIoFlags = RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; - -+#endif -+ - /* Load ramdac module */ - if(!xf86LoadSubModule(pScrn, "ramdac")) { - SISErrorLog(pScrn, "Could not load ramdac module\n"); -@@ -4424,6 +4429,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX (size %ldK)\n", - (ULong)pSiS->IOAddress, pSiS->mmioSize); - -+#ifndef XSERVER_LIBPCIACCESS - /* Register the PCI-assigned resources */ - if(xf86RegisterResources(pSiS->pEnt->index, NULL, ResExclusive)) { - SISErrorLog(pScrn, "PCI resource conflicts detected\n"); -@@ -4435,6 +4441,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - SISFreeRec(pScrn); - return FALSE; - } -+#endif - - from = X_PROBED; - if(pSiS->pEnt->device->videoRam != 0) { --- -cgit v0.8.3-6-g21f6 diff --git a/staging/xf86-video-sisimedia/0010-change-to-use-abi-version-check.patch b/staging/xf86-video-sisimedia/0010-change-to-use-abi-version-check.patch deleted file mode 100644 index cb9fd7ea5..000000000 --- a/staging/xf86-video-sisimedia/0010-change-to-use-abi-version-check.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8c3eca873717e877048c2bde345c02b1e9099e50 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Tue, 28 Jul 2009 05:22:41 +0000 -Subject: sis: change to using ABI version check - ---- -diff --git a/src/sis.h b/src/sis.h -index e859c78..400b83f 100644 ---- a/src/sis.h -+++ b/src/sis.h -@@ -77,7 +77,7 @@ - #include "xf86Pci.h" - #include "xf86Priv.h" - #include "xf86_OSproc.h" --#ifndef XSERVER_LIBPCIACCESS -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 - #include "xf86Resources.h" - #endif - #include "xf86.h" -diff --git a/src/sis_driver.c b/src/sis_driver.c -index bb11cbb..994b02d 100644 ---- a/src/sis_driver.c -+++ b/src/sis_driver.c -@@ -49,7 +49,7 @@ - - #include "sis.h" - --#ifndef XSERVER_LIBPCIACCESS -+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 - #include "xf86RAC.h" - #endif - #include "dixstruct.h" --- -cgit v0.8.3-6-g21f6 diff --git a/staging/xf86-video-sisimedia/0011-more-rac-removal.patch b/staging/xf86-video-sisimedia/0011-more-rac-removal.patch deleted file mode 100644 index 8175dea98..000000000 --- a/staging/xf86-video-sisimedia/0011-more-rac-removal.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nrup xf86-video-sis-0.9.1/src/sis_hwmc.c patched/src/sis_hwmc.c ---- xf86-video-sis-0.9.1/src/sis_hwmc.c 2008-03-04 14:31:10.000000000 -0300 -+++ patched/src/sis_hwmc.c 2010-04-20 17:10:21.073690167 -0300 -@@ -43,7 +43,9 @@ THE USE OR OTHER DEALINGS IN THE SOFTWAR - - #include "xf86.h" - #include "xf86_OSproc.h" -+#ifndef GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 - #include "xf86Resources.h" -+#endif - #include "compiler.h" - #include "xf86PciInfo.h" - #include "xf86Pci.h" diff --git a/staging/xf86-video-sisimedia/COPYING b/staging/xf86-video-sisimedia/COPYING deleted file mode 100644 index d643012d7..000000000 --- a/staging/xf86-video-sisimedia/COPYING +++ /dev/null @@ -1,139 +0,0 @@ -Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1) Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2) Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3) The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Copyright (C) 1998, 1999 by Alan Hourihane, Wigan, England. -Parts Copyright (C) 2001-2005 Thomas Winischhofer, Vienna, Austria. - -Licensed under the following terms: - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appears in all copies and that both that copyright -notice and this permission notice appear in supporting documentation, and -and that the name of the copyright holder not be used in advertising -or publicity pertaining to distribution of the software without specific, -written prior permission. The copyright holder makes no representations -about the suitability of this software for any purpose. It is provided -"as is" without expressed or implied warranty. - -THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO -EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. - -Copyright (C) 2003 Eric Anholt - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appears in all copies and that both that copyright -notice and this permission notice appear in supporting documentation, and -and that the name of the copyright holder not be used in advertising -or publicity pertaining to distribution of the software without specific, -written prior permission. The copyright holder makes no representations -about the suitability of this software for any purpose. It is provided -"as is" without expressed or implied warranty. - -THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO -EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. - -Copyright (C) 2000 by Alan Hourihane, Sychdyn, North Wales, UK. -Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria - -Portions from radeon_dga.c which is - Copyright 2000 ATI Technologies Inc., Markham, Ontario, and - VA Linux Systems Inc., Fremont, California. - -Licensed under the following terms: - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation, and that the name of the providers not be used in -advertising or publicity pertaining to distribution of the software without -specific, written prior permission. The providers make no representations -about the suitability of this software for any purpose. It is provided -"as is" without express or implied warranty. - -THE PROVIDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -EVENT SHALL THE PROVIDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. - -Copyright 2007 George Sapountzis - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice (including the next -paragraph) shall be included in all copies or substantial portions of the -Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -Copyright (C) 1999-2004 by The XFree86 Project, Inc. -based on code written by Mark Vojkovich -Copyright (C) 2003-2005 Thomas Winischhofer - -Licensed under the following terms: - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appears in all copies and that both that copyright -notice and this permission notice appear in supporting documentation, and -and that the name of the copyright holder not be used in advertising -or publicity pertaining to distribution of the software without specific, -written prior permission. The copyright holder makes no representations -about the suitability of this software for any purpose. It is provided -"as is" without expressed or implied warranty. - -THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO -EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. - diff --git a/staging/xf86-video-sisimedia/PKGBUILD b/staging/xf86-video-sisimedia/PKGBUILD deleted file mode 100644 index e4a3b1d78..000000000 --- a/staging/xf86-video-sisimedia/PKGBUILD +++ /dev/null @@ -1,82 +0,0 @@ -# $Id: PKGBUILD 136441 2011-08-29 10:48:07Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-sisimedia -pkgver=0.9.1 -pkgrel=1 -pkgdesc="X.org SiS 671 video driver" -arch=(i686 x86_64) -url="http://www.linuxconsulting.ro/xorg-drivers/" -license=('custom') -depends=('glibc' 'sis-dri') -makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto' 'libdrm' 'xf86driproto' 'mesa' 'glproto') -conflicts=('xorg-server<1.11.0') -options=('!libtool') -source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-0.9.1_20091203.tar.bz2 - xf86-video-sis-0.9.1-20102701.patch - 0002-Remove-XFree86-Misc-PassMessage-support.patch - 0003-Fix-build-with-Werror-format-security.patch - 0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch - 0006-Add-IgnoreHotkeyFlag-driver-option.patch - xf86-video-sis-0.9.1-dump-regs-after-video-init.patch - 0007-Remove-useless-loader-symbol-lists.patch - 0008-update-to-xextproto-7-1-support.patch - 0009-update-for-rac-removal.patch - 0010-change-to-use-abi-version-check.patch - 0011-more-rac-removal.patch - 0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch - 0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch - 0005-Correct-bounds-check-of-blitClip-array-access.patch - xserver19.patch - COPYING) -sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430' - '61715bb86180decde55a56fad9a12d841c89fbb2' - '33fdea57187a2758802bcb9572d3a864aaab4d59' - '6f05eae535b099b01c2819e63c68d4489b940267' - 'a6cb5da9312d32d729ad2619d8ae50cb26ba7d4d' - 'df728052a89c4152abbe89826756040dac23b624' - '4bed1c2455ed447f7053cb0729e99cbe598b3274' - 'd7802db5c49540ab136e71450cc846cfccd8b8d1' - 'e2236d2d00338f1658c66d9b972919af39897071' - '0c6b9322e6cb22c67e04d50a0b818a2dd4585cf2' - '802829a8ebd2b7e35fcc86665d842b1594a8ba30' - 'c26afe7508183735b7568b435be9c270ceeb62f1' - 'd2fa2a21454f3a161bcd8ae4d349657561049edd' - '5e288526bfa2c534f1feabdb571da16da8a1c7a6' - 'e86d702cb0b5e9bf43ff732696229965e176db7c' - 'b5f260bed7e705808ec05620316e503ed5d52ee5' - 'a64e244f274bcb155f892d0488a1a4b1b2f7d70d') - -build() { - cd "${srcdir}/xf86-video-sis-${pkgver}" - patch -Np1 -i "${srcdir}/xf86-video-sis-0.9.1-20102701.patch" - patch -Np1 -i "${srcdir}/0002-Remove-XFree86-Misc-PassMessage-support.patch" - patch -Np1 -i "${srcdir}/0003-Fix-build-with-Werror-format-security.patch" - patch -Np1 -i "${srcdir}/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch" - patch -Np1 -i "${srcdir}/0006-Add-IgnoreHotkeyFlag-driver-option.patch" - patch -Np1 -i "${srcdir}/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch" - patch -Np1 -i "${srcdir}/0007-Remove-useless-loader-symbol-lists.patch" - patch -Np1 -i "${srcdir}/0008-update-to-xextproto-7-1-support.patch" - patch -Np1 -i "${srcdir}/0009-update-for-rac-removal.patch" - patch -Np1 -i "${srcdir}/0010-change-to-use-abi-version-check.patch" - patch -Np1 -i "${srcdir}/0011-more-rac-removal.patch" - patch -Np1 -i "${srcdir}/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch" - patch -Np1 -i "${srcdir}/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch" - patch -Np1 -i "${srcdir}/0005-Correct-bounds-check-of-blitClip-array-access.patch" - patch -Np1 -i "${srcdir}/xserver19.patch" - - sed -i -e 's,sis_drv,sisimedia_drv,g' src/Makefile.am - sed -i -e 's,\"sis\",\"sisimedia\",g' src/sis.h - sed -i -e 's,sisModuleData,sisimediaModuleData,g' src/sis_driver.c - - autoreconf -fi - - ./configure --prefix=/usr --enable-dri - make - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}/usr/share/man" - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-sisimedia/xf86-video-sis-0.9.1-20102701.patch b/staging/xf86-video-sisimedia/xf86-video-sis-0.9.1-20102701.patch deleted file mode 100644 index 944eceb12..000000000 --- a/staging/xf86-video-sisimedia/xf86-video-sis-0.9.1-20102701.patch +++ /dev/null @@ -1,1376 +0,0 @@ -diff -p -up xf86-video-sis-0.9.1/src/sis.h.orig xf86-video-sis-0.9.1/src/sis.h ---- xf86-video-sis-0.9.1/src/sis.h.orig 2010-01-27 15:27:11.000000000 -0500 -+++ xf86-video-sis-0.9.1/src/sis.h 2010-01-27 15:22:42.000000000 -0500 -@@ -98,6 +98,7 @@ - #define XF86_VERSION_CURRENT XF86_VERSION_NUMERIC(4,3,99,902,0) - #endif - -+#if 0 - /*** Xorg Version Path <= X-Server 2.0 ***/ - /* K.T for xorg 1.3 */ - #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(2,0,0,0,0) -@@ -109,33 +110,36 @@ - #define NEW_XORG_VERSION 1 - #endif - #endif -+#endif -+#define NEW_XORG_VERSION 1 - --#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,0,0,0) -+//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,0,0,0) - #define SIS_HAVE_RR_FUNC - #ifdef HaveDriverFuncs - #undef SIS_HaveDriverFuncs - #define SIS_HaveDriverFuncs HaveDriverFuncs - #define SIS_HAVE_DRIVER_FUNC - #endif /* HaveDriverFuncs */ --#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,900,0) -+//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,900,0) - #define SISISXORG6899900 --#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,901,0) -+//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,901,0) - #define SISISXORG6899901 - #ifdef RANDR - #define SIS_HAVE_RR_GET_MODE_MM - #define SIS_HAVE_RANDR_SIZE_PATCH - #endif /* RANDR */ --#endif /* >= 6.8.99.901 */ --#endif /* >= 6.8.99.900 */ --#endif /* >= 6.8.0.0 */ --#else /* XORG_VERSION_CURRENT */ --#include "xf86Version.h" --#define SISMYSERVERNAME "XFree86" -+//#endif /* >= 6.8.99.901 */ -+//#endif /* >= 6.8.99.900 */ -+//#endif /* >= 6.8.0.0 */ -+//#else /* XORG_VERSION_CURRENT */ -+//#include "xf86Version.h" -+//#define SISMYSERVERNAME "XFree86" - #endif - - /*I.L. modified*/ - //#define NEC_CASE /*It used the old Xorg_Version with new PCI structure.*/ - -+#if 0 - #ifdef XSERVER_LIBPCIACCESS - #ifdef NEC_CASE - #define XORG_VERSION_CURRENT (((7) * 10000000) + ((1) * 100000) + ((0) * 1000) + 0) -@@ -143,6 +147,7 @@ - #define XORG_VERSION_CURRENT (((7) * 10000000) + ((4) * 100000) + ((0) * 1000) + 0) - #endif - #endif -+#endif - - - #define SIS_NAME "SIS" -@@ -268,16 +273,16 @@ - - #undef SISCHECKOSSSE - #ifdef XORG_VERSION_CURRENT --#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) -+//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) - #define SISCHECKOSSSE /* Automatic check OS for SSE; requires SigIll facility */ --#endif -+//#endif - #endif - - #undef SISGAMMARAMP - #ifdef XORG_VERSION_CURRENT --#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) -+//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) - #define SISGAMMARAMP /* Driver can set gamma ramp; requires additional symbols in xf86sym.h */ --#endif -+//#endif - #endif - - #if 0 /* Perhaps for future use */ -@@ -1031,6 +1036,7 @@ typedef struct { - #endif - - PCITAG PciTag; -+ - int PciBus, PciDevice, PciFunc; - EntityInfoPtr pEnt; - int Chipset; -diff -p -up xf86-video-sis-0.9.1/src/sis300_accel.c.orig xf86-video-sis-0.9.1/src/sis300_accel.c ---- xf86-video-sis-0.9.1/src/sis300_accel.c.orig 2007-05-29 22:12:02.000000000 -0400 -+++ xf86-video-sis-0.9.1/src/sis300_accel.c 2010-01-27 15:21:54.000000000 -0500 -@@ -1231,8 +1231,8 @@ SiS300AccelInit(ScreenPtr pScreen) - - #ifdef SIS_USE_EXA /* ----------------------- EXA ----------------------- */ - if(pSiS->useEXA) { --#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) -- -+//#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) -+#if 0 - if(pSiS->scrnOffset < 8192) { - int obase = 0; - /* data */ -@@ -1430,7 +1430,8 @@ SiS300AccelInit(ScreenPtr pScreen) - pSiS->exa_scratch = exaOffscreenAlloc(pScreen, 128 * 1024, 16, TRUE, - SiSScratchSave, pSiS); - -- #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) -+// #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) -+ #if 0 - if(pSiS->exa_scratch) { - pSiS->exa_scratch_next = pSiS->exa_scratch->offset; - pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch; -diff -p -up xf86-video-sis-0.9.1/src/sis310_accel.c.orig xf86-video-sis-0.9.1/src/sis310_accel.c ---- xf86-video-sis-0.9.1/src/sis310_accel.c.orig 2007-09-29 05:13:12.000000000 -0400 -+++ xf86-video-sis-0.9.1/src/sis310_accel.c 2010-01-27 15:21:54.000000000 -0500 -@@ -65,9 +65,9 @@ - # define SIS_NEED_ARRAY - # undef SISNEWRENDER - # ifdef XORG_VERSION_CURRENT --# if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0) -+//# if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0) - # define SISNEWRENDER --# endif -+//# endif - # endif - # endif - #endif -@@ -1463,7 +1463,7 @@ SiSUploadToScratch(PixmapPtr pSrc, Pixma - int dst_pitch, size, w, h, bytes; - - w = pSrc->drawable.width; -- -+/* - #if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) - dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) + - pSiS->EXADriverPtr->card.offscreenPitch - 1) & -@@ -1472,17 +1472,17 @@ SiSUploadToScratch(PixmapPtr pSrc, Pixma - dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) + - pSiS->EXADriverPtr->card.pixmapPitchAlign - 1) & - ~(pSiS->EXADriverPtr->card.pixmapPitchAlign - 1); --#else -+#else*/ - dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) + - pSiS->EXADriverPtr->pixmapPitchAlign - 1) & - ~(pSiS->EXADriverPtr->pixmapPitchAlign - 1); - --#endif -+//#endif - size = dst_pitch * pSrc->drawable.height; - - if(size > pSiS->exa_scratch->size) - return FALSE; -- -+/* - #if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) - pSiS->exa_scratch_next = (pSiS->exa_scratch_next + - pSiS->EXADriverPtr->card.offscreenByteAlign - 1) & -@@ -1491,34 +1491,34 @@ SiSUploadToScratch(PixmapPtr pSrc, Pixma - pSiS->exa_scratch_next = (pSiS->exa_scratch_next + - pSiS->EXADriverPtr->card.pixmapOffsetAlign - 1) & - ~(pSiS->EXADriverPtr->card.pixmapOffsetAlign - 1); --#else -+#else*/ - pSiS->exa_scratch_next = (pSiS->exa_scratch_next + - pSiS->EXADriverPtr->pixmapOffsetAlign - 1) & - ~(pSiS->EXADriverPtr->pixmapOffsetAlign - 1); --#endif -- -+//#endif -+/* - #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) - if(pSiS->exa_scratch_next + size > - pSiS->exa_scratch->offset + pSiS->exa_scratch->size) { - (pSiS->EXADriverPtr->accel.WaitMarker)(pSrc->drawable.pScreen, 0); - pSiS->exa_scratch_next = pSiS->exa_scratch->offset; - } --#else -+#else*/ - if(pSiS->exa_scratch_next + size > - pSiS->exa_scratch->offset + pSiS->exa_scratch->size) { - (pSiS->EXADriverPtr->WaitMarker)(pSrc->drawable.pScreen, 0); - pSiS->exa_scratch_next = pSiS->exa_scratch->offset; - } --#endif -+//#endif - - memcpy(pDst, pSrc, sizeof(*pDst)); - pDst->devKind = dst_pitch; - --#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) -- pDst->devPrivate.ptr = pSiS->EXADriverPtr->card.memoryBase + pSiS->exa_scratch_next; --#else -+//#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) -+// pDst->devPrivate.ptr = pSiS->EXADriverPtr->card.memoryBase + pSiS->exa_scratch_next; -+//#else - pDst->devPrivate.ptr = pSiS->EXADriverPtr->memoryBase + pSiS->exa_scratch_next; --#endif -+//#endif - - pSiS->exa_scratch_next += size; - -@@ -1762,7 +1762,8 @@ SiS315AccelInit(ScreenPtr pScreen) - - #ifdef SIS_USE_EXA /* ----------------------- EXA ----------------------- */ - if(pSiS->useEXA) { --#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) -+#if 0 -+//#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) - - int obase = 0; - -@@ -1952,11 +1953,11 @@ SiS315AccelInit(ScreenPtr pScreen) - SiSScratchSave, pSiS); - if(pSiS->exa_scratch) { - pSiS->exa_scratch_next = pSiS->exa_scratch->offset; -- #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) -- pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch; -- #else -+ //#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) -+ // pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch; -+ //#else - pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch; -- #endif -+ //#endif - } - - } else { -diff -p -up xf86-video-sis-0.9.1/src/sis_3daccel.c.orig xf86-video-sis-0.9.1/src/sis_3daccel.c ---- xf86-video-sis-0.9.1/src/sis_3daccel.c.orig 2007-08-10 04:22:16.000000000 -0400 -+++ xf86-video-sis-0.9.1/src/sis_3daccel.c 2010-01-27 15:21:54.000000000 -0500 -@@ -64,9 +64,9 @@ - # define SIS_NEED_ARRAY - # undef SISNEWRENDER - # ifdef XORG_VERSION_CURRENT --# if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0) -+//# if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0) - # define SISNEWRENDER --# endif -+//# endif - # endif - # endif - #endif -diff -p -up xf86-video-sis-0.9.1/src/sis_accel.c.orig xf86-video-sis-0.9.1/src/sis_accel.c ---- xf86-video-sis-0.9.1/src/sis_accel.c.orig 2007-05-29 22:12:02.000000000 -0400 -+++ xf86-video-sis-0.9.1/src/sis_accel.c 2010-01-27 15:21:54.000000000 -0500 -@@ -781,50 +781,50 @@ SiSAccelInit(ScreenPtr pScreen) - - #ifdef SIS_USE_EXA /* ----------------------- EXA ----------------------- */ - if(pSiS->useEXA) { --#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) -+//#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) - - /* data */ -- pSiS->EXADriverPtr->card.memoryBase = pSiS->FbBase; -- pSiS->EXADriverPtr->card.memorySize = pSiS->maxxfbmem; -- pSiS->EXADriverPtr->card.offScreenBase = pScrn->displayWidth * pScrn->virtualY -- * (pScrn->bitsPerPixel >> 3); -- if(pSiS->EXADriverPtr->card.memorySize > pSiS->EXADriverPtr->card.offScreenBase) { -- pSiS->EXADriverPtr->card.flags = EXA_OFFSCREEN_PIXMAPS; -- } else { -- pSiS->NoXvideo = TRUE; -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -- "Not enough video RAM for offscreen memory manager. Xv disabled\n"); -- } --#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) -- pSiS->EXADriverPtr->card.offscreenByteAlign = 8; /* src/dst: double quad word boundary */ -- pSiS->EXADriverPtr->card.offscreenPitch = 1; --#else -- pSiS->EXADriverPtr->card.pixmapOffsetAlign = 8; /* src/dst: double quad word boundary */ -- pSiS->EXADriverPtr->card.pixmapPitchAlign = 8; /* could possibly be 1, but who knows for sure */ --#endif -- pSiS->EXADriverPtr->card.maxX = 2047; -- pSiS->EXADriverPtr->card.maxY = 2047; -+// pSiS->EXADriverPtr->card.memoryBase = pSiS->FbBase; -+// pSiS->EXADriverPtr->card.memorySize = pSiS->maxxfbmem; -+// pSiS->EXADriverPtr->card.offScreenBase = pScrn->displayWidth * pScrn->virtualY -+// * (pScrn->bitsPerPixel >> 3); -+// if(pSiS->EXADriverPtr->card.memorySize > pSiS->EXADriverPtr->card.offScreenBase) { -+// pSiS->EXADriverPtr->card.flags = EXA_OFFSCREEN_PIXMAPS; -+// } else { -+// pSiS->NoXvideo = TRUE; -+// xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+// "Not enough video RAM for offscreen memory manager. Xv disabled\n"); -+// } -+//#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) -+// pSiS->EXADriverPtr->card.offscreenByteAlign = 8; /* src/dst: double quad word boundary */ -+// pSiS->EXADriverPtr->card.offscreenPitch = 1; -+//#else -+// pSiS->EXADriverPtr->card.pixmapOffsetAlign = 8; /* src/dst: double quad word boundary */ -+// pSiS->EXADriverPtr->card.pixmapPitchAlign = 8; /* could possibly be 1, but who knows for sure */ -+//#endif -+// pSiS->EXADriverPtr->card.maxX = 2047; -+// pSiS->EXADriverPtr->card.maxY = 2047; - - /* Sync */ -- pSiS->EXADriverPtr->accel.WaitMarker = SiSEXASync; -+// pSiS->EXADriverPtr->accel.WaitMarker = SiSEXASync; - - /* Solid fill */ -- pSiS->EXADriverPtr->accel.PrepareSolid = SiSPrepareSolid; -- pSiS->EXADriverPtr->accel.Solid = SiSSolid; -- pSiS->EXADriverPtr->accel.DoneSolid = SiSDoneSolid; -+// pSiS->EXADriverPtr->accel.PrepareSolid = SiSPrepareSolid; -+// pSiS->EXADriverPtr->accel.Solid = SiSSolid; -+// pSiS->EXADriverPtr->accel.DoneSolid = SiSDoneSolid; - - /* Copy */ -- pSiS->EXADriverPtr->accel.PrepareCopy = SiSPrepareCopy; -- pSiS->EXADriverPtr->accel.Copy = SiSCopy; -- pSiS->EXADriverPtr->accel.DoneCopy = SiSDoneCopy; -+// pSiS->EXADriverPtr->accel.PrepareCopy = SiSPrepareCopy; -+// pSiS->EXADriverPtr->accel.Copy = SiSCopy; -+// pSiS->EXADriverPtr->accel.DoneCopy = SiSDoneCopy; - - /* Composite not supported */ - - /* Upload, download to/from Screen */ -- pSiS->EXADriverPtr->accel.UploadToScreen = SiSUploadToScreen; -- pSiS->EXADriverPtr->accel.DownloadFromScreen = SiSDownloadFromScreen; -+// pSiS->EXADriverPtr->accel.UploadToScreen = SiSUploadToScreen; -+// pSiS->EXADriverPtr->accel.DownloadFromScreen = SiSDownloadFromScreen; - --#else /*xorg>=7.0*/ -+//#else /*xorg>=7.0*/ - - pSiS->EXADriverPtr->exa_major = 2; - pSiS->EXADriverPtr->exa_minor = 0; -@@ -867,7 +867,7 @@ SiSAccelInit(ScreenPtr pScreen) - - #endif /*end of Xorg>=7.0 EXA Setting*/ - } --#endif /* EXA */ -+//#endif /* EXA */ - - } /* NoAccel */ - -@@ -946,11 +946,11 @@ SiSAccelInit(ScreenPtr pScreen) - SiSScratchSave, pSiS); - if(pSiS->exa_scratch) { - pSiS->exa_scratch_next = pSiS->exa_scratch->offset; -- #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) -- pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch; -- #else -+ //#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) -+ // pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch; -+ //#else - pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch; -- #endif -+ //#endif - } - - } else { -diff -p -up xf86-video-sis-0.9.1/src/sis_dri.c.orig xf86-video-sis-0.9.1/src/sis_dri.c ---- xf86-video-sis-0.9.1/src/sis_dri.c.orig 2008-11-04 08:27:14.000000000 -0500 -+++ xf86-video-sis-0.9.1/src/sis_dri.c 2010-01-27 15:21:54.000000000 -0500 -@@ -56,7 +56,8 @@ extern Bool drmSiSAgpInit(int driSubFD, - - #ifdef XORG_VERSION_CURRENT - #define SISHAVECREATEBUSID --#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,7,99,1,0) -+#if 0 -+//#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,7,99,1,0) - /*I.L. modified*/ - #ifndef XSERVER_LIBPCIACCESS - extern char *DRICreatePCIBusID(pciVideoPtr PciInfo); -diff -p -up xf86-video-sis-0.9.1/src/sis_driver.c.orig xf86-video-sis-0.9.1/src/sis_driver.c ---- xf86-video-sis-0.9.1/src/sis_driver.c.orig 2009-06-22 08:15:54.000000000 -0400 -+++ xf86-video-sis-0.9.1/src/sis_driver.c 2010-01-27 15:21:54.000000000 -0500 -@@ -140,6 +140,17 @@ static int pix24bpp = 0; - * an upper-case version of the driver name. - */ - -+#if XSERVER_LIBPCIACCESS -+#define SIS_DEVICE_MATCH(d, i)\ -+ {PCI_VENDOR_SIS, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) } -+ -+static const struct pci_id_match SIS_device_match[] = { -+ SIS_DEVICE_MATCH (PCI_CHIP_SIS670, 0), -+ SIS_DEVICE_MATCH (PCI_CHIP_SIS671, 0), -+ {0, 0, 0 }, -+ }; -+#endif -+ - #ifdef _X_EXPORT - _X_EXPORT - #endif -@@ -147,7 +158,11 @@ DriverRec SIS = { - SIS_CURRENT_VERSION, - SIS_DRIVER_NAME, - SISIdentify, -+#if XSERVER_LIBPCIACCESS -+ NULL, -+#else - SISProbe, -+#endif - SISAvailableOptions, - NULL, - 0 -@@ -155,6 +170,11 @@ DriverRec SIS = { - , - SISDriverFunc - #endif -+#if XSERVER_LIBPCIACCESS -+ , -+ SIS_device_match, -+ SIS_pci_probe -+#endif - }; - - static SymTabRec SISChipsets[] = { -@@ -453,7 +473,94 @@ SISDriverFunc(ScrnInfoPtr pScrn, SISDRIV - /****************************************************/ - /* Probe() */ - /****************************************************/ -+static Bool SIS_pci_probe (DriverPtr driver, int entity_num, struct pci_device *device, intptr_t match_data) -+{ -+ ScrnInfoPtr pScrn; -+#ifdef SISDUALHEAD -+ EntityInfoPtr pEnt; -+ Bool foundScreen = FALSE; -+#endif -+xf86DrvMsg(0, X_INFO, "SIS_pci_probe - begin, entity_num=%d\n", entity_num); -+xf86DrvMsg(0, X_INFO, " vendor_id=0x%x\n", device->vendor_id); -+xf86DrvMsg(0, X_INFO, " device_id=0x%x\n", device->device_id); -+xf86DrvMsg(0, X_INFO, " bus=%d\n", device->bus); -+xf86DrvMsg(0, X_INFO, " dev=%d\n", device->dev); -+xf86DrvMsg(0, X_INFO, " func=%d\n", device->func); -+ pScrn = NULL; -+ if((pScrn = xf86ConfigPciEntity(pScrn, 0, -+ entity_num, -+ SISPciChipsets, -+ NULL, NULL, NULL, NULL, NULL))) { -+ xf86DrvMsg(0, X_INFO, "SIS_pci_probe - ConfigPciEntity found\n"); -+ /* Fill in what we can of the ScrnInfoRec */ -+ pScrn->driverVersion = SIS_CURRENT_VERSION; -+ pScrn->driverName = SIS_DRIVER_NAME; -+ pScrn->name = SIS_NAME; -+ pScrn->Probe = NULL;//SISProbe; -+ pScrn->PreInit = SISPreInit; -+ pScrn->ScreenInit = SISScreenInit; -+ pScrn->SwitchMode = SISSwitchMode; -+ pScrn->AdjustFrame = SISAdjustFrame; -+ pScrn->EnterVT = SISEnterVT; -+ pScrn->LeaveVT = SISLeaveVT; -+ pScrn->FreeScreen = SISFreeScreen; -+ pScrn->ValidMode = SISValidMode; -+ pScrn->PMEvent = SISPMEvent; /*add PM function for ACPI hotkey,Ivans*/ -+#ifdef X_XF86MiscPassMessage -+// if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) { -+// pScrn->HandleMessage = SISHandleMessage; -+// } -+#endif -+ foundScreen = TRUE; -+ } -+ #ifdef SISDUALHEAD -+ pEnt = xf86GetEntityInfo(entity_num); -+xf86DrvMsg(0, X_INFO, "SIS_pci_probe - GetEntityInfo chipset is 0x%x\n",pEnt->chipset); -+ switch(pEnt->chipset) { -+ case PCI_CHIP_SIS300: -+ case PCI_CHIP_SIS540: -+ case PCI_CHIP_SIS630: -+ case PCI_CHIP_SIS550: -+ case PCI_CHIP_SIS315: -+ case PCI_CHIP_SIS315H: -+ case PCI_CHIP_SIS315PRO: -+ case PCI_CHIP_SIS650: -+ case PCI_CHIP_SIS330: -+ case PCI_CHIP_SIS660: -+ case PCI_CHIP_SIS340: -+ case PCI_CHIP_SIS670: -+ case PCI_CHIP_SIS671: -+ case PCI_CHIP_XGIXG40: -+ { -+ SISEntPtr pSiSEnt = NULL; -+ DevUnion *pPriv; -+ -+ xf86SetEntitySharable(entity_num); -+ if(SISEntityIndex < 0) { -+ SISEntityIndex = xf86AllocateEntityPrivateIndex(); -+ } -+ pPriv = xf86GetEntityPrivate(pScrn->entityList[0], SISEntityIndex); -+ if(!pPriv->ptr) { -+ pPriv->ptr = xnfcalloc(sizeof(SISEntRec), 1); -+ pSiSEnt = pPriv->ptr; -+ memset(pSiSEnt, 0, sizeof(SISEntRec)); -+ pSiSEnt->lastInstance = -1; -+ } else { -+ pSiSEnt = pPriv->ptr; -+ } -+ pSiSEnt->lastInstance++; -+ xf86SetEntityInstanceForScreen(pScrn, pScrn->entityList[0], -+ pSiSEnt->lastInstance); -+ } -+ break; - -+ default: -+ break; -+ } -+#endif /* DUALHEAD */ -+xf86DrvMsg(0, X_INFO, "SIS_pci_probe - end\n"); -+ return foundScreen; -+} - - static Bool - SISProbe(DriverPtr drv, int flags) -@@ -464,7 +571,7 @@ SISProbe(DriverPtr drv, int flags) - int numDevSections; - int numUsed, numUsedSiS, numUsedXGI; - Bool foundScreen = FALSE; -- -+xf86DrvMsg(0, X_INFO, "SISPRobe() begin, flags=%d\n", flags); - /* - * The aim here is to find all cards that this driver can handle, - * and for the ones not already claimed by another driver, claim -@@ -490,6 +597,7 @@ SISProbe(DriverPtr drv, int flags) - * There's no matching device section in the config file, so quit - * now. - */ -+ xf86DrvMsg(0, X_INFO, "SISProbe - MatchDevice fail\n"); - return FALSE; - } - -@@ -526,14 +634,16 @@ SISProbe(DriverPtr drv, int flags) - xfree(devSections); - - numUsed = numUsedSiS + numUsedXGI; -- -- if(numUsed <= 0) -+xf86DrvMsg(0, X_INFO, "SISPRobe - test1\n"); -+ if(numUsed <= 0) { -+ xf86DrvMsg(0, X_INFO, "SISProbe - MatchPciInstances fail\n"); - return FALSE; -+ } - - if(flags & PROBE_DETECT) { - - foundScreen = TRUE; -- -+ xf86DrvMsg(0, X_INFO, "SISProbe - flags already probe"); - } else for(i = 0; i < numUsed; i++) { - - ScrnInfoPtr pScrn; -@@ -548,6 +658,7 @@ SISProbe(DriverPtr drv, int flags) - (i < numUsedSiS) ? usedChipsSiS[i] : usedChipsXGI[i-numUsedSiS], - (i < numUsedSiS) ? SISPciChipsets : XGIPciChipsets, - NULL, NULL, NULL, NULL, NULL))) { -+ xf86DrvMsg(0, X_INFO, "SISProbe - ConfigPciEntity found\n"); - /* Fill in what we can of the ScrnInfoRec */ - pScrn->driverVersion = SIS_CURRENT_VERSION; - pScrn->driverName = SIS_DRIVER_NAME; -@@ -563,16 +674,16 @@ SISProbe(DriverPtr drv, int flags) - pScrn->ValidMode = SISValidMode; - pScrn->PMEvent = SISPMEvent; /*add PM function for ACPI hotkey,Ivans*/ - #ifdef X_XF86MiscPassMessage -- if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) { -- pScrn->HandleMessage = SISHandleMessage; -+ if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) { -+// pScrn->HandleMessage = SISHandleMessage; - } - #endif - foundScreen = TRUE; - } -- -+xf86DrvMsg(0, X_INFO, "SISProbe - test2\n"); - #ifdef SISDUALHEAD - pEnt = xf86GetEntityInfo((i < numUsedSiS) ? usedChipsSiS[i] : usedChipsXGI[i-numUsedSiS]); -- -+ xf86DrvMsg(0, X_INFO, "SISProbe - GetEntityInfo done\n"); - switch(pEnt->chipset) { - case PCI_CHIP_SIS300: - case PCI_CHIP_SIS540: -@@ -620,7 +731,7 @@ SISProbe(DriverPtr drv, int flags) - - if(usedChipsSiS) xfree(usedChipsSiS); - if(usedChipsXGI) xfree(usedChipsXGI); -- -+xf86DrvMsg(0, X_INFO, "SISProbe end\n"); - return foundScreen; - } - -@@ -1306,7 +1417,11 @@ SiSReadROM(ScrnInfoPtr pScrn) - } - - if(readpci) { -+#ifndef XSERVER_LIBPCIACCESS - xf86ReadPciBIOS(0, pSiS->PciTag, 0, pSiS->BIOS, biossize); -+#else -+ pci_device_read_rom(pSiS->PciInfo, pSiS->BIOS); -+#endif - if(SISCheckBIOS(pSiS, mypciid, mypcivendor, biossize)) { - found = TRUE; - } -@@ -2224,8 +2339,7 @@ SiSSetSyncRangeFromEdid(ScrnInfoPtr pScr - { 2, 0x04, 56.6 }, - { 2, 0x02, 60.1 }, - { 2, 0x01, 80.1 } -- }; -- -+ }; - const myvddctiming myvtiming[11] = { - { 1, 0x02, 56 }, - { 1, 0x01, 60 }, -@@ -2240,11 +2354,6 @@ SiSSetSyncRangeFromEdid(ScrnInfoPtr pScr - { 2, 0x01, 75 } - }; - --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO, "SiSSetSyncRangeFromEdid\n"); --#endif -- - if(flag) { /* HSync */ - - for(i = 0; i < 4; i++) { -@@ -2350,12 +2459,6 @@ SiSSetSyncRangeFromEdid(ScrnInfoPtr pScr - static Bool - SiSAllowSyncOverride(SISPtr pSiS, Bool fromDDC, int mfbcrt) - { --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO, "SiSAllowSyncOverride\n"); --#endif --// return TRUE; -- - if(!(pSiS->VBFlags2 & VB2_VIDEOBRIDGE)) return FALSE; - - #ifdef SISDUALHEAD -@@ -2382,11 +2485,10 @@ SiSAllowSyncOverride(SISPtr pSiS, Bool f - } - #endif - --// PCF --// if(!(pSiS->VBFlags & DISPTYPE_CRT1)) { -+ if(!(pSiS->VBFlags & DISPTYPE_CRT1)) { - if( (pSiS->VBFlags & CRT2_TV) || - ((pSiS->VBFlags & CRT2_LCD) && (!fromDDC)) ) return TRUE; --// } else if((pSiS->VBFlags & CRT1_LCDA) && (!fromDDC)) return TRUE; -+ } else if((pSiS->VBFlags & CRT1_LCDA) && (!fromDDC)) return TRUE; - - return FALSE; - } -@@ -2394,8 +2496,6 @@ SiSAllowSyncOverride(SISPtr pSiS, Bool f - static Bool - SiSCheckForH(float hsync, MonPtr monitor) - { -- -- - int i; - for(i = 0; i < monitor->nHsync; i++) { - if((hsync > monitor->hsync[i].lo * (1.0 - SYNC_TOLERANCE)) && -@@ -2409,7 +2509,6 @@ SiSCheckForH(float hsync, MonPtr monitor - static Bool - SiSCheckForV(float vrefresh, MonPtr monitor) - { -- - int i; - for(i = 0; i < monitor->nVrefresh; i++) { - if((vrefresh > monitor->vrefresh[i].lo * (1.0 - SYNC_TOLERANCE)) && -@@ -2424,21 +2523,11 @@ static Bool - SiSCheckAndOverruleH(ScrnInfoPtr pScrn, MonPtr monitor) - { - DisplayModePtr mode = monitor->Modes; --// PCF - float mymin = 30.0, mymax = 80.0, hsync; -- - Bool doit = FALSE; - --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO, "SiSCheckAndOverruleH\n"); --#endif -- - for(hsync = mymin; hsync <= mymax; hsync += .5) { -- if(!SiSCheckForH(hsync, monitor)) -- { -- doit = TRUE; -- } -+ if(!SiSCheckForH(hsync, monitor)) doit = TRUE; - } - - if(mode) { -@@ -2461,7 +2550,6 @@ SiSCheckAndOverruleH(ScrnInfoPtr pScrn, - return TRUE; - } - -- - return FALSE; - } - -@@ -2469,20 +2557,11 @@ static Bool - SiSCheckAndOverruleV(ScrnInfoPtr pScrn, MonPtr monitor) - { - DisplayModePtr mode = monitor->Modes; --// PCF -- float mymin = 57.0, mymax = 63.0, vrefresh; -+ float mymin = 59.0, mymax = 61.0, vrefresh; - Bool doit = FALSE, ret = FALSE; -- --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO, "SiSCheckAndOverruleV\n"); --#endif - - for(vrefresh = mymin; vrefresh <= mymax; vrefresh += 1.0) { -- if(!SiSCheckForV(vrefresh, monitor)) -- { -- doit = TRUE; -- } -+ if(!SiSCheckForV(vrefresh, monitor)) doit = TRUE; - } - - if(mode) { -@@ -2515,7 +2594,6 @@ SiSCheckAndOverruleV(ScrnInfoPtr pScrn, - monitor->nVrefresh++; - ret = TRUE; - } -- - return ret; - } - -@@ -2529,11 +2607,6 @@ SiSFixupHVRanges(ScrnInfoPtr pScrn, int - static const char *saneh = "Correcting %s CRT%d monitor HSync range\n"; - static const char *sanev = "Correcting %s CRT%d monitor VRefresh range\n"; - int crtnum; -- --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO, "SiSFixupHVRanges\n"); --#endif - - #ifdef SISDUALHEAD - if(pSiS->DualHeadMode) { -@@ -2610,8 +2683,7 @@ SiSFixupHVRanges(ScrnInfoPtr pScrn, int - } - } - } --// PCF --// return TRUE; -+ - return freqoverruled; - } - -@@ -2623,11 +2695,6 @@ SiSMakeOwnModeList(ScrnInfoPtr pScrn, Bo - Bool isfordvi, Bool *havecustommodes, Bool fakecrt2modes, Bool IsForCRT2) - { - DisplayModePtr tempmode, delmode, mymodes; -- -- // PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO, "SiSMakeOwnModeList\n"); --#endif - - if((mymodes = SiSBuildBuiltInModeList(pScrn, includelcdmodes, isfordvi, fakecrt2modes, IsForCRT2))) { - if(!acceptcustommodes) { -@@ -2676,11 +2743,6 @@ SiSSetupModeListParmsCRT1(SISPtr pSiS, u - Bool *acceptcustommodes, Bool *includelcdmodes, Bool *isfordvi, - Bool *fakecrt2modes, Bool *IsForCRT2, Bool *AllowInterlace) - { --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO, "SiSSetupModeListParmsCRT1\n"); --#endif -- - (*acceptcustommodes) = TRUE; /* Accept user modelines */ - (*includelcdmodes) = TRUE; /* Include modes reported by DDC */ - (*isfordvi) = FALSE; /* Is for digital DVI output */ -@@ -2815,11 +2877,6 @@ SiSReplaceModeList(ScrnInfoPtr pScrn, Cl - * -) crt2 device is not TV, and - * -) crt1 is not LCDA, unless bridge is TMDS/LCDA capable (301C) - */ --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO, "SiSReplaceModeList\n"); --#endif -- - - if((pSiS->VGAEngine == SIS_300_VGA) || (pSiS->VGAEngine == SIS_315_VGA)) { - -@@ -2881,11 +2938,6 @@ SiSClearModesPrivate(DisplayModePtr mode - { - DisplayModePtr tempmode; - --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO, "SiSClearModesPrivate\n"); --#endif -- - /* Make sure that the Private field is NULL */ - /* (This way we don't have to care for MergedFB - * when freeing the mode; just check the Private -@@ -2904,11 +2956,6 @@ SiSDuplicateMode(DisplayModePtr source) - { - DisplayModePtr dest = NULL; - --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO, "SiSDuplicateMode\n"); --#endif -- - if(source) { - if((dest = xalloc(sizeof(DisplayModeRec)))) { - memcpy(dest, source, sizeof(DisplayModeRec)); -@@ -2972,11 +3019,6 @@ SiSBuildVesaModeList(ScrnInfoPtr pScrn, - SISPtr pSiS = SISPTR(pScrn); - int i = 0; - --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO, "SiSBuildVesaModeList\n"); --#endif -- - while(vbe->VideoModePtr[i] != 0xffff) { - sisModeInfoPtr m; - VbeModeInfoBlock *mode; -@@ -3014,7 +3056,7 @@ SiSSetMinMaxPixelClock(ScrnInfoPtr pScrn - { - SISPtr pSiS = SISPTR(pScrn); - MessageType from; -- -+ - /* Set the min pixel clock */ - pSiS->MinClock = 5000; - if((pSiS->VGAEngine == SIS_300_VGA) || (pSiS->VGAEngine == SIS_315_VGA)) { -@@ -3061,11 +3103,6 @@ SiSRemoveUnsuitableModes(ScrnInfoPtr pSc - int maxUsedClock = 0; - static const char *notsuitablestr = "Not using mode \"%s\" (not suitable for %s mode)\n"; - --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO, "SiSRemoveUnsuitableModes\n"); --#endif -- - if((p = first = initial)) { - - do { -@@ -3222,11 +3259,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - static const char *crtsetupstr = "*************************** CRT%d setup ***************************\n"; - #endif - --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO, "SISPreInit Start\n"); --#endif -- - if(flags & PROBE_DETECT) { - - vbeInfoPtr pVbe; -@@ -4716,10 +4748,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - mymax = 8192 * 1024; - else if(total <= 32768) /* <= 32MB: Use 16MB for X */ - mymax = 16384 * 1024; -- else --// PCF /* Otherwise: Use 20MB for X */ --// mymax = 20 * 1024 * 1024; -- mymax = 20 * 1024 *1024; -+ else /* Otherwise: Use 20MB for X */ -+ mymax = 20 * 1024 * 1024; - /* availMem is right now adjusted to not use the UMA - * area. Make sure that our default doesn't reach - * into the UMA area either. -@@ -4758,9 +4788,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - if(pScrn->videoRam <= 65536) - pSiS->maxxfbmem = 16384 * 1024; /* On >=315 series and <=64MB, use 16MB */ - else --// PCF --// pSiS->maxxfbmem = 20 * 1024 * 1024; /* On >=315 series and > 64MB, use 20MB */ -- pSiS->maxxfbmem = 20 * 1024 * 1024; -+ pSiS->maxxfbmem = 20 * 1024 * 1024; /* On >=315 series and > 64MB, use 20MB */ - } else - pSiS->maxxfbmem = 12288 * 1024; /* On <315 series, use 12MB */ - -@@ -4980,7 +5008,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - * via CRT2.) - * (TODO: This might need some modification for the - * 307 bridges, if these are capable of driving -- * LCDs > via channel B) -+ * LCDs > 1600 via channel B) - */ - if((pSiS->SiS_SD_Flags & SiS_SD_SUPPORTLCDA) && - (pSiS->VBFlags & CRT2_LCD) && -@@ -4995,10 +5023,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - */ - if(pSiS->ChipType < SIS_662 || pSiS->ChipType >= XGI_20) pSiS->ForceCRT1Type = CRT1_LCDA; - pSiS->ForceCRT2Type = CRT2_TV; --// PCF --// } else if(pSiS->LCDwidth > 1600) { -- } else if(pSiS->LCDwidth > 1920) { -- -+ } else if(pSiS->LCDwidth > 1600) { - /* If LCD is > 1600, default to LCDA if we don't need CRT1/VGA for other head */ - Bool NeedCRT1VGA = FALSE; - #ifdef SISDUALHEAD -@@ -5591,11 +5616,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - clockRanges->minClock = pSiS->MinClock; - clockRanges->maxClock = pSiS->MaxClock; - clockRanges->clockIndex = -1; /* programmable */ --// PCF --// clockRanges->interlaceAllowed = TRUE; --// clockRanges->doubleScanAllowed = TRUE; -- clockRanges->interlaceAllowed = FALSE; -- clockRanges->doubleScanAllowed = FALSE; -+ clockRanges->interlaceAllowed = TRUE; -+ clockRanges->doubleScanAllowed = TRUE; - - /* Replace default mode list */ - SiSReplaceModeList(pScrn, clockRanges, FALSE); -@@ -5623,11 +5645,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - break; - case SIS_300_VGA: - case SIS_315_VGA: --// PCF - maxpitch = 4088; -- maxheight = 4096; --// maxpitch = 1600; --// maxheight = 1200; -+ maxheight = 4096; - break; - default: - maxpitch = 2048; -@@ -5688,12 +5707,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - pScrn->monitor->DDC = NULL; - } - #endif --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"xf86ValidateModes Start\n"); -- xf86DrvMsg(0, X_INFO,"virtualX = %d, virtualY = %d, maxpitch = %d, maxheight = %d, maxxfbmem = %ld \n", -- pScrn->display->virtualX,pScrn->display->virtualY,maxpitch,maxheight,pSiS->maxxfbmem/1024); --#endif -+ - i = xf86ValidateModes(pScrn, - pScrn->monitor->Modes, - pScrn->display->modes, -@@ -5703,13 +5717,9 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - pScrn->bitsPerPixel * 8, - minheight, maxheight, - pScrn->display->virtualX, -- pScrn->display->virtualY, -+ pScrn->display->virtualY, - pSiS->maxxfbmem, - LOOKUP_BEST_REFRESH); --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"xf86ValidateModes End\n"); --#endif - - pScrn->monitor->DDC = backupddc; - } -@@ -5745,28 +5755,17 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - #endif - - /* Prune the modes marked as invalid */ --// PCF --// xf86DrvMsg(0, X_INFO,"xf86PruneDriverModes Start\n"); - xf86PruneDriverModes(pScrn); --// xf86DrvMsg(0, X_INFO,"xf86PruneDriverModes End\n"); -- - - if(i == 0 || pScrn->modes == NULL) { - SISErrorLog(pScrn, "No valid modes found - check VertRefresh/HorizSync\n"); - goto my_error_1; - } - --// PCF --// xf86DrvMsg(0, X_INFO,"xf86SetCrtcForModes Start\n"); - xf86SetCrtcForModes(pScrn, INTERLACE_HALVE_V); --// xf86DrvMsg(0, X_INFO,"xf86SetCrtcForModes End\n"); -- - - /* Clear the modes' Private field */ --// PCF --// xf86DrvMsg(0, X_INFO,"SiSClearModesPrivate Start\n"); - SiSClearModesPrivate(pScrn->modes); --// xf86DrvMsg(0, X_INFO,"SiSClearModesPrivate End\n"); - - /* Save virtualX/Y calculated by ValidateModes - * and overwrite them with our values assumed to -@@ -5823,23 +5822,9 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - } - - if(usemyprint) { --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"SiSPrintModes Start\n"); --#endif - SiSPrintModes(pScrn, printfreq); --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"SiSPrintModes End\n"); --#endif - } else { --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"xf86PrintModes Start\n"); --#endif - xf86PrintModes(pScrn); --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"xf86PrintModes End\n"); --#endif - } - } - -@@ -6072,10 +6057,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) - - /*xf86DrvMsg(0,X_INFO,"CurrentMode=%d. \n",pSiS->Hkey_Device_Switch_State); - xf86DrvMsg(0,X_INFO,"Init_VBFlags=0X%x. \n",pSiS->VBFlags);*/ --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0,X_INFO,"SISPreInit End\n"); --#endif -+ - return TRUE; - - /* ---- */ -@@ -7523,9 +7505,7 @@ SiSPreSetMode(ScrnInfoPtr pScrn, Display - xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, SISVERBLEVEL, "VBFlags=0x%x\n", pSiS->VBFlags); - - CR30 = 0x00; --// PCF --// CR31 &= ~0x60; /* Clear VB_Drivermode & VB_OutputDisable */ -- CR31 &= ~0x20; /* Clear VB_Drivermode & VB_OutputDisable */ -+ CR31 &= ~0x60; /* Clear VB_Drivermode & VB_OutputDisable */ - CR31 |= 0x04; /* Set VB_NotSimuMode (not for 30xB/1400x1050?) */ - CR35 = 0x00; - -@@ -8633,11 +8613,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo - SISEntPtr pSiSEnt = NULL; - #endif - --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"SISModeInit\n"); --#endif -- - andSISIDXREG(SISCR,0x11,0x7f); /* Unlock CRTC registers */ - - SISModifyModeInfo(mode); /* Quick check of the mode parameters */ -@@ -8647,14 +8622,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo - } - - if(pSiS->UseVESA) { /* With VESA: */ --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n"); -- xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n"); -- xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n"); -- xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n"); -- xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n"); --#endif - - #ifdef SISDUALHEAD - /* No dual head mode when using VESA */ -@@ -8679,7 +8646,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo - SISErrorLog(pScrn, "SiSSetVESAMode() failed\n"); - return FALSE; - } -- - sisSaveUnlockExtRegisterLock(pSiS, NULL, NULL); - if(pSiS->VGAEngine == SIS_300_VGA || pSiS->VGAEngine == SIS_315_VGA) { - SiSPreSetMode(pScrn, mode, SIS_MODE_SIMU); -@@ -8697,21 +8663,11 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo - SiSVGAProtect(pScrn, TRUE); - (*pSiS->SiSRestore)(pScrn, &pSiS->ModeReg); - SiSVGAProtect(pScrn, FALSE); --// xf86DrvMsg(0, X_INFO,"VESA DualHeadMode SetMode\n"); -+ - } else { /* Without VESA: */ --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n"); -- xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n"); -- xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n"); -- xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n"); -- xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n"); --#endif - - #ifdef SISDUALHEAD - if(pSiS->DualHeadMode) { -- -- xf86DrvMsg(0, X_INFO,"SISModeInit DualHeadMode\n"); - - if(!(*pSiS->ModeInit)(pScrn, mode)) { - SISErrorLog(pScrn, "ModeInit() failed\n"); -@@ -8730,10 +8686,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo - SISErrorLog(pScrn, "SiSBIOSSetModeCRT2() failed\n"); - return FALSE; - } --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"DualHeadMode SetCRT2\n"); --#endif - SiSPostSetMode(pScrn, &pSiS->ModeReg); - if(pSiSEnt->pScrn_2) { - /* No need to go through pScrn->AdjustFrame; the coords -@@ -8752,11 +8704,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo - SISErrorLog(pScrn, "SiSBIOSSetModeCRT1() failed\n"); - return FALSE; - } --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"DualHeadMode SetCRT1\n"); --#endif -- - SiS_SiSLVDSBackLight(pSiS, TRUE); - SiSPostSetMode(pScrn, &pSiS->ModeReg); - if(pSiSEnt->pScrn_1) { -@@ -8771,20 +8718,8 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo - - } else { - #endif --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); -- xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); -- xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); -- xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); -- xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); --#endif - - if(pSiS->VGAEngine == SIS_300_VGA || pSiS->VGAEngine == SIS_315_VGA) { --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"SISModeInit SIS_315_VGA\n"); --#endif - - if(!(*pSiS->ModeInit)(pScrn, mode)) { - SISErrorLog(pScrn, "ModeInit() failed\n"); -@@ -8795,10 +8730,7 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo - - #ifdef SISMERGED - if(pSiS->MergedFB) { --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"SISModeInit SISMERGED\n"); --#endif -+ - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Setting MergedFB mode %dx%d\n", - mode->HDisplay, mode->VDisplay); - -@@ -8813,10 +8745,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo - SISErrorLog(pScrn, "SiSBIOSSetModeCRT1() failed\n"); - return FALSE; - } --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"SISMERGED SetCRT1\n"); --#endif - - SiSPreSetMode(pScrn, mode, SIS_MODE_CRT2); - -@@ -8827,10 +8755,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo - SISErrorLog(pScrn, "SiSBIOSSetModeCRT2() failed\n"); - return FALSE; - } --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"SISMERGED SetCRT2\n"); --#endif - - SiS_SiSLVDSBackLight(pSiS, TRUE); - -@@ -8838,25 +8762,9 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo - - } else { - #endif --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"SISModeInit Not SISMERGED\n"); --#endif - - if((pSiS->VBFlags & CRT1_LCDA) || (!(mode->type & M_T_DEFAULT))) { --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"SISModeInit #1\n"); -- if(pSiS->VBFlags & CRT1_LCDA) -- { -- xf86DrvMsg(0, X_INFO,"SISModeInit #1 LCDA\n"); -- -- } -- else -- { -- xf86DrvMsg(0, X_INFO,"SISModeInit #1 LCDB\n"); -- } --#endif -+ - pSiS->SiS_Pr->SiS_EnableBackLight = FALSE; - - SiSPreSetMode(pScrn, mode, SIS_MODE_CRT1); -@@ -8867,10 +8775,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo - SISErrorLog(pScrn, "SiSBIOSSetModeCRT1() failed\n"); - return FALSE; - } --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"NoVESA SetCRT1\n"); --#endif - - SiSPreSetMode(pScrn, mode, SIS_MODE_CRT2); - -@@ -8880,28 +8784,10 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo - SISErrorLog(pScrn, "SiSBIOSSetModeCRT2() failed\n"); - return FALSE; - } --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"NoVESA SetCRT2\n"); --#endif -- - - SiS_SiSLVDSBackLight(pSiS, TRUE); - - } else { --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"SISModeInit #2\n"); -- -- if(pSiS->VBFlags & CRT1_LCDA) -- { -- xf86DrvMsg(0, X_INFO,"SISModeInit #2 LCDA\n"); -- } -- else -- { -- xf86DrvMsg(0, X_INFO,"SISModeInit #2 LCDB\n"); -- } --#endif - - pSiS->SiS_Pr->SiS_EnableBackLight = TRUE; - -@@ -8918,11 +8804,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo - #ifdef SISMERGED - } - #endif --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"SISModeInit #3\n"); --#endif -- - SiSPostSetMode(pScrn, &pSiS->ModeReg); - #ifdef TWDEBUG - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VBFlags %lx\n", pSiS->VBFlags); -@@ -8932,10 +8813,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo - #endif - - } else { --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO,"SISModeInit Old method\n"); --#endif - - /* For other chipsets, use the old method */ - -@@ -9147,7 +9024,7 @@ SISSaveScreenDH(ScreenPtr pScreen, int m - static void - SISDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags) - { -- SISPtr pSiS = SISPTR(pScrn); -+ SISPtr pSiS = SISPTR(pScrn); - Bool docrt1 = TRUE, docrt2 = TRUE, backlight = TRUE; - UChar sr1=0, cr17=0, cr63=0, pmreg=0, sr7=0; - UChar p1_13=0, p2_0=0, oldpmreg=0; -@@ -10237,7 +10114,6 @@ SISScreenInit(int scrnIndex, ScreenPtr p - static Bool - SiSValidLCDUserMode(SISPtr pSiS, unsigned int VBFlags, DisplayModePtr mode, Bool isforlcda) - { -- - if(mode->Flags & V_INTERLACE) return FALSE; - - if(mode->HDisplay > 2048) return FALSE; -@@ -10352,7 +10228,7 @@ SiS_CheckModeCRT1(ScrnInfoPtr pScrn, Dis - } - - } -- -+ - return(SiS_GetModeID(pSiS->VGAEngine, VBFlags, mode->HDisplay, mode->VDisplay, - i, pSiS->FSTN, pSiS->LCDwidth, pSiS->LCDheight)); - } -@@ -10370,12 +10246,8 @@ SiS_CheckModeCRT2(ScrnInfoPtr pScrn, Dis - xf86DrvMsg(0, X_INFO, "Inside CheckCalcModeIndex (VBFlags %lx, mode %dx%d)\n", - VBFlags,mode->HDisplay, mode->VDisplay); - #endif -+ - if(VBFlags & CRT2_LCD) { /* CRT2 is LCD */ -- --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0, X_INFO, "SiS_CheckModeCRT2 LCDwidth= %d, LCDheight= %d\n",pSiS->LCDwidth,pSiS->LCDheight); --#endif - - if((pSiS->VBFlags2 & VB2_SISTMDSBRIDGE) && (!(pSiS->VBFlags2 & VB2_30xBDH))) { - -@@ -10403,7 +10275,6 @@ SiS_CheckModeCRT2(ScrnInfoPtr pScrn, Dis - return 0xfe; - - } --// PCF - - if( ((mode->HDisplay <= pSiS->LCDwidth) && - (mode->VDisplay <= pSiS->LCDheight)) || -@@ -10415,15 +10286,11 @@ SiS_CheckModeCRT2(ScrnInfoPtr pScrn, Dis - (((mode->HDisplay == 1024) && (mode->HDisplay == 768)) || - ((mode->HDisplay == 800) && (mode->HDisplay == 600)))) || - ((pSiS->EnablePanel_1366x768)&&(pSiS->LCDwidth==1366)&&(mode->HDisplay==1368))) {/*let 1366x768 mode valid. Ivans@090109*/ --/* -- if( (mode->HDisplay <= pSiS->LCDwidth) && -- (mode->VDisplay <= pSiS->LCDheight)) { --*/ -+ - ModeIndex = SiS_GetModeID_LCD(pSiS->VGAEngine, VBFlags, mode->HDisplay, mode->VDisplay, i, - pSiS->FSTN, pSiS->SiS_Pr->SiS_CustomT, pSiS->LCDwidth, pSiS->LCDheight, - pSiS->VBFlags2); --// PCF --// xf86DrvMsg(0, X_INFO, "SiS_CheckModeCRT2 LCDwidth= %d, LCDheight= %d, ModeID= %x\n",pSiS->LCDwidth,pSiS->LCDheight,ModeIndex); -+ - } - - } else if(VBFlags & CRT2_TV) { /* CRT2 is TV */ -@@ -10514,7 +10381,7 @@ SISValidMode(int scrnIndex, DisplayModeP - if(SiS_CheckModeCRT2(pScrn, mode, pSiS->VBFlags, - pSiS->VBFlags3, pSiS->HaveCustomModes) < 0x14){ - #ifdef TWDEBUG -- xf86DrvMsg(0,X_INFO,"[SISValidMode()]: else condition. passing CheckModeCRT2 and MODE_Fail.\n"); -+ xf86DrvMsg(0,X_INFO,"[SISValidMode()]: else condition. passing CheckModeCRT2 and MODE_OK.\n"); - #endif - return MODE_BAD; - } -@@ -10629,18 +10496,12 @@ SISSwitchMode(int scrnIndex, DisplayMode - * (In non-MergedFB mode this is also here in order - * to get a cheap update of the HWCursor image) - */ -- --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0,X_INFO,"SISSwitchMode\n"); --#endif - - if(!pSiS->skipswitchcheck) { - if(SISValidMode(scrnIndex, mode, TRUE, flags) != MODE_OK) { - return FALSE; - } - } -- - /* Mark for 3D full-screen bug */ - /* - #ifdef XF86DRI -@@ -11510,12 +11371,6 @@ SISHotkeySwitchMode(ScrnInfoPtr pScrn, B - int dotclock=65146; - int hdisplay=1024; - --// PCF --#ifdef TWDEBUG -- xf86DrvMsg(0,X_INFO,"SISHotkeySwitchMode\n"); --#endif -- -- - if(!VidModeGetCurrentModeline(pScrn->scrnIndex,&hkeymode,&dotClock)) - return FALSE; - -diff -p -up xf86-video-sis-0.9.1/src/sis_driver.h.orig xf86-video-sis-0.9.1/src/sis_driver.h ---- xf86-video-sis-0.9.1/src/sis_driver.h.orig 2008-09-02 10:19:02.000000000 -0400 -+++ xf86-video-sis-0.9.1/src/sis_driver.h 2010-01-27 15:21:54.000000000 -0500 -@@ -779,6 +779,9 @@ static Bool SISSwitchMode(int scrnIndex, - static void SISNewAdjustFrame(int scrnIndex, int x, int y, int flags); - static Bool SISPMEvent(int scrnIndex, pmEvent event, Bool undo);/*APM-ACPI, adding by Ivans.*/ - -+#if XSERVER_LIBPCIACCESS -+static Bool SIS_pci_probe(DriverPtr driver, int entity_num, struct pci_device *device, intptr_t match_data); -+#endif - /* ACPI Device Switch functions */ - static Bool SISHotkeySwitchCRT1Status(ScrnInfoPtr pScrn,int onoff);/*hotkey pressing: switch CRT1 on/off*/ - static Bool SISHotkeySwitchCRT2Status(ScrnInfoPtr pScrn,ULong newvbflags ,ULong newvbflags3);/*LCD on/off*/ diff --git a/staging/xf86-video-sisimedia/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch b/staging/xf86-video-sisimedia/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch deleted file mode 100644 index 415985921..000000000 --- a/staging/xf86-video-sisimedia/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- xf86-video-sis-0.9.1/src/sis_driver.c.orig 2010-01-18 13:17:56.000000000 -0500 -+++ xf86-video-sis-0.9.1/src/sis_driver.c 2010-01-25 16:35:40.000000000 -0500 -@@ -11677,7 +11677,64 @@ SISPMEvent(int scrnIndex, pmEvent event, - return 1;/*TRUE*/ - } - -+void -+sis_print_registers(SISPtr pSiS) -+{ -+#define print(...) xf86ErrorFVerb(1, __VA_ARGS__) -+ auto void print_range(char *name, int base, int first, int last) { -+ int i, j; -+ unsigned char c; -+ char buffer[9]; -+ print("%s:\n", name); -+ buffer[8] = 0; -+ for (i = first; i <= last; i++) { -+ inSISIDXREG(base, i, c); -+ for (j = 0; j < 8; j++) -+ buffer[7 - j] = c & (1 << j) ? '1' : '0'; -+ print("\t%02x: %02x:%s\n", i, c, buffer); -+ } -+ } - -+ auto void print_range_int(char *name, int base, int first, int last) { -+ int i, j; -+ unsigned int l; -+ char buffer[33]; -+ print("%s:\n", name); -+ buffer[32] = 0; -+ for (i = first; i <= last; i += 4) { -+ l = inSISREGL(base + i); -+ for (j = 0; j < 32; j++) -+ buffer[31 - j] = l & (1 << j) ? '1' : '0'; -+ print("\t%02x: %08x:%s\n", i, l, buffer); -+ } -+ } - -- -- -+ print_range_int ("PCI: CNF00 - CNF1B", pSiS->RelIO, 0x00, 0x1b); -+ print_range_int ("PCI: CNF2C - CNF47", pSiS->RelIO, 0x2C, 0x47); -+ print_range_int ("AGP: CNF50 - CNF5B", pSiS->RelIO, 0x50, 0x5B); -+ print_range ("CRT1: SR05 - SR12", SISSR, 0x05, 0x12); -+ print_range ("CRT1: SR13 - SR16 (reserved)", SISSR, 0x13, 0x16); -+ print ("CRT1: SR19 - SR1A (reserved)\n"); -+ print_range ("CRT1: SR1B - SR3A", SISSR, 0x1b, 0x3a); -+ print ("CRT1: SR3B (reserved)\n"); -+ print_range ("CRT1: SR3C - SR3F", SISSR, 0x3c, 0x3f); -+ print_range ("CRT1: CR19 - CR1A", SISCR, 0x19, 0x1a); -+ print ("CRT1: CR1B - CR27 (undocumented?)\n"); -+ print_range ("CRT1: CR28 - CR2E", SISCR, 0x28, 0x2e); -+ print ("CRT1: CR2F (reserved)\n"); -+ print_range ("VGA BIOS: CR30 - CR3F", SISCR, 0x30, 0x3f); -+ print_range ("CRT1: CR40 - CR43", SISCR, 0x40, 0x43); -+ print ("CRT1: CR44 - CR45 (reserved)\n"); -+ print_range ("CRT1: CR46 - CR67", SISCR, 0x46, 0x67); -+ print ("CRT1: CR68 - CR6F (DRAM registers reserved for backward compatibility with 760)\n"); -+ print ("CRT1: CR70 - CR77 (undocumented?)\n"); -+ print_range ("SMA BIOS: CR78 - CR7F", SISCR, 0x78, 0x7f); -+ print_range_int ("CRT1: CR80 - CR9B", SISCR, 0x80, 0xb3); -+ print_range_int ("CRT1: CRC0 - CRF3", SISCR, 0xc0, 0xf3); -+ print_range ("CRT2: SIGNAL REGISTERS, PART1 00 - 45", SISPART1, 0x00, 0x45); -+ print_range ("CRT2: TV SIGNAL REGISTERS, PART2 00 - 4d", SISPART2, 0x00, 0x4d); -+ print_range ("CRT2: TV COPY PROTECTION, PART3 00 - 40", SISPART3, 0x00, 0x40); -+ print_range ("CRT2: SIGNAL REGISTERS, PART4 00 - 3A", SISPART4, 0x00, 0x3a); -+ print_range ("CRT2: PALETTE SIGNAL REGISTERS, PART5 00 - 00 (?)", SISPART5, 0x00, 0x00); -+#undef print -+} ---- xf86-video-sis-0.9.1/src/sis_video.c.orig 2010-01-18 13:17:56.000000000 -0500 -+++ xf86-video-sis-0.9.1/src/sis_video.c 2010-01-26 13:38:13.000000000 -0500 -@@ -129,6 +129,8 @@ - - #include "sis_video.h" - -+extern void sis_print_registers(SISPtr pSiS); -+ - void SiSInitMC(ScreenPtr pScreen); - - /********************************* -@@ -712,6 +714,8 @@ SISResetVideo(ScrnInfoPtr pScrn) - #ifdef SISMERGED - pPriv->mustresettap2 = TRUE; - #endif -+ -+ sis_print_registers(pSiS); - } - - diff --git a/staging/xf86-video-sisimedia/xserver19.patch b/staging/xf86-video-sisimedia/xserver19.patch deleted file mode 100644 index 67ef6f585..000000000 --- a/staging/xf86-video-sisimedia/xserver19.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: xf86-video-sis-0.9.1/src/sis_driver.c -=================================================================== ---- xf86-video-sis-0.9.1.orig/src/sis_driver.c -+++ xf86-video-sis-0.9.1/src/sis_driver.c -@@ -85,7 +85,6 @@ - #include "shadowfb.h" - #include "fb.h" - #include "micmap.h" --#include "mibank.h" - #include "mipointer.h" - #include "mibstore.h" - #include "edid.h" -Index: xf86-video-sis-0.9.1/src/sis_mergedfb.c -=================================================================== ---- xf86-video-sis-0.9.1.orig/src/sis_mergedfb.c -+++ xf86-video-sis-0.9.1/src/sis_mergedfb.c -@@ -2948,11 +2948,11 @@ SiSXineramaExtensionInit(ScrnInfoPtr pSc - - while(SiSXineramaGeneration != serverGeneration) { - -- ClientType = CreateNewResourceType(SiSXineramaFreeClient); -+ ClientType = CreateNewResourceType(SiSXineramaFreeClient, "XineramaClient"); - if(!ClientType) - break; - -- EventType = CreateNewResourceType(SiSXineramaFreeEvents); -+ EventType = CreateNewResourceType(SiSXineramaFreeEvents, "XineramaEvents"); - if(!EventType) - break; - diff --git a/staging/xf86-video-sisusb/PKGBUILD b/staging/xf86-video-sisusb/PKGBUILD deleted file mode 100644 index c91fb5442..000000000 --- a/staging/xf86-video-sisusb/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 136266 2011-08-25 09:06:58Z jgc $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-sisusb -pkgver=0.9.4 -pkgrel=5 -pkgdesc="X.org SiS USB video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('600fd49dffe00121f9042555fea55948653d1a7e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-tdfx/PKGBUILD b/staging/xf86-video-tdfx/PKGBUILD deleted file mode 100644 index 1f82a0428..000000000 --- a/staging/xf86-video-tdfx/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 136272 2011-08-25 09:25:40Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-tdfx -pkgver=1.4.3 -pkgrel=7 -pkgdesc="X.org tdfx video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc' 'tdfx-dri') -makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto') -conflicts=('xorg-server<1.10.99.902') -options=(!libtool) -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - copyright.patch) -md5sums=('8161bbf2b100c21b609163f0010766b3' - 'a3be7ac534ceb846d3f155ddbe14378f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/copyright.patch" - ./configure --prefix=/usr --enable-dri - make - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-trident/PKGBUILD b/staging/xf86-video-trident/PKGBUILD deleted file mode 100644 index 719adfcd2..000000000 --- a/staging/xf86-video-trident/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 136279 2011-08-25 09:34:33Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-trident -pkgver=1.3.4 -pkgrel=5 -pkgdesc="X.org Trident video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902' 'xf86dgaproto') -conflicts=('xorg-server<1.10.99.902') -groups=('xorg-drivers' 'xorg') -options=(!libtool) -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('7c40f5c02bddf399862782b708941e79302318af') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-tseng/PKGBUILD b/staging/xf86-video-tseng/PKGBUILD deleted file mode 100644 index c2fe56a6c..000000000 --- a/staging/xf86-video-tseng/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 136283 2011-08-25 09:40:39Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-tseng -pkgver=1.2.4 -pkgrel=5 -pkgdesc="X.org tseng video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - fix-regression-from-pciaccess-conversion.patch) -sha1sums=('1b45f55657b2c92f30abb0769cae57fca98d93b7' - 'df7660ec18cce3e9f04a7c70f72c75daa947e4a9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix-regression-from-pciaccess-conversion.patch" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-unichrome/LICENSE b/staging/xf86-video-unichrome/LICENSE deleted file mode 100644 index f4007667b..000000000 --- a/staging/xf86-video-unichrome/LICENSE +++ /dev/null @@ -1,23 +0,0 @@ -Copyright (c) 2004-2007 Luc Verhaegen. All Rights Reserved. -Copyright (c) 2004-2005 The Unichrome Project. All Rights Reserved. -Copyright (c) 1998-2003 VIA Technologies, Inc. All Rights Reserved. -Copyright (c) 2001-2003 S3 Graphics, Inc. All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sub license, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice (including the -next paragraph) shall be included in all copies or substantial portions -of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. diff --git a/staging/xf86-video-unichrome/PKGBUILD b/staging/xf86-video-unichrome/PKGBUILD deleted file mode 100644 index 68d0a9ec2..000000000 --- a/staging/xf86-video-unichrome/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 136290 2011-08-25 10:06:07Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-unichrome -pkgver=0.2.7 -pkgrel=6 -_gitversion=b917bee87db8a65b8e8da0ca12c24a176c9e9fb2 -pkgdesc="Unichrome video drivers for X.Org" -arch=(i686 x86_64) -url="http://unichrome.sf.net/" -license=('custom') -depends=('glibc' 'unichrome-dri') -makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc' 'glproto') -options=('!libtool') -conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 'xorg-server<1.10.99.902') -source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2) -md5sums=('f7adef052de08a01af86e245d1932239') - -build() { - cd "${srcdir}/${pkgname}-${_gitversion}" - ./autogen.sh --prefix=/usr --enable-dri - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" -} diff --git a/staging/xf86-video-v4l/LICENSE b/staging/xf86-video-v4l/LICENSE deleted file mode 100644 index 535595b88..000000000 --- a/staging/xf86-video-v4l/LICENSE +++ /dev/null @@ -1,826 +0,0 @@ -This package was downloaded from -http://xorg.freedesktop.org/releases/individual/driver/ - - Licenses - - The X.Org Foundation - - March 2004 - -1. Introduction - -The X.org Foundation X Window System distribution is a compilation of code -and documentation from many sources. This document is intended primarily as -a guide to the licenses used in the distribution: you must check each file -and/or package for precise redistribution terms. None-the-less, this summary -may be useful to many users. No software incorporating the XFree86 1.1 -license has been incorporated. - -This document is based on the compilation from XFree86. - -2. XFree86 License - -XFree86 code without an explicit copyright is covered by the following copy- -right/license: - -Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is fur- -nished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- -NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the XFree86 Project shall not -be used in advertising or otherwise to promote the sale, use or other deal- -ings in this Software without prior written authorization from the XFree86 -Project. - -3. Other Licenses - -Portions of code are covered by the following licenses/copyrights. See indi- -vidual files for the copyright dates. - -3.1 X/MIT Copyrights - -3.1.1 X Consortium - -Copyright (C) <date> X Consortium - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is fur- -nished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X -CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the X Consortium shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from the X Consortium. - -X Window System is a trademark of X Consortium, Inc. - -3.1.2 The Open Group - -Copyright <date> The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that copyright -notice and this permission notice appear in supporting documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - -3.2 Berkeley-based copyrights: - -o - -3.2.1 General - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- -CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- -CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- -ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - -3.2.2 UCB/LBL - -Copyright (c) 1993 The Regents of the University of California. All rights -reserved. - -This software was developed by the Computer Systems Engineering group at -Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and contributed to -Berkeley. - -All advertising materials mentioning features or use of this software must -display the following acknowledgement: This product includes software devel- -oped by the University of California, Lawrence Berkeley Laboratory. - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: This product includes soft- - ware developed by the University of California, Berkeley and its con- - tributors. - - 4. Neither the name of the University nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DIS- -CLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -3.2.3 The NetBSD Foundation, Inc. - -Copyright (c) 2003 The NetBSD Foundation, Inc. All rights reserved. - -This code is derived from software contributed to The NetBSD Foundation by -Ben Collver <collver1@attbi.com> - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: This product includes soft- - ware developed by the NetBSD Foundation, Inc. and its contributors. - - 4. Neither the name of The NetBSD Foundation nor the names of its con- - tributors may be used to endorse or promote products derived from this - software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSE- -QUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAM- -AGE. - -3.2.4 Theodore Ts'o. - -Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. All rights -reserved. - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - and the entire permission notice in its entirety, including the dis- - claimer of warranties. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. he name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED. IN NO -EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- -CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- -ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF NOT -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -3.2.5 Theo de Raadt and Damien Miller - -Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. Copyright (c) -2001-2002 Damien Miller. All rights reserved. - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- -CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- -CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- -ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - -3.2.6 Todd C. Miller - -Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> - -Permission to use, copy, modify, and distribute this software for any purpose -with or without fee is hereby granted, provided that the above copyright -notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MER- -CHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE FOR ANY -SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER -RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CON- -TRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -3.2.7 Thomas Winischhofer - -Copyright (C) 2001-2004 Thomas Winischhofer - -Redistribution and use in source and binary forms, with or without modifica- -tion, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- -CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH- -ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - -3.3 NVIDIA Corp - -Copyright (c) 1996 NVIDIA, Corp. All rights reserved. - -NOTICE TO USER: The source code is copyrighted under U.S. and international -laws. NVIDIA, Corp. of Sunnyvale, California owns the copyright and as -design patents pending on the design and interface of the NV chips. Users -and possessors of this source code are hereby granted a nonexclusive, roy- -alty-free copyright and design patent license to use this code in individual -and commercial software. - -Any use of this source code must include, in the user documentation and -internal comments to the code, notices to the end user as follows: - -Copyright (c) 1996 NVIDIA, Corp. NVIDIA design patents pending in the U.S. -and foreign countries. - -NVIDIA, CORP. MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE -CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WAR- -RANTY OF ANY KIND. NVIDIA, CORP. DISCLAIMS ALL WARRANTIES WITH REGARD TO -THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL NVIDIA, CORP. BE LIABLE -FOR ANY SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAM- -AGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE. - -3.4 GLX Public License - -GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License") - -Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby -grants permission to Recipient (defined below), under Recipient's copyrights -in the Original Software (defined below), to use, copy, modify, merge, pub- -lish, distribute, sublicense and/or sell copies of Subject Software (defined -below), and to permit persons to whom the Subject Software is furnished in -accordance with this License to do the same, subject to all of the following -terms and conditions, which Recipient accepts by engaging in any such use, -copying, modifying, merging, publishing, distributing, sublicensing or sell- -ing: - -1. Definitions. - - (a) "Original Software" means source code of computer software code - which is described in Exhibit A as Original Software. - - (b) "Modifications" means any addition to or deletion from the sub- - stance or structure of either the Original Software or any previous - Modifications. When Subject Software is released as a series of - files, a Modification means (i) any addition to or deletion from - the contents of a file containing Original Software or previous - Modifications and (ii) any new file that contains any part of the - Original Code or previous Modifications. - - (c) "Subject Software" means the Original Software or Modifications - or the combination of the Original Software and Modifications, or - portions of any of the foregoing. - - (d) "Recipient" means an individual or a legal entity exercising - rights under, and complying with all of the terms of, this License. - For legal entities, "Recipient" includes any entity which controls, - is controlled by, or is under common control with Recipient. For - purposes of this definition, "control" of an entity means (a) the - power, direct or indirect, to direct or manage such entity, or (b) - ownership of fifty percent (50%) or more of the outstanding shares - or beneficial ownership of such entity. - -2. Redistribution of Source Code Subject to These Terms. Redistributions of -Subject Software in source code form must retain the notice set forth in -Exhibit A, below, in every file. A copy of this License must be included in -any documentation for such Subject Software where the recipients' rights -relating to Subject Software are described. Recipient may distribute the -source code version of Subject Software under a license of Recipient's -choice, which may contain terms different from this License, provided that -(i) Recipient is in compliance with the terms of this License, and (ii) the -license terms include this Section 2 and Sections 3, 4, 7, 8, 10, 12 and 13 -of this License, which terms may not be modified or superseded by any other -terms of such license. If Recipient distributes the source code version under -a different license Recipient must make it absolutely clear that any terms -which differ from this License are offered by Recipient alone, not by SGI. -Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as -a result of any such terms Recipient offers. - -3. Redistribution in Executable Form. The notice set forth in Exhibit A must -be conspicuously included in any notice in an executable version of Subject -Software, related documentation or collateral in which Recipient describes -the user's rights relating to the Subject Software. Recipient may distribute -the executable version of Subject Software under a license of Recipient's -choice, which may contain terms different from this License, provided that -(i) Recipient is in compliance with the terms of this License, and (ii) the -license terms include this Section 3 and Sections 4, 7, 8, 10, 12 and 13 of -this License, which terms may not be modified or superseded by any other -terms of such license. If Recipient distributes the executable version under -a different license Recipient must make it absolutely clear that any terms -which differ from this License are offered by Recipient alone, not by SGI. -Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as -a result of any such terms Recipient offers. - -4. Termination. This License and the rights granted hereunder will terminate -automatically if Recipient fails to comply with terms herein and fails to -cure such breach within 30 days of the breach. Any sublicense to the Subject -Software which is properly granted shall survive any termination of this -License absent termination by the terms of such sublicense. Provisions which, -by their nature, must remain in effect beyond the termination of this License -shall survive. - -5. No Trademark Rights. This License does not grant any rights to use any -trade name, trademark or service mark whatsoever. No trade name, trademark or -service mark of SGI may be used to endorse or promote products derived from -the Subject Software without prior written permission of SGI. - -6. No Other Rights. This License does not grant any rights with respect to -the OpenGL API or to any software or hardware implementation thereof or to -any other software whatsoever, nor shall any other rights or licenses not -expressly granted hereunder arise by implication, estoppel or otherwise with -respect to the Subject Software. Title to and ownership of the Original Soft- -ware at all times remains with SGI. All rights in the Original Software not -expressly granted under this License are reserved. - -7. Compliance with Laws; Non-Infringement. Recipient shall comply with all -applicable laws and regulations in connection with use and distribution of -the Subject Software, including but not limited to, all export and import -control laws and regulations of the U.S. government and other countries. -Recipient may not distribute Subject Software that (i) in any way infringes -(directly or contributorily) the rights (including patent, copyright, trade -secret, trademark or other intellectual property rights of any kind) of any -other person or entity or (ii) breaches any representation or warranty, -express, implied or statutory, which under any applicable law it might be -deemed to have been distributed. - -8. Claims of Infringement. If Recipient at any time has knowledge of any one -or more third party claims that reproduction, modification, use, distribu- -tion, import or sale of Subject Software (including particular functionality -or code incorporated in Subject Software) infringes the third party's intel- -lectual property rights, Recipient must place in a well-identified web page -bearing the title "LEGAL" a description of each such claim and a description -of the party making each such claim in sufficient detail that a user of the -Subject Software will know whom to contact regarding the claim. Also, upon -gaining such knowledge of any such claim, Recipient must conspicuously -include the URL for such web page in the Exhibit A notice required under Sec- -tions 2 and 3, above, and in the text of any related documentation, license -agreement or collateral in which Recipient describes end user's rights relat- -ing to the Subject Software. If Recipient obtains such knowledge after it -makes Subject Software available to any other person or entity, Recipient -shall take other steps (such as notifying appropriate mailing lists or news- -groups) reasonably calculated to inform those who received the Subject Soft- -ware that new knowledge has been obtained. - -9. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, -WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT -LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER- -CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON- INFRINGING. SGI ASSUMES NO -RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE -PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER- -VICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN -ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED -HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THE- -ORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIA- -BILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR -ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY -CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK -STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER -COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF -THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY -TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO -THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO -NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, -SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT. - -11. Indemnity. Recipient shall be solely responsible for damages arising, -directly or indirectly, out of its utilization of rights under this License. -Recipient will defend, indemnify and hold harmless Silicon Graphics, Inc. -from and against any loss, liability, damages, costs or expenses (including -the payment of reasonable attorneys fees) arising out of Recipient's use, -modification, reproduction and distribution of the Subject Software or out of -any representation or warranty made by Recipient. - -12. U.S. Government End Users. The Subject Software is a "commercial item" -consisting of "commercial computer software" as such terms are defined in -title 48 of the Code of Federal Regulations and all U.S. Government End -Users acquire only the rights set forth in this License and are subject to -the terms of this License. - -13. Miscellaneous. This License represents the complete agreement concerning -subject matter hereof. If any provision of this License is held to be unen- -forceable, such provision shall be reformed so as to achieve as nearly as -possible the same economic effect as the original provision and the remainder -of this License will remain in effect. This License shall be governed by and -construed in accordance with the laws of the United States and the State of -California as applied to agreements entered into and to be performed entirely -within California between California residents. Any litigation relating to -this License shall be subject to the exclusive jurisdiction of the Federal -Courts of the Northern District of California (or, absent subject matter -jurisdiction in such courts, the courts of the State of California), with -venue lying exclusively in Santa Clara County, California, with the losing -party responsible for costs, including without limitation, court costs and -reasonable attorneys fees and expenses. The application of the United Nations -Convention on Contracts for the International Sale of Goods is expressly -excluded. Any law or regulation which provides that the language of a con- -tract shall be construed against the drafter shall not apply to this License. - -Exhibit A - -The contents of this file are subject to Sections 2, 3, 4, 7, 8, 10, 12 and -13 of the GLX Public License Version 1.0 (the "License"). You may not use -this file except in compliance with those sections of the License. You may -obtain a copy of the License at Silicon Graphics, Inc., attn: Legal Services, -2011 N. Shoreline Blvd., Mountain View, CA 94043 or at -http://www.sgi.com/software/opensource/glx/license.html. - -Software distributed under the License is distributed on an "AS IS" basis. -ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED -WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON- -INFRINGEMENT. See the License for the specific language governing rights and -limitations under the License. - -The Original Software is GLX version 1.2 source code, released February, -1999. The developer of the Original Software is Silicon Graphics, Inc. Those -portions of the Subject Software created by Silicon Graphics, Inc. are Copy- -right (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved. - -3.5 CID Font Code Public License - -CID FONT CODE PUBLIC LICENSE (Version 1.0 (3/31/99))("License") - -Subject to any applicable third party claims, Silicon Graphics, Inc. ("SGI") -hereby grants permission to Recipient (defined below), under SGI's copyrights -in the Original Software (defined below), to use, copy, modify, merge, pub- -lish, distribute, sublicense and/or sell copies of Subject Software (defined -below) in both source code and executable form, and to permit persons to whom -the Subject Software is furnished in accordance with this License to do the -same, subject to all of the following terms and conditions, which Recipient -accepts by engaging in any such use, copying, modifying, merging, publica- -tion, distributing, sublicensing or selling: - -1. Definitions. - - a. "Original Software" means source code of computer software code - that is described in Exhibit A as Original Software. - - b. "Modifications" means any addition to or deletion from the sub- - stance or structure of either the Original Software or any previous - Modifications. When Subject Software is released as a series of - files, a Modification means (i) any addition to or deletion from - the contents of a file containing Original Software or previous - Modifications and (ii) any new file that contains any part of the - Original Code or previous Modifications. - - c. "Subject Software" means the Original Software or Modifications - or the combination of the Original Software and Modifications, or - portions of any of the foregoing. - - d. "Recipient" means an individual or a legal entity exercising - rights under the terms of this License. For legal entities, "Recip- - ient" includes any entity that controls, is controlled by, or is - under common control with Recipient. For purposes of this defini- - tion, "control" of an entity means (i) the power, direct or indi- - rect, to direct or manage such entity, or (ii) ownership of fifty - percent (50%) or more of the outstanding shares or beneficial own- - ership of such entity. - - e. "Required Notice" means the notice set forth in Exhibit A to - this License. - - f. "Accompanying Technology" means any software or other technology - that is not a Modification and that is distributed or made publicly - available by Recipient with the Subject Software. Separate soft- - ware files that do not contain any Original Software or any previ- - ous Modification shall not be deemed a Modification, even if such - software files are aggregated as part of a product, or in any - medium of storage, with any file that does contain Original Soft- - ware or any previous Modification. - -2. License Terms. All distribution of the Subject Software must be made sub- -ject to the terms of this License. A copy of this License and the Required -Notice must be included in any documentation for Subject Software where -Recipient's rights relating to Subject Software and/or any Accompanying Tech- -nology are described. Distributions of Subject Software in source code form -must also include the Required Notice in every file distributed. In addition, -a ReadMe file entitled "Important Legal Notice" must be distributed with each -distribution of one or more files that incorporate Subject Software. That -file must be included with distributions made in both source code and exe- -cutable form. A copy of the License and the Required Notice must be included -in that file. Recipient may distribute Accompanying Technology under a -license of Recipient's choice, which may contain terms different from this -License, provided that (i) Recipient is in compliance with the terms of this -License, (ii) such other license terms do not modify or supersede the terms -of this License as applicable to the Subject Software, (iii) Recipient hereby -indemnifies SGI for any liability incurred by SGI as a result of the distri- -bution of Accompanying Technology or the use of other license terms. - -3. Termination. This License and the rights granted hereunder will terminate -automatically if Recipient fails to comply with terms herein and fails to -cure such breach within 30 days of the breach. Any sublicense to the Subject -Software that is properly granted shall survive any termination of this -License absent termination by the terms of such sublicense. Provisions which, -by their nature, must remain in effect beyond the termination of this License -shall survive. - -4. Trademark Rights. This License does not grant any rights to use any trade -name, trademark or service mark whatsoever. No trade name, trademark or ser- -vice mark of SGI may be used to endorse or promote products derived from or -incorporating any Subject Software without prior written permission of SGI. - -5. No Other Rights. No rights or licenses not expressly granted hereunder -shall arise by implication, estoppel or otherwise. Title to and ownership of -the Original Software at all times remains with SGI. All rights in the Origi- -nal Software not expressly granted under this License are reserved. - -6. Compliance with Laws; Non-Infringement. Recipient shall comply with all -applicable laws and regulations in connection with use and distribution of -the Subject Software, including but not limited to, all export and import -control laws and regulations of the U.S. government and other countries. -Recipient may not distribute Subject Software that (i) in any way infringes -(directly or contributorily) the rights (including patent, copyright, trade -secret, trademark or other intellectual property rights of any kind) of any -other person or entity, or (ii) breaches any representation or warranty, -express, implied or statutory, which under any applicable law it might be -deemed to have been distributed. - -7. Claims of Infringement. If Recipient at any time has knowledge of any one -or more third party claims that reproduction, modification, use, distribu- -tion, import or sale of Subject Software (including particular functionality -or code incorporated in Subject Software) infringes the third party's intel- -lectual property rights, Recipient must place in a well-identified web page -bearing the title "LEGAL" a description of each such claim and a description -of the party making each such claim in sufficient detail that a user of the -Subject Software will know whom to contact regarding the claim. Also, upon -gaining such knowledge of any such claim, Recipient must conspicuously -include the URL for such web page in the Required Notice, and in the text of -any related documentation, license agreement or collateral in which Recipient -describes end user's rights relating to the Subject Software. If Recipient -obtains such knowledge after it makes Subject Software available to any other -person or entity, Recipient shall take other steps (such as notifying appro- -priate mailing lists or newsgroups) reasonably calculated to provide such -knowledge to those who received the Subject Software. - -8. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, -WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT -LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER- -CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. SGI ASSUMES NO -RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE -PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER- -VICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN -ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED -HEREUNDER EXCEPT UNDER THIS DISCLAIMER. - -9. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, -WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY), -CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SUBJECT SOFTWARE OR -THE USE OR OTHER DEALINGS IN THE SUBJECT SOFTWARE. SOME JURISDICTIONS DO NOT -ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO THIS EXCLUSION AND -LIMITATION MAY NOT APPLY TO RECIPIENT TO THE EXTENT SO DISALLOWED. - -10. Indemnity. Recipient shall be solely responsible for damages arising, -directly or indirectly, out of its utilization of rights under this License. -Recipient will defend, indemnify and hold SGI and its successors and assigns -harmless from and against any loss, liability, damages, costs or expenses -(including the payment of reasonable attorneys fees) arising out of (Recipi- -ent's use, modification, reproduction and distribution of the Subject Soft- -ware or out of any representation or warranty made by Recipient. - -11. U.S. Government End Users. The Subject Software is a "commercial item" -consisting of "commercial computer software" as such terms are defined in -title 48 of the Code of Federal Regulations and all U.S. Government End Users -acquire only the rights set forth in this License and are subject to the -terms of this License. - -12. Miscellaneous. This License represents the complete agreement concerning -subject matter hereof. If any provision of this License is held to be unen- -forceable by any judicial or administrative authority having proper jurisdic- -tion with respect thereto, such provision shall be reformed so as to achieve -as nearly as possible the same economic effect as the original provision and -the remainder of this License will remain in effect. This License shall be -governed by and construed in accordance with the laws of the United States -and the State of California as applied to agreements entered into and to be -performed entirely within California between California residents. Any liti- -gation relating to this License shall be subject to the exclusive jurisdic- -tion of the Federal Courts of the Northern District of California (or, absent -subject matter jurisdiction in such courts, the courts of the State of Cali- -fornia), with venue lying exclusively in Santa Clara County, California, with -the losing party responsible for costs, including without limitation, court -costs and reasonable attorneys fees and expenses. The application of the -United Nations Convention on Contracts for the International Sale of Goods is -expressly excluded. Any law or regulation that provides that the language of -a contract shall be construed against the drafter shall not apply to this -License. - -Exhibit A - -Copyright (c) 1994-1999 Silicon Graphics, Inc. - -The contents of this file are subject to the CID Font Code Public License -Version 1.0 (the "License"). You may not use this file except in compliance -with the License. You may obtain a copy of the License at Silicon Graphics, -Inc., attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043 -or at http://www.sgi.com/software/opensource/cid/license.html - -Software distributed under the License is distributed on an "AS IS" basis. -ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED -WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON- -INFRINGEMENT. See the License for the specific language governing rights and -limitations under the License. - -The Original Software (as defined in the License) is CID font code that was -developed by Silicon Graphics, Inc. Those portions of the Subject Software -(as defined in the License) that were created by Silicon Graphics, Inc. are -Copyright (c) 1994-1999 Silicon Graphics, Inc. All Rights Reserved. - -[NOTE: When using this text in connection with Subject Software delivered -solely in object code form, Recipient may replace the words "this file" with -"this software" in both the first and second sentences.] - -3.6 Bitstream Vera Fonts Copyright - -The fonts have a generous copyright, allowing derivative works (as long as -"Bitstream" or "Vera" are not in the names), and full redistribution (so long -as they are not *sold* by themselves). They can be be bundled, redistributed -and sold with any software. - -The fonts are distributed under the following copyright: - -Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is -a trademark of Bitstream, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of the fonts accompanying this license ("Fonts") and associated documentation -files (the "Font Software"), to reproduce and distribute the Font Software, -including without limitation the rights to use, copy, merge, publish, dis- -tribute, and/or sell copies of the Font Software, and to permit persons to -whom the Font Software is furnished to do so, subject to the following condi- -tions: - -The above copyright and trademark notices and this permission notice shall be -included in all copies of one or more of the Font Software typefaces. - -The Font Software may be modified, altered, or added to, and in particular -the designs of glyphs or characters in the Fonts may be modified and addi- -tional glyphs or characters may be added to the Fonts, only if the fonts are -renamed to names not containing either the words "Bitstream" or the word -"Vera". - -This License becomes null and void to the extent applicable to Fonts or Font -Software that has been modified and is distributed under the "Bitstream Vera" -names. - -The Font Software may be sold as part of a larger software package but no -copy of one or more of the Font Software typefaces may be sold by itself. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, -TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDA- -TION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN- -ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR -INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT- -WARE. - -Except as contained in this notice, the names of Gnome, the Gnome Foundation, -and Bitstream Inc., shall not be used in advertising or otherwise to promote -the sale, use or other dealings in this Font Software without prior written -authorization from the Gnome Foundation or Bitstream Inc., respectively. For -further information, contact: fonts at gnome dot org. - -3.7 Bigelow & Holmes Inc and URW++ GmbH Luxi font license - -Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font instruction -code copyright (c) 2001 by URW++ GmbH. All Rights Reserved. Luxi is a regis- -tered trademark of Bigelow & Holmes Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of these Fonts and associated documentation files (the "Font Software"), to -deal in the Font Software, including without limitation the rights to use, -copy, merge, publish, distribute, sublicense, and/or sell copies of the Font -Software, and to permit persons to whom the Font Software is furnished to do -so, subject to the following conditions: - -The above copyright and trademark notices and this permission notice shall be -included in all copies of one or more of the Font Software. - -The Font Software may not be modified, altered, or added to, and in particu- -lar the designs of glyphs or characters in the Fonts may not be modified nor -may additional glyphs or characters be added to the Fonts. This License -becomes null and void when the Fonts or Font Software have been modified. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, -TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BIGELOW & HOLMES INC. OR URW++ -GMBH. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN- -ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR -INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT- -WARE. - -Except as contained in this notice, the names of Bigelow & Holmes Inc. and -URW++ GmbH. shall not be used in advertising or otherwise to promote the -sale, use or other dealings in this Font Software without prior written -authorization from Bigelow & Holmes Inc. and URW++ GmbH. - -For further information, contact: - -info@urwpp.de or design@bigelowandholmes.com - - $Id: LICENSE,v 1.3 2004/09/03 23:41:21 kem Exp $ diff --git a/staging/xf86-video-v4l/PKGBUILD b/staging/xf86-video-v4l/PKGBUILD deleted file mode 100644 index 9f2136dbf..000000000 --- a/staging/xf86-video-v4l/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 136298 2011-08-25 10:36:50Z jgc $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-v4l -pkgver=0.2.0 -pkgrel=9 -pkgdesc="X.org v4l video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch - LICENSE) -md5sums=('2251ae2a0a905764941cd7b098e85ad1' - 'cdb7113a9564ea9202e847de88440540' - '7d4d018f6bbff7e42672d1aabc75c5cf') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - autoreconf -fi - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-vesa/PKGBUILD b/staging/xf86-video-vesa/PKGBUILD deleted file mode 100644 index 56f76b116..000000000 --- a/staging/xf86-video-vesa/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 136239 2011-08-25 07:26:54Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-vesa -pkgver=2.3.0 -pkgrel=6 -pkgdesc="X.org vesa video driver" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('glibc') -makedepends=('pkgconfig' 'xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch) -sha1sums=('4689b7c295d7a8d7326302dafecb812739617134' - '1e54ae50daa796ab0c29c8088f25e522dc6faa4a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - autoreconf -fi - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-voodoo/PKGBUILD b/staging/xf86-video-voodoo/PKGBUILD deleted file mode 100644 index 10d718da0..000000000 --- a/staging/xf86-video-voodoo/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 135221 2011-08-11 07:49:16Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-voodoo -pkgver=1.2.4 -pkgrel=5 -pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902' 'xf86dgaproto') -conflicts=('xorg-server<1.10.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('7ecd232cc0b7fe507e18e08799791eefa9fdaf48') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/xf86-video-xgi/PKGBUILD b/staging/xf86-video-xgi/PKGBUILD deleted file mode 100644 index 731c3ea69..000000000 --- a/staging/xf86-video-xgi/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 135218 2011-08-11 07:46:30Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-xgi -pkgver=1.6.0 -pkgrel=4 -pkgdesc="X.org XGI video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'xf86dgaproto') -conflicts=('xorg-server<1.10.99.902') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch) -sha1sums=('826f14d6ba799cd2aae9f0c818f84cf8b75f1ddb' - '61ce13325c69befaa710c3389a85a8aa9d1cf28d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-xgi/git-fixes.patch b/staging/xf86-video-xgi/git-fixes.patch deleted file mode 100644 index f15fea88a..000000000 --- a/staging/xf86-video-xgi/git-fixes.patch +++ /dev/null @@ -1,451 +0,0 @@ -diff --git a/man/xgi.man b/man/xgi.man -index 19880f2..5699ae4 100644 ---- a/man/xgi.man -+++ b/man/xgi.man -@@ -1,4 +1,3 @@ --.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/xgi/xgi.man,v 1.14 2003/11/12 16:50:36 twini Exp $ - .\" shorthand for double quote that works everywhere. - .ds q \N'34' - .TH XGI __drivermansuffix__ __vendorversion__ -diff --git a/src/vb_init.c b/src/vb_init.c -index 8338410..50980c4 100755 ---- a/src/vb_init.c -+++ b/src/vb_init.c -@@ -131,6 +131,8 @@ static void XGINew_SetDRAMDefaultRegister340(PXGI_HW_DEVICE_INFO, USHORT, - static void XGINew_SetDRAMDefaultRegisterXG45(PXGI_HW_DEVICE_INFO, USHORT, - PVB_DEVICE_INFO); - static UCHAR XGINew_Get340DRAMType(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO); -+/* horrible */ -+#define XGINew_GetXG20DRAMType XGINew_Get340DRAMType - - static int XGINew_SetDDRChannel(int index, UCHAR ChannelNo, - UCHAR XGINew_ChannelAB, const USHORT DRAMTYPE_TABLE[][5], -@@ -1451,7 +1453,7 @@ void XGINew_SetDRAMDefaultRegister340( PXGI_HW_DEVICE_INFO HwDeviceExtension , - } - - temp3 = 0 ; -- for( k = 0 ; k < 4 ; k++ ) -+ for( k = 1 ; k < 4 ; k++ ) - { - XGI_SetRegANDOR((XGIIOADDRESS) P3d4 , 0x6E , 0xFC , temp3 ) ; /* CR6E_D[1:0] select channel */ - temp2 = 0 ; -diff --git a/src/vgatypes.h b/src/vgatypes.h -index 8a60927..7484661 100755 ---- a/src/vgatypes.h -+++ b/src/vgatypes.h -@@ -1,5 +1,3 @@ --/* $XFree86$ */ --/* $XdotOrg$ */ - /* - * General type definitions for universal mode switching modules - * -diff --git a/src/xgi.h b/src/xgi.h -index 715502f..e818631 100755 ---- a/src/xgi.h -+++ b/src/xgi.h -@@ -981,6 +981,7 @@ int compute_vclk(int Clock, int *out_n, int *out_dn, int *out_div, - void XGI_WaitBeginRetrace(XGIIOADDRESS RelIO); - void XGI_WaitEndRetrace(XGIIOADDRESS RelIO); - -+#include <unistd.h> - /* 2005/11/21 added by jjtseng */ - #define DelayS(sec) usleep((sec)*1000000) - #define DelayMS(millisec) usleep((millisec)*1000) -diff --git a/src/xgi_accel.c b/src/xgi_accel.c -index c072691..4c298ed 100755 ---- a/src/xgi_accel.c -+++ b/src/xgi_accel.c -@@ -200,20 +200,7 @@ extern int FbDevExist; - #endif - - #if X_BYTE_ORDER == X_BIG_ENDIAN --static CARD32 BE_SWAP32 (CARD32 val) --{ -- PDEBUG(ErrorF("X_BIG_ENDIAN...\n")); -- if (CurrentColorDepth == 8) -- return ((((val) & 0x000000ff) << 24) | \ -- (((val) & 0x0000ff00) << 8) | \ -- (((val) & 0x00ff0000) >> 8) | \ -- (((val) & 0xff000000) >> 24)); -- if (CurrentColorDepth == 24) -- return val; -- if (CurrentColorDepth == 16) -- return ((((val) & 0x0000ffff) << 16) | \ -- (((val) & 0xffff0000) >> 16)); --} -+#define BE_SWAP32(x) lswapl(x) - #else - static CARD32 BE_SWAP32 (CARD32 val) - { -diff --git a/src/xgi_dga.c b/src/xgi_dga.c -index 04f90aa..8bd84bc 100755 ---- a/src/xgi_dga.c -+++ b/src/xgi_dga.c -@@ -103,18 +103,18 @@ XGISetupDGAMode( - - if(pMode->HDisplay != otherPitch) { - -- newmodes = xrealloc(modes, (*num + 2) * sizeof(DGAModeRec)); -+ newmodes = realloc(modes, (*num + 2) * sizeof(DGAModeRec)); - oneMore = TRUE; - - } else { - -- newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec)); -+ newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec)); - oneMore = FALSE; - - } - - if(!newmodes) { -- xfree(modes); -+ free(modes); - return NULL; - } - modes = newmodes; -diff --git a/src/xgi_dri.c b/src/xgi_dri.c -index 93687e1..e575c19 100755 ---- a/src/xgi_dri.c -+++ b/src/xgi_dri.c -@@ -46,7 +46,6 @@ - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Priv.h" - - #include "xf86PciInfo.h" - #include "xf86Pci.h" -@@ -145,13 +144,13 @@ XGIInitVisualConfigs(ScreenPtr pScreen) - } - if (!(pXGIConfigs = (XGIConfigPrivPtr)xnfcalloc(sizeof(XGIConfigPrivRec), - numConfigs))) { -- xfree(pConfigs); -+ free(pConfigs); - return FALSE; - } - if (!(pXGIConfigPtrs = (XGIConfigPrivPtr*)xnfcalloc(sizeof(XGIConfigPrivPtr), - numConfigs))) { -- xfree(pConfigs); -- xfree(pXGIConfigs); -+ free(pConfigs); -+ free(pXGIConfigs); - return FALSE; - } - for (i=0; i<numConfigs; i++) -@@ -333,7 +332,7 @@ Bool XGIDRIScreenInit(ScreenPtr pScreen) - pDRIInfo->bufferRequests = DRI_ALL_WINDOWS; - - if (!DRIScreenInit(pScreen, pDRIInfo, &pXGI->drmSubFD)) { -- xfree(pDRIInfo->devPrivate); -+ free(pDRIInfo->devPrivate); - pDRIInfo->devPrivate=0; - DRIDestroyInfoRec(pXGI->pDRIInfo); - pXGI->pDRIInfo=0; -@@ -537,14 +536,14 @@ XGIDRICloseScreen(ScreenPtr pScreen) - - if (pXGI->pDRIInfo) { - if (pXGI->pDRIInfo->devPrivate) { -- xfree(pXGI->pDRIInfo->devPrivate); -+ free(pXGI->pDRIInfo->devPrivate); - pXGI->pDRIInfo->devPrivate=0; - } - DRIDestroyInfoRec(pXGI->pDRIInfo); - pXGI->pDRIInfo=0; - } -- if (pXGI->pVisualConfigs) xfree(pXGI->pVisualConfigs); -- if (pXGI->pVisualConfigsPriv) xfree(pXGI->pVisualConfigsPriv); -+ if (pXGI->pVisualConfigs) free(pXGI->pVisualConfigs); -+ if (pXGI->pVisualConfigsPriv) free(pXGI->pVisualConfigsPriv); - - if(pXGI->agpSize){ - /* ErrorF("Freeing agp memory\n"); */ -diff --git a/src/xgi_driver.c b/src/xgi_driver.c -index b4f83b8..b8b8679 100755 ---- a/src/xgi_driver.c -+++ b/src/xgi_driver.c -@@ -54,7 +54,7 @@ - #include "fb.h" - #include "micmap.h" - #include "xf86.h" --#include "xf86Priv.h" -+#include "xf86Module.h" - #include "xf86_OSproc.h" - #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 - #include "xf86Resources.h" -@@ -106,6 +106,10 @@ - #include <unistd.h> - #endif - -+#ifndef DEFAULT_DPI -+#define DEFAULT_DPI 96 -+#endif -+ - /* Jong 01/22/2009; compiler error; type conflict */ - /* - #include <fcntl.h> -@@ -556,13 +560,13 @@ XGIFreeRec(ScrnInfoPtr pScrn) - * head. - */ - if (pXGIEnt->BIOS) -- xfree(pXGIEnt->BIOS); -+ free(pXGIEnt->BIOS); - pXGIEnt->BIOS = pXGI->BIOS = NULL; - if (pXGIEnt->XGI_Pr) -- xfree(pXGIEnt->XGI_Pr); -+ free(pXGIEnt->XGI_Pr); - pXGIEnt->XGI_Pr = pXGI->XGI_Pr = NULL; - if (pXGIEnt->RenderAccelArray) -- xfree(pXGIEnt->RenderAccelArray); -+ free(pXGIEnt->RenderAccelArray); - pXGIEnt->RenderAccelArray = pXGI->RenderAccelArray = NULL; - } - else { -@@ -573,19 +577,19 @@ XGIFreeRec(ScrnInfoPtr pScrn) - } - else { - if (pXGI->BIOS) -- xfree(pXGI->BIOS); -+ free(pXGI->BIOS); - pXGI->BIOS = NULL; - if (pXGI->XGI_Pr) -- xfree(pXGI->XGI_Pr); -+ free(pXGI->XGI_Pr); - pXGI->XGI_Pr = NULL; - if (pXGI->RenderAccelArray) -- xfree(pXGI->RenderAccelArray); -+ free(pXGI->RenderAccelArray); - pXGI->RenderAccelArray = NULL; - } - - #ifdef XGIMERGED - if (pXGI->MetaModes) -- xfree(pXGI->MetaModes); -+ free(pXGI->MetaModes); - pXGI->MetaModes = NULL; - - if (pXGI->CRT1Modes) { -@@ -595,8 +599,8 @@ XGIFreeRec(ScrnInfoPtr pScrn) - do { - DisplayModePtr p = pScrn->currentMode->next; - if (pScrn->currentMode->Private) -- xfree(pScrn->currentMode->Private); -- xfree(pScrn->currentMode); -+ free(pScrn->currentMode->Private); -+ free(pScrn->currentMode); - pScrn->currentMode = p; - } while (pScrn->currentMode != pScrn->modes); - } -@@ -612,7 +616,7 @@ XGIFreeRec(ScrnInfoPtr pScrn) - pXGI->pVbe = NULL; - if (pScrn->driverPrivate == NULL) - return; -- xfree(pScrn->driverPrivate); -+ free(pScrn->driverPrivate); - pScrn->driverPrivate = NULL; - } - -@@ -975,7 +979,7 @@ XGIProbe(DriverPtr drv, int flags) - numDevSections, drv, &usedChips); - - /* Free it since we don't need that list after this */ -- xfree(devSections); -+ free(devSections); - if (numUsed <= 0) - return FALSE; - -@@ -1015,7 +1019,7 @@ XGIProbe(DriverPtr drv, int flags) - - #endif - } -- xfree(usedChips); -+ free(usedChips); - - return foundScreen; - } -@@ -1044,11 +1048,11 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, - - ErrorF("XGICopyModeNLink()...Use Virtual Size-1\n"); - -- if (!((mode = xalloc(sizeof(DisplayModeRec))))) -+ if (!((mode = malloc(sizeof(DisplayModeRec))))) - return dest; - memcpy(mode, i, sizeof(DisplayModeRec)); -- if (!((mode->Private = xalloc(sizeof(XGIMergedDisplayModeRec))))) { -- xfree(mode); -+ if (!((mode->Private = malloc(sizeof(XGIMergedDisplayModeRec))))) { -+ free(mode); - return dest; - } - ((XGIMergedDisplayModePtr) mode->Private)->CRT1 = i; -@@ -1125,8 +1129,8 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Skipped %dx%d, not enough video RAM or beyond hardware specs\n", - mode->HDisplay, mode->VDisplay); -- xfree(mode->Private); -- xfree(mode); -+ free(mode->Private); -+ free(mode); - - return dest; - } -@@ -1559,10 +1563,10 @@ XGIFreeCRT2Structs(XGIPtr pXGI) - pXGI->CRT2pScrn->monitor->Modes); - } - if (pXGI->CRT2pScrn->monitor->DDC) -- xfree(pXGI->CRT2pScrn->monitor->DDC); -- xfree(pXGI->CRT2pScrn->monitor); -+ free(pXGI->CRT2pScrn->monitor->DDC); -+ free(pXGI->CRT2pScrn->monitor); - } -- xfree(pXGI->CRT2pScrn); -+ free(pXGI->CRT2pScrn); - pXGI->CRT2pScrn = NULL; - } - } -@@ -2438,7 +2442,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn) - - #ifdef XGIMERGED - if (pXGI->MergedFB) { -- pXGI->CRT2pScrn->monitor = xalloc(sizeof(MonRec)); -+ pXGI->CRT2pScrn->monitor = malloc(sizeof(MonRec)); - if (pXGI->CRT2pScrn->monitor) { - DisplayModePtr tempm = NULL, currentm = NULL, newm = NULL; - memcpy(pXGI->CRT2pScrn->monitor, pScrn->monitor, sizeof(MonRec)); -@@ -2446,11 +2450,11 @@ XGIDDCPreInit(ScrnInfoPtr pScrn) - pXGI->CRT2pScrn->monitor->Modes = NULL; - tempm = pScrn->monitor->Modes; - while (tempm) { -- if (!(newm = xalloc(sizeof(DisplayModeRec)))) -+ if (!(newm = malloc(sizeof(DisplayModeRec)))) - break; - memcpy(newm, tempm, sizeof(DisplayModeRec)); -- if (!(newm->name = xalloc(strlen(tempm->name) + 1))) { -- xfree(newm); -+ if (!(newm->name = malloc(strlen(tempm->name) + 1))) { -+ free(newm); - break; - } - strcpy(newm->name, tempm->name); -@@ -2490,7 +2494,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn) - "Failed to allocate memory for CRT2 monitor, %s.\n", - mergeddisstr); - if (pXGI->CRT2pScrn) -- xfree(pXGI->CRT2pScrn); -+ free(pXGI->CRT2pScrn); - pXGI->CRT2pScrn = NULL; - pXGI->MergedFB = FALSE; - } -@@ -3540,7 +3544,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) - /* Do some MergedFB mode initialisation */ - #ifdef XGIMERGED - if (pXGI->MergedFB) { -- pXGI->CRT2pScrn = xalloc(sizeof(ScrnInfoRec)); -+ pXGI->CRT2pScrn = malloc(sizeof(ScrnInfoRec)); - if (!pXGI->CRT2pScrn) { - XGIErrorLog(pScrn, - "Failed to allocate memory for 2nd pScrn, %s\n", -@@ -3586,7 +3590,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) - XGIErrorLog(pScrn, mergednocrt1, mergeddisstr); - } - if (pXGI->CRT2pScrn) -- xfree(pXGI->CRT2pScrn); -+ free(pXGI->CRT2pScrn); - pXGI->CRT2pScrn = NULL; - pXGI->MergedFB = FALSE; - } -@@ -3627,7 +3631,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) - XGIErrorLog(pScrn, mergednocrt2, mergeddisstr); - } - if (pXGI->CRT2pScrn) -- xfree(pXGI->CRT2pScrn); -+ free(pXGI->CRT2pScrn); - pXGI->CRT2pScrn = NULL; - pXGI->MergedFB = FALSE; - } -@@ -4901,7 +4905,7 @@ XGIScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - if (pXGI->ShadowFB) { - pXGI->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width); -- pXGI->ShadowPtr = xalloc(pXGI->ShadowPitch * height); -+ pXGI->ShadowPtr = malloc(pXGI->ShadowPitch * height); - displayWidth = pXGI->ShadowPitch / (pScrn->bitsPerPixel >> 3); - FBStart = pXGI->ShadowPtr; - } -@@ -5777,17 +5781,17 @@ XGICloseScreen(int scrnIndex, ScreenPtr pScreen) - } - - if (pXGI->ShadowPtr) { -- xfree(pXGI->ShadowPtr); -+ free(pXGI->ShadowPtr); - pXGI->ShadowPtr = NULL; - } - - if (pXGI->DGAModes) { -- xfree(pXGI->DGAModes); -+ free(pXGI->DGAModes); - pXGI->DGAModes = NULL; - } - - if (pXGI->adaptor) { -- xfree(pXGI->adaptor); -+ free(pXGI->adaptor); - pXGI->adaptor = NULL; - pXGI->ResetXv = pXGI->ResetXvGamma = NULL; - } -diff --git a/src/xgi_opt.c b/src/xgi_opt.c -index 09346e4..c0608d5 100755 ---- a/src/xgi_opt.c -+++ b/src/xgi_opt.c -@@ -195,7 +195,7 @@ xgiOptions(ScrnInfoPtr pScrn) - xf86CollectOptions(pScrn, NULL); - - /* Process the options */ -- if(!(pXGI->Options = xalloc(sizeof(XGIOptions)))) return; -+ if(!(pXGI->Options = malloc(sizeof(XGIOptions)))) return; - - memcpy(pXGI->Options, XGIOptions, sizeof(XGIOptions)); - -diff --git a/src/xgi_setup.c b/src/xgi_setup.c -index c1d2cdc..6641b09 100755 ---- a/src/xgi_setup.c -+++ b/src/xgi_setup.c -@@ -678,7 +678,7 @@ bAccessVGAPCIInfo(PXGI_HW_DEVICE_INFO pHwDevInfo, ULONG ulOffset, ULONG ulSet, U - err = pci_device_cfg_write_u32(pXGI->PciInfo, *pulValue, - ulOffset & ~3); - } else { -- err = pci_device_cfg_write_u32(pXGI->PciInfo, pulValue, -+ err = pci_device_cfg_read_u32(pXGI->PciInfo, pulValue, - ulOffset & ~3); - } - -diff --git a/src/xgi_video.c b/src/xgi_video.c -index 31cffd5..df76d14 100755 ---- a/src/xgi_video.c -+++ b/src/xgi_video.c -@@ -142,7 +142,7 @@ void XGIInitVideo(ScreenPtr pScreen) - adaptors = &newAdaptor; - } else { - newAdaptors = /* need to free this someplace */ -- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*)); -+ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*)); - if(newAdaptors) { - memcpy(newAdaptors, adaptors, num_adaptors * - sizeof(XF86VideoAdaptorPtr)); -@@ -157,7 +157,7 @@ void XGIInitVideo(ScreenPtr pScreen) - xf86XVScreenInit(pScreen, adaptors, num_adaptors); - - if(newAdaptors) -- xfree(newAdaptors); -+ free(newAdaptors); - - } - -@@ -395,7 +395,7 @@ XGISetupImageVideo(ScreenPtr pScreen) - struct v4l2_standard standard; - # endif//VC - -- if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) + -+ if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) + - sizeof(XGIPortPrivRec) + - sizeof(DevUnion)))) - return NULL; diff --git a/staging/xf86-video-xgixp/PKGBUILD b/staging/xf86-video-xgixp/PKGBUILD deleted file mode 100644 index afe49186d..000000000 --- a/staging/xf86-video-xgixp/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 135215 2011-08-11 07:24:33Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-xgixp -pkgver=1.8.0 -pkgrel=4 -pkgdesc="X.org XGIXP video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto') -conflicts=('xorg-server<1.10.99.902') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - api-compat-fix-for-DRAWABLE_BUFFER.patch) -sha1sums=('67caeaa4c746572160208fe23c7257f62cb442a3' - 'ea140a13963bbf33cdff1ad75789d765867ec53b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/api-compat-fix-for-DRAWABLE_BUFFER.patch" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch b/staging/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch deleted file mode 100644 index f8cb64673..000000000 --- a/staging/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 86258a6fd8fc8bb09a52ee446b37abe6bd0843ef Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Fri, 25 Mar 2011 22:46:55 +0000 -Subject: API compat fix for DRAWABLE_BUFFER - -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/src/xgi_driver.c b/src/xgi_driver.c -index e54d8c7..189b84a 100644 ---- a/src/xgi_driver.c -+++ b/src/xgi_driver.c -@@ -2708,7 +2708,9 @@ xg47_setup_fb_wrap(ReadMemoryProcPtr *read_ptr, - { - switch (pDraw->type) { - case DRAWABLE_WINDOW: -+#ifdef DRAWABLE_BUFFER - case DRAWABLE_BUFFER: -+#endif - *read_ptr = xg47_read_memory_swap_func; - *write_ptr = xg47_write_memory_swap_func; - break; --- -cgit v0.8.3-6-g21f6 diff --git a/staging/xorg-server/10-quirks.conf b/staging/xorg-server/10-quirks.conf deleted file mode 100644 index 7afad22dc..000000000 --- a/staging/xorg-server/10-quirks.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Collection of quirks and blacklist/whitelists for specific devices. - - -# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable -# http://bugs.freedesktop.org/show_bug.cgi?id=22442 -Section "InputClass" - Identifier "ThinkPad HDAPS accelerometer blacklist" - MatchProduct "ThinkPad HDAPS accelerometer data" - Option "Ignore" "on" -EndSection diff --git a/staging/xorg-server/PKGBUILD b/staging/xorg-server/PKGBUILD deleted file mode 100644 index 26bd56ee8..000000000 --- a/staging/xorg-server/PKGBUILD +++ /dev/null @@ -1,178 +0,0 @@ -# $Id: PKGBUILD 136404 2011-08-29 07:29:48Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=xorg-server -pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.11.0 -pkgrel=1 -arch=('i686' 'x86_64') -license=('custom') -url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto') -options=('!libtool') -source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 - autoconfig-nvidia.patch - xvfb-run - xvfb-run.1 - 10-quirks.conf) -sha1sums=('5fa0c0a190fbe1030a14e435de2d5a3259ca70be' - '0249b892f27243d8fe6fe6d226bf4c2391cedf49' - 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' - '6838fc00ef4618c924a77e0fb03c05346080908a' - '993798f3d22ad672d769dae5f48d1fa068d5578f') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Use nouveau/nv/nvidia drivers for nvidia devices - patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" - - autoreconf - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-dri \ - --enable-dmx \ - --enable-xvfb \ - --enable-xnest \ - --enable-composite \ - --enable-xcsecurity \ - --enable-xorg \ - --enable-xephyr \ - --enable-glx-tls \ - --enable-kdrive \ - --enable-install-setuid \ - --enable-config-udev \ - --disable-config-dbus \ - --enable-record \ - --disable-xfbdev \ - --disable-xfake \ - --disable-static \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var \ - --with-xkb-path=/usr/share/X11/xkb \ - --with-xkb-output=/var/lib/xkb \ - --with-fontrootdir=/usr/share/fonts - make - - # Disable subdirs for make install rule to make splitting easier - sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ - -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ - -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ - -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ - -i hw/Makefile -} - -package_xorg-server-common() { - pkgdesc="Xorg server common files" - depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc') - - cd "${srcdir}/${pkgbase}-${pkgver}" - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" - install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" - - make -C xkb DESTDIR="${pkgdir}" install-data - - install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/lib/xorg" - install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/" -} - -package_xorg-server() { - pkgdesc="Xorg X server" - depends=(libxdmcp libxfont udev libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev) - backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') - provides=('x-server') - groups=('xorg') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/X11" - mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/" - install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - - rmdir "${pkgdir}/usr/share/X11" - - # Needed for non-mesa drivers, libgl will restore it - mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ - "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" - - rm -rf "${pkgdir}/var" - - rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" - rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" - - rm -rf "${pkgdir}/usr/lib/pkgconfig" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/share/aclocal" -} - -package_xorg-server-xephyr() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING" -} - -package_xorg-server-xvfb() { - pkgdesc="Virtual framebuffer X server" - depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb" - make DESTDIR="${pkgdir}" install - - install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" - install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING" -} - -package_xorg-server-xnest() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libxext libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING" -} - -package_xorg-server-xdmx() { - pkgdesc="Distributed Multihead X Server and utilities" - depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING" -} - -package_xorg-server-devel() { - pkgdesc="Development files for the X.Org X server" - depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess) - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}/usr/bin" - rm -rf "${pkgdir}/usr/share/man" - rm -rf "${pkgdir}/usr/share/doc" - rm -rf "${pkgdir}/usr/share/X11" - rm -rf "${pkgdir}/usr/lib/xorg" - rm -rf "${pkgdir}/var" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING" -} diff --git a/staging/xorg-server/autoconfig-nvidia.patch b/staging/xorg-server/autoconfig-nvidia.patch deleted file mode 100644 index baa2eb601..000000000 --- a/staging/xorg-server/autoconfig-nvidia.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/hw/xfree86/common/xf86pciBus.c -+++ b/hw/xfree86/common/xf86pciBus.c -@@ -1123,7 +1123,25 @@ videoPtrToDriverList(struct pci_device * - break; - case 0x102b: driverList[0] = "mga"; break; - case 0x10c8: driverList[0] = "neomagic"; break; -- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; -+ case 0x10de: case 0x12d2: -+ switch (dev->device_id) { -+ /* NV1 */ -+ case 0x0008: -+ case 0x0009: -+ driverList[0] = "vesa"; -+ break; -+ /* NV3 */ -+ case 0x0018: -+ case 0x0019: -+ driverList[0] = "nv"; -+ break; -+ default: -+ driverList[0] = "nouveau"; -+ driverList[1] = "nv"; -+ driverList[2] = "nvidia"; -+ break; -+ } -+ break; - case 0x1106: driverList[0] = "openchrome"; break; - case 0x1b36: driverList[0] = "qxl"; break; - case 0x1163: driverList[0] = "rendition"; break; diff --git a/staging/xorg-server/xvfb-run b/staging/xorg-server/xvfb-run deleted file mode 100644 index 4c2f4e0d3..000000000 --- a/staging/xorg-server/xvfb-run +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/sh - -# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $ - -# This script starts an instance of Xvfb, the "fake" X server, runs a command -# with that server available, and kills the X server when done. The return -# value of the command becomes the return value of this script. -# -# If anyone is using this to build a Debian package, make sure the package -# Build-Depends on xvfb, xbase-clients, and xfonts-base. - -set -e - -PROGNAME=xvfb-run -SERVERNUM=99 -AUTHFILE= -ERRORFILE=/dev/null -STARTWAIT=3 -XVFBARGS="-screen 0 640x480x8" -LISTENTCP="-nolisten tcp" -XAUTHPROTO=. - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the event -# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the -# script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -# Display a message, wrapping lines at the terminal width. -message () { - echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} -} - -# Display an error message. -error () { - message "error: $*" >&2 -} - -# Display a usage message. -usage () { - if [ -n "$*" ]; then - message "usage error: $*" - fi - cat <<EOF -Usage: $PROGNAME [OPTION ...] COMMAND -Run COMMAND (usually an X client) in a virtual X server environment. -Options: --a --auto-servernum try to get a free server number, starting at - --server-num --e FILE --error-file=FILE file used to store xauth errors and Xvfb - output (default: $ERRORFILE) --f FILE --auth-file=FILE file used to store auth cookie - (default: ./.Xauthority) --h --help display this usage message and exit --n NUM --server-num=NUM server number to use (default: $SERVERNUM) --l --listen-tcp enable TCP port listening in the X server --p PROTO --xauth-protocol=PROTO X authority protocol name to use - (default: xauth command's default) --s ARGS --server-args=ARGS arguments (other than server number and - "-nolisten tcp") to pass to the Xvfb server - (default: "$XVFBARGS") --w DELAY --wait=DELAY delay in seconds to wait for Xvfb to start - before running COMMAND (default: $STARTWAIT) -EOF -} - -# Find a free server number by looking at .X*-lock files in /tmp. -find_free_servernum() { - # Sadly, the "local" keyword is not POSIX. Leave the next line commented in - # the hope Debian Policy eventually changes to allow it in /bin/sh scripts - # anyway. - #local i - - i=$SERVERNUM - while [ -f /tmp/.X$i-lock ]; do - i=$(($i + 1)) - done - echo $i -} - -# Clean up files -clean_up() { - if [ -e "$AUTHFILE" ]; then - XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1 - fi - if [ -n "$XVFB_RUN_TMPDIR" ]; then - if ! rm -r "$XVFB_RUN_TMPDIR"; then - error "problem while cleaning up temporary directory" - exit 5 - fi - fi -} - -# Parse the command line. -ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ - --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ - --name "$PROGNAME" -- "$@") -GETOPT_STATUS=$? - -if [ $GETOPT_STATUS -ne 0 ]; then - error "internal error; getopt exited with status $GETOPT_STATUS" - exit 6 -fi - -eval set -- "$ARGS" - -while :; do - case "$1" in - -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; - -e|--error-file) ERRORFILE="$2"; shift ;; - -f|--auth-file) AUTHFILE="$2"; shift ;; - -h|--help) SHOWHELP="yes" ;; - -n|--server-num) SERVERNUM="$2"; shift ;; - -l|--listen-tcp) LISTENTCP="" ;; - -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; - -s|--server-args) XVFBARGS="$2"; shift ;; - -w|--wait) STARTWAIT="$2"; shift ;; - --) shift; break ;; - *) error "internal error; getopt permitted \"$1\" unexpectedly" - exit 6 - ;; - esac - shift -done - -if [ "$SHOWHELP" ]; then - usage - exit 0 -fi - -if [ -z "$*" ]; then - usage "need a command to run" >&2 - exit 2 -fi - -if ! which xauth >/dev/null; then - error "xauth command not found" - exit 3 -fi - -# tidy up after ourselves -trap clean_up EXIT - -# If the user did not specify an X authorization file to use, set up a temporary -# directory to house one. -if [ -z "$AUTHFILE" ]; then - XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)" - AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority" -fi - -# Start Xvfb. -MCOOKIE=$(mcookie) -XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 -add :$SERVERNUM $XAUTHPROTO $MCOOKIE -EOF -XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \ - 2>&1 & -XVFBPID=$! -sleep "$STARTWAIT" -if ! kill -0 $XVFBPID 2>/dev/null; then - echo "Xvfb failed to start" >&2 - exit 1 -fi - -# Start the command and save its exit status. -set +e -DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 -RETVAL=$? -set -e - -# Kill Xvfb now that the command has exited. -kill $XVFBPID - -# Return the executed command's exit status. -exit $RETVAL - -# vim:set ai et sts=4 sw=4 tw=80: diff --git a/staging/xorg-server/xvfb-run.1 b/staging/xorg-server/xvfb-run.1 deleted file mode 100644 index 137d3a196..000000000 --- a/staging/xorg-server/xvfb-run.1 +++ /dev/null @@ -1,282 +0,0 @@ -.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $ -.\" -.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>. -.\" -.\" This is free software; you may redistribute it and/or modify -.\" it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2, -.\" or (at your option) any later version. -.\" -.\" This is distributed in the hope that it will be useful, but -.\" WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License with -.\" the Debian operating system, in /usr/share/common-licenses/GPL; if -.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, -.\" Suite 330, Boston, MA 02111-1307 USA -.\" -.\" We need the URL macro from groff's www macro package, but also want -.\" things to work all right for people who don't have it. So we define -.\" our own URL macro and let the www macro package override it if it's -.\" available. -.de URL -\\$2 \(laURL: \\$1 \(ra\\$3 -.. -.if \n[.g] .mso www.tmac -.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" -.SH NAME -xvfb\-run \- run specified X client or command in a virtual X server environment -.SH SYNOPSIS -.B xvfb\-run -[ -.I options -] -.I command -.SH DESCRIPTION -.B xvfb\-run -is a wrapper for the -.BR Xvfb (1x) -command which simplifies the task of running commands (typically an X -client, or a script containing a list of clients to be run) within a virtual -X server environment. -.PP -.B xvfb\-run -sets up an X authority file (or uses an existing user\-specified one), -writes a cookie to it (see -.BR xauth (1x)) -and then starts the -.B Xvfb -X server as a background process. -The process ID of -.B Xvfb -is stored for later use. -The specified -.I command -is then run using the X display corresponding to the -.B Xvfb -server -just started and the X authority file created earlier. -.PP -When the -.I command -exits, its status is saved, the -.B Xvfb -server is killed (using the process ID stored earlier), the X authority -cookie removed, and the authority file deleted (if the user did not specify -one to use). -.B xvfb\-run -then exits with the exit status of -.IR command . -.PP -.B xvfb\-run -requires the -.B xauth -command to function. -.SH OPTIONS -.TP -.B \-a\fR,\fB \-\-auto\-servernum -Try to get a free server number, starting at 99, or the argument to -.BR \-\-server\-num . -.TP -.BI \-e\ file \fR,\fB\ \-\-error\-file= file -Store output from -.B xauth -and -.B Xvfb -in -.IR file . -The default is -.IR /dev/null . -.TP -.BI \-f\ file \fR,\fB\ \-\-auth\-file= file -Store X authentication data in -.IR file . -By default, a temporary directory called -.IR xvfb\-run. PID -(where PID is the process ID of -.B xvfb\-run -itself) is created in the directory specified by the environment variable -.B TMPDIR -(or -.I /tmp -if that variable is null or unset), and the -.BR tempfile (1) -command is used to create a file in that temporary directory called -.IR Xauthority . -.TP -.B \-h\fR,\fB \-\-help -Display a usage message and exit. -.TP -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -Use -.I servernumber -as the server number (but see the -.B \-a\fR,\fB \-\-auto\-servernum -option above). -The default is 99. -.TP -.B \-l\fR,\fB \-\-listen\-tcp -Enable TCP port listening in the X server. -For security reasons (to avoid denial\-of\-service attacks or exploits), -TCP port listening is disabled by default. -.TP -.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname -Use -.I protocolname -as the X authority protocol to use. -The default is \(oq.\(cq, which -.B xauth -interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. -.TP -.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments -Pass -.I arguments -to the -.B Xvfb -server. -Be careful to quote any whitespace characters that may occur within -.I arguments -to prevent them from regarded as separators for -.BR xvfb\-run 's -own arguments. -Also, note that specification of \(oq\-nolisten tcp\(cq in -.I arguments -may override the function of -.BR xvfb\-run 's -own -.B \-l\fR,\fB \-\-listen\-tcp -option, and that specification of the server number (e.g., \(oq:1\(cq) may -be ignored because of the way the X server parses its argument list. -Use the -.B xvfb\-run -option -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -to achieve the latter function. -The default is \(oq\-screen 0 640x480x8\(cq. -.TP -.BI \-w\ delay \fR,\fB\ \-\-wait= delay -Wait -.I delay -seconds after launching -.B Xvfb -before attempting to start the specified command. -The default is 3. -.SH ENVIRONMENT -.TP -.B COLUMNS -indicates the width of the terminal device in character cells. -This value is used for formatting diagnostic messages. -If not set, the terminal is queried using -.BR stty (1) -to determine its width. -If that fails, a value of \(oq80\(cq is assumed. -.TP -.B TMPDIR -specifies the directory in which to place -.BR xvfb\-run 's -temporary directory for storage of the X authority file; only used if the -.B \-f -or -.B \-\-auth\-file -options are not specified. -.SH "OUTPUT FILES" -.PP -Unless the -.B \-f -or -.B \-\-auth\-file -options are specified, a temporary -directory and file within it are created (and deleted) to store the X -authority cookies used by the -.B Xvfb -server and client(s) run under it. -See -.BR tempfile (1). -If \-f or \-\-auth\-file are used, then the specified X authority file is -only written to, not created or deleted (though -.B xauth -creates an authority file itself if told to use use that does not already -exist). -.PP -An error file with a user\-specified name is also created if the -.B \-e -or -.B \-\-error\-file -options are specifed; see above. -.SH "EXIT STATUS" -.B xvfb\-run -uses its exit status as well as output to standard error to communicate -diagnostics. -The exit status of \(oq1\(cq is not used, and should be interpreted as failure -of the specified command. -.TP -0 -.B xvfb\-run -only uses this exit status if the -.B \-h\fR,\fB \-\-help -option is given. -In all other situations, this may be interpreted as success of the specified -command. -.TP -2 -No command to run was specified. -.TP -3 -The -.B xauth -command is not available. -.TP -4 -The temporary directory that was going to be used already exists; since -.B xvfb\-run -produces a uniquely named directory, this may indicate an attempt by another -process on the system to exploit a temporary file race condition. -.TP -5 -A problem was encountered while cleaning up the temporary directory. -.TP -6 -A problem was encountered while using -.BR getopt (1) -to parse the command\-line arguments. -.SH EXAMPLES -.TP -.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo -runs the -.BR xlogo (1x) -demonstration client inside the -.B Xvfb -X server on the first available server number greater than or equal to 1. -.TP -.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces -runs the -.BR ico (1x) -demonstration client (and passes it the -.B \-faces -argument) inside the -.B Xvfb -X server, configured with a root window of 1024 by 768 pixels and a color -depth of 24 bits. -.PP -Note that the demo X clients used in the above examples will not exit on -their own, so they will have to be killed before -.B xvfb\-run -will exit. -.SH BUGS -See -.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . -If you wish to report a bug in -.BR xvfb\-run , -please use the -.BR reportbug (1) -command. -.SH AUTHOR -.B xfvb\-run -was written by Branden Robinson and Jeff Licquia with sponsorship from -Progeny Linux Systems. -.SH "SEE ALSO" -.BR Xvfb (1x), -.BR xauth (1x) -.\" vim:set et tw=80: diff --git a/testing/abiword/PKGBUILD b/testing/abiword/PKGBUILD deleted file mode 100644 index fc132f7b3..000000000 --- a/testing/abiword/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 135371 2011-08-13 09:02:34Z andyrtr $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Maël Lavault <moimael@neuf.fr> - -pkgbase=abiword -pkgname=('abiword' 'abiword-plugins') -pkgver=2.8.6 -pkgrel=5 -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.abisource.com" -makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup') -options=('!makeflags' '!libtool') -source=("http://www.abisource.com/downloads/${pkgbase}/${pkgver}/source/${pkgbase}-${pkgver}.tar.gz" - compat_libwpg_0_9.patch - abiword-2.8.6-no-undefined.patch) -sha1sums=('998f69d038000b3fc027d4259548f02d67c8d0df' - 'e5374f439e3d9b63a4bbd2cd39146c67cf1e85ea' - '159b1cd0b9354868ab86f851b64a03dae7d254dc') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch" - # fix a gcc 4.6.x build issue, patch from Fedora - patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch" - libtoolize --force - autoreconf - - ./configure --prefix=/usr --enable-clipart --enable-templates --enable-collab-backend-xmpp --enable-collab-backend-tcp --enable-collab-backend-service --disable-collab-backend-sugar --enable-plugins --without-gnomevfs --with-gio --with-goffice --disable-static --with-psiconv-config=/nothere - make -} - -package_abiword() { - pkgdesc="A fully-featured word processor" - depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils') - install=$pkgname.install - optdepends=('abiword-plugins') - conflicts=("abiword-plugins<${pkgver}-${pkgrel}") - - cd "${srcdir}/${pkgbase}-${pkgver}" - sed -i plugins/Makefile \ - -e 's/ collab / /' \ - -e 's/ wpg / /' \ - -e 's/ wmf / /' \ - -e 's/ grammar / /' \ - -e 's/ mathview / /' \ - -e 's/ aiksaurus / /' \ - -e 's/ latex / /' \ - -e 's/ ots / /' \ - -e 's/ wordperfect / /' - make DESTDIR="${pkgdir}" install -} - -package_abiword-plugins() { - pkgdesc="Additional plugins for Abiword" - depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf') - - cd "${srcdir}/${pkgbase}-${pkgver}/plugins" - for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do - make -C ${dir} DESTDIR="${pkgdir}" install - done -} diff --git a/testing/abiword/abiword-2.8.6-no-undefined.patch b/testing/abiword/abiword-2.8.6-no-undefined.patch deleted file mode 100644 index c07000edb..000000000 --- a/testing/abiword/abiword-2.8.6-no-undefined.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am ---- abiword-2.8.6.orig/src/Makefile.am 2009-09-09 15:11:01.000000000 +0200 -+++ abiword-2.8.6/src/Makefile.am 2011-08-02 23:35:51.904761961 +0200 -@@ -107,7 +107,7 @@ - - AbiWord_LDFLAGS = \ - $(DEPS_LIBS) \ -- --no-undefined \ -+ -Wl,--no-undefined \ - -avoid-version \ - -export-dynamic \ - -headerpad_max_install_names -@@ -129,7 +129,7 @@ - - abiword_LDFLAGS = \ - $(platform_ldflags) \ -- --no-undefined \ -+ -Wl,--no-undefined \ - -avoid-version \ - -export-dynamic - diff --git a/testing/abiword/abiword.install b/testing/abiword/abiword.install deleted file mode 100644 index 2eaa60550..000000000 --- a/testing/abiword/abiword.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/abiword/compat_libwpg_0_9.patch b/testing/abiword/compat_libwpg_0_9.patch deleted file mode 100644 index cf36e188e..000000000 --- a/testing/abiword/compat_libwpg_0_9.patch +++ /dev/null @@ -1,371 +0,0 @@ -diff -Nur abiword-2.8.6.orig//plugin-configure.m4 abiword-2.8.6/plugin-configure.m4 ---- abiword-2.8.6.orig//plugin-configure.m4 2010-06-13 14:17:27.000000000 -0700 -+++ abiword-2.8.6/plugin-configure.m4 2010-12-06 13:59:43.083048588 -0800 -@@ -794,7 +794,7 @@ - AC_SUBST([OPENXML_LIBS]) - - --wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" -+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" - wpg_deps="no" - - if test "$enable_wpg" != ""; then -@@ -1497,8 +1497,8 @@ - AC_SUBST([EML_LIBS]) - - --wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req" --wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0' -+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" -+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' - wordperfect_deps="no" - - WORDPERFECT_CFLAGS= -diff -Nur abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 abiword-2.8.6/plugins/wordperfect/plugin.m4 ---- abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 2010-05-30 07:50:46.000000000 -0700 -+++ abiword-2.8.6/plugins/wordperfect/plugin.m4 2010-12-06 13:59:53.929715254 -0800 -@@ -1,6 +1,6 @@ - --wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req" --wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0' -+wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" -+wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' - wordperfect_deps="no" - - WORDPERFECT_CFLAGS= -diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp ---- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp 2010-02-06 13:06:11.000000000 -0800 -+++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp 2010-12-06 13:59:53.926381921 -0800 -@@ -60,7 +60,7 @@ - - // Stream class - --#include <libwpd/WPXStream.h> -+#include <libwpd-stream/libwpd-stream.h> - - #include <gsf/gsf-input.h> - #include <gsf/gsf-infile.h> -@@ -70,12 +70,7 @@ - #include <libwps/libwps.h> - #endif - --class AbiWordperfectInputStream : --#ifdef HAVE_LIBWPS -- public WPSInputStream --#else -- public WPXInputStream --#endif -+class AbiWordperfectInputStream : public WPXInputStream - { - public: - AbiWordperfectInputStream(GsfInput *input); -@@ -86,7 +81,7 @@ - - virtual WPXInputStream * getDocumentOLEStream(const char * name); - -- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead); -+ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); - virtual int seek(long offset, WPX_SEEK_TYPE seekType); - virtual long tell(); - virtual bool atEOS(); -@@ -98,11 +93,7 @@ - }; - - AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) : --#ifdef HAVE_LIBWPS -- WPSInputStream(), --#else -- WPXInputStream(true), --#endif -+ WPXInputStream(), - m_input(input), - m_ole(NULL) - { -@@ -117,9 +108,9 @@ - g_object_unref(G_OBJECT(m_input)); - } - --const uint8_t * AbiWordperfectInputStream::read(size_t numBytes, size_t &numBytesRead) -+const unsigned char * AbiWordperfectInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) - { -- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL); -+ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL); - - if (buf == NULL) - numBytesRead = 0; -@@ -256,19 +247,12 @@ - { - AbiWordperfectInputStream gsfInput(input); - -- WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput, true); -+ WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput); - - switch (confidence) - { - case WPD_CONFIDENCE_NONE: -- // libwpd > 0.7.1 reports POOR if the text file is plain text (that _could_ be a WP4x document) -- // however, we'll let the text importer handle such cases -- case WPD_CONFIDENCE_POOR: - return UT_CONFIDENCE_ZILCH; -- case WPD_CONFIDENCE_LIKELY: -- return UT_CONFIDENCE_SOSO; -- case WPD_CONFIDENCE_GOOD: -- return UT_CONFIDENCE_GOOD; - case WPD_CONFIDENCE_EXCELLENT: - return UT_CONFIDENCE_PERFECT; - default: -@@ -328,7 +312,7 @@ - UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input) - { - AbiWordperfectInputStream gsfInput(input); -- WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this)); -+ WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL); - - if (error != WPD_OK) - { -@@ -381,9 +365,9 @@ - float marginLeft = 1.0f, marginRight = 1.0f; - - if (propList["fo:margin-left"]) -- marginLeft = propList["fo:margin-left"]->getFloat(); -+ marginLeft = propList["fo:margin-left"]->getDouble(); - if (propList["fo:margin-right"]) -- marginRight = propList["fo:margin-right"]->getFloat(); -+ marginRight = propList["fo:margin-right"]->getDouble(); - - if (marginLeft != m_leftPageMargin || marginRight != m_rightPageMargin /* || */ - /* marginTop != m_marginBottom || marginBottom != m_marginBottom */ ) -@@ -456,15 +440,15 @@ - float marginTop = 0.0f, marginBottom = 0.0f; - float marginLeft = 0.0f, marginRight = 0.0f, textIndent = 0.0f; - if (propList["fo:margin-top"]) -- marginTop = propList["fo:margin-top"]->getFloat(); -+ marginTop = propList["fo:margin-top"]->getDouble(); - if (propList["fo:margin-bottom"]) -- marginBottom = propList["fo:margin-bottom"]->getFloat(); -+ marginBottom = propList["fo:margin-bottom"]->getDouble(); - if (propList["fo:margin-left"]) -- marginLeft = propList["fo:margin-left"]->getFloat(); -+ marginLeft = propList["fo:margin-left"]->getDouble(); - if (propList["fo:margin-right"]) -- marginRight = propList["fo:margin-right"]->getFloat(); -+ marginRight = propList["fo:margin-right"]->getDouble(); - if (propList["fo:text-indent"]) -- textIndent = propList["fo:text-indent"]->getFloat(); -+ textIndent = propList["fo:text-indent"]->getDouble(); - - m_topMargin = marginTop; - m_bottomMargin = marginBottom; -@@ -487,7 +471,7 @@ - - float lineSpacing = 1.0f; - if (propList["fo:line-height"]) -- lineSpacing = propList["fo:line-height"]->getFloat(); -+ lineSpacing = propList["fo:line-height"]->getDouble(); - - UT_String tmpBuffer; - UT_String_sprintf(tmpBuffer, "; margin-top:%.4fin; margin-bottom:%.4fin; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f", -@@ -504,7 +488,7 @@ - propBuffer += tmpBuffer; - if (i()["style:position"]) - { -- UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getFloat()); -+ UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble()); - propBuffer += tmpBuffer; - } - -@@ -640,9 +624,9 @@ - - // TODO: support spaceAfter - if (propList["fo:margin-left"]) -- marginLeft = propList["fo:margin-left"]->getFloat(); -+ marginLeft = propList["fo:margin-left"]->getDouble(); - if (propList["fo:margin-right"]) -- marginRight = propList["fo:margin-right"]->getFloat(); -+ marginRight = propList["fo:margin-right"]->getDouble(); - - if (marginLeft != m_leftSectionMargin || marginRight != m_rightSectionMargin || m_sectionColumnsCount != columnsCount) - m_bSectionChanged = true; -@@ -709,9 +693,9 @@ - if (propList["style:num-format"]) - listType = propList["style:num-format"]->getStr().cstr()[0]; - if (propList["text:space-before"]) -- listLeftOffset = propList["text:space-before"]->getFloat(); -+ listLeftOffset = propList["text:space-before"]->getDouble(); - if (propList["text:min-label-width"]) -- listMinLabelWidth = propList["text:min-label-width"]->getFloat(); -+ listMinLabelWidth = propList["text:min-label-width"]->getDouble(); - - if (!m_pCurrentListDefinition || - m_pCurrentListDefinition->getOutlineHash() != listID || -@@ -749,9 +733,9 @@ - if (propList["libwpd:level"]) - level = propList["libwpd:level"]->getInt(); - if (propList["text:space-before"]) -- listLeftOffset = propList["text:space-before"]->getFloat(); -+ listLeftOffset = propList["text:space-before"]->getDouble(); - if (propList["text:min-label-width"]) -- listMinLabelWidth = propList["text:min-label-width"]->getFloat(); -+ listMinLabelWidth = propList["text:min-label-width"]->getDouble(); - - if (!m_pCurrentListDefinition || m_pCurrentListDefinition->getOutlineHash() != listID) - { -@@ -871,10 +855,10 @@ - - UT_String_sprintf(tempBuffer, "margin-left:%.4fin; ", m_pCurrentListDefinition->getListLeftOffset(m_iCurrentListLevel) - + m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel) -- - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f)); -+ - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f)); - propBuffer += tempBuffer; - UT_String_sprintf(tempBuffer, "text-indent:%.4fin", - m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel) -- + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f)); -+ + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f)); - propBuffer += tempBuffer; - - listAttribs[attribsCount++] = PT_PROPS_ATTRIBUTE_NAME; -@@ -1263,7 +1247,7 @@ - virtual UT_Error _loadFile(GsfInput * input) - { - AbiWordperfectInputStream gsfInput(input); -- WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXHLListenerImpl *>(this)); -+ WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this)); - - if (error != WPS_OK) - { -@@ -1302,18 +1286,12 @@ - { - AbiWordperfectInputStream gsfInput(input); - -- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput, true); -+ WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput); - - switch (confidence) - { - case WPS_CONFIDENCE_NONE: - return UT_CONFIDENCE_ZILCH; -- case WPS_CONFIDENCE_POOR: -- return UT_CONFIDENCE_POOR; -- case WPS_CONFIDENCE_LIKELY: -- return UT_CONFIDENCE_SOSO; -- case WPS_CONFIDENCE_GOOD: -- return UT_CONFIDENCE_GOOD; - case WPS_CONFIDENCE_EXCELLENT: - return UT_CONFIDENCE_PERFECT; - default: -diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h ---- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h 2009-06-19 01:55:49.000000000 -0700 -+++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h 2010-12-06 13:59:53.929715254 -0800 -@@ -30,13 +30,7 @@ - #define IE_IMP_WP_H - - #include <stdio.h> --#ifdef _WIN32 --#define POINT WPX_POINT --#endif - #include <libwpd/libwpd.h> --#ifdef _WIN32 --#undef POINT --#endif - #include "ie_imp.h" - #include "ut_string.h" - #include "ut_string_class.h" -@@ -98,7 +92,7 @@ - IE_Imp ** ppie); - }; - --class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl -+class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface - { - public: - IE_Imp_WordPerfect(PD_Document * pDocument); -@@ -154,6 +148,21 @@ - virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {} - virtual void closeTable(); - -+ virtual void definePageStyle(const WPXPropertyList&) {} -+ virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} -+ virtual void defineCharacterStyle(const WPXPropertyList&) {} -+ virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} -+ virtual void insertSpace() {} -+ virtual void insertField(const WPXString&, const WPXPropertyList&) {} -+ virtual void openComment(const WPXPropertyList&) {} -+ virtual void closeComment() {} -+ virtual void openTextBox(const WPXPropertyList&) {} -+ virtual void closeTextBox() {} -+ virtual void openFrame(const WPXPropertyList&) {} -+ virtual void closeFrame() {} -+ virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {} -+ virtual void insertEquation(const WPXPropertyList&, const WPXString&) {} -+ - - protected: - virtual UT_Error _loadFile(GsfInput * input); -diff -Nur abiword-2.8.6.orig//plugins/wpg/plugin.m4 abiword-2.8.6/plugins/wpg/plugin.m4 ---- abiword-2.8.6.orig//plugins/wpg/plugin.m4 2010-05-30 07:50:46.000000000 -0700 -+++ abiword-2.8.6/plugins/wpg/plugin.m4 2010-12-06 13:59:53.929715254 -0800 -@@ -1,5 +1,5 @@ - --wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" -+wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" - wpg_deps="no" - - if test "$enable_wpg" != ""; then -diff -Nur abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp ---- abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp 2008-08-15 14:52:32.000000000 -0700 -+++ abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp 2010-12-06 13:59:53.923048588 -0800 -@@ -31,11 +31,10 @@ - #include <gsf/gsf-input-memory.h> - #include <gsf/gsf-input-stdio.h> - #include <gsf/gsf-infile-msole.h> --#include <libwpd/WPXStream.h> -+#include <libwpd-stream/libwpd-stream.h> - #include "xap_Module.h" - - using libwpg::WPGraphics; --using libwpg::WPGString; - - ABI_PLUGIN_DECLARE("WPG") - -@@ -48,7 +47,7 @@ - virtual bool isOLEStream(); - virtual WPXInputStream * getDocumentOLEStream(); - virtual WPXInputStream * getDocumentOLEStream(const char * name); -- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead); -+ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); - virtual int seek(long offset, WPX_SEEK_TYPE seekType); - virtual long tell(); - virtual bool atEOS(); -@@ -60,7 +59,7 @@ - }; - - AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) : -- WPXInputStream(true), -+ WPXInputStream(), - m_input(input), - m_ole(NULL) - { -@@ -75,9 +74,9 @@ - g_object_unref(G_OBJECT(m_input)); - } - --const uint8_t * AbiWordPerfectGraphicsInputStream::read(size_t numBytes, size_t &numBytesRead) -+const unsigned char * AbiWordPerfectGraphicsInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) - { -- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL); -+ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL); - - if (buf == NULL) - numBytesRead = 0; -@@ -245,10 +244,10 @@ - UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg) - { - AbiWordPerfectGraphicsInputStream gsfInput(input); -- WPGString svgOutput; -+ WPXString svgOutput; - if (WPGraphics::generateSVG(&gsfInput, svgOutput)) - { -- GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.length(), false); -+ GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false); - UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg); - g_object_unref(svgInput); - return result; diff --git a/testing/avahi/PKGBUILD b/testing/avahi/PKGBUILD deleted file mode 100644 index 4e9934d63..000000000 --- a/testing/avahi/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 135978 2011-08-21 03:40:24Z allan $ -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=avahi -pkgver=0.6.30 -pkgrel=5 -pkgdesc='A multicast/unicast DNS-SD framework' -arch=('i686' 'x86_64') -url='http://www.avahi.org/' -license=('LGPL') -depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm') -optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' - 'gtk2: gtk2 bindings' - 'qt3: qt3 bindings' - 'qt: qt bindings' - 'pygtk: avahi-bookmarks, avahi-discover' - 'twisted: avahi-bookmarks' - 'mono: mono bindings' - 'dbus-python: avahi-discover' - 'nss-mdns: NSS support for mDNS') -makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' - 'gtk-sharp-2' 'gobject-introspection' 'gtk3') -backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service) -install=install -conflicts=('howl' 'mdnsresponder') -provides=('howl' 'mdnsresponder') -replaces=('howl' 'mdnsresponder') -options=('!libtool') -source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" - 'gnome-nettool.png' - 'rc.d.patch') -sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06' - 'cf56387c88aed246b9f435efc182ef44de4d52f3' - '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf - patch -p1 -i "../rc.d.patch" - - # pygtk requires python2; make it explicit in case other python are installed: FS#21865 - PYTHON=python2 \ - PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-monodoc \ - --disable-doxygen-doc \ - --disable-xmltoman \ - --enable-compat-libdns_sd \ - --enable-compat-howl \ - --with-distro=archlinux \ - --with-avahi-priv-access-group=network \ - --with-autoipd-user=avahi \ - --with-autoipd-group=avahi \ - --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999 - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png - - cd "${pkgdir}" - sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover} - # howl and mdnsresponder compatability - (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) - (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc) -} diff --git a/testing/avahi/gnome-nettool.png b/testing/avahi/gnome-nettool.png Binary files differdeleted file mode 100644 index 227d0678a..000000000 --- a/testing/avahi/gnome-nettool.png +++ /dev/null diff --git a/testing/avahi/install b/testing/avahi/install deleted file mode 100644 index 7c75c3dd4..000000000 --- a/testing/avahi/install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null - getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null - - cat <<EOF -==> The following daemons may be added to DAEMONS in /etc/rc.conf: -==> avahi-daemon: the mdns responder, you probably want this. -==> dbus needs to be running when you start it. -==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns -==> configuration on dhcp-less networks. - -==> To use some of the client applications you will have to install python. -==> In addition, pygtk is required for the graphical ones and -==> twisted for avahi-bookmarks. -EOF -} - -post_remove() { - getent passwd avahi &>/dev/null && userdel avahi >/dev/null - getent group avahi &>/dev/null && groupdel avahi >/dev/null -} diff --git a/testing/avahi/rc.d.patch b/testing/avahi/rc.d.patch deleted file mode 100644 index fd735734b..000000000 --- a/testing/avahi/rc.d.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in ---- old/initscript/archlinux/avahi-daemon.in 2011-06-24 03:07:00.916170590 +0200 -+++ new/initscript/archlinux/avahi-daemon.in 2011-06-24 03:16:32.220596377 +0200 -@@ -33,6 +33,7 @@ - - case "$1" in - start) -+ ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; } - stat_busy "Starting $DESC" - $DAEMON -D > /dev/null 2>&1 - if [ $? -gt 0 ]; then diff --git a/testing/bind/127.0.0.zone b/testing/bind/127.0.0.zone deleted file mode 100644 index 509c311f6..000000000 --- a/testing/bind/127.0.0.zone +++ /dev/null @@ -1,11 +0,0 @@ -$ORIGIN 0.0.127.in-addr.arpa. - -@ 1D IN SOA localhost. root.localhost. ( - 42 ; serial (yyyymmdd##) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum ttl - - 1D IN NS localhost. -1 1D IN PTR localhost. diff --git a/testing/bind/PKGBUILD b/testing/bind/PKGBUILD deleted file mode 100644 index c67de70cb..000000000 --- a/testing/bind/PKGBUILD +++ /dev/null @@ -1,88 +0,0 @@ -# $Id: PKGBUILD 136400 2011-08-29 05:28:19Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> -# Contributor: Mario Vazquez <mario_vazq@hotmail.com> - -pkgname=bind - -# Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.8.0.P4 -_pkgver=9.8.0-P4 -pkgrel=2 - -pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' -url='http://www.isc.org/software/bind/' -license=('custom:ISC') -arch=('i686' 'x86_64') -depends=('openssl' 'krb5' 'libxml2') -options=('!makeflags' '!libtool') -source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" - 'root.hint::ftp://ftp.rs.internic.net/domain/db.cache' - 'so_bsdcompat.patch' - 'remove-tools.patch' - 'named' - 'named.conf' - 'named.conf.d' - 'named.logrotate' - 'localhost.zone' - '127.0.0.zone') -sha1sums=('969864200c1516a8bea54266de60f316d79182b4' - 'cbdecd1ea8e7b612b33b63d66bc57273795d1f54' - 'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb' - '18f477f510df31e6c6f547ee2d5fc46e973479bf' - '46232e9db243c6c05e170a1781d7a7f413be5d03' - '5ca7a5f2a132548a090a045a2df3acea6b35d9eb' - '7848edbfb9a848843f57c11c02b0289eefd42d00' - '9ffb5c3f72390a517aeae557e32349d5d278cb63' - '76a0d4cd1b913db177a5a375bebc47e5956866ec' - '53be0f1437ebe595240d8dbdd819939582b97fb9') - -provides=('dns-server') - -install=install -backup=('etc/logrotate.d/named' - 'etc/conf.d/named' - 'etc/named.conf') - -build() { - cd "${srcdir}/bind-${_pkgver}" - - patch -p1 -i ../remove-tools.patch - patch -p1 -i ../so_bsdcompat.patch - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-linux-caps \ - --with-openssl \ - --with-gssapi \ - --with-libxml2 \ - --with-libtool \ - --with-dlz-dlopen \ - - make -} - -package() { - cd "${srcdir}/bind-${_pkgver}" - - install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - make DESTDIR="${pkgdir}" install - - rmdir "${pkgdir}/var/run" - install -d "${pkgdir}"/usr/share/doc/bind - install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind/ - - install -D -m755 ../named "${pkgdir}"/etc/rc.d/named - install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named - install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named - install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf - - install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named - install -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named/ - install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named/ - install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named/ -} diff --git a/testing/bind/install b/testing/bind/install deleted file mode 100644 index 287d0e05b..000000000 --- a/testing/bind/install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - getent group named &>/dev/null || groupadd -g 40 named - getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named - passwd -l named &>/dev/null - - touch var/log/named.log - chown named:named var/log/named.log - - # create an rndc.key if it doesn't already exist - if [[ ! -s etc/rndc.key ]]; then - usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key - chown root:named etc/rndc.key - chmod 640 etc/rndc.key - fi -} - -pre_remove() { - getent passwd named &>/dev/null && userdel named >/dev/null - getent group named &>/dev/null && groupdel named >/dev/null - return 0 -} diff --git a/testing/bind/localhost.zone b/testing/bind/localhost.zone deleted file mode 100644 index e3ff9641c..000000000 --- a/testing/bind/localhost.zone +++ /dev/null @@ -1,10 +0,0 @@ -$ORIGIN localhost. -@ 1D IN SOA @ root ( - 42 ; serial (yyyymmdd##) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum ttl - - 1D IN NS @ - 1D IN A 127.0.0.1 diff --git a/testing/bind/named b/testing/bind/named deleted file mode 100755 index 7907f9983..000000000 --- a/testing/bind/named +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/named - -[[ -d /var/run/named ]] || mkdir -p /var/run/named -chown named:named /var/run/named - -PIDFILE=/var/run/named/named.pid -PID=$(cat $PIDFILE 2>/dev/null) -readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; } - -case "$1" in - start) - stat_busy "Starting BIND" - [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon named - stat_done - fi - ;; - stop) - stat_busy "Stopping BIND" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon named - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading BIND" - [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|reload|restart}" -esac -exit 0 diff --git a/testing/bind/named.conf b/testing/bind/named.conf deleted file mode 100644 index 38fb12cbe..000000000 --- a/testing/bind/named.conf +++ /dev/null @@ -1,64 +0,0 @@ -// -// /etc/named.conf -// - -options { - directory "/var/named"; - pid-file "/var/run/named/named.pid"; - auth-nxdomain yes; - datasize default; -// Uncomment these to enable IPv6 connections support -// IPv4 will still work: -// listen-on-v6 { any; }; -// Add this for no IPv4: -// listen-on { none; }; - - // Default security settings. - allow-recursion { 127.0.0.1; }; - allow-transfer { none; }; - allow-update { none; }; - version none; - hostname none; - server-id none; -}; - -zone "localhost" IN { - type master; - file "localhost.zone"; - allow-transfer { any; }; -}; - -zone "0.0.127.in-addr.arpa" IN { - type master; - file "127.0.0.zone"; - allow-transfer { any; }; -}; - -zone "." IN { - type hint; - file "root.hint"; -}; - -//zone "example.org" IN { -// type slave; -// file "example.zone"; -// masters { -// 192.168.1.100; -// }; -// allow-query { any; }; -// allow-transfer { any; }; -//}; - -logging { - channel xfer-log { - file "/var/log/named.log"; - print-category yes; - print-severity yes; - print-time yes; - severity info; - }; - category xfer-in { xfer-log; }; - category xfer-out { xfer-log; }; - category notify { xfer-log; }; -}; - diff --git a/testing/bind/named.conf.d b/testing/bind/named.conf.d deleted file mode 100644 index aecbd2307..000000000 --- a/testing/bind/named.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to BIND -# -NAMED_ARGS="-u named" diff --git a/testing/bind/named.logrotate b/testing/bind/named.logrotate deleted file mode 100644 index ef1a2d032..000000000 --- a/testing/bind/named.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/named.log { - missingok - postrotate - /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/testing/bind/remove-tools.patch b/testing/bind/remove-tools.patch deleted file mode 100644 index cbd1c53ad..000000000 --- a/testing/bind/remove-tools.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/bin/Makefile.in new/bin/Makefile.in ---- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 -+++ new/bin/Makefile.in 2011-08-28 19:14:17.025674400 -0700 -@@ -19,7 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -+SUBDIRS = named rndc dnssec tests tools nsupdate \ - check confgen @PKCS11_TOOLS@ - TARGETS = - diff --git a/testing/bind/so_bsdcompat.patch b/testing/bind/so_bsdcompat.patch deleted file mode 100644 index 4d7031fcc..000000000 --- a/testing/bind/so_bsdcompat.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/lib/isc/unix/socket.c new/lib/isc/unix/socket.c ---- old/lib/isc/unix/socket.c 2011-02-18 05:01:16.000000000 +0100 -+++ new/lib/isc/unix/socket.c 2011-05-27 10:12:01.685269374 +0200 -@@ -712,6 +712,8 @@ - } - #endif - -+#undef SO_BSDCOMPAT -+ - static void - socket_log(isc__socket_t *sock, isc_sockaddr_t *address, - isc_logcategory_t *category, isc_logmodule_t *module, int level, diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD deleted file mode 100644 index bfdb3aece..000000000 --- a/testing/binutils/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# $Id: PKGBUILD 135501 2011-08-14 10:07:19Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -pkgname=binutils -pkgver=2.21.1 -pkgrel=2 -_date=20110627 -pkgdesc="A set of programs to assemble and manipulate binary and object files" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/binutils/" -license=('GPL') -groups=('base') -depends=('glibc>=2.14' 'zlib') -checkdepends=('dejagnu') -options=('!libtool' '!distcc' '!ccache') -install=binutils.install -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) -md5sums=('2face559e80d649ba148e42bb2d1fb0f') - -mksource() { - mkdir ${pkgname}-${_date} - cd ${pkgname}-${_date} - export _TAG=binutils-2_21-branch - export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src' - cvs -z9 co -r $_TAG binutils || return 1 - mv src binutils - tar -cvjf ../binutils-${pkgver}_${_date}.tar.bz2 binutils/* -} - -build() { - cd ${srcdir} - mkdir binutils-build && cd binutils-build - - [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib" - - ${srcdir}/binutils/configure --prefix=/usr \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --enable-shared $CONFIGFLAG - - # check the host environment and makes sure all the necessary tools are available - make configure-host - - make tooldir=${pkgdir}/usr -} - -check() { - cd ${srcdir}/binutils-build - - # do not abort on errors - manually check log files - make -k -j1 check || true -} - -package() { - cd ${srcdir}/binutils-build - make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - - # Add some useful headers - install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include - install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include - - # Rebuild libiberty.a with -fPIC - make -C libiberty clean - make CFLAGS="$CFLAGS -fPIC" -C libiberty - install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib - - # Rebuild libbfd.a with -fPIC - make -C bfd clean - # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API - make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd - install -m644 bfd/libbfd.a ${pkgdir}/usr/lib - - # Remove Windows/Novell specific man pages - rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* - - # Remove these symlinks, they are not ABI stable. - # Programs should compile static to the .a file. - rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so - echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so - echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so -} diff --git a/testing/binutils/binutils.install b/testing/binutils/binutils.install deleted file mode 100644 index 8bf9f3a47..000000000 --- a/testing/binutils/binutils.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/testing/blender/PKGBUILD b/testing/blender/PKGBUILD deleted file mode 100644 index 1e283304a..000000000 --- a/testing/blender/PKGBUILD +++ /dev/null @@ -1,92 +0,0 @@ -# $Id: PKGBUILD 135345 2011-08-13 01:50:31Z eric $ -# Contributor: John Sowiak <john@archlinux.org> -# Maintainer: tobias <tobias@archlinux.org> - -# Apparently, the blender guys refuse to release source tarballs for -# intermediate releases that deal mainly with binaries but incorporate tiny -# minor changes from svn. Since I'm sick and tired of the urges of users that -# look for release numbers only, we make a messy PKGBUILD that can checkout svn -# release if necessary. - -#_svn=true -_svn=false - -pkgname=blender -pkgver=2.59 -pkgrel=1 -epoch=2 -pkgdesc="A fully integrated 3D graphics creation suite" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.blender.org" -depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \ - 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \ - 'freetype2' 'openal' 'libsamplerate' 'ffmpeg') -makedepends=('cmake') # 'subversion' -install=blender.install -if [ $_svn = false ]; then - source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz) - md5sums=('6f68fe3c3c2b6a85f1ba9ebc5b1155fe') -else - source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) - md5sums=('7579d1139d0d6025df8afcfca64a65c4') -fi - -# source PKGBUILD && mksource -mksource() { - _svnver=38016 - _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender" - _svnmod="$pkgname-$pkgver" - mkdir ${pkgname}-$pkgver - pushd ${pkgname}-$pkgver - svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod - find . -depth -type d -name .svn -exec rm -rf {} \; - tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/* - popd -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - mkdir build - cd build - - [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF" - - cmake .. \ - -DCMAKE_INSTALL_PREFIX:PATH=/usr \ - -DCMAKE_BUILD_TYPE:STRING=Release \ - -DWITH_INSTALL_PORTABLE:BOOL=OFF \ - -DWITH_PYTHON_INSTALL:BOOL=OFF \ - -DWITH_OPENCOLLADA:BOOL=OFF \ - -DWITH_GAMEENGINE:BOOL=ON \ - -DWITH_PLAYER:BOOL=ON \ - -DWITH_BUILTIN_GLEW:BOOL=OFF \ - -DWITH_CODEC_FFMPEG:BOOL=ON \ - -DWITH_CODEC_SNDFILE:BOOL=ON \ - -DPYTHON_VERSION:STRING=3.2 \ - -DPYTHON_LIBPATH:STRING=/usr/lib \ - -DPYTHON_LIBRARY:STRING=python3.2mu \ - -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \ - $ENABLESSE2 - - make $MAKEFLAGS - - cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \ - "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/ - cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi - chmod 755 bmake - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver/build" - make DESTDIR="${pkgdir}" install - python -m compileall "${pkgdir}/usr/share/blender" - -# install plugins - install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture} - cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \ - "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/ - cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \ - "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/ -} diff --git a/testing/blender/blender.install b/testing/blender/blender.install deleted file mode 100644 index f4d7cc443..000000000 --- a/testing/blender/blender.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_remove() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} diff --git a/testing/bzr/PKGBUILD b/testing/bzr/PKGBUILD deleted file mode 100644 index 58b6598b4..000000000 --- a/testing/bzr/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 136469 2011-08-29 21:41:53Z eric $ -# Maintainer : -# Contributor: Hugo Doria <hugo@archlinux.org> - -pkgname=bzr -pkgver=2.4.0 -pkgrel=1 -pkgdesc="A decentralized revision control system (bazaar)" -arch=('i686' 'x86_64') -url="http://bazaar.canonical.com/en/" -license=('GPL') -depends=('python2') -optdepends=('python-paramiko: for sftp support') -source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") -md5sums=('087c65e4b79f454b9e733c21607bdd56') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|man/man1|share/man/man1|' setup.py - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ - bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py} - python2 setup.py build -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 - - # bash-completion - install -D -m644 contrib/bash/bzr "${pkgdir}/etc/bash_completion.d/bzr" -} diff --git a/testing/claws-mail/PKGBUILD b/testing/claws-mail/PKGBUILD deleted file mode 100644 index b395a6177..000000000 --- a/testing/claws-mail/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 134940 2011-08-09 15:03:29Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=claws-mail -pkgver=3.7.9 -pkgrel=5 -pkgdesc="A GTK+ based e-mail client." -arch=('i686' 'x86_64') -license=('GPL3') -url="http://www.claws-mail.org" -depends=('gtk2' 'gnutls' 'startup-notification' 'pilot-link' 'enchant' - 'gpgme' 'libetpan' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind') -optdepends=('python2: needed for some tools' - 'perl: needed for some tools' - 'spamassassin: adds support for spamfiltering' - 'bogofilter: adds support for spamfiltering' - 'html2ps: AUR pkg - adds support for printing html mails together with html plugins') -replaces=('sylpheed-claws') -provides=('claws') -options=(!libtool) -install=claws-mail.install -source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2 - claws-notify-crash.patch) -md5sums=('2f9d2dcabf84e312cfeb56efa799b5b3' - '9a2903449f679344b5f5f51c91825b45') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - patch -Np0 -i $srcdir/claws-notify-crash.patch - sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py - - ./configure --prefix=/usr --disable-static \ - --enable-enchant \ - --enable-gnutls \ - --enable-ldap \ - --disable-dillo-viewer-plugin \ - --enable-crash-dialog \ - --enable-pgpmime-plugin \ - --enable-spamassassin-plugin \ - --enable-bogofilter-plugin \ - --enable-jpilot - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - # build and install extra tools - cd tools - make - # all executables and .conf files ; only top directory - find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do - install -D -m755 ${i} \ - ${pkgdir}/usr/lib/claws-mail/tools/${i} - done -} diff --git a/testing/claws-mail/claws-mail.install b/testing/claws-mail/claws-mail.install deleted file mode 100644 index 648480c3b..000000000 --- a/testing/claws-mail/claws-mail.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - diff --git a/testing/claws-mail/claws-notify-crash.patch b/testing/claws-mail/claws-notify-crash.patch deleted file mode 100644 index e1d4eb686..000000000 --- a/testing/claws-mail/claws-notify-crash.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: src/main.c -=================================================================== -RCS file: //claws/src/main.c,v -retrieving revision 1.115.2.237 -retrieving revision 1.115.2.238 -diff -u -r1.115.2.237 -r1.115.2.238 ---- src/main.c 10 Apr 2011 17:19:04 -0000 1.115.2.237 -+++ src/main.c 30 Apr 2011 19:27:15 -0000 1.115.2.238 -@@ -331,7 +331,7 @@ - gtk_widget_show(hack); - } - -- xdisplay = gdk_display_get_default(); -+ xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); - sn_display = sn_display_new(xdisplay, - sn_error_trap_push, - sn_error_trap_pop); - diff --git a/testing/cloog/PKGBUILD b/testing/cloog/PKGBUILD deleted file mode 100644 index 0f99d53d7..000000000 --- a/testing/cloog/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 136092 2011-08-23 01:52:17Z heftig $ -# Maintainer: Allan McRae <allan@archlinux.org> - -pkgname=cloog -pkgver=0.16.3 -pkgrel=1 -pkgdesc="Library that generates loops for scanning polyhedra" -arch=('i686' 'x86_64') -url="http://www.bastoul.net/cloog/" -license=('GPL') -depends=('isl' 'gmp') -conflicts=('cloog-ppl<0.15.10-2') -options=('!libtool') -source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz) -md5sums=('a0f8a241cd1c4f103f8d2c91642b3498') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --with-isl=system --with-gmp=system - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} diff --git a/testing/cups/PKGBUILD b/testing/cups/PKGBUILD deleted file mode 100644 index 4eae9e73f..000000000 --- a/testing/cups/PKGBUILD +++ /dev/null @@ -1,144 +0,0 @@ -# $Id: PKGBUILD 135845 2011-08-19 10:37:17Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase="cups" -pkgname=('libcups' 'cups') -pkgver=1.5.0 -pkgrel=1 -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.cups.org/" -makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3' - 'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi' 'hicolor-icon-theme') -source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 - cups-avahi.patch - cups-no-export-ssllibs.patch - cups-no-gcrypt.patch - cups cups.logrotate cups.pam) -#options=('!emptydirs') -md5sums=('e54ed09ede2340fc3014913333520fe4' - 'e0843e8d8c345792ac73a185260e69fe' - '9b8467a1e51d360096b70e2c3c081e6c' - '3733c23e77eb503bd94cc368e02830dc' - '9657daa21760bb0b5fa3d8b51d5e01a1' - 'f861b18f4446c43918c8643dcbbd7f6d' - '96f82c38f3f540b53f3e5144900acf17') - -# move client.conf man page for next update to the client pkg. - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - # Avahi support in the dnssd backend. patch from Debian based on the Fedora work but brings it in a single file http://patch-tracker.debian.org/package/cups - patch -Np1 -i ${srcdir}/cups-avahi.patch - - # Do not export SSL libs in cups-config - patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch" - - patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch" - - # Rebuild configure script for --enable-avahi. - aclocal -I config-scripts - autoconf -I config-scripts - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libdir=/usr/lib \ - --with-logdir=/var/log/cups \ - --with-docdir=/usr/share/cups/doc \ - --with-cups-user=daemon \ - --with-cups-group=lp \ - --enable-pam=yes \ - --disable-ldap \ - --enable-raw-printing \ - --enable-dbus --with-dbusdir=/etc/dbus-1 \ - --enable-ssl=yes --enable-gnutls \ - --enable-threads \ - --enable-avahi\ - --with-php=/usr/bin/php-cgi \ - --with-pdftops=pdftops \ - --with-optim="$CFLAGS" - make -} - -check() { - cd "$srcdir/$pkgbase-$pkgver" - #httpAddrGetList(workstation64): FAIL - #1 TESTS FAILED! - #make[1]: *** [testhttp] Error 1 - make -k check || /bin/true -} - -package_libcups() { -pkgdesc="The CUPS Printing System - client libraries and headers" -depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'krb5' 'avahi') - - cd ${srcdir}/${pkgbase}-${pkgver} - make BUILDROOT=${pkgdir} install-headers install-libs - # put this into the libs pkg to make other software find the libs(no pkg-config file included) - mkdir -p ${pkgdir}/usr/bin - install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config -} - -package_cups() { -pkgdesc="The CUPS Printing System - deamon package" -install=cups.install -backup=(etc/cups/cupsd.conf - etc/cups/mime.convs - etc/cups/mime.types - etc/cups/snmp.conf - etc/cups/printers.conf - etc/cups/classes.conf - etc/cups/client.conf - etc/cups/subscriptions.conf - etc/dbus-1/system.d/cups.conf - etc/logrotate.d/cups - etc/pam.d/cups - etc/xinetd.d/cups-lpd) -depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme') -optdepends=('php: for included phpcups.so module' - 'ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' - 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' - 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly' - 'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly' - 'xdg-utils: xdg .desktop file support') - - cd ${srcdir}/${pkgbase}-${pkgver} - make BUILDROOT=${pkgdir} install-data install-exec - - # this one we ship in the libcups pkg - rm -f ${pkgdir}/usr/bin/cups-config - - # kill the sysv stuff - rm -rf ${pkgdir}/etc/rc*.d - rm -rf ${pkgdir}/etc/init.d - install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd - install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups - install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups - - # fix perms on /var/spool and /etc - chmod 755 ${pkgdir}/var/spool - chmod 755 ${pkgdir}/etc - - # serial backend needs to run as root (http://bugs.archlinux.org/task/20396) - chmod 700 ${pkgdir}/usr/lib/cups/backend/serial - - # install ssl directory where to store the certs, solves some samba issues - install -dm700 -g lp ${pkgdir}/etc/cups/ssl - # remove directory from package, we create it in cups rc.d file - rm -rf ${pkgdir}/var/run -# install -dm511 -g lp ${pkgdir}/var/run/cups/certs - - # install some more configuration files that will get filled by cupsd - touch ${pkgdir}/etc/cups/printers.conf - touch ${pkgdir}/etc/cups/classes.conf - touch ${pkgdir}/etc/cups/client.conf - echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf - echo "ServerName /var/run/cups/cups.sock # alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf - touch ${pkgdir}/etc/cups/subscriptions.conf - chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,client.conf,subscriptions.conf} - - # fix .desktop file - sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop - - # compress some driver files, adopted from Fedora - find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f -} diff --git a/testing/cups/cups b/testing/cups/cups deleted file mode 100755 index 744c8e663..000000000 --- a/testing/cups/cups +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -daemon_name=cupsd - -. /etc/rc.conf -. /etc/rc.d/functions -#. /etc/conf.d/$daemon_name.conf - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid - # RUN - $daemon_name - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $(get_pid) > /var/run/$daemon_name.pid - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/$daemon_name.pid &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/testing/cups/cups-avahi.patch b/testing/cups/cups-avahi.patch deleted file mode 100644 index 7e9c8ecea..000000000 --- a/testing/cups/cups-avahi.patch +++ /dev/null @@ -1,3156 +0,0 @@ -Description: Avahi support -Bug: http://www.cups.org/str.php?L3066 -Author: Tim Waugh -Origin: git clone http://twaugh.fedorapeople.org/cups-avahi.git (Aug 11, 2011) - ---- a/backend/dnssd.c -+++ b/backend/dnssd.c -@@ -15,14 +15,21 @@ - * - * Contents: - * -+ * next_txt_record() - Get next TXT record from a cups_txt_records_t. -+ * parse_txt_record_pair() - Read key/value pair in cups_txt_records_t. - * main() - Browse for printers. - * browse_callback() - Browse devices. - * browse_local_callback() - Browse local devices. - * compare_devices() - Compare two devices. - * exec_backend() - Execute the backend that corresponds to the - * resolved service name. -+ * device_type() - Get DNS-SD type enumeration from string. - * get_device() - Create or update a device. - * query_callback() - Process query data. -+ * avahi_client_callback() - Avahi client callback function. -+ * avahi_query_callback() - Avahi query callback function. -+ * avahi_browse_callback() - Avahi browse callback function. -+ * find_device() - Find a device from its name and domain. - * sigterm_handler() - Handle termination signals... - * unquote() - Unquote a name string. - */ -@@ -33,7 +40,18 @@ - - #include "backend-private.h" - #include <cups/array.h> --#include <dns_sd.h> -+#ifdef HAVE_DNSSD -+# include <dns_sd.h> -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+# include <avahi-client/client.h> -+# include <avahi-client/lookup.h> -+# include <avahi-common/simple-watch.h> -+# include <avahi-common/domain.h> -+# include <avahi-common/error.h> -+# include <avahi-common/malloc.h> -+#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX -+#endif /* HAVE_AVAHI */ - - - /* -@@ -53,7 +71,12 @@ - - typedef struct - { -+#ifdef HAVE_DNSSD - DNSServiceRef ref; /* Service reference for resolve */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ int resolved; /* Did we resolve the device? */ -+#endif /* HAVE_AVAHI */ - char *name, /* Service name */ - *domain, /* Domain name */ - *fullName, /* Full name */ -@@ -65,6 +88,20 @@ - sent; /* Did we list the device? */ - } cups_device_t; - -+typedef struct -+{ -+ char key[256]; -+ char value[256]; -+ -+#ifdef HAVE_DNSSD -+ const uint8_t *data; -+ const uint8_t *datanext; -+ const uint8_t *dataend; -+#else /* HAVE_AVAHI */ -+ AvahiStringList *txt; -+#endif /* HAVE_DNSSD */ -+} cups_txt_records_t; -+ - - /* - * Local globals... -@@ -78,6 +115,7 @@ - * Local functions... - */ - -+#ifdef HAVE_DNSSD - static void browse_callback(DNSServiceRef sdRef, - DNSServiceFlags flags, - uint32_t interfaceIndex, -@@ -93,12 +131,6 @@ - const char *regtype, - const char *replyDomain, - void *context); --static int compare_devices(cups_device_t *a, cups_device_t *b); --static void exec_backend(char **argv); --static cups_device_t *get_device(cups_array_t *devices, -- const char *serviceName, -- const char *regtype, -- const char *replyDomain); - static void query_callback(DNSServiceRef sdRef, - DNSServiceFlags flags, - uint32_t interfaceIndex, -@@ -107,9 +139,118 @@ - uint16_t rrclass, uint16_t rdlen, - const void *rdata, uint32_t ttl, - void *context); -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+static void avahi_client_callback (AvahiClient *client, -+ AvahiClientState state, -+ void *context); -+static void avahi_browse_callback (AvahiServiceBrowser *browser, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiBrowserEvent event, -+ const char *serviceName, -+ const char *regtype, -+ const char *replyDomain, -+ AvahiLookupResultFlags flags, -+ void *context); -+#endif /* HAVE_AVAHI */ -+ -+static cups_device_t * find_device (cups_array_t *devices, -+ cups_txt_records_t *txt, -+ cups_device_t *dkey); -+static int compare_devices(cups_device_t *a, cups_device_t *b); -+static void exec_backend(char **argv); -+static cups_device_t *get_device(cups_array_t *devices, -+ const char *serviceName, -+ const char *regtype, -+ const char *replyDomain); - static void sigterm_handler(int sig); - static void unquote(char *dst, const char *src, size_t dstsize); - -+#ifdef HAVE_AVAHI -+static AvahiSimplePoll *simple_poll = NULL; -+static int avahi_got_callback; -+#endif /* HAVE_AVAHI */ -+ -+ -+/* -+ * 'next_txt_record()' - Get next TXT record from a cups_txt_records_t. -+ */ -+ -+static cups_txt_records_t * -+next_txt_record (cups_txt_records_t *txt) -+{ -+#ifdef HAVE_DNSSD -+ txt->data = txt->datanext; -+#else /* HAVE_AVAHI */ -+ txt->txt = avahi_string_list_get_next (txt->txt); -+ if (txt->txt == NULL) -+ return NULL; -+#endif /* HAVE_DNSSD */ -+ -+ return txt; -+} -+ -+ -+/* -+ * 'parse_txt_record_pair()' - Read key/value pair in cups_txt_records_t. -+ */ -+ -+static int -+parse_txt_record_pair (cups_txt_records_t *txt) -+{ -+#ifdef HAVE_DNSSD -+ uint8_t datalen; -+ uint8_t *data = txt->data; -+ char *ptr; -+ -+ /* -+ * Read a key/value pair starting with an 8-bit length. Since the -+ * length is 8 bits and the size of the key/value buffers is 256, we -+ * don't need to check for overflow... -+ */ -+ -+ datalen = *data++; -+ if (!datalen || (data + datalen) >= txt->dataend) -+ return NULL; -+ txt->datanext = data + datalen; -+ -+ for (ptr = txt->key; data < txt->datanext && *data != '='; data ++) -+ *ptr++ = *data; -+ *ptr = '\0'; -+ -+ if (data < txt->datanext && *data == '=') -+ { -+ data++; -+ -+ if (data < datanext) -+ memcpy (txt->value, data, txt->datanext - data); -+ value[txt->datanext - data] = '\0'; -+ } -+ else -+ return 1; -+#else /* HAVE_AVAHI */ -+ char *key, *value; -+ size_t len; -+ avahi_string_list_get_pair (txt->txt, &key, &value, &len); -+ if (len > sizeof (txt->value) - 1) -+ len = sizeof (txt->value) - 1; -+ -+ memcpy (txt->value, value, len); -+ txt->value[len] = '\0'; -+ len = strlen (key); -+ if (len > sizeof (txt->key) - 1) -+ len = sizeof (txt->key) - 1; -+ -+ memcpy (txt->key, key, len); -+ txt->key[len] = '\0'; -+ avahi_free (key); -+ avahi_free (value); -+#endif /* HAVE_AVAHI */ -+ -+ return 0; -+} -+ - - /* - * 'main()' - Browse for printers. -@@ -120,6 +261,13 @@ - char *argv[]) /* I - Command-line arguments */ - { - const char *name; /* Backend name */ -+ cups_array_t *devices; /* Device array */ -+ cups_device_t *device; /* Current device */ -+ char uriName[1024]; /* Unquoted fullName for URI */ -+#ifdef HAVE_DNSSD -+ int fd; /* Main file descriptor */ -+ fd_set input; /* Input set for select() */ -+ struct timeval timeout; /* Timeout for select() */ - DNSServiceRef main_ref, /* Main service reference */ - fax_ipp_ref, /* IPP fax service reference */ - ipp_ref, /* IPP service reference */ -@@ -133,12 +281,11 @@ - pdl_datastream_ref, /* AppSocket service reference */ - printer_ref, /* LPD service reference */ - riousbprint_ref; /* Remote IO service reference */ -- int fd; /* Main file descriptor */ -- fd_set input; /* Input set for select() */ -- struct timeval timeout; /* Timeout for select() */ -- cups_array_t *devices; /* Device array */ -- cups_device_t *device; /* Current device */ -- char uriName[1024]; /* Unquoted fullName for URI */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ AvahiClient *client; -+ int error; -+#endif /* HAVE_AVAHI */ - #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) - struct sigaction action; /* Actions for POSIX signals */ - #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ -@@ -198,6 +345,49 @@ - * Browse for different kinds of printers... - */ - -+#ifdef HAVE_AVAHI -+ if ((simple_poll = avahi_simple_poll_new ()) == NULL) -+ { -+ perror ("ERROR: Unable to create avahi simple poll object"); -+ return (1); -+ } -+ -+ client = avahi_client_new (avahi_simple_poll_get (simple_poll), -+ 0, avahi_client_callback, NULL, &error); -+ if (!client) -+ { -+ perror ("DEBUG: Unable to create avahi client"); -+ return (0); -+ } -+ -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_fax-ipp._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_ipp._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_ipp-tls._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_pdl-datastream._tcp", -+ NULL, 0, -+ avahi_browse_callback, -+ devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_printer._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_riousbprint._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+#endif /* HAVE_AVAHI */ -+#ifdef HAVE_DNSSD - if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError) - { - perror("ERROR: Unable to create service connection"); -@@ -258,6 +448,7 @@ - riousbprint_ref = main_ref; - DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0, - "_riousbprint._tcp", NULL, browse_callback, devices); -+#endif /* HAVE_DNSSD */ - - /* - * Loop until we are killed... -@@ -265,6 +456,9 @@ - - while (!job_canceled) - { -+ int announce = 0; -+ -+#ifdef HAVE_DNSSD - FD_ZERO(&input); - FD_SET(fd, &input); - -@@ -284,11 +478,35 @@ - } - else - { -+ announce = 1; -+ } -+#else /* HAVE_AVAHI */ -+ int r; -+ avahi_got_callback = 0; -+ r = avahi_simple_poll_iterate (simple_poll, 1); -+ if (r != 0 && r != EINTR) -+ { -+ /* -+ * We've been told to exit the loop. Perhaps the connection to -+ * avahi failed. -+ */ -+ -+ break; -+ } -+ -+ if (avahi_got_callback) -+ announce = 1; -+#endif /* HAVE_DNSSD */ -+ -+ if (announce) -+ { - /* - * Announce any devices we've found... - */ - -+#ifdef HAVE_DNSSD - DNSServiceErrorType status; /* DNS query status */ -+#endif /* HAVE_DNSSD */ - cups_device_t *best; /* Best matching device */ - char device_uri[1024]; /* Device URI */ - int count; /* Number of queries */ -@@ -302,6 +520,7 @@ - if (device->sent) - sent ++; - -+#ifdef HAVE_DNSSD - if (device->ref) - count ++; - -@@ -333,14 +552,23 @@ - count ++; - } - } -- else if (!device->sent) -+ else -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ if (!device->resolved) -+ continue; -+ else -+#endif /* HAVE_AVAHI */ -+ if (!device->sent) - { -+#ifdef HAVE_DNSSD - /* - * Got the TXT records, now report the device... - */ - - DNSServiceRefDeallocate(device->ref); - device->ref = 0; -+#endif /* HAVE_DNSSD */ - - if (!best) - best = device; -@@ -401,6 +629,7 @@ - } - - -+#ifdef HAVE_DNSSD - /* - * 'browse_callback()' - Browse devices. - */ -@@ -489,6 +718,7 @@ - device->fullName); - device->sent = 1; - } -+#endif /* HAVE_DNSSD */ - - - /* -@@ -569,6 +799,41 @@ - - - /* -+ * 'device_type()' - Get DNS-SD type enumeration from string. -+ */ -+ -+static int -+device_type (const char *regtype) -+{ -+#ifdef HAVE_AVAHI -+ if (!strcmp(regtype, "_ipp._tcp")) -+ return (CUPS_DEVICE_IPP); -+ else if (!strcmp(regtype, "_ipps._tcp") || -+ !strcmp(regtype, "_ipp-tls._tcp")) -+ return (CUPS_DEVICE_IPPS); -+ else if (!strcmp(regtype, "_fax-ipp._tcp")) -+ return (CUPS_DEVICE_FAX_IPP); -+ else if (!strcmp(regtype, "_printer._tcp")) -+ return (CUPS_DEVICE_PDL_DATASTREAM); -+#else -+ if (!strcmp(regtype, "_ipp._tcp.")) -+ return (CUPS_DEVICE_IPP); -+ else if (!strcmp(regtype, "_ipps._tcp.") || -+ !strcmp(regtype, "_ipp-tls._tcp.")) -+ return (CUPS_DEVICE_IPPS); -+ else if (!strcmp(regtype, "_fax-ipp._tcp.")) -+ return (CUPS_DEVICE_FAX_IPP); -+ else if (!strcmp(regtype, "_printer._tcp.")) -+ return (CUPS_DEVICE_PRINTER); -+ else if (!strcmp(regtype, "_pdl-datastream._tcp.")) -+ return (CUPS_DEVICE_PDL_DATASTREAM); -+#endif /* HAVE_AVAHI */ -+ -+ return (CUPS_DEVICE_RIOUSBPRINT); -+} -+ -+ -+/* - * 'get_device()' - Create or update a device. - */ - -@@ -589,20 +854,7 @@ - */ - - key.name = (char *)serviceName; -- -- if (!strcmp(regtype, "_ipp._tcp.")) -- key.type = CUPS_DEVICE_IPP; -- else if (!strcmp(regtype, "_ipps._tcp.") || -- !strcmp(regtype, "_ipp-tls._tcp.")) -- key.type = CUPS_DEVICE_IPPS; -- else if (!strcmp(regtype, "_fax-ipp._tcp.")) -- key.type = CUPS_DEVICE_FAX_IPP; -- else if (!strcmp(regtype, "_printer._tcp.")) -- key.type = CUPS_DEVICE_PRINTER; -- else if (!strcmp(regtype, "_pdl-datastream._tcp.")) -- key.type = CUPS_DEVICE_PDL_DATASTREAM; -- else -- key.type = CUPS_DEVICE_RIOUSBPRINT; -+ key.type = device_type (regtype); - - for (device = cupsArrayFind(devices, &key); - device; -@@ -622,8 +874,14 @@ - free(device->domain); - device->domain = strdup(replyDomain); - -+#ifdef HAVE_DNSSD - DNSServiceConstructFullName(fullName, device->name, regtype, - replyDomain); -+#else /* HAVE_AVAHI */ -+ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, -+ serviceName, regtype, replyDomain); -+#endif /* HAVE_DNSSD */ -+ - free(device->fullName); - device->fullName = strdup(fullName); - } -@@ -643,6 +901,9 @@ - device->domain = strdup(replyDomain); - device->type = key.type; - device->priority = 50; -+#ifdef HAVE_AVAHI -+ device->resolved = 0; -+#endif /* HAVE_AVAHI */ - - cupsArrayAdd(devices, device); - -@@ -650,13 +911,20 @@ - * Set the "full name" of this service, which is used for queries... - */ - -+#ifdef HAVE_DNSSD - DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain); -+#else /* HAVE_AVAHI */ -+ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, -+ serviceName, regtype, replyDomain); -+#endif /* HAVE_DNSSD */ -+ - device->fullName = strdup(fullName); - - return (device); - } - - -+#ifdef HAVE_DNSSD - /* - * 'query_callback()' - Process query data. - */ -@@ -680,7 +948,7 @@ - *ptr; /* Pointer into string */ - cups_device_t dkey, /* Search key */ - *device; /* Device */ -- -+ cups_txt_records_t txt; - - fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, " - "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", " -@@ -714,94 +982,233 @@ - if ((ptr = strstr(name, "._")) != NULL) - *ptr = '\0'; - -- if (strstr(fullName, "_ipp._tcp.")) -- dkey.type = CUPS_DEVICE_IPP; -- else if (strstr(fullName, "_ipps._tcp.") || -- strstr(fullName, "_ipp-tls._tcp.")) -- dkey.type = CUPS_DEVICE_IPPS; -- else if (strstr(fullName, "_fax-ipp._tcp.")) -- dkey.type = CUPS_DEVICE_FAX_IPP; -- else if (strstr(fullName, "_printer._tcp.")) -- dkey.type = CUPS_DEVICE_PRINTER; -- else if (strstr(fullName, "_pdl-datastream._tcp.")) -- dkey.type = CUPS_DEVICE_PDL_DATASTREAM; -+ dkey.type = device_type (fullName); -+ -+ txt.data = rdata; -+ txt.dataend = rdata + rdlen; -+ device = find_device ((cups_array_t *) context, &txt, &dkey); -+ if (!device) -+ fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); -+} -+#endif /* HAVE_DNSSD */ -+ -+ -+#ifdef HAVE_AVAHI -+/* -+ * 'avahi_client_callback()' - Avahi client callback function. -+ */ -+ -+static void -+avahi_client_callback(AvahiClient *client, -+ AvahiClientState state, -+ void *context) -+{ -+ /* -+ * If the connection drops, quit. -+ */ -+ -+ if (state == AVAHI_CLIENT_FAILURE) -+ { -+ fprintf (stderr, "ERROR: Avahi connection failed\n"); -+ avahi_simple_poll_quit (simple_poll); -+ } -+} -+ -+ -+/* -+ * 'avahi_query_callback()' - Avahi query callback function. -+ */ -+ -+static void -+avahi_query_callback(AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ AvahiClient *client; -+ cups_device_t key, -+ *device; -+ char uqname[1024], -+ *ptr; -+ cups_txt_records_t txtr; -+ -+ client = avahi_service_resolver_get_client (resolver); -+ if (event != AVAHI_RESOLVER_FOUND) -+ { -+ if (event == AVAHI_RESOLVER_FAILURE) -+ { -+ fprintf (stderr, "ERROR: %s\n", -+ avahi_strerror (avahi_client_errno (client))); -+ } -+ -+ avahi_service_resolver_free (resolver); -+ return; -+ } -+ -+ /* -+ * Set search key for device. -+ */ -+ -+ key.name = uqname; -+ unquote (uqname, name, sizeof (uqname)); -+ if ((ptr = strstr(name, "._")) != NULL) -+ *ptr = '\0'; -+ -+ key.domain = (char *) domain; -+ key.type = device_type (type); -+ -+ /* -+ * Find the device and the the TXT information. -+ */ -+ -+ txtr.txt = txt; -+ device = find_device ((cups_array_t *) context, &txtr, &key); -+ if (device) -+ { -+ /* -+ * Let the main loop know to announce the device. -+ */ -+ -+ device->resolved = 1; -+ avahi_got_callback = 1; -+ } - else -- dkey.type = CUPS_DEVICE_RIOUSBPRINT; -+ fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name); -+ -+ avahi_service_resolver_free (resolver); -+} -+ -+ -+/* -+ * 'avahi_browse_callback()' - Avahi browse callback function. -+ */ -+ -+static void -+avahi_browse_callback(AvahiServiceBrowser *browser, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiBrowserEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ AvahiClient *client = avahi_service_browser_get_client (browser); -+ -+ switch (event) -+ { -+ case AVAHI_BROWSER_FAILURE: -+ fprintf (stderr, "ERROR: %s\n", -+ avahi_strerror (avahi_client_errno (client))); -+ avahi_simple_poll_quit (simple_poll); -+ return; -+ -+ case AVAHI_BROWSER_NEW: -+ /* -+ * This object is new on the network. -+ */ -+ -+ if (flags & AVAHI_LOOKUP_RESULT_LOCAL) -+ { -+ /* -+ * This comes from the local machine so ignore it. -+ */ -+ -+ fprintf (stderr, "DEBUG: ignoring local service %s\n", name); -+ } -+ else -+ { -+ /* -+ * Create a device entry for it if it doesn't yet exist. -+ */ -+ -+ get_device ((cups_array_t *)context, name, type, domain); -+ -+ /* -+ * Now look for a TXT entry. -+ */ -+ -+ if (avahi_service_resolver_new (client, interface, protocol, -+ name, type, domain, -+ AVAHI_PROTO_UNSPEC, 0, -+ avahi_query_callback, context) == NULL) -+ { -+ fprintf (stderr, "ERROR: failed to resolve service %s: %s\n", -+ name, avahi_strerror (avahi_client_errno (client))); -+ } -+ } -+ -+ break; -+ -+ case AVAHI_BROWSER_REMOVE: -+ case AVAHI_BROWSER_ALL_FOR_NOW: -+ case AVAHI_BROWSER_CACHE_EXHAUSTED: -+ break; -+ } -+} -+#endif /* HAVE_AVAHI */ -+ - -- for (device = cupsArrayFind(devices, &dkey); -+/* -+ * 'find_device()' - Find a device from its name and domain. -+ */ -+ -+static cups_device_t * -+find_device (cups_array_t *devices, -+ cups_txt_records_t *txt, -+ cups_device_t *dkey) -+{ -+ cups_device_t *device; -+ char *ptr; -+ -+ for (device = cupsArrayFind(devices, dkey); - device; - device = cupsArrayNext(devices)) - { -- if (_cups_strcasecmp(device->name, dkey.name) || -- _cups_strcasecmp(device->domain, dkey.domain)) -+ if (_cups_strcasecmp(device->name, dkey->name) || -+ _cups_strcasecmp(device->domain, dkey->domain)) - { - device = NULL; - break; - } -- else if (device->type == dkey.type) -+ else if (device->type == dkey->type) - { - /* - * Found it, pull out the priority and make and model from the TXT - * record and save it... - */ - -- const uint8_t *data, /* Pointer into data */ -- *datanext, /* Next key/value pair */ -- *dataend; /* End of entire TXT record */ -- uint8_t datalen; /* Length of current key/value pair */ -- char key[256], /* Key string */ -- value[256], /* Value string */ -- make_and_model[512], -+ char make_and_model[512], - /* Manufacturer and model */ - model[256], /* Model */ -- device_id[2048];/* 1284 device ID */ -- -+ device_id[2048]; /* 1284 device ID */ - - device_id[0] = '\0'; - make_and_model[0] = '\0'; - - strcpy(model, "Unknown"); - -- for (data = rdata, dataend = data + rdlen; -- data < dataend; -- data = datanext) -+ for (;;) - { -- /* -- * Read a key/value pair starting with an 8-bit length. Since the -- * length is 8 bits and the size of the key/value buffers is 256, we -- * don't need to check for overflow... -- */ -- -- datalen = *data++; -- -- if (!datalen || (data + datalen) >= dataend) -- break; -- -- datanext = data + datalen; -- -- for (ptr = key; data < datanext && *data != '='; data ++) -- *ptr++ = *data; -- *ptr = '\0'; -+ char *key; -+ char *value; - -- if (data < datanext && *data == '=') -- { -- data ++; -- -- if (data < datanext) -- memcpy(value, data, datanext - data); -- value[datanext - data] = '\0'; -+ if (parse_txt_record_pair (txt)) -+ goto next; - -- fprintf(stderr, "DEBUG2: query_callback: \"%s=%s\".\n", -- key, value); -- } -- else -- { -- fprintf(stderr, "DEBUG2: query_callback: \"%s\" with no value.\n", -- key); -- continue; -- } -- -- if (!_cups_strncasecmp(key, "usb_", 4)) -+ key = txt->key; -+ value = txt->value; -+ if (!strncasecmp(key, "usb_", 4)) - { - /* - * Add USB device ID information... -@@ -856,6 +1263,10 @@ - if (device->type == CUPS_DEVICE_PRINTER) - device->sent = 1; - } -+ -+ next: -+ if (next_txt_record (txt) == NULL) -+ break; - } - - if (device->device_id) -@@ -905,11 +1316,9 @@ - } - } - -- if (!device) -- fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); -+ return device; - } - -- - /* - * 'sigterm_handler()' - Handle termination signals... - */ ---- a/config-scripts/cups-dnssd.m4 -+++ b/config-scripts/cups-dnssd.m4 -@@ -23,6 +23,21 @@ - DNSSDLIBS="" - DNSSD_BACKEND="" - -+AC_ARG_ENABLE(avahi, [ --enable-avahi turn on DNS Service Discovery support, default=no], -+ [if test x$enable_avahi = xyes; then -+ AC_MSG_CHECKING(for Avahi) -+ if $PKGCONFIG --exists avahi-client; then -+ AC_MSG_RESULT(yes) -+ CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`" -+ DNSSDLIBS="`$PKGCONFIG --libs avahi-client`" -+ DNSSD_BACKEND="dnssd" -+ AC_DEFINE(HAVE_AVAHI) -+ enable_dnssd=no -+ else -+ AC_MSG_RESULT(no) -+ fi -+ fi]) -+ - if test x$enable_dnssd != xno; then - AC_CHECK_HEADER(dns_sd.h, [ - case "$uname" in ---- a/config.h.in -+++ b/config.h.in -@@ -390,6 +390,13 @@ - - - /* -+ * Do we have Avahi for DNS Service Discovery? -+ */ -+ -+#undef HAVE_AVAHI -+ -+ -+/* - * Do we have <sys/ioctl.h>? - */ - ---- a/cups/http-support.c -+++ b/cups/http-support.c -@@ -43,6 +43,10 @@ - * http_copy_decode() - Copy and decode a URI. - * http_copy_encode() - Copy and encode a URI. - * http_resolve_cb() - Build a device URI for the given service name. -+ * avahi_resolve_uri_client_cb() -+ * - Avahi client callback for resolving URI. -+ * avahi_resolve_uri_resolver_cb() -+ * - Avahi resolver callback for resolving URI. - */ - - /* -@@ -60,6 +64,11 @@ - # include <sys/select.h> - # endif /* WIN32 */ - #endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+# include <avahi-client/client.h> -+# include <avahi-client/lookup.h> -+# include <avahi-common/simple-watch.h> -+#endif /* HAVE_AVAHI */ - - - /* -@@ -127,6 +136,24 @@ - void *context); - #endif /* HAVE_DNSSD */ - -+#ifdef HAVE_AVAHI -+static void avahi_resolve_uri_client_cb(AvahiClient *client, -+ AvahiClientState state, -+ void *simple_poll); -+static void avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context); -+#endif /* HAVE_AVAHI */ - - /* - * 'httpAssembleURI()' - Assemble a uniform resource identifier from its -@@ -1431,6 +1458,9 @@ - - if (strstr(hostname, "._tcp")) - { -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+ char *regtype, /* Pointer to type in hostname */ -+ *domain; /* Pointer to domain in hostname */ - #ifdef HAVE_DNSSD - # ifdef WIN32 - # pragma comment(lib, "dnssd.lib") -@@ -1449,6 +1479,17 @@ - fd_set input_set; /* Input set for select() */ - struct timeval stimeout; /* Timeout value for select() */ - #endif /* HAVE_POLL */ -+#else /* HAVE_AVAHI */ -+ AvahiSimplePoll *simple_poll; -+ AvahiClient *client; -+ int error; -+ struct -+ { -+ AvahiSimplePoll *poll; -+ _http_uribuf_t uribuf; -+ } user_data; -+#endif /* HAVE_DNSSD */ -+ - - if (options & _HTTP_RESOLVE_STDERR) - fprintf(stderr, "DEBUG: Resolving \"%s\"...\n", hostname); -@@ -1485,9 +1526,16 @@ - if (domain) - *domain++ = '\0'; - -+#ifdef HAVE_DNSSD - uribuf.buffer = resolved_uri; - uribuf.bufsize = resolved_size; - uribuf.options = options; -+#else -+ user_data.uribuf.buffer = resolved_uri; -+ user_data.uribuf.bufsize = resolved_size; -+ user_data.uribuf.options = options; -+#endif -+ - resolved_uri[0] = '\0'; - - DEBUG_printf(("6_httpResolveURI: Resolving hostname=\"%s\", regtype=\"%s\", " -@@ -1501,6 +1549,7 @@ - - uri = NULL; - -+#ifdef HAVE_DNSSD - if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError) - { - localref = ref; -@@ -1608,6 +1657,36 @@ - - DNSServiceRefDeallocate(ref); - } -+#else /* HAVE_AVAHI */ -+ if ((simple_poll = avahi_simple_poll_new ()) != NULL) -+ { -+ if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll), -+ 0, avahi_resolve_uri_client_cb, -+ &simple_poll, &error)) != NULL) -+ { -+ user_data.poll = simple_poll; -+ if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, hostname, -+ regtype, domain, AVAHI_PROTO_UNSPEC, 0, -+ avahi_resolve_uri_resolver_cb, -+ &user_data) != NULL) -+ { -+ avahi_simple_poll_loop (simple_poll); -+ -+ /* -+ * Collect the result. -+ */ -+ -+ if (resolved_uri[0]) -+ uri = resolved_uri; -+ } -+ -+ avahi_client_free (client); -+ } -+ -+ avahi_simple_poll_free (simple_poll); -+ } -+#endif /* HAVE_DNSSD */ - - if (options & _HTTP_RESOLVE_STDERR) - { -@@ -1619,13 +1698,13 @@ - fputs("STATE: -connecting-to-device,offline-report\n", stderr); - } - --#else -+#else /* HAVE_DNSSD || HAVE_AVAHI */ - /* - * No DNS-SD support... - */ - - uri = NULL; --#endif /* HAVE_DNSSD */ -+#endif /* HAVE_DNSSD || HAVE_AVAHI */ - - if ((options & _HTTP_RESOLVE_STDERR) && !uri) - _cupsLangPrintFilter(stderr, "ERROR", _("Unable to find printer.")); -@@ -1895,6 +1974,116 @@ - #endif /* HAVE_DNSSD */ - - -+#ifdef HAVE_AVAHI -+/* -+ * 'avahi_resolve_uri_client_cb()' - Avahi client callback for resolving URI. -+ */ -+ -+static void -+avahi_resolve_uri_client_cb (AvahiClient *client, -+ AvahiClientState state, -+ void *simple_poll) -+{ -+ DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, " -+ "simple_poll=%p)\n", client, state, simple_poll)); -+ -+ /* -+ * If the connection drops, quit. -+ */ -+ -+ if (state == AVAHI_CLIENT_FAILURE) -+ avahi_simple_poll_quit (simple_poll); -+} -+ -+ -+/* -+ * 'avahi_resolve_uri_resolver_cb()' - Avahi resolver callback for resolving -+ * URI. -+ */ -+ -+static void -+avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ const char *scheme; /* URI scheme */ -+ char rp[256]; /* Remote printer */ -+ AvahiStringList *pair; -+ char *value; -+ size_t valueLen = 0; -+ char addr[AVAHI_ADDRESS_STR_MAX]; -+ struct -+ { -+ AvahiSimplePoll *poll; -+ _http_uribuf_t uribuf; -+ } *poll_uribuf = context; -+ -+ DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, " -+ "interface=%d, protocol=%d, event=%d, name=\"%s\", " -+ "type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, " -+ "port=%d, txt=%p, flags=%d, context=%p)\n", -+ resolver, interface, protocol, event, name, type, domain, -+ host_name, address, port, txt, flags, context)); -+ -+ if (event != AVAHI_RESOLVER_FOUND) -+ { -+ avahi_service_resolver_free (resolver); -+ avahi_simple_poll_quit (poll_uribuf->poll); -+ return; -+ } -+ -+ /* -+ * Figure out the scheme from the full name... -+ */ -+ -+ if (strstr(type, "_ipp.")) -+ scheme = "ipp"; -+ else if (strstr(type, "_printer.")) -+ scheme = "lpd"; -+ else if (strstr(type, "_pdl-datastream.")) -+ scheme = "socket"; -+ else -+ scheme = "riousbprint"; -+ -+ /* -+ * Extract the "remote printer key from the TXT record... -+ */ -+ -+ if ((pair = avahi_string_list_find (txt, "rp")) != NULL) -+ { -+ avahi_string_list_get_pair (pair, NULL, &value, &valueLen); -+ rp[0] = '/'; -+ memcpy (rp + 1, value, valueLen); -+ rp[valueLen + 1] = '\0'; -+ } -+ else -+ rp[0] = '\0'; -+ -+ /* -+ * Assemble the final device URI... -+ */ -+ -+ avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address); -+ httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer, -+ poll_uribuf->uribuf.bufsize, scheme, NULL, -+ addr, port, rp); -+ DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n", -+ poll_uribuf->uribuf.buffer)); -+ avahi_simple_poll_quit (poll_uribuf->poll); -+} -+#endif /* HAVE_AVAHI */ -+ -+ - /* - * End of "$Id: http-support.c 9820 2011-06-10 22:06:26Z mike $". - */ ---- a/scheduler/Makefile -+++ b/scheduler/Makefile -@@ -17,6 +17,7 @@ - - CUPSDOBJS = \ - auth.o \ -+ avahi.o \ - banners.o \ - cert.o \ - classes.o \ -@@ -39,7 +40,8 @@ - server.o \ - statbuf.o \ - subscriptions.o \ -- sysman.o -+ sysman.o \ -+ timeout.o - LIBOBJS = \ - filter.o \ - mime.o \ ---- /dev/null -+++ b/scheduler/avahi.c -@@ -0,0 +1,445 @@ -+/* -+ * "$Id$" -+ * -+ * Avahi poll implementation for the CUPS scheduler. -+ * -+ * Copyright (C) 2010 Red Hat, Inc. -+ * Authors: -+ * Tim Waugh <twaugh@redhat.com> -+ * -+ * Distribution and use rights are outlined in the file "LICENSE.txt" -+ * "LICENSE" which should have been included with this file. If this -+ * file is missing or damaged, see the license at "http://www.cups.org/". -+ * -+ * Contents: -+ * -+ * watch_read_cb - Read callback for file descriptor -+ * watch_write_cb - Write callback for file descriptor -+ * watched_fd_add_select() - Call cupsdAddSelect() as needed -+ * watch_new() - Create a new file descriptor watch -+ * watch_free() - Free a file descriptor watch -+ * watch_update() - Update watched events for a file descriptor -+ * watch_get_events() - Get events that happened for a file descriptor -+ * timeout_cb() - Run a timed Avahi callback -+ * timeout_new() - Set a wakeup time -+ * timeout_update() - Update the expiration time for a timeout -+ * timeout_free() - Free a timeout -+ * compare_watched_fds() - Compare watched file descriptors for array sorting -+ * compare_timeouts() - Compare timeouts for array sorting -+ * avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS -+ * avahi_cups_poll_free() - Free an Avahi main loop object for CUPS -+ * avahi_cups_poll_get() - Get the abstract poll API structure -+ */ -+ -+#include <config.h> -+ -+#ifdef HAVE_AVAHI /* Applies to entire file... */ -+ -+/* -+ * Include necessary headers... -+ */ -+ -+#include "cupsd.h" -+ -+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) -+# include <malloc.h> -+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ -+ -+#ifdef HAVE_AVAHI -+# include <avahi-common/timeval.h> -+#endif /* HAVE_AVAHI */ -+ -+ -+typedef struct -+{ -+ AvahiCupsPoll *cups_poll; -+ -+ int fd; -+ AvahiWatchEvent occurred; -+ cups_array_t *watches; -+} cupsd_watched_fd_t; -+ -+struct AvahiWatch -+{ -+ cupsd_watched_fd_t *watched_fd; -+ -+ AvahiWatchEvent events; -+ AvahiWatchCallback callback; -+ void *userdata; -+}; -+ -+struct AvahiTimeout -+{ -+ AvahiCupsPoll *cups_poll; -+ AvahiTimeoutCallback callback; -+ void *userdata; -+ cupsd_timeout_t *cupsd_timeout; -+}; -+ -+/* -+ * Local functions... -+ */ -+ -+static AvahiWatch * watch_new(const AvahiPoll *api, -+ int fd, -+ AvahiWatchEvent events, -+ AvahiWatchCallback callback, -+ void *userdata); -+static void watch_free(AvahiWatch *watch); -+static void watch_update(AvahiWatch *watch, -+ AvahiWatchEvent events); -+static AvahiWatchEvent watch_get_events(AvahiWatch *watch); -+static int compare_watches(AvahiWatch *p0, -+ AvahiWatch *p1); -+ -+ -+/* -+ * 'watch_read_cb' - Read callback for file descriptor -+ */ -+ -+static void -+watch_read_cb (void *userdata) -+{ -+ AvahiWatch *watch; -+ cupsd_watched_fd_t *watched_fd = userdata; -+ watched_fd->occurred |= AVAHI_WATCH_IN; -+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); -+ watch; -+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) { -+ if (watch->events & watched_fd->occurred) { -+ (watch->callback) (watch, watched_fd->fd, -+ AVAHI_WATCH_IN, watch->userdata); -+ watched_fd->occurred &= ~AVAHI_WATCH_IN; -+ break; -+ } -+ } -+} -+ -+ -+/* -+ * 'watch_write_cb' - Write callback for file descriptor -+ */ -+ -+static void -+watch_write_cb (void *userdata) -+{ -+ AvahiWatch *watch; -+ cupsd_watched_fd_t *watched_fd = userdata; -+ watched_fd->occurred |= AVAHI_WATCH_OUT; -+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); -+ watch; -+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) { -+ if (watch->events & watched_fd->occurred) { -+ (watch->callback) (watch, watched_fd->fd, -+ AVAHI_WATCH_OUT, watch->userdata); -+ watched_fd->occurred &= ~AVAHI_WATCH_OUT; -+ break; -+ } -+ } -+} -+ -+ -+/* -+ * 'watched_fd_add_select' - Call cupsdAddSelect() as needed -+ */ -+ -+static int /* O - Watches? */ -+watched_fd_add_select (cupsd_watched_fd_t *watched_fd) -+{ -+ AvahiWatch *watch; -+ cupsd_selfunc_t read_cb = NULL, write_cb = NULL; -+ -+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); -+ watch; -+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) { -+ if (watch->events & (AVAHI_WATCH_IN | -+ AVAHI_WATCH_ERR | -+ AVAHI_WATCH_HUP)) { -+ read_cb = (cupsd_selfunc_t)watch_read_cb; -+ if (write_cb != NULL) -+ break; -+ } -+ -+ if (watch->events & AVAHI_WATCH_OUT) { -+ write_cb = (cupsd_selfunc_t)watch_write_cb; -+ if (read_cb != NULL) -+ break; -+ } -+ } -+ -+ if (read_cb || write_cb) -+ cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd); -+ else -+ cupsdRemoveSelect (watched_fd->fd); -+ -+ return (read_cb || write_cb); -+} -+ -+/* -+ * 'watch_new' - Create a new file descriptor watch -+ */ -+ -+static AvahiWatch * -+watch_new (const AvahiPoll *api, -+ int fd, -+ AvahiWatchEvent events, -+ AvahiWatchCallback callback, -+ void *userdata) -+{ -+ cupsd_watched_fd_t key, *watched_fd; -+ AvahiCupsPoll *cups_poll = api->userdata; -+ AvahiWatch *watch = malloc(sizeof(AvahiWatch)); -+ if (watch == NULL) -+ return (NULL); -+ -+ watch->events = events; -+ watch->callback = callback; -+ watch->userdata = userdata; -+ -+ key.fd = fd; -+ watched_fd = cupsArrayFind (cups_poll->watched_fds, &key); -+ if (watched_fd == NULL) { -+ watched_fd = malloc(sizeof(cupsd_watched_fd_t)); -+ if (watched_fd == NULL) { -+ free (watch); -+ return (NULL); -+ } -+ -+ watched_fd->fd = fd; -+ watched_fd->occurred = 0; -+ watched_fd->cups_poll = cups_poll; -+ watched_fd->watches = cupsArrayNew ((cups_array_func_t)compare_watches, -+ NULL); -+ } -+ -+ watch->watched_fd = watched_fd; -+ cupsArrayAdd(watched_fd->watches, watch); -+ watched_fd_add_select (watched_fd); -+ return (watch); -+} -+ -+ -+/* -+ * 'watch_free' - Free a file descriptor watch -+ */ -+ -+static void -+watch_free (AvahiWatch *watch) -+{ -+ cupsd_watched_fd_t *watched_fd = watch->watched_fd; -+ AvahiCupsPoll *cups_poll = watched_fd->cups_poll; -+ -+ cupsArrayRemove (watched_fd->watches, watch); -+ free (watch); -+ -+ if (!watched_fd_add_select (watched_fd)) { -+ /* No more watches */ -+ cupsArrayRemove (cups_poll->watched_fds, watched_fd); -+ free (watched_fd); -+ } -+} -+ -+ -+/* -+ * 'watch_update' - Update watched events for a file descriptor -+ */ -+ -+static void -+watch_update (AvahiWatch *watch, -+ AvahiWatchEvent events) -+{ -+ watch->events = events; -+ watched_fd_add_select (watch->watched_fd); -+} -+ -+ -+/* -+ * 'watch_get_events' - Get events that happened for a file descriptor -+ */ -+ -+static AvahiWatchEvent -+watch_get_events (AvahiWatch *watch) -+{ -+ return (watch->watched_fd->occurred); -+} -+ -+ -+/* -+ * 'compare_watches' - Compare watches for array sorting -+ */ -+ -+static int -+compare_watches (AvahiWatch *p0, -+ AvahiWatch *p1) -+{ -+ if (p0->watched_fd->fd < p1->watched_fd->fd) -+ return (-1); -+ -+ return ((p0->watched_fd->fd == p1->watched_fd->fd) ? 0 : 1); -+} -+ -+ -+/* -+ * 'timeout_cb()' - Run a timed Avahi callback -+ */ -+ -+static void -+timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata) -+{ -+ AvahiTimeout *timeout = userdata; -+ (timeout->callback) (timeout, timeout->userdata); -+} -+ -+ -+/* -+ * 'timeout_new' - Set a wakeup time -+ */ -+ -+static AvahiTimeout * -+timeout_new (const AvahiPoll *api, -+ const struct timeval *tv, -+ AvahiTimeoutCallback callback, -+ void *userdata) -+{ -+ AvahiTimeout *timeout; -+ AvahiCupsPoll *cups_poll = api->userdata; -+ -+ timeout = malloc(sizeof(AvahiTimeout)); -+ if (timeout == NULL) -+ return (NULL); -+ -+ timeout->cups_poll = cups_poll; -+ timeout->callback = callback; -+ timeout->userdata = userdata; -+ timeout->cupsd_timeout = cupsdAddTimeout (tv, -+ (cupsd_timeoutfunc_t)timeout_cb, -+ timeout); -+ cupsArrayAdd (cups_poll->timeouts, timeout); -+ return (timeout); -+} -+ -+ -+/* -+ * 'timeout_update' - Update the expiration time for a timeout -+ */ -+ -+static void -+timeout_update (AvahiTimeout *timeout, -+ const struct timeval *tv) -+{ -+ cupsdUpdateTimeout (timeout->cupsd_timeout, tv); -+} -+ -+ -+/* -+ * ' timeout_free' - Free a timeout -+ */ -+ -+static void -+timeout_free (AvahiTimeout *timeout) -+{ -+ cupsArrayRemove (timeout->cups_poll->timeouts, timeout); -+ cupsdRemoveTimeout (timeout->cupsd_timeout); -+ free (timeout); -+} -+ -+ -+/* -+ * 'compare_watched_fds' - Compare watched file descriptors for array sorting -+ */ -+static int -+compare_watched_fds(cupsd_watched_fd_t *p0, -+ cupsd_watched_fd_t *p1) -+{ -+ if (p0->fd != p1->fd) -+ return (p0->fd < p1->fd ? -1 : 1); -+ -+ if (p0 == p1) -+ return (0); -+ -+ return (p0 < p1 ? -1 : 1); -+} -+ -+ -+/* -+ * 'compare_timeouts' - Compare timeouts for array sorting -+ */ -+static int -+compare_timeouts(AvahiTimeout *p0, -+ AvahiTimeout *p1) -+{ -+ /* -+ * Just compare pointers to make it a stable sort. -+ */ -+ -+ if (p0->cupsd_timeout < p1->cupsd_timeout) -+ return (-1); -+ return ((p0->cupsd_timeout == p1->cupsd_timeout) ? 0 : 1); -+} -+ -+ -+/* -+ * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS -+ */ -+ -+AvahiCupsPoll * -+avahi_cups_poll_new (void) -+{ -+ AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll)); -+ if (cups_poll == NULL) -+ return (NULL); -+ -+ cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds, -+ NULL); -+ cups_poll->timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, -+ NULL); -+ -+ cups_poll->api.userdata = cups_poll; -+ cups_poll->api.watch_new = watch_new; -+ cups_poll->api.watch_free = watch_free; -+ cups_poll->api.watch_update = watch_update; -+ cups_poll->api.watch_get_events = watch_get_events; -+ -+ cups_poll->api.timeout_new = timeout_new; -+ cups_poll->api.timeout_update = timeout_update; -+ cups_poll->api.timeout_free = timeout_free; -+ -+ return (cups_poll); -+} -+ -+ -+/* -+ * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS -+ */ -+void -+avahi_cups_poll_free (AvahiCupsPoll *cups_poll) -+{ -+ cupsd_watched_fd_t *watched_fd; -+ -+ for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds); -+ watched_fd; -+ watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds)){ -+ cupsArrayClear (watched_fd->watches); -+ } -+ -+ cupsArrayClear (cups_poll->watched_fds); -+ cupsArrayClear (cups_poll->timeouts); -+} -+ -+ -+/* -+ * 'avahi_cups_poll_get' - Get the abstract poll API structure -+ */ -+ -+const AvahiPoll * -+avahi_cups_poll_get (AvahiCupsPoll *cups_poll) -+{ -+ return (&cups_poll->api); -+} -+ -+ -+#endif /* HAVE_AVAHI ... from top of file */ -+ -+/* -+ * End of "$Id$". -+ */ ---- /dev/null -+++ b/scheduler/avahi.h -@@ -0,0 +1,49 @@ -+/* -+ * "$Id$" -+ * -+ * Avahi poll implementation for the CUPS scheduler. -+ * -+ * Copyright (C) 2010 Red Hat, Inc. -+ * Authors: -+ * Tim Waugh <twaugh@redhat.com> -+ * -+ * Distribution and use rights are outlined in the file "LICENSE.txt" -+ * which should have been included with this file. If this file is -+ * file is missing or damaged, see the license at "http://www.cups.org/". -+ */ -+ -+#include <config.h> -+ -+#ifdef HAVE_AVAHI -+# include <avahi-client/client.h> -+# include <avahi-client/publish.h> -+#endif /* HAVE_AVAHI */ -+ -+#ifdef HAVE_AUTHORIZATION_H -+# include <Security/Authorization.h> -+#endif /* HAVE_AUTHORIZATION_H */ -+ -+ -+#ifdef HAVE_AVAHI -+typedef struct -+{ -+ AvahiPoll api; -+ cups_array_t *watched_fds; -+ cups_array_t *timeouts; -+} AvahiCupsPoll; -+#endif /* HAVE_AVAHI */ -+ -+/* -+ * Prototypes... -+ */ -+ -+#ifdef HAVE_AVAHI -+extern AvahiCupsPoll * avahi_cups_poll_new(void); -+extern void avahi_cups_poll_free(AvahiCupsPoll *cups_poll); -+extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll); -+#endif /* HAVE_AVAHI */ -+ -+ -+/* -+ * End of "$Id$". -+ */ ---- a/scheduler/cupsd.h -+++ b/scheduler/cupsd.h -@@ -140,6 +140,15 @@ - - typedef void (*cupsd_selfunc_t)(void *data); - -+#ifdef HAVE_AVAHI -+/* -+ * Timeout callback function type... -+ */ -+ -+typedef struct _cupsd_timeout_s cupsd_timeout_t; -+typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data); -+#endif /* HAVE_AVAHI */ -+ - - /* - * Globals... -@@ -173,6 +182,11 @@ - /* Running from launchd */ - #endif /* HAVE_LAUNCH_H */ - -+#ifdef HAVE_AVAHI -+VAR cups_array_t *Timeouts; /* Timed callbacks for main loop */ -+#endif /* HAVE_AVAHI */ -+ -+ - - /* - * Prototypes... -@@ -242,6 +256,20 @@ - extern void cupsdStartServer(void); - extern void cupsdStopServer(void); - -+#ifdef HAVE_AVAHI -+extern void cupsdInitTimeouts(void); -+extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv, -+ cupsd_timeoutfunc_t cb, -+ void *data); -+extern cupsd_timeout_t *cupsdNextTimeout (long *delay); -+extern void cupsdRunTimeout (cupsd_timeout_t *timeout); -+extern void cupsdUpdateTimeout (cupsd_timeout_t *timeout, -+ const struct timeval *tv); -+extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout); -+#endif /* HAVE_AVAHI */ -+ -+extern int cupsdRemoveFile(const char *filename); -+ - - /* - * End of "$Id: cupsd.h 9766 2011-05-11 22:17:34Z mike $". ---- a/scheduler/main.c -+++ b/scheduler/main.c -@@ -122,6 +122,10 @@ - cupsd_listener_t *lis; /* Current listener */ - time_t current_time, /* Current time */ - activity, /* Client activity timer */ -+#ifdef HAVE_AVAHI -+ avahi_client_time, /* Time for next Avahi client -+ check */ -+#endif /* HAVE_AVAHI */ - browse_time, /* Next browse send time */ - senddoc_time, /* Send-Document time */ - expire_time, /* Subscription expire time */ -@@ -148,6 +152,10 @@ - int launchd_idle_exit; - /* Idle exit on select timeout? */ - #endif /* HAVE_LAUNCHD */ -+#ifdef HAVE_AVAHI -+ cupsd_timeout_t *tmo; /* Next scheduled timed callback */ -+ long tmo_delay; /* Time before it must be called */ -+#endif /* HAVE_AVAHI */ - - - #ifdef HAVE_GETEUID -@@ -527,6 +535,14 @@ - - httpInitialize(); - -+#ifdef HAVE_AVAHI -+ /* -+ * Initialize timed callback structures. -+ */ -+ -+ cupsdInitTimeouts(); -+#endif /* HAVE_AVAHI */ -+ - cupsdStartServer(); - - /* -@@ -657,6 +673,9 @@ - */ - - current_time = time(NULL); -+#ifdef HAVE_AVAHI -+ avahi_client_time = current_time; -+#endif /* HAVE_AVAHI */ - browse_time = current_time; - event_time = current_time; - expire_time = current_time; -@@ -871,6 +890,26 @@ - } - #endif /* __APPLE__ */ - -+#ifdef HAVE_AVAHI -+ /* -+ * If a timed callback is due, run it. -+ */ -+ -+ tmo = cupsdNextTimeout (&tmo_delay); -+ if (tmo && tmo_delay == 0) -+ cupsdRunTimeout (tmo); -+ -+ /* -+ * Try to restart the Avahi client every 10 seconds if needed... -+ */ -+ -+ if ((current_time - avahi_client_time) >= 10) -+ { -+ avahi_client_time = current_time; -+ cupsdStartAvahiClient(); -+ } -+#endif /* HAVE_AVAHI */ -+ - #ifndef __APPLE__ - /* - * Update the network interfaces once a minute... -@@ -1815,6 +1854,10 @@ - cupsd_job_t *job; /* Job information */ - cupsd_subscription_t *sub; /* Subscription information */ - const char *why; /* Debugging aid */ -+#ifdef HAVE_AVAHI -+ cupsd_timeout_t *tmo; /* Timed callback */ -+ long tmo_delay; /* Seconds before calling it */ -+#endif /* HAVE_AVAHI */ - - - /* -@@ -1857,6 +1900,19 @@ - } - #endif /* __APPLE__ */ - -+#ifdef HAVE_AVAHI -+ /* -+ * See if there are any scheduled timed callbacks to run. -+ */ -+ -+ tmo = cupsdNextTimeout (&tmo_delay); -+ if (tmo) -+ { -+ timeout = tmo_delay; -+ why = "run a timed callback"; -+ } -+#endif /* HAVE_AVAHI */ -+ - /* - * Check whether we are accepting new connections... - */ ---- /dev/null -+++ b/scheduler/timeout.c -@@ -0,0 +1,195 @@ -+/* -+ * "$Id$" -+ * -+ * Timeout functions for the Common UNIX Printing System (CUPS). -+ * -+ * Copyright (C) 2010 Red Hat, Inc. -+ * Authors: -+ * Tim Waugh <twaugh@redhat.com> -+ * -+ * Distribution and use rights are outlined in the file "LICENSE.txt" -+ * which should have been included with this file. If this file is -+ * file is missing or damaged, see the license at "http://www.cups.org/". -+ * -+ * Contents: -+ * -+ * cupsdInitTimeouts() - Initialise timeout structure. -+ * cupsdAddTimeout() - Add a timed callback. -+ * cupsdNextTimeout() - Find the next enabled timed callback. -+ * cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it. -+ * cupsdRemoveTimeout() - Discard a timed callback. -+ * compare_timeouts() - Compare timed callbacks for array sorting. -+ */ -+ -+#include <config.h> -+ -+#ifdef HAVE_AVAHI /* Applies to entire file... */ -+ -+/* -+ * Include necessary headers... -+ */ -+ -+#include "cupsd.h" -+ -+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) -+# include <malloc.h> -+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ -+ -+#ifdef HAVE_AVAHI -+# include <avahi-common/timeval.h> -+#endif /* HAVE_AVAHI */ -+ -+ -+struct _cupsd_timeout_s -+{ -+ struct timeval when; -+ int enabled; -+ cupsd_timeoutfunc_t callback; -+ void *data; -+}; -+ -+/* -+ * Local functions... -+ */ -+ -+/* -+ * 'compare_timeouts()' - Compare timed callbacks for array sorting. -+ */ -+ -+static int -+compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1) -+{ -+ if (!p0->enabled || !p1->enabled) -+ { -+ if (!p0->enabled && !p1->enabled) -+ return (0); -+ -+ return (p0->enabled ? -1 : 1); -+ } -+ -+ return (avahi_timeval_compare (&p0->when, &p1->when)); -+} -+ -+ -+/* -+ * 'cupsdInitTimeouts()' - Initialise timeout structures. -+ */ -+ -+void -+cupsdInitTimeouts(void) -+{ -+ Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL); -+} -+ -+ -+/* -+ * 'cupsdAddTimeout()' - Add a timed callback. -+ */ -+ -+cupsd_timeout_t * /* O - Timeout handle */ -+cupsdAddTimeout(const struct timeval *tv, /* I - Absolute time */ -+ cupsd_timeoutfunc_t cb, /* I - Callback function */ -+ void *data) /* I - User data */ -+{ -+ cupsd_timeout_t *timeout; -+ -+ timeout = malloc (sizeof(cupsd_timeout_t)); -+ if (timeout != NULL) -+ { -+ timeout->enabled = (tv != NULL); -+ if (tv) -+ { -+ timeout->when.tv_sec = tv->tv_sec; -+ timeout->when.tv_usec = tv->tv_usec; -+ } -+ -+ timeout->callback = cb; -+ timeout->data = data; -+ cupsArrayAdd (Timeouts, timeout); -+ } -+ -+ return timeout; -+} -+ -+ -+/* -+ * 'cupsdNextTimeout()' - Find the next enabled timed callback. -+ */ -+ -+cupsd_timeout_t * /* O - Next enabled timeout or NULL */ -+cupsdNextTimeout(long *delay) /* O - Seconds before scheduled */ -+{ -+ cupsd_timeout_t *first = cupsArrayFirst (Timeouts); -+ struct timeval curtime; -+ -+ if (first && !first->enabled) -+ first = NULL; -+ -+ if (first && delay) -+ { -+ gettimeofday (&curtime, NULL); -+ if (avahi_timeval_compare (&curtime, &first->when) > 0) -+ { -+ *delay = 0; -+ } else { -+ *delay = 1 + first->when.tv_sec - curtime.tv_sec; -+ if (first->when.tv_usec < curtime.tv_usec) -+ (*delay)--; -+ } -+ } -+ -+ return (first); -+} -+ -+ -+/* -+ * 'cupsdRunTimeout()' - Run a timed callback. -+ */ -+ -+void -+cupsdRunTimeout(cupsd_timeout_t *timeout) /* I - Timeout */ -+{ -+ if (!timeout) -+ return; -+ timeout->enabled = 0; -+ if (!timeout->callback) -+ return; -+ timeout->callback (timeout, timeout->data); -+} -+ -+/* -+ * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it. -+ */ -+ -+void -+cupsdUpdateTimeout(cupsd_timeout_t *timeout, /* I - Timeout */ -+ const struct timeval *tv) /* I - Absolute time or NULL */ -+{ -+ cupsArrayRemove (Timeouts, timeout); -+ timeout->enabled = (tv != NULL); -+ if (tv) -+ { -+ timeout->when.tv_sec = tv->tv_sec; -+ timeout->when.tv_usec = tv->tv_usec; -+ } -+ cupsArrayAdd (Timeouts, timeout); -+} -+ -+ -+/* -+ * 'cupsdRemoveTimeout()' - Discard a timed callback. -+ */ -+ -+void -+cupsdRemoveTimeout(cupsd_timeout_t *timeout) /* I - Timeout */ -+{ -+ cupsArrayRemove (Timeouts, timeout); -+ free (timeout); -+} -+ -+ -+#endif /* HAVE_AVAHI ... from top of file */ -+ -+/* -+ * End of "$Id$". -+ */ ---- a/cgi-bin/admin.c -+++ b/cgi-bin/admin.c -@@ -1643,7 +1643,7 @@ - else - local_protocols[0] = '\0'; - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - if (cgiGetVariable("BROWSE_LOCAL_DNSSD")) - { - if (local_protocols[0]) -@@ -1651,7 +1651,7 @@ - else - strcat(local_protocols, "dnssd"); - } --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - #ifdef HAVE_LDAP - if (cgiGetVariable("BROWSE_LOCAL_LDAP")) -@@ -2718,9 +2718,9 @@ - #endif /* HAVE_GSSAPI */ - cgiSetVariable("KERBEROS", ""); - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - cgiSetVariable("HAVE_DNSSD", "1"); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - #ifdef HAVE_LDAP - cgiSetVariable("HAVE_LDAP", "1"); ---- a/scheduler/client.c -+++ b/scheduler/client.c -@@ -4987,7 +4987,7 @@ - !strncmp(host, "[::1]:", 6)); - } - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - /* - * Check if the hostname is something.local (Bonjour); if so, allow it. - */ -@@ -4996,7 +4996,7 @@ - (!_cups_strcasecmp(end, ".local") || !_cups_strncasecmp(end, ".local:", 7) || - !_cups_strcasecmp(end, ".local.") || !_cups_strncasecmp(end, ".local.:", 8))) - return (1); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - /* - * Check if the hostname is an IP address... ---- a/scheduler/dirsvc.c -+++ b/scheduler/dirsvc.c -@@ -27,6 +27,7 @@ - * ldap_connect() - Start new LDAP connection - * ldap_reconnect() - Reconnect to LDAP Server - * ldap_disconnect() - Disconnect from LDAP Server -+ * cupsdStartAvahiClient() - Start an Avahi client if needed - * cupsdStartBrowsing() - Start sending and receiving broadcast - * information. - * cupsdStartPolling() - Start polling servers as needed. -@@ -45,6 +46,8 @@ - * printer. - * dnssdPackTxtRecord() - Pack an array of key/value pairs into the TXT - * record format. -+ * avahiPackTxtRecord() - Pack an array of key/value pairs into an -+ * AvahiStringList. - * dnssdRegisterCallback() - DNSServiceRegister callback. - * dnssdRegisterPrinter() - Start sending broadcast information for a - * printer or update the broadcast contents. -@@ -83,6 +86,7 @@ - */ - - #include "cupsd.h" -+#include <assert.h> - #include <grp.h> - - #ifdef HAVE_DNSSD -@@ -97,6 +101,17 @@ - # endif /* HAVE_SYSTEMCONFIGURATION */ - # endif /* __APPLE__ */ - #endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+# include <avahi-common/domain.h> -+#endif /* HAVE_AVAHI */ -+ -+ -+#ifdef HAVE_DNSSD -+typedef char *cupsd_txt_record_t; -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+typedef AvahiStringList *cupsd_txt_record_t; -+#endif /* HAVE_AVAHI */ - - - /* -@@ -159,27 +174,39 @@ - static void update_smb(int onoff); - - -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+static cupsd_txt_record_t dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p, -+ int for_lpd); -+static int dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b); -+static void dnssdDeregisterPrinter(cupsd_printer_t *p); -+static void dnssdRegisterPrinter(cupsd_printer_t *p); -+static void dnssdStop(void); -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ -+ - #ifdef HAVE_DNSSD - # ifdef HAVE_COREFOUNDATION - static void dnssdAddAlias(const void *key, const void *value, - void *context); - # endif /* HAVE_COREFOUNDATION */ --static char *dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p, -- int for_lpd); --static int dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b); --static void dnssdDeregisterPrinter(cupsd_printer_t *p); --static char *dnssdPackTxtRecord(int *txt_len, char *keyvalue[][2], -- int count); - static void dnssdRegisterCallback(DNSServiceRef sdRef, - DNSServiceFlags flags, - DNSServiceErrorType errorCode, - const char *name, const char *regtype, - const char *domain, void *context); --static void dnssdRegisterPrinter(cupsd_printer_t *p); --static void dnssdStop(void); - static void dnssdUpdate(void); - #endif /* HAVE_DNSSD */ - -+#ifdef HAVE_AVAHI -+static AvahiStringList *avahiPackTxtRecord(char *keyvalue[][2], -+ int count); -+static void avahi_entry_group_cb (AvahiEntryGroup *group, -+ AvahiEntryGroupState state, -+ void *userdata); -+static void avahi_client_cb (AvahiClient *client, -+ AvahiClientState state, -+ void *userdata); -+#endif /* HAVE_AVAHI */ -+ - #ifdef HAVE_LDAP - static const char * const ldap_attrs[] =/* CUPS LDAP attributes */ - { -@@ -283,10 +310,10 @@ - ldap_dereg_printer(p); - #endif /* HAVE_LDAP */ - --#ifdef HAVE_DNSSD -- if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef) -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+ if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD)) - dnssdDeregisterPrinter(p); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - } - - -@@ -702,10 +729,10 @@ - slpRegisterPrinter(p); */ - #endif /* HAVE_LIBSLP */ - --#ifdef HAVE_DNSSD -- if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef) -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+ if ((BrowseLocalProtocols & BROWSE_DNSSD)) - dnssdRegisterPrinter(p); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - } - - -@@ -1419,6 +1446,27 @@ - #endif /* HAVE_LDAP */ - - -+#ifdef HAVE_AVAHI -+/* -+ * 'cupsdStartAvahiClient()' - Start an Avahi client if needed -+ */ -+ -+void -+cupsdStartAvahiClient(void) -+{ -+ if (!AvahiCupsClient && !AvahiCupsClientConnecting) -+ { -+ if (!AvahiCupsPollHandle) -+ AvahiCupsPollHandle = avahi_cups_poll_new (); -+ -+ if (AvahiCupsPollHandle) -+ avahi_client_new (avahi_cups_poll_get (AvahiCupsPollHandle), -+ AVAHI_CLIENT_NO_FAIL, avahi_client_cb, NULL, NULL); -+ } -+} -+#endif /* HAVE_AVAHI */ -+ -+ - /* - * 'cupsdStartBrowsing()' - Start sending and receiving broadcast information. - */ -@@ -1542,13 +1590,16 @@ - else - BrowseSocket = -1; - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_DNSSD) - { -+#ifdef HAVE_DNSSD - DNSServiceErrorType error; /* Error from service creation */ -+#endif /* HAVE_DNSSD */ - cupsd_listener_t *lis; /* Current listening socket */ - - -+#ifdef HAVE_DNSSD - /* - * First create a "master" connection for all registrations... - */ -@@ -1573,6 +1624,7 @@ - fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); - - cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL); -+#endif /* HAVE_DNSSD */ - - /* - * Then get the port we use for registrations. If we are not listening -@@ -1606,9 +1658,16 @@ - */ - - cupsdUpdateDNSSDName(); -+ -+#ifdef HAVE_AVAHI -+ cupsdStartAvahiClient (); -+#endif /* HAVE_AVAHI */ -+ -+#ifdef HAVE_DNSSD - } -- } - #endif /* HAVE_DNSSD */ -+ } -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - #ifdef HAVE_LIBSLP - if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) -@@ -1834,10 +1893,10 @@ - BrowseSocket = -1; - } - --#ifdef HAVE_DNSSD -- if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef) -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+ if ((BrowseLocalProtocols & BROWSE_DNSSD)) - dnssdStop(); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - #ifdef HAVE_LIBSLP - if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) && -@@ -1902,7 +1961,7 @@ - } - - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - /* - * 'cupsdUpdateDNSSDName()' - Update the computer name we use for browsing... - */ -@@ -1910,8 +1969,14 @@ - void - cupsdUpdateDNSSDName(void) - { -+#ifdef HAVE_DNSSD - DNSServiceErrorType error; /* Error from service creation */ - char webif[1024]; /* Web interface share name */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ int ret; /* Error from service creation */ -+ char webif[AVAHI_LABEL_MAX]; /* Web interface share name */ -+#endif /* HAVE_AVAHI */ - # ifdef HAVE_SYSTEMCONFIGURATION - SCDynamicStoreRef sc; /* Context for dynamic store */ - CFDictionaryRef btmm; /* Back-to-My-Mac domains */ -@@ -2042,6 +2107,7 @@ - else - strlcpy(webif, "CUPS Web Interface", sizeof(webif)); - -+#ifdef HAVE_DNSSD - if (WebIFRef) - DNSServiceRefDeallocate(WebIFRef); - -@@ -2054,9 +2120,45 @@ - NULL)) != kDNSServiceErr_NoError) - cupsdLogMessage(CUPSD_LOG_ERROR, - "DNS-SD web interface registration failed: %d", error); -+#endif /* HAVE_DNSSD */ -+ -+#ifdef HAVE_AVAHI -+ if (!AvahiCupsClient) -+ /* -+ * Client not yet running. -+ */ -+ return; -+ -+ if (AvahiWebIFGroup) -+ avahi_entry_group_reset (AvahiWebIFGroup); -+ else -+ AvahiWebIFGroup = avahi_entry_group_new (AvahiCupsClient, -+ avahi_entry_group_cb, -+ NULL); -+ -+ if (AvahiWebIFGroup) -+ { -+ ret = avahi_entry_group_add_service (AvahiWebIFGroup, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, /* flags */ -+ webif, /* name */ -+ "_http._tcp", /* type */ -+ NULL, /* domain */ -+ NULL, /* host */ -+ DNSSDPort, /* port */ -+ "path=/", NULL); -+ if (ret == 0) -+ ret = avahi_entry_group_commit (AvahiWebIFGroup); -+ -+ if (ret != 0) -+ cupsdLogMessage (CUPSD_LOG_ERROR, -+ "Avahi web interface registration failed: %d", ret); -+ } -+#endif /* HAVE_AVAHI */ - } - } --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - - #ifdef HAVE_LDAP -@@ -2334,13 +2436,15 @@ - "Bad Back to My Mac domain in dynamic store!"); - } - # endif /* HAVE_COREFOUNDATION */ -+#endif /* HAVE_DNSSD */ - - -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - /* - * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info. - */ - --static char * /* O - TXT record */ -+static cupsd_txt_record_t /* O - TXT record */ - dnssdBuildTxtRecord( - int *txt_len, /* O - TXT record length */ - cupsd_printer_t *p, /* I - Printer information */ -@@ -2379,7 +2483,12 @@ - keyvalue[i ][0] = "ty"; - keyvalue[i++][1] = p->make_model ? p->make_model : "Unknown"; - -- snprintf(admin_hostname, sizeof(admin_hostname), "%s.local.", DNSSDHostName); -+ snprintf(admin_hostname, sizeof(admin_hostname), -+ "%s.local" -+#ifdef HAVE_DNSSD -+ "." /* terminating dot no good for Avahi */ -+#endif /* HAVE_DNSSD */ -+ , DNSSDHostName); - httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl_str, sizeof(adminurl_str), - "http", NULL, admin_hostname, DNSSDPort, "/%s/%s", - (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers", -@@ -2462,7 +2571,12 @@ - * Then pack them into a proper txt record... - */ - -+#ifdef HAVE_DNSSD - return (dnssdPackTxtRecord(txt_len, keyvalue, i)); -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ return (avahiPackTxtRecord(keyvalue, i)); -+#endif /* HAVE_AVAHI */ - } - - -@@ -2474,7 +2588,16 @@ - dnssdComparePrinters(cupsd_printer_t *a,/* I - First printer */ - cupsd_printer_t *b)/* I - Second printer */ - { -- return (_cups_strcasecmp(a->reg_name, b->reg_name)); -+ if (!a->reg_name) -+ if (!b->reg_name) -+ return 0; -+ else -+ return -1; -+ else -+ if (!b->reg_name) -+ return 1; -+ else -+ return (_cups_strcasecmp(a->reg_name, b->reg_name)); - } - - -@@ -2489,6 +2612,10 @@ - { - cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdDeregisterPrinter(%s)", p->name); - -+#ifdef HAVE_DNSSD -+ if (!DNSSDRef) -+ return; -+ - /* - * Closing the socket deregisters the service - */ -@@ -2524,6 +2651,24 @@ - free(p->printer_txt); - p->printer_txt = NULL; - } -+#endif /* HAVE_DNSSD */ -+ -+#ifdef HAVE_AVAHI -+ if (p->avahi_group) -+ { -+ avahi_entry_group_reset (p->avahi_group); -+ avahi_entry_group_free (p->avahi_group); -+ p->avahi_group = NULL; -+ -+ if (p->ipp_txt) -+ avahi_string_list_free (p->ipp_txt); -+ -+ if (p->printer_txt) -+ avahi_string_list_free (p->printer_txt); -+ -+ p->ipp_txt = p->printer_txt = NULL; -+ } -+#endif /* HAVE_AVAHI */ - - /* - * Remove the printer from the array of DNS-SD printers, then clear the -@@ -2533,8 +2678,10 @@ - cupsArrayRemove(DNSSDPrinters, p); - cupsdClearString(&p->reg_name); - } -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - -+#ifdef HAVE_DNSSD - /* - * 'dnssdPackTxtRecord()' - Pack an array of key/value pairs into the - * TXT record format. -@@ -2644,8 +2791,10 @@ - LastEvent |= CUPSD_EVENT_PRINTER_MODIFIED; - } - } -+#endif /* HAVE_DNSSD */ - - -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - /* - * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer - * or update the broadcast contents. -@@ -2654,20 +2803,40 @@ - static void - dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */ - { -+#ifdef HAVE_DNSSD - DNSServiceErrorType se; /* dnssd errors */ - char *ipp_txt, /* IPP TXT record buffer */ - *printer_txt, /* LPD TXT record buffer */ -- name[1024], /* Service name */ -- *nameptr; /* Pointer into name */ -+ name[1024]; /* Service name */ - int ipp_len, /* IPP TXT record length */ - printer_len, /* LPD TXT record length */ - printer_port; /* LPD port number */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ int ret; /* Error code */ -+ AvahiStringList *ipp_txt, /* IPP TXT record */ -+ *printer_txt; /* LPD TXT record */ -+ char name[AVAHI_LABEL_MAX], /* Service name */ -+ fullsubtype[AVAHI_LABEL_MAX]; /* Full subtype */ -+ char *regtype_copy, /* Writeable copy of reg type */ -+ *subtype, /* Current service sub type */ -+ *nextsubtype; /* Next service sub type */ -+#endif /* HAVE_AVAHI */ -+ char *nameptr; /* Pointer into name */ - const char *regtype; /* Registration type */ - - -+#ifdef HAVE_DNSSD -+ if (!DNSSDRef) -+ return; -+ - cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name, - !p->ipp_ref ? "new" : "update"); -- -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name, -+ !p->avahi_group ? "new" : "update"); -+#endif /* HAVE_AVAHI */ - /* - * If per-printer sharing was just disabled make sure we're not - * registered before returning. -@@ -2686,12 +2855,36 @@ - if (p->info && strlen(p->info) > 0) - { - if (DNSSDComputerName) -- snprintf(name, sizeof(name), "%s @ %s", p->info, DNSSDComputerName); -+ { -+ /* -+ * Make sure there is room for at least 15 characters of -+ * DNSSDComputerName. -+ */ -+ -+ assert(sizeof(name) >= 15 + 4); -+ nameptr = name + strlcpy(name, p->info, -+ sizeof(name) - 4 - -+ strnlen(DNSSDComputerName, 15)); -+ nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name)); -+ strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name)); -+ } - else - strlcpy(name, p->info, sizeof(name)); - } - else if (DNSSDComputerName) -- snprintf(name, sizeof(name), "%s @ %s", p->name, DNSSDComputerName); -+ { -+ /* -+ * Make sure there is room for at least 15 characters of -+ * DNSSDComputerName. -+ */ -+ -+ assert(sizeof(name) >= 15 + 4); -+ nameptr = name + strlcpy(name, p->info, -+ sizeof(name) - 4 - -+ strnlen(DNSSDComputerName, 15)); -+ nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name)); -+ strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name)); -+ } - else - strlcpy(name, p->name, sizeof(name)); - -@@ -2712,6 +2905,7 @@ - * Register IPP and (optionally) LPD... - */ - -+#ifdef HAVE_DNSSD - ipp_len = 0; /* anti-compiler-warning-code */ - ipp_txt = dnssdBuildTxtRecord(&ipp_len, p, 0); - -@@ -2884,6 +3078,209 @@ - - if (printer_txt) - free(printer_txt); -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ if (!AvahiCupsClient) -+ /* -+ * Client not running yet. The client callback will call us again later. -+ */ -+ return; -+ -+ ipp_txt = dnssdBuildTxtRecord(NULL, p, 0); -+ printer_txt = dnssdBuildTxtRecord(NULL, p, 1); -+ regtype = (p->type & CUPS_PRINTER_FAX) ? "_fax-ipp._tcp" : DNSSDRegType; -+ -+ if (p->avahi_group && p->ipp_txt && ipp_txt && -+ !avahi_string_list_equal (p->ipp_txt, ipp_txt)) -+ { -+ /* -+ * Update the existing registration... -+ */ -+ -+ avahi_string_list_free (p->ipp_txt); -+ -+ if (p->printer_txt) -+ avahi_string_list_free (p->printer_txt); -+ -+ /* -+ * Update the service group entry. -+ */ -+ -+ regtype_copy = strdup (regtype); -+ subtype = strchr (regtype_copy, ','); -+ if (subtype) -+ *subtype = '\0'; -+ -+ cupsdLogMessage (CUPSD_LOG_DEBUG, -+ "Updating TXT record for %s (%s)", name, regtype_copy); -+ ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, name, -+ regtype_copy, -+ NULL, ipp_txt); -+ free (regtype_copy); -+ -+ if (ret < 0) -+ goto update_failed; -+ -+ p->ipp_txt = ipp_txt; -+ ipp_txt = NULL; -+ -+ if (BrowseLocalProtocols & BROWSE_LPD) -+ { -+ ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, name, -+ "_printer._tcp", NULL, -+ printer_txt); -+ if (ret < 0) -+ goto update_failed; -+ -+ p->printer_txt = printer_txt; -+ printer_txt = NULL; -+ } -+ -+ ret = avahi_entry_group_commit (p->avahi_group); -+ if (ret < 0) -+ { -+ update_failed: -+ cupsdLogMessage (CUPSD_LOG_ERROR, -+ "Failed to update TXT record for %s: %d", -+ name, ret); -+ avahi_entry_group_reset (p->avahi_group); -+ avahi_entry_group_free (p->avahi_group); -+ p->avahi_group = NULL; -+ ipp_txt = p->ipp_txt; -+ p->ipp_txt = NULL; -+ } -+ } -+ -+ if (!p->avahi_group) -+ { -+ /* -+ * Initial registration. Use the _fax subtype for fax queues... -+ */ -+ -+ p->avahi_group = avahi_entry_group_new (AvahiCupsClient, -+ avahi_entry_group_cb, -+ p); -+ -+ cupsdLogMessage(CUPSD_LOG_DEBUG, -+ "Registering Avahi printer %s with name \"%s\" and " -+ "type \"%s\"", p->name, name, regtype); -+ -+ if (!p->avahi_group) -+ { -+ ret = 0; -+ goto add_failed; -+ } -+ -+ /* -+ * Add each service type (DNSSDRegType may contain several, -+ * separated by commas). -+ */ -+ -+ subtype = regtype_copy = strdup (regtype); -+ while (subtype && *subtype) -+ { -+ nextsubtype = strchr (subtype, ','); -+ if (nextsubtype) -+ *nextsubtype++ = '\0'; -+ -+ if (subtype == regtype_copy) -+ { -+ /* -+ * Main type entry. -+ */ -+ -+ cupsdLogMessage (CUPSD_LOG_DEBUG, -+ "Adding TXT record for %s (%s)", name, regtype_copy); -+ ret = avahi_entry_group_add_service_strlst (p->avahi_group, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, name, regtype_copy, -+ NULL, NULL, -+ DNSSDPort, -+ ipp_txt); -+ } -+ else -+ { -+ /* -+ * Sub-type entry. -+ */ -+ -+ snprintf (fullsubtype, sizeof(fullsubtype), -+ "%s._sub.%s", subtype, regtype_copy); -+ cupsdLogMessage (CUPSD_LOG_DEBUG, -+ "Adding TXT record for %s (%s)", name, fullsubtype); -+ ret = avahi_entry_group_add_service_subtype (p->avahi_group, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, name, -+ regtype_copy, -+ NULL, fullsubtype); -+ } -+ -+ if (ret < 0) -+ { -+ free (regtype_copy); -+ goto add_failed; -+ } -+ -+ subtype = nextsubtype; -+ } -+ -+ free (regtype_copy); -+ p->ipp_txt = ipp_txt; -+ ipp_txt = NULL; -+ -+ if (BrowseLocalProtocols & BROWSE_LPD) -+ { -+ cupsdLogMessage(CUPSD_LOG_DEBUG, -+ "Registering Avahi printer %s with name \"%s\" and " -+ "type \"_printer._tcp\"", p->name, name); -+ -+ ret = avahi_entry_group_add_service_strlst (p->avahi_group, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, name, -+ "_printer._tcp", NULL, NULL, -+ 515, -+ printer_txt); -+ if (ret < 0) -+ goto add_failed; -+ -+ p->printer_txt = printer_txt; -+ printer_txt = NULL; -+ } -+ -+ ret = avahi_entry_group_commit (p->avahi_group); -+ -+ if (ret < 0) -+ { -+ add_failed: -+ cupsdLogMessage (CUPSD_LOG_ERROR, -+ "Failed to add Avahi entry for %s: %d", -+ name, ret); -+ if (p->avahi_group) -+ { -+ avahi_entry_group_reset (p->avahi_group); -+ avahi_entry_group_free (p->avahi_group); -+ p->avahi_group = NULL; -+ } -+ ipp_txt = p->ipp_txt; -+ p->ipp_txt = NULL; -+ } -+ } -+ -+ if (ipp_txt) -+ avahi_string_list_free (ipp_txt); -+ -+ if (printer_txt) -+ avahi_string_list_free (printer_txt); -+#endif /* HAVE_AVAHI */ - } - - -@@ -2896,6 +3293,10 @@ - { - cupsd_printer_t *p; /* Current printer */ - -+#ifdef HAVE_DNSSD -+ if (!DNSSDRef) -+ return; -+#endif /* HAVE_DNSSD */ - - /* - * De-register the individual printers -@@ -2906,6 +3307,7 @@ - p = (cupsd_printer_t *)cupsArrayNext(Printers)) - dnssdDeregisterPrinter(p); - -+#ifdef HAVE_DNSSD - /* - * Shutdown the rest of the service refs... - */ -@@ -2926,14 +3328,17 @@ - - DNSServiceRefDeallocate(DNSSDRef); - DNSSDRef = NULL; -+#endif /* HAVE_DNSSD */ - - cupsArrayDelete(DNSSDPrinters); - DNSSDPrinters = NULL; - - DNSSDPort = 0; - } -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - -+#ifdef HAVE_DNSSD - /* - * 'dnssdUpdate()' - Handle DNS-SD queries. - */ -@@ -2955,6 +3360,147 @@ - #endif /* HAVE_DNSSD */ - - -+#ifdef HAVE_AVAHI -+/* -+ * 'avahiPackTxtRecord()' - Pack an array of key/value pairs into an -+ * AvahiStringList. -+ */ -+ -+static AvahiStringList * /* O - new string list */ -+avahiPackTxtRecord(char *keyvalue[][2], /* I - Table of key value pairs */ -+ int count) /* I - Number of items in table */ -+{ -+ AvahiStringList *strlst = NULL; -+ char **elements; -+ size_t len; -+ int i = 0; -+ -+ elements = malloc ((1 + count) * sizeof (char *)); -+ if (!elements) -+ goto cleanup; -+ -+ for (i = 0; i < count; i++) -+ { -+ len = (1 + strlen (keyvalue[i][0]) + -+ (keyvalue[i][1] ? 1 + strlen (keyvalue[i][1]) : 1)); -+ elements[i] = malloc (len * sizeof (char)); -+ if (!elements[i]) -+ goto cleanup; -+ -+ snprintf (elements[i], len, "%s=%s", keyvalue[i][0], keyvalue[i][1]); -+ } -+ -+ strlst = avahi_string_list_new_from_array ((const char **) elements, count); -+ -+cleanup: -+ while (--i >= 0) -+ free (elements[i]); -+ -+ free (elements); -+ return (strlst); -+} -+ -+ -+/* -+ * 'avahi_entry_group_cb()' - Avahi entry group callback function. -+ */ -+static void -+avahi_entry_group_cb (AvahiEntryGroup *group, -+ AvahiEntryGroupState state, -+ void *userdata) -+{ -+ char *name; -+ -+ if (userdata) -+ name = ((cupsd_printer_t *) userdata)->reg_name; -+ else -+ name = "CUPS web interface"; -+ -+ switch (state) -+ { -+ case AVAHI_ENTRY_GROUP_UNCOMMITED: -+ case AVAHI_ENTRY_GROUP_REGISTERING: -+ break; -+ -+ case AVAHI_ENTRY_GROUP_ESTABLISHED: -+ cupsdLogMessage (CUPSD_LOG_DEBUG, -+ "Avahi entry group established for %s", name); -+ break; -+ -+ default: -+ cupsdLogMessage (CUPSD_LOG_DEBUG, -+ "Avahi entry group %s has state %d", -+ name, state); -+ break; -+ } -+} -+ -+ -+/* -+ * 'avahi_client_cb()' - Avahi client callback function. -+ */ -+static void -+avahi_client_cb (AvahiClient *client, -+ AvahiClientState state, -+ void *userdata) -+{ -+ cupsd_printer_t *printer; -+ switch (state) -+ { -+ case AVAHI_CLIENT_S_RUNNING: -+ /* -+ * Avahi client started successfully. -+ */ -+ AvahiCupsClient = client; -+ AvahiCupsClientConnecting = 0; -+ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client started"); -+ -+ cupsdUpdateDNSSDName (); -+ -+ for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers); -+ printer; -+ printer = (cupsd_printer_t *)cupsArrayNext(Printers)) -+ if (Browsing && (BrowseLocalProtocols & BROWSE_DNSSD) && -+ (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT | -+ CUPS_PRINTER_SCANNER))) && printer->shared) -+ dnssdRegisterPrinter (printer); -+ -+ break; -+ -+ case AVAHI_CLIENT_CONNECTING: -+ /* -+ * No Avahi daemon, client is waiting. -+ */ -+ AvahiCupsClientConnecting = 1; -+ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client connecting"); -+ break; -+ -+ case AVAHI_CLIENT_FAILURE: -+ /* -+ * Avahi client failed, close it to allow a clean restart. -+ */ -+ cupsdLogMessage (CUPSD_LOG_ERROR, -+ "Avahi client failed, " -+ "closing client to allow a clean restart"); -+ -+ for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers); -+ printer; -+ printer = (cupsd_printer_t *)cupsArrayNext(Printers)) -+ dnssdDeregisterPrinter (printer); -+ -+ avahi_client_free(client); -+ AvahiCupsClientConnecting = 0; -+ AvahiCupsClient = NULL; -+ -+ break; -+ -+ default: -+ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client state: %d", state); -+ } -+} -+#endif /* HAVE_AVAHI */ -+ -+ - /* - * 'get_auth_info_required()' - Get the auth-info-required value to advertise. - */ ---- a/scheduler/dirsvc.h -+++ b/scheduler/dirsvc.h -@@ -31,6 +31,10 @@ - # endif /* HAVE_LDAP_SSL_H */ - #endif /* HAVE_LDAP */ - -+#ifdef HAVE_AVAHI -+# include <avahi-client/publish.h> -+#endif /* HAVE_AVAHI */ -+ - /* - * Browse protocols... - */ -@@ -131,19 +135,22 @@ - VAR cupsd_statbuf_t *PollStatusBuffer VALUE(NULL); - /* Status buffer for pollers */ - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - VAR char *DNSSDComputerName VALUE(NULL), - /* Computer/server name */ - *DNSSDHostName VALUE(NULL), - /* Hostname */ - *DNSSDRegType VALUE(NULL); - /* Bonjour registration type */ --VAR cups_array_t *DNSSDAlias VALUE(NULL); -- /* List of dynamic ServerAlias's */ - VAR int DNSSDPort VALUE(0); - /* Port number to register */ - VAR cups_array_t *DNSSDPrinters VALUE(NULL); - /* Printers we have registered */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ -+ -+#ifdef HAVE_DNSSD -+VAR cups_array_t *DNSSDAlias VALUE(NULL); -+ /* List of dynamic ServerAlias's */ - VAR DNSServiceRef DNSSDRef VALUE(NULL), - /* Master DNS-SD service reference */ - WebIFRef VALUE(NULL), -@@ -152,6 +159,17 @@ - /* Remote printer browse reference */ - #endif /* HAVE_DNSSD */ - -+#ifdef HAVE_AVAHI -+VAR AvahiCupsPoll *AvahiCupsPollHandle VALUE(NULL); -+ /* AvahiCupsPoll object */ -+VAR AvahiClient *AvahiCupsClient VALUE(NULL); -+ /* AvahiClient object */ -+VAR int AvahiCupsClientConnecting VALUE(0); -+ /* Is AvahiClient object connecting? */ -+VAR AvahiEntryGroup *AvahiWebIFGroup VALUE(NULL); -+ /* Web interface entry group */ -+#endif /* HAVE_AVAHI */ -+ - #ifdef HAVE_LIBSLP - VAR SLPHandle BrowseSLPHandle VALUE(NULL); - /* SLP API handle */ -@@ -195,13 +213,14 @@ - extern void cupsdRestartPolling(void); - extern void cupsdSaveRemoteCache(void); - extern void cupsdSendBrowseList(void); -+extern void cupsdStartAvahiClient(void); - extern void cupsdStartBrowsing(void); - extern void cupsdStartPolling(void); - extern void cupsdStopBrowsing(void); - extern void cupsdStopPolling(void); --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - extern void cupsdUpdateDNSSDName(void); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - #ifdef HAVE_LDAP - extern void cupsdUpdateLDAPBrowse(void); - #endif /* HAVE_LDAP */ ---- a/scheduler/ipp.c -+++ b/scheduler/ipp.c -@@ -6087,7 +6087,7 @@ - ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time", - ippTimeToDate(curtime)); - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - if (!ra || cupsArrayFind(ra, "printer-dns-sd-name")) - { - if (printer->reg_name) -@@ -6097,7 +6097,7 @@ - ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE, - "printer-dns-sd-name", 0); - } --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - if (!ra || cupsArrayFind(ra, "printer-error-policy")) - ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME, ---- a/scheduler/printers.c -+++ b/scheduler/printers.c -@@ -883,9 +883,9 @@ - cupsdClearString(&p->alert); - cupsdClearString(&p->alert_description); - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - cupsdClearString(&p->pdl); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - cupsArrayDelete(p->filetypes); - -@@ -3765,7 +3765,7 @@ - attr->values[i].string.text = _cupsStrAlloc(mimetype); - } - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - { - char pdl[1024]; /* Buffer to build pdl list */ - mime_filter_t *filter; /* MIME filter looping var */ -@@ -3821,7 +3821,7 @@ - - cupsdSetString(&p->pdl, pdl); - } --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - } - - ---- a/scheduler/printers.h -+++ b/scheduler/printers.h -@@ -16,6 +16,9 @@ - #ifdef HAVE_DNSSD - # include <dns_sd.h> - #endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+# include "avahi.h" -+#endif /* HAVE_AVAHI */ - #include <cups/pwg-private.h> - - -@@ -95,16 +98,23 @@ - time_t marker_time; /* Last time marker attributes were updated */ - _ppd_cache_t *pc; /* PPD cache and mapping data */ - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - char *reg_name, /* Name used for service registration */ -- *pdl, /* pdl value for TXT record */ -- *ipp_txt, /* IPP TXT record contents */ -+ *pdl; /* pdl value for TXT record */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ -+#ifdef HAVE_DNSSD -+ char *ipp_txt, /* IPP TXT record contents */ - *printer_txt; /* LPD TXT record contents */ - int ipp_len, /* IPP TXT record length */ - printer_len; /* LPD TXT record length */ - DNSServiceRef ipp_ref, /* Reference for _ipp._tcp,_cups */ - printer_ref; /* Reference for _printer._tcp */ - #endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ AvahiStringList *ipp_txt, /* IPP TXT record */ -+ *printer_txt; /* LPD TXT record */ -+ AvahiEntryGroup *avahi_group; /* Avahi entry group */ -+#endif /* HAVE_AVAHI */ - }; - - ---- a/scheduler/conf.c -+++ b/scheduler/conf.c -@@ -650,7 +650,7 @@ - Browsing = CUPS_DEFAULT_BROWSING; - DefaultShared = CUPS_DEFAULT_DEFAULT_SHARED; - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - cupsdSetString(&DNSSDRegType, "_ipp._tcp,_cups"); - #endif /* HAVE_DNSSD */ - diff --git a/testing/cups/cups-no-export-ssllibs.patch b/testing/cups/cups-no-export-ssllibs.patch deleted file mode 100644 index 9be3c819b..000000000 --- a/testing/cups/cups-no-export-ssllibs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4 ---- cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200 -+++ cups-1.5b1/config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200 -@@ -164,7 +164,7 @@ AC_SUBST(IPPALIASES) - AC_SUBST(SSLFLAGS) - AC_SUBST(SSLLIBS) - --EXPORT_SSLLIBS="$SSLLIBS" -+EXPORT_SSLLIBS="" - AC_SUBST(EXPORT_SSLLIBS) - - diff --git a/testing/cups/cups-no-gcrypt.patch b/testing/cups/cups-no-gcrypt.patch deleted file mode 100644 index 42f71d0d4..000000000 --- a/testing/cups/cups-no-gcrypt.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/cups-ssl.m4 ---- cups-1.5.0.orig//config-scripts/cups-ssl.m4 2011-01-11 08:05:58.000000000 +0100 -+++ cups-1.5.0/config-scripts/cups-ssl.m4 2011-08-02 10:44:26.011047900 +0200 -@@ -96,7 +96,6 @@ - dnl Then look for GNU TLS... - if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then - AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config) -- AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config) - if $PKGCONFIG --exists gnutls; then - have_ssl=1 - SSLLIBS=`$PKGCONFIG --libs gnutls` -@@ -110,16 +109,6 @@ - AC_DEFINE(HAVE_SSL) - AC_DEFINE(HAVE_GNUTLS) - fi -- -- if test $have_ssl = 1; then -- if $PKGCONFIG --exists gcrypt; then -- SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`" -- SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`" -- elif test "x$LIBGCRYPTCONFIG" != x; then -- SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`" -- SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`" -- fi -- fi - fi - - dnl Check for the OpenSSL library last... ---- cups-1.5.0.orig//cups/http-private.h 2011-01-22 01:07:22.000000000 +0100 -+++ cups-1.5.0/cups/http-private.h 2011-08-02 10:42:43.341604107 +0200 -@@ -93,7 +93,6 @@ - # elif defined HAVE_GNUTLS - # include <gnutls/gnutls.h> - # include <gnutls/x509.h> --# include <gcrypt.h> - # elif defined(HAVE_CDSASSL) - # include <CoreFoundation/CoreFoundation.h> - # include <Security/Security.h> diff --git a/testing/cups/cups.install b/testing/cups/cups.install deleted file mode 100644 index 47c3d9b82..000000000 --- a/testing/cups/cups.install +++ /dev/null @@ -1,26 +0,0 @@ -post_install() { - if [ -x usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null - fi - echo ">> If you use an HTTPS connection to CUPS, the first time you access" - echo ">> the interface it may take a very long time before the site comes up." - echo ">> This is because the first request triggers the generation of the CUPS" - echo ">> SSL certificates which can be a very time-consuming job." -} - -post_upgrade() { - if [ -x usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null - fi - if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then - # important upgrade notice - echo "daemon script has been renamed to /etc/rc.d/cupsd" - echo "change your entry in /etc/rc.conf" - fi -} - -post_remove() { - if [ -x usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null - fi -} diff --git a/testing/cups/cups.logrotate b/testing/cups/cups.logrotate deleted file mode 100644 index 9c49bbdaf..000000000 --- a/testing/cups/cups.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/cups/*log { - missingok - notifempty - delaycompress - postrotate - /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/testing/cups/cups.pam b/testing/cups/cups.pam deleted file mode 100644 index 53724d1f8..000000000 --- a/testing/cups/cups.pam +++ /dev/null @@ -1,3 +0,0 @@ -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so diff --git a/testing/dash/PKGBUILD b/testing/dash/PKGBUILD deleted file mode 100644 index 50aaf36c0..000000000 --- a/testing/dash/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 135041 2011-08-09 23:37:21Z tomegun $ -# Maintainer: Dan McGee <dan@archlinux.org> - -pkgname=dash -pkgver=0.5.7 -pkgrel=2 -pkgdesc="A POSIX compliant shell that aims to be as small as possible" -arch=('i686' 'x86_64') -url="http://gondor.apana.org.au/~herbert/dash/" -license=('BSD') -depends=('glibc') -install=dash.install -source=("http://gondor.apana.org.au/~herbert/dash/files/${pkgname}-${pkgver}.tar.gz") -sha1sums=('a3ebc16f2e2c7ae8adf64e5e62ae3dcb631717c6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man --exec-prefix="" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # license - install -m644 -D COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING -} diff --git a/testing/dash/dash.install b/testing/dash/dash.install deleted file mode 100644 index 6b04cba30..000000000 --- a/testing/dash/dash.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - grep -q '/bin/dash' etc/shells || echo '/bin/dash' >> etc/shells -} - -post_upgrade() { - post_install -} - -pre_remove() { - sed -i '/^\/bin\/dash/d' etc/shells -} diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD deleted file mode 100644 index a310318f1..000000000 --- a/testing/dnsutils/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 136402 2011-08-29 05:30:27Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: kevin <kevin@archlinux.org> -# Contributor: mario <mario_vazq@hotmail.com> - -pkgname=dnsutils - -# Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.8.0.P4 -_pkgver=9.8.0-P4 -pkgrel=2 - -pkgdesc='DNS utilities: dig host nslookup' -url='http://www.isc.org/software/bind/' -license=('custom:ISC') -arch=('i686' 'x86_64') -depends=('openssl' 'idnkit') -options=('!makeflags') -source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" - 'remove-bind.patch') -sha1sums=('969864200c1516a8bea54266de60f316d79182b4' - 'b465ef6160b004838f04de9978fe1be8422af777') - -replaces=('bind-tools' 'host') - -build() { - cd "${srcdir}/bind-${_pkgver}" - - patch -p1 -i ../remove-bind.patch - export STD_CDEFINES='-DDIG_SIGCHASE' - - # hack to remove unused bloat from the binaries - CFLAGS+=' -fdata-sections -ffunction-sections' - LDFLAGS+=' -Wl,--gc-sections' - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-linux-caps \ - --with-openssl \ - --with-idn \ - - make -} - -package() { - cd "${srcdir}/bind-${_pkgver}" - - install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - cd bin - make DESTDIR="${pkgdir}" install - -} diff --git a/testing/dnsutils/remove-bind.patch b/testing/dnsutils/remove-bind.patch deleted file mode 100644 index 19d650964..000000000 --- a/testing/dnsutils/remove-bind.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -aur old/bin/Makefile.in new/bin/Makefile.in ---- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 -+++ new/bin/Makefile.in 2011-08-28 19:16:17.245495043 -0700 -@@ -19,8 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -- check confgen @PKCS11_TOOLS@ -+SUBDIRS = dig - TARGETS = - - @BIND9_MAKE_RULES@ -diff -aur old/lib/Makefile.in new/lib/Makefile.in ---- old/lib/Makefile.in 2007-06-19 16:47:13.000000000 -0700 -+++ new/lib/Makefile.in 2011-08-28 19:17:50.828688599 -0700 -@@ -23,7 +23,7 @@ - # Attempt to disable parallel processing. - .NOTPARALLEL: - .NO_PARALLEL: --SUBDIRS = isc isccc dns isccfg bind9 lwres tests -+SUBDIRS = isc dns isccfg bind9 lwres - TARGETS = - - @BIND9_MAKE_RULES@ diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD deleted file mode 100644 index 952c577d6..000000000 --- a/testing/empathy/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 134982 2011-08-09 18:33:31Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -pkgname=empathy -pkgver=3.0.2 -pkgrel=2 -pkgdesc="A GNOME instant messaging client using the Telepathy framework." -arch=('i686' 'x86_64') -url="http://live.gnome.org/Empathy" -license=('GPL2') -depends=('telepathy-glib' 'telepathy-mission-control' 'folks' 'telepathy-logger' 'telepathy-farsight' 'gnome-keyring' 'gnutls' 'evolution-data-server' - 'libcanberra' 'libnotify' 'enchant' 'iso-codes' 'libwebkit3' 'dconf' 'ca-certificates') -makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gnome-control-center') -optdepends=('telepathy-gabble: XMPP/Jabber support' - 'telepathy-butterfly: MSN support' - 'telepathy-idle: IRC support' - 'telepathy-salut: Link-local XMPP support' - 'telepathy-sofiasip: SIP support' - 'telepathy-haze: libpurple support') -options=('!libtool') -groups=('gnome-extra') -install=empathy.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8074f6ce951fb95b1e13c546497e22d487bca9a87d88f1ebb903cdd2fd48bdc2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/empathy \ - --disable-static \ - --disable-scrollkeeper \ - --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/empathy/empathy.install b/testing/empathy/empathy.install deleted file mode 100644 index 63dd6b907..000000000 --- a/testing/empathy/empathy.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - echo "To use Empathy you need to install at least one Telepathy connection manager." -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/testing/fakeroot/PKGBUILD b/testing/fakeroot/PKGBUILD deleted file mode 100644 index 8313935d3..000000000 --- a/testing/fakeroot/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 136667 2011-08-31 12:17:26Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Jochem Kossen <j.kossen@home.nl> - -pkgname=fakeroot -pkgver=1.18 -pkgrel=1 -pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" -arch=('i686' 'x86_64') -license=('GPL') -url="http://packages.debian.org/fakeroot" -groups=('base-devel') -install=fakeroot.install -depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh') -options=('!libtool') -source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2) -md5sums=('b0e7696460ee54bc378b9c89997f77c2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot \ - --disable-static --with-ipc=sysv - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install - - install -dm755 ${pkgdir}/etc/ld.so.conf.d/ - echo '/usr/lib/libfakeroot' > ${pkgdir}/etc/ld.so.conf.d/fakeroot.conf - - # install README for sysv/tcp usage - install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README -} diff --git a/testing/fakeroot/fakeroot.install b/testing/fakeroot/fakeroot.install deleted file mode 100644 index 986c91b06..000000000 --- a/testing/fakeroot/fakeroot.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - sbin/ldconfig -r . -} - -post_upgrade() { - if [ "$(vercmp $2 1.14.4-2)" -lt 0 ]; then - sed -i -e '/\/usr\/lib\/libfakeroot/d' etc/ld.so.conf - fi - sbin/ldconfig -r . -} - -pre_remove() { - sbin/ldconfig -r . -} diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD deleted file mode 100644 index cf21a0880..000000000 --- a/testing/gcc/PKGBUILD +++ /dev/null @@ -1,254 +0,0 @@ -# $Id: PKGBUILD 136096 2011-08-23 01:52:22Z heftig $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: libtool requires rebuilt with each new gcc version - -pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') -pkgver=4.6.1 -pkgrel=4 -_snapshot=4.6-20110819 -_libstdcppmanver=20110814 # Note: check source directory name when updating this -pkgdesc="The GNU Compiler Collection" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL' 'custom') -url="http://gcc.gnu.org" -makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada') -checkdepends=('dejagnu') -options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 - gcc_pure64.patch - gcc-hash-style-both.patch) -md5sums=('b14d22730f9085eab7fd927039e68d28' - 'ce920d2550ff7e042b9f091d27764d8f' - '4030ee1c08dd1e843c0225b772360e76' - '4df25b623799b148a0703eaeec8fdf3f') - -if [ -n "${_snapshot}" ]; then - _basedir="${srcdir}/gcc-${_snapshot}" -else - _basedir="${srcdir}/gcc-${pkgver}" -fi - -build() { - cd ${_basedir} - - # Do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - if [ "${CARCH}" = "x86_64" ]; then - patch -Np1 -i ${srcdir}/gcc_pure64.patch - fi - patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch - - echo ${pkgver} > gcc/BASE-VER - - cd ${srcdir} - mkdir gcc-build && cd gcc-build - - ${_basedir}/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --with-bugurl=https://bugs.archlinux.org/ \ - --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ - --enable-shared --enable-threads=posix \ - --with-system-zlib --enable-__cxa_atexit \ - --disable-libunwind-exceptions --enable-clocale=gnu \ - --enable-gnu-unique-object --enable-linker-build-id \ - --with-ppl --enable-cloog-backend=isl \ - --enable-lto --enable-gold --enable-ld=default \ - --enable-plugin --with-plugin-ld=ld.gold \ - --disable-multilib --disable-libssp --disable-libstdcxx-pch \ - --enable-checking=release - make -} - -check() { - cd gcc-build - - # increase stack size to prevent test failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 - ulimit -s 32768 - - # do not abort on error as some are "expected" - make -k check || true - ${_basedir}/contrib/test_summary -} - -package_gcc-libs() -{ - pkgdesc="Runtime libraries shipped by GCC" - groups=('base') - depends=('glibc>=2.14') - install=gcc-libs.install - - cd gcc-build - make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src; do - make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install - make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc() -{ - pkgdesc="The GNU Compiler Collection - C and C++ frontends" - depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.21.1' 'libmpc' 'cloog' 'ppl') - groups=('base-devel') - install=gcc.install - - cd gcc-build - - # unfortunately it is much, much easier to install the lot and clean-up the mess... - make -j1 DESTDIR=${pkgdir} install - rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} - rm $pkgdir/usr/lib/*.so* - rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a - rm $pkgdir/usr/lib/libgfortran.spec - rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a} - rm -r $pkgdir/usr/lib/go - rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info - rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 - rm $pkgdir/usr/share/man/man3/ffi* - - # many packages require these symlinks - install -dm755 ${pkgdir}/lib - ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp - ln -sf gcc ${pkgdir}/usr/bin/cc - ln -sf g++ ${pkgdir}/usr/bin/c++ - - # install gengtype for plugin support - install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ - install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ - - # POSIX conformance launcher scripts for c89 and c99 - cat > $pkgdir/usr/bin/c89 <<"EOF" -#!/bin/sh -fl="-std=c89" -for opt; do - case "$opt" in - -ansi|-std=c89|-std=iso9899:1990) fl="";; - -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - cat > $pkgdir/usr/bin/c99 <<"EOF" -#!/bin/sh -fl="-std=c99" -for opt; do - case "$opt" in - -std=c99|-std=iso9899:1999) fl="";; - -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - chmod 755 $pkgdir/usr/bin/c{8,9}9 - - # install the libstdc++ man pages - install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/ - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-fortran() -{ - pkgdesc="Fortran front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-fortran.install - - cd gcc-build - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=$pkgdir install-target-libgfortran - make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS - make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} - install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so* - rm ${pkgdir}/usr/share/info/libquadmath.info - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-objc() -{ - pkgdesc="Objective-C front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libobjc - install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib/libobjc.so* - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-ada() -{ - pkgdesc="Ada front-end for GCC (GNAT)" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-ada.install - - cd gcc-build/gcc - make -j1 DESTDIR=$pkgdir ada.install-{common,info} - install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-go() -{ - pkgdesc="Go front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-go.install - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libgo - make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} - install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION -} diff --git a/testing/gcc/gcc-ada.install b/testing/gcc/gcc-ada.install deleted file mode 100644 index df0553a4f..000000000 --- a/testing/gcc/gcc-ada.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gnat-style.info gnat_rm.info gnat_ugn.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/testing/gcc/gcc-fortran.install b/testing/gcc/gcc-fortran.install deleted file mode 100644 index b15d89a97..000000000 --- a/testing/gcc/gcc-fortran.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -file="gfortran.info" - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} diff --git a/testing/gcc/gcc-go.install b/testing/gcc/gcc-go.install deleted file mode 100644 index 7dc50dee5..000000000 --- a/testing/gcc/gcc-go.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gccgo.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/testing/gcc/gcc-hash-style-both.patch b/testing/gcc/gcc-hash-style-both.patch deleted file mode 100644 index 8b59f4535..000000000 --- a/testing/gcc/gcc-hash-style-both.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000 -@@ -41,7 +41,7 @@ - - #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER - --#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ -+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \ - %{O*:-O3} %{!O*:-O1} \ - %{shared:-shared} \ - %{!shared: \ ---- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000 -+++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000 -@@ -78,7 +78,7 @@ - %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" - - #undef LINK_SPEC --#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ -+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000 -+++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -104,7 +104,7 @@ - { "dynamic_linker", LINUX_DYNAMIC_LINKER } - - #undef LINK_SPEC --#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ -+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ ---- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -64,7 +64,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "\ -+#define LINK_SPEC "--hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000 -+++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000 -@@ -389,11 +389,11 @@ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) - - --#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}" - --#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}" - ---- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000 -+++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000 -@@ -830,7 +830,7 @@ - #define LINUX_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) - --#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER "}}" - ---- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -77,7 +77,7 @@ - - #undef LINK_SPEC - #define LINK_SPEC \ -- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ -+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{static:-static} \ ---- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000 -+++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000 -@@ -113,7 +113,7 @@ - { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ - { "link_arch", LINK_ARCH_SPEC }, - --#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ -+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -121,7 +121,7 @@ - %{static:-static}} \ - " - --#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -193,7 +193,7 @@ - #else /* !SPARC_BI_ARCH */ - - #undef LINK_SPEC --#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ ---- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000 -+++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -74,7 +74,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ -+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ - %{!mno-relax:%{!r:-relax}} \ - %{!shared: \ - %{!static: \ diff --git a/testing/gcc/gcc-libs.install b/testing/gcc/gcc-libs.install deleted file mode 100644 index 23553b8f0..000000000 --- a/testing/gcc/gcc-libs.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -filelist=(libgomp.info libquadmath.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/testing/gcc/gcc.install b/testing/gcc/gcc.install deleted file mode 100644 index 3407a5e1f..000000000 --- a/testing/gcc/gcc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/testing/gcc/gcc_pure64.patch b/testing/gcc/gcc_pure64.patch deleted file mode 100644 index 8c0baf8e2..000000000 --- a/testing/gcc/gcc_pure64.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h ---- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400 -@@ -49,8 +49,8 @@ - When the -shared link option is used a final link is not being - done. */ - --#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - - #undef LINK_SPEC - #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64 ---- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400 -@@ -6,7 +6,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = ../lib ../lib32 - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib diff --git a/testing/glib-networking/PKGBUILD b/testing/glib-networking/PKGBUILD deleted file mode 100644 index d97a99aad..000000000 --- a/testing/glib-networking/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 135436 2011-08-13 13:27:37Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -pkgname=glib-networking -pkgver=2.28.7 -pkgrel=4 -pkgdesc="Network-related giomodules for glib" -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -license=('GPL2') -depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas') -makedepends=('intltool') -options=('!libtool') -install=glib-networking.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2 - glib-networking-2.29.9-port-gnutls3-API.patch) -sha256sums=('98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c' - '101daf107773f84d08d7ab55a354875e2e021c3b5dd3cdc259fb544f94a8beee') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np0 -i "$srcdir/glib-networking-2.29.9-port-gnutls3-API.patch" - ./configure \ - --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/glib-networking --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch b/testing/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch deleted file mode 100644 index 19a168638..000000000 --- a/testing/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: tls/gnutls/gtlsconnection-gnutls.c -=================================================================== ---- tls/gnutls/gtlsconnection-gnutls.c -+++ tls/gnutls/gtlsconnection-gnutls.c 2011-08-04 00:40:33.194189789 +0200 -@@ -860,9 +860,10 @@ - - if (peer_certificate) - { -- int status; -+ int verify_ret; -+ unsigned int status; - -- status = gnutls_certificate_verify_peers (gnutls->priv->session); -+ verify_ret = gnutls_certificate_verify_peers2 (gnutls->priv->session, &status); - peer_certificate_errors = g_tls_certificate_gnutls_convert_flags (status); - if (peer_certificate_errors) - { diff --git a/testing/glib-networking/glib-networking.install b/testing/glib-networking/glib-networking.install deleted file mode 100644 index 595f1c75b..000000000 --- a/testing/glib-networking/glib-networking.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - usr/bin/gio-querymodules usr/lib/gio/modules -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD deleted file mode 100644 index d762b7aae..000000000 --- a/testing/glibc/PKGBUILD +++ /dev/null @@ -1,203 +0,0 @@ -# $Id: PKGBUILD 135504 2011-08-14 10:26:15Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: valgrind requires rebuilt with each new glibc version - -pkgname=glibc -pkgver=2.14 -pkgrel=5 -_glibcdate=20110617 -pkgdesc="GNU C Library" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/libc" -license=('GPL' 'LGPL') -groups=('base') -depends=('linux-api-headers>=3.0' 'tzdata') -makedepends=('gcc>=4.6') -backup=(etc/locale.gen - etc/nscd.conf) -options=('!strip') -install=glibc.install -source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz - glibc-2.10-dont-build-timezone.patch - glibc-2.10-bz4781.patch - glibc-__i686.patch - glibc-2.12.1-static-shared-getpagesize.patch - glibc-2.12.2-ignore-origin-of-privileged-program.patch - glibc-2.13-futex.patch - glibc-2.14-libdl-crash.patch - #glibc-2.14-fix-resolver-crash-typo.patch - glibc-2.14-revert-4462fad3.patch - glibc-2.14-reexport-rpc-interface.patch - glibc-2.14-reinstall-nis-rpc-headers.patch - nscd - locale.gen.txt - locale-gen) -md5sums=('e441d745609d93c907b72548ba646dad' - '4dadb9203b69a3210d53514bb46f41c3' - '0c5540efc51c0b93996c51b57a8540ae' - '40cd342e21f71f5e49e32622b25acc52' - 'a3ac6f318d680347bb6e2805d42b73b2' - 'b042647ea7d6f22ad319e12e796bd13e' - '7d0154b7e17ea218c9fa953599d24cc4' - 'cea62cc6b903d222c5f26e05a3c0e0e6' - '46e56492cccb1c9172ed3a235cf43c6c' - 'c5de2a946215d647c8af5432ec4b0da0' - '55febbb72139ac7b65757df085024b83' - 'b587ee3a70c9b3713099295609afde49' - '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') - - -mksource() { - git clone git://sourceware.org/git/glibc.git - pushd glibc - git checkout -b glibc-2.14-arch origin/release/2.14/master - popd - tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/* -} - -build() { - cd ${srcdir}/glibc - - # timezone data is in separate package (tzdata) - patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781 - patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411 - # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html - patch -Np1 -i ${srcdir}/glibc-__i686.patch - - # http://sourceware.org/bugzilla/show_bug.cgi?id=11929 - # using Fedora "fix" as patch in that bug report causes breakages... - patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch - - # http://www.exploit-db.com/exploits/15274/ - # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch - - # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 - patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch - - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...) - # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html - patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch - - # This fixes the main segfault but not the assert fail (FS#24615) - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 - #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch - # resort to reverting the bad commit completely for the moment - patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch - - # re-export RPC interface until libtirpc is ready as a replacement - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch - - install -dm755 ${pkgdir}/etc - touch ${pkgdir}/etc/ld.so.conf - - cd ${srcdir} - mkdir glibc-build - cd glibc-build - - if [[ ${CARCH} = "i686" ]]; then - # Hack to fix NPTL issues with Xen, only required on 32bit platforms - export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" - fi - - echo "slibdir=/lib" >> configparms - - # remove hardening options from CFLAGS for building libraries - CFLAGS=${CFLAGS/-fstack-protector/} - CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} - - ${srcdir}/glibc/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --with-headers=/usr/include \ - --enable-add-ons=nptl,libidn \ - --enable-kernel=2.6.27 \ - --with-tls --with-__thread \ - --enable-bind-now --without-gd \ - --without-cvs --disable-profile \ - --disable-multi-arch - - # build libraries with hardening disabled - echo "build-programs=no" >> configparms - make - - # re-enable hardening for programs - sed -i "s#=no#=yes#" configparms - echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms - echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms - make - - # remove harding in preparation to run test-suite - sed -i '2,4d' configparms -} - -check() { - cd ${srcdir}/glibc-build - - # some errors are expected - manually check log files - make -k check || true -} - -package() { - cd ${srcdir}/glibc-build - make install_root=${pkgdir} install - - rm -f ${pkgdir}/etc/ld.so.{cache,conf} - - install -dm755 ${pkgdir}/etc/rc.d - install -dm755 ${pkgdir}/usr/sbin - install -dm755 ${pkgdir}/usr/lib/locale - install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf - install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd - install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin - install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf - - sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf - - # create /etc/locale.gen - install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen - sed -i "s|/| |g" ${srcdir}/glibc/localedata/SUPPORTED - sed -i 's|\\| |g' ${srcdir}/glibc/localedata/SUPPORTED - sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/glibc/localedata/SUPPORTED - cat ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen - sed -i "s|^|#|g" ${pkgdir}/etc/locale.gen - - if [[ ${CARCH} = "x86_64" ]]; then - # fix for the linker - sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd - # Comply with multilib binaries, they look for the linker in /lib64 - mkdir ${pkgdir}/lib64 - cd ${pkgdir}/lib64 - ln -v -s ../lib/ld* . - fi - - # manually strip files as stripping libpthread-*.so and libthread_db.so - # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks - # valgrind on x86_64 - - cd $pkgdir - strip $STRIP_BINARIES sbin/{ldconfig,sln} \ - usr/bin/{gencat,getconf,getent,iconv,locale} \ - usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \ - usr/lib/getconf/* \ - usr/sbin/{iconvconfig,nscd} - [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 - - strip $STRIP_STATIC usr/lib/*.a \ - lib/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so - - strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \ - lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ - lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ - lib/{libmemusage,libpcprofile,libSegFault}.so \ - usr/lib/{pt_chown,{audit,gconv}/*.so} -} diff --git a/testing/glibc/glibc-2.10-bz4781.patch b/testing/glibc/glibc-2.10-bz4781.patch deleted file mode 100644 index cf1a97a18..000000000 --- a/testing/glibc/glibc-2.10-bz4781.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -120,9 +120,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (eip); - /* Note: %esi is zero. */ - movl %esi,%ebp /* terminate the stack frame */ - #ifdef RESET_PID -@@ -155,7 +152,6 @@ - jmp L(haspid) - .previous - #endif -- cfi_endproc; - - cfi_startproc - PSEUDO_END (BP_SYM (__clone)) -diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -89,9 +89,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (rip); - /* Clear the frame pointer. The ABI suggests this be done, to mark - the outermost frame obviously. */ - xorl %ebp, %ebp -@@ -116,7 +113,6 @@ - /* Call exit with return value from function call. */ - movq %rax, %rdi - call HIDDEN_JUMPTARGET (_exit) -- cfi_endproc; - - cfi_startproc; - PSEUDO_END (BP_SYM (__clone)) diff --git a/testing/glibc/glibc-2.10-dont-build-timezone.patch b/testing/glibc/glibc-2.10-dont-build-timezone.patch deleted file mode 100644 index d3abeff17..000000000 --- a/testing/glibc/glibc-2.10-dont-build-timezone.patch +++ /dev/null @@ -1,13 +0,0 @@ -timezone data has been split into the package sys-libs/timezone-data - ---- glibc-2.4/Makeconfig -+++ glibc-2.4/Makeconfig -@@ -931,7 +931,7 @@ - stdlib stdio-common libio malloc string wcsmbs time dirent \ - grp pwd posix io termios resource misc socket sysvipc gmon \ - gnulib iconv iconvdata wctype manual shadow gshadow po argp \ -- crypt nss localedata timezone rt conform debug \ -+ crypt nss localedata rt conform debug \ - $(add-on-subdirs) $(dlfcn) $(binfmt-subdir) - - ifndef avoid-generated diff --git a/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch b/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch deleted file mode 100644 index e84754279..000000000 --- a/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c -+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c -@@ -28,7 +28,7 @@ - int - __getpagesize () - { --#ifdef __ASSUME_AT_PAGESIZE -+#if 0 && defined __ASSUME_AT_PAGESIZE - assert (GLRO(dl_pagesize) != 0); - return GLRO(dl_pagesize); - #else diff --git a/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch deleted file mode 100644 index ce089b49c..000000000 --- a/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Thu, 9 Dec 2010 15:00:59 +0100 -Subject: [PATCH 1/1] Ignore origin of privileged program - ---- - ChangeLog | 5 +++++ - elf/dl-object.c | 3 +++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/elf/dl-object.c b/elf/dl-object.c -index 22a1635..7674d49 100644 ---- a/elf/dl-object.c -+++ b/elf/dl-object.c -@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type, - out: - new->l_origin = origin; - } -+ else if (INTUSE(__libc_enable_secure) && type == lt_executable) -+ /* The origin of a privileged program cannot be trusted. */ -+ new->l_origin = (char *) -1; - - return new; - } --- -1.7.2 diff --git a/testing/glibc/glibc-2.13-futex.patch b/testing/glibc/glibc-2.13-futex.patch deleted file mode 100644 index 9b9c3ac45..000000000 --- a/testing/glibc/glibc-2.13-futex.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S -+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S -@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: - cfi_restore(%r12) - retq - --#ifdef __ASSUME_PRIVATE_FUTEX -+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME - cfi_adjust_cfa_offset(16) - cfi_rel_offset(%r12, 8) - cfi_rel_offset(%r13, 0) ---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S -+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S -@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: - - 7: movq %rdx, %rax - --#ifndef __ASSUME_PRIVATE_FUTEX -+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME - addq $16, %rsp - cfi_adjust_cfa_offset(-16) - popq %r14 -@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: - cfi_restore(%r12) - retq - --#ifdef __ASSUME_PRIVATE_FUTEX -+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME - cfi_adjust_cfa_offset(16) - cfi_rel_offset(%r12, 8) - cfi_rel_offset(%r13, 0) diff --git a/testing/glibc/glibc-2.14-fix-resolver-crash-typo.patch b/testing/glibc/glibc-2.14-fix-resolver-crash-typo.patch deleted file mode 100644 index b5d86c7d2..000000000 --- a/testing/glibc/glibc-2.14-fix-resolver-crash-typo.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/resolv/res_send.c b/resolv/res_send.c -index 97142b7..a001c1e 100644 ---- a/resolv/res_send.c -+++ b/resolv/res_send.c -@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ns, ansp, ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) - goto next_ns; - } else { - /* Use datagrams. */ -@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) - goto next_ns; - if (v_circuit) - // XXX Check whether both requests failed or diff --git a/testing/glibc/glibc-2.14-libdl-crash.patch b/testing/glibc/glibc-2.14-libdl-crash.patch deleted file mode 100644 index ee29f8c20..000000000 --- a/testing/glibc/glibc-2.14-libdl-crash.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff --git a/elf/dl-close.c b/elf/dl-close.c -index 73b2a2f..9bd91e3 100644 ---- a/elf/dl-close.c -+++ b/elf/dl-close.c -@@ -1,5 +1,5 @@ - /* Close a shared object opened by `_dl_open'. -- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) - if (map->l_direct_opencount > 0 || map->l_type != lt_loaded - || dl_close_state != not_pending) - { -- if (map->l_direct_opencount == 0) -- { -- if (map->l_type == lt_loaded) -- dl_close_state = rerun; -- else if (map->l_type == lt_library) -- { -- struct link_map **oldp = map->l_initfini; -- map->l_initfini = map->l_orig_initfini; -- _dl_scope_free (oldp); -- } -- } -+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) -+ dl_close_state = rerun; - - /* There are still references to this object. Do nothing more. */ - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) -diff --git a/elf/dl-deps.c b/elf/dl-deps.c -index 9e30594..3890d00 100644 ---- a/elf/dl-deps.c -+++ b/elf/dl-deps.c -@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, - nneeded * sizeof needed[0]); - atomic_write_barrier (); - l->l_initfini = l_initfini; -+ l->l_free_initfini = 1; - } - - /* If we have no auxiliary objects just go on to the next map. */ -@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING")); - l_initfini[nlist] = NULL; - atomic_write_barrier (); - map->l_initfini = l_initfini; -+ map->l_free_initfini = 1; - if (l_reldeps != NULL) - { - atomic_write_barrier (); -@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING")); - _dl_scope_free (old_l_reldeps); - } - if (old_l_initfini != NULL) -- map->l_orig_initfini = old_l_initfini; -+ _dl_scope_free (old_l_initfini); - } -diff --git a/elf/dl-libc.c b/elf/dl-libc.c -index 7be9483..a13fce3 100644 ---- a/elf/dl-libc.c -+++ b/elf/dl-libc.c -@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) - - for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) - { -- /* Remove all additional names added to the objects. */ - for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next) - { - struct libname_list *lnp = l->l_libname->next; - - l->l_libname->next = NULL; - -+ /* Remove all additional names added to the objects. */ - while (lnp != NULL) - { - struct libname_list *old = lnp; -@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem) - if (! old->dont_free) - free (old); - } -+ -+ /* Free the initfini dependency list. */ -+ if (l->l_free_initfini) -+ free (l->l_initfini); - } - - if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 -diff --git a/elf/rtld.c b/elf/rtld.c -index 4a9109e..617e30e 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - lnp->dont_free = 1; - lnp = lnp->next; - } -+ l->l_free_initfini = 0; - - if (l != &GL(dl_rtld_map)) - _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, -diff --git a/include/link.h b/include/link.h -index e877104..051b99a 100644 ---- a/include/link.h -+++ b/include/link.h -@@ -1,6 +1,6 @@ - /* Data structure for communication from the run-time dynamic linker for - loaded ELF shared objects. -- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -192,6 +192,9 @@ struct link_map - during LD_TRACE_PRELINKING=1 - contains any DT_SYMBOLIC - libraries. */ -+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be -+ freed, ie. not allocated with -+ the dummy malloc in ld.so. */ - - /* Collected information about own RPATH directories. */ - struct r_search_path_struct l_rpath_dirs; -@@ -240,9 +243,6 @@ struct link_map - - /* List of object in order of the init and fini calls. */ - struct link_map **l_initfini; -- /* The init and fini list generated at startup, saved when the -- object is also loaded dynamically. */ -- struct link_map **l_orig_initfini; - - /* List of the dependencies introduced through symbol binding. */ - struct link_map_reldeps diff --git a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch b/testing/glibc/glibc-2.14-reexport-rpc-interface.patch deleted file mode 100644 index e2beea881..000000000 --- a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/include/libc-symbols.h b/include/libc-symbols.h -index 67e1ca2..5e7cca5 100644 ---- a/include/libc-symbols.h -+++ b/include/libc-symbols.h -@@ -635,7 +635,7 @@ for linking") - # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) - # define libc_hidden_def(name) hidden_def (name) - # define libc_hidden_weak(name) hidden_weak (name) --# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) -+# define libc_hidden_nolink(name, version) hidden_def (name) - # define libc_hidden_ver(local, name) hidden_ver (local, name) - # define libc_hidden_data_def(name) hidden_data_def (name) - # define libc_hidden_data_weak(name) hidden_data_weak (name) -diff --git a/sunrpc/Makefile b/sunrpc/Makefile -index 5134ce9..40c73d1 100644 ---- a/sunrpc/Makefile -+++ b/sunrpc/Makefile -@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ - des_crypt.h) - headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ - $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h --headers = rpc/netdb.h -+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc) - install-others = $(inst_sysconfdir)/rpc - generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ - $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen diff --git a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch deleted file mode 100644 index eb0fd822d..000000000 --- a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Tue, 17 May 2011 17:42:30 +0200 -Subject: [PATCH] Reinstall NIS RPC headers - ---- - nis/Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nis/Makefile b/nis/Makefile -index b5c9609..d2934d9 100644 ---- a/nis/Makefile -+++ b/nis/Makefile -@@ -23,9 +23,9 @@ subdir := nis - - aux := nis_hash - -+headers := $(wildcard rpcsvc/*.[hx]) - distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ -- nisplus-parser.h nis_xdr.h nss \ -- $(wildcard rpcsvc/*.[hx]) -+ nisplus-parser.h nis_xdr.h nss - - # These are the databases available for the nis (and perhaps later nisplus) - # service. This must be a superset of the services in nss. --- -1.7.5.4 - diff --git a/testing/glibc/glibc-2.14-revert-4462fad3.patch b/testing/glibc/glibc-2.14-revert-4462fad3.patch deleted file mode 100644 index d71e37492..000000000 --- a/testing/glibc/glibc-2.14-revert-4462fad3.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c ---- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 -+++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 -@@ -549,7 +549,7 @@ - ns, ansp, ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - } else { - /* Use datagrams. */ -@@ -559,7 +559,7 @@ - ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - if (v_circuit) - // XXX Check whether both requests failed or -@@ -1275,14 +1275,10 @@ - (*thisresplenp > *thisanssizp) - ? *thisanssizp : *thisresplenp); - -- if (recvresp1 || (buf2 != NULL && recvresp2)) { -- *resplen2 = 0; -+ if (recvresp1 || (buf2 != NULL && recvresp2)) - return resplen; -- } - if (buf2 != NULL) - { -- /* No data from the first reply. */ -- resplen = 0; - /* We are waiting for a possible second reply. */ - if (hp->id == anhp->id) - recvresp1 = 1; diff --git a/testing/glibc/glibc-__i686.patch b/testing/glibc/glibc-__i686.patch deleted file mode 100644 index 28d5dd424..000000000 --- a/testing/glibc/glibc-__i686.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile ---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 -+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 -@@ -1,6 +1,7 @@ - # The mpn functions need a #define for asm syntax flavor. --# Every i386 port in use uses gas syntax (I think). --asm-CPPFLAGS += -DGAS_SYNTAX -+# Every i386 port in use uses gas syntax (I think). Don't replace -+# __i686 in __i686.get_pc_thunk.bx. -+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 - - # The i386 `long double' is a distinct type we support. - long-double-fcts = yes diff --git a/testing/glibc/glibc.install b/testing/glibc/glibc.install deleted file mode 100644 index 7f85ade96..000000000 --- a/testing/glibc/glibc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11}) - -post_upgrade() { - sbin/ldconfig -r . - [ -x sbin/init ] && sbin/init u - usr/sbin/locale-gen - - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/testing/glibc/locale-gen b/testing/glibc/locale-gen deleted file mode 100755 index 5aff344c4..000000000 --- a/testing/glibc/locale-gen +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -set -e - -LOCALEGEN=/etc/locale.gen -LOCALES=/usr/share/i18n/locales -if [ -n "$POSIXLY_CORRECT" ]; then - unset POSIXLY_CORRECT -fi - - -[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0; - -# Remove all old locale dir and locale-archive before generating new -# locale data. -rm -rf /usr/lib/locale/* || true - -umask 022 - -is_entry_ok() { - if [ -n "$locale" -a -n "$charset" ] ; then - true - else - echo "error: Bad entry '$locale $charset'" - false - fi -} - -echo "Generating locales..." -while read locale charset; do \ - case $locale in \#*) continue;; "") continue;; esac; \ - is_entry_ok || continue - echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \ - echo -n ".$charset"; \ - echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ - echo -n '...'; \ - if [ -f $LOCALES/$locale ]; then input=$locale; else \ - input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \ - localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \ - echo ' done'; \ -done < $LOCALEGEN -echo "Generation complete." diff --git a/testing/glibc/locale.gen.txt b/testing/glibc/locale.gen.txt deleted file mode 100644 index ccdd81734..000000000 --- a/testing/glibc/locale.gen.txt +++ /dev/null @@ -1,23 +0,0 @@ -# Configuration file for locale-gen -# -# lists of locales that are to be generated by the locale-gen command. -# -# Each line is of the form: -# -# <locale> <charset> -# -# where <locale> is one of the locales given in /usr/share/i18n/locales -# and <charset> is one of the character sets listed in /usr/share/i18n/charmaps -# -# Examples: -# en_US ISO-8859-1 -# en_US.UTF-8 UTF-8 -# de_DE ISO-8859-1 -# de_DE@euro ISO-8859-15 -# -# The locale-gen command will generate all the locales, -# placing them in /usr/lib/locale. -# -# A list of supported locales is included in this file. -# Uncomment the ones you need. -# diff --git a/testing/glibc/nscd b/testing/glibc/nscd deleted file mode 100755 index 8b14f2a3f..000000000 --- a/testing/glibc/nscd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/nscd` -case "$1" in - start) - stat_busy "Starting nscd" - # create necessary directories if they don't already exist - mkdir -p /var/run/nscd /var/db/nscd 2>/dev/null - # remove stale files - rm -f /var/db/nscd/* /var/run/nscd/* 2>/dev/null - [ -z "$PID" ] && /usr/sbin/nscd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon nscd - stat_done - fi - ;; - stop) - stat_busy "Stopping nscd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon nscd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/gmp/538dfce27f41.patch b/testing/gmp/538dfce27f41.patch deleted file mode 100644 index 2e0a1af50..000000000 --- a/testing/gmp/538dfce27f41.patch +++ /dev/null @@ -1,38 +0,0 @@ - -# HG changeset patch -# User Torbjorn Granlund <tege@gmplib.org> -# Date 1310730221 -7200 -# Node ID 538dfce27f410b910d5e2f011119269e224d16a3 -# Parent 03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366 -(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right. - -diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c ---- a/mpn/generic/dcpi1_bdiv_q.c Thu Jun 16 12:22:24 2011 +0200 -+++ b/mpn/generic/dcpi1_bdiv_q.c Fri Jul 15 13:43:41 2011 +0200 -@@ -7,7 +7,7 @@ - SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES. IN FACT, IT IS ALMOST - GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE. - --Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc. -+Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. - - This file is part of the GNU MP Library. - -@@ -28,7 +28,6 @@ - #include "gmp-impl.h" - - -- - mp_size_t - mpn_dcpi1_bdiv_q_n_itch (mp_size_t n) - { -@@ -130,7 +129,7 @@ - qn = nn - qn; - while (qn > dn) - { -- mpn_sub_1 (np + dn, np + dn, qn, cy); -+ mpn_sub_1 (np + dn, np + dn, qn - dn, cy); - cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp); - qp += dn; - np += dn; - diff --git a/testing/gmp/PKGBUILD b/testing/gmp/PKGBUILD deleted file mode 100644 index f1055efa5..000000000 --- a/testing/gmp/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 135480 2011-08-14 09:28:35Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gmp -pkgver=5.0.2 -pkgrel=3 -pkgdesc="A free library for arbitrary precision arithmetic" -arch=('i686' 'x86_64') -url="http://gmplib.org/" -depends=('gcc-libs' 'sh') -license=('LGPL3') -options=(!libtool) -install=gmp.install -source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2 - 538dfce27f41.patch) -md5sums=('0bbaedc82fb30315b06b1588b9077cd3' - 'a769be9c41618ca9c35d83375e7097d0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i $srcdir/538dfce27f41.patch - - [ "${CARCH}" = "i686" ] && export ABI="32" - ./configure --build=${CHOST} \ - --prefix=/usr --infodir=/usr/share/info \ - --enable-cxx - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gmp/gmp.install b/testing/gmp/gmp.install deleted file mode 100644 index cad3354f9..000000000 --- a/testing/gmp/gmp.install +++ /dev/null @@ -1,20 +0,0 @@ -info_dir=usr/share/info -info_files=(gmp.info gmp.info-1 gmp.info-2) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/testing/gnome-vfs/PKGBUILD b/testing/gnome-vfs/PKGBUILD deleted file mode 100644 index 5b98fc8e8..000000000 --- a/testing/gnome-vfs/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 135094 2011-08-10 09:17:01Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-vfs -pkgver=2.24.4 -pkgrel=5 -pkgdesc="The GNOME Virtual File System" -arch=(i686 x86_64) -license=('LGPL') -depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls' 'libgcrypt') -makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org" -install=gnome-vfs.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2 - gnutls-config.patch - gcrypt-config.patch) -sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa' - '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d' - 'c059e218f310da683778919d36e7862f7e763384805f6453d328fbaf507a8114') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - #Fix build with new gnutls - patch -Np1 -i "${srcdir}/gnutls-config.patch" - #fix build with new libgcrypt >= 1.5.0 - patch -Np1 -i "${srcdir}/gcrypt-config.patch" - libtoolize --force - gtkdocize - aclocal - autoconf - automake - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-vfs-2.0 \ - --enable-samba --disable-hal \ - --enable-avahi --disable-howl \ - --disable-openssl --enable-gnutls - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -d -m755 "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-vfs-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/gnome-vfs/gcrypt-config.patch b/testing/gnome-vfs/gcrypt-config.patch deleted file mode 100644 index 8ce91870a..000000000 --- a/testing/gnome-vfs/gcrypt-config.patch +++ /dev/null @@ -1,31 +0,0 @@ -# Allow gnome-vfs-2.24 to build with libgcrypt >= 1.5.0 ---- gnome-vfs-2.24.4/configure.in 2010-07-01 12:36:09.000000000 -0300 -+++ gnome-vfs-2.24.4-libgcrypt//configure.in 2011-07-22 15:55:02.296325640 -0300 -@@ -689,6 +689,16 @@ - AM_CONDITIONAL(HAVE_SSL, test x$have_ssl = xtrue) - - dnl **************************** -+dnl LibGCrypt 1.5.0 -+dnl **************************** -+ -+AM_PATH_LIBGCRYPT(1.5.0) -+ -+if test "x${LIBGCRYPT_LIBS}" = "x"; then -+ AC_MSG_ERROR([unable to find libgcrypt]) -+fi -+ -+dnl **************************** - dnl DNS-SD implementations - dnl **************************** - AM_CONDITIONAL(HAVE_AVAHI, false) -@@ -1045,8 +1055,8 @@ - dnl ============================================================================== - - PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement) --LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS" --LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS" -+LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS $LIBGCRYPT_CFLAGS" -+LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS $LIBGCRYPT_LIBS" - AC_SUBST(LIBGNOMEVFS_CFLAGS) - AC_SUBST(LIBGNOMEVFS_LIBS) - diff --git a/testing/gnome-vfs/gnome-vfs.install b/testing/gnome-vfs/gnome-vfs.install deleted file mode 100644 index 793a3e7ab..000000000 --- a/testing/gnome-vfs/gnome-vfs.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=gnome-vfs - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/testing/gnome-vfs/gnutls-config.patch b/testing/gnome-vfs/gnutls-config.patch deleted file mode 100644 index f6fa18b17..000000000 --- a/testing/gnome-vfs/gnutls-config.patch +++ /dev/null @@ -1,25 +0,0 @@ -# Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0 -# Use pkg-config in place of gnutls own macro since it's not present anymore. ---- a/configure.in 2009-03-07 19:59:53.805507753 +0100 -+++ b/configure.in 2009-03-07 18:34:36.928169018 +0100 -@@ -686,14 +686,14 @@ - AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***]) - else - AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***])) -- AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -- have_ssl=true]) -+ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -+ have_ssl=true]) - - if test "x${LIBGNUTLS_LIBS}" = "x"; then -- AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -- AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) -- have_ssl=true], -- AC_MSG_ERROR([Unable to find GNUTLS])) -+ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -+ AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) -+ have_ssl=true], -+ AC_MSG_ERROR([Unable to find GNUTLS])) - fi - fi - fi diff --git a/testing/gnutls/PKGBUILD b/testing/gnutls/PKGBUILD deleted file mode 100644 index 232866e8e..000000000 --- a/testing/gnutls/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 135280 2011-08-12 06:48:04Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnutls -pkgver=3.0.0 -pkgrel=2 -pkgdesc="A library which provides a secure layer over a reliable transport layer" -arch=('i686' 'x86_64') -license=('GPL3' 'LGPL') -url="http://www.gnu.org/software/gnutls/" -install=gnutls.install -options=('!libtool' '!zipman') -depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2') -source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz - align.patch) -md5sums=('0677a66667f48810ff8df8335a9a9f9b' - 'bce979498addb45d0fa8d6951f93fab3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # fix AES-NI for i686 - patch -Np1 -i ${srcdir}/align.patch - ./configure --prefix=/usr \ - --with-zlib \ - --disable-static \ - --disable-guile \ - --without-p11-kit - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check # passes all || /bin/true -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman - # gzip -9 all files in infodir and manpages manually - find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \; - find "$pkgdir/usr/share/man" -exec gzip -9 {} \; -} diff --git a/testing/gnutls/align.patch b/testing/gnutls/align.patch deleted file mode 100644 index dce5cf408..000000000 --- a/testing/gnutls/align.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/lib/accelerated/intel/aes-x86.c b/lib/accelerated/intel/aes-x86.c -index 6801e7e..ff5b714 100644 ---- a/lib/accelerated/intel/aes-x86.c -+++ b/lib/accelerated/intel/aes-x86.c -@@ -40,6 +40,10 @@ struct aes_ctx - uint8_t iv[16]; - }; - -+#define AESNI_MIN_ALIGN 16 -+#define AESNI_ALIGN(x) \ -+ ((void *)(((size_t)(x)+AESNI_MIN_ALIGN-1)&~(AESNI_MIN_ALIGN-1))) -+ - static int - aes_cipher_init (gnutls_cipher_algorithm_t algorithm, void **_ctx) - { -@@ -69,11 +73,11 @@ aes_cipher_setkey (void *_ctx, const void *userkey, size_t keysize) - struct aes_ctx *ctx = _ctx; - int ret; - -- ret = aesni_set_encrypt_key (userkey, keysize * 8, &ctx->expanded_key); -+ ret = aesni_set_encrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key)); - if (ret != 0) - return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED); - -- ret = aesni_set_decrypt_key (userkey, keysize * 8, &ctx->expanded_key_dec); -+ ret = aesni_set_decrypt_key (userkey, keysize * 8, AESNI_ALIGN(&ctx->expanded_key_dec)); - if (ret != 0) - return gnutls_assert_val (GNUTLS_E_ENCRYPTION_FAILED); - -@@ -95,7 +99,7 @@ aes_encrypt (void *_ctx, const void *src, size_t src_size, - { - struct aes_ctx *ctx = _ctx; - -- aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key, ctx->iv, 1); -+ aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key), ctx->iv, 1); - return 0; - } - -@@ -105,7 +109,7 @@ aes_decrypt (void *_ctx, const void *src, size_t src_size, - { - struct aes_ctx *ctx = _ctx; - -- aesni_cbc_encrypt (src, dst, src_size, &ctx->expanded_key_dec, ctx->iv, 0); -+ aesni_cbc_encrypt (src, dst, src_size, AESNI_ALIGN(&ctx->expanded_key_dec), ctx->iv, 0); - - return 0; - } -diff --git a/lib/accelerated/intel/aes-x86.h b/lib/accelerated/intel/aes-x86.h -index 8f49ff3..20a169e 100644 ---- a/lib/accelerated/intel/aes-x86.h -+++ b/lib/accelerated/intel/aes-x86.h -@@ -11,10 +11,11 @@ void register_x86_crypto (void); - # define ALIGN16 - #endif - -+#define AES_KEY_ALIGN_SIZE 8 - #define AES_MAXNR 14 - typedef struct - { -- uint32_t ALIGN16 rd_key[4 * (AES_MAXNR + 1)]; -+ uint32_t rd_key[4 * (AES_MAXNR + 1)+AES_KEY_ALIGN_SIZE]; - int rounds; - } AES_KEY; - diff --git a/testing/gnutls/gnutls.install b/testing/gnutls/gnutls.install deleted file mode 100644 index 9ce7c6edc..000000000 --- a/testing/gnutls/gnutls.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/testing/gpsd/PKGBUILD b/testing/gpsd/PKGBUILD deleted file mode 100644 index 88fdd571d..000000000 --- a/testing/gpsd/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 135939 2011-08-20 16:11:39Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org -# Contributor: Giacomo Rizzo <alt@free-os.it> - -pkgname=gpsd -pkgver=3.0 -pkgrel=3 -pkgdesc="GPS daemon and library to support USB/serial GPS devices" -arch=('i686' 'x86_64') -url="http://gpsd.berlios.de" -license=('BSD') -depends=('python2' 'libusb' 'bluez' 'desktop-file-utils') -optdepends=('php: generate a PHP status page for your GPS' - 'php-gd: image support for the PHP status page') -makedepends=('scons' 'docbook-xsl' 'chrpath') -backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules') -options=('!libtool' '!buildflags') -install="${pkgname}.install" -source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'gpsd' 'gpsd.conf.d') -md5sums=('c63d41a26868e9bdd48d9e311a9cc42c' - '1f3402f8e33a7032b9ae6dfd077234f7' - '3e963df3f9f7ef3572ecc648ae829315') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # fix python 2.7 path - sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ - -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - $(find . -name '*.py') - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gegps gpscat gpsfake \ - gpsprof xgps xgpsspeed - - scons prefix=/usr \ - systemd=yes \ - libQgpsmm=no \ - PYTHONPATH=/usr/bin/python2 - scons build -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Fix man pages path (FS#21715) - sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1 - - export DESTDIR="${pkgdir}" - scons install - - install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd" - - install -D -m644 "gpsd.rules" "${pkgdir}/lib/udev/rules.d/99-gpsd-usb.rules" - - sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug - install -D -m755 gpsd.hotplug "${pkgdir}/lib/udev/gpsd.hotplug" - - # GPSD needs RPATH - chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0 - chrpath -r /usr/lib/ "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps} - chrpath -r /usr/lib/ "${pkgdir}"/usr/sbin/{gpsd,gpsdctl} - - install -D -m644 packaging/X11/xgps.desktop \ - "${pkgdir}/usr/share/applications/xgps.desktop" - install -D -m644 packaging/X11/xgpsspeed.desktop \ - "${pkgdir}/usr/share/applications/xgpsspeed.desktop" - install -D -m644 packaging/X11/gpsd-logo.png \ - "${pkgdir}/usr/share/gpsd/gpsd-logo.png" - - install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd" - - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/gpsd/gpsd b/testing/gpsd/gpsd deleted file mode 100755 index b510a7542..000000000 --- a/testing/gpsd/gpsd +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd - -NAME=gpsd -DAEMON=/usr/sbin/$NAME -PIDFILE=/var/run/$NAME/$NAME.pid -PID=$(cat $PIDFILE 2>/dev/null) - -case "$1" in - start) - stat_busy "Starting $NAME" - [ ! -d /var/run/$NAME ] && install -d /var/run/$NAME - [ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /var/run/$NAME/$NAME.sock ${GPSD_OPTIONS} ${DEVICES} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $NAME - stat_done - fi - ;; - stop) - stat_busy "Stopping $NAME" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f $PIDFILE &>/dev/null - rm_daemon $NAME - stat_done - fi - ;; - - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/gpsd/gpsd.conf.d b/testing/gpsd/gpsd.conf.d deleted file mode 100644 index 9fef72cb9..000000000 --- a/testing/gpsd/gpsd.conf.d +++ /dev/null @@ -1,5 +0,0 @@ -# Default settings for gpsd. -START_DAEMON="true" -GPSD_OPTIONS="" -DEVICES="" -USBAUTO="true" diff --git a/testing/gpsd/gpsd.install b/testing/gpsd/gpsd.install deleted file mode 100644 index ee661fcb1..000000000 --- a/testing/gpsd/gpsd.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - echo ">>> Note: the supplied gpsd udev rules are device-specific, so" - echo ">>> if your device isn't detected correctly, please use lsusb or" - echo ">>> another suitable tool to determine the proper device IDs and" - echo ">>> use the commented rules to fill in the blanks for your device." - - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/testing/gtk-vnc/PKGBUILD b/testing/gtk-vnc/PKGBUILD deleted file mode 100644 index b8e4c8856..000000000 --- a/testing/gtk-vnc/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 134864 2011-08-08 05:59:44Z eric $ -# Maintainer: -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Allan McRae <mcrae_allan@hotmail.com> -# Contributor: lp76 <l.peduto@gmail.com> - -pkgname=gtk-vnc -pkgver=0.4.3 -pkgrel=2 -pkgdesc="A VNC viewer widget for GTK" -arch=('i686' 'x86_64') -url="http://live.gnome.org/gtk-vnc" -license=('LGPL') -depends=('gtk3') -optdepends=('gtk2: GTK2 widget') -makedepends=('intltool' 'pygtk' 'pygobject-devel' 'gtk-doc' 'gtk2') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377') - -build() { - cd "$srcdir" - cp -a $pkgname-$pkgver gtk3-build - - ( cd $pkgname-$pkgver - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --with-python --disable-static --with-gtk=2.0 - make ) - - ( cd gtk3-build - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --with-python --with-examples --disable-static --with-gtk=3.0 - make ) -} - -package() { - cd "${srcdir}" - make -C $pkgname-$pkgver -j1 DESTDIR="${pkgdir}" install - make -C gtk3-build -j1 DESTDIR="${pkgdir}" install -} diff --git a/testing/isl/PKGBUILD b/testing/isl/PKGBUILD deleted file mode 100644 index e15ced106..000000000 --- a/testing/isl/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 136094 2011-08-23 01:52:18Z heftig $ -# Maintainer: Allan McRae <allan@archlinux.org> - -pkgname=isl -pkgver=0.07 -pkgrel=1 -pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" -arch=('i686' 'x86_64') -url="http://www.kotnet.org/~skimo/isl/" -license=('LGPL2.1') -options=('!libtool') -source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) -md5sums=('0d1a38db9f1c7d526758092b985827ea') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make -j1 DESTDIR="$pkgdir/" install - - # this seems a better place for this file... - install -dm755 $pkgdir/usr/share/gdb/auto-load/ - mv $pkgdir/usr/{lib,share/gdb/auto-load}/libisl.so.7.0.0-gdb.py -} diff --git a/testing/lftp/PKGBUILD b/testing/lftp/PKGBUILD deleted file mode 100644 index 9cd8e8d15..000000000 --- a/testing/lftp/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 134943 2011-08-09 15:13:13Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> - -pkgname=lftp -pkgver=4.3.1 -pkgrel=2 -pkgdesc="Sophisticated command line based FTP client" -arch=('i686' 'x86_64') -license=('GPL3') -depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh') -optdepends=('perl: needed for convert-netscape-cookies and verify-file') -makedepends=('autoconf') -url="http://lftp.yar.ru/" -backup=('etc/lftp.conf') -source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ea45acfb47b5590d4675c50dc0c6e13c') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --with-gnutls \ - --without-openssl --disable-static - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - rm -rf ${pkgdir}/usr/lib -}
\ No newline at end of file diff --git a/testing/libedit/PKGBUILD b/testing/libedit/PKGBUILD deleted file mode 100644 index 781325d1b..000000000 --- a/testing/libedit/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 135318 2011-08-12 19:30:04Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Roman Cheplyaka <roma@ro-che.info> - -pkgname=libedit -pkgver=20110802_3.0 -pkgrel=1 -pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions' -arch=('i686' 'x86_64') -url='http://www.thrysoee.dk/editline/' -license=('BSD') -depends=('ncurses') -options=('!libtool') -source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz") -sha1sums=('b06e3cf248a4235617c71454e15ca3a54a61d467') - -build() { - cd "${srcdir}/${pkgname}-${pkgver/_/-}" - ./configure --prefix=/usr --enable-widec --enable-static=no - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver/_/-}" - make prefix="${pkgdir}"/usr install - - cp "${pkgdir}"/usr/share/man/man3/editline.3 "${pkgdir}"/usr/share/man/man3/el.3 - install -D -m0644 COPYING "${pkgdir}"/usr/share/licenses/libedit/LICENSE -} diff --git a/testing/libepc/PKGBUILD b/testing/libepc/PKGBUILD deleted file mode 100644 index 55d302e51..000000000 --- a/testing/libepc/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 135240 2011-08-11 10:52:34Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libepc -pkgver=0.3.11 -pkgrel=2 -pkgdesc="Easy Publish and Consume Library" -arch=(i686 x86_64) -license=('LGPL') -url="http://live.gnome.org/libepc" -depends=('gtk2' 'avahi' 'libsoup') -makedepends=('intltool') -options=('!libtool' '!makeflags') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('ec38fe4206fab7a8939fb351d7b419cc681ac44afcdd5aab9bdb8fc3386df25c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/libevent/PKGBUILD b/testing/libevent/PKGBUILD deleted file mode 100644 index 88a9d6c56..000000000 --- a/testing/libevent/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 136467 2011-08-29 20:57:46Z eric $ -# Maintainer: -# Contributor: Judd <jvinet@zeroflux.org> - -pkgname=libevent -pkgver=2.0.13 -pkgrel=1 -pkgdesc="An event notification library" -arch=('i686' 'x86_64') -url="http://www.monkey.org/~provos/libevent/" -license=('GPL2') -depends=('openssl') -optdepends=('python2: to use event_rpcgen.py') -options=('!libtool') -source=("http://www.monkey.org/~provos/libevent-$pkgver-stable.tar.gz") -md5sums=('af786b4b3f790c9d3279792edf7867fc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}-stable" - sed -i 's#python#python2#' event_rpcgen.py - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}-stable" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}-stable" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/libgnomecups/PKGBUILD b/testing/libgnomecups/PKGBUILD deleted file mode 100644 index ad012813e..000000000 --- a/testing/libgnomecups/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 135360 2011-08-13 07:42:39Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Paulius Palevicius <paulius@birzai.com> - -pkgname=libgnomecups -pkgver=0.2.3 -pkgrel=9 -pkgdesc="GNOME cups library" -arch=(i686 x86_64) -license=('LGPL' 'GPL') -url="http://www.gnome.org" -depends=('libcups' 'glib2' 'krb5' 'gnutls') -makedepends=('perlxml') -options=(!libtool) -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2 - libgnomecups_0.2.3-ignore-ipp-not-found.patch) -md5sums=('dc4920c15c9f886f73ea74fbff0ae48b' - '973a1b9d93013ce431400a14b78f5d94') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # This avoids generating huge 'IPP request failed with status 1030' lines - patch -Np1 -i ${srcdir}/libgnomecups_0.2.3-ignore-ipp-not-found.patch - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch b/testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch deleted file mode 100644 index 797367bf9..000000000 --- a/testing/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libgnomecups/gnome-cups-request.c 2007-01-31 10:49:17.000000000 -0800 -+++ b/libgnomecups/gnome-cups-request.c 2009-11-24 12:49:30.000000000 -0800 -@@ -349,7 +349,7 @@ - if (request->response == NULL) - status = IPP_INTERNAL_ERROR; - -- if (status > IPP_OK_CONFLICT) { -+ if (status > IPP_OK_CONFLICT && status != IPP_NOT_FOUND) { - g_warning ("IPP request failed with status %d", status); - if (request->error != NULL) - *(request->error) = g_error_new (GNOME_CUPS_ERROR, diff --git a/testing/libgnomeprint/PKGBUILD b/testing/libgnomeprint/PKGBUILD deleted file mode 100644 index 3e86111ac..000000000 --- a/testing/libgnomeprint/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 135363 2011-08-13 07:48:01Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libgnomeprint -pkgver=2.18.8 -pkgrel=3 -pkgdesc="Printing routines for GNOME" -arch=(i686 x86_64) -license=('LGPL' 'GPL') -depends=('pango' 'libart-lgpl' 'libxml2' 'libgnomecups' 'krb5' 'gnutls' 'libgcrypt' 'bzip2') -makedepends=('intltool' 'pkgconfig') -replaces=('libgnomeprint-cups') -conflicts=('libgnomeprint-cups') -url="http://www.gnome.org" -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/libgpod/PKGBUILD b/testing/libgpod/PKGBUILD deleted file mode 100644 index 58ef7b358..000000000 --- a/testing/libgpod/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 134924 2011-08-09 13:21:55Z ibiru $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=libgpod -pkgver=0.8.2 -pkgrel=2 -pkgdesc="A shared library to access the contents of an iPod" -arch=(i686 x86_64) -license=('LGPL') -depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice') -makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject-devel' 'gtk-sharp-2') -optdepends=('gtk-sharp-2: Mono bindings') -url="http://www.gtkpod.org/libgpod/" -source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2) -options=('!libtool' '!emptydirs') -md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --enable-udev --with-python=/usr/bin/python2 - make PREFIX=/usr -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX=/usr DESTDIR="${pkgdir}" install -} - diff --git a/testing/libimobiledevice/PKGBUILD b/testing/libimobiledevice/PKGBUILD deleted file mode 100644 index a6f48d786..000000000 --- a/testing/libimobiledevice/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 134921 2011-08-09 12:21:53Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Gabriel Martinez < reitaka at gmail dot com > - -pkgname=libimobiledevice -pkgver=1.1.1 -pkgrel=2 -pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux" -url="http://libimobiledevice.org/" -arch=('i686' 'x86_64') -license=('GPL2' 'LGPL2.1') -depends=('glib2' 'gnutls' 'libgcrypt' 'libplist' 'usbmuxd') -makedepends=('swig' 'python2') -options=('!libtool') -source=(http://libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2 - swig-version-check.patch) -md5sums=('cdc13037e822d9ac2e109536701d153a' - '8bb215e36fe0e08a72332c108c7842cc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # SWIG version check is wrong (still not fixed upstream) - patch -p1 -i "$srcdir"/swig-version-check.patch - PYTHON=/usr/bin/python2 ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/libimobiledevice/swig-version-check.patch b/testing/libimobiledevice/swig-version-check.patch deleted file mode 100644 index c56b095db..000000000 --- a/testing/libimobiledevice/swig-version-check.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure ---- libimobiledevice-1.0.3.old/configure 2010-10-04 07:38:37.000000000 -0700 -+++ libimobiledevice-1.0.3/configure 2010-10-08 05:43:05.466686656 -0700 -@@ -3477,9 +3477,7 @@ - if test -z "$available_patch" ; then - available_patch=0 - fi -- if test $available_major -ne $required_major \ -- -o $available_minor -ne $required_minor \ -- -o $available_patch -lt $required_patch ; then -+ if test $available_major -lt $required_major ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required. You have $swig_version. You should look at http://www.swig.org" >&5 - $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required. You have $swig_version. You should look at http://www.swig.org" >&2;} - SWIG=false diff --git a/testing/libmpc/PKGBUILD b/testing/libmpc/PKGBUILD deleted file mode 100644 index cc456ec0d..000000000 --- a/testing/libmpc/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 135486 2011-08-14 09:36:03Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -pkgname=libmpc -pkgver=0.9 -pkgrel=2 -pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision" -arch=('i686' 'x86_64') -url="http://www.multiprecision.org/" -license=('LGPL') -depends=('mpfr>=3.0.0') -options=('!libtool') -install=libmpc.install -source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz - libmpc-0.9-configure_cflags_egrep_issue.patch) -md5sums=('0d6acab8d214bd7d1fbbc593e83dd00d' - '35d5bb02dc6c1153e581b7c34a738a08') - -build() { - cd "${srcdir}/mpc-${pkgver}" - - # http://lists.gforge.inria.fr/pipermail/mpc-discuss/2011-February/000805.html - patch -Np1 -i $srcdir/libmpc-0.9-configure_cflags_egrep_issue.patch - autoreconf - - ./configure --prefix=/usr - make -} - -check() { - cd "${srcdir}/mpc-${pkgver}" - make check -} - -package() { - cd "${srcdir}/mpc-${pkgver}" - make DESTDIR="${pkgdir}" install - mv ${pkgdir}/usr/share/info/{mpc,libmpc}.info -} diff --git a/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch b/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch deleted file mode 100644 index 3bf324728..000000000 --- a/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- trunk/configure.ac 2011/02/21 12:18:31 932 -+++ trunk/configure.ac 2011/02/21 16:41:09 936 -@@ -33,7 +33,7 @@ - AC_CANONICAL_HOST - AC_CONFIG_MACRO_DIR([m4]) - --dnl Extra arguments to configure -+# Extra arguments to configure - AC_ARG_WITH([mpfr_include], - [AC_HELP_STRING([--with-mpfr-include=DIR], - [MPFR include directory])], -@@ -85,18 +85,19 @@ - ) - - --dnl Setup CC and CFLAGS -+# Setup CC and CFLAGS -+AC_PROG_CC -+AC_LANG(C) - --dnl Check for user specification of CC or CFLAGS -+# Set up LibTool -+AC_PROG_LIBTOOL -+ -+# Check for user specification of CC or CFLAGS - if test -n "$CFLAGS" || test -n "$CC" ; then - user_redefine_cc=yes - fi - --# Check for programs --AC_PROG_CC --AC_LANG(C) -- --dnl Check GMP Header -+# Check GMP Header - AC_MSG_CHECKING(for gmp.h) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include "gmp.h" -@@ -105,22 +106,19 @@ - AC_MSG_ERROR([gmp.h can't be found, or is unusable.]) - ]) - --dnl Check for GMP CFLAGS in gmp.h -+# Check for GMP CFLAGS in gmp.h - if test -z "$user_redefine_cc" ; then - MPC_GMP_CC_CFLAGS - fi - - --dnl Configs for Windows DLLs -+# Configs for Windows DLLs - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - MPC_WINDOWS - esac - - --dnl Finally set up LibTool --AC_PROG_LIBTOOL -- - # Checks for header files. - AC_HEADER_STDC - AC_CHECK_HEADERS([complex.h locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h]) diff --git a/testing/libmpc/libmpc.install b/testing/libmpc/libmpc.install deleted file mode 100644 index b0718c745..000000000 --- a/testing/libmpc/libmpc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(libmpc.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/testing/libssh2/PKGBUILD b/testing/libssh2/PKGBUILD deleted file mode 100644 index 342e889fa..000000000 --- a/testing/libssh2/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 136165 2011-08-23 16:20:17Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: ice-man <icemanf@gmail.com> - -pkgname=libssh2 -pkgver=1.2.9 -pkgrel=1 -pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" -url="http://www.libssh2.org/" -arch=('i686' 'x86_64') -license=('BSD') -depends=('openssl') -makedepends=('zlib') -options=('!libtool') -source=("http://www.libssh2.org/download/${pkgname}-${pkgver}.tar.gz") -md5sums=('62ea143c41c6ed437a55d6a0b0579f2f') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/testing/libvncserver/PKGBUILD b/testing/libvncserver/PKGBUILD deleted file mode 100644 index f67790f2e..000000000 --- a/testing/libvncserver/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 135543 2011-08-15 02:52:19Z eric $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=libvncserver -pkgver=0.9.8 -pkgrel=4 -pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server" -arch=('i686' 'x86_64') -url="http://libvncserver.sourceforge.net/" -license=('GPL') -depends=('libjpeg' 'gnutls' 'libgcrypt') -options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz") -md5sums=('dda9e75a1d5d7c37bb57d90ead7b32b3') - -build() { - cd "${srcdir}/LibVNCServer-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/LibVNCServer-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/links/PKGBUILD b/testing/links/PKGBUILD deleted file mode 100644 index b826f16da..000000000 --- a/testing/links/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 135532 2011-08-15 01:04:50Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=links -pkgver=2.3 -pkgrel=1 -pkgdesc="A text WWW browser, similar to Lynx" -arch=('i686' 'x86_64') -url="http://links.twibright.com/" -license=('GPL') -depends=('bzip2' 'zlib' 'openssl' 'gpm') -makedepends=('libtiff' 'libpng' 'libxt') -optdepends=('libx11: for using xlinks' 'libtiff: for using xlinks' 'libpng: for using xlinks') -provides=('links-g') -conflicts=('links-g') -replaces=('links-g') -source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop) -md5sums=('1dc17862e766cec7c544166186e7167b' - '7c47b15aaef51f1de129ff3a2afb7eac') -sha1sums=('0f91e550a80a2bc358ce3bdf48a23504a0582b02' - 'f600e27c2a71184444f7dd07a10230aa44463a02') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - (cd intl; ./gen-intl; ./synclang) - ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \ - --enable-graphics --with-x --with-fb - make - mv links xlinks - - ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \ - --disable-graphics --without-x --without-fb - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 xlinks "${pkgdir}/usr/bin/xlinks" - ln -s links.1.gz "${pkgdir}/usr/share/man/man1/xlinks.1.gz" - - install -D -m644 "${srcdir}/links.desktop" "${pkgdir}/usr/share/applications/links.desktop" - install -d "${pkgdir}/usr/share/pixmaps" - install -m644 links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm "${pkgdir}/usr/share/pixmaps/" - - install -d "${pkgdir}/usr/share/doc/links/calibration" - install -m644 doc/links_cal/* "${pkgdir}/usr/share/doc/links/calibration/" -} diff --git a/testing/links/links.desktop b/testing/links/links.desktop deleted file mode 100644 index 9d6338a5b..000000000 --- a/testing/links/links.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=Links -Exec=xlinks -g -Icon=links_32x32.xpm -Type=Application -Terminal=false -Categories=Network;WebBrowser; diff --git a/testing/linux-api-headers/PKGBUILD b/testing/linux-api-headers/PKGBUILD deleted file mode 100644 index 06dce5838..000000000 --- a/testing/linux-api-headers/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 135474 2011-08-14 09:22:16Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -pkgname=linux-api-headers -pkgver=3.0.1 -_basever=3.0 -pkgrel=1 -pkgdesc="Kernel headers sanitized for use in userspace" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/libc" -license=('GPL2') -provides=("kernel-headers=${pkgver}") -conflicts=('kernel-headers') -replaces=('kernel-headers') -source=(http://www.kernel.org/pub/linux/kernel/v${_basever}/linux-${_basever}.tar.bz2 - http://www.kernel.org/pub/linux/kernel/v${_basever}/patch-${pkgver}.bz2) -md5sums=('398e95866794def22b12dfbc15ce89c0' - 'ac49f7907f1fc85fbab92d0f1aa1552a') - -build() { - cd ${srcdir}/linux-${_basever} - [[ $pkgver != $_basever ]] && patch -Np1 -i ${srcdir}/patch-${pkgver} - - make mrproper - make headers_check -} - -package() { - cd ${srcdir}/linux-${_basever} - make INSTALL_HDR_PATH=${pkgdir}/usr headers_install - - # use headers from libdrm - rm -rf ${pkgdir}/usr/include/drm - - # clean-up unnecessary files generated during install - find ${pkgdir} -name .install -or -name ..install.cmd | xargs rm -f -} diff --git a/testing/logrotate/PKGBUILD b/testing/logrotate/PKGBUILD deleted file mode 100644 index eac5714c2..000000000 --- a/testing/logrotate/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 136073 2011-08-22 13:06:08Z allan $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> - -pkgname=logrotate -pkgver=3.8.0 -pkgrel=2 -pkgdesc="Rotates system logs automatically" -arch=('i686' 'x86_64') -url="https://fedorahosted.org/logrotate/" -license=('GPL') -groups=('base') -depends=('popt' 'cron' 'gzip') -backup=('etc/logrotate.conf') -source=(https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz - logrotate-3.8.0-noasprintf.patch - logrotate.conf - logrotate.cron.daily) -md5sums=('590f77c13077a4c384dbec7ca9c5f242' - '624801859beb9abe7958b6392c854d72' - '462a5f364717461537eb2ae6394ad23e' - '8e23d5d4cc29b1e055b24df87e355cdc') - -build() { - cd "$srcdir/${pkgname}-${pkgver}" - - patch -Np1 -i "$srcdir"/logrotate-3.8.0-noasprintf.patch - - sed -i 's|#define DEFAULT_MAIL_COMMAND .*|#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"|'\ - config.h - sed -i "s|CFLAGS = -Wall|CFLAGS = -Wall $CFLAGS|" Makefile - sed -i 's|$(BASEDIR)/man|$(BASEDIR)/share/man|' Makefile - - make -} - -check() { - cd "$srcdir/${pkgname}-${pkgver}" - make test -} - -package() { - cd "$srcdir/${pkgname}-${pkgver}" - make PREFIX="$pkgdir" install - - install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf" - install -Dm744 "$srcdir/logrotate.cron.daily" "$pkgdir/etc/cron.daily/logrotate" -} diff --git a/testing/logrotate/logrotate-3.8.0-noasprintf.patch b/testing/logrotate/logrotate-3.8.0-noasprintf.patch deleted file mode 100644 index b9464e230..000000000 --- a/testing/logrotate/logrotate-3.8.0-noasprintf.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.8.0.orig/config.c logrotate-3.8.0/config.c ---- logrotate-3.8.0.orig/config.c 2011-06-21 04:12:02.000000000 -0400 -+++ logrotate-3.8.0/config.c 2011-07-12 13:47:36.274319050 -0400 -@@ -41,39 +41,6 @@ - #endif - #endif - --#if !defined(asprintf) --#include <stdarg.h> -- --int asprintf(char **string_ptr, const char *format, ...) --{ -- va_list arg; -- char *str; -- int size; -- int rv; -- -- va_start(arg, format); -- size = vsnprintf(NULL, 0, format, arg); -- size++; -- va_start(arg, format); -- str = malloc(size); -- if (str == NULL) { -- va_end(arg); -- /* -- * Strictly speaking, GNU asprintf doesn't do this, -- * but the caller isn't checking the return value. -- */ -- fprintf(stderr, "failed to allocate memory\\n"); -- exit(1); -- } -- rv = vsnprintf(str, size, format, arg); -- va_end(arg); -- -- *string_ptr = str; -- return (rv); --} -- --#endif -- - enum { - STATE_DEFAULT = 2, - STATE_SKIP_LINE = 4, -diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.8.0.orig/logrotate.h logrotate-3.8.0/logrotate.h ---- logrotate-3.8.0.orig/logrotate.h 2011-06-21 04:12:02.000000000 -0400 -+++ logrotate-3.8.0/logrotate.h 2011-07-12 13:47:38.949285608 -0400 -@@ -66,8 +66,5 @@ extern int numLogs; - extern int debug; - - int readAllConfigPaths(const char **paths); --#if !defined(asprintf) --int asprintf(char **string_ptr, const char *format, ...); --#endif - - #endif diff --git a/testing/logrotate/logrotate.conf b/testing/logrotate/logrotate.conf deleted file mode 100644 index 88b4935cd..000000000 --- a/testing/logrotate/logrotate.conf +++ /dev/null @@ -1,31 +0,0 @@ -# see "man logrotate" for details -# rotate log files weekly -weekly - -# keep 4 weeks worth of backlogs -rotate 4 - -# restrict maximum size of log files -#size 20M - -# create new (empty) log files after rotating old ones -create - -# uncomment this if you want your log files compressed -#compress - -# Logs are moved into directory for rotation -# olddir /var/log/archive - -# Ignore pacman saved files -tabooext + .pacorig .pacnew .pacsave - -# Arch packages drop log rotation information into this directory -include /etc/logrotate.d - -/var/log/wtmp { - monthly - create 0664 root root - rotate 1 -} - diff --git a/testing/logrotate/logrotate.cron.daily b/testing/logrotate/logrotate.cron.daily deleted file mode 100755 index e8ab921ea..000000000 --- a/testing/logrotate/logrotate.cron.daily +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/usr/sbin/logrotate /etc/logrotate.conf diff --git a/testing/loudmouth/01-fix-sasl-md5-digest-uri.patch b/testing/loudmouth/01-fix-sasl-md5-digest-uri.patch deleted file mode 100644 index 5bca69c0c..000000000 --- a/testing/loudmouth/01-fix-sasl-md5-digest-uri.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/loudmouth/lm-connection.c b/loudmouth/lm-connection.c -index 21c1bc2..ae8de94 100644 ---- a/loudmouth/lm-connection.c -+++ b/loudmouth/lm-connection.c -@@ -1441,11 +1441,18 @@ lm_connection_authenticate (LmConnection *connection, - connection->effective_jid = g_strdup_printf ("%s/%s", - connection->jid, connection->resource); - - if (connection->use_sasl) { -+ gchar *domain = NULL; -+ -+ if (!connection_get_server_from_jid (connection->jid, &domain)) { -+ domain = g_strdup (connection->server); -+ } -+ - lm_sasl_authenticate (connection->sasl, - username, password, -- connection->server, -+ domain, - connection_sasl_auth_finished); -+ g_free (domain); - - connection->features_cb = - lm_message_handler_new (connection_features_cb, diff --git a/testing/loudmouth/03-drop-stanzas-on-fail.patch b/testing/loudmouth/03-drop-stanzas-on-fail.patch deleted file mode 100644 index 87b86a998..000000000 --- a/testing/loudmouth/03-drop-stanzas-on-fail.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Sjoerd Simons <sjoerd.simons@collabora.co.uk> -Date: Tue, 13 Jan 2009 11:28:44 +0000 -Subject: [PATCH] Drop stanzas when failing to convert them to LmMessages - -when a stanza comes in that for some reason can't be parsed into an LmMessage, -just drop them on the floor instead of blocking the parser. I've seen this -issue happen in practise because some (buggy?) client sending an iq with a -prefix e.g. <client:iq xmlns:client="jabber:client" ... /> ---- - loudmouth/lm-parser.c | 15 ++++++--------- - 1 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/loudmouth/lm-parser.c b/loudmouth/lm-parser.c -index 1938d56..89f6675 100644 ---- a/loudmouth/lm-parser.c -+++ b/loudmouth/lm-parser.c -@@ -151,19 +151,16 @@ parser_end_node_cb (GMarkupParseContext *context, - if (!m) { - g_warning ("Couldn't create message: %s\n", - parser->cur_root->name); -- return; -- } -- -- g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER, -+ } else { -+ g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER, - "Have a new message\n"); -- if (parser->function) { -- (* parser->function) (parser, m, parser->user_data); -+ if (parser->function) { -+ (* parser->function) (parser, m, parser->user_data); -+ } -+ lm_message_unref (m); - } - -- lm_message_unref (m); - lm_message_node_unref (parser->cur_root); -- -- - parser->cur_node = parser->cur_root = NULL; - } else { - LmMessageNode *tmp_node; --- -1.5.6.5 - diff --git a/testing/loudmouth/04-use-pkg-config-for-gnutls.patch b/testing/loudmouth/04-use-pkg-config-for-gnutls.patch deleted file mode 100644 index 20f388e89..000000000 --- a/testing/loudmouth/04-use-pkg-config-for-gnutls.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: use pkg-config to detect gnutls -Debian: http://bugs.debian.org/529835 -Origin: http://groups.google.com/group/loudmouth-dev/browse_thread/thread/3f78255837048daf# - ---- a/configure.ac.orig 2009-08-16 20:29:36.000000000 +0200 -+++ b/configure.ac 2009-08-16 20:30:43.000000000 +0200 -@@ -146,10 +146,12 @@ AC_ARG_WITH(openssl-libs, - enable_ssl=no - if test "x$ac_ssl" = "xgnutls"; then - dnl Look for GnuTLS -- AM_PATH_LM_LIBGNUTLS($GNUTLS_REQUIRED, have_libgnutls=yes, have_libgnutls=no) -- if test "x$have_libgnutls" = "xyes"; then -- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" -- LIBS="$LIBS $LIBGNUTLS_LIBS" -+ PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED, have_gnutls=yes, have_gnutls=no) -+ if test "x$have_gnutls" = "xyes"; then -+ AC_SUBST(ASYNCNS_CFLAGS) -+ AC_SUBST(ASYNCNS_LIBS) -+ CFLAGS="$CFLAGS $GNUTLS_CFLAGS" -+ LIBS="$LIBS $GNUTLS_LIBS" - AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.]) - enable_ssl=GnuTLS - else diff --git a/testing/loudmouth/PKGBUILD b/testing/loudmouth/PKGBUILD deleted file mode 100644 index d1686df56..000000000 --- a/testing/loudmouth/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: damir <damir@archlinux.org> -# Contributor: Brice Carpentier <brice.carpentier@orange.fr> - -pkgname=loudmouth -pkgver=1.4.3 -pkgrel=3 -pkgdesc="A lightweight Jabber client library written in C/Glib" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://groups.google.com/group/loudmouth-dev" -depends=('glib2' 'gnutls' 'libidn') -options=('!libtool') -makedepends=('intltool' 'pkgconfig' 'gtk-doc') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2 - 01-fix-sasl-md5-digest-uri.patch - 03-drop-stanzas-on-fail.patch - 04-use-pkg-config-for-gnutls.patch) -md5sums=('55339ca42494690c3942ee1465a96937' - 'dc799cea18b24847b1e008c7424010a3' - 'b7b2d81b01a5eee5fd5e21cae67b4af7' - 'bffb25b9551df43255fe1706588582f3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/01-fix-sasl-md5-digest-uri.patch" - patch -Np1 -i "${srcdir}/03-drop-stanzas-on-fail.patch" - patch -Np1 -i "${srcdir}/04-use-pkg-config-for-gnutls.patch" - libtoolize --force - autoreconf - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules deleted file mode 100644 index d2c167324..000000000 --- a/testing/lvm2/11-dm-initramfs.rules +++ /dev/null @@ -1,3 +0,0 @@ -# needed with new udev/mkinitcpio and as implemented in dracut: -# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54> -SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist" diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD deleted file mode 100644 index c2caf6563..000000000 --- a/testing/lvm2/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 135887 2011-08-20 02:15:24Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgbase=lvm2 -pkgname=('lvm2' 'device-mapper') -pkgver=2.02.88 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://sourceware.org/lvm2/" -license=('GPL2' 'LGPL2.1') -groups=('base') -source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz - lvm2_install - lvm2_hook - 11-dm-initramfs.rules) -md5sums=('321429cd1b1526a29cf6d75018b1e4bb' - 'dcb82506d732cc7b10159a89b579dba8' - '8d613b84a175cd85f752a75198e40e15' - '69e40679cd8b3658bfc619e48baae125') -sha1sums=('05a4fb09cb5e3d680ad1b268c941968853fb1979' - '7f108b2f2056eb050fc898bf5190ecf9145aed8a' - 'a0e0513c2efb183006e57e595d93ce18be297928' - 'f6a554eea9557c3c236df2943bb6e7e723945c41') - -build() { - cd "${srcdir}/LVM2.${pkgver}" - sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh - unset LDFLAGS - ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ - --includedir=/usr/include --with-usrlibdir=/usr/lib \ - --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ - --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules - make -} - -package_device-mapper() { - pkgdesc="Device mapper userspace library and tools" - url="http://sourceware.org/dm/" - depends=('glibc' 'udev') - - cd "${srcdir}/LVM2.${pkgver}" - make DESTDIR="${pkgdir}" install_device-mapper - # extra udev rule for device-mapper in initramfs - install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules" -} - -package_lvm2() { - pkgdesc="Logical Volume Manager 2 utilities" - depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') - conflicts=('lvm' 'mkinitcpio<0.7') - backup=('etc/lvm/lvm.conf') - options=('!makeflags') - - cd "${srcdir}/LVM2.${pkgver}" - make DESTDIR="${pkgdir}" install_lvm2 - # install applib - make -C liblvm DESTDIR="${pkgdir}" install - # /etc directories - install -d "${pkgdir}"/etc/lvm/{archive,backup} - # mkinitcpio hook - install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" - install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" -} diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook deleted file mode 100644 index 874b91d06..000000000 --- a/testing/lvm2/lvm2_hook +++ /dev/null @@ -1,25 +0,0 @@ -# vim:set ft=sh: -run_hook () -{ - /sbin/modprobe -q dm-mod >/dev/null 2>&1 - if [ -e "/sys/class/misc/device-mapper" ]; then - if [ ! -e "/dev/mapper/control" ]; then - mkdir /dev/mapper - mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') - fi - - # If the lvmwait= parameter has been specified on the command line - # wait for the device(s) before trying to activate the volume group(s) - if [ -n "${lvmwait}" ]; then - for pvdev in $(echo ${lvmwait} | sed 's|,| |g'); do - poll_device ${pvdev} ${rootdelay} - done - fi - - [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" - - msg "Activating logical volumes..." - [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit - eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET - fi -} diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install deleted file mode 100644 index 94175b523..000000000 --- a/testing/lvm2/lvm2_install +++ /dev/null @@ -1,29 +0,0 @@ -# vim: set ft=sh: - -build() -{ - MODULES=" dm-mod dm-snapshot dm-mirror" - BINARIES="" - FILES="" - SCRIPT="lvm2" - - add_binary "/sbin/lvm" - add_binary "/sbin/dmsetup" - add_file "/lib/udev/rules.d/10-dm.rules" - add_file "/lib/udev/rules.d/13-dm-disk.rules" - add_file "/lib/udev/rules.d/95-dm-notify.rules" - add_file "/lib/udev/rules.d/11-dm-lvm.rules" - add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" -} - -help () -{ -cat<<HELPEOF - This hook loads the necessary modules for an LVM2 root device. - - The optional lvmwait= parameter followed by a comma-separated - list of device names can be given on the command line. - It will cause the hook to wait until all given devices exist - before trying to scan and activate any volume groups. -HELPEOF -} diff --git a/testing/lzo2/PKGBUILD b/testing/lzo2/PKGBUILD deleted file mode 100644 index 2bec2cfa8..000000000 --- a/testing/lzo2/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 136326 2011-08-26 12:38:07Z tpowa $ -# Contributor: Low Kian Seong <fastmail_low@speedymail.org> -# Maintainer: dorphell <dorphell@archlinux.org> -pkgname=lzo2 -pkgver=2.06 -pkgrel=1 -pkgdesc="Portable lossless data compression library" -arch=('i686' 'x86_64') -url="http://www.oberhumer.com/opensource/lzo" -license=('GPL') -depends=('glibc') -source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz) -options=(!libtool) -md5sums=('95380bd4081f85ef08c5209f4107e9f8') - -build() { - cd "${srcdir}/lzo-${pkgver}" - - ./configure --prefix=/usr --enable-shared - make - - # build minilzo - gcc $CFLAGS -fpic -Iinclude/lzo -o minilzo/minilzo.o -c minilzo/minilzo.c - gcc -g -shared -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o -} - -package() { - cd "${srcdir}/lzo-${pkgver}" - make DESTDIR=${pkgdir} install - - # install minilzo - install -m 755 libminilzo.so.0 ${pkgdir}/usr/lib - install -p -m 644 minilzo/minilzo.h ${pkgdir}/usr/include/lzo - cd ${pkgdir}/usr/lib - ln -s libminilzo.so.0 libminilzo.so -} diff --git a/testing/mkinitcpio-busybox/PKGBUILD b/testing/mkinitcpio-busybox/PKGBUILD deleted file mode 100644 index 0e50e672b..000000000 --- a/testing/mkinitcpio-busybox/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 135465 2011-08-13 23:34:47Z thomas $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> -pkgname=mkinitcpio-busybox -pkgver=1.18.5 -pkgrel=1 -pkgdesc="base initramfs tools" -arch=('i686' 'x86_64') -url="http://www.busybox.net/" -license=('GPL') -depends=('glibc') -source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2 - config) -sha256sums=('10954fcd5c48d8a262a3497b16227bf983a05658bf2bf661af2fdeca773f2fc0' - '0961b4db5eb5eaa1b8d353a3fc792884f4f2733ec0f5715ba88a0e667f0f48ec') - -build() { - cd "${srcdir}/busybox-${pkgver}" - - unset CFLAGS CXXFLAGS - if [ ${CARCH} = "x86_64" ]; then - sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config - else - sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=i686 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config - fi - make -} - -package() { - install -D -m755 "${srcdir}/busybox-${pkgver}"/busybox "${pkgdir}/lib/initcpio/busybox" -} -# vim:set ts=2 sw=2 et: diff --git a/testing/mkinitcpio-busybox/config b/testing/mkinitcpio-busybox/config deleted file mode 100644 index 31a9d4330..000000000 --- a/testing/mkinitcpio-busybox/config +++ /dev/null @@ -1,990 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.18.5 -# Sun Aug 14 01:22:25 2011 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -# CONFIG_DESKTOP is not set -# CONFIG_EXTRA_COMPAT is not set -# CONFIG_INCLUDE_SUSv2 is not set -# CONFIG_USE_PORTABLE_CODE is not set -CONFIG_PLATFORM_LINUX=y -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -# CONFIG_FEATURE_VERBOSE_USAGE is not set -# CONFIG_FEATURE_COMPRESS_USAGE is not set -CONFIG_FEATURE_INSTALLER=y -# CONFIG_INSTALL_NO_USR is not set -# CONFIG_LOCALE_SUPPORT is not set -CONFIG_UNICODE_SUPPORT=y -# CONFIG_UNICODE_USING_LOCALE is not set -# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set -CONFIG_SUBST_WCHAR=63 -CONFIG_LAST_SUPPORTED_WCHAR=767 -# CONFIG_UNICODE_COMBINING_WCHARS is not set -# CONFIG_UNICODE_WIDE_WCHARS is not set -# CONFIG_UNICODE_BIDI_SUPPORT is not set -# CONFIG_UNICODE_NEUTRAL_TABLE is not set -# CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_LONG_OPTS=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_WTMP is not set -# CONFIG_FEATURE_UTMP is not set -# CONFIG_FEATURE_PIDFILE is not set -CONFIG_FEATURE_SUID=y -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox" -CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_PIE is not set -# CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_EXTRA_CFLAGS="" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set - -# -# Installation Options ("make install" behavior) -# -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" - -# -# Busybox Library Tuning -# -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=0 -CONFIG_FEATURE_FAST_TOP=y -# CONFIG_FEATURE_ETC_NETWORKS is not set -# CONFIG_FEATURE_USE_TERMIOS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -# CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=15 -# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set -CONFIG_FEATURE_TAB_COMPLETION=y -# CONFIG_FEATURE_USERNAME_COMPLETION is not set -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set -CONFIG_FEATURE_NON_POSIX_CP=y -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -# CONFIG_FEATURE_HWIB is not set - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_FEATURE_SEAMLESS_XZ is not set -# CONFIG_FEATURE_SEAMLESS_LZMA is not set -# CONFIG_FEATURE_SEAMLESS_BZ2 is not set -# CONFIG_FEATURE_SEAMLESS_GZ is not set -# CONFIG_FEATURE_SEAMLESS_Z is not set -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -# CONFIG_FEATURE_AR_CREATE is not set -# CONFIG_BUNZIP2 is not set -# CONFIG_BZIP2 is not set -# CONFIG_CPIO is not set -# CONFIG_FEATURE_CPIO_O is not set -# CONFIG_FEATURE_CPIO_P is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -# CONFIG_GUNZIP is not set -# CONFIG_GZIP is not set -# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set -# CONFIG_LZOP is not set -# CONFIG_LZOP_COMPR_HIGH is not set -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -# CONFIG_TAR is not set -# CONFIG_FEATURE_TAR_CREATE is not set -# CONFIG_FEATURE_TAR_AUTODETECT is not set -# CONFIG_FEATURE_TAR_FROM is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_FEATURE_TAR_TO_COMMAND is not set -# CONFIG_FEATURE_TAR_UNAME_GNAME is not set -# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set -# CONFIG_FEATURE_TAR_SELINUX is not set -# CONFIG_UNCOMPRESS is not set -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -# CONFIG_LZMA is not set -# CONFIG_UNXZ is not set -# CONFIG_XZ is not set -# CONFIG_UNZIP is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -CONFIG_CAT=y -# CONFIG_DATE is not set -# CONFIG_FEATURE_DATE_ISOFMT is not set -# CONFIG_FEATURE_DATE_NANO is not set -# CONFIG_FEATURE_DATE_COMPAT is not set -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y -# CONFIG_TR is not set -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set -# CONFIG_BASE64 is not set -# CONFIG_CAL is not set -# CONFIG_CATV is not set -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set -CONFIG_CHROOT=y -# CONFIG_CKSUM is not set -# CONFIG_COMM is not set -CONFIG_CP=y -# CONFIG_FEATURE_CP_LONG_OPTIONS is not set -CONFIG_CUT=y -CONFIG_DD=y -# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set -# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set -# CONFIG_FEATURE_DD_IBS_OBS is not set -CONFIG_DF=y -# CONFIG_FEATURE_DF_FANCY is not set -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -# CONFIG_UNIX2DOS is not set -CONFIG_DU=y -# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y -# CONFIG_EXPAND is not set -# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set -CONFIG_EXPR=y -CONFIG_EXPR_MATH_SUPPORT_64=y -CONFIG_FALSE=y -# CONFIG_FOLD is not set -# CONFIG_FSYNC is not set -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -# CONFIG_HOSTID is not set -# CONFIG_ID is not set -CONFIG_INSTALL=y -CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -# CONFIG_LENGTH is not set -CONFIG_LN=y -# CONFIG_LOGNAME is not set -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -# CONFIG_FEATURE_LS_COLOR is not set -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y -# CONFIG_NICE is not set -# CONFIG_NOHUP is not set -# CONFIG_OD is not set -# CONFIG_PRINTENV is not set -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y -CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SHA256SUM=y -CONFIG_SHA512SUM=y -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_FEATURE_FLOAT_SLEEP=y -CONFIG_SORT=y -# CONFIG_FEATURE_SORT_BIG is not set -# CONFIG_SPLIT is not set -# CONFIG_FEATURE_SPLIT_FANCY is not set -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y -# CONFIG_STTY is not set -# CONFIG_SUM is not set -# CONFIG_SYNC is not set -# CONFIG_TAC is not set -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -# CONFIG_TEE is not set -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TOUCH=y -CONFIG_TRUE=y -# CONFIG_TTY is not set -CONFIG_UNAME=y -# CONFIG_UNEXPAND is not set -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set -CONFIG_UNIQ=y -# CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -CONFIG_WC=y -CONFIG_FEATURE_WC_LARGE=y -# CONFIG_WHO is not set -# CONFIG_WHOAMI is not set -CONFIG_YES=y - -# -# Common options for cp and mv -# -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum, sha256sum, sha512sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -# CONFIG_CHVT is not set -# CONFIG_FGCONSOLE is not set -# CONFIG_CLEAR is not set -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set -CONFIG_KBD_MODE=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -# CONFIG_RESET is not set -# CONFIG_RESIZE is not set -# CONFIG_FEATURE_RESIZE_PRINT is not set -# CONFIG_SETCONSOLE is not set -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -CONFIG_SETFONT=y -# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set -CONFIG_DEFAULT_SETFONT_DIR="" -# CONFIG_SETKEYCODES is not set -# CONFIG_SETLOGCONS is not set -# CONFIG_SHOWKEY is not set - -# -# Common options for loadfont and setfont -# -CONFIG_FEATURE_LOADFONT_PSF2=y -CONFIG_FEATURE_LOADFONT_RAW=y - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -# CONFIG_RUN_PARTS is not set -# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set -# CONFIG_START_STOP_DAEMON is not set -# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set -# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set -# CONFIG_WHICH is not set - -# -# Editors -# -# CONFIG_PATCH is not set -CONFIG_AWK=y -# CONFIG_FEATURE_AWK_LIBM is not set -# CONFIG_CMP is not set -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_ED is not set -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=4096 -CONFIG_FEATURE_VI_8BIT=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -# CONFIG_FEATURE_ALLOW_EXEC is not set - -# -# Finding Utilities -# -# CONFIG_FIND is not set -# CONFIG_FEATURE_FIND_PRINT0 is not set -# CONFIG_FEATURE_FIND_MTIME is not set -# CONFIG_FEATURE_FIND_MMIN is not set -# CONFIG_FEATURE_FIND_PERM is not set -# CONFIG_FEATURE_FIND_TYPE is not set -# CONFIG_FEATURE_FIND_XDEV is not set -# CONFIG_FEATURE_FIND_MAXDEPTH is not set -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -# CONFIG_FEATURE_FIND_EXEC is not set -# CONFIG_FEATURE_FIND_USER is not set -# CONFIG_FEATURE_FIND_GROUP is not set -# CONFIG_FEATURE_FIND_NOT is not set -# CONFIG_FEATURE_FIND_DEPTH is not set -# CONFIG_FEATURE_FIND_PAREN is not set -# CONFIG_FEATURE_FIND_SIZE is not set -# CONFIG_FEATURE_FIND_PRUNE is not set -# CONFIG_FEATURE_FIND_DELETE is not set -# CONFIG_FEATURE_FIND_PATH is not set -# CONFIG_FEATURE_FIND_REGEX is not set -# CONFIG_FEATURE_FIND_CONTEXT is not set -# CONFIG_FEATURE_FIND_LINKS is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set -# CONFIG_FEATURE_GREP_CONTEXT is not set -# CONFIG_XARGS is not set -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set - -# -# Init Utilities -# -# CONFIG_BOOTCHARTD is not set -# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set -# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set -CONFIG_HALT=y -# CONFIG_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" -# CONFIG_INIT is not set -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_KILL_REMOVED is not set -CONFIG_FEATURE_KILL_DELAY=0 -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_INIT_SYSLOG is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_INIT_TERMINAL_TYPE="" -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# CONFIG_ADD_SHELL is not set -# CONFIG_REMOVE_SHELL is not set -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_CRYPT is not set -# CONFIG_USE_BB_CRYPT_SHA is not set -# CONFIG_ADDUSER is not set -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -# CONFIG_FEATURE_CHECK_NAMES is not set -CONFIG_FIRST_SYSTEM_ID=0 -CONFIG_LAST_SYSTEM_ID=0 -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_DELUSER is not set -# CONFIG_DELGROUP is not set -# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -# CONFIG_GETTY is not set -# CONFIG_LOGIN is not set -# CONFIG_PAM is not set -# CONFIG_LOGIN_SCRIPTS is not set -# CONFIG_FEATURE_NOLOGIN is not set -# CONFIG_FEATURE_SECURETTY is not set -# CONFIG_PASSWD is not set -# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set -# CONFIG_CRYPTPW is not set -# CONFIG_CHPASSWD is not set -# CONFIG_SU is not set -# CONFIG_FEATURE_SU_SYSLOG is not set -# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -# CONFIG_FSCK is not set -# CONFIG_LSATTR is not set -# CONFIG_TUNE2FS is not set - -# -# Linux Module Utilities -# -CONFIG_MODINFO=y -# CONFIG_MODPROBE_SMALL is not set -# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -CONFIG_INSMOD=y -CONFIG_RMMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -# CONFIG_MODPROBE is not set -# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set -# CONFIG_DEPMOD is not set - -# -# Options common to multiple modutils -# -# CONFIG_FEATURE_2_4_MODULES is not set -# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -# CONFIG_FEATURE_MODUTILS_ALIAS is not set -# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -CONFIG_DEFAULT_MODULES_DIR="" -CONFIG_DEFAULT_DEPMOD_FILE="" - -# -# Linux System Utilities -# -# CONFIG_BLOCKDEV is not set -# CONFIG_REV is not set -# CONFIG_ACPID is not set -# CONFIG_FEATURE_ACPID_COMPAT is not set -# CONFIG_BLKID is not set -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -# CONFIG_FBSET is not set -# CONFIG_FEATURE_FBSET_FANCY is not set -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -# CONFIG_FEATURE_FDISK_WRITABLE is not set -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_GPT_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FINDFS is not set -# CONFIG_FLOCK is not set -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_EXT2 is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_MKFS_REISER is not set -# CONFIG_MKFS_VFAT is not set -CONFIG_GETOPT=y -CONFIG_FEATURE_GETOPT_LONG=y -CONFIG_HEXDUMP=y -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set -# CONFIG_HD is not set -# CONFIG_HWCLOCK is not set -# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set -# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -CONFIG_LOSETUP=y -# CONFIG_LSPCI is not set -# CONFIG_LSUSB is not set -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_RENAME is not set -# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set -# CONFIG_MKSWAP is not set -# CONFIG_FEATURE_MKSWAP_UUID is not set -# CONFIG_MORE is not set -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -CONFIG_FEATURE_MOUNT_VERBOSE=y -CONFIG_FEATURE_MOUNT_HELPERS=y -CONFIG_FEATURE_MOUNT_LABEL=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -# CONFIG_PIVOT_ROOT is not set -# CONFIG_RDATE is not set -# CONFIG_RDEV is not set -# CONFIG_READPROFILE is not set -# CONFIG_RTCWAKE is not set -# CONFIG_SCRIPT is not set -# CONFIG_SCRIPTREPLAY is not set -# CONFIG_SETARCH is not set -# CONFIG_SWAPONOFF is not set -# CONFIG_FEATURE_SWAPON_PRI is not set -CONFIG_SWITCH_ROOT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MOUNT_LOOP_CREATE=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set -CONFIG_VOLUMEID=y - -# -# Filesystem/Volume identification -# -# CONFIG_FEATURE_VOLUMEID_EXT is not set -# CONFIG_FEATURE_VOLUMEID_BTRFS is not set -# CONFIG_FEATURE_VOLUMEID_REISERFS is not set -# CONFIG_FEATURE_VOLUMEID_FAT is not set -# CONFIG_FEATURE_VOLUMEID_HFS is not set -# CONFIG_FEATURE_VOLUMEID_JFS is not set -# CONFIG_FEATURE_VOLUMEID_XFS is not set -# CONFIG_FEATURE_VOLUMEID_NTFS is not set -# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set -# CONFIG_FEATURE_VOLUMEID_UDF is not set -# CONFIG_FEATURE_VOLUMEID_LUKS is not set -# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set -# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set -# CONFIG_FEATURE_VOLUMEID_ROMFS is not set -# CONFIG_FEATURE_VOLUMEID_SYSV is not set -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set - -# -# Miscellaneous Utilities -# -# CONFIG_CONSPY is not set -# CONFIG_NANDWRITE is not set -# CONFIG_NANDDUMP is not set -# CONFIG_UBIATTACH is not set -# CONFIG_UBIDETACH is not set -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set -# CONFIG_BEEP is not set -CONFIG_FEATURE_BEEP_FREQ=0 -CONFIG_FEATURE_BEEP_LENGTH_MS=0 -# CONFIG_CHAT is not set -# CONFIG_FEATURE_CHAT_NOFAIL is not set -# CONFIG_FEATURE_CHAT_TTY_HIFI is not set -# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set -# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set -# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set -# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set -# CONFIG_FEATURE_CHAT_CLR_ABORT is not set -# CONFIG_CHRT is not set -# CONFIG_CROND is not set -# CONFIG_FEATURE_CROND_D is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_FEATURE_CROND_DIR="" -# CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_FEATURE_DC_LIBM is not set -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_DEVMEM is not set -# CONFIG_EJECT is not set -# CONFIG_FEATURE_EJECT_SCSI is not set -# CONFIG_FBSPLASH is not set -# CONFIG_FLASHCP is not set -# CONFIG_FLASH_LOCK is not set -# CONFIG_FLASH_UNLOCK is not set -# CONFIG_FLASH_ERASEALL is not set -# CONFIG_IONICE is not set -# CONFIG_INOTIFYD is not set -# CONFIG_LAST is not set -# CONFIG_FEATURE_LAST_SMALL is not set -# CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_FEATURE_LESS_WINCH is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set -# CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MAN is not set -# CONFIG_MICROCOM is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# CONFIG_RAIDAUTORUN is not set -# CONFIG_READAHEAD is not set -# CONFIG_RFKILL is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -# CONFIG_SETSID is not set -CONFIG_STRINGS=y -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -# CONFIG_TIME is not set -# CONFIG_TIMEOUT is not set -# CONFIG_TTYSIZE is not set -# CONFIG_VOLNAME is not set -# CONFIG_WALL is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -# CONFIG_NBDCLIENT is not set -CONFIG_NC=y -CONFIG_NC_SERVER=y -CONFIG_NC_EXTRA=y -# CONFIG_NC_110_COMPAT is not set -CONFIG_FEATURE_IPV6=y -# CONFIG_FEATURE_UNIX_LOCAL is not set -CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -# CONFIG_ARP is not set -# CONFIG_ARPING is not set -# CONFIG_BRCTL is not set -# CONFIG_FEATURE_BRCTL_FANCY is not set -# CONFIG_FEATURE_BRCTL_SHOW is not set -# CONFIG_DNSD is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPD is not set -# CONFIG_FEATURE_FTP_WRITE is not set -# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -# CONFIG_HOSTNAME is not set -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -# CONFIG_FEATURE_HTTPD_GZIP is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -CONFIG_FEATURE_IFCONFIG_SLIP=y -CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -# CONFIG_IFENSLAVE is not set -# CONFIG_IFPLUGD is not set -# CONFIG_IFUPDOWN is not set -CONFIG_IFUPDOWN_IFSTATE_PATH="" -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -CONFIG_FEATURE_IP_RULE=y -CONFIG_FEATURE_IP_SHORT_FORMS=y -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -CONFIG_IPADDR=y -CONFIG_IPLINK=y -CONFIG_IPROUTE=y -CONFIG_IPTUNNEL=y -CONFIG_IPRULE=y -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -CONFIG_NETSTAT=y -CONFIG_FEATURE_NETSTAT_WIDE=y -CONFIG_FEATURE_NETSTAT_PRG=y -CONFIG_NSLOOKUP=y -# CONFIG_NTPD is not set -# CONFIG_FEATURE_NTPD_SERVER is not set -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -# CONFIG_PSCAN is not set -CONFIG_ROUTE=y -# CONFIG_SLATTACH is not set -# CONFIG_TCPSVD is not set -CONFIG_TELNET=y -# CONFIG_FEATURE_TELNET_TTYPE is not set -# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set -CONFIG_TFTP=y -# CONFIG_TFTPD is not set - -# -# Common options for tftp/tftpd -# -CONFIG_FEATURE_TFTP_GET=y -# CONFIG_FEATURE_TFTP_PUT is not set -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set -# CONFIG_TFTP_DEBUG is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_TRACEROUTE6 is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_TUNCTL is not set -# CONFIG_FEATURE_TUNCTL_UG is not set -# CONFIG_UDHCPD is not set -# CONFIG_DHCPRELAY is not set -# CONFIG_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_DHCPD_LEASES_FILE="" -# CONFIG_UDHCPC is not set -# CONFIG_FEATURE_UDHCPC_ARPING is not set -# CONFIG_FEATURE_UDHCP_PORT is not set -CONFIG_UDHCP_DEBUG=0 -# CONFIG_FEATURE_UDHCP_RFC3397 is not set -CONFIG_UDHCPC_DEFAULT_SCRIPT="" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" -# CONFIG_UDPSVD is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_FEATURE_WGET_TIMEOUT=y -# CONFIG_ZCIP is not set - -# -# Print Utilities -# -# CONFIG_LPD is not set -# CONFIG_LPR is not set -# CONFIG_LPQ is not set - -# -# Mail Utilities -# -# CONFIG_MAKEMIME is not set -CONFIG_FEATURE_MIME_CHARSET="" -# CONFIG_POPMAILDIR is not set -# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set -# CONFIG_REFORMIME is not set -# CONFIG_FEATURE_REFORMIME_COMPAT is not set -# CONFIG_SENDMAIL is not set - -# -# Process Utilities -# -# CONFIG_IOSTAT is not set -# CONFIG_MPSTAT is not set -# CONFIG_PMAP is not set -# CONFIG_POWERTOP is not set -# CONFIG_SMEMCAP is not set -CONFIG_FREE=y -# CONFIG_FUSER is not set -CONFIG_KILL=y -CONFIG_KILLALL=y -# CONFIG_KILLALL5 is not set -# CONFIG_NMETER is not set -CONFIG_PGREP=y -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -# CONFIG_PKILL is not set -CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -# CONFIG_FEATURE_PS_TIME is not set -# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -# CONFIG_RENICE is not set -# CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set -# CONFIG_FEATURE_SHOW_THREADS is not set -CONFIG_UPTIME=y -# CONFIG_WATCH is not set - -# -# Runit Utilities -# -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set -# CONFIG_FEATURE_RUNSVDIR_LOG is not set -# CONFIG_SV is not set -CONFIG_SV_DEFAULT_SERVICE_DIR="" -# CONFIG_SVLOGD is not set -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set - -# -# Shells -# -CONFIG_ASH=y -CONFIG_ASH_BASH_COMPAT=y -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_PRINTF=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_CMDCMD=y -# CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -CONFIG_ASH_EXPAND_PRMT=y -CONFIG_CTTYHACK=y -# CONFIG_HUSH is not set -# CONFIG_HUSH_BASH_COMPAT is not set -# CONFIG_HUSH_BRACE_EXPANSION is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_SAVEHISTORY is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_HUSH_CASE is not set -# CONFIG_HUSH_FUNCTIONS is not set -# CONFIG_HUSH_LOCAL is not set -# CONFIG_HUSH_RANDOM_SUPPORT is not set -# CONFIG_HUSH_EXPORT_N is not set -# CONFIG_HUSH_MODE_X is not set -# CONFIG_MSH is not set -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -# CONFIG_FEATURE_BASH_IS_ASH is not set -# CONFIG_FEATURE_BASH_IS_HUSH is not set -CONFIG_FEATURE_BASH_IS_NONE=y -CONFIG_SH_MATH_SUPPORT=y -# CONFIG_SH_MATH_SUPPORT_64 is not set -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_FEATURE_SH_NOFORK is not set - -# -# System Logging Utilities -# -# CONFIG_SYSLOGD is not set -# CONFIG_FEATURE_ROTATE_LOGFILE is not set -# CONFIG_FEATURE_REMOTE_LOG is not set -# CONFIG_FEATURE_SYSLOGD_DUP is not set -CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 -# CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 -# CONFIG_LOGREAD is not set -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -# CONFIG_KLOGD is not set -# CONFIG_FEATURE_KLOGD_KLOGCTL is not set -# CONFIG_LOGGER is not set diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD deleted file mode 100644 index 0e8ce5323..000000000 --- a/testing/mpfr/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 135483 2011-08-14 09:33:15Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: damir <damir@archlinux.org> - -pkgname=mpfr -_pkgver=3.0.1 -_patchlevel=p4 -pkgver=${_pkgver}.${_patchlevel} -pkgrel=2 -pkgdesc="Multiple-precision floating-point library" -arch=('i686' 'x86_64') -url="http://www.mpfr.org/" -license=('LGPL') -depends=('gmp>=5.0') -options=('!libtool') -install=mpfr.install -source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz - mpfr-${_pkgver}.${_patchlevel}.patch) -md5sums=('645882d9d179113a70af84d27086ed9f' - '52c2ac5ffbbbf0c68f08e89f016ba7aa') - -build() { - cd "${srcdir}/${pkgname}-${_pkgver}" - patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch - ./configure --prefix=/usr --enable-thread-safe --enable-shared - make -} - -check() { - cd "${srcdir}/${pkgname}-${_pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${_pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/mpfr/mpfr-3.0.1.p4.patch b/testing/mpfr/mpfr-3.0.1.p4.patch deleted file mode 100644 index 9604635a2..000000000 --- a/testing/mpfr/mpfr-3.0.1.p4.patch +++ /dev/null @@ -1,367 +0,0 @@ -diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES ---- mpfr-3.0.1-a/PATCHES 2011-04-12 10:50:02.000000000 +0000 -+++ mpfr-3.0.1-b/PATCHES 2011-04-12 10:50:02.000000000 +0000 -@@ -0,0 +1 @@ -+asin_exprange -diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION ---- mpfr-3.0.1-a/VERSION 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/VERSION 2011-04-12 10:50:02.000000000 +0000 -@@ -1 +1 @@ --3.0.1 -+3.0.1-p1 -diff -Naurd mpfr-3.0.1-a/asin.c mpfr-3.0.1-b/asin.c ---- mpfr-3.0.1-a/asin.c 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/asin.c 2011-04-12 10:50:02.000000000 +0000 -@@ -63,11 +63,14 @@ - - compared = mpfr_cmp_ui (xp, 1); - -+ MPFR_SAVE_EXPO_MARK (expo); -+ - if (MPFR_UNLIKELY (compared >= 0)) - { - mpfr_clear (xp); - if (compared > 0) /* asin(x) = NaN for |x| > 1 */ - { -+ MPFR_SAVE_EXPO_FREE (expo); - MPFR_SET_NAN (asin); - MPFR_RET_NAN; - } -@@ -80,13 +83,11 @@ - inexact = -mpfr_const_pi (asin, MPFR_INVERT_RND(rnd_mode)); - MPFR_CHANGE_SIGN (asin); - } -- mpfr_div_2ui (asin, asin, 1, rnd_mode); /* May underflow */ -- return inexact; -+ mpfr_div_2ui (asin, asin, 1, rnd_mode); - } - } -- -- MPFR_SAVE_EXPO_MARK (expo); -- -+ else -+ { - /* Compute exponent of 1 - ABS(x) */ - mpfr_ui_sub (xp, 1, xp, MPFR_RNDD); - MPFR_ASSERTD (MPFR_GET_EXP (xp) <= 0); -@@ -115,6 +116,7 @@ - inexact = mpfr_set (asin, xp, rnd_mode); - - mpfr_clear (xp); -+ } - - MPFR_SAVE_EXPO_FREE (expo); - return mpfr_check_range (asin, inexact, rnd_mode); -diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h ---- mpfr-3.0.1-a/mpfr.h 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/mpfr.h 2011-04-12 10:50:02.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 1 --#define MPFR_VERSION_STRING "3.0.1" -+#define MPFR_VERSION_STRING "3.0.1-p1" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.1-a/tests/tasin.c mpfr-3.0.1-b/tests/tasin.c ---- mpfr-3.0.1-a/tests/tasin.c 2011-04-04 10:19:17.000000000 +0000 -+++ mpfr-3.0.1-b/tests/tasin.c 2011-04-12 10:50:02.000000000 +0000 -@@ -219,6 +219,49 @@ - mpfr_clear (y); - } - -+static void -+reduced_expo_range (void) -+{ -+ mpfr_exp_t emin, emax; -+ mpfr_t x, y, ex_y; -+ int inex, ex_inex; -+ unsigned int flags, ex_flags; -+ -+ emin = mpfr_get_emin (); -+ emax = mpfr_get_emax (); -+ -+ mpfr_inits2 (4, x, y, ex_y, (mpfr_ptr) 0); -+ mpfr_set_str (x, "-0.1e1", 2, MPFR_RNDN); -+ -+ mpfr_set_emin (1); -+ mpfr_set_emax (1); -+ mpfr_clear_flags (); -+ inex = mpfr_asin (y, x, MPFR_RNDA); -+ flags = __gmpfr_flags; -+ mpfr_set_emin (emin); -+ mpfr_set_emax (emax); -+ -+ mpfr_set_str (ex_y, "-0.1101e1", 2, MPFR_RNDN); -+ ex_inex = -1; -+ ex_flags = MPFR_FLAGS_INEXACT; -+ -+ if (SIGN (inex) != ex_inex || flags != ex_flags || -+ ! mpfr_equal_p (y, ex_y)) -+ { -+ printf ("Error in reduced_expo_range\non x = "); -+ mpfr_dump (x); -+ printf ("Expected y = "); -+ mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN); -+ printf ("\n inex = %d, flags = %u\n", ex_inex, ex_flags); -+ printf ("Got y = "); -+ mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN); -+ printf ("\n inex = %d, flags = %u\n", SIGN (inex), flags); -+ exit (1); -+ } -+ -+ mpfr_clears (x, y, ex_y, (mpfr_ptr) 0); -+} -+ - int - main (void) - { -@@ -226,6 +269,7 @@ - - special (); - special_overflow (); -+ reduced_expo_range (); - - test_generic (2, 100, 15); - -diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c ---- mpfr-3.0.1-a/version.c 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/version.c 2011-04-12 10:50:02.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.1"; -+ return "3.0.1-p1"; - } -diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES ---- mpfr-3.0.1-a/PATCHES 2011-05-04 11:18:33.000000000 +0000 -+++ mpfr-3.0.1-b/PATCHES 2011-05-04 11:18:33.000000000 +0000 -@@ -0,0 +1 @@ -+rec_sqrt-carry -diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION ---- mpfr-3.0.1-a/VERSION 2011-04-12 10:50:02.000000000 +0000 -+++ mpfr-3.0.1-b/VERSION 2011-05-04 11:18:33.000000000 +0000 -@@ -1 +1 @@ --3.0.1-p1 -+3.0.1-p2 -diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h ---- mpfr-3.0.1-a/mpfr.h 2011-04-12 10:50:02.000000000 +0000 -+++ mpfr-3.0.1-b/mpfr.h 2011-05-04 11:18:33.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 1 --#define MPFR_VERSION_STRING "3.0.1-p1" -+#define MPFR_VERSION_STRING "3.0.1-p2" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.1-a/rec_sqrt.c mpfr-3.0.1-b/rec_sqrt.c ---- mpfr-3.0.1-a/rec_sqrt.c 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/rec_sqrt.c 2011-05-04 11:18:33.000000000 +0000 -@@ -375,20 +375,37 @@ - MPFR_ASSERTD(un == ln + 1 || un == ln + 2); - /* the high un-ln limbs of u will overlap the low part of {x+ln,xn}, - we need to add or subtract the overlapping part {u + ln, un - ln} */ -+ /* Warning! th may be 0, in which case the mpn_add_1 and mpn_sub_1 -+ below (with size = th) mustn't be used. In such a case, the limb -+ (carry) will be 0, so that this is semantically a no-op, but if -+ mpn_add_1 and mpn_sub_1 are used, GMP (currently) still does a -+ non-atomic read/write in a place that is not always allocated, -+ with the possible consequences: a crash if the corresponding -+ address is not mapped, or (rather unlikely) memory corruption -+ if another process/thread writes at the same place; things may -+ be worse with future GMP versions. Hence the tests carry != 0. */ - if (neg == 0) - { - if (ln > 0) - MPN_COPY (x, u, ln); - cy = mpn_add (x + ln, x + ln, xn, u + ln, un - ln); - /* add cu at x+un */ -- cy += mpn_add_1 (x + un, x + un, th, cu); -+ if (cu != 0) -+ { -+ MPFR_ASSERTD (th != 0); -+ cy += mpn_add_1 (x + un, x + un, th, cu); -+ } - } - else /* negative case */ - { - /* subtract {u+ln, un-ln} from {x+ln,un} */ - cy = mpn_sub (x + ln, x + ln, xn, u + ln, un - ln); - /* carry cy is at x+un, like cu */ -- cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */ -+ if (cy + cu != 0) -+ { -+ MPFR_ASSERTD (th != 0); -+ cy = mpn_sub_1 (x + un, x + un, th, cy + cu); /* n - un = th */ -+ } - /* cy cannot be zero, since the most significant bit of Xh is 1, - and the correction is bounded by 2^{-h+3} */ - MPFR_ASSERTD(cy == 0); -diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c ---- mpfr-3.0.1-a/version.c 2011-04-12 10:50:02.000000000 +0000 -+++ mpfr-3.0.1-b/version.c 2011-05-04 11:18:33.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.1-p1"; -+ return "3.0.1-p2"; - } -diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES ---- mpfr-3.0.1-a/PATCHES 2011-05-05 00:00:35.000000000 +0000 -+++ mpfr-3.0.1-b/PATCHES 2011-05-05 00:00:35.000000000 +0000 -@@ -0,0 +1 @@ -+atan-expo-range -diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION ---- mpfr-3.0.1-a/VERSION 2011-05-04 11:18:33.000000000 +0000 -+++ mpfr-3.0.1-b/VERSION 2011-05-05 00:00:35.000000000 +0000 -@@ -1 +1 @@ --3.0.1-p2 -+3.0.1-p3 -diff -Naurd mpfr-3.0.1-a/atan.c mpfr-3.0.1-b/atan.c ---- mpfr-3.0.1-a/atan.c 2011-04-04 10:19:18.000000000 +0000 -+++ mpfr-3.0.1-b/atan.c 2011-05-05 00:00:35.000000000 +0000 -@@ -431,5 +431,5 @@ - MPFR_GROUP_CLEAR (group); - - MPFR_SAVE_EXPO_FREE (expo); -- return mpfr_check_range (arctgt, inexact, rnd_mode); -+ return mpfr_check_range (atan, inexact, rnd_mode); - } -diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h ---- mpfr-3.0.1-a/mpfr.h 2011-05-04 11:18:33.000000000 +0000 -+++ mpfr-3.0.1-b/mpfr.h 2011-05-05 00:00:35.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 1 --#define MPFR_VERSION_STRING "3.0.1-p2" -+#define MPFR_VERSION_STRING "3.0.1-p3" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.1-a/tests/tatan.c mpfr-3.0.1-b/tests/tatan.c ---- mpfr-3.0.1-a/tests/tatan.c 2011-04-04 10:19:17.000000000 +0000 -+++ mpfr-3.0.1-b/tests/tatan.c 2011-05-05 00:00:35.000000000 +0000 -@@ -535,6 +535,52 @@ - mpfr_clears (a, x, y, (mpfr_ptr) 0); - } - -+/* http://websympa.loria.fr/wwsympa/arc/mpfr/2011-05/msg00008.html -+ * Incorrect flags (in debug mode on a 32-bit machine, assertion failure). -+ */ -+static void -+reduced_expo_range (void) -+{ -+ mpfr_exp_t emin, emax; -+ mpfr_t x, y, ex_y; -+ int inex, ex_inex; -+ unsigned int flags, ex_flags; -+ -+ emin = mpfr_get_emin (); -+ emax = mpfr_get_emax (); -+ -+ mpfr_inits2 (12, x, y, ex_y, (mpfr_ptr) 0); -+ mpfr_set_str (x, "0.1e-5", 2, MPFR_RNDN); -+ -+ mpfr_set_emin (-5); -+ mpfr_set_emax (-5); -+ mpfr_clear_flags (); -+ inex = mpfr_atan (y, x, MPFR_RNDN); -+ flags = __gmpfr_flags; -+ mpfr_set_emin (emin); -+ mpfr_set_emax (emax); -+ -+ mpfr_set_str (ex_y, "0.1e-5", 2, MPFR_RNDN); -+ ex_inex = 1; -+ ex_flags = MPFR_FLAGS_INEXACT; -+ -+ if (SIGN (inex) != ex_inex || flags != ex_flags || -+ ! mpfr_equal_p (y, ex_y)) -+ { -+ printf ("Error in reduced_expo_range\non x = "); -+ mpfr_dump (x); -+ printf ("Expected y = "); -+ mpfr_out_str (stdout, 2, 0, ex_y, MPFR_RNDN); -+ printf ("\n inex = %d, flags = %u\n", ex_inex, ex_flags); -+ printf ("Got y = "); -+ mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN); -+ printf ("\n inex = %d, flags = %u\n", SIGN (inex), flags); -+ exit (1); -+ } -+ -+ mpfr_clears (x, y, ex_y, (mpfr_ptr) 0); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -546,6 +592,7 @@ - smallvals_atan2 (); - atan2_bug_20071003 (); - atan2_different_prec (); -+ reduced_expo_range (); - - test_generic_atan (2, 200, 17); - test_generic_atan2 (2, 200, 17); -diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c ---- mpfr-3.0.1-a/version.c 2011-05-04 11:18:33.000000000 +0000 -+++ mpfr-3.0.1-b/version.c 2011-05-05 00:00:35.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.1-p2"; -+ return "3.0.1-p3"; - } -diff -Naurd mpfr-3.0.1-a/PATCHES mpfr-3.0.1-b/PATCHES ---- mpfr-3.0.1-a/PATCHES 2011-05-09 14:48:24.000000000 +0000 -+++ mpfr-3.0.1-b/PATCHES 2011-05-09 14:48:24.000000000 +0000 -@@ -0,0 +1 @@ -+texp-zero -diff -Naurd mpfr-3.0.1-a/VERSION mpfr-3.0.1-b/VERSION ---- mpfr-3.0.1-a/VERSION 2011-05-05 00:00:35.000000000 +0000 -+++ mpfr-3.0.1-b/VERSION 2011-05-09 14:48:24.000000000 +0000 -@@ -1 +1 @@ --3.0.1-p3 -+3.0.1-p4 -diff -Naurd mpfr-3.0.1-a/mpfr.h mpfr-3.0.1-b/mpfr.h ---- mpfr-3.0.1-a/mpfr.h 2011-05-05 00:00:35.000000000 +0000 -+++ mpfr-3.0.1-b/mpfr.h 2011-05-09 14:48:24.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 1 --#define MPFR_VERSION_STRING "3.0.1-p3" -+#define MPFR_VERSION_STRING "3.0.1-p4" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.1-a/tests/texp.c mpfr-3.0.1-b/tests/texp.c ---- mpfr-3.0.1-a/tests/texp.c 2011-04-04 10:19:17.000000000 +0000 -+++ mpfr-3.0.1-b/tests/texp.c 2011-05-09 14:48:24.000000000 +0000 -@@ -170,7 +170,9 @@ - mpfr_set_prec (x, prec); - mpfr_set_prec (y, prec); - mpfr_set_prec (z, prec); -- mpfr_urandomb (x, RANDS); -+ do -+ mpfr_urandomb (x, RANDS); -+ while (MPFR_IS_ZERO (x)); /* 0 is handled by mpfr_exp only */ - rnd = RND_RAND (); - mpfr_exp_2 (y, x, rnd); - mpfr_exp_3 (z, x, rnd); -diff -Naurd mpfr-3.0.1-a/version.c mpfr-3.0.1-b/version.c ---- mpfr-3.0.1-a/version.c 2011-05-05 00:00:35.000000000 +0000 -+++ mpfr-3.0.1-b/version.c 2011-05-09 14:48:24.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.1-p3"; -+ return "3.0.1-p4"; - } diff --git a/testing/mpfr/mpfr.install b/testing/mpfr/mpfr.install deleted file mode 100644 index d6dd0475b..000000000 --- a/testing/mpfr/mpfr.install +++ /dev/null @@ -1,20 +0,0 @@ -info_dir=usr/share/info -info_files=(mpfr.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/testing/msmtp/PKGBUILD b/testing/msmtp/PKGBUILD deleted file mode 100644 index 44d3e6209..000000000 --- a/testing/msmtp/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 134900 2011-08-08 19:38:44Z eric $ -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Ben Mazer <blm@groknil.org> - -pkgname=msmtp -pkgver=1.4.24 -pkgrel=3 -pkgdesc="A mini smtp client" -arch=('i686' 'x86_64') -license=('GPL3') -url="http://msmtp.sourceforge.net" -depends=('gnutls' 'libidn') -makedepends=('texlive-core') -provides=('smtp-forwarder') -install=msmtp.install -source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('3ed704fbd3e7419cab5c65bb7928d9ba') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --with-ssl=gnutls - make - make -C doc html pdf -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - make DESTDIR="${pkgdir}" -C doc install-html install-pdf - -# Installing example configs and scripts to /usr/share/doc/msmtp -# as they are not installed by default (Debian and Gentoo do it this way) - install -d "${pkgdir}/usr/share/doc/msmtp" - cp -r scripts/{find_alias,msmtp-gnome-tool,msmtpqueue,msmtpq,set_sendmail} "${pkgdir}/usr/share/doc/msmtp/" - install -D -m644 doc/*.example "${pkgdir}/usr/share/doc/msmtp/" - - install -D -m644 scripts/vim/msmtp.vim "${pkgdir}/usr/share/vim/vimfiles/syntax/msmtp.vim" -} diff --git a/testing/msmtp/msmtp.install b/testing/msmtp/msmtp.install deleted file mode 100644 index c4dd76476..000000000 --- a/testing/msmtp/msmtp.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(msmtp.info) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/nettle/PKGBUILD b/testing/nettle/PKGBUILD deleted file mode 100644 index e079a16f8..000000000 --- a/testing/nettle/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 134726 2011-08-07 17:54:31Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: bender02 at gmx dot com - -pkgname=nettle -pkgver=2.2 -pkgrel=1 -pkgdesc="A low-level cryptographic library" -arch=('i686' 'x86_64') -url="http://www.lysator.liu.se/~nisse/nettle/" -license=('GPL2') -install=$pkgname.install -depends=('gmp') -source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz) -md5sums=('9a9c6102eb9909019f8a13b67578cdfe') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --libdir=/usr/lib \ - --enable-shared \ - --disable-static # <-- seems not working now - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make -k check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install - - # remove static libs - rm -f ${pkgdir}/usr/lib/{libhogweed,libnettle}.a -} diff --git a/testing/nettle/nettle.install b/testing/nettle/nettle.install deleted file mode 100644 index 3d19b5f19..000000000 --- a/testing/nettle/nettle.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(nettle.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/testing/network-manager-applet/PKGBUILD b/testing/network-manager-applet/PKGBUILD deleted file mode 100644 index 4bcc17f5e..000000000 --- a/testing/network-manager-applet/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 136149 2011-08-23 08:09:50Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Arjan Timmerman <arjan@archlinux.org> -# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> -# Contributor: Tor Krill <tor@krill.nu> -# Contributor: Will Rea <sillywilly@gmail.com> - -pkgname=network-manager-applet -pkgver=0.9.0 -pkgrel=1 -pkgdesc="GNOME frontends to NetWorkmanager" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme' 'mobile-broadband-provider-info' 'gconf') -makedepends=('intltool' 'gnome-bluetooth') -optdepends=('gnome-bluetooth: for PAN/DUN support') -options=('!libtool') -install=network-manager-applet.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0e85f7e1c0d7677f382dde08a3c9d3fa93d4d850d3801a41e5a9bd95043bfe24') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/networkmanager \ - --disable-static \ - --disable-maintainer-mode - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain nm-applet ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/network-manager-applet/network-manager-applet.install b/testing/network-manager-applet/network-manager-applet.install deleted file mode 100644 index 9922d12b2..000000000 --- a/testing/network-manager-applet/network-manager-applet.install +++ /dev/null @@ -1,18 +0,0 @@ -pkgname=network-manager-applet - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor -} diff --git a/testing/networkmanager-openconnect/PKGBUILD b/testing/networkmanager-openconnect/PKGBUILD deleted file mode 100644 index 5c0913fe5..000000000 --- a/testing/networkmanager-openconnect/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 136151 2011-08-23 08:09:52Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=networkmanager-openconnect -pkgver=0.9.0 -pkgrel=1 -pkgdesc="NetworkManager VPN integration for openconnect" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver}" 'openconnect' 'dbus-glib' 'gconf') -makedepends=('intltool') -optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') -options=('!libtool') -install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz) -sha256sums=('0fef61c672265f2b6008d8439ed5b18fe188f2a5f207227fc79a1b78657a6812') - -build() { - cd "${srcdir}/NetworkManager-openconnect-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/networkmanager \ - --disable-static - make -} - -package() { - cd "${srcdir}/NetworkManager-openconnect-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/networkmanager-openconnect/networkmanager-openconnect.install b/testing/networkmanager-openconnect/networkmanager-openconnect.install deleted file mode 100644 index 7bd4d44f9..000000000 --- a/testing/networkmanager-openconnect/networkmanager-openconnect.install +++ /dev/null @@ -1,16 +0,0 @@ -pkgname=networkmanager-openconnect - -post_install() { - getent group nm-openconnect >/dev/null 2>&1 || groupadd -g 104 nm-openconnect - getent passwd nm-openconnect > /dev/null 2>&1 || useradd -u 104 -s /sbin/nologin -d / -M -c 'NetworkManager user for OpenConnect' -g nm-openconnect nm-openconnect - passwd -l nm-openconnect > /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - getent passwd nm-openconnect >/dev/null 2>&1 && userdel nm-openconnect - getent group nm-openconnect >/dev/null 2>&1 && groupdel nm-openconnect -} diff --git a/testing/networkmanager-openvpn/PKGBUILD b/testing/networkmanager-openvpn/PKGBUILD deleted file mode 100644 index f1c520cb9..000000000 --- a/testing/networkmanager-openvpn/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 136155 2011-08-23 08:09:55Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=networkmanager-openvpn -pkgver=0.9.0 -pkgrel=1 -pkgdesc="NetworkManager VPN plugin for OpenVPN" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver}" 'openvpn' 'gtk3' 'libgnome-keyring') -makedepends=('intltool') -optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') -install=networkmanager-openvpn.install -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz) -sha256sums=('741e39bcedd589b656067c9d3aa45ebca41a0f329914d157450f4b92e79bf7ee') - -build() { - cd "${srcdir}/NetworkManager-openvpn-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/networkmanager \ - --disable-static - make -} - -package() { - cd "${srcdir}/NetworkManager-openvpn-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/networkmanager-openvpn/networkmanager-openvpn.install b/testing/networkmanager-openvpn/networkmanager-openvpn.install deleted file mode 100644 index 931c0517c..000000000 --- a/testing/networkmanager-openvpn/networkmanager-openvpn.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/networkmanager-pptp/PKGBUILD b/testing/networkmanager-pptp/PKGBUILD deleted file mode 100644 index 2548f6757..000000000 --- a/testing/networkmanager-pptp/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 136157 2011-08-23 08:09:58Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=networkmanager-pptp -pkgver=0.9.0 -pkgrel=1 -pkgdesc="NetworkManager VPN plugin for pptp " -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver}" 'pptpclient' 'gtk3' 'libgnome-keyring') -makedepends=('intltool') -optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') -options=('!libtool') -install=networkmanager-pptp.install -source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz) -sha256sums=('97da81b0c8b1698316908a1dfe66c5a02a71088b56471d67d7e12066d956cbd5') - -build() { - cd "${srcdir}/NetworkManager-pptp-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/networkmanager \ - --disable-static - make -} - -package() { - cd "${srcdir}/NetworkManager-pptp-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/networkmanager-pptp/networkmanager-pptp.install b/testing/networkmanager-pptp/networkmanager-pptp.install deleted file mode 100644 index 931c0517c..000000000 --- a/testing/networkmanager-pptp/networkmanager-pptp.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/networkmanager-vpnc/PKGBUILD b/testing/networkmanager-vpnc/PKGBUILD deleted file mode 100644 index e06189c21..000000000 --- a/testing/networkmanager-vpnc/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 136159 2011-08-23 08:10:02Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=networkmanager-vpnc -pkgver=0.9.0 -pkgrel=1 -pkgdesc="NetworkManager VPN plugin for vpnc" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme' - 'gtk3' 'libgnome-keyring') -makedepends=('intltool') -optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') -options=('!libtool') -install=networkmanager-vpnc.install -source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) -sha256sums=('d672ed353f57d0422486ba96bc1bd673fd08aec5f9c015584028af07c45239a4') - -build() { - cd "${srcdir}/NetworkManager-vpnc-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/networkmanager \ - --disable-static - make -} - -package() { - cd "${srcdir}/NetworkManager-vpnc-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/networkmanager-vpnc/networkmanager-vpnc.install b/testing/networkmanager-vpnc/networkmanager-vpnc.install deleted file mode 100644 index 931c0517c..000000000 --- a/testing/networkmanager-vpnc/networkmanager-vpnc.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/networkmanager/NetworkManager.conf b/testing/networkmanager/NetworkManager.conf deleted file mode 100644 index c37b59680..000000000 --- a/testing/networkmanager/NetworkManager.conf +++ /dev/null @@ -1,2 +0,0 @@ -[main] -plugins=keyfile diff --git a/testing/networkmanager/PKGBUILD b/testing/networkmanager/PKGBUILD deleted file mode 100644 index 42d12cf4e..000000000 --- a/testing/networkmanager/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 136147 2011-08-23 08:09:48Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinxu.org> -# Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> -# Contributor: Tor Krill <tor@krill.nu> -# Contributor: Will Rea <sillywilly@gmail.com> -# Contributor: Valentine Sinitsyn <e_val@inbox.ru> - -pkgname=networkmanager -pkgver=0.9.0 -pkgrel=1 -pkgdesc="Network Management daemon" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd') -makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection') -optdepends=('modemmanager: for modem management service' - 'dhclient: alternative DHCP/DHCPv6 client' - 'iptables: Connection sharing' - 'dnsmasq: Connection sharing' - 'bluez: Bluetooth support') -options=('!libtool') -backup=('etc/NetworkManager/NetworkManager.conf') -install=networkmanager.install -source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz - NetworkManager.conf disable_set_hostname.patch) -sha256sums=('166db385e5a349dd320f061554a54a9d599eb5bfc8fcbcc836cf5046904c5149' - '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' - '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') - -build() { - cd "${srcdir}/NetworkManager-${pkgver}" - - patch -Np1 -i "${srcdir}/disable_set_hostname.patch" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/networkmanager \ - --with-crypto=nss \ - --with-distro=arch \ - --with-dhclient=/usr/sbin/dhclient \ - --with-dhcpcd=/sbin/dhcpcd \ - --with-iptables=/usr/sbin/iptables \ - --with-systemdsystemunitdir=/lib/systemd/system \ - --disable-static \ - --enable-more-warnings=no \ - --disable-wimax - - make -} - -package() { - cd "${srcdir}/NetworkManager-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/" - - rm -rf "${pkgdir}/var/run/" -} diff --git a/testing/networkmanager/disable_set_hostname.patch b/testing/networkmanager/disable_set_hostname.patch deleted file mode 100644 index ee95dd0e1..000000000 --- a/testing/networkmanager/disable_set_hostname.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c ---- NetworkManager-0.9.0.orig/src/nm-policy.c 2011-08-23 06:41:02.099686450 +0000 -+++ NetworkManager-0.9.0/src/nm-policy.c 2011-08-23 06:43:38.227791737 +0000 -@@ -302,6 +302,7 @@ - return; - } - -+#if 0 - /* Try automatically determined hostname from the best device's IP config */ - if (!best4) - best4 = get_best_ip4_device (policy->manager, &best_req4); -@@ -356,6 +357,7 @@ - } - } - -+#endif - /* If no automatically-configured hostname, try using the hostname from - * when NM started up. - */ diff --git a/testing/networkmanager/networkmanager.install b/testing/networkmanager/networkmanager.install deleted file mode 100644 index de40c17ed..000000000 --- a/testing/networkmanager/networkmanager.install +++ /dev/null @@ -1,9 +0,0 @@ -post_upgrade() { - (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG -ATTENTION: - /etc/NetworkManager/nm-system-settings.conf has been replaced - by /etc/NetworkManager/NetworkManager.conf. Make sure you move - any custom settings to the new config file. -MSG - true -} diff --git a/testing/nfs-utils/PKGBUILD b/testing/nfs-utils/PKGBUILD deleted file mode 100644 index 4d09d8be0..000000000 --- a/testing/nfs-utils/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 136332 2011-08-26 14:46:35Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> -# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> -# Contributor: abelstr <abel@pinklf.eu> -# Contributor: Marco Lima <cipparello gmail com> - -pkgname=nfs-utils -pkgver=1.2.4 -pkgrel=3 -pkgdesc="Support programs for Network File Systems" -arch=('i686' 'x86_64') -url='http://nfs.sourceforge.net' -license=('GPL') -backup=(etc/{exports,idmapd.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) -depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue') -makedepends=('pkgconfig' 'autoconf' 'automake') -source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - nfs-common - nfs-common.conf - nfs-server - nfs-server.conf - exports - idmapd.conf - start-statd.patch - nfs-utils-1.1.4-mtab-sym.patch - nfs-utils-1.1.4-no-exec.patch - kernel-3.0-segfault.patch) -install=nfs-utils.install -md5sums=('938dc0574f3eb9891a8ed4746f806277' - 'dd0d65fc6e8f422fa12520813098264b' - 'f73f197a16b02c3e248488ec35c4cf43' - 'e619f18354ff958ed624d05d08853d8f' - '2bf71def3263325643a09458635520f0' - 'ff585faf410a62c4333a027c50b56bae' - 'eb4f4027fab6fc1201f1ca04f5954c76' - 'e24f81a8c8657672e262c61235d34b4a' - '7674106eaaa4c149bccd4f05fe3604e9' - '4f4827dfc93008dfadd0a530ad0872b2' - 'ab92e67f3d0ee2935faab9cdabef8003') - -build() { - cd $srcdir/${pkgname}-${pkgver} - patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch - #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch - patch -Np1 -i ../kernel-3.0-segfault.patch - # arch specific patch - patch -Np0 -i $srcdir/start-statd.patch - - ./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \ - --without-tcp-wrappers --with-statedir=/var/lib/nfs --enable-ipv6 --sysconfdir=/etc - - make -} - -package() { - cd $srcdir/${pkgname}-${pkgver} - make DESTDIR=$pkgdir install - - # support python2 (FS#25120) - sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats} - - # NFS & NFSv4 init scripts - install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common - install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server - # Configuration - install -D -m 644 ../exports "$pkgdir/"etc/exports - install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf - install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf - install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf - # directories - mkdir "$pkgdir/"etc/exports.d - mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs - mkdir "$pkgdir/"var/lib/nfs/v4recovery -} diff --git a/testing/nfs-utils/exports b/testing/nfs-utils/exports deleted file mode 100644 index 8f4aac598..000000000 --- a/testing/nfs-utils/exports +++ /dev/null @@ -1,15 +0,0 @@ -# /etc/exports -# -# List of directories exported to NFS clients. See exports(5). -# Use exportfs -arv to reread. -# -# Example for NFSv2 and NFSv3: -# /srv/home hostname1(rw,sync) hostname2(ro,sync) -# -# Example for NFSv4: -# /srv/nfs4 hostname1(rw,sync,fsid=0) -# /srv/nfs4/home hostname1(rw,sync,nohide) -# Using Kerberos and integrity checking: -# /srv/nfs4 gss/krb5i(rw,sync,fsid=0,crossmnt) -# /srv/nfs4/home gss/krb5i(rw,sync,nohide) -# diff --git a/testing/nfs-utils/idmapd.conf b/testing/nfs-utils/idmapd.conf deleted file mode 100644 index b1b23afe9..000000000 --- a/testing/nfs-utils/idmapd.conf +++ /dev/null @@ -1,14 +0,0 @@ -[General] - -Verbosity = 0 -Pipefs-Directory = /var/lib/nfs/rpc_pipefs -Domain = localdomain - -[Mapping] - -Nobody-User = nobody -Nobody-Group = nobody - -[Translation] - -Method = nsswitch diff --git a/testing/nfs-utils/kernel-3.0-segfault.patch b/testing/nfs-utils/kernel-3.0-segfault.patch deleted file mode 100644 index 3dba94a05..000000000 --- a/testing/nfs-utils/kernel-3.0-segfault.patch +++ /dev/null @@ -1,53 +0,0 @@ -mount.nfs segfaults if kernel version number does not contain -at least 3 components delimited with a dot. - -Avoid this by matching up to three unsigned integers inialised -to zero, separated by dots. - -A version that does not start with an integer is probably a future -version where the versioning evolved to another scheme. -Return UINT_MAX which is guaranteed to be higher than existing -versions. This would also make it possible to easily identify -versions that do not start with an integer. - -Signed-off-by: Luk Claes <luk@...> ---- - utils/mount/version.h | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) - -diff --git a/utils/mount/version.h b/utils/mount/version.h -index af61a6f..531cf68 100644 ---- a/utils/mount/version.h -+++ b/utils/mount/version.h -@@ -23,8 +23,8 @@ - #ifndef _NFS_UTILS_MOUNT_VERSION_H - #define _NFS_UTILS_MOUNT_VERSION_H - --#include <stdlib.h> --#include <string.h> -+#include <stdio.h> -+#include <limits.h> - - #include <sys/utsname.h> - -@@ -37,14 +37,16 @@ static inline unsigned int MAKE_VERSION(unsigned int p, unsigned int q, - static inline unsigned int linux_version_code(void) - { - struct utsname my_utsname; -- unsigned int p, q, r; -+ unsigned int p, q = 0, r = 0; - -+ /* UINT_MAX as backward compatibility code should not be run */ - if (uname(&my_utsname)) -- return 0; -+ return UINT_MAX; - -- p = (unsigned int)atoi(strtok(my_utsname.release, ".")); -- q = (unsigned int)atoi(strtok(NULL, ".")); -- r = (unsigned int)atoi(strtok(NULL, ".")); -+ /* UINT_MAX as future versions might not start with an integer */ -+ if (sscanf(my_utsname.release, "%u.%u.%u", &p, &q, &r) < 1) -+ return UINT_MAX; -+ - return MAKE_VERSION(p, q, r); - } diff --git a/testing/nfs-utils/nfs-common b/testing/nfs-utils/nfs-common deleted file mode 100644 index 7b16b4b3c..000000000 --- a/testing/nfs-utils/nfs-common +++ /dev/null @@ -1,315 +0,0 @@ -#!/bin/bash - -daemon_name=nfs-common - -NEED_STATD= -STATD_OPTS= -NEED_IDMAPD= -IDMAPD_OPTS= -NEED_GSSD= -GSSD_OPTS= -PIPEFS_MOUNTPOINT= -PIPEFS_MOUNTOPTS= - -# rpc.statd daemon & binary location -STATD_DAEMON_NAME=rpc.statd -STATD="/usr/sbin/rpc.statd" - -# rpc.idmapd daemon & binary location -IDMAPD_DAEMON_NAME=rpc.idmapd -IDMAPD="/usr/sbin/rpc.idmapd" - -# rpc.gssd daemon & binary location -GSSD_DAEMON_NAME=rpc.gssd -GSSD="/usr/sbin/rpc.gssd" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -# Default mountpoint and options for rpc_pipefs filesystem -[ -z "$PIPEFS_MOUNTPOINT" ] && PIPEFS_MOUNTPOINT="/var/lib/nfs/rpc_pipefs" -[ -z "$PIPEFS_MOUNTOPTS" ] && PIPEFS_MOUNTOPTS="defaults" - -# Parse the fstab file, and determine whether we need idmapd and gssd. (The -# /etc/conf.d/nfs-common settings, if any, will override our autodetection.) -AUTO_NEED_IDMAPD=no -AUTO_NEED_GSSD=no - -if [ -f /etc/fstab ]; then - exec 9<&0 </etc/fstab - - while read DEV MTPT FSTYPE OPTS REST; do - if [ "$FSTYPE" = "nfs4" ]; then - AUTO_NEED_IDMAPD=yes - fi - case "$OPTS" in - sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*) - AUTO_NEED_GSSD=yes - ;; - esac - done - - exec 0<&9 9<&- -fi - -# We also need idmapd if we run an NFSv4 server. It's fairly difficult -# to autodetect whether there are NFSv4 exports or not, and idmapd is not a -# particularily heavy daemon, so we auto-enable it if we find an /etc/exports -# file. This does not mean that there are NFSv4 or other mounts active (or -# even that nfs-kernel-server is installed), but it matches what the "start" -# condition in nfs-kernel-server's init script does, which has a value in -# itself. -if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports; then - AUTO_NEED_IDMAPD=yes -fi - -case "$NEED_STATD" in - yes|no) - ;; - *) - NEED_STATD=yes - ;; -esac - -case "$NEED_IDMAPD" in - yes|no) - ;; - *) - NEED_IDMAPD=$AUTO_NEED_IDMAPD - ;; -esac - -case "$NEED_GSSD" in - yes|no) - ;; - *) - NEED_GSSD=$AUTO_NEED_GSSD - ;; -esac - -do_modprobe() { - if [ -x /sbin/modprobe -a -f /proc/modules ]; then - modprobe -q "$1" || true - fi -} - -do_mount() { - if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then - return 1 - fi - - if grep -vw "$1" /proc/mounts &> /dev/null ; then - if ! mountpoint -q "$2" ; then - mount -t "$1" "$1" "$2" -o "$3" - return - fi - fi - return 0 -} - -do_umount() { - if mountpoint -q "$1" ; then - umount "$1" - fi - return 0 -} - -get_pid() { - pidof -o %PPID "$1" -} - -case "$1" in - start) - ck_daemon rpcbind && { echo -n "Start rpcbind first." >&2; stat_die; } - rc=0 - if [ "$NEED_STATD" = yes ]; then - stat_busy "Starting $STATD_DAEMON_NAME daemon" - PID=$(get_pid $STATD) - if [ -z "$PID" ]; then - [ -f /var/run/$STATD_DAEMON_NAME.pid ] && rm -f /var/run/$STATD_DAEMON_NAME.pid - # RUN - $STATD $STATD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $STATD) > /var/run/$STATD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - # Run sm-notify - /usr/sbin/sm-notify $SMNOTIFY_OPTS - fi - - if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then - stat_busy "Mounting pipefs filesystem" - do_modprobe sunrpc - do_modprobe nfs - do_modprobe nfsd - do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS" - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Starting $IDMAPD_DAEMON_NAME daemon" - PID=$(get_pid $IDMAPD) - if [ -z "$PID" ]; then - [ -f /var/run/$IDMAPD_DAEMON_NAME.pid ] && rm -f /var/run/$IDMAPD_DAEMON_NAME.pid - # RUN - $IDMAPD $IDMAPD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $IDMAPD) > /var/run/$IDMAPD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - - if [ "$NEED_GSSD" = yes ]; then - do_modprobe rpcsec_gss_krb5 - stat_busy "Starting $GSSD_DAEMON_NAME daemon" - PID=$(get_pid $GSSD) - if [ -z "$PID" ]; then - [ -f /var/run/$GSSD_DAEMON_NAME.pid ] && rm -f /var/run/$GSSD_DAEMON_NAME.pid - # RUN - $GSSD $GSSD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $GSSD) > /var/run/$GSSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - fi - - add_daemon $daemon_name - ;; - - stop) - rc=0 - if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then - - if [ "$NEED_GSSD" = yes ]; then - stat_busy "Stopping $GSSD_DAEMON_NAME daemon" - PID=$(get_pid $GSSD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$GSSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Stopping $IDMAPD_DAEMON_NAME daemon" - PID=$(get_pid $IDMAPD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$IDMAPD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - do_umount "$PIPEFS_MOUNTPOINT" 2>/dev/null || true - fi - - if [ "$NEED_STATD" = yes ]; then - stat_busy "Stopping $STATD_DAEMON_NAME daemon" - PID=$(get_pid $STATD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$STATD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - rm_daemon $daemon_name - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - - if [ "$NEED_STATD" = yes ]; then - stat_busy "Daemon $STATD_DAEMON_NAME running" - PID=$(get_pid $STATD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - - if [ "$NEED_GSSD" = yes ]; then - stat_busy "Daemon $GSSD_DAEMON_NAME running" - PID=$(get_pid $GSSD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - - if [ "$NEED_IDMAPD" = yes ]; then - stat_busy "Daemon $IDMAPD_DAEMON_NAME running" - PID=$(get_pid $IDMAPD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - echo - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|status|restart}" -esac -exit 0 - diff --git a/testing/nfs-utils/nfs-common.conf b/testing/nfs-utils/nfs-common.conf deleted file mode 100644 index 12466b3e5..000000000 --- a/testing/nfs-utils/nfs-common.conf +++ /dev/null @@ -1,40 +0,0 @@ -# Parameters to be passed to nfs-common (nfs clients & server) init script. -# - -# If you do not set values for the NEED_ options, they will be attempted -# autodetected; this should be sufficient for most people. Valid alternatives -# for the NEED_ options are "yes" and "no". - -# Do you want to start the statd daemon? It is not needed for NFSv4. -NEED_STATD="" - -# Options to pass to rpc.statd. -# See rpc.statd(8) for more details. -# N.B. statd normally runs on both client and server, and run-time -# options should be specified accordingly. -# STATD_OPTS="-p 32765 -o 32766" -STATD_OPTS="" - -# Options to pass to sm-notify -# e.g. SMNOTIFY_OPTS="-p 32764" -SMNOTIFY_OPTS="" - -# Do you want to start the idmapd daemon? It is only needed for NFSv4. -NEED_IDMAPD="" - -# Options to pass to rpc.idmapd. -# See rpc.idmapd(8) for more details. -IDMAPD_OPTS="" - -# Do you want to start the gssd daemon? It is required for Kerberos mounts. -NEED_GSSD="" - -# Options to pass to rpc.gssd. -# See rpc.gssd(8) for more details. -GSSD_OPTS="" - -# Where to mount rpc_pipefs filesystem; the default is "/var/lib/nfs/rpc_pipefs". -PIPEFS_MOUNTPOINT="" - -# Options used to mount rpc_pipefs filesystem; the default is "defaults". -PIPEFS_MOUNTOPTS="" diff --git a/testing/nfs-utils/nfs-server b/testing/nfs-utils/nfs-server deleted file mode 100644 index 6aa609d8c..000000000 --- a/testing/nfs-utils/nfs-server +++ /dev/null @@ -1,299 +0,0 @@ -#!/bin/bash - -daemon_name=nfs-server - -NFSD_COUNT= -NFSD_OPTS= -NEED_SVCGSSD= -SVCGSSD_OPTS= -MOUNTD_OPTS= -PROCNFSD_MOUNTPOINT= -PROCNFSD_MOUNTOPTS= - -# rpc.nfsd daemon & binary location -NFSD_PROCESS_NAME=nfsd -NFSD_DAEMON_NAME=rpc.nfsd -NFSD="/usr/sbin/rpc.nfsd" - -# rpc.svcgssd daemon & binary location -SVCGSSD_DAEMON_NAME=rpc.svcgssd -SVCGSSD="/usr/sbin/rpc.svcgssd" - -# rpc.idmapd daemon & binary location -IDMAPD_DAEMON_NAME=rpc.idmapd -IDMAPD="/usr/sbin/rpc.idmapd" - -# rpc.mountd daemon & binary location -MOUNTD_DAEMON_NAME=rpc.mountd -MOUNTD="/usr/sbin/rpc.mountd" - -# exortfs binary location -EXPORTFS="/usr/sbin/exportfs" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -# Default number of nfsd servers -[ -z "$NFSD_COUNT" ] && NFSD_COUNT=8 - -# Default mountpoint and options for nfsd filesystem -[ -z "$PROCNFSD_MOUNTPOINT" ] && PROCNFSD_MOUNTPOINT="/proc/fs/nfsd" -[ -z "$PROCNFSD_MOUNTOPTS" ] && PROCNFSD_MOUNTOPTS="rw,nodev,noexec,nosuid" - -case "$NEED_SVCGSSD" in - yes|no) - ;; - *) - NEED_SVCGSSD=no - ;; -esac - -do_modprobe() { - if [ -x /sbin/modprobe -a -f /proc/modules ]; then - modprobe -q "$1" || true - fi -} - -do_mount() { - if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then - return 1 - fi - - if grep -vw "$1" /proc/mounts &> /dev/null ; then - if ! mountpoint -q "$2" ; then - mount -t "$1" "$1" "$2" -o "$3" - return - fi - fi - return 0 -} - -do_umount() { - if mountpoint -q "$1" ; then - umount "$1" - fi - return 0 -} - -get_pid() { - pidof -o %PPID "$1" -} - -case "$1" in - start) - ck_daemon nfs-common && { echo -n "Start nfs-common first." >&2; stat_die; } - rc=0 - stat_busy "Mounting nfsd filesystem" - do_modprobe nfsd - do_mount nfsd "$PROCNFSD_MOUNTPOINT" "$PROCNFSD_MOUNTOPTS" - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - stat_busy "Exporting all directories" - $EXPORTFS -r - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - stat_busy "Starting $NFSD_DAEMON_NAME daemon" - PID=$(get_pid $NFSD_PROCESS_NAME) - if [ -z "$PID" ]; then - [ -f /var/run/$NFSD_DAEMON_NAME.pid ] && rm -f /var/run/$NFSD_DAEMON_NAME.pid - # RUN - $NFSD $NFSD_OPTS $NFSD_COUNT - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $NFSD_PROCESS_NAME) > /var/run/$NFSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - do_modprobe rpcsec_gss_krb5 - stat_busy "Starting $SVCGSSD_DAEMON_NAME daemon" - PID=$(get_pid $SVCGSSD) - if [ -z "$PID" ]; then - [ -f /var/run/$SVCGSSD_DAEMON_NAME.pid ] && rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid - # RUN - $SVCGSSD $SVCGSSD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $SVCGSSD) > /var/run/$SVCGSSD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - fi - - PID=$(get_pid $IDMAPD) - [ ! -z "$PID" ] && kill -SIGHUP $IDMAPD_DAEMON_NAME &> /dev/null - - stat_busy "Starting $MOUNTD_DAEMON_NAME daemon" - PID=$(get_pid $MOUNTD) - if [ -z "$PID" ]; then - [ -f /var/run/$MOUNTD_DAEMON_NAME.pid ] && rm -f /var/run/$MOUNTD_DAEMON_NAME.pid - # RUN - $MOUNTD $MOUNTD_OPTS - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - echo $(get_pid $MOUNTD) > /var/run/$MOUNTD_DAEMON_NAME.pid - stat_done - fi - else - stat_fail - exit 1 - fi - - add_daemon $daemon_name - ;; - - stop) - rc=0 - stat_busy "Stopping $MOUNTD_DAEMON_NAME daemon" - PID=$(get_pid $MOUNTD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$MOUNTD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - stat_busy "Stopping $SVCGSSD_DAEMON_NAME daemon" - PID=$(get_pid $SVCGSSD) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - fi - - stat_busy "Stopping $NFSD_DAEMON_NAME daemon" - PID=$(get_pid $NFSD_PROCESS_NAME) - # KILL (SIGINT) - [ ! -z "$PID" ] && kill -2 $PID &> /dev/null - # - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - sleep 1 - PID=$(get_pid $NFSD_PROCESS_NAME) - # KILL (KILL) - just to be sure - [ ! -z "$PID" ] && kill -9 $PID &> /dev/null - # - rm -f /var/run/$NFSD_DAEMON_NAME.pid &> /dev/null - stat_done - fi - - stat_busy "Unexporting all directories" - $EXPORTFS -au - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - - # flush everything out of the kernels export table - if mountpoint -q "$PROCNFSD_MOUNTPOINT" ; then - $EXPORTFS -f - fi - do_umount "$PROCNFSD_MOUNTPOINT" 2>/dev/null || true - rm_daemon $daemon_name - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - - stat_busy "Daemon $NFSD_DAEMON_NAME running" - PID=$(get_pid $NFSD_PROCESS_NAME) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - - stat_busy "Daemon $MOUNTD_DAEMON_NAME running" - PID=$(get_pid $MOUNTD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - - if [ "$NEED_SVCGSSD" = yes ]; then - stat_busy "Daemon $SVCGSSD_DAEMON_NAME running" - PID=$(get_pid $SVCGSSD) - if [ -z "$PID" ]; then - stat_fail - else - stat_done - fi - fi - echo - ;; - - reload) - rc=0 - stat_busy "Re-exporting all directories" - $EXPORTFS -r - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - exit $rc - else - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|status|reload|restart}" -esac -exit 0 diff --git a/testing/nfs-utils/nfs-server.conf b/testing/nfs-utils/nfs-server.conf deleted file mode 100644 index 4054d6b88..000000000 --- a/testing/nfs-utils/nfs-server.conf +++ /dev/null @@ -1,29 +0,0 @@ -# Parameters to be passed to nfs-server init script. -# - -# Options to pass to rpc.nfsd. -# See rpc.nfsd(8) for more details. -NFSD_OPTS="" - -# Number of servers to start up; the default is 8 servers. -NFSD_COUNT="" - -# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd". -PROCNFSD_MOUNTPOINT="" - -# Options used to mount nfsd filesystem; the default is "rw,nodev,noexec,nosuid". -PROCNFSD_MOUNTOPTS="" - -# Options for rpc.mountd. -# If you have a port-based firewall, you might want to set up -# a fixed port here using the --port option. -# See rpc.mountd(8) for more details. -MOUNTD_OPTS="--no-nfs-version 2" - -# Do you want to start the svcgssd daemon? It is only required for Kerberos -# exports. Valid alternatives are "yes" and "no"; the default is "no". -NEED_SVCGSSD="" - -# Options to pass to rpc.svcgssd. -# See rpc.svcgssd(8) for more details. -SVCGSSD_OPTS="" diff --git a/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch b/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch deleted file mode 100644 index 4a5a138e7..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff -NaurwB nfs-utils-1.1.2.orig/aclocal/kerberos5.m4 nfs-utils-1.1.2/aclocal/kerberos5.m4 ---- nfs-utils-1.1.2.orig/aclocal/kerberos5.m4 2008-03-14 16:46:29.000000000 +0100 -+++ nfs-utils-1.1.2/aclocal/kerberos5.m4 2008-06-12 17:13:51.000000000 +0200 -@@ -1,112 +1,48 @@ --dnl Checks for Kerberos --dnl NOTE: while we intend to do generic gss-api, currently we --dnl have a requirement to get an initial Kerberos machine --dnl credential. Thus, the requirement for Kerberos. --dnl The Kerberos gssapi library will be dynamically loaded? - AC_DEFUN([AC_KERBEROS_V5],[ -+ K5CONFIG="krb5-config" - AC_MSG_CHECKING(for Kerberos v5) -- AC_ARG_WITH(krb5, -- [AC_HELP_STRING([--with-krb5=DIR], [use Kerberos v5 installation in DIR])], -+ AC_ARG_WITH(krb5-config, -+ [AC_HELP_STRING([--with-krb5-config=PATH], [Full Path to krb5-config.])], - [ case "$withval" in - yes|no) -- krb5_with="" -+ K5CONFIG="krb5-config" - ;; - *) -- krb5_with="$withval" -+ K5CONFIG="$withval" - ;; - esac ] - ) - -- for dir in $krb5_with /usr /usr/kerberos /usr/local /usr/local/krb5 \ -- /usr/krb5 /usr/heimdal /usr/local/heimdal /usr/athena ; do -- dnl This ugly hack brought on by the split installation of -- dnl MIT Kerberos on Fedora Core 1 -- K5CONFIG="" -- if test -f $dir/bin/krb5-config; then -- K5CONFIG=$dir/bin/krb5-config -- elif test -f "/usr/kerberos/bin/krb5-config"; then -- K5CONFIG="/usr/kerberos/bin/krb5-config" -- elif test -f "/usr/lib/mit/bin/krb5-config"; then -- K5CONFIG="/usr/lib/mit/bin/krb5-config" -- fi - if test "$K5CONFIG" != ""; then - KRBCFLAGS=`$K5CONFIG --cflags` - KRBLIBS=`$K5CONFIG --libs gssapi` -- K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'` -- AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number]) -- if test -f $dir/include/gssapi/gssapi_krb5.h -a \ -- \( -f $dir/lib/libgssapi_krb5.a -o \ -- -f $dir/lib64/libgssapi_krb5.a -o \ -- -f $dir/lib64/libgssapi_krb5.so -o \ -- -f $dir/lib/libgssapi_krb5.so \) ; then -+ if $K5CONFIG --version | grep -q -e heimdal; then -+ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f2 -d ' ' | tr -d '.'` -+ AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries]) -+ gssapi_lib=gssapi -+ KRBIMPL="heimdal" -+ elif $K5CONFIG --version | grep -q -e mit; then -+ K5VERS=`$K5CONFIG --version | head -n 1 | cut -f4 -d ' ' | tr -d '.'` - AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries]) -- KRBDIR="$dir" -- dnl If we are using MIT K5 1.3.1 and before, we *MUST* use the -- dnl private function (gss_krb5_ccache_name) to get correct -- dnl behavior of changing the ccache used by gssapi. -- dnl Starting in 1.3.2, we *DO NOT* want to use -- dnl gss_krb5_ccache_name, instead we want to set KRB5CCNAME -- dnl to get gssapi to use a different ccache - if test $K5VERS -le 131; then - AC_DEFINE(USE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the private function, gss_krb5_cache_name, must be used to tell the Kerberos library which credentials cache to use. Otherwise, this is done by setting the KRB5CCNAME environment variable]) - fi - gssapi_lib=gssapi_krb5 -- break -- dnl The following ugly hack brought on by the split installation -- dnl of Heimdal Kerberos on SuSe -- elif test \( -f $dir/include/heim_err.h -o\ -- -f $dir/include/heimdal/heim_err.h \) -a \ -- -f $dir/lib/libroken.a; then -- AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries]) -- KRBDIR="$dir" -- gssapi_lib=gssapi -- break -- fi -- fi -- done -- dnl We didn't find a usable Kerberos environment -- if test "x$KRBDIR" = "x"; then -- if test "x$krb5_with" = "x"; then -- AC_MSG_ERROR(Kerberos v5 with GSS support not found: consider --disable-gss or --with-krb5=) -+ KRBIMPL="mit-krb5" - else -- AC_MSG_ERROR(Kerberos v5 with GSS support not found at $krb5_with) -- fi -+ AC_MSG_ERROR(Unknown Kerberos 5 Implementation. Is neither heimdal or mit-krb5.) -+ KRBIMPL="unknown" - fi -- AC_MSG_RESULT($KRBDIR) -- -- dnl Check if -rpath=$(KRBDIR)/lib is needed -- echo "The current KRBDIR is $KRBDIR" -- if test "$KRBDIR/lib" = "/lib" -o "$KRBDIR/lib" = "/usr/lib" \ -- -o "$KRBDIR/lib" = "//lib" -o "$KRBDIR/lib" = "/usr//lib" ; then -- KRBLDFLAGS=""; -- elif /sbin/ldconfig -p | grep > /dev/null "=> $KRBDIR/lib/"; then -- KRBLDFLAGS=""; -- else -- KRBLDFLAGS="-Wl,-rpath=$KRBDIR/lib" -+ AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number]) - fi -+ AC_MSG_RESULT($KRBIMPL) - -- dnl Now check for functions within gssapi library -- AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, -- AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS) -- AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, -- AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS) -- AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, -- AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS) -- -- dnl Check for newer error message facility -- AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, -- AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS) -+ AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS) - -- dnl Check for function to specify addressless tickets -- AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, -- AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS) -- -- dnl If they specified a directory and it didn't work, give them a warning -- if test "x$krb5_with" != "x" -a "$krb5_with" != "$KRBDIR"; then -- AC_MSG_WARN(Using $KRBDIR instead of requested value of $krb5_with for Kerberos!) -- fi -- -- AC_SUBST([KRBDIR]) - AC_SUBST([KRBLIBS]) - AC_SUBST([KRBCFLAGS]) - AC_SUBST([KRBLDFLAGS]) diff --git a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch deleted file mode 100644 index c9e60afc7..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch +++ /dev/null @@ -1,39 +0,0 @@ -ripped from Debian - ---- nfs-utils-1.1.4/utils/mount/fstab.c -+++ nfs-utils-1.1.4/utils/mount/fstab.c -@@ -57,7 +57,7 @@ mtab_does_not_exist(void) { - return var_mtab_does_not_exist; - } - --static int -+int - mtab_is_a_symlink(void) { - get_mtab_info(); - return var_mtab_is_a_symlink; ---- nfs-utils-1.1.4/utils/mount/fstab.h -+++ nfs-utils-1.1.4/utils/mount/fstab.h -@@ -7,6 +7,7 @@ - #define _PATH_FSTAB "/etc/fstab" - #endif - -+int mtab_is_a_symlink(void); - int mtab_is_writable(void); - int mtab_does_not_exist(void); - void reset_mtab_info(void); ---- nfs-utils-1.1.4/utils/mount/mount.c -+++ nfs-utils-1.1.4/utils/mount/mount.c -@@ -230,6 +230,13 @@ create_mtab (void) { - int flags; - mntFILE *mfp; - -+ /* Avoid writing if the mtab is a symlink to /proc/mounts, since -+ that would create a file /proc/mounts in case the proc filesystem -+ is not mounted, and the fchmod below would also fail. */ -+ if (mtab_is_a_symlink()) { -+ return EX_SUCCESS; -+ } -+ - lock_mtab(); - - mfp = nfs_setmntent (MOUNTED, "a+"); diff --git a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch b/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch deleted file mode 100644 index ea50a21d8..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch +++ /dev/null @@ -1,15 +0,0 @@ -ripped from Debian - ---- nfs-utils-1.1.2/utils/mount/mount.c -+++ nfs-utils-1.1.2/utils/mount/mount.c -@@ -381,10 +381,6 @@ - mount_error(NULL, mount_point, ENOTDIR); - return 1; - } -- if (access(mount_point, X_OK) < 0) { -- mount_error(NULL, mount_point, errno); -- return 1; -- } - - return 0; - } diff --git a/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch b/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch deleted file mode 100644 index 7f6c7a751..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -Naur nfs-utils-1.1.6.orig/utils/gssd/krb5_util.c nfs-utils-1.1.6/utils/gssd/krb5_util.c ---- utils/gssd/krb5_util.c 2009-04-20 19:32:50.000000000 +0200 -+++ utils/gssd/krb5_util.c 2009-04-20 20:57:31.000000000 +0200 -@@ -940,9 +940,37 @@ - { - krb5_error_code ret; - krb5_creds creds; -- krb5_cc_cursor cur; - int found = 0; - -+#ifdef HAVE_HEIMDAL -+ krb5_creds pattern; -+ krb5_realm *client_realm; -+ -+ krb5_cc_clear_mcred(&pattern); -+ -+ client_realm = krb5_princ_realm (context, principal); -+ -+ ret = krb5_make_principal (context, &pattern.server, -+ *client_realm, KRB5_TGS_NAME, *client_realm, -+ NULL); -+ if (ret) -+ krb5_err (context, 1, ret, "krb5_make_principal"); -+ pattern.client = principal; -+ -+ ret = krb5_cc_retrieve_cred (context, ccache, 0, &pattern, &creds); -+ krb5_free_principal (context, pattern.server); -+ if (ret) { -+ if (ret == KRB5_CC_END) -+ return 1; -+ krb5_err (context, 1, ret, "krb5_cc_retrieve_cred"); -+ } -+ -+ found = creds.times.endtime > time(NULL); -+ -+ krb5_free_cred_contents (context, &creds); -+#else -+ krb5_cc_cursor cur; -+ - ret = krb5_cc_start_seq_get(context, ccache, &cur); - if (ret) - return 0; -@@ -962,6 +990,7 @@ - krb5_free_cred_contents(context, &creds); - } - krb5_cc_end_seq_get(context, ccache, &cur); -+#endif - - return found; - } -@@ -1008,6 +1037,9 @@ - } - krb5_free_principal(context, principal); - err_princ: -+#ifdef HAVE_HEIMDAL -+#define KRB5_TC_OPENCLOSE 0x00000001 -+#endif - krb5_cc_set_flags(context, ccache, KRB5_TC_OPENCLOSE); - krb5_cc_close(context, ccache); - err_cache: -@@ -1262,7 +1294,7 @@ - if (context != NULL) { - origmsg = krb5_get_error_message(context, code); - msg = strdup(origmsg); -- krb5_free_error_message(context, origmsg); -+ krb5_free_error_string(context, origmsg); - } - #endif - if (msg != NULL) diff --git a/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch b/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch deleted file mode 100644 index 917136a8c..000000000 --- a/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch +++ /dev/null @@ -1,57 +0,0 @@ -Index: nfs-utils-1.1.6/utils/gssd/context_lucid.c -=================================================================== ---- nfs-utils-1.1.6.orig/utils/gssd/context_lucid.c -+++ nfs-utils-1.1.6/utils/gssd/context_lucid.c -@@ -51,8 +51,10 @@ - #include "context.h" - - #ifndef OM_uint64 -+#ifndef GSSAPI_GSSAPI_H_ - typedef uint64_t OM_uint64; - #endif -+#endif - - static int - write_lucid_keyblock(char **p, char *end, gss_krb5_lucid_key_t *key) -@@ -177,10 +179,10 @@ - int retcode = 0; - - printerr(2, "DEBUG: serialize_krb5_ctx: lucid version!\n"); -- maj_stat = gss_export_lucid_sec_context(&min_stat, &ctx, -+ maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx, - 1, &return_ctx); - if (maj_stat != GSS_S_COMPLETE) { -- pgsserr("gss_export_lucid_sec_context", -+ pgsserr("gss_krb5_export_lucid_sec_context", - maj_stat, min_stat, &krb5oid); - goto out_err; - } -@@ -204,9 +206,9 @@ - else - retcode = prepare_krb5_rfc_cfx_buffer(lctx, buf, endtime); - -- maj_stat = gss_free_lucid_sec_context(&min_stat, ctx, return_ctx); -+ maj_stat = gss_krb5_free_lucid_sec_context(&min_stat, ctx); - if (maj_stat != GSS_S_COMPLETE) { -- pgsserr("gss_export_lucid_sec_context", -+ pgsserr("gss_krb5_export_lucid_sec_context", - maj_stat, min_stat, &krb5oid); - printerr(0, "WARN: failed to free lucid sec context\n"); - } -Index: nfs-utils-1.1.6/utils/gssd/krb5_util.c -=================================================================== ---- nfs-utils-1.1.6.orig/utils/gssd/krb5_util.c -+++ nfs-utils-1.1.6/utils/gssd/krb5_util.c -@@ -332,10 +332,10 @@ - return -1; - } - -- maj_stat = gss_set_allowable_enctypes(&min_stat, credh, &krb5oid, -+ maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh, - num_enctypes, &enctypes); - if (maj_stat != GSS_S_COMPLETE) { -- pgsserr("gss_set_allowable_enctypes", -+ pgsserr("gss_krb5_set_allowable_enctypes", - maj_stat, min_stat, &krb5oid); - gss_release_cred(&min_stat, &credh); - return -1; diff --git a/testing/nfs-utils/nfs-utils.install b/testing/nfs-utils/nfs-utils.install deleted file mode 100644 index 7dcdf9575..000000000 --- a/testing/nfs-utils/nfs-utils.install +++ /dev/null @@ -1,32 +0,0 @@ -## arg 1: the new package version -post_install() { -cat << 'EOM' - ==> PLEASE NOTE: - ==> Extended configuration options for NFS (clients & server) are available in - ==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf - ==> - ==> Please refer to http://wiki.archlinux.org/index.php/Nfs - ==> for further information on NFS; for NFSv4, refer to - ==> http://wiki.archlinux.org/index.php/NFSv4 -EOM -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - if [ "$(vercmp $2 1.2.0-2)" -lt 0 ]; then -cat << 'EOM' - ==> IMPORTANT NFS UTILS CHANGES: - ==> This is a rather important upgrade, you are going to have to change config files. - ==> /etc/rc.conf daemons changes: - ==> Change portmap to rpcbind - ==> Change nfslock to nfs-common - ==> Change nfsd to nfs-server - ==> - ==> Extended configuration options for NFS (clients & server) are available in: - ==> /etc/conf.d/nfs-common - ==> /etc/conf.d/nfs-server - ==> Please change them to your needs. -EOM - fi -} diff --git a/testing/nfs-utils/start-statd.patch b/testing/nfs-utils/start-statd.patch deleted file mode 100644 index 38c60a784..000000000 --- a/testing/nfs-utils/start-statd.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- utils/statd/start-statd 2007-05-11 04:40:57.000000000 +0100 -+++ utils/statd/start-statd.new 2007-09-21 17:11:34.000000000 +0100 -@@ -1,9 +1,16 @@ --#!/bin/sh -p -+#!/bin/sh -+ -+# Original script provided by the NFS project -+# Modified for Arch Linux by Tom Killian -+ - # nfsmount calls this script when mounting a filesystem with locking - # enabled, but when statd does not seem to be running (based on - # /var/run/rpc.statd.pid). - # It should run run statd with whatever flags are apropriate for this - # site. --PATH=/sbin:/usr/sbin --exec rpc.statd --no-notify -+ -+# source application-specific settings -+[ -f /etc/conf.d/nfs-common.conf ] && . /etc/conf.d/nfs-common.conf -+ -+exec /usr/sbin/rpc.statd $STATD_OPTS - diff --git a/testing/nfsidmap/PKGBUILD b/testing/nfsidmap/PKGBUILD deleted file mode 100644 index 235332551..000000000 --- a/testing/nfsidmap/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 136337 2011-08-26 15:15:41Z tpowa $ -# Maintainer: -# Contributor: Judd <jvinet@zeroflux.org> - -pkgname=nfsidmap -pkgver=0.24 -pkgrel=3 -pkgdesc="Library to help mapping IDs, mainly for NFSv4" -arch=('i686' 'x86_64') -url="http://www.citi.umich.edu/projects/nfsv4/linux/" -depends=('glibc' 'libldap>=2.4.18') -license=('custom:nfsidmap') -options=(!libtool) -source=(http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-$pkgver.tar.gz) -md5sums=('d71a1ee9881d5b5814ff3ec41256937d') - -build() { - cd $srcdir/lib$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd $srcdir/lib$pkgname-$pkgver - make DESTDIR=$pkgdir install - - # install license - install -Dm644 COPYING $pkgdir/usr/share/licenses/nfsidmap/LICENSE -} diff --git a/testing/nss/PKGBUILD b/testing/nss/PKGBUILD deleted file mode 100644 index 5e5fd134f..000000000 --- a/testing/nss/PKGBUILD +++ /dev/null @@ -1,105 +0,0 @@ -# $Id: PKGBUILD 136450 2011-08-29 14:44:54Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=nss -pkgver=3.12.11 -pkgrel=2 -pkgdesc="Mozilla Network Security Services" -arch=(i686 x86_64) -url="http://www.mozilla.org/projects/security/pki/nss/" -license=('MPL' 'GPL') -_nsprver=4.8.9 -depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib' 'sh') -makedepends=('perl') -replaces=('nss-nspr') -options=('!strip') -source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz - nss-no-rpath.patch - nss.pc.in - nss-config.in - add_spi+cacert_ca_certs.patch - ssl-renegotiate-transitional.patch) -md5sums=('ca0ca058380be200cf247ea2496b5352' - 'e5c97db0c884d5f4cfda21e562dc9bba' - 'c547b030c57fe1ed8b77c73bf52b3ded' - '46bee81908f1e5b26d6a7a2e14c64d9f' - '7f39c19b1dfd62d7db7d8bf19f156fed' - 'd83c7b61abb7e9f8f7bcd157183d1ade') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian - patch -Np1 -i "${srcdir}/add_spi+cacert_ca_certs.patch" - # Adds transitional SSL renegotiate support - patch from Debian - patch -Np1 -i "${srcdir}/ssl-renegotiate-transitional.patch" - # Removes rpath - patch -Np0 -i "${srcdir}/nss-no-rpath.patch" - - # Respect LDFLAGS - sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \ - -i mozilla/security/coreconf/rules.mk - - cd mozilla/security/nss/lib/ckfw/builtins - make generate - - cd "${srcdir}/${pkgname}-${pkgver}" - export BUILD_OPT=1 - export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 - export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` - export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'` - export XCFLAGS="${CFLAGS}" - - [ "$CARCH" = "x86_64" ] && export USE_64=1 - - make -j 1 -C mozilla/security/coreconf - make -j 1 -C mozilla/security/dbm - make -j 1 -C mozilla/security/nss -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/bin" - install -m755 -d "${pkgdir}/usr/include/nss" - - NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - - sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib,g" \ - -e "s,%prefix%,/usr,g" \ - -e "s,%exec_prefix%,/usr/bin,g" \ - -e "s,%includedir%,/usr/include/nss,g" \ - -e "s,%NSPR_VERSION%,${pkgver},g" \ - -e "s,%NSS_VERSION%,${pkgver},g" > \ - "${pkgdir}/usr/lib/pkgconfig/nss.pc" - ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc" - chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc - - sed "${srcdir}/nss-config.in" -e "s,@libdir@,/usr/lib,g" \ - -e "s,@prefix@,/usr/bin,g" \ - -e "s,@exec_prefix@,/usr/bin,g" \ - -e "s,@includedir@,/usr/include/nss,g" \ - -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \ - -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \ - -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \ - > "${pkgdir}/usr/bin/nss-config" - chmod 755 "${pkgdir}/usr/bin/nss-config" - - for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \ - libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so - do - install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/" - done - - install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib/" - install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib/" - - for file in certutil cmsutil crlutil modutil pk12util shlibsign signtool signver ssltap; do - install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/" - done - - install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/" -} diff --git a/testing/nss/add_spi+cacert_ca_certs.patch b/testing/nss/add_spi+cacert_ca_certs.patch deleted file mode 100644 index 1cc7c18f5..000000000 --- a/testing/nss/add_spi+cacert_ca_certs.patch +++ /dev/null @@ -1,561 +0,0 @@ ---- a/mozilla/security/nss/lib/ckfw/builtins/certdata.txt -+++ b/mozilla/security/nss/lib/ckfw/builtins/certdata.txt -@@ -20926,3 +20926,558 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR - CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR - CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "CAcert.org Class 1 Root CA" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\000 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000 -+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 -+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 -+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 -+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 -+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 -+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 -+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 -+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 -+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063 -+\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060 -+\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016 -+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 -+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 -+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 -+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 -+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 -+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 -+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 -+\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 -+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 -+\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007 -+\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002 -+\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011 -+\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315 -+\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230 -+\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272 -+\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016 -+\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052 -+\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262 -+\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140 -+\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150 -+\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273 -+\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022 -+\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234 -+\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334 -+\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070 -+\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232 -+\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044 -+\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355 -+\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252 -+\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352 -+\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276 -+\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306 -+\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320 -+\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167 -+\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335 -+\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324 -+\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246 -+\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106 -+\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272 -+\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334 -+\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304 -+\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060 -+\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265 -+\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071 -+\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230 -+\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260 -+\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016 -+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036 -+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057 -+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042 -+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164 -+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151 -+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011 -+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162 -+\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001 -+\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037 -+\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160 -+\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157 -+\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006 -+\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164 -+\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060 -+\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045 -+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162 -+\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077 -+\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102 -+\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165 -+\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164 -+\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040 -+\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167 -+\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006 -+\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001 -+\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201 -+\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275 -+\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234 -+\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323 -+\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073 -+\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140 -+\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353 -+\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160 -+\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334 -+\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231 -+\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116 -+\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145 -+\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031 -+\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363 -+\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330 -+\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367 -+\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260 -+\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223 -+\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335 -+\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026 -+\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005 -+\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361 -+\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371 -+\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246 -+\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206 -+\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153 -+\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344 -+\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143 -+\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362 -+\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226 -+\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175 -+\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305 -+\103 -+END -+ -+# Trust for Certificate "CAcert.org Class 1 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106 -+\166\316\217\063 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\000 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "CAcert.org Class 3 Root CA" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143 -+\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004 -+\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101 -+\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004 -+\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040 -+\063\040\122\157\157\164 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001 -+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 -+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 -+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 -+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 -+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 -+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 -+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 -+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 -+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065 -+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060 -+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022 -+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156 -+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164 -+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157 -+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143 -+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164 -+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001 -+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001 -+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335 -+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175 -+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163 -+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144 -+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001 -+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171 -+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313 -+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011 -+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353 -+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277 -+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331 -+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205 -+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073 -+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161 -+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371 -+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047 -+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252 -+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102 -+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064 -+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133 -+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242 -+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137 -+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325 -+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150 -+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230 -+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140 -+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347 -+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321 -+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206 -+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257 -+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164 -+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373 -+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003 -+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006 -+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006 -+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072 -+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162 -+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034 -+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162 -+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003 -+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001 -+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002 -+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101 -+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160 -+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206 -+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241 -+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072 -+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135 -+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253 -+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364 -+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172 -+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302 -+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214 -+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074 -+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154 -+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025 -+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352 -+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231 -+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213 -+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325 -+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242 -+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214 -+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027 -+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057 -+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224 -+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134 -+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356 -+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005 -+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355 -+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143 -+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123 -+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243 -+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005 -+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156 -+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317 -+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360 -+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101 -+\322\156\245\033\231\047\200\347\013\251\250\000 -+END -+ -+# Trust for Certificate "CAcert.org Class 3 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304 -+\030\116\052\055 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -+\100\143\141\143\145\162\164\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ -+# -+# Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+# -+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -+CKA_SUBJECT MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_ID UTF8 "0" -+CKA_ISSUER MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\011\000\350\216\266\311\370\052\024\050 -+END -+CKA_VALUE MULTILINE_OCTAL -+\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000 -+\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206 -+\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003 -+\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010 -+\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125 -+\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163 -+\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167 -+\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151 -+\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003 -+\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061 -+\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146 -+\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061 -+\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026 -+\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151 -+\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063 -+\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060 -+\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125 -+\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023 -+\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004 -+\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061 -+\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141 -+\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143 -+\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125 -+\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036 -+\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151 -+\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045 -+\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150 -+\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156 -+\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110 -+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002 -+\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051 -+\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074 -+\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271 -+\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240 -+\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321 -+\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265 -+\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175 -+\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375 -+\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161 -+\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342 -+\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172 -+\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056 -+\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247 -+\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310 -+\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361 -+\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356 -+\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110 -+\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151 -+\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316 -+\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307 -+\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320 -+\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205 -+\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123 -+\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154 -+\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275 -+\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356 -+\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250 -+\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204 -+\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147 -+\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305 -+\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057 -+\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124 -+\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060 -+\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161 -+\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122 -+\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346 -+\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102 -+\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061 -+\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016 -+\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025 -+\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141 -+\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037 -+\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040 -+\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061 -+\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141 -+\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103 -+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157 -+\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015 -+\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100 -+\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216 -+\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377 -+\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206 -+\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035 -+\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102 -+\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151 -+\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164 -+\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102 -+\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141 -+\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055 -+\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206 -+\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057 -+\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143 -+\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125 -+\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164 -+\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016 -+\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015 -+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002 -+\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162 -+\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030 -+\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255 -+\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065 -+\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014 -+\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306 -+\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051 -+\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017 -+\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302 -+\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213 -+\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017 -+\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162 -+\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152 -+\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357 -+\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266 -+\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104 -+\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177 -+\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253 -+\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206 -+\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217 -+\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265 -+\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225 -+\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140 -+\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207 -+\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252 -+\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340 -+\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254 -+\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275 -+\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132 -+\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151 -+\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005 -+\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004 -+\243\140 -+END -+ -+# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST -+CKA_TOKEN CK_BBOOL CK_TRUE -+CKA_PRIVATE CK_BBOOL CK_FALSE -+CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044 -+\251\220\103\034 -+END -+CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170 -+END -+CKA_ISSUER MULTILINE_OCTAL -+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 -+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141 -+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144 -+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125 -+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040 -+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162 -+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157 -+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004 -+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101 -+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206 -+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163 -+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147 -+END -+CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\011\000\350\216\266\311\370\052\024\050 -+END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/testing/nss/nss-config.in b/testing/nss/nss-config.in deleted file mode 100644 index f8f893e71..000000000 --- a/testing/nss/nss-config.in +++ /dev/null @@ -1,145 +0,0 @@ -#!/bin/sh - -prefix=@prefix@ - -major_version=@MOD_MAJOR_VERSION@ -minor_version=@MOD_MINOR_VERSION@ -patch_version=@MOD_PATCH_VERSION@ - -usage() -{ - cat <<EOF -Usage: nss-config [OPTIONS] [LIBRARIES] -Options: - [--prefix[=DIR]] - [--exec-prefix[=DIR]] - [--includedir[=DIR]] - [--libdir[=DIR]] - [--version] - [--libs] - [--cflags] -Dynamic Libraries: - nss - nssutil - ssl - smime -EOF - exit $1 -} - -if test $# -eq 0; then - usage 1 1>&2 -fi - -lib_ssl=yes -lib_smime=yes -lib_nss=yes -lib_nssutil=yes - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --prefix=*) - prefix=$optarg - ;; - --prefix) - echo_prefix=yes - ;; - --exec-prefix=*) - exec_prefix=$optarg - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; - --includedir=*) - includedir=$optarg - ;; - --includedir) - echo_includedir=yes - ;; - --libdir=*) - libdir=$optarg - ;; - --libdir) - echo_libdir=yes - ;; - --version) - echo ${major_version}.${minor_version}.${patch_version} - ;; - --cflags) - echo_cflags=yes - ;; - --libs) - echo_libs=yes - ;; - ssl) - lib_ssl=yes - ;; - smime) - lib_smime=yes - ;; - nss) - lib_nss=yes - ;; - nssutil) - lib_nssutil=yes - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - -# Set variables that may be dependent upon other variables -if test -z "$exec_prefix"; then - exec_prefix=`pkg-config --variable=exec_prefix nss` -fi -if test -z "$includedir"; then - includedir=`pkg-config --variable=includedir nss` -fi -if test -z "$libdir"; then - libdir=`pkg-config --variable=libdir nss` -fi - -if test "$echo_prefix" = "yes"; then - echo $prefix -fi - -if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix -fi - -if test "$echo_includedir" = "yes"; then - echo $includedir -fi - -if test "$echo_libdir" = "yes"; then - echo $libdir -fi - -if test "$echo_cflags" = "yes"; then - echo -I$includedir -fi - -if test "$echo_libs" = "yes"; then - libdirs="-Wl,-rpath-link,$libdir -L$libdir" - if test -n "$lib_ssl"; then - libdirs="$libdirs -lssl${major_version}" - fi - if test -n "$lib_smime"; then - libdirs="$libdirs -lsmime${major_version}" - fi - if test -n "$lib_nss"; then - libdirs="$libdirs -lnss${major_version}" - fi - if test -n "$lib_nssutil"; then - libdirs="$libdirs -lnssutil${major_version}" - fi - echo $libdirs -fi - diff --git a/testing/nss/nss-no-rpath.patch b/testing/nss/nss-no-rpath.patch deleted file mode 100644 index 35ea57315..000000000 --- a/testing/nss/nss-no-rpath.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ./mozilla/security/nss/cmd/platlibs.mk.withrpath 2007-02-19 07:17:06.000000000 +0100 -+++ ./mozilla/security/nss/cmd/platlibs.mk 2007-02-19 07:18:07.000000000 +0100 -@@ -52,9 +52,9 @@ - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' - endif - endif - diff --git a/testing/nss/nss.pc.in b/testing/nss/nss.pc.in deleted file mode 100644 index d47b9e146..000000000 --- a/testing/nss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% - -Name: NSS -Description: Network Security Services -Version: %NSS_VERSION% -Requires: nspr >= %NSPR_VERSION% -Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 -Cflags: -I${includedir} diff --git a/testing/nss/ssl-renegotiate-transitional.patch b/testing/nss/ssl-renegotiate-transitional.patch deleted file mode 100644 index f457c5551..000000000 --- a/testing/nss/ssl-renegotiate-transitional.patch +++ /dev/null @@ -1,21 +0,0 @@ -Enable transitional scheme for ssl renegotiation: - -(from mozilla/security/nss/lib/ssl/ssl.h) -Disallow unsafe renegotiation in server sockets only, but allow clients -to continue to renegotiate with vulnerable servers. -This value should only be used during the transition period when few -servers have been upgraded. - -diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c -index f1d1921..c074360 100644 ---- a/mozilla/security/nss/lib/ssl/sslsock.c -+++ b/mozilla/security/nss/lib/ssl/sslsock.c -@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = { - PR_FALSE, /* noLocks */ - PR_FALSE, /* enableSessionTickets */ - PR_FALSE, /* enableDeflate */ -- 2, /* enableRenegotiation (default: requires extension) */ -+ 3, /* enableRenegotiation (default: transitional) */ - PR_FALSE, /* requireSafeNegotiation */ - }; - diff --git a/testing/openconnect/PKGBUILD b/testing/openconnect/PKGBUILD deleted file mode 100644 index c4b34224c..000000000 --- a/testing/openconnect/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 136153 2011-08-23 08:09:54Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=openconnect -pkgver=3.11 -pkgrel=1 -epoch=1 -pkgdesc="Open client for Cisco AnyConnect VPN" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.infradead.org/openconnect.html" -depends=('libxml2' 'openssl' 'libproxy') -options=('!libtool' '!emptydirs') -source=(ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('b66927f98cfeb577b3016f8b83005d6b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/pcre/PKGBUILD b/testing/pcre/PKGBUILD deleted file mode 100644 index e00105faa..000000000 --- a/testing/pcre/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 136064 2011-08-22 11:33:49Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> - -pkgname=pcre -pkgver=8.13 -pkgrel=2 -pkgdesc="A library that implements Perl 5-style regular expressions" -arch=('i686' 'x86_64') -url="http://www.pcre.org/" -license=('BSD') -depends=('gcc-libs') -options=('!libtool') -source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2 - r661.diff) -md5sums=('5e595edbcded141813fa1a10dbce05cb' - '70e2725b46ff6f3f114ce5067fd03405') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - - # http://bugs.exim.org/show_bug.cgi?id=1136 - patch -Np2 -i "${srcdir}"/r661.diff - sed -i '12140d' testdata/testoutput2 - - [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC" - ./configure --prefix=/usr --enable-utf8 --enable-unicode-properties - make -} - -check() { - cd "${srcdir}"/${pkgname}-${pkgver} - make check -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - - # grep uses pcre, so we need the libs in /lib - install -dm755 "${pkgdir}"/lib - mv "${pkgdir}"/usr/lib/libpcre.so.* "${pkgdir}"/lib/ - ln -sf /lib/libpcre.so.0 "${pkgdir}"/usr/lib/libpcre.so - - install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/testing/pcre/r661.diff b/testing/pcre/r661.diff deleted file mode 100644 index 7bed4ce2e..000000000 --- a/testing/pcre/r661.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- code/trunk/pcre_compile.c 2011/08/02 11:00:40 654 -+++ code/trunk/pcre_compile.c 2011/08/21 09:00:54 661 -@@ -2295,8 +2295,13 @@ - A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not. - It seems that the appearance of a nested POSIX class supersedes an apparent - external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or --a digit. Also, unescaped square brackets may also appear as part of class --names. For example, [:a[:abc]b:] gives unknown class "[:abc]b:]"in Perl. -+a digit. -+ -+In Perl, unescaped square brackets may also appear as part of class names. For -+example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for -+[:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not -+seem right at all. PCRE does not allow closing square brackets in POSIX class -+names. - - Arguments: - ptr pointer to the initial [ -@@ -2314,6 +2319,7 @@ - { - if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) - ptr++; -+ else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE; - else - { - if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) diff --git a/testing/php-apc/PKGBUILD b/testing/php-apc/PKGBUILD deleted file mode 100644 index 326f74b21..000000000 --- a/testing/php-apc/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 135737 2011-08-18 09:07:47Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgname=php-apc -pkgver=3.1.9 -pkgrel=2 -arch=('i686' 'x86_64') -pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code' -url='http://pecl.php.net/package/APC' -depends=('php') -license="PHP" -source=("http://pecl.php.net/get/APC-${pkgver}.tgz") -backup=('etc/php/conf.d/apc.ini') -md5sums=('a2cf7fbf6f3a87f190d897a53260ddaa') - -build() { - cd $srcdir/APC-$pkgver - phpize - ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/APC-$pkgver - make INSTALL_ROOT=$pkgdir install - echo ';extension=apc.so' > apc.ini - install -D -m644 apc.ini $pkgdir/etc/php/conf.d/apc.ini - install -D -m644 apc.php $pkgdir/usr/share/php-apc/apc.php - install -D -m644 INSTALL $pkgdir/usr/share/doc/php-apc/install.txt -} diff --git a/testing/php-suhosin/PKGBUILD b/testing/php-suhosin/PKGBUILD deleted file mode 100644 index 5d1106c38..000000000 --- a/testing/php-suhosin/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 135740 2011-08-18 09:08:36Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgname=php-suhosin -pkgver=0.9.32.1 -pkgrel=2 -arch=('i686' 'x86_64') -pkgdesc='An advanced protection system for PHP installations' -url='http://www.hardened-php.net/suhosin/' -license='PHP' -source=("http://download.suhosin.org/suhosin-${pkgver}.tar.gz") -depends=('php') -conflicts=('php-suhosin-extension') -replaces=('php-suhosin-extension') -backup=('etc/php/conf.d/suhosin.ini') -md5sums=('26a86f0f684a656c3e789e3eb4ec1db3') - -build() { - cd ${srcdir}/suhosin-${pkgver} - phpize - ./configure --prefix=/usr --enable-suhosin - make -} - -package() { - cd ${srcdir}/suhosin-${pkgver} - make INSTALL_ROOT=${pkgdir} install - # disable by default - sed -i 's|extension = suhosin.so|;extension=suhosin.so|g' suhosin.ini - install -D -m644 suhosin.ini ${pkgdir}/etc/php/conf.d/suhosin.ini -} diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD deleted file mode 100644 index 10e4467c6..000000000 --- a/testing/php/PKGBUILD +++ /dev/null @@ -1,344 +0,0 @@ -# $Id: PKGBUILD 135733 2011-08-18 08:19:46Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=php -pkgname=('php' - 'php-cgi' - 'php-apache' - 'php-fpm' - 'php-embed' - 'php-curl' - 'php-enchant' - 'php-gd' - 'php-gmp' - 'php-intl' - 'php-ldap' - 'php-mcrypt' - 'php-mssql' - 'php-odbc' - 'php-pgsql' - 'php-pspell' - 'php-snmp' - 'php-sqlite' - 'php-tidy' - 'php-xsl') -pkgver=5.3.7 -pkgrel=1 -arch=('i686' 'x86_64') -license=('PHP') -url='http://www.php.net' -makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' - 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' - 'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'libpng' 'libjpeg' 'icu' - 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') -source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" - 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' - 'logrotate.d.php-fpm') -md5sums=('2d47d003c96de4e88863ff38da61af33' - '39eaa70d276fc3d45d6bcf6cd5ae1106' - 'dec2cbaad64e3abf4f0ec70e1de4e8e9' - 'b01be5f816988fcee7e78225836e5e27' - '09005dabd90c48ddd392b3dbf05f8a82' - '07c4e412909ac65a44ec90e7a2c4bade') - -build() { - phpconfig="--srcdir=../${pkgbase}-${pkgver} \ - --prefix=/usr \ - --sysconfdir=/etc/php \ - --localstatedir=/var \ - --with-layout=GNU \ - --with-config-file-path=/etc/php \ - --with-config-file-scan-dir=/etc/php/conf.d \ - --enable-inline-optimization \ - --disable-debug \ - --disable-rpath \ - --disable-static \ - --enable-shared \ - --mandir=/usr/share/man \ - --without-pear \ - " - - phpextensions="--enable-bcmath=shared \ - --enable-calendar=shared \ - --enable-dba=shared \ - --enable-exif=shared \ - --enable-ftp=shared \ - --enable-gd-native-ttf \ - --enable-intl=shared \ - --enable-json=shared \ - --enable-mbregex \ - --enable-mbstring \ - --enable-pdo \ - --enable-phar=shared \ - --enable-posix=shared \ - --enable-session \ - --enable-shmop=shared \ - --enable-soap=shared \ - --enable-sockets=shared \ - --enable-sqlite-utf8 \ - --enable-sysvmsg=shared \ - --enable-sysvsem=shared \ - --enable-sysvshm=shared \ - --enable-xml \ - --enable-zip=shared \ - --with-bz2=shared \ - --with-curl=shared \ - --with-db4=/usr \ - --with-enchant=shared,/usr \ - --with-freetype-dir=shared,/usr \ - --with-gd=shared \ - --with-gdbm=shared \ - --with-gettext=shared \ - --with-gmp=shared \ - --with-iconv=shared \ - --with-icu-dir=/usr \ - --with-imap-ssl=shared \ - --with-imap=shared \ - --with-jpeg-dir=shared,/usr \ - --with-ldap=shared \ - --with-ldap-sasl \ - --with-mcrypt=shared \ - --with-mhash \ - --with-mssql=shared \ - --with-mysql-sock=/var/run/mysqld/mysqld.sock \ - --with-mysql=shared,mysqlnd \ - --with-mysqli=shared,mysqlnd \ - --with-openssl=shared \ - --with-pcre-regex=/usr \ - --with-pdo-mysql=shared,mysqlnd \ - --with-pdo-odbc=shared,unixODBC,/usr \ - --with-pdo-pgsql=shared \ - --with-pdo-sqlite=shared,/usr \ - --with-pgsql=shared \ - --with-png-dir=shared,/usr \ - --with-pspell=shared \ - --with-regex=php \ - --with-snmp=shared \ - --with-sqlite3=shared,/usr \ - --with-sqlite=shared \ - --with-tidy=shared \ - --with-unixODBC=shared,/usr \ - --with-xmlrpc=shared \ - --with-xsl=shared \ - --with-zlib \ - --without-db2 \ - --without-db3 \ - " - - EXTENSION_DIR=/usr/lib/php/modules - export EXTENSION_DIR - PEAR_INSTALLDIR=/usr/share/pear - export PEAR_INSTALLDIR - - cd ${srcdir}/${pkgbase}-${pkgver} - - # adjust paths - patch -p0 -i ${srcdir}/php.ini.patch - patch -p0 -i ${srcdir}/php-fpm.conf.in.patch - - # php - mkdir ${srcdir}/build-php - cd ${srcdir}/build-php - ln -s ../${pkgbase}-${pkgver}/configure - ./configure ${phpconfig} \ - --disable-cgi \ - --with-readline \ - --enable-pcntl \ - ${phpextensions} - make - - # cgi and fcgi - # reuse the previous run; this will save us a lot of time - cp -a ${srcdir}/build-php ${srcdir}/build-cgi - cd ${srcdir}/build-cgi - ./configure ${phpconfig} \ - --disable-cli \ - --enable-cgi \ - ${phpextensions} - make - - # apache - cp -a ${srcdir}/build-php ${srcdir}/build-apache - cd ${srcdir}/build-apache - ./configure ${phpconfig} \ - --disable-cli \ - --with-apxs2 \ - ${phpextensions} - make - - # fpm - cp -a ${srcdir}/build-php ${srcdir}/build-fpm - cd ${srcdir}/build-fpm - ./configure ${phpconfig} \ - --disable-cli \ - --enable-fpm \ - --with-fpm-user=http \ - --with-fpm-group=http \ - ${phpextensions} - make - - # embed - cp -a ${srcdir}/build-php ${srcdir}/build-embed - cd ${srcdir}/build-embed - ./configure ${phpconfig} \ - --disable-cli \ - --enable-embed=shared \ - ${phpextensions} - make -} - -# check() { -# cd ${srcdir}/build-php -# make test -# } - -package_php() { - pkgdesc='An HTML-embedded scripting language' - depends=('pcre' 'libxml2' 'bzip2' 'openssl') - replaces=('php-fileinfo') - provides=('php-fileinfo') - conflicts=('php-fileinfo') - backup=('etc/php/php.ini') - - cd ${srcdir}/build-php - make -j1 INSTALL_ROOT=${pkgdir} install - install -d -m755 ${pkgdir}/usr/share/pear - # install php.ini - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini - install -d -m755 ${pkgdir}/etc/php/conf.d/ - - # remove static modules - rm -f ${pkgdir}/usr/lib/php/modules/*.a - # remove modules provided by sub packages - rm -f ${pkgdir}/usr/lib/php/modules/{curl,enchant,gd,gmp,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so -} - -package_php-cgi() { - pkgdesc='CGI and FCGI SAPI for PHP' - depends=('php' 'pcre' 'libxml2') - - install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi -} - -package_php-apache() { - pkgdesc='Apache SAPI for PHP' - depends=('php' 'apache' 'pcre' 'libxml2') - backup=('etc/httpd/conf/extra/php5_module.conf') - - install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so - install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf -} - -package_php-fpm() { - pkgdesc='FastCGI Process Manager for PHP' - depends=('php') - backup=('etc/php/php-fpm.conf') - - install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm - install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 - install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf - install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm - install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm - install -d -m755 ${pkgdir}/etc/php/fpm.d -} - -package_php-embed() { - pkgdesc='Embed SAPI for PHP' - depends=('php' 'pcre' 'libxml2') - - install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h -} - -package_php-curl() { - depends=('php' 'curl') - pkgdesc='curl module for PHP' - install -D -m755 ${srcdir}/build-php/modules/curl.so ${pkgdir}/usr/lib/php/modules/curl.so -} - -package_php-enchant() { - depends=('php' 'enchant') - pkgdesc='enchant module for PHP' - install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so -} - -package_php-gd() { - depends=('php' 'libpng' 'libjpeg' 'freetype2') - pkgdesc='gd module for PHP' - install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so -} - -package_php-gmp() { - depends=('php' 'gmp') - pkgdesc='gmp module for PHP' - install -D -m755 ${srcdir}/build-php/modules/gmp.so ${pkgdir}/usr/lib/php/modules/gmp.so -} - -package_php-intl() { - depends=('php' 'icu') - pkgdesc='intl module for PHP' - install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so -} - -package_php-ldap() { - depends=('php' 'libldap') - pkgdesc='ldap module for PHP' - install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so -} - -package_php-mcrypt() { - depends=('php' 'libmcrypt' 'libtool') - pkgdesc='mcrypt module for PHP' - install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so -} - -package_php-mssql() { - depends=('php' 'freetds') - pkgdesc='mssql module for PHP' - install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so -} - -package_php-odbc() { - depends=('php' 'unixodbc') - pkgdesc='ODBC modules for PHP' - install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so - install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so -} - -package_php-pgsql() { - depends=('php' 'postgresql-libs') - pkgdesc='PostgreSQL modules for PHP' - install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so - install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so -} - -package_php-pspell() { - depends=('php' 'aspell') - pkgdesc='pspell module for PHP' - install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so -} - -package_php-snmp() { - depends=('php' 'net-snmp') - pkgdesc='snmp module for PHP' - install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so -} - -package_php-sqlite() { - depends=('php' 'sqlite3') - pkgdesc='sqlite3 module for PHP' - install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so - install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so -} - -package_php-tidy() { - depends=('php' 'tidyhtml') - pkgdesc='tidy module for PHP' - install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so -} - -package_php-xsl() { - depends=('php' 'libxslt') - pkgdesc='xsl module for PHP' - install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so -} diff --git a/testing/php/apache.conf b/testing/php/apache.conf deleted file mode 100644 index c3ca0aad5..000000000 --- a/testing/php/apache.conf +++ /dev/null @@ -1,13 +0,0 @@ -# Required modules: dir_module, php5_module - -<IfModule dir_module> - <IfModule php5_module> - DirectoryIndex index.php index.html - <FilesMatch "\.php$"> - SetHandler application/x-httpd-php - </FilesMatch> - <FilesMatch "\.phps$"> - SetHandler application/x-httpd-php-source - </FilesMatch> - </IfModule> -</IfModule> diff --git a/testing/php/logrotate.d.php-fpm b/testing/php/logrotate.d.php-fpm deleted file mode 100644 index 7a1ba2597..000000000 --- a/testing/php/logrotate.d.php-fpm +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/php-fpm.log { - missingok - postrotate - /etc/rc.d/php-fpm logrotate >/dev/null || true - endscript -} diff --git a/testing/php/php-fpm.conf.in.patch b/testing/php/php-fpm.conf.in.patch deleted file mode 100644 index b4dd32f96..000000000 --- a/testing/php/php-fpm.conf.in.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- sapi/fpm/php-fpm.conf.in 2011-07-04 23:22:56.000000000 +0200 -+++ sapi/fpm/php-fpm.conf.in 2011-08-12 16:56:23.686606725 +0200 -@@ -12,7 +12,7 @@ - ; Relative path can also be used. They will be prefixed by: - ; - the global prefix if it's been set (-p arguement) - ; - @prefix@ otherwise --;include=etc/fpm.d/*.conf -+;include=/etc/php/fpm.d/*.conf - - ;;;;;;;;;;;;;;;;;; - ; Global Options ; -@@ -22,7 +22,7 @@ - ; Pid file - ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ - ; Default Value: none --;pid = run/php-fpm.pid -+pid = run/php-fpm/php-fpm.pid - - ; Error log file - ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ -@@ -102,7 +102,8 @@ - ; specific port; - ; '/path/to/unix/socket' - to listen on a unix socket. - ; Note: This value is mandatory. --listen = 127.0.0.1:9000 -+;listen = 127.0.0.1:9000 -+listen = /var/run/php-fpm/php-fpm.sock - - ; Set listen(2) backlog. A value of '-1' means unlimited. - ; Default Value: 128 (-1 on FreeBSD and OpenBSD) -@@ -121,9 +122,9 @@ - ; BSD-derived systems allow connections regardless of permissions. - ; Default Values: user and group are set as the running user - ; mode is set to 0666 --;listen.owner = @php_fpm_user@ --;listen.group = @php_fpm_group@ --;listen.mode = 0666 -+listen.owner = @php_fpm_user@ -+listen.group = @php_fpm_group@ -+listen.mode = 0660 - - ; Unix user/group of processes - ; Note: The user is mandatory. If the group is not set, the default user's group -@@ -163,23 +164,23 @@ - ; The number of child processes created on startup. - ; Note: Used only when pm is set to 'dynamic' - ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 --;pm.start_servers = 20 -+pm.start_servers = 20 - - ; The desired minimum number of idle server processes. - ; Note: Used only when pm is set to 'dynamic' - ; Note: Mandatory when pm is set to 'dynamic' --;pm.min_spare_servers = 5 -+pm.min_spare_servers = 5 - - ; The desired maximum number of idle server processes. - ; Note: Used only when pm is set to 'dynamic' - ; Note: Mandatory when pm is set to 'dynamic' --;pm.max_spare_servers = 35 -+pm.max_spare_servers = 35 - - ; The number of requests each child process should execute before respawning. - ; This can be useful to work around memory leaks in 3rd party libraries. For - ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. - ; Default Value: 0 --;pm.max_requests = 500 -+pm.max_requests = 500 - - ; The URI to view the FPM status page. If this value is not set, no URI will be - ; recognized as a status page. By default, the status page shows the following -@@ -333,7 +334,7 @@ - ; Chdir to this directory at the start. - ; Note: relative path can be used. - ; Default Value: current directory or / when chroot --;chdir = /var/www -+;chdir = /srv/http - - ; Redirect worker stdout and stderr into main error log. If not set, stdout and - ; stderr will be redirected to /dev/null according to FastCGI specs. diff --git a/testing/php/php.ini.patch b/testing/php/php.ini.patch deleted file mode 100644 index 356e190b4..000000000 --- a/testing/php/php.ini.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- php.ini-production 2011-02-09 01:25:44.000000000 +0100 -+++ php.ini-production 2011-03-19 11:11:44.496987763 +0100 -@@ -376,7 +376,7 @@ - ; or per-virtualhost web server configuration file. This directive is - ; *NOT* affected by whether Safe Mode is turned On or Off. - ; http://php.net/open-basedir --;open_basedir = -+open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/ - - ; This directive allows you to disable certain functions for security reasons. - ; It receives a comma-delimited list of function names. This directive is -@@ -781,7 +781,7 @@ - ;;;;;;;;;;;;;;;;;;;;;;;;; - - ; UNIX: "/path1:/path2" --;include_path = ".:/php/includes" -+include_path = ".:/usr/share/pear" - ; - ; Windows: "\path1;\path2" - ;include_path = ".;c:\php\includes" -@@ -804,7 +804,7 @@ - - ; Directory in which the loadable extensions (modules) reside. - ; http://php.net/extension-dir --; extension_dir = "./" -+extension_dir = "/usr/lib/php/modules/" - ; On windows: - ; extension_dir = "ext" - -@@ -938,53 +938,49 @@ - ; If you only provide the name of the extension, PHP will look for it in its - ; default extension directory. - ; --; Windows Extensions --; Note that ODBC support is built in, so no dll is needed for it. --; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) --; extension folders as well as the separate PECL DLL download (PHP 5). --; Be sure to appropriately set the extension_dir directive. --; --;extension=php_bz2.dll --;extension=php_curl.dll --;extension=php_fileinfo.dll --;extension=php_gd2.dll --;extension=php_gettext.dll --;extension=php_gmp.dll --;extension=php_intl.dll --;extension=php_imap.dll --;extension=php_interbase.dll --;extension=php_ldap.dll --;extension=php_mbstring.dll --;extension=php_exif.dll ; Must be after mbstring as it depends on it --;extension=php_mysql.dll --;extension=php_mysqli.dll --;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client --;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client --;extension=php_openssl.dll --;extension=php_pdo_firebird.dll --;extension=php_pdo_mssql.dll --;extension=php_pdo_mysql.dll --;extension=php_pdo_oci.dll --;extension=php_pdo_odbc.dll --;extension=php_pdo_pgsql.dll --;extension=php_pdo_sqlite.dll --;extension=php_pgsql.dll --;extension=php_pspell.dll --;extension=php_shmop.dll -- --; The MIBS data available in the PHP distribution must be installed. --; See http://www.php.net/manual/en/snmp.installation.php --;extension=php_snmp.dll -- --;extension=php_soap.dll --;extension=php_sockets.dll --;extension=php_sqlite.dll --;extension=php_sqlite3.dll --;extension=php_sybase_ct.dll --;extension=php_tidy.dll --;extension=php_xmlrpc.dll --;extension=php_xsl.dll --;extension=php_zip.dll -+;extension=bcmath.so -+;extension=bz2.so -+;extension=calendar.so -+;extension=curl.so -+;extension=dba.so -+;extension=enchant.so -+;extension=exif.so -+;extension=ftp.so -+;extension=gd.so -+extension=gettext.so -+;extension=gmp.so -+;extension=iconv.so -+;extension=imap.so -+;extension=intl.so -+;extension=json.so -+;extension=ldap.so -+;extension=mcrypt.so -+;extension=mssql.so -+;extension=mysqli.so -+;extension=mysql.so -+;extension=odbc.so -+;extension=openssl.so -+;extension=pdo_mysql.so -+;extension=pdo_odbc.so -+;extension=pdo_pgsql.so -+;extension=pdo_sqlite.so -+;extension=pgsql.so -+;extension=phar.so -+;extension=posix.so -+;extension=pspell.so -+;extension=shmop.so -+;extension=snmp.so -+;extension=soap.so -+;extension=sockets.so -+;extension=sqlite3.so -+;extension=sqlite.so -+;extension=sysvmsg.so -+;extension=sysvsem.so -+;extension=sysvshm.so -+;extension=tidy.so -+;extension=xmlrpc.so -+;extension=xsl.so -+;extension=zip.so - - ;;;;;;;;;;;;;;;;;;; - ; Module Settings ; diff --git a/testing/php/rc.d.php-fpm b/testing/php/rc.d.php-fpm deleted file mode 100644 index 54bcf4d5b..000000000 --- a/testing/php/rc.d.php-fpm +++ /dev/null @@ -1,158 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - - -wait_for_pid () { - try=0 - while test $try -lt 35 ; do - case "$1" in - 'created') - if [ -f "$2" ] ; then - try='' - break - fi - ;; - 'removed') - if [ ! -f "$2" ] ; then - try='' - break - fi - ;; - esac - - stat_append '.' - try=`expr $try + 1` - sleep 1 - done -} - -test_config() { - stat_busy 'Checking configuration' - if [ $(id -u) -ne 0 ]; then - stat_append '(This script must be run as root)' - stat_die - fi - - if [ ! -r /etc/php/php-fpm.conf ]; then - stat_append '(/etc/php/php-fpm.conf not found)' - stat_die - fi - - local test=$(/usr/sbin/php-fpm -t 2>&1) - if [ $? -gt 0 ]; then - stat_append '(error in /etc/php/php-fpm.conf)' - stat_die - elif echo $test | grep -qi 'error'; then - stat_append '(error in /etc/php/php.ini)' - stat_die - fi - - [ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm - - stat_done -} - -case "$1" in - start) - test_config - stat_busy 'Starting php-fpm' - - /usr/sbin/php-fpm - - if [ "$?" != 0 ] ; then - stat_fail - exit 1 - fi - - wait_for_pid created /var/run/php-fpm/php-fpm.pid - - if [ -n "$try" ] ; then - stat_fail - exit 1 - else - add_daemon php-fpm - stat_done - fi - ;; - - stop) - test_config - stat_busy 'Gracefully shutting down php-fpm' - - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -QUIT `cat /var/run/php-fpm/php-fpm.pid` - - wait_for_pid removed /var/run/php-fpm.pid - - if [ -n "$try" ] ; then - stat_fail - exit 1 - else - rm_daemon php-fpm - stat_done - fi - ;; - - force-quit) - stat_busy 'Terminating php-fpm' - - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -TERM `cat /var/run/php-fpm/php-fpm.pid` - - wait_for_pid removed /var/run/php-fpm/php-fpm.pid - - if [ -n "$try" ] ; then - stat_fail - exit 1 - else - rm_daemon php-fpm - stat_done - fi - ;; - - restart) - $0 stop - $0 start - ;; - - reload) - test_config - stat_busy 'Reload service php-fpm' - - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -USR2 `cat /var/run/php-fpm/php-fpm.pid` - stat_done - ;; - - logrotate) - stat_busy 'Reopen php-fpm log' - - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -USR1 `cat /var/run/php-fpm/php-fpm.pid` - stat_done - ;; - - *) - echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}" - exit 1 - ;; - -esac diff --git a/testing/ppl/PKGBUILD b/testing/ppl/PKGBUILD deleted file mode 100644 index 6d0c7cfc1..000000000 --- a/testing/ppl/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 135489 2011-08-14 09:37:40Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: ezzetabi <ezzetabi at gawab dot com> - -pkgname=ppl -pkgver=0.11.2 -pkgrel=2 -pkgdesc="A modern library for convex polyhedra and other numerical abstractions." -arch=('i686' 'x86_64') -url="http://www.cs.unipr.it/ppl" -license=('GPL3') -depends=('gmp>=5.0') -options=('!docs' '!libtool') -source=(http://www.cs.unipr.it/ppl/Download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz) -md5sums=('ce014f153a28006009db207ca953a984') - -build() { - cd $srcdir/ppl-$pkgver - ./configure --prefix=/usr --enable-interfaces="c,cxx" - make -} - -check() { - cd $srcdir/ppl-$pkgver - make check -} - -package() { - cd $srcdir/ppl-$pkgver - make DESTDIR=$pkgdir install -} - diff --git a/testing/qemu-kvm/65-kvm.rules b/testing/qemu-kvm/65-kvm.rules deleted file mode 100644 index c2f7317aa..000000000 --- a/testing/qemu-kvm/65-kvm.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="kvm", GROUP="kvm", MODE="0660" diff --git a/testing/qemu-kvm/PKGBUILD b/testing/qemu-kvm/PKGBUILD deleted file mode 100644 index 604d55da4..000000000 --- a/testing/qemu-kvm/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 135315 2011-08-12 16:52:46Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=qemu-kvm -pkgver=0.15.0 -pkgrel=2 -pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." -arch=(i686 x86_64) -license=('GPL2' 'LGPL2.1') -url="http://www.linux-kvm.org" -depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng') -makedepends=('texi2html' 'perl' 'python2') -backup=('etc/qemu/target-x86_64.conf') -install=qemu-kvm.install -conflicts=('qemu') -provides=('qemu') -replaces=('kvm') -source=(http://downloads.sourceforge.net/kvm/${pkgname}-${pkgver}.tar.gz - 65-kvm.rules) -options=(!strip) - -build() -{ - cd ${srcdir}/${pkgname}-${pkgver} - # fix esound building - ./configure --prefix=/usr \ - --python=/usr/bin/python2 \ - --sysconfdir=/etc \ - --audio-drv-list=alsa,sdl,oss \ - --audio-card-list=ac97,sb16,es1370,hda \ - --enable-docs - make -} -package() -{ - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - # symbolic link for backwards compatibility - ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu-kvm - # symbolic link for to qemu binary for emulator apps - ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/qemu - # symbolic link for to qemu binary for emulator apps - ln -s qemu-system-x86_64 ${pkgdir}/usr/bin/kvm - # fix man page - mv ${pkgdir}/usr/share/man/man1/qemu.1 \ - ${pkgdir}/usr/share/man/man1/qemu-kvm.1 - # install udev rules - install -D -m644 ${srcdir}/65-kvm.rules \ - ${pkgdir}/lib/udev/rules.d/65-kvm.rules - # strip scripts directory - find ${pkgdir}/usr/bin -type f -perm -u+w 2>/dev/null | while read binary ; do - case "$(file -bi "$binary")" in - *application/x-executable*) # Binaries - /usr/bin/strip $STRIP_BINARIES "$binary";; - esac - done -} -md5sums=('b45b0deebba4ce47dcaaab3807f6ed47' - 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/testing/qemu-kvm/qemu-kvm.install b/testing/qemu-kvm/qemu-kvm.install deleted file mode 100644 index 84aa773b9..000000000 --- a/testing/qemu-kvm/qemu-kvm.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - groupadd kvm -f -g 78 - echo ">>> PLEASE READ FOR KVM USAGE!" - echo ">>> Load the correct KVM module, you will need a KVM capable CPU!" - echo ">>> Add yourself to the group 'kvm'." - echo ">>> Use 'qemu-kvm -enable-kvm' to use KVM." - echo "" -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - groupdel kvm -} diff --git a/testing/qemu/65-kvm.rules b/testing/qemu/65-kvm.rules deleted file mode 100644 index c2f7317aa..000000000 --- a/testing/qemu/65-kvm.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="kvm", GROUP="kvm", MODE="0660" diff --git a/testing/qemu/PKGBUILD b/testing/qemu/PKGBUILD deleted file mode 100644 index 0fbbd0d46..000000000 --- a/testing/qemu/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 135352 2011-08-13 06:11:28Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=qemu -pkgver=0.15.0 -pkgrel=2 -pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." -arch=('i686' 'x86_64') -license=('GPL2' 'LGPL2.1') -url="http://wiki.qemu.org/Index.html" -makedepends=('texi2html' 'perl' 'python2') -depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl') -backup=('etc/qemu/target-x86_64.conf') -install=qemu.install -source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz - 65-kvm.rules) -options=(!strip) - -build() -{ - cd ${srcdir}/${pkgname}-${pkgver} - sed -i -e 's/lib64/lib/g' x86_64.ld - ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl \ - --python=/usr/bin/python2 \ - --audio-card-list=ac97,sb16,es1370,hda \ - --enable-docs - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -D -m644 ${srcdir}/65-kvm.rules \ - ${pkgdir}/lib/udev/rules.d/65-kvm.rules - # strip scripts directory - find ${pkgdir}/usr/src/linux-${_kernver}/scripts -type f -perm -u+w 2>/dev/null | while read binary ; do - case "$(file -bi "$binary")" in - *application/x-executable*) # Binaries - /usr/bin/strip $STRIP_BINARIES "$binary";; - esac - done - -} -md5sums=('dbc55b014bcd21b98e347f6a90f7fb6d' - 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/testing/qemu/qemu.install b/testing/qemu/qemu.install deleted file mode 100644 index e16ac027c..000000000 --- a/testing/qemu/qemu.install +++ /dev/null @@ -1,24 +0,0 @@ -# kvm: the new package version -post_install() { - # - groupadd kvm -f -g 78 - echo ">>> PLEASE READ FOR KVM USAGE!" - echo ">>> Load the correct KVM module, you will need a KVM capable CPU!" - echo ">>> Add yourself to the group 'kvm'." - echo ">>> Use 'qemu -enable-kvm' to use KVM." - echo "" - if [ "$(vercmp $2 0.11)" -lt 0 ]; then - echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module" - echo "is no longer supported and will be removed from the repositories. You" - echo "can safely uninstall it from your system." - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - # - groupdel kvm -} diff --git a/testing/run-parts/PKGBUILD b/testing/run-parts/PKGBUILD deleted file mode 100644 index 1a51f36af..000000000 --- a/testing/run-parts/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 136374 2011-08-28 08:50:02Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgname=run-parts -pkgver=4.0.2 -pkgrel=1 -pkgdesc='run scripts or programs in a directory' -arch=('i686' 'x86_64') -url='http://packages.qa.debian.org/d/debianutils.html' -license=('GPL') -depends=('glibc') -source=("http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_${pkgver}.tar.gz") -sha256sums=('c2fca92e93437ea5f0904f12847779d67b13d4b9d6ca85b8213e678a03ed76dc') - -build() { - cd $srcdir/debianutils-$pkgver - ./configure --prefix=/usr - make run-parts -} - -package() { - cd $srcdir/debianutils-$pkgver - install -D -m755 run-parts $pkgdir/usr/bin/run-parts - install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8 - for l in po4a/*/run-parts.8; do - install -D -m644 ${l} $pkgdir/usr/share/man/${l:5:2}/man8/run-parts.8 - done -} diff --git a/testing/samba/PKGBUILD b/testing/samba/PKGBUILD deleted file mode 100644 index 6832cb257..000000000 --- a/testing/samba/PKGBUILD +++ /dev/null @@ -1,163 +0,0 @@ -# $Id: PKGBUILD 136307 2011-08-25 16:02:25Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> -pkgbase=samba -pkgname=('smbclient' 'samba') -pkgver=3.6.0 -# We use the 'A' to fake out pacman's version comparators. Samba chooses -# to append 'a','b',etc to their subsequent releases, which pamcan -# misconstrues as alpha, beta, etc. Bad samba! -_realver=3.6.0 -pkgrel=3 -arch=(i686 x86_64) -url="http://www.samba.org" -license=('GPL3') -makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' -'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb' 'python2') -options=(!makeflags) -source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz - samba samba.logrotate - swat.xinetd - samba.pam - samba.conf.d - fix-ipv6-mount.patch) -### UNINSTALL dmapi package before building!!! - -build() { - cd ${srcdir}/${pkgbase}-${_realver}/source3 - sed -i "s/env python/env python2/g" ../buildtools/bin/waf - ./autogen-waf.sh - # everything needs to be specified :/ - ../buildtools/bin/waf configure --prefix=/usr \ - --with-privatedir=/etc/samba/private \ - --libdir=/usr/lib/ \ - --with-modulesdir=/usr/lib/samba \ - --with-swatdir=/usr/share/samba/swat \ - --localstatedir=/var \ - --with-configdir=/etc/samba \ - --with-lockdir=/var/cache/samba \ - --with-cachedir=/var/cache/samba \ - --with-statedir=/var/cache/samba \ - --with-piddir=/var/run/samba \ - --with-logfilebase=/var/log/samba \ - --sysconfdir=/etc \ - --with-pam \ - --with-pam_smbpass \ - --with-pammodulesdir=/lib/security \ - --with-ads \ - --with-acl-support \ - --with-syslog \ - --disable-avahi \ - --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \ - --disable-rpath \ - --disable-rpath-private-install \ - --disable-rpath-install - #fix the shitty build system! - sed -i -e 's#/etc/smb.conf#/etc/samba/smb.conf#g' bin/default/source3/include/config.h - ../buildtools/bin/waf build ${MAKEFLAGS} -} - -package_smbclient () { -pkgdesc="Tools to access a server's filespace and printers via SMB" -depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc') - cd ${srcdir}/${pkgbase}-${_realver}/source3 - mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib - install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/ - for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so libtdb-wrap.so libaddns.so libcliauth.so; do - install -m644 -D bin/shared/private/$i ${pkgdir}/usr/lib/$i - done - for i in libsmbconf libnetapi libwbclient libsmbclient; do - install -m644 -D bin/shared/$i.so.0 ${pkgdir}/usr/lib/$i.so.0 - ln -sf /usr/lib/$i.so.0 ${pkgdir}/usr/lib/$i.so - done - mkdir ${pkgdir}/usr/lib/libsmb - ln -sf /usr/lib/libsmb/libsmbclient.so.0 ${pkgdir}/usr/lib/libsmb/libsmbclient.so.0 - ln -sf /usr/lib/libsmb/libsmbclient.so.0 ${pkgdir}/usr/lib/libsmb/libsmbclient.so - for i in libndr-krb5pac libndr-standard libndr; do - install -m644 -D bin/shared/$i.so.0 ${pkgdir}/usr/lib/$i.so.0.0.1 - ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so.0 - ln -sf /usr/lib/$i.so.0.0.1 ${pkgdir}/usr/lib/$i.so - done - install -m644 -D bin/shared/private/libtevent.so.0 ${pkgdir}/usr/lib/libtevent.so.0.9.11 - ln -sf /usr/lib/samba/libtevent.so.0.9.11 ${pkgdir}/usr/lib/libtevent.so.0 - install -m755 script/smbtar ${pkgdir}/usr/bin/ - mkdir -p ${pkgdir}/usr/lib/cups/backend - ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb - mkdir -p ${pkgdir}/usr/include - install -m644 include/libsmbclient.h ${pkgdir}/usr/include/ - install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/ - mkdir -p ${pkgdir}/usr/share/man/man{1,7} - for man in rpcclient smbcacls smbclient smbcquotas smbget \ - smbtree smbtar nmblookup; do - install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/ - done - install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/ -} - -package_samba () { -pkgdesc="Tools to access a server's filespace and printers via SMB" -backup=(etc/logrotate.d/samba - etc/pam.d/samba - etc/samba/smb.conf - etc/xinetd.d/swat - etc/conf.d/samba) -depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc') -optdepends=('python2: for python bindings') - cd ${srcdir}/samba-${_realver}/source3 - mkdir -p ${pkgdir}/etc/samba/private - chmod 700 ${pkgdir}/etc/samba/private - ../buildtools/bin/waf install --destdir=${pkgdir} - chmod 644 ${pkgdir}/usr/include/*.h - rm -rf ${pkgdir}/usr/var - install -D -m755 ${startdir}/samba ${pkgdir}/etc/rc.d/samba - install -D -m644 ${startdir}/samba.conf.d ${pkgdir}/etc/conf.d/samba - mkdir -p ${pkgdir}/etc/samba - cat ../examples/smb.conf.default | \ - sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default - install -D -m644 ${startdir}/samba.logrotate ${pkgdir}/etc/logrotate.d/samba - install -D -m644 ${startdir}/swat.xinetd ${pkgdir}/etc/xinetd.d/swat - install -D -m644 ${startdir}/samba.pam ${pkgdir}/etc/pam.d/samba - # spool directory - install -d -m1777 ${pkgdir}/var/spool/samba - sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default - # fix logrotate - sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default - # remove conflict files of smbclient - for man in libsmbclient smbspool \ - mount.cifs net cifs.upcall; do - rm -f ${pkgdir}/usr/share/man/man8/${man}.8 - done - for i in libreplace.so libsmbregistry.so libsecurity.so librpccommon.so libdcerpc-samba.so libpassdb.so libLIBCLI_SPOOLSS.so libprinting_migrate.so libsamba3core.so libndr-samba.so libsamba-util-common.so libads.so libtdb-wrap.so libaddns.so libcliauth.so libtevent.so.0.9.11 libtevent.so.0; do - rm -f ${pkgdir}/usr/lib/samba/$i - done - mv ${pkgdir}/usr/lib/samba/*.so ${pkgdir}/usr/lib - for i in libndr-krb5pac.* libsmbconf.* libndr-standard.* libndr.* libnetapi.* libwbclient.* libsmbclient.*; do - rm -f ${pkgdir}/usr/lib/$i - done - for bin in net \ - nmblookup rpcclient smbcacls smbclient \ - smbcquotas smbget smbspool smbtar smbtree; do - rm -f ${pkgdir}/usr/bin/$bin - done - rm -r ${pkgdir}/usr/lib/libsmb - rm -f ${pkgdir}/usr/sbin/cifs.upcall - rm -f ${pkgdir}/usr/include/netapi.h - for man in rpcclient smbcacls smbclient smbcquotas \ - smbtree smbtar nmblookup smbget; do - rm -f ${pkgdir}/usr/share/man/man1/${man}.1 - done - for man in tdbbackup tdbdump tdbtool; do - rm -f ${pkgdir}/usr/share/man/man8/${man}.8 - done - rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7 - rm -f ${pkgdir}/usr/include/libsmbclient.h - # copy ldap example - install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema -} -md5sums=(e297e0ea7923c7de8d7c1d8fd0ec0a05 - a3da19515a234c703876cf850c44e996 - 5697da77590ec092cc8a883bae06093c - a4bbfa39fee95bba2e7ad6b535fae7e6 - 96f82c38f3f540b53f3e5144900acf17 - f2f2e348acd1ccb566e95fa8a561b828 - c6a38a8c8fa24979e6217aed533358ea) diff --git a/testing/samba/fix-ipv6-mount.patch b/testing/samba/fix-ipv6-mount.patch deleted file mode 100644 index 89bef6533..000000000 --- a/testing/samba/fix-ipv6-mount.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- client/mount.cifs.c.orig 2010-03-03 13:42:02.143936727 +1000 -+++ client/mount.cifs.c 2010-03-04 01:53:22.752879004 +1000 -@@ -1563,7 +1563,7 @@ - } - } - -- if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) { -+ if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) { - strlcat(options, "%", options_size); - current_len = strnlen(options, options_size); - optionstail = options + current_len; diff --git a/testing/samba/samba b/testing/samba/samba deleted file mode 100755 index 458eb8e2b..000000000 --- a/testing/samba/samba +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba - -[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd) - -case "$1" in - start) - rc=0 - stat_busy "Starting Samba Server" - if [ ! -x /var/run/samba ] ; then - install -m755 -g 81 -o 81 -d /var/run/samba - fi - if [ ! -x /var/log/samba ] ; then - install -m755 -g 81 -o 81 -d /var/log/samba - fi - for d in ${SAMBA_DAEMONS[@]}; do - PID=`pidof -o %PPID /usr/sbin/$d` - [ -z "$PID" ] && /usr/sbin/$d -D - rc=$(($rc+$?)) - done - if [ $rc -gt 0 ]; then - stat_fail - else - add_daemon samba - stat_done - fi - ;; - stop) - rc=0 - stat_busy "Stopping Samba Server" - for d in ${SAMBA_DAEMONS[@]}; do - PID=`pidof -o %PPID /usr/sbin/$d` - [ -z "$PID" ] || kill $PID &> /dev/null - rc=$(($rc+$?)) - done - if [ $rc -gt 0 ]; then - stat_fail - else - rm /var/run/samba/smbd.pid &>/dev/null - rm /var/run/samba/nmbd.pid &>/dev/null - rm /var/run/samba/winbindd.pid &>/dev/null - rm_daemon samba - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/samba/samba.conf.d b/testing/samba/samba.conf.d deleted file mode 100644 index 8721f956a..000000000 --- a/testing/samba/samba.conf.d +++ /dev/null @@ -1,7 +0,0 @@ -# -# Configuration for the samba init script -# - -# space separated list of daemons to launch -SAMBA_DAEMONS=(smbd nmbd) -#SAMBA_DAEMONS=(smbd nmbd winbindd) diff --git a/testing/samba/samba.logrotate b/testing/samba/samba.logrotate deleted file mode 100644 index 581f4c33b..000000000 --- a/testing/samba/samba.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log { - notifempty - missingok - sharedscripts - copytruncate - postrotate - /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/testing/samba/samba.pam b/testing/samba/samba.pam deleted file mode 100644 index 53724d1f8..000000000 --- a/testing/samba/samba.pam +++ /dev/null @@ -1,3 +0,0 @@ -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so diff --git a/testing/samba/swat.xinetd b/testing/samba/swat.xinetd deleted file mode 100644 index 2e62a82b2..000000000 --- a/testing/samba/swat.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service swat -{ - socket_type = stream - wait = no - user = root - server = /usr/sbin/swat - log_on_success += HOST DURATION - log_on_failure += HOST - disable = yes -} diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD deleted file mode 100644 index 0a822dd19..000000000 --- a/testing/sudo/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 135743 2011-08-18 12:43:52Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=sudo -_ver=1.8.2 -pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=1 -pkgdesc="Give certain users the ability to run some commands as root" -arch=('i686' 'x86_64') -url="http://www.sudo.ws/sudo/" -license=('custom') -depends=('glibc' 'pam') -backup=('etc/sudoers' 'etc/pam.d/sudo') -options=('!libtool' '!makeflags') -source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz - sudo.pam) -md5sums=('000f458e7391be9fdf459a9ad6a4912a' - '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') - -build() { - cd "$srcdir/$pkgname-$_ver" - - ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \ - --with-env-editor --with-all-insults --with-logfac=auth - make -} - -package() { - cd "$srcdir/$pkgname-$_ver" - install -dm755 "$pkgdir/var/lib" - - make DESTDIR="$pkgdir" install - install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo" - - install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE" -} diff --git a/testing/sudo/sudo.pam b/testing/sudo/sudo.pam deleted file mode 100644 index 4e586cd22..000000000 --- a/testing/sudo/sudo.pam +++ /dev/null @@ -1,3 +0,0 @@ -#%PAM-1.0 -auth required pam_unix.so -auth required pam_nologin.so diff --git a/testing/usbutils/PKGBUILD b/testing/usbutils/PKGBUILD deleted file mode 100644 index a578fa636..000000000 --- a/testing/usbutils/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 135725 2011-08-18 04:47:26Z eric $ -# Maintainer: Judd Vinet <jvinet@zeroflux.org> -# Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com> -pkgname=usbutils -pkgver=004 -pkgrel=1 -_usb_ids_date=2011.08.17 -pkgdesc="USB Device Utilities" -arch=(i686 x86_64) -license=('GPL') -groups=('base') -makedepends=('wget') -depends=('glibc' 'libusb') -optdepends=('python2: for lsusb.py usage' - 'coreutils: for lsusb.py usage') -url="http://linux-usb.sourceforge.net/" -source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz - fix-python2.patch - usb.ids-${_usb_ids_date}) # from http://linux-usb.sourceforge.net/usb.ids -md5sums=('481e1de453bcabbd5f43125bb4df2ab7' - '45766196895b4cc50b53cd56e1bbf3d1' - 'f04c301b5363ef618f0ec776deff3117') - -build() { - cd $srcdir/$pkgname-$pkgver - rm usb.ids - cp $srcdir/usb.ids-${_usb_ids_date} usb.ids - # patch lsusb.py to use correct usb.ids file and python2 interpreter - patch -Np1 -i $srcdir/fix-python2.patch - ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - # fix pkgconfig file - install -dm755 $pkgdir/usr/lib - mv $pkgdir/usr/share/pkgconfig $pkgdir/usr/lib/ -} -md5sums=('481e1de453bcabbd5f43125bb4df2ab7' - '45766196895b4cc50b53cd56e1bbf3d1' - 'f04c301b5363ef618f0ec776deff3117') diff --git a/testing/usbutils/fix-python2.patch b/testing/usbutils/fix-python2.patch deleted file mode 100644 index 7e2875e99..000000000 --- a/testing/usbutils/fix-python2.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- usbutils-002/lsusb.py 2010-12-16 01:07:09.000000000 +0100 -+++ usbutils-002/lsusb.py 2011-04-09 22:43:59.043828595 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # lsusb.py - # Displays your USB devices in reasonable form. - # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3. -@@ -16,7 +16,7 @@ - warnsort = False - - prefix = "/sys/bus/usb/devices/" --usbids = "/usr/share/usb.ids" -+usbids = "/usr/share/hwdata/usb.ids" - - esc = chr(27) - norm = esc + "[0;0m" diff --git a/testing/usbutils/usb.ids-2011.08.17 b/testing/usbutils/usb.ids-2011.08.17 deleted file mode 100644 index a194ddaec..000000000 --- a/testing/usbutils/usb.ids-2011.08.17 +++ /dev/null @@ -1,16529 +0,0 @@ -# -# List of USB ID's -# -# Maintained by Stephen J. Gowdy <linux.usb.ids@gmail.com> -# If you have any new entries, please submit them via -# http://www.linux-usb.org/usb-ids.html -# or send entries as patches (diff -u old new) in the -# body of your email (a bot will attempt to deal with it). -# The latest version can be obtained from -# http://www.linux-usb.org/usb.ids -# -# Version: 2011.08.10 -# Date: 2011-08-10 20:34:03 -# - -# Vendors, devices and interfaces. Please keep sorted. - -# Syntax: -# vendor vendor_name -# device device_name <-- single tab -# interface interface_name <-- two tabs - -0001 Fry's Electronics - 142b Arbiter Systems, Inc. -0002 Ingram -0003 Club Mac -0004 Nebraska Furniture Mart -0053 Planex - 5301 GW-US54ZGL 802.11bg -0079 DragonRise Inc. - 0006 Generic USB Joystick - 0011 Gamepad -0105 Trust International B.V. - 145f NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211] -0145 Unknown - 0112 Card Reader -0204 Chipsbank Microelectronics Co., Ltd - 6025 CBM2080 Flash drive controller - 6026 CBM1180 Flash drive controller -0218 Hangzhou Worlde - 0301 MIDI Port -02ad HUMAX Co., Ltd. - 138c PVR Mass Storage -0300 MM300 eBook Reader -0324 OCZ Technology Inc - bc06 OCZ ATV USB 2.0 Flash Drive - bc08 OCZ Rally2/ATV USB 2.0 Flash Drive -0325 OCZ Technology Inc - ac02 ATV Turbo / Rally2 Dual Channel USB 2.0 Flash Drive -0386 LTS - 0001 PSX for USB Converter -03da Bernd Walter Computer Technology - 0002 HD44780 LCD interface -03e8 EndPoints, Inc. - 0004 SE401 Webcam - 0008 101 Ethernet [klsi] - 0015 ATAPI Enclosure - 2123 SiPix StyleCam Deluxe - 8004 Aox 99001 -03e9 Thesys Microelectronics -03ea Data Broadcasting Corp. -03eb Atmel Corp. - 0902 4-Port Hub - 2002 Mass Storage Device - 2015 at90usbkey sample firmware (HID keyboard) - 2018 at90usbkey sample firmware (CDC ACM) - 2019 stk525 sample firmware (microphone) - 201c at90usbkey sample firmware (HID mouse) - 201d at90usbkey sample firmware (HID generic) - 2022 at90usbkey sample firmware (composite device) - 2040 LUFA Test PID - 2041 LUFA Mouse Demo Application - 2042 LUFA Keyboard Demo Application - 2043 LUFA Joystick Demo Application - 2044 LUFA CDC Demo Application - 2045 LUFA Mass Storage Demo Application - 2046 LUFA Audio Output Demo Application - 2047 LUFA Audio Input Demo Application - 2048 LUFA MIDI Demo Application - 2049 Stripe Snoop Magnetic Stripe Reader - 204a LUFA CDC Class Bootloader - 204b LUFA USB to Serial Adapter Project - 204c LUFA RNDIS Demo Application - 204d LUFA Combined Mouse and Keyboard Demo Application - 204e LUFA Dual CDC Demo Application - 204f LUFA Generic HID Demo Application - 2060 Benito Programmer Project - 2061 LUFA Combined Mass Storage and Keyboard Demo Application - 2062 LUFA Combined CDC and Mouse Demo Application - 2063 LUFA Datalogger Device - 2064 Interfaceless Control-Only LUFA Devices - 2065 LUFA Test and Measurement Demo Application - 2066 LUFA Multiple Report HID Demo - 2068 LUFA Virtual Serial/Mass Storage Demo - 2069 LUFA Webserver Project - 2103 JTAG ICE mkII - 2104 AVR ISP mkII - 2105 AVRONE! - 2106 STK600 development board - 2107 AVR Dragon - 210d XPLAIN evaluation kit (CDC ACM) - 2122 XMEGA-A1 Explained evaluation kit - 2310 EVK11xx evaluation board - 2ffb at90usb AVR DFU bootloader - 2ffd at89c5130/c5131 DFU bootloader - 2fff at89c5132/c51snd1c DFU bootloader - 3301 at43301 4-Port Hub - 3312 4-Port Hub - 4102 AirVast W-Buddie WN210 - 5601 at76c510 Prism-II 802.11b Access Point - 5603 Cisco 7920 WiFi IP Phone - 6124 at91sam SAMBA bootloader - 7603 D-Link DWL-120 802.11b Wireless Adapter [Atmel at76c503a] - 7604 at76c503a 802.11b Adapter - 7605 at76c503a 802.11b Adapter - 7606 at76c505 802.11b Adapter - 7611 at76c510 rfmd2948 802.11b Access Point - 7613 WL-1130 USB - 7614 AT76c505a Wireless Adapter - 7615 AT76C505AMX Wireless Adapter - 7617 AT76C505AS Wireless Adapter - 7800 Mini Album - ff07 Tux Droid fish dongle -03ec Iwatsu America, Inc. -03ed Mitel Corp. -03ee Mitsumi - 0000 CD-R/RW Drive - 2501 eHome Infrared Receiver - 2502 eHome Infrared Receiver - 5609 Japanese Keyboard - 641f WIF-0402C Bluetooth Adapter - 6438 Bluetooth Device - 6440 WML-C52APR Bluetooth Adapter - 6901 SmartDisk FDD - 6902 Floppy Disk Drive - 7500 CD-R/RW - ffff Dongle with BlueCore in DFU mode -03f0 Hewlett-Packard - 0004 DeskJet 895c - 0011 OfficeJet G55 - 0012 DeskJet 1125C Printer Port - 0024 KU-0316 Keyboard - 002a LaserJet P1102 - 0101 ScanJet 4100c - 0102 PhotoSmart S20 - 0104 DeskJet 880c/970c - 0105 ScanJet 4200c - 0107 CD-Writer Plus - 010c Multimedia Keyboard Hub - 0111 G55xi Printer/Scanner/Copier - 0117 LaserJet 3200 - 011c hn210w 802.11b Adapter - 011d Integrated Bluetooth Module - 0121 HP49g+ Calculator - 0122 HID Internet Keyboard - 0201 ScanJet 6200c - 0202 PhotoSmart S20 - 0204 DeskJet 815c - 0205 ScanJet 3300c - 0207 CD-Writer Plus 8200e - 020c Multimedia Keyboard - 0211 OfficeJet G85 - 0212 DeskJet 1220C - 0217 LaserJet 2200 - 0218 APOLLO P2500/2600 - 0304 DeskJet 810c/812c - 0305 ScanJet 4300c - 0307 CD-Writer+ CD-4e - 0311 OfficeJet G85xi - 0312 Color Inkjet CP1700 - 0314 designjet 30/130 series - 0317 LaserJet 1200 - 0324 SK-2885 keyboard - 0401 ScanJet 5200c - 0404 DeskJet 830c/832c - 0405 ScanJet 3400cse - 0411 OfficeJet G95 - 0412 Printing Support - 0417 LaserJet 1200 series - 0423 HS-COMBO - 0504 DeskJet 885c - 0505 ScanJet 2100c - 0507 DVD+RW - 050c 5219 Wireless Keyboard - 0511 OfficeJet K60 - 0512 DeckJet 450 - 0517 LaserJet 1000 - 051d Wireless (Bluetooth + WLAN) Interface [Integrated Module] - 0601 ScanJet 6300c - 0604 DeskJet 840c - 0605 ScanJet 2200c - 0611 OfficeJet K60xi - 0612 business inkjet 3000 - 0624 Bluetooth Dongle - 0701 ScanJet 5300c/5370c - 0704 DeskJet 825c - 0705 ScanJet 4400c - 0711 OfficeJet K80 - 0712 DeskJet 1180c - 0714 Printing Support - 0801 ScanJet 7400c - 0804 DeskJet 816c - 0805 HP4470C - 0811 OfficeJet K80xi - 0817 LaserJet 3300 - 0901 ScanJet 2300c - 0904 DeskJet 845c - 0912 Printing Support - 0917 LaserJet 3330 - 0924 Modular Smartcard Keyboard - 0a01 ScanJet 2400c - 0a17 color LaserJet 3700 - 0b01 ScanJet 82x0C - 0b0c Wireless Keyboard and Optical Mouse receiver - 0b17 LaserJet 2300d - 0c17 LaserJet 1010 - 0c24 Bluetooth Dongle - 0d12 OfficeJet 9100 series - 0d17 LaserJet 1012 - 0e17 LaserJet 1015 - 0f0c Wireless Keyboard and Optical Mouse receiver - 0f11 OfficeJet V40 - 0f12 Printing Support - 0f17 LaserJet 1150 - 1001 Photo Scanner 1000 - 1002 PhotoSmart 140 series - 1004 DeskJet 970c/970cse - 1005 ScanJet 5400c - 1011 OfficeJet V40xi - 1016 Jornada 548 / iPAQ HW6515 Pocket PC - 1017 LaserJet 1300 - 1024 Smart Card Keyboard - 1027 Virtual keyboard and mouse - 1102 PhotoSmart 240 series - 1104 DeskJet 959c - 1105 ScanJet 5470c/5490c - 1111 OfficeJet v60 - 1116 Jornada 568 Pocket PC - 1117 LaserJet 1300n - 1151 PSC-750xi Printer/Scanner/Copier - 1202 PhotoSmart 320 series - 1204 DeskJet 930c - 1205 ScanJet 4500C/5550C - 1211 OfficeJet v60xi - 1217 LaserJet 2300L - 1302 PhotoSmart 370 series - 1305 ScanJet 4570c - 1311 OfficeJet V30 - 1312 DeskJet 460 - 1317 LaserJet 1005 - 1405 ScanJet 3670 - 1411 PSC 750 - 1424 f2105 Monitor Hub - 1502 PhotoSmart 420 series - 1504 DeskJet 920c - 150c Mood Lighting (Microchip Technology Inc.) - 1511 PSC 750xi - 1512 Printing Support - 1517 color LaserJet 3500 - 1524 Smart Card Keyboard - KR - 1602 PhotoSmart 330 series - 1604 DeskJet 940c - 1605 ScanJet 5530C PhotoSmart - 1611 psc 780 - 1617 LaserJet 3015 - 161d Wireless Rechargeable Optical Mouse (HID) - 1624 Smart Card Keyboard - JP - 1702 PhotoSmart 380 series - 1704 DeskJet 948C - 1705 ScanJet 5590 - 1711 psc 780xi - 1712 Printing Support - 1717 LaserJet 3020 - 171d Wireless (Bluetooth + WLAN) Interface [Integrated Module] - 1801 Inkjet P-2000U - 1802 PhotoSmart 470 series - 1804 DeskJet 916C - 1805 ScanJet 7650 - 1811 PSC 720 - 1812 OfficeJet Pro K550 - 1817 LaserJet 3030 - 181d integrated module with Bluetooth 2.0 wireless technology. - 1902 PhotoSmart A430 series - 1904 DeskJet 3820 - 1911 OfficeJet V45 - 1917 LaserJet 3380 - 1a02 PhotoSmart A510 series - 1a11 OfficeJet 5100 series - 1a17 color LaserJet 4650 - 1b02 PhotoSmart A610 series - 1b04 DeskJet 3810 - 1b05 ScanJet 4850C/4890C - 1b07 Premium Starter Webcam - 1c02 PhotoSmart A710 series - 1c17 Color LaserJet 2550l - 1d02 PhotoSmart A310 series - 1d17 LaserJet 1320 - 1e02 PhotoSmart A320 Printer series - 1e11 PSC-950 - 1e17 LaserJet 1160 series - 1f02 PhotoSmart A440 Printer series - 1f11 PSC 920 - 1f12 OfficeJet Pro K5300 - 1f17 color LaserJet 5550 - 1f1d un2400 Gobi Wireless Modem - 2001 Floppy - 2002 Hub - 2004 DeskJet 640c - 2005 ScanJet 3570c - 2012 OfficeJet Pro K5400 - 201d un2400 Gobi Wireless Modem (QDL mode) - 2102 PhotoSmart 7345 - 2104 DeskJet 630c - 2112 OfficeJet Pro L7500 - 211d Sierra MC5725 [ev2210] - 2202 PhotoSmart 7600 series - 2205 ScanJet 3500c - 2212 OfficeJet Pro L7600 - 2217 color LaserJet 9500 MFP - 2302 PhotoSmart 7600 series - 2304 DeskJet 656c - 2305 ScanJet 3970c - 2311 OfficeJet d series - 2312 OfficeJet Pro L7700 - 2317 LaserJet 4350 - 2402 PhotoSmart 7700 series - 2404 Deskjet F2280 series - 2405 ScanJet 4070 PhotoSmart - 2417 LaserJet 4250 - 241d Gobi 2000 Wireless Modem (QDL mode) - 2424 LP1965 19" Monitor Hub - 2502 PhotoSmart 7700 series - 2504 DeskJet F4200 series - 2505 ScanJet 3770 - 2512 OfficeJet Pro L7300 - 2517 LaserJet 2410 - 251d Gobi 2000 Wireless Modem - 2524 LP3065 30" Monitor Hub - 2602 PhotoSmart A520 series - 2605 ScanJet 3800c - 2611 OfficeJet 7100 series - 2617 Color LaserJet 2820 series - 2624 Pole Display (HP522 2 x 20 Line Display) - 2702 PhotoSmart A620 series - 2704 DeskJet 915 - 2717 Color LaserJet 2830 - 2811 PSC-2100 - 2817 Color LaserJet 2840 - 2902 PhotoSmart A820 series - 2911 PSC 2200 - 2917 LaserJet 2420 - 2a11 PSC 2150 series - 2a17 LaserJet 2430 - 2b11 PSC 2170 series - 2b17 LaserJet 1020 - 2c12 Officejet J4680 - 2c17 LaserJet 1022 - 2c24 Logitech M-UAL-96 Mouse - 2d11 OfficeJet 6110 - 2d17 Printing Support - 2e11 PSC 1000 - 2e17 LaserJet 2600n - 2e24 LP2275w Monitor Hub - 2f11 PSC 1200 - 2f17 EWS 2605dn - 2f24 LP2475w Monitor Hub - 3002 PhotoSmart P1000 - 3004 DeskJet 980c - 3005 ScanJet 4670v - 3011 PSC 1100 series - 3017 Printing Support - 3102 PhotoSmart P1100 Printer w/ Card Reader - 3104 DeskJet 960c - 3111 OfficeJet 4100 series - 3117 EWS 2605dtn - 311d Atheros AR9285 Malbec Bluetooth Adapter - 3202 PhotoSmart 1215 - 3207 4 GB flash drive - 3211 OfficeJet 4105 series - 3217 LaserJet 3050 - 3302 PhotoSmart 1218 - 3304 DeskJet 990c - 3312 OfficeJet J6410 - 3317 LaserJet 3052 - 3402 PhotoSmart 1115 - 3404 DeskJet 6122 - 3417 LaserJet 3055 - 3502 PhotoSmart 230 - 3504 DeskJet 6127c - 3511 PSC 2300 - 3517 LaserJet 3390 - 3602 PhotoSmart 1315 - 3611 PSC 2410 PhotoSmart - 3617 Color LaserJet 2605 - 3711 PSC 2500 - 3717 EWS UPD - 3724 Webcam - 3802 PhotoSmart 100 - 3817 LaserJet P2015 series - 3902 PhotoSmart 130 - 3a02 PhotoSmart 7150 - 3a11 OfficeJet 5500 series - 3a17 Printing Support - 3b02 PhotoSmart 7150~ - 3b11 PSC 1300 series - 3b17 LaserJet M1005 MFP - 3c02 PhotoSmart 7350 - 3c11 PSC 1358 - 3c17 EWS UPD - 3d02 PhotoSmart 7350~ - 3d11 OfficeJet 4215 - 3d17 LaserJet P1005 - 3e02 PhotoSmart 7550 - 3e17 LaserJet P1006 - 3f02 PhotoSmart 7550~ - 3f11 PSC-1315/PSC-1317 - 4002 PhotoSmart 635/715/720/735/935 (storage) - 4004 cp1160 - 4102 PhotoSmart 618 - 4105 ScanJet 4370 - 4111 OfficeJet 7200 series - 4117 LaserJet 1018 - 4202 PhotoSmart 812 - 4205 ScanJet G3010 - 4211 OfficeJet 7300 series - 4217 EWS CM1015 - 4302 PhotoSmart 850 (ptp) - 4305 ScanJet G3110 - 4311 OfficeJet 7400 series - 4317 Color LaserJet CM1017 - 4402 PhotoSmart 935 (ptp) - 4417 EWS UPD - 4502 PhotoSmart 945 (PTP mode) - 4505 ScanJet G4010 - 4511 PhotoSmart 2600 - 4512 E709n [Officejet 6500 Wireless] - 4517 EWS UPD - 4605 ScanJet G4050 - 4611 PhotoSmart 2700 - 4717 Color LaserJet CP1215 - 4811 PSC 1600 - 4911 PSC 2350 - 4b11 OfficeJet 6200 - 4c11 PSC 1500 series - 4c17 EWS UPD - 4d11 PSC 1400 - 4d17 EWS UPD - 4e11 PhotoSmart 2570 series - 4f11 OfficeJet 5600 (USBHUB) - 5004 DeskJet 995c - 5011 PhotoSmart 3100 series - 5017 EWS UPD - 5111 PhotoSmart 3200 series - 5211 PhotoSmart 3300 series - 5311 OfficeJet 6300 - 5312 Officejet Pro 8500A - 5411 OfficeJet 4300 - 5511 DeskJet F300 series - 5611 PhotoSmart C3180 - 5617 LaserJet M1120 MFP - 5711 PhotoSmart C4100 series - 5717 LaserJet M1120n MFP - 5811 PhotoSmart C5100 series - 5817 LaserJet M1319f MFP - 5911 PhotoSmart C6180 - 5a11 PhotoSmart C7100 series - 5b11 OfficeJet J2100 series - 5c11 PhotoSmart C4200 Printer series - 5d11 PhotoSmart C5200 series - 5e11 PhotoSmart D7400 series - 6004 DeskJet 5550 - 6102 Hewlett Packard Digital Camera - 6104 DeskJet 5650c - 6117 color LaserJet 3550 - 6202 PhotoSmart 215 - 6204 DeskJet 5150c - 6217 Color LaserJet 4700 - 6302 PhotoSmart 318/612 - 6317 Color LaserJet 4730mfp - 6402 PhotoSmart 715 (ptp) - 6411 PhotoSmart C8100 series - 6417 LaserJet 5200 - 6502 PhotoSmart 120 (ptp) - 6511 PhotoSmart C7200 series - 6602 PhotoSmart 320 - 6611 PhotoSmart C4380 series - 6617 LaserJet 5200L - 6702 PhotoSmart 720 (ptp) - 6717 Color LaserJet 3000 - 6802 PhotoSmart 620 (ptp) - 6811 PhotoSmart D5300 series - 6817 Color LaserJet 3800 - 6911 PhotoSmart D7200 series - 6917 Color LaserJet 3600 - 6a02 PhotoSmart 735 (ptp) - 6a11 PhotoSmart C6200 series - 6a17 LaserJet 4240 - 6b02 PhotoSmart R707 (PTP mode) - 6b11 Photosmart C4500 series - 6c17 Color LaserJet 4610 - 6f17 Color LaserJet CP6015 series - 7004 DeskJet 3320c - 7102 PhotoSmart 635 (PTP mode) - 7104 DeskJet 3420c - 7117 CM8060 Color MFP with Edgeline Technology - 7202 PhotoSmart 43x (ptp) - 7204 DeskJet 36xx - 7217 LaserJet M5035 MFP - 7302 PhotoSmart M307 (PTP mode) - 7304 DeskJet 35xx - 7311 Photosmart Premium C309 - 7317 LaserJet P3005 - 7404 Printing Support - 7417 LaserJet M4345 MFP - 7504 Printing Support - 7517 LaserJet M3035 MFP - 7604 DeskJet 3940 - 7611 DeskJet F2492 All-in-One - 7617 LaserJet P3004 - 7702 PhotoSmart R817 (PTP mode) - 7704 DeskJet D4100 - 7717 CM8050 Color MFP with Edgeline Technology - 7804 DeskJet D1360 - 7817 Color LaserJet CP3505 - 7917 LaserJet M5025 MFP - 7a02 PhotoSmart M415 (PTP mode) - 7a04 DeskJet D2460 - 7a17 LaserJet M3027 MFP - 7b02 PhotoSmart M23 (PTP mode) - 7b17 Color LaserJet CP4005 - 7c17 Color LaserJet CM6040 series - 7d04 DeskJet F2100 Printer series - 7d17 Color LaserJet CM4730 MFP - 7e04 DeskJet F4100 Printer series - 8017 LaserJet P4515 - 8104 Printing Support - 8117 LaserJet P4015 - 811c Ethernet HN210E - 8204 Printing Support - 8207 FHA-3510 2.4GHz Wireless Optical Mobile Mouse - 8217 LaserJet P4014 - 8317 LaserJet M9050 MFP - 8404 DeskJet 6800 series - 8417 LaserJet M9040 MFP - 8504 DeskJet 6600 series - 8604 DeskJet 5440 - 8704 DeskJet 5940 - 8804 DeskJet 6980 series - 8904 DeskJet 6940 series - 8c07 Digital Stereo Headset - 8c11 Deskjet F4500 series - 9002 PhotoSmart M437 - 9102 PhotoSmart M537 - 9302 PhotoSmart R930 series - 9402 PhotoSmart R837 - 9502 PhotoSmart R840 series - 9602 PhotoSmart M730 series - 9702 PhotoSmart R740 series - 9802 PhotoSmart Mz60 series - 9902 PhotoSmart M630 series - 9a02 PhotoSmart E330 series - 9b02 PhotoSmart M540 series - 9c02 PhotoSmart M440 series - a004 DeskJet 5850c - b002 PhotoSmart 7200 series - b102 PhotoSmart 7200 series - b116 Webcam - b202 PhotoSmart 7600 series - b302 PhotoSmart 7600 series - b402 PhotoSmart 7700 series - b502 PhotoSmart 7700 series - b602 PhotoSmart 7900 series - b702 PhotoSmart 7900 series - b802 PhotoSmart 7400 series - b902 PhotoSmart 7800 series - ba02 PhotoSmart 8100 series - bb02 PhotoSmart 8400 series - bc02 PhotoSmart 8700 series - bd02 PhotoSmart Pro B9100 series - bef4 NEC Picty760 - c002 PhotoSmart 7800 series - c102 PhotoSmart 8000 series - c202 PhotoSmart 8200 series - c302 DeskJet D2300 - c402 PhotoSmart D5100 series - c502 PhotoSmart D6100 series - c602 PhotoSmart D7100 series - c702 PhotoSmart D7300 series - c802 PhotoSmart D5060 Printer - d104 Bluetooth Dongle - efbe NEC Picty900 - f0be NEC Picty920 - f1be NEC Picty800 -03f1 Genoa Technology -03f2 Oak Technology, Inc. -03f3 Adaptec, Inc. - 0020 AWN-8020 WLAN - 0080 AVC-1100 Audio Capture - 0083 AVC-2200 Device - 0087 AVC-2210 Loader - 0088 AVC-2210 Device - 008b AVC-2310 Loader - 008c AVC-2310 Device - 0094 eHome Infrared Receiver - 009b AVC-1410 GameBridge TV NTSC - 2000 USBXchange - 2001 USBXchange Adapter - 2002 USB2-Xchange - 2003 USB2-Xchange Adapter - adcc Composite Device Support -03f4 Diebold, Inc. -03f5 Siemens Electromechanical -03f8 Epson Imaging Technology Center -03f9 KeyTronic Corp. - 0100 Keyboard - 0101 Keyboard - 0102 Keyboard Mouse -03fb OPTi, Inc. -03fc Elitegroup Computer Systems -03fd Xilinx, Inc. -03fe Farallon Comunications -0400 National Semiconductor Corp. - 05dc Rigol Technologies DS1000USB Oscilloscope - 0807 Bluetooth Dongle - 080a Bluetooth Device - 09c4 Rigol Technologies DG1022 Arbitrary Waveform Generator - 1000 Mustek BearPaw 1200 Scanner - 1001 Mustek BearPaw 2400 Scanner - 1237 Hub - a000 Smart Display Reference Device - c359 Logitech Harmony (Boot loader mode) - c35b Printing Support - c55d Rigol Technologies DS5000USB Oscilloscope -0401 National Registry, Inc. -0402 ALi Corp. - 5462 M5462 IDE Controller - 5602 M5602 Video Camera Controller - 5603 M5603 Video Camera Controller - 5606 M5606 Video Camera Controller [UVC] - 5621 M5621 High-Speed IDE Controller - 5623 M5623 Scanner Controller - 5627 Welland ME-740PS USB2 3.5" Power Saving Enclosure - 5632 M5632 Host-to-Host Link - 5635 M5635 Flash Card Reader - 5636 USB 2.0 Storage Device - 5637 M5637 IDE Controller - 5661 M5661 MP3 player - 5667 M5667 MP3 player - 9665 Gateway Webcam -0403 Future Technology Devices International, Ltd - 0000 H4SMK 7 Port Hub - 0232 Serial Converter - 1060 JTAG adapter - 6001 FT232 USB-Serial (UART) IC - 6007 Serial Converter - 6008 Serial Converter - 6009 Serial Converter - 6010 FT2232C Dual USB-UART/FIFO IC - 6011 FT4232H Quad HS USB-UART/FIFO IC - 6014 FT232H Single HS USB-UART/FIFO IC - 8040 4 Port Hub - 8070 7 Port Hub - 8370 7 Port Hub - 8371 PS/2 Keyboard And Mouse - 8372 FT8U100AX Serial Port - bcd8 Stellaris Development Board - bcd9 Stellaris Evaluation Board - c630 lcd2usb interface - c631 i2c-tiny-usb interface - c632 xu1541 c64 floppy drive interface - c633 TinyCrypt dongle - c634 glcd2usb interface - c7d0 RR-CirKits LocoBuffer-USB - c8b8 Alpermann+Velte MTD TCU - c8b9 Alpermann+Velte MTD TCU 1HE - c8ba Alpermann+Velte Rubidium H1 - c8bb Alpermann+Velte Rubidium H3 - c8bc Alpermann+Velte Rubidium S1 - c8bd Alpermann+Velte Rubidium T1 - c8be Alpermann+Velte Rubidium D1 - cc48 product FTDI TACTRIX_OPENPORT_13M 0xcc48 OpenPort 1.3 Mitsubishi - cc49 product FTDI TACTRIX_OPENPORT_13S 0xcc49 OpenPort 1.3 Subaru - cc4a product FTDI TACTRIX_OPENPORT_13U 0xcc4a OpenPort 1.3 Universal - d010 SCS PTC-IIusb - d011 SCS Position-Tracker/TNC - d012 SCS DRAGON 1 - d013 SCS DRAGON 1 - d6f8 UNI Black BOX - d9a9 Actisense USG-1 NMEA Serial Gateway - d9aa Actisense NGT-1 NMEA2000 PC Interface - e0d0 Total Phase Aardvark I2C/SPI Host Adapter - e521 EVER Sinline XL Series UPS - e6c8 PYRAMID Computer GmbH LCD - e700 Elster Unicom III Optical Probe - e888 Expert ISDN Control USB - e889 USB-RS232 OptoBridge - e88a Expert mouseCLOCK USB II - e88b Precision Clock MSF USB - e88c Expert mouseCLOCK USB II HBG - ea90 Eclo 1-Wire Adapter - ed71 HAMEG HO870 Serial Port - ed72 HAMEG HO720 Serial Port - ed73 HAMEG HO730 Serial Port - ed74 HAMEG HO820 Serial Port - ef10 FT1245BL - f070 Serial Converter 422/485 [Vardaan VEUSB422R3] - f1a0 Asix PRESTO Programmer - f208 Papenmeier Braille-Display - f3c0 4N-GALAXY Serial Converter - f680 Suunto Sports Instrument - f758 GW Instek GDS-8x0 Oscilloscope - f850 USB-UIRT (Universal Infrared Receiver+Transmitter) - f918 Ant8 Logic Probe - fa00 Matrix Orbital USB Serial - fa01 Matrix Orbital MX2 or MX3 - fa02 Matrix Orbital MX4 or MX5 - fa03 Matrix Orbital VK/LK202 Family - fa04 Matrix Orbital VK/LK204 Family - fc08 Crystalfontz CFA-632 USB LCD - fc09 Crystalfontz CFA-634 USB LCD - fc0b Crystalfontz CFA-633 USB LCD - fc0c Crystalfontz CFA-631 USB LCD - fc0d Crystalfontz CFA-635 USB LCD - fc82 SEMC DSS-20/DSS-25 SyncStation - fd48 ShipModul MiniPlex-4xUSB NMEA Multiplexer - fd49 ShipModul MiniPlex-4xUSB-AIS NMEA Multiplexer - ff08 ToolHouse LoopBack Adapter - ff18 Logbook Bus - ff19 Logbook Bus - ff1a Logbook Bus - ff1b Logbook Bus - ff1c Logbook Bus - ff1d Logbook Bus - ff1e Logbook Bus - ff1f Logbook Bus -0404 NCR Corp. - 0202 78XX Scanner - 0203 78XX Scanner - Embedded System - 0310 K590 Printer, Self-Service - 0311 7167 Printer, Receipt/Slip - 0312 7197 Printer Receipt - 0320 5932-USB Keyboard - 0321 5953-USB Dynakey - 0322 5932-USB Enhanced Keyboard - 0323 5932-USB Enhanced Keyboard, Flash-Recovery/Download - 0324 5953-USB Enhanced Dynakey - 0325 5953-USB Enhanced Dynakey Flash-Recovery/Download - 0328 K016: USB-MSR ISO 3-track MSR: POS Standard (See HID pages) - 0329 K018: USB-MSR JIS 2-Track MSR: POS Standard - 032a K016: USB-MSR ISO 3-Track MSR: HID Keyboard Mode - 032b K016/K018: USB-MSR Flash-Recovery/Download -0405 Synopsys, Inc. -0406 Fujitsu-ICL Computers -0407 Fujitsu Personal Systems, Inc. -0408 Quanta Computer, Inc. - 0103 FV TouchCam N1 (Audio) - 030c HP Webcam - 03b2 HP Webcam - 1030 FV TouchCam N1 (Video) - 3000 Optical dual-touch panel - 3001 Optical Touch Screen -0409 NEC Corp. - 0011 PC98 Series Layout Keyboard Mouse - 0012 ATerm IT75DSU ISDN TA - 0014 Japanese Keyboard - 0019 109 Japanese Keyboard with Bus-Powered Hub - 001a PC98 Series Layout Keyboard with Bus-Powered Hub - 0025 Mini Keyboard with Bus-Powered Hub - 0027 MultiSync Monitor - 002c Clik!-USB Drive - 0034 109 Japanese Keyboard with One-touch start buttons - 003f Wireless Keyboard with One-touch start buttons - 0040 Floppy - 004e SuperScript 1400 Series - 004f Wireless Keyboard with One-touch start buttons - 0058 HighSpeed Hub - 0059 HighSpeed Hub - 005a HighSpeed Hub - 006a Conceptronic USB Harddisk Box - 0081 SuperScript 1400 Series - 0082 SuperScript 1400 Series - 0094 Japanese Keyboard with One-touch start buttons - 0095 Japanese Keyboard - 00a9 AtermIT21L 128K Support Standard - 00aa AtermITX72 128K Support Standard - 00ab AtermITX62 128K Support Standard - 00ac AtermIT42 128K Support Standard - 00ae INSMATEV70G-MAX Standard - 00af AtermITX70 128K Support Standard - 00b0 AtermITX80 128K Support Standard - 00b2 AtermITX80D 128K Support Standard - 00c0 Wireless Remocon - 00f7 Smart Display PK-SD10 - 011d e228 Mobile Phone - 0203 HID Audio Controls - 021d Aterm WL54SU2 802.11g Wireless Adapter [Atheros AR5523] - 0248 Aterm PA-WL54GU - 0249 Aterm WL300NU-G - 02b4 Aterm WL300NU-AG - 02b6 Aterm WL300NU-GS 802.11n Wireless Adapter - 55aa Hub - 55ab Hub [iMac/iTouch kbd] - 8010 Intellibase Hub - 8011 Intellibase Hub - efbe P!cty 900 [HP DJ] - f0be P!cty 920 [HP DJ 812c] -040a Kodak Co. - 0001 DVC-323 - 0002 DVC-325 - 0100 DC-220 - 0110 DC-260 - 0111 DC-265 - 0112 DC-290 - 0120 DC-240 - 0121 DC-240 (PTP firmware) - 0130 DC-280 - 0131 DC-5000 - 0132 DC-3400 - 0140 DC-4800 - 0160 DC4800 - 0170 DX3900 - 0200 Digital Camera - 0300 EZ-200 - 0400 MC3 - 0402 Digital Camera - 0403 Z7590 - 0500 DX3500 - 0510 DX3600 - 0525 DX3215 - 0530 DX3700 - 0535 EasyShare CX4230 Camera - 0540 LS420 - 0550 DX4900 - 0555 DX4330 - 0560 CX4200 - 0565 CX4210 - 0566 CX4300 - 0567 LS753 - 0568 LS443 - 0569 LS663 - 0570 DX6340 - 0571 CX6330 - 0572 DX6440 - 0573 CX6230 - 0574 CX6200 - 0575 DX6490 - 0576 DX4530 - 0577 DX7630 - 0578 CX7300/CX7310 - 0579 CX7220 - 057a CX7330 - 057b CX7430 - 057c CX7530 - 057d DX7440 - 057e C300 - 057f DX7590 - 0580 Z730 - 0581 Digital Camera - 0582 Digital Camera - 0583 Digital Camera - 0584 CX6445 - 0585 Digital Camera - 0586 CX7525 - 0587 Digital Camera - 0588 Digital Camera - 0589 EasyShare C360 - 058a C310 - 058b Digital Camera - 058c C330 - 058d C340 - 058e V530 - 058f V550 - 0590 Digital Camera - 0591 Digital Camera - 0592 Digital Camera - 0593 Digital Camera - 0594 Digital Camera - 0595 Digital Camera - 0596 Digital Camera - 0597 Digital Camera - 0598 Digital Camera - 0599 Digital Camera - 059a Digital Camera - 059b Digital Camera - 059c Digital Camera - 059d Digital Camera - 059e Digital Camera - 059f Digital Camera - 05a0 Digital Camera - 05a1 Digital Camera - 05a2 Digital Camera - 05a3 Digital Camera - 05a4 Digital Camera - 05a5 Digital Camera - 05a6 Digital Camera - 05a7 Digital Camera - 05a8 Digital Camera - 05a9 Digital Camera - 05aa Digital Camera - 05ab Digital Camera - 05ac Digital Camera - 05ad Digital Camera - 05ae Digital Camera - 05af Digital Camera - 05b0 Digital Camera - 05b1 Digital Camera - 05b2 Digital Camera - 05b3 EasyShare Z710 Camera - 05b4 Digital Camera - 05b5 Digital Camera - 05b6 Digital Camera - 05b7 Digital Camera - 05b8 Digital Camera - 05b9 Digital Camera - 05ba Digital Camera - 05bb Digital Camera - 05bc Digital Camera - 05bd Digital Camera - 05be Digital Camera - 05bf Digital Camera - 05c0 Digital Camera - 05c1 Digital Camera - 05c2 Digital Camera - 05c3 Digital Camera - 05c4 Digital Camera - 05c5 Digital Camera - 05c8 EASYSHARE Z1485 IS Digital Camera - 05d3 EasyShare M320 Camera - 05d4 EasyShare C180 Digital Camera - 1001 EasyShare SV811 Digital Picture Frame - 4000 InkJet Color Printer - 4109 EasyShare Printer Dock Series 3 - 410d EasyShare G600 Printer Dock - 5010 Wireless Adapter - 5012 DBT-220 Bluetooth Adapter - 6001 i30 - 6002 i40 - 6003 i50 - 6004 i60 - 6005 i80 -040b Weltrend Semiconductor - 6510 Weltrend Bar Code Reader - 6520 XBOX Xploder - 6533 Speed-Link Competition Pro -040c VTech Computers, Ltd -040d VIA Technologies, Inc. - 3184 VNT VT6656 USB-802.11 Wireless LAN Adapter - 6205 USB 2.0 Card Reader -040e MCCI -040f Echo Speech Corp. -0411 BUFFALO INC. (formerly MelCo., Inc.) - 0001 LUA-TX Ethernet [pegasus] - 0005 LUA-TX Ethernet - 0006 WLI-USB-L11 Wireless LAN Adapter - 0009 LUA2-TX Ethernet - 000b WLI-USB-L11G-WR Wireless LAN Adapter - 000d WLI-USB-L11G Wireless LAN Adapter - 0012 LUA-KTX Ethernet - 0013 USB2-IDE Adapter - 0016 WLI-USB-S11 802.11b Adapter - 0018 USB2-IDE Adapter - 001c USB-IDE Bridge: DUB-PxxG - 0027 WLI-USB-KS11G 802.11b Adapter - 003d LUA-U2-KTX Ethernet - 0044 WLI-USB-KB11 Wireless LAN Adapter - 004b WLI-USB-G54 802.11g Adapter [Broadcom 4320 USB] - 004d WLI-USB-B11 Wireless LAN Adapter - 0050 WLI2-USB2-G54 Wireless LAN Adapter - 005e WLI-U2-KG54-YB WLAN - 0065 Python2 WDM Encoder - 0066 WLI-U2-KG54 WLAN - 0067 WLI-U2-KG54-AI WLAN - 0089 Buffalo RUF-C/U2 Flash Drive - 008b Nintendo Wi-Fi - 0091 WLI-U2-KAMG54 Wireless LAN Adapter - 0092 WLI-U2-KAMG54 Bootloader - 0097 WLI-U2-KG54-BB - 00a9 WLI-U2-AMG54HP Wireless LAN Adapter - 00aa WLI-U2-AMG54HP Bootloader - 00b3 PC-OP-RS1 RemoteStation - 00bc WLI-U2-KG125S 802.11g Adapter [Broadcom 4320 USB] - 00ca 802.11n Network Adapter - 00cb WLI-U2-G300N 802.11n Adapter - 00d8 WLI-U2-SG54HP - 00d9 WLI-U2-G54HP - 00da WLI-U2-KG54L 802.11bg [ZyDAS ZD1211B] - 00e8 WLI-UC-G300N Wireless LAN Adapter [Ralink RT2870] - 012e WLI-UC-AG300N Wireless LAN Adapter - 0148 WLI-UC-G300HP Wireless LAN Adapter - 0150 WLP-UC-AG300 Wireless LAN Adapter - 0157 External Hard Drive HD-PEU2 - 0158 WLI-UC-GNHP Wireless LAN Adapter - 015d WLI-UC-GN Wireless LAN Adapter [Ralink RT3070] - 016f WLI-UC-G301N Wireless LAN Adapter - 017f Sony UWA-BR100 802.11abgn Wireless Adapter [Atheros AR7010+AR9280] - 019e WLI-UC-GNP Wireless LAN Adapter - 01a1 MiniStation Metro - 01a2 WLI-UC-GNM Wireless LAN Adapter -0412 Award Software International -0413 Leadtek Research, Inc. - 1310 WinFast TV - NTSC + FM - 1311 WinFast TV - NTSC + MTS + FM - 1312 WinFast TV - PAL BG + FM - 1313 WinFast TV - PAL BG+TXT + FM - 1314 WinFast TV Audio - PHP PAL I - 1315 WinFast TV Audio - PHP PAL I+TXT - 1316 WinFast TV Audio - PHP PAL DK - 1317 WinFast TV Audio - PHP PAL DK+TXT - 1318 WinFast TV - PAL I/DK + FM - 1319 WinFast TV - PAL N + FM - 131a WinFast TV Audio - PHP SECAM LL - 131b WinFast TV Audio - PHP SECAM LL+TXT - 131c WinFast TV Audio - PHP SECAM DK - 131d WinFast TV - SECAM DK + TXT + FM - 131e WinFast TV - NTSC Japan + FM - 1320 WinFast TV - NTSC - 1321 WinFast TV - NTSC + MTS - 1322 WinFast TV - PAL BG - 1323 WinFast TV - PAL BG+TXT - 1324 WinFast TV Audio - PHP PAL I - 1325 WinFast TV Audio - PHP PAL I+TXT - 1326 WinFast TV Audio - PHP PAL DK - 1327 WinFast TV Audio - PHP PAL DK+TXT - 1328 WinFast TV - PAL I/DK - 1329 WinFast TV - PAL N - 132a WinFast TV Audio - PHP SECAM LL - 132b WinFast TV Audio - PHP SECAM LL+TXT - 132c WinFast TV Audio - PHP SECAM DK - 132d WinFast TV - SECAM DK + TXT - 132e WinFast TV - NTSC Japan - 6023 EMP Audio Device - 6024 WinFast PalmTop/Novo TV Video - 6025 WinFast DTV Dongle (cold state) - 6026 WinFast DTV Dongle (warm state) - 6029 WinFast DTV Dongle Gold - 6125 WinFast DTV Dongle - 6126 WinFast DTV Dongle BDA Driver - 6f00 WinFast DTV Dongle (STK7700P based) -0414 Giga-Byte Technology Co., Ltd -0416 Winbond Electronics Corp. - 0035 W89C35 802.11bg WLAN Adapter - 0101 Hub - 0961 AVL Flash Card Reader - 3810 Smart Card Controller - 3811 Generic Controller - Single interface - 3812 Smart Card Controller_2Interface - 3813 Panel Display - 5518 4-Port Hub - 551a PC Sync Keypad - 551b PC Async Keypad - 551c Sync Tenkey - 551d Async Tenkey - 551e Keyboard - 551f Keyboard w/ Sys and Media - 5521 Keyboard - 6481 16-bit Scanner - 7721 Memory Stick Reader/Writer - 7722 Memory Stick Reader/Writer - 7723 SD Card Reader -0417 Symbios Logic -0418 AST Research -0419 Samsung Info. Systems America, Inc. - 0001 IrDA Remote Controller / Creative Cordless Mouse - 0600 Desktop Wireless 6000 - 3001 Xerox P1202 Laser Printer - 3003 Olivetti PG L12L - 3201 Docuprint P8ex - 3404 SCX-5x12 series - 3406 MFP 830 series - 3407 ML-912 - 3601 InkJet Color Printer - 3602 InkJet Color Printer - 4602 Remote NDIS Network Device - 8001 Hub - 8002 SyncMaster HID Monitor Control - aa03 SDAS-3 MP3 Player -041a Phoenix Technologies, Ltd -041b d'TV -041d S3, Inc. -041e Creative Technology, Ltd - 1002 Nomad II - 1003 Blaster GamePad Cobra - 1050 GamePad Cobra - 1053 Mouse Gamer HD7600L - 200c MuVo V100 - 2020 Zen X-Fi 2 - 2029 ZiiO - 2801 Prodikeys PC-MIDI multifunction keyboard - 3000 SoundBlaster Extigy - 3002 SB External Composite Device - 3010 SoundBlaster MP3+ - 3014 SB External Composite Device - 3015 Sound Blaster Digital Music LX - 3020 SoundBlaster Audigy 2 NX - 3030 SB External Composite Device - 3040 SoundBlaster Live! 24-bit External SB0490 - 3060 Sound Blaster Audigy 2 ZS External - 3061 SoundBlaster Audigy 2 ZS Video Editor - 3090 Sound Blaster Digital Music SX - 30d3 Sound Blaster Play! - 3f00 E-Mu Xboard 25 MIDI Controller - 3f02 E-Mu 0202 - 3f04 E-Mu 0404 - 3f07 E-Mu Xmidi 1x1 - 4003 VideoBlaster Webcam Go Plus [W9967CF] - 4004 Nomad II MG - 4005 Webcam Blaster Go ES - 4007 Go Mini - 400a PC-Cam 300 - 400b PC-Cam 600 - 400c Webcam 5 [pwc] - 400d Webcam PD1001 - 400f PC-CAM 550 (Composite) - 4011 Webcam PRO eX - 4012 PC-CAM350 - 4013 PC-Cam 750 - 4015 CardCam Value - 4016 CardCam - 4017 Webcam Mobile [PD1090] - 4018 Webcam Vista [PD1100] - 4019 Audio Device - 401a Webcam Vista [PD1100] - 401c Webcam NX [PD1110] - 401d Webcam NX Ultra - 401e Webcam NX Pro - 401f Webcam Notebook [PD1171] - 4020 Webcam NX - 4021 Webcam NX Ultra - 4022 Webcam NX Pro - 4028 Vista Plus cam [VF0090] - 4029 Webcam Live! - 402f DC-CAM 3000Z - 4034 Webcam Instant - 4035 Webcam Instant - 4036 Webcam Live!/Live! Pro - 4037 Webcam Live! - 4038 ORITE CCD Webcam [PC370R] - 4039 Webcam Live! Effects - 403a Webcam NX Pro 2 - 403b Creative Webcam Vista [VF0010] - 403c Webcam Live! Ultra - 403d Webcam Notebook Ultra - 403e Webcam Vista Plus - 4041 Webcam Live! Motion - 4043 Vibra Plus Webcam - 4045 Live! Cam Voice - 4049 Live! Cam Voice - 4051 Live! Cam Notebook Pro [VF0250] - 4052 Live! Cam Vista IM - 4053 Live! Cam Video IM - 4054 Live! Cam Video IM - 4055 Live! Cam Video IM Pro - 4056 Live! Cam Video IM Pro - 4057 Live! Cam Optia - 4058 Live! Cam Optia AF - 4061 Live! Cam Notebook Pro [VF0400] - 4063 Live! Cam Video IM Pro - 4068 Live! Cam Notebook [VF0470] - 406c Live! Cam Sync [VF0520] - 4083 Live! Cam Socialize [VF0640] - 4100 Nomad Jukebox 2 - 4101 Nomad Jukebox 3 - 4102 NOMAD MuVo^2 - 4106 Nomad MuVo - 4107 NOMAD MuVo - 4108 Nomad Jukebox Zen - 4109 Nomad Jukebox Zen NX - 410b Nomad Jukebox Zen USB 2.0 - 410c Nomad MuVo NX - 410f NOMAD MuVo^2 (Flash) - 4110 Nomad Jukebox Zen Xtra - 4111 Dell Digital Jukebox - 4116 MuVo^2 - 4117 Nomad MuVo TX - 411b Zen Touch - 411c Nomad MuVo USB 2.0 - 411d Zen - 411e Zen Micro - 4120 Nomad MuVo TX FM - 4123 Zen Portable Media Center - 4124 MuVo^2 FM (uHDD) - 4126 Dell DJ (2nd gen) - 4127 Dell DJ - 4128 NOMAD Jukebox Zen Xtra (mtp) - 412b MuVo N200 with FM radio - 412f Dell Digital Jukebox 2.Gen - 4130 Zen Micro (mtp) - 4131 Zen Touch (mtp) - 4133 Mass Storage Device - 4134 Zen Neeon - 4136 Zen Sleek - 4137 Zen Sleek (mtp) - 4139 Zen Nano Plus - 413c Zen MicroPhoto - 4150 Zen V (MTP) - 4151 Zen Vision:M (mtp) - 4152 Zen V Plus - 4153 Zen Vision W - 4155 Zen Stone plus - 4157 Zen (MTP) - 500f Broadband Blaster 8012U-V - 5015 TECOM Bluetooth Device - ffff Webcam Live! Ultra -041f LCS Telegraphics -0420 Chips and Technologies - 1307 Celly SIM Card Reader -0421 Nokia Mobile Phones - 0001 E61i (PC Suite mode) - 0018 6288 GSM Smartphone - 0019 6288 GSM Smartphone (imaging mode) - 001a 6288 GSM Smartphone (file transfer mode) - 0024 5610 XpressMusic (Storage mode) - 0025 5610 XpressMusic (PC Suite mode) - 0028 5610 XpressMusic (Imaging mode) - 002d 6120 Phone (Mass storage mode) - 002e 6120 Phone (Media-Player mode) - 002f 6120 Phone (PC-Suite mode) - 0042 E51 (PC Suite mode) - 0064 3109c GSM Phone - 006b 5310 Xpress Music (PC Suite mode) - 006c 5310 Xpress music (Storage mode) - 006d N95 (Storage mode) - 006e N95 (Multimedia mode) - 006f N95 (Printing mode) - 0070 N95 (PC Suite mode) - 0096 N810 Internet Tablet - 00aa E71 (Mass storage mode) - 00ab E71 (PC Suite mode) - 00e4 E71 (Media transfer mode) - 0103 ADL Flashing Engine AVALON Parent - 0104 ADL Re-Flashing Engine Parent - 0105 Nokia Firmware Upgrade Mode - 0106 ROM Parent - 0154 5800 XpressMusic (PC Suite mode) - 0155 5800 XpressMusic (Multimedia mode) - 0156 5800 XpressMusic (Storage mode) - 0157 5800 XpressMusic (Imaging mode) - 0199 6700 Classic (msc) - 019a 6700 Classic (PC Suite) - 019b 6700 Classic (mtp) - 01b0 6303 classic Phone (PC Suite mode) - 01b1 6303 classic Phone (Mass storage mode) - 01b2 6303 classic Phone (Printing and media mode) - 01c7 N900 (Storage Mode) - 01c8 N900 (PC-Suite Mode) - 0228 5530 XpressMusic - 026a N97 (mass storage) - 026b N97 (Multimedia) - 026c N97 (PC Suite) - 026d N97 (Pictures) - 0295 660i/6600i Slide Phone (Mass Storage) - 0297 660i/6600i Slide Phone (Still Image) - 02e1 5230 (Storage mode) - 02e2 5230 (Multimedia mode) - 02e3 5230 (PC-Suite mode) - 02e4 5230 (Imaging mode) - 03a4 C5 (Storage mode) - 0400 7600 Phone Parent - 0401 6650 GSM Phone - 0402 6255 Phone Parent - 0404 5510 - 0405 9500 GSM Communicator - 0407 Music Player HDR-1(tm) - 040b N-Gage GSM Phone - 040d 6620 Phone Parent - 040e 6651 Phone Parent - 040f 6230 GSM Phone - 0410 6630 Imaging Smartphone - 0411 7610 Phone Parent - 0413 6260 Phone Parent - 0414 7370 - 0415 9300 GSM Smartphone - 0416 6170 Phone Parent - 0417 7270 Phone Parent - 0418 E70 (PC Suite mode) - 0419 E60 (PC Suite mode) - 041a 9500 GSM Communicator (RNDIS) - 041b 9300 GSM Smartphone (RNDIS) - 041c 7710 Phone Parent - 041d 6670 Phone Parent - 041e 6680 - 041f 6235 Phone Parent - 0421 3230 Phone Parent - 0422 6681 Phone Parent - 0423 6682 Phone Parent - 0428 6230i Modem - 0429 6230i MultiMedia Card - 0431 770 Internet Tablet - 0432 N90 Phone Parent - 0435 E70 (IP Passthrough/RNDIS mode) - 0436 E60 (IP Passthrough/RNDIS mode) - 0437 6265 Phone Parent - 043a N70 USB Phone Parent - 043b 3155 Phone Parent - 043c 6155 Phone Parent - 043d 6270 Phone Parent - 0443 N70 Phone Parent - 0444 N91 - 044c NM850iG Phone Parent - 044d E61 (PC Suite mode) - 044e E61 (Data Exchange mode) - 044f E61 (IP Passthrough/RNDIS mode) - 0453 9300 Phone Parent - 0456 6111 Phone Parent - 0457 6111 Phone (Printing mode) - 045a 6280 Phone Parent - 045d 6282 Phone Parent - 046e 6110 Navigator - 0471 6110 Navigator - 0485 MTP Device - 04b9 5300 - 04c3 N800 Internet Tablet - 04ce E90 Communicator (PC Suite mode) - 04cf E90 Communicator (Storage mode) - 04f0 Nokia N95 (PC Suite mode) - 04f9 6300 (PC Suite mode) - 0508 E65 (PC Suite mode) - 0509 E65 (Storage mode) - 0600 Digital Pen SU-1B - 0610 CS-15 (Internet Stick 3G modem) - 0800 Connectivity Cable DKU-5 - 0801 Data Cable DKU-6 - 0802 CA-42 Phone Parent -0422 ADI Systems, Inc. -0423 Computer Access Technology Corp. - 000a NetMate Ethernet - 000c NetMate2 Ethernet - 000d USB Chief Analyzer - 0100 Generic Universal Protocol Analyzer - 0101 UPA USBTracer - 0200 Generic 10K Universal Protocol Analyzer - 020a PETracer ML - 0300 Generic Universal Protocol Analyzer - 0301 2500H Tracer Trainer - 030a PETracer x1 - 1237 Andromeda Hub -0424 Standard Microsystems Corp. - 0001 Integrated Hub - 0acd Sitecom Internal Multi Memory reader/writer MD-005 - 0fdc Floppy - 10cd Sitecom Internal Multi Memory reader/writer MD-005 - 2020 USB Hub - 20cd Sitecom Internal Multi Memory reader/writer MD-005 - 20fc 6-in-1 Card Reader - 2228 9-in-2 Card Reader - 223a 8-in-1 Card Reader - 2503 USB 2.0 Hub - 2504 USB 2.0 Hub - 2512 USB 2.0 Hub - 2514 USB 2.0 Hub - 2517 Hub - 2524 USB MultiSwitch Hub - 2602 USB 2.0 Hub - 2640 USB 2.0 Hub - 4060 Ultra Fast Media Reader - 4064 Ultra Fast Media Reader -0425 Motorola Semiconductors HK, Ltd - 0101 G-Tech Wireless Mouse & Keyboard - f102 G-Tech U+P Wireless Mouse -0426 Integrated Device Technology, Inc. - 0426 WDM Driver -0427 Motorola Electronics Taiwan, Ltd -0428 Advanced Gravis Computer Tech, Ltd - 4001 GamePad Pro -0429 Cirrus Logic -042a Ericsson Austrian, AG -042b Intel Corp. - 9316 8x931Hx Customer Hub -042c Innovative Semiconductors, Inc. -042d Micronics -042e Acer, Inc. - 0380 MP3 Player -042f Molex, Inc. -0430 Sun Microsystems, Inc. - 0002 109 Keyboard - 0005 Type 6 Keyboard - 000a 109 Japanese Keyboard - 000b 109 Japanese Keyboard - 0082 109 Japanese Keyboard - 0083 109 Japanese Keyboard - 00a2 Type 7 Keyboard - 0100 3-button Mouse - 100e 24.1" LCD Monitor v4 / FID-638 Mouse - 36ba Bus Powered Hub - cdab Raritan KVM dongle -0431 Itac Systems, Inc. - 0100 Mouse-Trak 3-button Track Ball -0432 Unisys Corp. -0433 Alps Electric, Inc. - 1101 IBM Game Controller - abab Keyboard -0434 Samsung Info. Systems America, Inc. -0435 Hyundai Electronics America -0436 Taugagreining HF - 0005 CameraMate (DPCM_USB) -0437 Framatome Connectors USA -0438 Advanced Micro Devices, Inc. -0439 Voice Technologies Group -043d Lexmark International, Inc. - 0001 Laser Printer - 0002 Optra E310 Printer - 0003 Laser Printer - 0004 Laser Printer - 0005 Laser Printer - 0006 Laser Printer - 0007 Laser Printer - 0008 Inkjet Color Printer - 0009 Optra S2450 Printer - 000a Laser Printer - 000b Inkjet Color Printer - 000c Optra E312 Printer - 000d Laser Printer - 000e Laser Printer - 000f Laser Printer - 0010 Laser Printer - 0011 Laser Printer - 0012 Inkjet Color Printer - 0013 Inkjet Color Printer - 0014 InkJet Color Printer - 0015 InkJet Color Printer - 0016 Z12 Color Jetprinter - 0017 Z32 printer - 0018 Z52 Printer - 0019 Forms Printer - 001a Z65 Printer - 001b InkJet Photo Printer - 001c Kodak Personal Picture Maker 200 Printer - 001d InkJet Color Printer - 001e InkJet Photo Printer - 001f Kodak Personal Picture Maker 200 Card Reader - 0020 Z51 Printer - 0021 Z33 Printer - 0022 InkJet Color Printer - 0023 Laser Printer - 0024 Laser Printer - 0025 InkJet Color Printer - 0026 InkJet Color Printer - 0027 InkJet Color Printer - 0028 InkJet Color Printer - 0029 Scan Print Copy - 002a Scan Print Copy - 002b Scan Print Copy - 002c Scan Print Copy - 002d X70/X73 Scan/Print/Copy - 002e Scan Print Copy - 002f Scan Print Copy - 0030 Scan Print Copy - 0031 Scan Print Copy - 0032 Scan Print Copy - 0033 Scan Print Copy - 0034 Scan Print Copy - 0035 Scan Print Copy - 0036 Scan Print Copy - 0037 Scan Print Copy - 0038 Scan Print Copy - 0039 Scan Print Copy - 003a Scan Print Copy - 003b Scan Print Copy - 003c Scan Print Copy - 003d X83 Scan/Print/Copy - 003e Scan Print Copy - 003f Scan Print Copy - 0040 Scan Print Copy - 0041 Scan Print Copy - 0042 Scan Print Copy - 0043 Scan Print Copy - 0044 Scan Print Copy - 0045 Scan Print Copy - 0046 Scan Print Copy - 0047 Scan Print Copy - 0048 Scan Print Copy - 0049 Scan Print Copy - 004a Scan Print Copy - 004b Scan Print Copy - 004c Scan Print Copy - 004d Laser Printer - 004e Laser Printer - 004f InkJet Color Printer - 0050 InkJet Color Printer - 0051 Laser Printer - 0052 Laser Printer - 0053 InkJet Color Printer - 0054 InkJet Color Printer - 0057 Z35 Printer - 0058 Laser Printer - 005a X63 - 005c InkJet Color Printer - 0060 X74/X75 Scanner - 0061 X74 Hub - 0065 X5130 - 0069 X74/X75 Printer - 006d X125 - 006e C510 - 0072 X6170 Printer - 0073 InkJet Color Printer - 0078 InkJet Color Printer - 0079 InkJet Color Printer - 007a Generic Hub - 007b InkJet Color Printer - 007c Lexmark X1110/X1130/X1140/X1150/X1170/X1180/X1185 - 007d Photo 3150 - 008a 4200 series - 008b InkJet Color Printer - 008c to CF/SM/SD/MS Card Reader - 008e InkJet Color Printer - 008f X422 - 0093 X5250 - 0095 E220 Printer - 0096 2200 series - 0097 P6250 - 0098 7100 series - 009e P910 series Human Interface Device - 009f InkJet Color Printer - 00a9 IBM Infoprint 1410 MFP - 00ab InkJet Color Printer - 00b2 3300 series - 00b8 7300 series - 00b9 8300 series - 00ba InkJet Color Printer - 00bb 2300 series - 00bd Printing Support - 00be Printing Support - 00bf Printing Support - 00c0 6300 series - 00c1 4300 series - 00c7 Printing Support - 00c8 Printing Support - 00c9 Printing Support - 00cb Printing Support - 00cc E120(n) - 00d0 9300 series - 00d3 X340 Scanner - 00d4 X342n Scanner - 00d5 Printing Support - 00d6 X340 Scanner - 00e8 X642e - 00e9 2400 series - 00f6 3400 series - 00f7 InkJet Color Printer - 00ff InkJet Color Printer - 010b 2500 series - 010d 3500-4500 series - 010f 6500 series - 0142 X3650 (Printer, Scanner, Copier) - 4303 Xerox WorkCentre Pro 412 -043e LG Electronics USA, Inc. - 3001 AN-WF100 802.11abgn Wireless Adapter [Broadcom BCM4323] - 42bd Flatron 795FT Plus Monitor - 4a4d Flatron 915FT Plus Monitor - 7001 MF-PD100 Soul Digital MP3 Player - 7013 MP3 Player - 8484 LPC-U30 Webcam II - 8585 LPC-UC35 Webcam - 8888 Electronics VCS Camera II(LPC-U20) - 9800 Remote Control Receiver_iMON - 9803 eHome Infrared Receiver - 9804 DMB Receiver Control - 9c01 LGE Sync -043f RadiSys Corp. -0440 Eizo Nanao Corp. -0441 Winbond Systems Lab. - 1456 Hub -0442 Ericsson, Inc. - abba Bluetooth Device -0443 Gateway, Inc. - 000e Multimedia Keyboard - 002e Millennium Keyboard -0445 Lucent Technologies, Inc. -0446 NMB Technologies Corp. - 6781 Keyboard with PS/2 Mouse Port - 6782 Keyboard -0447 Momentum Microsystems -044a Shamrock Tech. Co., Ltd -044b WSI -044c CCL/ITRI -044d Siemens Nixdorf AG -044e Alps Electric Co., Ltd - 1104 Japanese Keyboard - 2002 MD-5500 Printer - 2014 Bluetooth Device - 3001 UGTZ4 Bluetooth - 3002 Bluetooth Device - 3003 Bluetooth Device - 3004 Bluetooth Adapter - 3005 Integrated Bluetooth Device - 3006 Bluetooth Adapter - 3007 Bluetooth Controller (ALPS/UGX) - 300c Bluetooth Controller (ALPS/UGPZ6) - 300d Bluetooth Controller (ALPS/UGPZ6) - 3010 Bluetooth Adapter - 3017 BCM2046 Bluetooth Device - ffff Compaq Bluetooth Multiport Module -044f ThrustMaster, Inc. - 0400 HOTAS Cougar - a003 Rage 3D Game Pad - a01b PK-GP301 Driving Wheel - a0a0 Top Gun Joystick - a0a1 Top Gun Joystick (rev2) - a0a3 Fusion Digital GamePad - a201 PK-GP201 PlayStick - b10a T.16000M Joystick - b203 360 Modena Pro Wheel - b300 Firestorm Dual Power - b304 Firestorm Dual Power - b307 vibrating Upad - b30b Wireless VibrationPad - b323 Dual Trigger 3-in-1 (PC Mode) - b324 Dual Trigger 3-in-1 (PS3 Mode) - b603 force feedback Wheel - b605 force feedback Racing Wheel - b651 Ferrari GT Rumble Force Wheel - b653 RGT Force Feedback Clutch Racing Wheel - b654 Ferrari GT Force Feedback Wheel - b700 Tacticalboard -0450 DFI, Inc. -0451 Texas Instruments, Inc. - 1234 Bluetooth Device - 1428 Hub - 1446 TUSB2040/2070 Hub - 16a6 BM-USBD1 BlueRobin RF heart rate sensor receiver - 2036 TUSB2036 Hub - 2046 TUSB2046 Hub - 2077 TUSB2077 Hub - 3410 TUSB3410 Microcontroller - 3f00 OMAP1610 - 3f02 SMC WSKP100 Wi-Fi Phone - 5409 Frontier Labs NEX IA+ Digital Audio Player - 6000 AU5 ADSL Modem (pre-reenum) - 6001 AU5 ADSL Modem - 6060 RNDIS/BeWAN ADSL2+ - 6070 RNDIS/BeWAN ADSL2+ - 625f TUSB6250 ATA Bridge - dbc0 Device Bay Controller - e001 GraphLink - e003 TI-84 Plus Calculator - e004 TI-89 Titanium Calculator - e008 TI-84 Plus Silver Calculator - f430 MSP-FET430UIF JTAG Tool - f432 eZ430 Development Tool - ffff Bluetooth Device -0452 Mitsubishi Electronics America, Inc. - 0021 HID Monitor Controls - 0050 Diamond Pro 900u CRT Monitor - 0051 Integrated Hub -0453 CMD Technology - 6781 NMB Keyboard - 6783 Chicony Composite Keyboard -0454 Vobis Microcomputer AG -0455 Telematics International, Inc. -0456 Analog Devices, Inc. - f000 FT2232 JTAG ICE [gnICE] - f001 FT2232H Hi-Speed JTAG ICE [gnICE+] -0457 Silicon Integrated Systems Corp. - 0150 Super Talent 1GB Flash Drive - 0151 Super Flash 1GB / GXT 64MB Flash Drive - 0162 SiS162 usb Wireless LAN Adapter - 0163 802.11 Wireless LAN Adapter - 5401 Wireless Adapter RO80211GS-USB -0458 KYE Systems Corp. (Mouse Systems) - 0001 Mouse - 0002 Genius NetMouse Pro - 0003 Genius NetScroll+ - 0006 Easy Mouse+ USB(USB\Vid_0458&Pid;_0006) Mouse - 000b NetMouse Wheel(P+U) - 000c TACOMA Fingerprint V1.06.01 - 000e VideoCAM Web - 0013 TACOMA Fingerprint Mouse V1.06.01 - 001a Genius WebScroll+ - 0036 Pocket Mouse LE - 0039 NetScroll+ Superior - 003a NetScroll+ Mini Traveler / Genius NetScroll 120 - 004c Slimstar Pro Keyboard - 0056 Ergo 300 Mouse - 0057 Enhanced Gaming Device - 0059 Enhanced Laser Device - 005a Enhanced Device - 005b Enhanced Device - 005c Enhanced Laser Gaming Device - 005d Enhanced Device - 0061 Bluetooth Dongle - 0072 Navigator 335 - 0083 Bluetooth Dongle - 0087 Ergo 525V Laser Mouse - 0100 EasyPen Tablet - 0101 CueCat - 011b NetScroll T220 - 1001 Joystick - 1002 Game Pad - 1003 Genius VideoCam - 1004 Flight2000 F-23 Joystick - 100a Aashima Technology Trust Sight Fighter Vibration Feedback Joystick - 2001 ColorPage-Vivid Pro Scanner - 2004 ColorPage-HR6 V1 Scanner - 2005 ColorPage-HR6/Vivid3 - 2007 ColorPage-HR6 V2 Scanner - 2008 ColorPage-HR6 V2 Scanner - 2009 ColorPage-HR6A Scanner - 2011 ColorPage-Vivid3x Scanner - 2012 Plustek Scanner - 2013 ColorPage-HR7 Scanner - 2014 ColorPage-Vivid4 - 2015 ColorPage-HR7LE Scanner - 2016 ColorPage-HR6X Scanner - 2017 ColorPage-Vivid3xe - 2018 ColorPage-HR7X - 2019 ColorPage-HR6X Slim - 201a ColorPage-Vivid4xe - 201b ColorPage-Vivid4x - 201c ColorPage-HR8 - 201d ColorPage-Vivid 1200 X - 201e ColorPage-Slim 1200 - 201f ColorPage-Vivid 1200 XE - 2020 ColorPage-Slim 1200 USB2 - 2021 ColorPage-SF600 - 3017 SPEED WHEEL 3 Vibration - 3018 Wireless 2.4Ghz Game Pad - 3019 10-Button USB Joystick with Vibration - 301a MaxFire G-12U Vibration - 301d Genius MaxFire MiniPad - 400f Genius TVGo DVB-T02Q MCE - 4012 TVGo DVB-T03 - 5003 G-pen 560 Tablet - 5004 G-pen Tablet - 6001 GF3000F Ethernet Adapter - 7004 VideoCAM Express V2 - 7006 Dsc 1.3 Smart Camera Device - 7007 VideoCAM Web - 7009 G-Shot G312 Still Camera Device - 700c VideoCAM Web V3 - 700d G-Shot G511 Composite Device - 700f VideoCAM Web - 7012 WebCAM USB2.0 - 7014 VideoCAM Live V3 - 701c G-Shot G512 Still Camera - 7020 Sim 321C - 7025 Eye 311Q Camera - 7029 Genius Look 320s (SN9C201 + HV7131R) - 702f Genius Slim 322 - 7035 i-Look 325T Camera - 7045 Genius Look 1320 V2 - 704c Genius i-Look 1321 - 704d Slim 1322AF - 7055 Slim 2020AF camera - 705a Asus USB2.0 Webcam - 705c Genius iSlim 1300AF - 7079 FaceCam 2025R -0459 Adobe Systems, Inc. -045a SONICblue, Inc. - 07da Supra Express 56K modem - 0b4a SupraMax 2890 56K Modem [Lucent Atlas] - 0b68 SupraMax 56K Modem - 5001 Rio 600 MP3 Player - 5002 Rio 800 MP3 Player - 5003 Nike Psa/Play MP3 Player - 5005 Rio S10 MP3 Player - 5006 Rio S50 MP3 Player - 5007 Rio S35 MP3 Player - 5008 Rio 900 MP3 Player - 5009 Rio S30 MP3 Player - 500d Fuse MP3 Player - 500e Chiba MP3 Player - 500f Cali MP3 Player - 5010 Rio S11 MP3 Player - 501c Virgin MPF-1000 - 501d Rio Fuse - 501e Rio Chiba - 501f Rio Cali - 503f Cali256 MP3 Player - 5202 Rio Riot MP3 Player - 5210 Rio Karma Music Player - 5220 Rio Nitrus MP3 Player - 5221 Rio Eigen -045b Hitachi, Ltd -045d Nortel Networks, Ltd -045e Microsoft Corp. - 0007 SideWinder Game Pad - 0008 SideWinder Precision Pro - 0009 IntelliMouse - 000b Natural Keyboard Elite - 000e SideWinder® Freestyle Pro - 0014 Digital Sound System 80 - 001a SideWinder Precision Racing Wheel - 001b SideWinder Force Feedback 2 Joystick - 001c Internet Keyboard Pro - 001d Natural Keyboard Pro - 001e IntelliMouse Explorer - 0023 Trackball Optical - 0024 Trackball Explorer - 0025 IntelliEye Mouse - 0026 SideWinder GamePad Pro - 0027 SideWinder PnP GamePad - 0028 SideWinder Dual Strike - 0029 IntelliMouse Optical - 002b Internet Keyboard Pro - 002d Internet Keyboard - 002f Integrated Hub - 0033 Sidewinder Strategic Commander - 0034 SideWinder Force Feedback Wheel - 0038 SideWinder Precision 2 - 0039 IntelliMouse Optical - 003b SideWinder Game Voice - 003c SideWinder Joystick - 0040 Wheel Mouse Optical - 0047 IntelliMouse Explorer 3.0 - 0048 Office Keyboard 1.0A - 0053 Optical Mouse - 0059 Wireless IntelliMouse Explorer - 005c Office Keyboard (106/109) - 005f Wireless MultiMedia Keyboard - 0061 Wireless MultiMedia Keyboard (106/109) - 0063 Wireless Natural MultiMedia Keyboard - 0065 Wireless Natural MultiMedia Keyboard (106/109) - 006a Wireless Optical Mouse (IntelliPoint) - 006d eHome Remote Control Keyboard keys - 006e MN-510 802.11b Wireless Adapter [Intersil ISL3873B] - 006f Smart Display Reference Device - 0070 Wireless MultiMedia Keyboard - 0071 Wireless MultiMedia Keyboard (106/109) - 0072 Wireless Natural MultiMedia Keyboard - 0073 Wireless Natural MultiMedia Keyboard (106/109) - 0079 IXI Ogo CT-17 handheld device - 007a 10/100 USB NIC - 007d Notebook Optical Mouse - 007e Wireless Transceiver for Bluetooth - 0080 Digital Media Pro Keyboard - 0083 Basic Optical Mouse - 0084 Basic Optical Mouse - 008a Wireless Keyboard and Mouse - 008b Dual Receiver Wireless Mouse (IntelliPoint) - 008c Wireless Intellimouse Explorer 2.0 - 0095 IntelliMouse Explorer 4.0 (IntelliPoint) - 009c Wireless Transceiver for Bluetooth 2.0 - 009d Wireless Optical Desktop 3.0 - 00a0 eHome Infrared Receiver - 00b0 Digital Media Pro Keyboard - 00b9 Wireless Optical Mouse 3.0 - 00bb Fingerprint Reader - 00bc Fingerprint Reader - 00bd Fingerprint Reader - 00c2 MN-710 802.11g Wireless Adapter [Intersil ISL3886] - 00c9 MTP Device - 00ca Fingerprint Reader - 00cb Basic Optical Mouse v2.0 - 00ce Generic PPC Flash device - 00d1 Optical Mouse with Tilt Wheel - 00da eHome Infrared Receiver - 00db Natural Ergonomic Keyboard 4000 V1.0 - 00dd Comfort Curve Keyboard 2000 V1.0 - 00e1 Wireless Laser Mouse 6000 Reciever - 00f4 LifeCam VX-6000 (SN9C20x + OV9650) - 00f5 LifeCam VX-3000 - 00f6 Comfort Optical Mouse 1000 - 00f7 LifeCam VX-1000 - 00f8 LifeCam NX-6000 - 00f9 Wireless Desktop Receiver 3.1 - 0202 Xbox Controller - 0280 XBox Device - 0283 Xbox Communicator - 0284 Xbox DVD Playback Kit - 0285 Xbox Controller S - 0288 Xbox Controller S Hub - 0289 Xbox Controller S - 028b Xbox360 DVD Emulator - 028d Xbox360 Memory Unit 64MB - 028e Xbox360 Controller - 028f Xbox360 Wireless Controller - 0290 Xbox360 Performance Pipe (PIX) - 0291 Xbox 360 Wireless Receiver for Windows - 0292 Xbox360 Wireless Networking Adapter - 029c Xbox360 HD-DVD Drive - 029d Xbox360 HD-DVD Drive - 029e Xbox360 HD-DVD Memory Unit - 02a0 Xbox360 Big Button IR - 02a8 Xbox360 Wireless N Networking Adapter [Atheros AR7010+AR9280] - 02ad Xbox NUI Audio - 02ae Xbox NUI Camera - 02b0 Xbox NUI Motor - 0400 Windows Powered Pocket PC 2002 - 0401 Windows Powered Pocket PC 2002 - 0402 Windows Powered Pocket PC 2002 - 0403 Windows Powered Pocket PC 2002 - 0404 Windows Powered Pocket PC 2002 - 0405 Windows Powered Pocket PC 2002 - 0406 Windows Powered Pocket PC 2002 - 0407 Windows Powered Pocket PC 2002 - 0408 Windows Powered Pocket PC 2002 - 0409 Windows Powered Pocket PC 2002 - 040a Windows Powered Pocket PC 2002 - 040b Windows Powered Pocket PC 2002 - 040c Windows Powered Pocket PC 2002 - 040d Windows Powered Pocket PC 2002 - 040e Windows Powered Pocket PC 2002 - 040f Windows Powered Pocket PC 2002 - 0410 Windows Powered Pocket PC 2002 - 0411 Windows Powered Pocket PC 2002 - 0412 Windows Powered Pocket PC 2002 - 0413 Windows Powered Pocket PC 2002 - 0414 Windows Powered Pocket PC 2002 - 0415 Windows Powered Pocket PC 2002 - 0416 Windows Powered Pocket PC 2002 - 0417 Windows Powered Pocket PC 2002 - 0432 Windows Powered Pocket PC 2003 - 0433 Windows Powered Pocket PC 2003 - 0434 Windows Powered Pocket PC 2003 - 0435 Windows Powered Pocket PC 2003 - 0436 Windows Powered Pocket PC 2003 - 0437 Windows Powered Pocket PC 2003 - 0438 Windows Powered Pocket PC 2003 - 0439 Windows Powered Pocket PC 2003 - 043a Windows Powered Pocket PC 2003 - 043b Windows Powered Pocket PC 2003 - 043c Windows Powered Pocket PC 2003 - 043d Becker Traffic Assist Highspeed 7934 - 043e Windows Powered Pocket PC 2003 - 043f Windows Powered Pocket PC 2003 - 0440 Windows Powered Pocket PC 2003 - 0441 Windows Powered Pocket PC 2003 - 0442 Windows Powered Pocket PC 2003 - 0443 Windows Powered Pocket PC 2003 - 0444 Windows Powered Pocket PC 2003 - 0445 Windows Powered Pocket PC 2003 - 0446 Windows Powered Pocket PC 2003 - 0447 Windows Powered Pocket PC 2003 - 0448 Windows Powered Pocket PC 2003 - 0449 Windows Powered Pocket PC 2003 - 044a Windows Powered Pocket PC 2003 - 044b Windows Powered Pocket PC 2003 - 044c Windows Powered Pocket PC 2003 - 044d Windows Powered Pocket PC 2003 - 044e Windows Powered Pocket PC 2003 - 044f Windows Powered Pocket PC 2003 - 0450 Windows Powered Pocket PC 2003 - 0451 Windows Powered Pocket PC 2003 - 0452 Windows Powered Pocket PC 2003 - 0453 Windows Powered Pocket PC 2003 - 0454 Windows Powered Pocket PC 2003 - 0455 Windows Powered Pocket PC 2003 - 0456 Windows Powered Pocket PC 2003 - 0457 Windows Powered Pocket PC 2003 - 0458 Windows Powered Pocket PC 2003 - 0459 Windows Powered Pocket PC 2003 - 045a Windows Powered Pocket PC 2003 - 045b Windows Powered Pocket PC 2003 - 045c Windows Powered Pocket PC 2003 - 045d Windows Powered Pocket PC 2003 - 045e Windows Powered Pocket PC 2003 - 045f Windows Powered Pocket PC 2003 - 0460 Windows Powered Pocket PC 2003 - 0461 Windows Powered Pocket PC 2003 - 0462 Windows Powered Pocket PC 2003 - 0463 Windows Powered Pocket PC 2003 - 0464 Windows Powered Pocket PC 2003 - 0465 Windows Powered Pocket PC 2003 - 0466 Windows Powered Pocket PC 2003 - 0467 Windows Powered Pocket PC 2003 - 0468 Windows Powered Pocket PC 2003 - 0469 Windows Powered Pocket PC 2003 - 046a Windows Powered Pocket PC 2003 - 046b Windows Powered Pocket PC 2003 - 046c Windows Powered Pocket PC 2003 - 046d Windows Powered Pocket PC 2003 - 046e Windows Powered Pocket PC 2003 - 046f Windows Powered Pocket PC 2003 - 0470 Windows Powered Pocket PC 2003 - 0471 Windows Powered Pocket PC 2003 - 0472 Windows Powered Pocket PC 2003 - 0473 Windows Powered Pocket PC 2003 - 0474 Windows Powered Pocket PC 2003 - 0475 Windows Powered Pocket PC 2003 - 0476 Windows Powered Pocket PC 2003 - 0477 Windows Powered Pocket PC 2003 - 0478 Windows Powered Pocket PC 2003 - 0479 Windows Powered Pocket PC 2003 - 047a Windows Powered Pocket PC 2003 - 047b Windows Powered Pocket PC 2003 - 04c8 Windows Powered Smartphone 2002 - 04c9 Windows Powered Smartphone 2002 - 04ca Windows Powered Smartphone 2002 - 04cb Windows Powered Smartphone 2002 - 04cc Windows Powered Smartphone 2002 - 04cd Windows Powered Smartphone 2002 - 04ce Windows Powered Smartphone 2002 - 04d7 Windows Powered Smartphone 2003 - 04d8 Windows Powered Smartphone 2003 - 04d9 Windows Powered Smartphone 2003 - 04da Windows Powered Smartphone 2003 - 04db Windows Powered Smartphone 2003 - 04dc Windows Powered Smartphone 2003 - 04dd Windows Powered Smartphone 2003 - 04de Windows Powered Smartphone 2003 - 04df Windows Powered Smartphone 2003 - 04e0 Windows Powered Smartphone 2003 - 04e1 Windows Powered Smartphone 2003 - 04e2 Windows Powered Smartphone 2003 - 04e3 Windows Powered Smartphone 2003 - 04e4 Windows Powered Smartphone 2003 - 04e5 Windows Powered Smartphone 2003 - 04e6 Windows Powered Smartphone 2003 - 04e7 Windows Powered Smartphone 2003 - 04e8 Windows Powered Smartphone 2003 - 04e9 Windows Powered Smartphone 2003 - 04ea Windows Powered Smartphone 2003 - 04ec Windows Phone (Zune) - 063e Zune HD Media Player - 0640 KIN Phone - 0641 KIN Phone - 0642 KIN Phone - 0707 Wireless Laser Mouse 8000 - 0708 Transceiver v 3.0 for Bluetooth - 070a Charon Bluetooth Dongle (DFU) - 0710 Zune Media Player - 0713 Wireless Presenter Mouse 8000 - 0719 Xbox 360 Wireless Adapter - 071f Mouse/Keyboard 2.4GHz Transceiver V2.0 - 0721 LifeCam NX-3000 (UVC-compliant) - 0723 LifeCam VX-7000 (UVC-compliant) - 0734 Wireless Optical Desktop 700 - 0737 Compact Optical Mouse 500 - 0745 Nano Transceiver v1.0 for Bluetooth - 0750 Wired Keyboard 600 - 075d LifeCam Cinema - 0768 Sidewinder X4 - 076d LifeCam HD-5000 - 930a ISOUSB.SYS Intel 82930 Isochronous IO Test Board - fff8 Keyboard - ffff Windows CE Mass Storage -0460 Ace Cad Enterprise Co., Ltd - 0004 Tablet (5x3.75) - 0006 LCD Tablet (12x9) - 0008 Tablet (3x2.25) -0461 Primax Electronics, Ltd - 0300 G2-300 Scanner - 0301 G2E-300 Scanner - 0302 G2-300 #2 Scanner - 0303 G2E-300 #2 Scanner - 0340 Colorado 9600 Scanner - 0341 Colorado 600u Scanner - 0345 Visioneer 6200 Scanner - 0346 Memorex Maxx 6136u Scanner - 0347 Primascan Colorado 2600u/Visioneer 4400 Scanner - 0360 Colorado 19200 Scanner - 0361 Colorado 1200u Scanner - 0363 VistaScan Astra 3600(ENG) - 0364 LG Electronics Scanworks 600U Scanner - 0365 VistaScan Astra 3600(ENG) - 0366 6400 - 0367 VistaScan Astra 3600(ENG) - 0371 Visioneer Onetouch 8920 Scanner - 0374 UMAX Astra 2500 - 0375 VistaScan Astra 3600(ENG) - 0377 Medion MD 5345 Scanner - 0378 VistaScan Astra 3600(ENG) - 037b Medion MD 6190 Scanner - 037c VistaScan Astra 3600(ENG) - 0380 G2-600 Scanner - 0381 ReadyScan 636i Scanner - 0382 G2-600 #2 Scanner - 0383 G2E-600 Scanner - 038a UMAX Astra 3000/3600 - 038b Xerox 2400 Onetouch - 038c UMAX Astra 4100 - 0392 Medion/Lifetec/Tevion/Cytron MD 6190 - 03a8 9420M - 0813 IBM UltraPort Camera - 0815 Micro Innovations IC200 Webcam - 0819 Fujifilm IX-30 Camera [webcam mode] - 081a Fujifilm IX-30 Camera [storage mode] - 081c Elitegroup ECS-C11 Camera - 081d Elitegroup ECS-C11 Storage - 0a00 Micro Innovations Web Cam 320 - 4d01 Comfort Keyboard - 4d02 Mouse-in-a-Box - 4d03 Kensington Mouse-in-a-box - 4d04 Mouse - 4d06 Balless Mouse (HID) - 4d15 Dell Optical Mouse - 4d17 Optical Mouse - 4d2a PoPo Elixir Mouse (HID) - 4d2b Wireless Laser Mini Mouse (HID) - 4d2c PoPo Mini Pointer Mouse (HID) - 4d2e Optical Mobile Mouse (HID) - 4d51 0Y357C PMX-MMOCZUL (B) [Dell Laser Mouse] - 4d75 Rocketfish RF-FLBTAD Bluetooth Adapter - 4de7 webcam -0463 MGE UPS Systems - 0001 UPS - ffff UPS -0464 AMP/Tycoelectronics Corp. -0467 AT&T Paradyne -0468 Wieson Technologies Co., Ltd -046a Cherry GmbH - 0001 My3000 Keyboard - 0003 My3000 Hub - 0004 CyBoard Keyboard - 0005 XX33 SmartCard Reader Keyboard - 0008 Wireless Keyboard and Mouse - 0010 SmartBoard XX44 - 0011 G83 (RS 6000) Keyboard - 0021 CyMotion Expert Combo - 0023 CyMotion Master Linux Keyboard - 0027 CyMotion Master Solar Keyboard - 002a Wireless Mouse & Keyboard - 002d SmartTerminal XX44 - 003e SmartTerminal ST-2xxx - 0080 eHealth Terminal ST 1503 - 0081 eHealth Keyboard G87 1504 - 0106 R-300 Wireless Mouse Receiver -046b American Megatrends, Inc. - 0001 Keyboard - 0101 PS/2 Keyboard, Mouse & Joystick Ports - 0301 USB 1.0 Hub - 0500 Serial & Parallel Ports -046c Toshiba Corp., Digital Media Equipment -046d Logitech, Inc. - 0082 Acer Aspire 5672 Webcam - 0200 WingMan Extreme Joystick - 0203 M2452 Keyboard - 0301 M4848 Mouse - 0401 HP PageScan - 0402 NEC PageScan - 040f Logitech/Storm PageScan - 0430 Mic (Cordless) - 0801 QuickCam Home - 0802 Webcam C200 - 0804 Webcam C250 - 0805 Webcam C300 - 0807 Webcam B500 - 0808 Webcam C600 - 0809 Webcam Pro 9000 - 080a Portable Webcam C905 - 080f Webcam C120 - 0810 QuickCam Pro - 0819 Webcam C210 - 081b Webcam C310 - 0820 QuickCam VC - 0821 HD Webcam C910 - 0825 Webcam C270 - 0828 HD Webcam B990 - 0830 QuickClip - 0840 QuickCam Express - 0850 QuickCam Web - 0870 QuickCam Express - 0890 QuickCam Traveler - 0892 OrbiCam - 0894 CrystalCam - 0895 QuickCam for Dell Notebooks - 0896 OrbiCam - 0897 QuickCam for Dell Notebooks - 0899 QuickCam for Dell Notebooks - 089d QuickCam E2500 series - 08a0 QuickCam IM - 08a1 QuickCam IM with sound - 08a2 Labtec Webcam Pro - 08a3 QuickCam QuickCam Chat - 08a6 QuickCam IM - 08a7 QuickCam Image - 08a9 Notebook Deluxe - 08aa Labtec Notebooks - 08ac QuickCam Cool - 08ad QuickCam Communicate STX - 08ae QuickCam for Notebooks - 08af QuickCam Easy/Cool - 08b0 QuickCam 3000 Pro [pwc] - 08b1 QuickCam Notebook Pro - 08b2 QuickCam Pro 4000 - 08b3 QuickCam Zoom - 08b4 QuickCam Zoom - 08b5 QuickCam Sphere - 08b9 QuickCam IM - 08bd Microphone (Pro 4000) - 08c0 QuickCam Pro 3000 - 08c1 QuickCam Fusion - 08c2 QuickCam PTZ - 08c3 Camera (Notebooks Pro) - 08c5 QuickCam Pro 5000 - 08c6 QuickCam for DELL Notebooks - 08c7 QuickCam OEM Cisco VT Camera II - 08c9 QuickCam Ultra Vision - 08ca Mic (Fusion) - 08cb Mic (Notebooks Pro) - 08cc Mic (PTZ) - 08ce QuickCam Pro 5000 - 08cf QuickCam UpdateMe - 08d0 QuickCam Express - 08d7 QuickCam Communicate STX - 08d8 QuickCam for Notebook Deluxe - 08d9 QuickCam IM/Connect - 08da QuickCam Messanger - 08dd QuickCam for Notebooks - 08e0 QuickCam Express - 08e1 Labtec Webcam - 08f0 QuickCam Messenger - 08f1 QuickCam Express - 08f2 Microphone (Messenger) - 08f3 QuickCam Express - 08f4 Labtec Webcam - 08f5 QuickCam Messenger Communicate - 08f6 QuickCam Messenger Plus - 0900 ClickSmart 310 - 0901 ClickSmart 510 - 0903 ClickSmart 820 - 0905 ClickSmart 820 - 0910 QuickCam Cordless - 0920 QuickCam Express - 0921 Labtec Webcam - 0922 QuickCam Live - 0928 QuickCam Express - 0929 Labtec Webcam Pro - 092a QuickCam for Notebooks - 092b Labtec Webcam Plus - 092c QuickCam Chat - 092d QuickCam Express / Go - 092e QuickCam Chat - 092f QuickCam Express Plus - 0950 Pocket Camera - 0960 ClickSmart 420 - 0970 Pocket750 - 0990 QuickCam Pro 9000 - 0991 QuickCam Pro for Notebooks - 0992 QuickCam Communicate Deluxe - 0994 QuickCam Orbit/Sphere AF - 09a1 QuickCam Communicate MP/S5500 - 09a2 QuickCam Communicate Deluxe/S7500 - 09a4 QuickCam E 3500 - 09a5 Quickcam 3000 For Business - 09a6 QuickCam Vision Pro - 09b0 Acer OrbiCam - 09b2 Fujitsu Webcam - 09c0 QuickCam for Dell Notebooks Mic - 09c1 QuickCam Deluxe for Notebooks - 0a01 USB Headset - 0a02 Premium Stereo USB Headset 350 - 0a03 Logitech USB Microphone - 0a04 V20 portable speakers (USB powered) - 0a07 Z-10 Speakers - 0a0b ClearChat Pro USB - 0a0c Clear Chat Comfort USB Headset - 0a13 Z-5 Speakers - 0a17 G330 Headset - 0b02 BT Mini-Receiver (HID proxy mode) - 8801 Video Camera - b305 BT Mini-Receiver - bfe4 Premium Optical Wheel Mouse - c000 N43 [Pilot Mouse] - c001 N48/M-BB48 [FirstMouse Plus] - c002 M-BA47 [MouseMan Plus] - c003 MouseMan - c004 WingMan Gaming Mouse - c005 WingMan Gaming Wheel Mouse - c00b MouseMan Wheel - c00c Optical Wheel Mouse - c00d MouseMan Wheel+ - c00e M-BJ58/M-BJ69 Optical Wheel Mouse - c00f MouseMan Traveler/Mobile - c011 Optical MouseMan - c012 Mouseman Dual Optical - c014 Corded Workstation Mouse - c015 Corded Workstation Mouse - c016 Optical Wheel Mouse - c018 Optical Wheel Mouse - c019 Optical Tilt Wheel Mouse - c01a M-BQ85 Optical Wheel Mouse - c01b MX310 Optical Mouse - c01c Optical Mouse - c01d MX510 Optical Mouse - c01e MX518 Optical Mouse - c024 MX300 Optical Mouse - c025 MX500 Optical Mouse - c030 iFeel Mouse - c031 iFeel Mouse+ - c032 MouseMan iFeel - c033 iFeel MouseMan+ - c034 MouseMan Optical - c035 Mouse - c036 Mouse - c037 Mouse - c038 Mouse - c03d M-BT96a Pilot Optical Mouse - c03e Premium Optical Wheel Mouse (M-BT58) - c03f M-BT85 [UltraX Optical Mouse] - c040 Corded Tilt-Wheel Mouse - c041 G5 Laser Mouse - c042 G3 Laser Mouse - c043 MX320/MX400 Laser Mouse - c044 LX3 Optical Mouse - c045 Optical Mouse - c046 RX1000 Laser Mouse - c047 Laser Mouse - c048 G9 Laser Mouse - c049 G5 Laser Mouse - c050 RX 250 Optical Mouse - c051 G3 (MX518) Optical Mouse - c053 Laser Mouse - c058 M115 Mouse - c05a Optical Mouse M90 - c05d Optical Mouse - c061 RX1500 Laser Mouse - c062 LS1 Laser Mouse, corded - c063 DELL Laser Mouse - c068 G500 Laser Mouse - c101 UltraX Media Remote - c110 Harmony 885 Remote - c11f Harmony 900 Remote - c122 Harmony 700 Remote - c201 WingMan Extreme Joystick with Throttle - c202 WingMan Formula - c207 WingMan Extreme Digital 3D - c208 WingMan Gamepad Extreme - c209 WingMan Gamepad - c20a WingMan RumblePad - c20b WingMan Action Pad - c20c WingMan Precision - c20d WingMan Attack 2 - c20e WingMan Formula GP - c211 iTouch Cordless Reciever - c212 WingMan Extreme Digital 3D - c213 J-UH16 (Freedom 2.4 Cordless Joystick) - c214 ATK3 (Attack III Joystick) - c215 Extreme 3D Pro - c216 Dual Action Gamepad - c218 Logitech RumblePad 2 USB - c219 Cordless RumblePad 2 - c21a Precision Gamepad - c21c G13 Advanced Gameboard - c21d F310 Gamepad [XInput Mode] - c21f F710 Wireless Gamepad [XInput Mode] - c221 G11/G15 Keyboard / Keyboard - c222 G15 Keyboard / LCD - c223 G11/G15 Keyboard / USB Hub - c225 G11/G15 Keyboard / G keys - c226 G15 Refresh Keyboard - c227 G15 Refresh Keyboard - c22d G510 Gaming Keyboard - c22e G510 Gaming Keyboard onboard audio - c281 WingMan Force - c283 WingMan Force 3D - c285 WingMan Strike Force 3D - c286 Force 3D Pro - c287 Flight System G940 - c291 WingMan Formula Force - c293 WingMan Formula Force GP - c294 Driving Force - c295 Momo Force Steering Wheel - c298 Driving Force Pro - c299 G25 Racing Wheel - c29b G27 Racing Wheel - c29c Speed Force Wireless Wheel for Wii - c2a0 Wingman Force Feedback Mouse - c2a1 WingMan Force Feedback Mouse - c301 iTouch Keyboard - c302 iTouch Pro Keyboard - c303 iTouch Keyboard - c305 Internet Keyboard - c307 Internet Keyboard - c308 Internet Navigator Keyboard - c309 Internet Keyboard - c30a iTouch Composite - c30b NetPlay Keyboard - c30c Internet Keys (X) - c30d Internet Keys - c30e UltraX Keyboard (Y-BL49) - c30f Logicool HID-Compliant Keyboard (106 key) - c311 Y-UF49 [Internet Pro Keyboard] - c312 DeLuxe 250 Keyboard - c313 Internet 350 Keyboard - c315 Classic New Touch Keyboard - c316 HID-Compliant Keyboard - c317 Wave Corded Keyboard - c318 Illuminated Keyboard - c31a Comfort Wave 450 - c31b Compact Keyboard K300 - c31c Keyboard K120 for Business - c401 TrackMan Marble Wheel - c402 Marble Mouse (2-button) - c403 Turbo TrackMan Marble FX - c404 TrackMan Wheel - c408 Marble Mouse (4-button) - c501 Cordless Mouse Receiver - c502 Cordless Mouse & iTouch Keys - c503 Cordless Mouse+Keyboard Receiver - c504 Cordless Mouse+Keyboard Receiver - c505 Cordless Mouse+Keyboard Receiver - c506 MX700 Cordless Mouse Receiver - c508 Cordless Trackball - c509 Cordless Keyboard & Mouse - c50a Cordless Mouse - c50b Cordless Desktop Optical - c50c Cordless Desktop S510 - c50d Cordless Mouse - c50e Cordless Mouse Receiver - c510 Cordless Mouse - c512 LX-700 Cordless Desktop Receiver - c513 MX3000 Cordless Desktop Receiver - c514 Cordless Mouse - c515 Cordless 2.4 GHz Presenter Presentation remote control - c517 LX710 Cordless Desktop Laser - c518 MX610 Laser Cordless Mouse - c51a MX Revolution/G7 Cordless Mouse - c51b V220 Cordless Optical Mouse for Notebooks - c521 Cordless Mouse Receiver - c525 MX Revolution Cordless Mouse - c526 Nano Receiver - c529 diNovo Keyboard for notebooks - c52b Unifying Receiver - c52f Wireless Mouse M305 - c623 3Dconnexion Space Traveller 3D Mouse - c625 3Dconnexion Space Pilot 3D Mouse - c626 3Dconnexion Space Navigator 3D Mouse - c627 3Dconnexion Space Explorer 3D Mouse - c702 Cordless Presenter - c703 Elite Keyboard Y-RP20 + Mouse MX900 (Bluetooth) - c704 diNovo Wireless Desktop - c705 MX900 Bluetooth Wireless Hub (C-UJ16A) - c707 Bluetooth wireless hub - c708 Bluetooth wireless hub - c709 BT Mini-Receiver (HCI mode) - c70a MX5000 Cordless Desktop - c70b BT Mini-Receiver (HID proxy mode) - c70c BT Mini-Receiver (HID proxy mode) - c70d Bluetooth wireless hub - c70e MX1000 Bluetooth Laser Mouse - c70f Bluetooth wireless hub - c712 Bluetooth wireless hub - c714 diNovo Edge Keyboard - c715 Bluetooth wireless hub - c71a Bluetooth wireless hub - c71d Bluetooth wireless hub - c71f diNovo Mini Wireless Keyboard - c720 Bluetooth wireless hub - ca03 MOMO Racing - ca04 Formula Vibration Feedback Wheel - cab1 Cordless Keyboard for Wii HID Receiver - d001 QuickCam Pro -046e Behavior Tech. Computer Corp. - 0100 Keyboard - 3001 Mass Storage Device - 3002 Mass Storage Device - 3003 Mass Storage Device - 3005 Mass Storage Device - 3008 Mass Storage Device - 5250 KeyMaestro Multimedia Keyboard - 5273 KeyMaestro Multimedia Keyboard - 52e6 Cordless Mouse - 5308 KeyMaestro Keyboard - 5408 KeyMaestro Multimedia Keyboard/Hub - 5500 Portable Keyboard 86+9 keys (Model 6100C US) - 5720 Smart Card Reader - 6782 BTC 7932 mouse+keyboard -046f Crystal Semiconductor -0471 Philips (or NXP) - 0101 DSS350 Digital Speaker System - 0104 DSS330 Digital Speaker System [uda1321] - 0105 UDA1321 - 014f GoGear SA9200 - 0160 MP3 Player - 0161 MP3 Player - 0163 GoGear SA1100 - 0164 GoGear SA1110/02 - 0165 GoGear SA1330 - 0201 Hub - 0222 Creative Nomad Jukebox - 0302 PCA645VC Webcam [pwc] - 0303 PCA646VC Webcam [pwc] - 0304 Askey VC010 Webcam [pwc] - 0307 PCVC675K Webcam [pwc] - 0308 PCVC680K Webcam [pwc] - 030b PC VGA Camera (Vesta Fun) - 030c PCVC690K Webcam [pwc] - 0310 PCVC730K Webcam [pwc] - 0311 PCVC740K ToUcam Pro [pwc] - 0312 PCVC750K Webcam [pwc] - 0314 DMVC 1000K - 0316 DMVC 2000K Video Capture - 0321 FunCam - 0322 DMVC1300K PC Camera - 0325 SPC 200NC PC Camera - 0326 SPC 300NC PC Camera - 0327 Webcam SPC 6000 NC (Webcam w/ mic) - 0328 SPC 700NC PC Camera - 0329 SPC 900NC PC Camera / ORITE CCD Webcam(PC370R) - 032d SPC 210NC PC Camera - 032e SPC 315NC PC Camera - 0330 SPC 710NC PC Camera - 0331 SPC 1300NC PC Camera - 0332 SPC 1000NC PC Camera - 0333 SPC 620NC PC Camera - 0334 SPC 520/525NC PC Camera - 0401 Semiconductors CICT Keyboard - 0402 PS/2 Mouse on Semiconductors CICT Keyboard - 0406 15 inch Detachable Monitor - 0407 10 inch Mobile Monitor - 0408 SG3WA1/74 802.11b WLAN Adapter [Atmel AT76C503A] - 0471 Digital Speaker System - 0601 OVU1020 IR Dongle (Kbd+Mouse) - 0602 ATI Remote Wonder II Input Device - 0603 ATI Remote Wonder II Controller - 0608 eHome Infrared Receiver - 060a TSU9600 Remote Control - 060c Consumer Infrared Transceiver (HP) - 060d Consumer Infrared Transceiver (SRM5100) - 060e RF Dongle - 060f Consumer Infrared Transceiver - 0613 Infrared Transceiver - 0617 IEEE802.15.4 RF Dongle - 0619 TSU9400 Remote Control - 0666 Hantek DDS-3005 Arbitrary Waveform Generator - 0700 Semiconductors CICT Hub - 0701 150P1 TFT Display - 0809 AVNET Bluetooth Device - 0811 JR24 CDRW - 0814 DCCX38/P data cable - 0815 eHome Infrared Receiver - 0844 SA2111/02 1GB Flash Audio Player - 084a GoGear SA3125 - 084e GoGear SA60xx (mtp) - 0888 Hantek DDS-3005 Arbitrary Waveform Generator - 1103 Digital Speaker System - 1120 Creative Rhomba MP3 player - 1125 Nike psa[128max Player - 1137 HDD065 MP3 player - 1201 Arima Bluetooth Device - 1230 Wireless Adapter 11g - 1232 SNU6500 Wireless Adapter - 1233 Wireless Adapter Bootloader Download - 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 - 200f 802.11n Wireless Adapter - 2021 SDE3273FC/97 2.5" SATA HDD Enclosure [INIC-1608L] - 2022 GoGear SA52XX - 2034 Webcam SPC530NC - 2036 Webcam SPC1030NC - 203f TSU9200 Remote Control - 2046 TSU9800 Remote Control - 204e GoGear RaGa (SA1942/02) - 205e TSU9300 Remote Control - 2070 GoGear Mix - 2076 GoGear Aria - 2079 GoGear Opus - 2088 MCE IR Receiver with ALS- Spinel plus for ASUS - 262c SPC230NC Webcam - 485d Senselock SenseIV v2.x - df55 LPCXpresso LPC-Link -0472 Chicony Electronics Co., Ltd - 0065 PFU-65 Keyboard [Chicony] - b086 Asus USB2.0 Webcam - b091 Webcam -0473 Sanyo Information Business Co., Ltd -0474 Sanyo Electric Co., Ltd - 0110 Digital Voice Recorder R200 - 0217 Xacti J2 - 022f C5 Digital Media Camera (mass storage mode) - 0230 C5 Digital Media Camera (PictBridge mode) - 0231 C5 Digital Media Camera (PC control mode) - 0401 Optical Drive - 0701 SCP-4900 Cellphone - 071f Usb Com Port Enumerator - 0722 W33SA Camera -0475 Relisys/Teco Information System - 0100 NEC Petiscan - 0103 Eclipse 1200U/Episode - 0210 Scorpio Ultra 3 -0476 AESP -0477 Seagate Technology, Inc. -0478 Connectix Corp. - 0001 QuickCam - 0002 QuickClip - 0003 QuickCam Pro -0479 Advanced Peripheral Laboratories -047a Semtech Corp. - 0004 ScreenCoder UR7HCTS2-USB -047b Silitek Corp. - 0001 Keyboard - 0002 Keyboard and Mouse - 0011 SK-1688U Keyboard - 00f9 SK-1789u Keyboard - 0101 BlueTooth Keyboard and Mouse - 020b SK-3105 SmartCard Reader - 050e Internet Compact Keyboard - 1000 Trust Office Scan USB 19200 - 1002 HP ScanJet 4300c Parallel Port -047c Dell Computer Corp. -047d Kensington - 1001 Mouse*in*a*Box - 1002 Expert Mouse Pro - 1003 Orbit TrackBall - 1004 MouseWorks - 1005 TurboBall - 1006 TurboRing - 1009 Orbit TrackBall for Mac - 1012 PocketMouse - 1013 Mouse*in*a*Box Optical Pro - 1014 Expert Mouse Pro Wireless - 1015 Expert Mouse - 1016 ADB/USB Orbit - 1018 Studio Mouse - 101d Mouse*in*a*Box Optical Pro - 101e Studio Mouse Wireless - 101f PocketMouse Pro - 1020 Expert Mouse Trackball - 1021 Expert Mouse Wireless - 1022 Orbit Optical - 1023 Pocket Mouse Pro Wireless - 1024 PocketMouse - 1025 Mouse*in*a*Box Optical Elite Wireless - 1026 Pocket Mouse Pro - 1027 StudioMouse - 1028 StudioMouse Wireless - 1029 Mouse*in*a*Box Optical Elite - 102a Mouse*in*a*Box Optical - 102b PocketMouse - 102c Iridio - 102d Pilot Optical - 102e Pilot Optical Pro - 102f Pilot Optical Pro Wireless - 1043 Ci65m Wireless Notebook Optical Mouse - 104a PilotMouse Mini Retractable - 105d PocketMouse Bluetooth - 105e Bluetooth EDR Dongle - 1061 PocketMouse Grip - 1062 PocketMouse Max - 1063 PocketMouse Max Wireless - 1064 PocketMouse 2.0 Wireless - 1065 PocketMouse 2.0 - 1066 PocketMouse Max Glow - 1067 ValueMouse - 1068 ValueOpt White - 1069 ValueOpt Black - 106a PilotMouse Laser Wireless Mini - 106b PilotMouse Laser - 3 Button - 106c PilotMouse Laser - Gaming - 106d PilotMouse Laser - Wired - 106e PilotMouse Micro Laser - 1070 ValueOpt Travel - 1071 ValueOpt RF TX - 1072 PocketMouse Colour - 1073 PilotMouse Laser - 6 Button - 1074 PilotMouse Laser Wireless Mini - 1075 SlimBlade Presenter Media Mouse - 1076 SlimBlade Media Mouse - 1077 SlimBlade Presenter Mouse - 1152 Bluetooth EDR Dongle - 2002 Optical Elite Wireless - 2010 Wireless Presentation Remote - 2012 Wireless Presenter with Laser Pointer - 2021 PilotBoard Wireless - 2030 PilotBoard Wireless - 2034 SlimBlade Media Notebook Set - 2041 SlimBlade Trackball - 4003 Gravis Xterminator Digital Gamepad - 4005 Gravis Eliminator GamePad Pro - 4006 Gravis Eliminator AfterShock - 4007 Gravis Xterminator Force - 4008 Gravis Destroyer TiltPad - 5001 Cabo I Camera - 5002 VideoCam CABO II - 5003 VideoCam -047e Agere Systems, Inc. (Lucent) - 0300 ORiNOCO Card - 1001 USS720 Parallel Port - 2892 Systems Soft Modem - bad1 Lucent 56k Modem - f101 Atlas Modem -047f Plantronics, Inc. - 0101 Bulk Driver - 0301 Bulk Driver - 0ca1 USB DSP v4 Audio Interface - 4254 BUA-100 Bluetooth Adapter -0480 Toshiba America Info. Systems, Inc. - 0001 InTouch Module - 0004 InTouch Module - 0011 InTouch Module - 0014 InTouch Module -0481 Zenith Data Systems -0482 Kyocera Corp. - 000e FS-1020D Printer - 0100 Finecam S3x - 0101 Finecam S4 - 0103 Finecam S5 - 0105 Finecam L3 - 0106 Finecam - 0107 Digital Camera Device - 0108 Digital Camera Device - 0203 AH-K3001V - 0204 iBurst Terminal -0483 SGS Thomson Microelectronics - 0137 BeWAN ADSL USB ST (blue or green) - 0138 Unicorn II (ST70138B + MTC-20174TQ chipset) - 1307 Cytronix 6in1 Card Reader - 163d Cool Icam Digi-MP3 - 2015 TouchChip® Fingerprint Reader - 2016 Fingerprint Reader - 2017 Biometric Smart Card Reader - 2018 BioSimKey - 2302 Portable Flash Device (PFD) - 3744 STLINK Pseudo disk - 3748 ST-LINK/V2 - 4810 ISDN adapter - 481d BT Digital Access adapter - 5000 ST Micro/Ergenic ERG BT-002 Bluetooth Adapter - 5001 ST Micro Bluetooth Device - 5721 Hantek DDS-3X25 Arbitrary Waveform Generator - 7270 ST Micro Serial Bridge - 7554 56k SoftModem - df11 STM Device in DFU Mode - ff10 Swann ST56 Modem -0484 Specialix -0485 Nokia Monitors -0486 ASUS Computers, Inc. - 0185 EeePC T91MT HID Touch Panel -0487 Stewart Connector -0488 Cirque Corp. -0489 Foxconn / Hon Hai - 0502 SmartMedia Card Reader Firmware Loader - 0503 SmartMedia Card Reader - d00c Rollei Compactline (Storage Mode) - d00e Rollei Compactline (Video Mode) - e000 T-Com TC 300 - e003 Pirelli DP-L10 - e00f Foxconn T77H114 BCM2070 [Single-Chip Bluetooth 2.1 + EDR Adapter] - e016 Ubee PXU1900 WiMAX Adapter [Beceem BCSM250] - e02c Atheros AR5BBU12 Bluetooth Device -048a S-MOS Systems, Inc. -048c Alps Electric Ireland, Ltd -048d Integrated Technology Express, Inc. - 9009 Zolid HD DVD Maker - 9135 Zolid Mini DVB-T Stick -048f Eicon Tech. -0490 United Microelectronics Corp. -0491 Capetronic - 0003 Taxan Monitor Control -0492 Samsung SemiConductor, Inc. - 0140 MP3 player - 0141 MP3 Player -0493 MAG Technology Co., Ltd -0495 ESS Technology, Inc. -0496 Micron Electronics -0497 Smile International - c001 Camera Device -0498 Capetronic (Kaohsiung) Corp. -0499 Yamaha Corp. - 1000 UX256 MIDI I/F - 1001 MU1000 - 1002 MU2000 - 1003 MU500 - 1004 UW500 - 1005 MOTIF6 - 1006 MOTIF7 - 1007 MOTIF8 - 1008 UX96 MIDI I/F - 1009 UX16 MIDI I/F - 100a EOS BX - 100c UC-MX - 100d UC-KX - 100e S08 - 100f CLP-150 - 1010 CLP-170 - 1011 P-250 - 1012 TYROS - 1013 PF-500 - 1014 S90 - 1015 MOTIF-R - 1016 MDP-5 - 1017 CVP-204 - 1018 CVP-206 - 1019 CVP-208 - 101a CVP-210 - 101b PSR-1100 - 101c PSR-2100 - 101d CLP-175 - 101e PSR-K1 - 101f EZ-J24 - 1020 EZ-250i - 1021 MOTIF ES 6 - 1022 MOTIF ES 7 - 1023 MOTIF ES 8 - 1024 CVP-301 - 1025 CVP-303 - 1026 CVP-305 - 1027 CVP-307 - 1028 CVP-309 - 1029 CVP-309GP - 102a PSR-1500 - 102b PSR-3000 - 102e ELS-01/01C - 1030 PSR-295/293 - 1031 DGX-205/203 - 1032 DGX-305 - 1033 DGX-505 - 1037 PSR-E403 - 103c MOTIF-RACK ES - 1054 S90XS Keyboard/Music Synthesizer - 2000 DGP-7 - 2001 DGP-5 - 3001 YST-MS55D USB Speaker - 3003 YST-M45D USB Speaker - 4000 NetVolante RTA54i Broadband&ISDN Router - 4001 NetVolante RTW65b Broadband Wireless Router - 4002 NetVolante RTW65i Broadband&ISDN Wireless Router - 4004 NetVolante RTA55i Broadband VoIP Router - 5000 CS1D - 5001 DSP1D - 5002 DME32 - 5003 DM2000 - 5004 02R96 - 5005 ACU16-C - 5006 NHB32-C - 5007 DM1000 - 5008 01V96 - 5009 SPX2000 - 500a PM5D - 500b DME64N - 500c DME24N - 6001 CRW2200UX Lightspeed 2 External CD-RW Drive - 7000 DTX - 7010 UB99 -049a Gandalf Technologies, Ltd -049b Curtis Computer Products -049c Acer Advanced Labs, Inc. - 0002 Keyboard (???) -049d VLSI Technology -049f Compaq Computer Corp. - 0002 InkJet Color Printer - 0003 iPAQ PocketPC - 000e Internet Keyboard - 0012 InkJet Color Printer - 0018 PA-1/PA-2 MP3 Player - 0019 InkJet Color Printer - 001a S4 100 Scanner - 001e IJ650 Inkjet Printer - 001f WL215 Adapter - 0021 S200 Scanner - 0027 Bluetooth Multiport Module by Compaq - 002a 1400P Inkjet Printer - 002b A3000 - 002c Lexmark X125 - 0032 802.11b Adapter [ipaq h5400] - 0033 Wireless LAN MultiPort W100 [Intersil PRISM 2.5] - 0036 Bluetooth Multiport Module - 0051 KU-0133 Easy Access Interner Keyboard - 0076 Wireless LAN MultiPort W200 - 0080 GPRS Multiport - 0086 Bluetooth Device - 504a Personal Jukebox PJB100 - 505a Linux-USB "CDC Subset" Device, or Itsy (experimental) - 8511 iPAQ Networking 10/100 Ethernet [pegasus2] -04a0 Digital Equipment Corp. -04a1 SystemSoft Corp. - fff0 Telex Composite Device -04a2 FirePower Systems -04a3 Trident Microsystems, Inc. -04a4 Hitachi, Ltd - 0004 DVD-CAM DZ-MV100A Camcorder - 001e DVDCAM USB HS Interface -04a5 Acer Peripherals Inc. (now BenQ Corp.) - 0001 Keyboard - 0002 API Ergo K/B - 0003 API Generic K/B Mouse - 12a6 AcerScan C310U - 1a20 Prisa 310U - 1a2a Prisa 620U - 2022 Prisa 320U/340U - 2040 Prisa 620UT - 205e ScanPrisa 640BU - 2060 Prisa 620U+/640U - 207e Prisa 640BU - 209e ScanPrisa 640BT - 20ae S2W 3000U - 20b0 S2W 3300U/4300U - 20be Prisa 640BT - 20c0 Prisa 1240UT - 20de S2W 4300U+ - 20f8 Benq 5000 - 20fc Benq 5000 - 20fe SW2 5300U - 2137 Benq 5150/5250 - 2202 Benq 7400UT - 2311 Benq 5560 - 3003 Benq Webcam - 3008 Benq 1500 - 300a Benq 3410 - 300c Benq 1016 - 3019 Benq DC C40 - 4000 P30 Composite Device - 4013 BenQ-Siemens EF82/SL91 - 4044 BenQ-Siemens SF71 - 4045 BenQ-Siemens E81 - 4048 BenQ M7 - 6001 Mass Storage Device - 6002 Mass Storage Device - 6003 ATA/ATAPI Adapter - 6004 Mass Storage Device - 6005 Mass Storage Device - 6006 Mass Storage Device - 6007 Mass Storage Device - 6008 Mass Storage Device - 6009 Mass Storage Device - 600a Mass Storage Device - 600b Mass Storage Device - 600c Mass Storage Device - 600d Mass Storage Device - 600e Mass Storage Device - 600f Mass Storage Device - 6010 Mass Storage Device - 6011 Mass Storage Device - 6012 Mass Storage Device - 6013 Mass Storage Device - 6014 Mass Storage Device - 6015 Mass Storage Device - 6125 MP3 Player - 6180 MP3 Player - 6200 MP3 Player - 7500 Hi-Speed Mass Storage Device - 9000 AWL300 Wireless Adapter - 9001 AWL400 Wireless Adapter - 9213 Kbd Hub -04a6 Nokia Display Products - 00b9 Audio - 0180 Hub Type P - 0181 HID Monitor Controls -04a7 Visioneer - 0100 StrobePro - 0101 Strobe Pro Scanner (1.01) - 0102 StrobePro Scanner - 0211 OneTouch 7600 Scanner - 0221 OneTouch 5300 Scanner - 0223 OneTouch 8200 - 0224 OneTouch 4800 USB/Microtek Scanport 3000 - 0225 VistaScan Astra 3600(ENG) - 0226 OneTouch 5300 USB - 0229 OneTouch 7100 - 022a OneTouch 6600 - 022c OneTouch 9000/9020 - 0231 6100 Scanner - 0311 6200 EPP/USB Scanner - 0321 OneTouch 8100 EPP/USB Scanner - 0331 OneTouch 8600 EPP/USB Scanner - 0341 6400 - 0361 VistaScan Astra 3600(ENG) - 0362 OneTouch 9320 - 0371 OneTouch 8700/8920 - 0380 OneTouch 7700 - 0382 Photo Port 7700 - 0390 9650 - 03a0 Xerox 4800 One Touch - 0410 OneTouch Pro 8800/8820 - 0421 9450 USB - 0423 9750 Scanner - 0424 Strobe XP 450 - 0425 Strobe XP 100 - 0426 Strobe XP 200 - 0427 Strobe XP 100 - 0444 OneTouch 7300 - 0445 CardReader 100 - 0446 Xerox DocuMate 510 - 0447 XEROX DocuMate 520 - 0448 XEROX DocuMate 250 - 0449 Xerox DocuMate 252 - 044a Xerox 6400 - 044c Xerox DocuMate 262 - 0474 Strobe XP 300 - 0475 Xerox DocuMate 272 - 0478 Strobe XP 220 - 0479 Strobe XP 470 - 047a 9450 - 047b 9650 - 047d 9420 - 0480 9520 - 048f Strobe XP 470 - 0491 Strobe XP 450 - 0493 9750 - 0494 Strobe XP 120 - 0497 Patriot 430 - 0498 Patriot 680 - 0499 Patriot 780 - 049b Strobe XP 100 - 04a0 7400 - 04ac Xerox Travel Scanner 100 -04a8 Multivideo Labs, Inc. - 0101 Hub - 0303 Peripheral Switch - 0404 Peripheral Switch -04a9 Canon, Inc. - 1005 BJ Printer Hub - 1035 PD Printer Storage - 1050 BJC-8200 - 1051 BJC-3000 Color Printer - 1052 BJC-6100 - 1053 BJC-6200 - 1054 BJC-6500 - 1055 BJC-85 - 1056 BJC-2110 Color Printer - 1057 LR1 - 105a BJC-55 - 105b S600 Printer - 105c S400 - 105d S450 Printer - 105e S800 - 1062 S500 Printer - 1063 S4500 - 1064 S300 Printer - 1065 S100 - 1066 S630 - 1067 S900 - 1068 S9000 - 1069 S820 - 106a S200 Printer - 106b S520 Printer - 106d S750 Printer - 106e S820D - 1070 S530D - 1072 I850 Printer - 1073 I550 Printer - 1074 S330 Printer - 1076 i70 - 1077 i950 - 107a S830D - 107b i320 - 107c i470D - 107d i9100 - 107e i450 - 107f i860 - 1082 i350 - 1084 i250 - 1085 i255 - 1086 i560 - 1088 i965 - 108a i455 - 108b i900D - 108c i475D - 108d PIXMA iP2000 - 108f i80 - 1090 i9900 Photo Printer - 1091 PIXMA iP1500 - 1093 PIXMA iP4000 - 1094 PIXMA iP3000x Printer - 1095 PIXMA iP6000D - 1097 PIXMA iP5000 - 1098 PIXMA iP1000 - 1099 PIXMA iP8500 - 109c PIXMA iP4000R - 109d iP90 - 10a0 PIXMA iP1600 Printer - 10a2 iP4200 - 10a4 iP5200R - 10a5 iP5200 - 10a7 iP6210D - 10a8 iP6220D - 10a9 iP6600D - 10b6 PIXMA iP4300 Printer - 10c2 PIXMA iP1800 Printer - 10c4 Pixma iP4500 Printer - 1404 W6400PG - 1405 W8400PG - 150f BIJ2350 PCL - 1510 BIJ1350 PCL - 1512 BIJ1350D PCL - 1601 DR-2080C Scanner - 1607 DR-6080 Scanner - 1700 PIXMA MP110 Scanner - 1701 PIXMA MP130 Scanner - 1702 MP410 Composite - 1703 MP430 Composite - 1704 MP330 Composite - 1706 PIXMA MP750 Scanner - 1707 PIXMA MP780 Scanner - 1708 PIXMA MP760 Scanner - 1709 PIXMA MP150 Scanner - 170a PIXMA MP170 Scanner - 170b PIXMA MP450 Scanner - 170c PIXMA MP500 Scanner - 170d PIXMA MP800 Scanner - 170e MP800R - 1710 MP950 - 1712 MP530 - 1713 PIXMA MP830 Scanner - 1714 MP160 - 1715 MP180 Storage - 1716 MP460 Composite - 1717 MP510 - 1718 MP600 Storage - 171a MP810 Storage - 171b MP960 - 1721 MP210 ser - 1723 MP470 ser - 1725 MP610 ser - 1726 MP970 ser - 1727 MX300 ser - 1728 MX310 ser - 1729 MX700 ser - 172b MP140 ser - 173e MP560 - 173f Pixma MP640 Multifunction device - 1748 Pixma MG5150 - 1900 CanoScan LiDE 90 - 1901 CanoScan 8800F - 1904 CanoScan LiDE 100 - 1905 CanoScan LiDE 200 - 1906 CanoScan 5600F - 1907 CanoScan LiDE 700F - 1909 CanoScan LiDE 110 - 190a CanoScan LiDE 210 - 2200 CanoScan LiDE 25 - 2201 CanoScan FB320U - 2202 CanoScan FB620U - 2204 CanoScan FB630U - 2205 CanoScan FB1210U - 2206 CanoScan N650U/N656U - 2207 CanoScan 1220U - 2208 CanoScan D660U - 220a CanoScan D2400UF - 220b CanoScan D646U - 220c CanoScan D1250U2 - 220d CanoScan N670U/N676U/LiDE 20 - 220e CanoScan N1240U/LiDE 30 - 220f CanoScan 8000F - 2210 CanoScan 9900F - 2212 CanoScan 5000F - 2213 CanoScan LiDE 50/LiDE 35/LiDE 40 - 2214 CanoScan LiDE 80 - 2215 CanoScan 3000/3000F/3000ex - 2216 CanoScan 3200F - 2217 CanoScan 5200F - 2219 CanoScan 9950F - 221b CanoScan 4200F - 221c CanoScan LiDE 60 - 221e CanoScan 8400F - 221f CanoScan LiDE 500F - 2220 CanoScan LIDE 25 - 2224 CanoScan LiDE 600F - 2225 CanoScan LiDE 70 - 2228 CanoScan 4400F - 2602 MultiPASS C555 - 2603 MultiPASS C755 - 260a CAPT Printer - 260e LBP-2000 - 2610 MPC600F - 2611 SmartBase MPC400 - 2612 MultiPASS C855 - 2617 CAPT Printer - 261a iR1600 - 261b iR1610 - 261c iC2300 - 261f MPC200 Printer - 2621 iR2000 - 2622 iR2010 - 2623 FAX-B180C - 2629 FAXPHONE L75 - 262b LaserShot LBP-1120 Printer - 262d iR C3200 - 262f MultiPASS MP730 - 2630 MultiPASS MP700 - 2631 LASER CLASS 700 - 2632 FAX-L2000 - 2635 MPC190 - 2637 iR C6800 - 2638 iR C3100 - 263c Smartbase MP360 - 263d MP370 - 263e MP390 FAX - 263f MP375 - 2646 MF5530 Scanner Device V1.9.1 - 2647 MF5550 Composite - 264d PIXMA MP710 - 264e MF5630 - 264f MF5650 (FAX) - 2650 iR 6800C EUR - 2651 iR 3100C EUR - 2655 FP-L170/MF350/L380/L398 - 2659 MF8100 - 265b CAPT Printer - 265c iR C3220 - 265d MF5730 - 265e MF5750 - 265f MF5770 - 2660 MF3110 - 2663 iR3570/iR4570 - 2664 iR2270/iR2870 - 2665 iR C2620 - 2666 iR C5800 - 2667 iR85PLUS - 2669 iR105PLUS - 266a CAPT Device - 266b iR8070 - 266c iR9070 - 266d iR 5800C EUR - 266e CAPT Device - 266f iR2230 - 2670 iR3530 - 2671 iR5570/iR6570 - 2672 iR C3170 - 2673 iR 3170C EUR - 2674 L120 - 2675 iR2830 - 2676 CAPT Device - 2677 iR C2570 - 2678 iR 2570C EUR - 2679 CAPT Device - 267a iR2016 - 267b iR2020 - 267d MF7100 series - 2684 MF3200 series - 2686 MF6500 series - 2687 iR4530 - 2688 LBP3460 - 268c iR C6870 - 268d iR 6870C EUR - 268e iR C5870 - 268f iR 5870C EUR - 2691 iR7105 - 26a3 MF4100 series - 26b0 MF4600 series - 26b4 MF4010 series - 26b5 MF4200 series - 3041 PowerShot S10 - 3042 CanoScan FS4000US Film Scanner - 3043 PowerShot S20 - 3044 EOS D30 - 3045 PowerShot S100 - 3046 IXY Digital - 3047 Digital IXUS - 3048 PowerShot G1 - 3049 PowerShot Pro90 IS - 304a CP-10 - 304b IXY Digital 300 - 304c PowerShot S300 - 304d Digital IXUS 300 - 304e PowerShot A20 - 304f PowerShot A10 - 3050 PowerShot unknown 1 - 3051 PowerShot S110 - 3052 Digital IXUS V - 3055 PowerShot G2 - 3056 PowerShot S40 - 3057 PowerShot S30 - 3058 PowerShot A40 - 3059 PowerShot A30 - 305b ZR45MC Digital Camcorder - 305c PowerShot unknown 2 - 3060 EOS D60 - 3061 PowerShot A100 - 3062 PowerShot A200 - 3063 CP-100 - 3065 PowerShot S200 - 3066 Digital IXUS 330 - 3067 MV550i Digital Video Camera - 3069 PowerShot G3 - 306a Digital unknown 3 - 306b MVX2i Digital Video Camera - 306c PowerShot S45 - 306d PowerShot S45 PtP Mode - 306e PowerShot G3 (normal mode) - 306f PowerShot G3 (ptp) - 3070 PowerShot S230 - 3071 PowerShot S230 (ptp) - 3072 PowerShot SD100 / Digital IXUS II (ptp) - 3073 PowerShot A70 (ptp) - 3074 PowerShot A60 (ptp) - 3075 IXUS 400 Camera - 3076 PowerShot A300 - 3077 PowerShot S50 - 3078 ZR70MC Digital Camcorder - 307a MV650i (normal mode) - 307b MV630i Digital Video Camera - 307c MV630i (normal mode) - 307d CP-300 - 307f Optura 20 - 3080 MVX150i (normal mode) / Optura 20 (normal mode) - 3081 Optura 10 - 3082 MVX100i / Optura 10 - 3083 EOS 10D - 3084 EOS 300D / EOS Digital Rebel - 3085 PowerShot G5 - 3087 Elura 50 (PTP mode) - 3088 Elura 50 (normal mode) - 308d MVX3i - 308e FV M1 (normal mode) / MVX 3i (normal mode) / Optura Xi (normal mode) - 3093 Optura 300 - 3096 IXY DV M2 (normal mode) / MVX 10i (normal mode) - 3099 EOS 300D (ptp) - 309a PowerShot A80 - 309b Digital IXUS (ptp) - 309c PowerShot S1 IS - 309d Camera - 309f Camera - 30a0 Camera - 30a1 Camera - 30a2 Camera - 30a8 Elura 60E/Optura 40 (ptp) - 30a9 MVX25i (normal mode) / Optura 40 (normal mode) - 30b1 PowerShot S70 (normal mode) / PowerShot S70 (PTP mode) - 30b2 PowerShot S60 (normal mode) / PowerShot S60 (PTP mode) - 30b3 PowerShot G6 (normal mode) / PowerShot G6 (PTP mode) - 30b4 PowerShot S500 - 30b5 PowerShot A75 - 30b6 Digital IXUS II2 / Digital IXUS II2 (PTP mode) / PowerShot SD110 (PTP mode) / PowerShot SD110 Digital ELPH - 30b7 PowerShot A400 / PowerShot A400 (PTP mode) - 30b8 PowerShot A310 / PowerShot A310 (PTP mode) - 30b9 Powershot A85 - 30ba PowerShot S410 Digital Elph - 30bb PowerShot A95 - 30bd CP-220 - 30be CP-330 - 30bf Digital IXUS 40 - 30c0 Digital IXUS 30 (PTP mode) / PowerShot SD200 (PTP mode) - 30c1 Digital IXUS 50 (normal mode) / IXY Digital 55 (normal mode) / PowerShot A520 (PTP mode) / PowerShot SD400 (normal mode) - 30c2 PowerShot A510 (normal mode) / PowerShot A510 (PTP mode) - 30c4 Digital IXUS i5 (normal mode) / IXY Digital L2 (normal mode) / PowerShot SD20 (normal mode) - 30ea EOS 1D Mark II (PTP mode) - 30eb EOS 20D - 30ec EOS 20D (ptp) - 30ee EOS 350D - 30ef EOS 350D (ptp) - 30f0 PowerShot S2 IS (PTP mode) - 30f2 Digital IXUS 700 (normal mode) / Digital IXUS 700 (PTP mode) / IXY Digital 600 (normal mode) / PowerShot SD500 (normal mode) / PowerShot SD500 (PTP mode) - 30f6 SELPHY CP400 - 30f8 Powershot A430 - 30f9 PowerShot A410 (PTP mode) - 30fc PowerShot A620 (PTP mode) - 30fd PowerShot A610 (normal mode)/PowerShot A610 (PTP mode) - 30fe Digital IXUS 65 (PTP mode)/PowerShot SD630 (PTP mode) - 30ff Digital IXUS 55 (PTP mode)/PowerShot SD450 (PTP mode) - 310b SELPHY CP600 - 310e Digital IXUS 50 (PTP mode) - 3110 EOS Digital Rebel XTi - 3116 Digital IXUS 750 (PTP mode) - 3117 PowerShot A700 - 312d Elura 100 - 3138 PowerShot A710 IS - 3147 EOS 1Ds Mark III - 3155 PowerShot A450 - 315a PowerShot G9 - 315d PowerShot A720 - 3160 Digital IXUS 860 IS - 3175 IXY Digital 25 IS - 3176 PowerShot A590 - 317a Powershot A470 - 3184 Digital IXUS 80 IS (PTP mode) - 319a EOS 7D - 31bc PowerShot D10 - 31c0 PowerShot SX200 IS - 31e5 Digital IXUS 200 IS - 31ee SELPHY ES40 - 31f3 PowerShot Digital ELPH SD1400 IS - 31ff Digital IXUS 55 -04aa DaeWoo Telecom, Ltd -04ab Chromatic Research -04ac Micro Audiometrics Corp. -04ad Dooin Electronics - 2501 Bluetooth Device -04af Winnov L.P. -04b0 Nikon Corp. - 0102 Coolpix 990 - 0103 Coolpix 880 - 0104 Coolpix 995 - 0106 Coolpix 775 - 0107 Coolpix 5000 - 0108 Coolpix 2500 - 0109 Coolpix 2500 (ptp) - 010a Coolpix 4500 - 010b Coolpix 4500 (ptp) - 010d Coolpix 5700 (ptp) - 010e Coolpix 4300 (storage) - 010f Coolpix 4300 (ptp) - 0110 Coolpix 3500 (Sierra Mode) - 0111 Coolpix 3500 (ptp) - 0112 Coolpix 885 (ptp) - 0113 Coolpix 5000 (ptp) - 0114 Coolpix 3100 (storage) - 0115 Coolpix 3100 (ptp) - 0117 Coolpix 2100 (ptp) - 0119 Coolpix 5400 (ptp) - 011d Coolpix 3700 (ptp) - 0121 Coolpix 3200 (ptp) - 0122 Coolpix 2200 (ptp) - 0124 Coolpix 8400 (mass storage mode) - 0125 Coolpix 8400 (ptp) - 0126 Coolpix 8800 - 0129 Coolpix 4800 (ptp) - 012c Coolpix 4100 (storage) - 012d Coolpix 4100 (ptp) - 012e Coolpix 5600 (ptp) - 0130 Coolpix 4600 (ptp) - 0135 Coolpix 5900 (ptp) - 0136 Coolpix 7900 (storage) - 0137 Coolpix 7900 (ptp) - 013a Coolpix 100 (storage) - 013b Coolpix 100 (ptp) - 0141 Coolpix P2 (storage) - 0142 Coolpix P2 (ptp) - 0163 Coolpix P5100 (ptp) - 0169 Coolpix P50 (ptp) - 0202 Coolpix SQ (ptp) - 0203 Coolpix 4200 (mass storage mode) - 0204 Coolpix 4200 (ptp) - 0205 Coolpix 5200 (storage) - 0206 Coolpix 5200 (ptp) - 0301 Coolpix 2000 (storage) - 0302 Coolpix 2000 (ptp) - 0317 Coolpix L20 (ptp) - 0402 DSC D100 (ptp) - 0403 D2H (mass storage mode) - 0404 D2H SLR (ptp) - 0405 D70 (mass storage mode) - 0406 DSC D70 (ptp) - 0408 D2X SLR (ptp) - 0409 D50 digital camera - 040a D50 (ptp) - 040c D2Hs - 040e DSC D70s (ptp) - 040f D200 (mass storage mode) - 0410 D200 (ptp) - 0413 D40 (mass storage mode) - 0422 D700 (ptp) - 0425 D300S - 0f03 PD-10 Wireless Printer Adapter - 4000 Coolscan LS 40 ED - 4001 LS 50 ED/Coolscan V ED - 4002 Super Coolscan LS-5000 ED -04b1 Pan International -04b3 IBM Corp. - 3003 Rapid Access III Keyboard - 3004 Media Access Pro Keyboard - 300a Rapid Access IIIe Keyboard - 3016 UltraNav Keyboard Hub - 3018 UltraNav Keyboard - 301b SK-8815 Keyboard - 301c Enhanced Performance Keyboard - 3020 Enhanced Performance Keyboard - 3100 NetVista Mouse - 3103 ScrollPoint Pro Mouse - 3104 ScrollPoint Wireless Mouse - 3105 ScrollPoint Optical (HID) - 3107 ThinkPad 800dpi Optical Travel Mouse - 3108 800dpi Optical Mouse w/ Scroll Point - 3109 Optical ScrollPoint Pro Mouse - 310b Red Wheel Mouse - 310c Wheel Mouse - 4427 Portable CD ROM - 4482 Serial Converter - 4485 Serial Converter - 4525 Double sided CRT - 4550 NVRAM (128 KB) - 4554 Cash Drawer - 4580 Hub w/ NVRAM - 4581 4800-2xx Hub w/ Cash Drawer - 4604 Keyboard w/ Card Reader - 4671 4820 LCD w/ MSR/KB -04b4 Cypress Semiconductor Corp. - 0000 Dacal DC-101 CD Library - 0001 Mouse - 0002 CY7C63x0x Thermometer - 0033 Mouse - 0100 Cino FuzzyScan F760-B - 0101 Keyboard/Hub - 0102 Keyboard with APM - 0130 MyIRC Remote Receiver - 0306 Telephone Receiver - 0407 Optical Skype Mouse - 0bad MetaGeek Wi-Spy - 1002 CY7C63001 R100 FM Radio - 1006 Human Interface Device - 2050 hub - 2830 Opera1 DVB-S (cold state) - 4381 SCAPS USC-1 Scanner Controller - 4611 Storage Adapter FX2 (CY) - 4616 Flash Disk (TPP) - 5201 Combi Keyboard-Hub (Hub) - 5202 Combi Keyboard-Hub (Keyboard) - 5500 HID->COM RS232 Adapter - 6370 ViewMate Desktop Mouse CC2201 - 6560 CY7C65640 USB-2.0 "TetraHub" - 6830 CY7C68300A EZ-USB AT2 USB 2.0 to ATA/ATAPI - 6831 Storage Adapter ISD-300LP (CY) - 7417 Wireless PC Lock/Ultra Mouse - 8329 USB To keyboard/Mouse Converter - 8613 CY7C68013 EZ-USB FX2 USB 2.0 Development Kit - 8614 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 861f Anysee E30 USB 2.0 DVB-T Receiver - bca1 Barcode Reader - cc04 Centor USB RACIA-ALVAR USB PORT - cc06 Centor-P RACIA-ALVAR USB PORT - d5d5 CY7C63x0x Zoltrix Z-Boxer GamePad - de61 Barcode Reader - de64 Barcode Reader - f000 CY30700 Licorice evaluation board - f111 CY8CKIT-002 PSoC MiniProg3 Rev A Program and debug kit - f115 PSoC FirstTouch Programmer -04b5 ROHM LSI Systems USA, LLC - 3064 Hantek DSO-3064 -04b6 Hint Corp. -04b7 Compal Electronics, Inc. -04b8 Seiko Epson Corp. - 0001 Stylus Color 740 / Photo 750 - 0002 ISD Smart Cable for Mac - 0003 ISD Smart Cable - 0004 Printer - 0005 Printer - 0006 Printer - 0007 Printer - 0101 Perfection 636 - 0102 GT-2200 - 0103 Perfection 610 - 0104 Perfection 1200 - 0105 StylusScan 2000 - 0106 Stylus Scan 2500 - 0107 Expression 1600U - 0109 Expression 1640 XL - 010a Perfection 1640SU - 010b Perfection 1240 - 010c Perfection 640 - 010e Perfection 1680 - 010f Perfection 1250 - 0110 Perfection 1650 - 0112 Perfection 2450 - 0114 Perfection 660 - 0116 Perfection 3170 (GT-9400) - 0118 Perfection 4180 (GF-F600) - 0119 Perfection 4490 Photo - 011a 1000 ICS - 011b Perfection 2400 Photo - 011c Perfection 3200 - 011d Perfection 1260 Photo - 011e Perfection 1660 Photo - 011f Perfection 1670 - 0120 Perfection 1270 scanner - 0121 Perfection 2480/2580 Photo [GT-F500] - 0122 Perfection 3590 scanner - 0126 GT-15000 (ES-7000) - 0128 Perfection 4870 (GT-X700) - 0129 Expression 10000XL (ES-10000G) - 012a Perfection 4990 Photo scanner - 012b GT-2500 (ES-H300) - 012c Perfection V700 Photo (GT-X900) - 012d Perfection V10/V100 (GT-S600/F650) - 012f Perfection V350 (GT-F700) - 0130 Perfection V500 (GT-X770) - 0131 Perfection V300 - 0136 GT-S80 (ES-D400) - 0137 GT-S50 (ES-D200) - 0202 Receipt Printer M129C - 0401 CP 800 Digital Camera - 0402 PhotoPC 850z - 0403 PhotoPC 3000z - 0509 JVC PIX-MC10 - 0601 Stylus Photo 875DC Card Reader - 0602 Stylus Photo 895 Card Reader - 0801 Stylus CX5200/CX5400/CX6600 - 0802 Stylus CX3200 - 0803 Printer (Composite Device) - 0804 Storage Device - 0805 Stylus CX6400 - 0806 Stylus Photo RX600/610 - 0807 Stylus Photo RX500/510 - 0808 Stylus CX5200 - 0809 Storage Device - 080a Storage Device - 080c ME100 - 080d Stylus CX4500/4600 - 080e CX-3500/3600/3650 MFP - 080f Stylus Photo RX425 scanner - 0810 Stylus Photo RX700 (PM-A900) - 0811 Stylus Photo RX620 all-in-one - 0812 MFP Composite Device - 0813 Stylus CX6500/6600 - 0814 (PM-A700) - 0815 AcuLaser CX11 (LP-A500) - 0816 Printer (Composite Device) - 0817 (LP-M5500) - 0818 Stylus CX3700/CX3800/DX3800 - 0819 Stylus CX4700/CX4800/DX4800 (PX-A750) - 081a Stylus Photo RX520/RX530 (PM-A750) - 081b MFP Composite Device - 081c Stylus Photo RX640/RX650 (PM-A890) - 081d (PM-A950) - 081e MFP Composite Device - 081f Stylus CX7700/7800 - 0820 CX4200 MP scanner - 0821 MFP Composite Device - 0822 Storage Device - 0823 MFP Composite Device - 0824 Storage Device - 0825 MFP Composite Device - 0826 Storage Device - 0827 Stylus Photo RX560/580/590 (PM-A820) - 0828 (PM-A970) - 0829 (PM-T990) - 082a (PM-A920) - 082b Stylus DX5050 - 082c Storage Device - 082d Storage Device - 082e 0x082e DX-60x0 MFP scanner - 082f Stylus DX4050 - 0830 Stylus CX2800/CX2900/ME200 - 0831 MFP Composite Device - 0832 MFP Composite Device - 0833 (LP-M5600) - 0834 MFP Composite Device - 0835 AcuLaser CX21 - 0836 MFP Composite Device - 0837 MFP Composite Device - 0838 CX7300/CX7400/DX7400 - 0839 CX8300/CX8400/DX8400 - 083a CX9300F/CX9400Fax/DX9400F - 083b MFP Composite Device - 083c MFP Composite Device - 083d MFP Composite Device - 083e MFP Composite Device - 083f Stylus DX4450 - 0849 Stylus SX205 - 084d Stylus SX115 - 0851 Stylus SX410 - 0856 Stylus SX515W - 085c Stylus SX125 -04b9 Rainbow Technologies, Inc. - 0300 SafeNet USB SuperPro/UltraPro - 1000 iKey 1000 Token - 1001 iKey 1200 Token - 1002 iKey Token - 1003 iKey Token - 1004 iKey Token - 1005 iKey Token - 1006 iKey Token - 1200 iKey 2000 Token - 1201 iKey Token - 1202 iKey 2032 Token - 1203 iKey Token - 1204 iKey Token - 1205 iKey Token - 1206 iKey 4000 Token - 1300 iKey 3000 Token - 1301 iKey 3000 - 1302 iKey Token - 1303 iKey Token - 1304 iKey Token - 1305 iKey Token - 1306 iKey Token -04ba Toucan Systems, Ltd -04bb I-O Data Device, Inc. - 0101 USB2-IDE/ATAPI Bridge Adapter - 0201 USB2-IDE/ATAPI Bridge Adapter - 0204 DVD Multi-plus unit iU-CD2 - 0206 DVD Multi-plus unit DVR-UEH8 - 0301 Storage Device - 0314 USB-SSMRW SD-card - 0319 USB2-IDE/ATAPI Bridge Adapter - 031a USB2-IDE/ATAPI Bridge Adapter - 031b USB2-IDE/ATAPI Bridge Adapter - 031e USB-SDRW SD-card - 0502 Nogatech Live! (BT) - 0528 GV-USB Video Capture - 0901 USB ETT - 0904 ET/TX Ethernet [pegasus] - 0913 ET/TX-S Ethernet [pegasus2] - 0919 USB WN-B11 - 0922 IOData AirPort WN-B11/USBS 802.11b - 0930 ETG-US2 - 0937 WN-WAG/USL Wireless LAN Adapter - 0938 WN-G54/USL Wireless LAN Adapter - 093b WN-GDN/USB - 093f WNGDNUS2 802.11n - 0944 WHG-AGDN/US Wireless LAN Adapter - 0945 WN-GDN/US3 Wireless LAN Adapter - 0947 WN-G150U Wireless LAN Adapter - 0948 WN-G300U Wireless LAN Adapter - 0a03 Serial USB-RSAQ1 - 0a07 USB2-iCN Adapter - 0a08 USB2-iCN Adapter - 0c01 FM-10 Pro Disk -04bd Toshiba Electronics Taiwan Corp. -04be Telia Research AB -04bf TDK Corp. - 0100 MediaReader CF - 0115 USB-PDC Adapter UPA9664 - 0116 USB-cdmaOne Adapter UCA1464 - 0117 USB-PHS Adapter UHA6400 - 0118 USB-PHS Adapter UPA6400 - 0135 MediaReader Dual - 0202 73S1121F Smart Card Reader- - 0309 Bluetooth USB dongle - 030a IBM Bluetooth Ultraport Module - 030b Bluetooth Device - 030c Ultraport Bluetooth Device - 0310 Integrated Bluetooth - 0311 Integrated Bluetooth Device - 0317 Bluetooth UltraPort Module from IBM - 0318 IBM Integrated Bluetooth - 0319 Bluetooth Adapter - 0320 Bluetooth Adapter - 0321 Bluetooth Device - 0a28 INDI AV-IN Device -04c1 U.S. Robotics (3Com) - 0020 56K Voice Pro - 0022 56K Voice Pro - 007e ISDN TA - 0082 OfficeConnect Analog Modem - 008f Pro ISDN TA - 0097 OfficeConnect Analog - 009d HomeConnect Webcam [vicam] - 00a9 ISDN Pro TA-U - 00b9 HomeConnect IDSL Modem - 3021 56k Voice FaxModem Pro -04c2 Methode Electronics Far East PTE, Ltd -04c3 Maxi Switch, Inc. - 1102 Mouse - 2102 Mouse -04c4 Lockheed Martin Energy Research -04c5 Fujitsu, Ltd - 1029 fi-4010c Scanner - 1033 fi-4110CU - 1041 fi-4120c Scanner - 1042 fi-4220c Scanner - 105b AH-F401U Air H device - 1096 fi-5110EOX - 1097 fi-5110C - 10ae fi-4120C2 - 10af fi-4220C2 - 10e0 fi-5120c Scanner - 10e1 fi-5220C - 10e7 fi-5900C - 10fe S500 -04c6 Toshiba America Electronic Components -04c7 Micro Macro Technologies -04c8 Konica Corp. - 0720 Digital Color Camera - 0721 e-miniD Camera - 0722 e-mini - 0723 KD-200Z Camera - 0726 KD-310Z Camera - 0728 Revio C2 Mass Storage Device - 0729 Revio C2 Digital Camera - 072c Revio KD20M - 072d Revio KD410Z -04ca Lite-On Technology Corp. - 1766 HID Monitor Controls - 9304 Hub -04cb Fuji Photo Film Co., Ltd - 0100 FinePix 30i/40i/50i, A101/201, 1300/2200, 1400/2400/2600/2800/4500/4700/4800/4900/6800/6900 Zoom - 0103 FinePix NX-500/NX-700 printer - 0104 FinePix A101, 2600/2800/4800/6800 Zoom (PC CAM) - 0108 FinePix F601 Zoom (DSC) - 0109 FinePix F601 Zoom (PC CAM) - 010a FinePix S602 (Pro) Zoom (DSC) - 010b FinePix S602 (Pro) Zoom (PC CAM) - 010d FinePix Digital Camera 020531 - 010e FinePix F402 Zoom (DSC) - 010f FinePix F402 Zoom (PC CAM) - 0110 FinePix M603 Zoom (DSC) - 0111 FinePix M603 Zoom (PC CAM) - 0112 FinePix A202, A200 Zoom (DSC) - 0113 FinePix A202, A200 Zoom (PC CAM) - 0114 FinePix F401 Zoom (DSC) - 0115 FinePix F401 Zoom (PC CAM) - 0116 FinePix A203 Zoom (DSC) - 0117 FinePix A203 Zoom (PC CAM) - 0118 FinePix A303 Zoom (DSC) - 0119 FinePix A303 Zoom (PC CAM) - 011a FinePix S304/3800 Zoom (DSC) - 011b FinePix S304/3800 Zoom (PC CAM) - 011c FinePix A204/2650 Zoom (DSC) - 011d FinePix A204/2650 Zoom (PC CAM) - 0120 FinePix F700 Zoom (DSC) - 0121 FinePix F700 Zoom (PC CAM) - 0122 FinePix F410 Zoom (DSC) - 0123 FinePix F410 Zoom (PC CAM) - 0124 FinePix A310 Zoom (DSC) - 0125 FinePix A310 Zoom (PC CAM) - 0126 FinePix A210 Zoom (DSC) - 0127 FinePix A210 Zoom (PC CAM) - 0128 FinePix A205(S) Zoom (DSC) - 0129 FinePix A205(S) Zoom (PC CAM) - 012a FinePix F610 Zoom (DSC) - 012b FinePix Digital Camera 030513 - 012c FinePix S7000 Zoom (DSC) - 012d FinePix S7000 Zoom (PC CAM) - 012f FinePix Digital Camera 030731 - 0130 FinePix S5000 Zoom (DSC) - 0131 FinePix S5000 Zoom (PC CAM) - 013b FinePix Digital Camera 030722 - 013c FinePix S3000 Zoom (DSC) - 013d FinePix S3000 Zoom (PC CAM) - 013e FinePix F420 Zoom (DSC) - 013f FinePix F420 Zoom (PC CAM) - 0142 FinePix S7000 Zoom (PTP) - 0148 FinePix A330 Zoom (DSC) - 0149 FinePix A330 Zoom (UVC) - 014a FinePix A330 Zoom (PTP) - 014b FinePix A340 Zoom (DSC) - 014c FinePix A340 Zoom (UVC) - 0159 FinePix F710 Zoom (DSC) - 0165 FinePix S3500 Zoom (DSC) - 0168 FinePix E500 Zoom (DSC) - 0169 FinePix E500 Zoom (UVC) - 016b FinePix E510 Zoom (DSC) - 016c FinePix E510 Zoom (PC CAM) - 016e FinePix S5500 Zoom (DSC) - 016f FinePix S5500 Zoom (UVC) - 0171 FinePix E550 Zoom (DSC) - 0172 FinePix E550 Zoom (UVC) - 0177 FinePix F10 (DSC) - 0179 Finepix F10 (PTP) - 0186 FinePix S5200/S5600 Zoom (DSC) - 0188 FinePix S5200/S5600 Zoom (PTP) - 018e FinePix S9500 Zoom (DSC) - 018f FinePix S9500 Zoom (PTP) - 0192 FinePix E900 Zoom (DSC) - 0193 FinePix E900 Zoom (PTP) - 019b FinePix F30 (PTP) - 01af FinePix A700 (PTP) - 01bf FinePix F6000fd/S6500fd Zoom (PTP) - 01c0 FinePix F20 (PTP) - 01c1 FinePix F31fd (PTP) - 01c4 FinePix S5700 Zoom (PTP) - 01c5 FinePix F40fd (PTP) - 01c6 FinePix A820 Zoom (PTP) - 01d2 FinePix A800 Zoom (PTP) - 01d3 FinePix A920 (PTP) - 01d4 FinePix F50fd (PTP) - 01d5 FinePix F47 (PTP) - 01f7 FinePix J250 (PTP) - 01fd A160 - 023e FinePix AX300 -04cc ST-Ericsson - 1122 Hub - 1520 USB 2.0 Hub (Avocent KVM) - 1521 USB 2.0 Hub - 1a62 GW Instek GSP-830 Spectrum Analyzer (HID) - 2323 Ux500 serial debug port - 2533 NFC device (PN533) - 8116 Camera -04cd Tatung Co. Of America -04ce ScanLogic Corp. - 0002 SL11R-IDE IDE Bridge - 0100 USB2PRN Printer Class - 0300 Phantom 336CX - C3 scanner - 04ce SL11DEMO, VID: 0x4ce, PID: 0x4ce - 07d1 SL11R, VID: 0x4ce, PID: 0x07D1 -04cf Myson Century, Inc. - 0800 MTP800 Mass Storage Device - 8810 CS8810 Mass Storage Device - 8811 CS8811 Mass Storage Device - 8813 CS8813 Mass Storage Device - 8818 USB2.0 to ATAPI Bridge Controller - 8819 USB 2.0 SD/MMC Reader - 9920 CS8819A2-114 Mass Storage Device -04d0 Digi International -04d1 ITT Canon -04d2 Altec Lansing Technologies - 0070 ADA70 Speakers - 0305 Non-Compliant Audio Device - 0311 ADA-310 Speakers - 2060 Claritel-i750 - vp - ff05 ADA-305 Speakers - ff47 Lansing HID Audio Controls - ff49 Lansing HID Audio Controls -04d3 VidUS, Inc. -04d4 LSI Logic, Inc. -04d5 Forte Technologies, Inc. -04d6 Mentor Graphics -04d7 Oki Semiconductor - 1be4 Bluetooth Device -04d8 Microchip Technology, Inc. - 0002 PicoLCD 20x2 - 0003 PICkit 2 Microcontroller Programmer - 000a CDC RS-232 Emulation Demo - 000b PIC18F2550 (32K Flashable 10 Channel, 10 Bit A/D USB Microcontroller) - 0032 PICkit1 - 0033 PICkit2 - 0036 PICkit Serial Analyzer - 00e0 PIC32 Starter Board - 0a04 AGP LIN Serial Analyzer - 8000 In-Circuit Debugger - 8001 ICD2 in-circuit debugger - 8101 PIC24F Starter Kit - 900a PICkit3 - c001 PicoLCD 20x4 - fbba DiscFerret Magnetic Disc Analyser (bootloader mode) - fbbb DiscFerret Magnetic Disc Analyser (active mode) - fc92 Open Bench Logic Sniffer - ffef PICoPLC [APStech] -04d9 Holtek Semiconductor, Inc. - 0022 Portable Keyboard - 048e Optical Mouse - 0499 Optical Mouse - 1203 Keyboard - 1400 PS/2 keyboard + mouse controller - 1503 Shortboard Lefty - 1603 Keyboard - 2221 Keyboard -04da Panasonic (Matsushita) - 0901 LS-120 Camera - 0912 SDR-S10 - 0b01 CD-R/RW Drive - 0b03 SuperDisk 240MB - 0d01 CD-R Drive KXL-840AN - 0d09 CD-R Drive KXL-RW32AN - 0d0a CD-R Drive KXL-CB20AN - 0d0d CDRCB03 - 0d0e DVD-ROM & CD-R/RW - 0f40 Printer - 1500 MFSUSB Driver - 1800 DY-WL10 802.11abgn Adapter [Broadcom BCM4323] - 1b00 MultiMediaCard - 2121 EB-VS6 - 2316 DVC Mass Storage Device - 2317 DVC USB-SERIAL Driver for WinXP - 2318 NV-GS11/230/250 (webcam mode) - 2319 NV-GS15 (webcam mode) - 231a NV-GS11/230/250 (DV mode) - 231d DVC Web Camera Device - 231e DVC DV Stream Device - 2372 Lumix Camera - 2374 DMC-FZ18/FZ20 - 2451 HDC-SD9 - 2497 HDC-TM700 - 250c Gobi Wireless Modem (QDL mode) - 250d Gobi Wireless Modem - 3904 N5HBZ0000055 802.11abgn Wireless Adapter [Atheros AR7010] - 3c04 JT-P100MR-20 [ePassport Reader] -04db Hypertec Pty, Ltd -04dc Huan Hsin Holdings, Ltd -04dd Sharp Corp. - 13a6 MFC2000 - 6006 AL-1216 - 6007 AL-1045 - 6008 AL-1255 - 6009 AL-1530CS - 600a AL-1540CS - 600b AL-1456 - 600c AL-1555 - 600d AL-1225 - 600e AL-1551CS - 600f AR-122E - 6010 AR-152E - 6011 AR-157E - 6012 SN-1045 - 6013 SN-1255 - 6014 SN-1456 - 6015 SN-1555 - 6016 AR-153E - 6017 AR-122E N - 6018 AR-153E N - 6019 AR-152E N - 601a AR-157E N - 601b AL-1217 - 601c AL-1226 - 601d AR-123E - 6021 IS01 - 7002 DVC Ver.1.0 - 7004 VE-CG40U Digital Still Camera - 7005 VE-CG30 Digital Still Camera - 7007 VL-Z7S Digital Camcorder - 8004 Zaurus SL-5000D/SL-5500 PDA - 8005 Zaurus A-300 - 8006 Zaurus SL-B500/SL-5600 PDA - 8007 Zaurus C-700 PDA - 9014 IM-DR80 Portable NetMD Player - 9031 Zaurus C-750/C-760/C-860/SL-C3000 PDA - 9032 Zaurus SL-6000 - 903a GSM GPRS - 9050 Zaurus C-860 PDA - 9056 Viewcam Z - 9073 AM-900 - 9074 GSM GPRS - 90a9 Sharp Composite - 90d0 USB-to-Serial Comm. Port - 90f2 Sharp 3G GSM USB Control - 9120 WS004SH - 9122 WS007SH - 9123 W-ZERO3 ES Smartphone - 91a3 922SH Internet Machine -04de MindShare, Inc. -04df Interlink Electronics -04e1 Iiyama North America, Inc. - 0201 Monitor Hub -04e2 Exar Corp. -04e3 Zilog, Inc. -04e4 ACC Microelectronics -04e5 Promise Technology -04e6 SCM Microsystems, Inc. - 0001 E-USB ATA Bridge - 0002 eUSCSI SCSI Bridge - 0003 eUSB SmartMedia Card Reader - 0005 eUSB SmartMedia/CompactFlash Card Reader - 0006 eUSB SmartMedia Card Reader - 0007 Hifd - 0009 eUSB ATA/ATAPI Adapter - 000a eUSB CompactFlash Adapter - 000b eUSCSI Bridge - 000c eUSCSI Bridge - 000d Dazzle MS - 0012 Dazzle SD/MMC - 0101 eUSB ATA Bridge (Sony Spressa USB CDRW) - 0311 Dazzle DM-CF - 0312 Dazzle DM-SD/MMC - 0313 Dazzle SM - 0314 Dazzle MS - 0322 e-Film Reader-5 - 0325 eUSB ORCA Quad Reader - 0327 Digital Media Reader - 03fe DMHS2 DFU Adapter - 0406 eUSB SmartDM Reader - 04e6 eUSB DFU Adapter - 04e7 STCII DFU Adapter - 04e8 eUSBDM DFU Adapter - 04e9 DM-E DFU Adapter - 0500 Veridicom 5thSense Fingerprint Sensor and eUSB SmartCard - 0701 DCS200 Loader Device - 0702 DVD Creation Station 200 - 0703 DVC100 Loader Device - 0704 Digital Video Creator 100 - 1001 SCR300 Smart Card Reader - 1010 USBAT-2 CompactFlash Card Reader - 1014 e-Film Reader-3 - 1020 USBAT ATA/ATAPI Adapter - 2007 RSA SecurID ComboReader - 2009 Citibank Smart Card Reader - 200a Reflex v.2 Smart Card Reader - 200d STR391 Reader - 5111 SCR331-DI SmartCard Reader - 5113 SCR333 SmartCard Reader - 5114 SCR331-DI SmartCard Reader - 5115 SCR335 SmartCard Reader - 5116 SCR331-LC1 / SCR3310 SmartCard Reader - 5117 SCR3320 - Smart Card Reader - 5118 Expresscard SIM Card Reader - 5119 SCR3340 - ExpressCard54 Smart Card Reader - 511b SmartCard Reader - 511d SCR3311 Smart Card Reader - 5120 SCR331-DI SmartCard Reader - 5121 SDI010 Smart Card Reader - 5151 SCR338 Keyboard Smart Card Reader - 5292 SCL011 RFID reader - 5410 SCR35xx Smart Card Reader - e000 SCRx31 Reader - e001 SCR331 SmartCard Reader - e003 SPR532 PinPad SmartCard Reader -04e7 Elo TouchSystems - 0001 TouchScreen - 0002 Touchmonitor Interface 2600 Rev 2 - 0004 4000U CarrollTouch® Touchmonitor Interface - 0007 2500U IntelliTouch® Touchmonitor Interface - 0008 3000U AccuTouch® Touchmonitor Interface - 0009 4000U CarrollTouch® Touchmonitor Interface - 0020 Touchscreen Interface (2700) - 0021 Touchmonitor Interface - 0030 4500U CarrollTouch® Touchmonitor Interface - 0032 Touchmonitor Interface - 0033 Touchmonitor Interface - 0041 5010 Surface Capacitive Touchmonitor Interface - 0042 Touchmonitor Interface - 0050 2216 AccuTouch® Touchmonitor Interface - 0071 Touchmonitor Interface - 0072 Touchmonitor Interface - 0081 Touchmonitor Interface - 0082 Touchmonitor Interface - 00ff Touchmonitor Interface -04e8 Samsung Electronics Co., Ltd - 0100 Kingston Flash Drive (128MB) - 0110 Connect3D Flash Drive - 0111 Connect3D Flash Drive - 1003 MP3 Player and Recorder - 1006 SDC-200Z - 1f06 HX-MU064DA portable harddisk - 2018 WIS09ABGN LinkStick Wireless LAN Adapter - 2035 Digital Photo Frame Mass Storage - 2036 Digital Photo Frame Mini Monitor - 3004 ML-4600 - 3005 Docuprint P1210 - 3008 ML-6060 laser printer - 300c ML-1210 Printer - 300e Laser Printer - 3104 ML-3550N - 3210 ML-5200A Laser Printer - 3226 Laser Printer - 3228 Laser Printer - 322a Laser Printer - 322c Laser Printer - 3230 ML-1440 - 3232 Laser Printer - 3236 ML-1450 - 3238 ML-1430 - 323a ML-1710 Printer - 323b Phaser 3130 - 323c Laser Printer - 323d Phaser 3120 - 323e Laser Printer - 3240 Laser Printer - 3242 ML-1510 Laser Printer - 3248 Color Laser Printer - 324a Laser Printer - 324c ML-1740 Printer - 324d Phaser 3121 - 3256 ML-1520 Laser Printer - 325b Xerox Phaser 3117 Laser Printer - 325f Phaser 3425 Laser Printer - 3260 CLP-510 Color Laser Printer - 3268 ML-1610 Mono Laser Printer - 326c ML-2010P Mono Laser Printer - 3276 ML-3050/ML-3051 Laser Printer - 328e CLP-310 Color Laser Printer - 3296 ML-2580N Mono Laser Printer - 3297 ML-191x/ML-252x Laser Printer - 3409 SCX-4216F Scanner - 340c SCX-5x15 series - 340d SCX-6x20 series - 340e MFP 560 series - 340f Printing Support - 3412 SCX-4x20 series - 3413 SCX-4100 Scanner - 3415 Composite Device - 3419 Composite Device - 341a Printing Support - 341b SCX-4200 series - 341c Composite Device - 341d Composite Device - 341f Composite Device - 3420 Composite Device - 3426 SCX-4500 Laser Printer - 3605 InkJet Color Printer - 3606 InkJet Color Printer - 3609 InkJet Color Printer - 3902 InkJet Color Printer - 3903 Xerox WorkCentre XK50cx - 390f InkJet Color Printer - 3911 SCX-1020 series - 4005 GT-S8000 Jet (msc) - 4f1f GT-S8000 Jet (mtp) - 5000 YP-MF series - 5001 YP-100 - 5002 YP-30 - 5003 YP-700 - 5004 YP-30 - 5005 YP-300 - 5006 YP-750 - 500d MP3 Player - 5010 Yepp YP-35 - 5011 YP-780 - 5013 YP-60 - 5015 yepp upgrade - 501b MP3 Player - 5021 Yepp YP-ST5 - 5026 YP-MT6V - 5027 YP-T7 - 502b YP-F1 - 5032 YP-J70 - 503b YP-U1 MP3 Player - 503d YP-T7F - 5041 YP-Z5 - 5050 YP-U2 MP3 Player - 5051 YP-F2R - 5055 YP-T9 - 507d YP-U3 (mtp) - 507f YP-T9J - 5080 Yepp YP-K3 (msc) - 5081 Yepp YP-K3 (mtp) - 5082 YP-P2 (msc) - 5083 YP-P2 (mtp) - 508a YP-T10 - 508b YP-S5 MP3 Player - 508c YP-S5 - 5090 YP-S3 (msc) - 5091 YP-S3 (mtp) - 5092 YP-U4 (msc) - 5093 YP-U4 (mtp) - 5095 YP-S2 - 510f YP-R1 - 5119 Yepp YP-P3 - 511c YP-Q2 - 5121 YP-U5 - 5123 Yepp YP-M1 - 5a00 YP-NEU - 5a01 YP-NDU - 5a03 Yepp MP3 Player - 5a04 YP-800 - 5a08 YP-90 - 5a0f Meizu M6 MiniPlayer - 5b01 Memory Stick Reader/Writer - 5b02 Memory Stick Reader/Writer - 5b03 Memory Stick Reader/Writer - 5b04 Memory Stick Reader/Writer - 5b05 Memory Stick Reader/Writer - 5b11 SEW-2001u Card - 5f00 NEXiO Sync - 5f01 NEXiO Sync - 5f02 NEXiO Sync - 5f03 NEXiO Sync - 5f04 NEXiO Sync - 6032 G2 Portable hard drive - 6601 Mobile Phone - 6602 Galaxy - 6603 Galaxy - 6611 MITs Sync - 6613 MITs Sync - 6615 MITs Sync - 6617 MITs Sync - 6619 MITs Sync - 661b MITs Sync - 661e Handheld - 6620 Handheld - 6622 Handheld - 6624 Handheld - 662e MITs Sync - 6630 MITs Sync - 6632 MITs Sync - 663e D900e Phone - 663f SGH-E720/SGH-E840 - 6640 Usb Modem Enumerator - 6702 X830 - 6708 U600 Phone - 6709 U600 - 6734 Juke - 6759 D900e Media Player - 675a D900e Mass Storage - 675b D900e Camera - 6772 Standalone LTE device (Trial) - 6795 S5230 - 6802 Standalone HSPA device - 6806 Composite LTE device (Trial) - 6807 Composite HSPA device - 681c Galaxy Portal/Spica/S - 681d Galaxy Portal/Spica Android Phone - 684e Wave (GT-S8500) - 6875 GT-B3710 Standalone LTE device (Commercial) - 6876 GT-B3710 LTE Modem - 6877 Galaxy S - 6888 GT-B3730 Composite LTE device (Commercial) - 6889 GT-B3730 Composite LTE device (Commercial) - 689a LTE Storage Driver [CMC2xx] - 689e GT-S5670 [Galaxy Fit] - 7011 SEW-2003U Card - 7021 Bluetooth Device - 7061 eHome Infrared Receiver - 7080 Anycall SCH-W580 - 7081 Human Interface Device - 8001 Handheld - e020 SERI E02 SCOM 6200 UMTS Phone - e021 SERI E02 SCOM 6200 Virtual UARTs - e022 SERI E02 SCOM 6200 Flash Load Disk - ff30 SG_iMON -04e9 PC-Tel, Inc. -04ea Brooktree Corp. -04eb Northstar Systems, Inc. - e004 eHome Infrared Transceiver -04ec Tokyo Electron Device, Ltd -04ed Annabooks -04ef Pacific Electronic International, Inc. -04f0 Daewoo Electronics Co., Ltd -04f1 Victor Company of Japan, Ltd - 0001 GC-QX3 Digital Still Camera - 0004 GR-DVL815U Digital Video Camera - 0006 DV Camera Storage - 0008 GZ-MG30AA/MC500E Digital Video Camera - 0009 GR-DX25EK Digital Video Camera - 000a GR-D72 Digital Video Camera - 1001 GC-A50 Camera Device - 3008 MP-PRX1 Ethernet - 3009 MP-XP7250 WLAN Adapter -04f2 Chicony Electronics Co., Ltd - 0001 KU-8933 Keyboard - 0002 NT68P81 Keyboard - 0110 KU-2971 Keyboard - 0111 KU-9908 Keyboard - 0112 KU-8933 Keyboard with PS/2 Mouse port - 0116 KU-2971/KU-0325 Keyboard - 0220 Wireless HID Receiver - 0402 Genius LuxeMate i200 Keyboard - 0403 KU-0420 keyboard - 0418 KU-0418 Tactical Pad - 0760 Acer KU-0760 Keyboard - 0860 2.4G Multimedia Wireless Kit - a001 E-Video DC-100 Camera - a120 ORITE CCD Webcam(PC370R) - a121 ORITE CCD Webcam(PC370R) - a122 ORITE CCD Webcam(PC370R) - a123 ORITE CCD Webcam(PC370R) - a124 ORITE CCD Webcam(PC370R) - a128 PC Camera (SN9C202 + OV7663 + EEPROM) - a133 Gateway Webcam - a136 LabTec Webcam 5500 - a204 DSC WIA Device (1300) - a208 DSC WIA Device (2320) - a209 Labtec DC-2320 - a20a DSC WIA Device (3310) - a20c DSC WIA Device (3320) - a210 Audio Device - b008 USB 2.0 Camera - b009 Integrated Camera - b010 Integrated Camera - b012 1.3 MPixel UVC Webcam - b013 USB 2.0 Camera - b015 VGA 24fps UVC Webcam - b016 VGA 30fps UVC Webcam - b018 2M UVC Webcam - b021 ViewSonic 1.3M, USB2.0 Webcam - b022 Gateway USB 2.0 Webcam - b023 Gateway USB 2.0 Webcam - b024 USB 2.0 Webcam - b025 Camera - b027 Gateway USB 2.0 Webcam - b028 VGA UVC Webcam - b029 1.3M UVC Webcam - b036 Asus Integrated 0.3M UVC Webcam - b044 Acer CrystalEye Webcam - b057 integrated USB webcam - b071 2.0M UVC Webcam / CNF7129 - b091 Webcam - b104 CNF7069 Webcam - b107 CNF7070 Webcam - b14c CNF8050 Webcam - b175 4-Port Hub - b1aa Webcam-101 - b1b4 Lenovo Integrated Camera - b1cf Lenovo Integrated Camera -04f3 Elan Microelectronics Corp. - 0210 AM-400 Hama Optical Mouse - 0212 Laser Mouse - 0214 Lynx M9 Optical Mouse - 0230 3D Optical Mouse - 02f4 2.4G Cordless Mouse -04f4 Harting Elektronik, Inc. -04f5 Fujitsu-ICL Systems, Inc. -04f6 Norand Corp. -04f7 Newnex Technology Corp. -04f8 FuturePlus Systems -04f9 Brother Industries, Ltd - 0002 HL-1050 Laser Printer - 0005 Printer - 0006 HL-1240 Laser Printer - 0007 HL-1250 Laser Printer - 0008 HL-1270 Laser Printer - 0009 Printer - 000a P2500 series - 000b Printer - 000c Printer - 000d HL-1440 Laser Printer - 000e HL-1450 series - 000f HL-1470N series - 0010 Printer - 0011 Printer - 0012 Printer - 0013 Printer - 0014 Printer - 0015 Printer - 0016 Printer - 0017 Printer - 0018 Printer - 001a HL-1430 Laser Printer - 001c Printer - 001e Printer - 0020 HL-5130 series - 0021 HL-5140 series - 0022 HL-5150D series - 0023 HL-5170DN series - 0024 Printer - 0025 Printer - 0027 HL-2030 Laser Printer - 0028 Printer - 0029 Printer - 002a HL-52x0 series - 002b HL-5250DN Printer - 002c Printer - 002d Printer - 0100 MFC8600/9650 series - 0101 MFC9600/9870 series - 0102 MFC9750/1200 series - 0104 MFC-8300J - 0105 MFC-9600J - 0106 MFC-7300C - 0107 MFC-7400C - 0108 MFC-9200C - 0109 MFC-830 - 010a MFC-840 - 010b MFC-860 - 010c MFC-7400J - 010d MFC-9200J - 010e MFC3100C Scanner - 010f MFC 5100C - 0110 MFC4800 Scanner - 0111 MFC 6800 - 0112 DCP1000 Port(FaxModem) - 0113 MFC-8500 - 0114 MFC9700 Port(FaxModem) - 0115 MFC9800 Scanner - 0116 DCP1400 Scanner - 0119 MFC-9660 - 011b MFC-9880 - 011c MFC-9760 - 011d MFC-9070 - 011e MFC-9180 - 011f MFC-9160 - 0120 MFC580 Port(FaxModem) - 0121 MFC-590 - 0122 MFC-5100J - 0129 Imagistics 2500 (MFC-8640D clone) - 012f FAX-4750e - 0132 MFC-5200C RemovableDisk - 0135 MFC-100 Scanner - 0136 MFC-150CL Scanner - 013c MFC-890 Port - 013d MFC-5200J Printer - 013e MFC-4420C RemovableDisk - 013f MFC-4820C RemovableDisk - 0140 DCP-8020 - 0141 DCP-8025D - 0142 MFC-8420 - 0143 MFC-8820D - 0144 DCP-4020C RemovableDisk - 0146 MFC-3220C - 0147 FAX-1820C Printer - 0148 MFC-3320CN Printer - 0149 FAX-1920CN Printer - 014a MFC-3420C - 014b MFC-3820CN - 014d FAX-1815C Printer - 014e MFC-8820J - 0150 MFC-8220 Port(FaxModem) - 0151 MFC-8210J - 0157 MFC-3420J Printer - 0158 MFC-3820JN Port(FaxModem) - 015d MFC Composite Device - 015e DCP-8045D - 015f MFC-8440 - 0160 MFC-8840D - 0161 MFC-210C - 0162 MFC-420CN Remote Setup Port - 0163 MFC-410CN RemovableDisk - 0165 MFC-620CN - 0166 MFC-610CLN RemovableDisk - 0168 MFC-620CLN - 0169 DCP-110C RemovableDisk - 016b DCP-310CN RemovableDisk - 016c FAX-2440C Printer - 016d MFC-5440CN - 016e MFC-5840CN Remote Setup Port - 0170 FAX-1840C Printer - 0171 FAX-1835C Printer - 0172 FAX-1940CN Printer - 0173 MFC-3240C Remote Setup Port - 0174 MFC-3340CN RemovableDisk - 017b Imagistics sx2100 - 0180 MFC-7420 - 0181 MFC-7820N Port(FaxModem) - 0182 Composite Device - 0183 DCP-7020 - 0184 DCP-7025 Printer - 0185 MFC-7220 Printer - 0186 Composite Device - 0187 FAX-2820 Printer - 0188 FAX-2920 Printer - 018a MFC-9420CN - 018c DCP-115C - 018d DCP-116C - 018e DCP-117C - 018f DCP-118C - 0190 DCP-120C - 0191 DCP-315CN - 0192 DCP-340CW - 0193 MFC-215C - 0194 MFC-425CN - 0195 MFC-820CW Remote Setup Port - 0196 MFC-820CN Remote Setup Port - 0197 MFC-640CW - 019a MFC-840CLN Remote Setup Port - 01a2 MFC-8640D - 01a3 Composite Device - 01a4 DCP-8065DN Printer - 01a5 MFC-8460N Port(FaxModem) - 01a6 MFC-8860DN Port(FaxModem) - 01a7 MFC-8870DW Printer - 01a8 DCP-130C - 01a9 DCP-330C - 01aa DCP-540CN - 01ab MFC-240C - 01ae DCP-750CW RemovableDisk - 01af MFC-440CN - 01b0 MFC-660CN - 01b1 MFC-665CW Remote Setup Port - 01b2 MFC-845CW Remote Setup Port - 01b4 MFC-460CN Remote Setup Port - 01b5 MFC-630CD - 01b6 MFC-850CDN - 01b7 MFC-5460CN Remote Setup Port - 01b8 MFC-5860CN - 01ba MFC-3360C - 01bd MFC-8660DN - 01be DCP-750CN RemovableDisk - 01bf MFC-860CDN Remote Setup Port - 01c0 DCP-128C - 01c1 DCP-129C - 01c2 DCP-131C - 01c3 DCP-329C - 01c4 DCP-331C - 01c5 MFC-239C - 01ca MFC-9440CN Remote Setup Port - 01ce DCP-135C - 01cf DCP-150C - 01d0 DCP-350C - 01d1 DCP-560CN - 01d4 MFC-230C - 01d5 MFC-235C - 01d6 MFC-260C - 01df DCP-155C - 01e0 MFC-265C - 01e1 DCP-153C - 01e2 DCP-157C - 01e3 DCP-353C - 01e4 DCP-357C - 01e7 MFC-7340 - 01e9 DCP-7040 - 01ea DCP-7030 - 01eb MFC-7320 - 01f4 MFC-5890CN - 1000 Printer - 1002 Printer - 2002 PTUSB Printing - 2004 PT-2300/2310 p-Touch Laber Printer - 2015 QL-500 P-touch label printer - 2016 QL-550 P-touch label printer - 201a PT-18R P-touch label printer - 2027 QL-560 P-Touch Label Printer - 2100 Card Reader Writer -04fa Dallas Semiconductor - 2490 DS1490F 2-in-1 Fob, 1-Wire adapter - 4201 DS4201 Audio DAC -04fb Biostar Microtech International Corp. -04fc Sunplus Technology Co., Ltd - 0003 CM1092 Optical Scroller Mouse - 0005 USB OpticalWheel Mouse - 0013 ViewMate Desktop Mouse CC2201 - 0015 ViewMate Desktop Mouse CC2201 - 00d3 00052486 / Laser Mouse M1052 [hama] - 0171 SPCA1527A/SPCA1528 SD card camera (Mass Storage mode) - 0232 Fingerprint - 0538 Wireless Optical Mouse 2.4G [Bright] - 0561 Flexcam 100 - 05d8 Wireless keyboard/mouse - 0c15 SPIF215A SATA bridge - 0c25 SATALink SPIF225A - 1528 SPCA1527A/SPCA1528 SD card camera (webcam mode) - 1533 Mass Storage - 2080 ASUS Webcam - 500c CA500C Digital Camera - 504a Aiptek Mini PenCam 1.3 - 504b Aiptek Mega PockerCam 1.3/Maxell MaxPocket LE 1.3 - 5330 Digitrex 2110 - 5331 Vivitar Vivicam 10 - 5360 Sunplus Generic Digital Camera - 5720 Card Reader Driver - 7333 Finet Technology Palmpix DC-85 - 757a Aiptek, MP315 MP3 Player - ffff PureDigital Ritz Disposable -04fd Soliton Systems, K.K. - 0003 Smart Card Reader II -04fe PFU, Ltd -04ff E-CMOS Corp. -0500 Siam United Hi-Tech - 0001 DART Keyboard Mouse - 0002 DART-2 Keyboard -0501 Fujikura DDK, Ltd -0502 Acer, Inc. - 0001 Handheld - 0736 Handheld - 15b1 PDA n311 - 1631 c10 Series - 1632 c20 Series - 16e1 n10 Handheld Sync - 16e2 n20 Pocket PC Sync - 16e3 n30 Handheld Sync - 3202 Liquid - 3203 Liquid (Debug mode) - 3341 Iconia tablet A500 - d001 Divio NW801/DVC-V6+ Digital Camera -0503 Hitachi America, Ltd -0504 Hayes Microcomputer Products -0506 3Com Corp. - 009d HomeConnect Camera - 00a0 3CREB96 Bluetooth Adapter - 00a1 Bluetooth Device - 00a2 Bluetooth Device - 00df 3Com Home Connect lite - 0100 HomeConnect ADSL Modem Driver - 03e8 3C19250 Ethernet [klsi] - 0a01 3CRSHEW696 Wireless Adapter - 0a11 3CRWE254G72 802.11g Adapter - 11f8 HomeConnect 3C460 - 2922 HomeConnect Cable Modem External with - 3021 U.S.Robotics 56000 Voice FaxModem Pro - 4601 3C460B 10/100 Ethernet Adapter - f002 3CP4218 ADSL Modem (pre-init) - f003 3CP4218 ADSL Modem - f100 3CP4218 ADSL Modem (pre-init) -0507 Hosiden Corp. - 0011 Konami ParaParaParadise Controller -0508 Clarion Co., Ltd -0509 Aztech Systems, Ltd - 0801 ADSL Modem - 0802 ADSL Modem (RFC1483) - 0806 DSL Modem - 080f Binatone ADSL500 Modem Network Interface - 0812 Pirelli ADSL Modem Network Interface -050a Cinch Connectors -050b Cable System International -050c InnoMedia, Inc. -050d Belkin Components - 0004 Direct Connect - 0012 F8T012 Bluetooth Adapter - 0013 F8T013 Bluetooth Adapter - 0017 B8T017 Bluetooth+EDR 2.1 - 003a Universal Media Reader - 0050 F5D6050 802.11b Wireless Adapter v2000 [Atmel at76c503a] - 0081 F8T001v2 Bluetooth - 0083 Bluetooth Device - 0084 F8T003v2 Bluetooth - 0102 Flip KVM - 0103 F5U103 Serial Adapter [etek] - 0106 VideoBus II Adapter, Video - 0108 F1DE108B KVM - 0109 F5U109/F5U409 PDA Adapter - 0115 SCSI Adapter - 0119 F5U120-PC Dual PS/2 Ports / F5U118-UNV ADB Adapter - 0121 F5D5050 100Mbps Ethernet - 0122 Ethernet Adapter - 0131 Bluetooth Device with trace filter - 016a Bluetooth Mini Dongle - 0201 Peripheral Switch - 0208 USBView II Video Adapter [nt1004] - 0210 F5U228 Hi-Speed USB 2.0 DVD Creator - 0211 F5U211 USB 2.0 15-in-1 Media Reader & Writer - 0224 F5U224 USB 2.0 4-Port Hub - 0234 F5U234 USB 2.0 4-Port Hub - 0237 F5U237 USB 2.0 7-Port Hub - 0240 F5U240 USB 2.0 CF Card Reader - 0249 USB 2 Flash Media Device - 0257 F5U257 Serial - 0304 FSU304 USB 2.0 - 4 Ports Hub - 0409 F5U409 Serial - 0551 F6C550-AVR UPS - 0706 2-N-1 USB 2.0 7-Port Hub (Lower half) - 0802 Nostromo n40 Gamepad - 0803 Nostromo 1745 GamePad - 0805 Nostromo N50 GamePad - 0815 Nostromo n52 HID SpeedPad Mouse Wheel - 0826 ErgoFit Wireless Optical Mouse (HID) - 0980 HID UPS Battery - 1102 F7D1102 N150/Surf Micro Wireless Adapter v1000 [Realtek RTL8188CE-VAU] - 1202 F5U120-PC Parallel Printer Port - 1203 F5U120-PC Serial Port - 2103 F7D2102 802.11n N300 Micro Wireless Adapter v3000 [Realtek RTL8192CU] - 258a F5U258 Host to Host cable - 3101 F1DF102U/F1DG102U Flip Hub - 3201 F1DF102U/F1DG102U Flip KVM - 4050 ZD1211B - 5055 F5D5055 Gigabit Network Adapter [AX88xxx] - 6051 F5D6051 802.11b Wireless Network Adapter [ZyDAS ZD1201] - 615a F7D4101 / F9L1101 802.11abgn Wireless Adapter [Broadcom BCM4323] - 7050 F5D7050 Wireless G Adapter v1000/v2000 [Intersil ISL3887] - 7051 F5D7051 802.11g Adapter v1000 [Broadcom 4320 USB] - 705a F5D7050 Wireless G Adapter v3000 [Ralink RT2571W] - 705b Wireless G Adapter - 705c F5D7050 Wireless G Adapter v4000 [Zydas ZD1211B] - 705e F5D7050 Wireless G Adapter v5000 [Realtek RTL8187B] - 706a 2-N-1 USB 2.0 7-Port Hub (Lower half) - 8053 F5D8053 N Wireless USB Adapter v1000/v4000 [Ralink RT2870] - 805c F5D8053 N Wireless Adapter v3000 [Ralink RT2870] - 805e F5D8053 N Wireless USB Adapter v5000 [Realtek RTL8192U] - 815c F5D8053 N Wireless USB Adapter v3000 [Ralink RT2870] - 815f F5D8053 N Wireless USB Adapter v6000 [Realtek RTL8192SU] - 825a F5D8055 N+ Wireless Adapter v1000 [Ralink RT2870] - 825b F5D8055 N+ Wireless Adapter v2000 [Ralink RT3070] - 845a F7D2101 802.11n Surf & Share Wireless Adapter v1000 [Realtek RTL8192SU] - 905b F5D9050 Wireless G+ MIMO Network Adapter v3000 [Ralink RT2573] - 905c F5D9050 Wireless G+ MIMO Network Adapter v4000 [Ralink RT2573] - 935a F6D4050 N150 Enhanced Wireless Network Adapter v1000 [Ralink RT2870] - 935b F6D4050 N150 Enhanced Wireless Network Adapter v2000 [Ralink RT3070] - 945a F7D1101 Basic Wireless USB Adapter v1000 [Realtek RTL8188SU] -050e Neon Technology, Inc. -050f KC Technology, Inc. - 0001 Hub - 0003 KC82C160S Hub - 0180 KC-180 IrDA Dongle - 0190 KC2190 USB Host-to-Host cable -0510 Sejin Electron, Inc. - 0001 Keyboard - 1000 Keyboard with PS/2 Mouse Port - e001 Mouse -0511 N'Able (DataBook) Technologies, Inc. -0512 Hualon Microelectronics Corp. -0513 digital-X, Inc. -0514 FCI Electronics -0515 ACTC -0516 Longwell Electronics -0517 Butterfly Communications -0518 EzKEY Corp. - 0001 USB to PS2 Adaptor v1.09 - 0002 EZ-9900C Keyboard -0519 Star Micronics Co., Ltd - 0003 TSP100ECO/TSP100II - c002 Xlive Bluetooth XBM-100S MP3 Player -051a WYSE Technology - a005 Smart Display Version 9973 -051b Silicon Graphics -051c Shuttle, Inc. - 0005 VFD Module - c001 eHome Infrared Receiver - c002 eHome Infrared Receiver -051d American Power Conversion - 0001 UPS - 0002 Uninterruptible Power Supply - 0003 UPS -051e Scientific Atlanta, Inc. -051f IO Systems (Elite Electronics), Inc. -0520 Taiwan Semiconductor Manufacturing Co. -0521 Airborn Connectors -0522 Advanced Connectek, Inc. -0523 ATEN GmbH -0524 Sola Electronics -0525 Netchip Technology, Inc. - 100d RFMD Bluetooth Device - 1080 NET1080 USB-USB Bridge - 1265 File-backed Storage Gadget - a140 USB Clik! 40 - a141 (OME) PocketZip 40 MP3 Player Driver - a220 GVC Bluetooth Wireless Adapter - a4a0 Linux-USB "Gadget Zero" - a4a1 Linux-USB Ethernet Gadget - a4a2 Linux-USB Ethernet/RNDIS Gadget - a4a3 Linux-USB user-mode isochronous source/sink - a4a4 Linux-USB user-mode bulk source/sink - a4a5 Linux-USB File Storage Gadget - a4a6 Linux-USB Serial Gadget - a4a7 Linux-USB Serial Gadget (CDC ACM mode) - a4a8 Linux-USB Printer Gadget - a4a9 Linux-USB OBEX Gadget - a4aa Linux-USB CDC Composite Gadge (Ethernet and ACM) -0526 Temic MHS S.A. -0527 ALTRA -0528 ATI Technologies, Inc. - 7561 TV Wonder - 7562 TV Wonder, Edition (FN5) - 7563 TV Wonder, Edition (FI) - 7564 TV Wonder, Edition (FQ) - 7565 TV Wonder, Edition (NTSC+) - 7566 TV Wonder, Edition (FN5) - 7567 TV Wonder, Edition (FI) - 7568 TV Wonder, Edition (FQ) - 7569 Live! Pro (A) - 756a Live! Pro Audio (O) -0529 Aladdin Knowledge Systems - 0001 HASP v0.06 - 030b eToken R1 v3.1.3.x - 0313 eToken R1 v3.2.3.x - 031b eToken R1 v3.3.3.x - 0323 eToken R1 v3.4.3.x - 0412 eToken R2 v2.2.4.x - 041a eToken R2 v2.2.4.x - 0422 eToken R2 v2.4.4.x - 042a eToken R2 v2.5.4.x - 050c eToken Pro v4.1.5.x - 0514 eToken Pro v4.2.5.4 - 0600 eToken Pro 64k (4.2) -052a Crescent Heart Software -052b Tekom Technologies, Inc. - 0102 Ca508A HP1020 Camera v.1.3.1.6 - 0801 Yakumo MegaImage 37 - 1512 Yakumo MegaImage IV - 1513 Aosta CX100 Webcam - 1514 Aosta CX100 Webcam Storage - 1905 Yakumo MegaImage 47 - 1911 Yakumo MegaImage 47 SL - 2202 WDM Still Image Capture - 2203 Sound Vision Stream Driver - 3a06 DigiLife DDV-5120A - d001 P35U Camera Capture -052c Canon Information Systems, Inc. -052d Avid Electronics Corp. -052e Standard Microsystems Corp. -052f Unicore Software, Inc. -0530 American Microsystems, Inc. -0531 Wacom Technology Corp. -0532 Systech Corp. -0533 Alcatel Mobile Phones -0534 Motorola, Inc. -0535 LIH TZU Electric Co., Ltd -0536 Hand Held Products (Welch Allyn, Inc.) - 01a0 PDT -0537 Inventec Corp. -0538 Caldera International, Inc. (SCO) -0539 Shyh Shiun Terminals Co., Ltd -053a PrehKeyTec GmbH - 0b00 Hub -053b Global Village Communication -053c Institut of Microelectronic & Mechatronic Systems -053d Silicon Architect -053e Mobility Electronics -053f Synopsys, Inc. -0540 UniAccess AB - 0101 Panache Surf ISDN TA -0541 Sirf Technology, Inc. -0543 ViewSonic Corp. - 00fe G773 Monitor Hub - 00ff P815 Monitor Hub - 0bf2 airpanel V150 Wireless Smart Display - 0bf3 airpanel V110 Wireless Smart Display - 0ed9 Color Pocket PC V35 - 0f01 airsync Wi-Fi Wireless Adapter - 1527 Color Pocket PC V36 - 1529 Color Pocket PC V37 - 152b Color Pocket PC V38 - 152e Pocket PC - 1921 Communicator Pocket PC - 1922 Smartphone - 1923 Pocket PC V30 - 1a11 Wireless 802.11g Adapter - 1e60 TA310 - ATSC/NTSC/PAL Driver(PCM4) - 4153 ViewSonic G773 Control (?) -0544 Cristie Electronics, Ltd -0545 Xirlink, Inc. - 7333 Trution Web Camera - 8002 IBM NetCamera - 8009 Veo PC Camera - 800c Veo Stingray - 800d Veo PC Camera - 8080 IBM C-It Webcam - 808a Veo PC Camera - 808b Veo Stingray - 808d Veo PC Camera - 810a Veo Advanced Connect Webcam - 810b Veo PC Camera - 810c Veo PC Camera - 8135 Veo Mobile/Advanced Web Camera - 813a Veo PC Camera - 813b Veo PC Camera - 813c Veo Mobile/Advanced Web Camera - 8333 Veo Stingray/Connect Web Camera - 888c eVision 123 digital camera - 888d eVision 123 digital camera -0546 Polaroid Corp. - 0daf PDC 2300Z - 1bed PDC 1320 Camera - 3097 PDC 310 - 3155 PDC 3070 Camera - 3187 Digital Camera - 3191 Ion 80 Camera - 3273 PDC 2030 Camera - 3304 a500 Digital Camera - dccf Sound Vision Stream Driver -0547 Anchor Chips, Inc. - 0001 ICSI Bluetooth Device - 1002 Python2 WDM Encoder - 2131 AN2131 EZUSB Microcontroller - 2235 AN2235 EZUSB-FX Microcontroller - 2710 EZ-Link Loader (EZLNKLDR.SYS) - 2720 AN2720 USB-USB Bridge - 2727 Xircom PGUNET USB-USB Bridge - 2750 EZ-Link (EZLNKUSB.SYS) - 2810 Cypress ATAPI Bridge - 7777 Bluetooth Device - 9999 AN2131 uninitialized (?) -0548 Tyan Computer Corp. - 1005 EZ Cart II GameBoy Flash Programmer -0549 Pixera Corp. -054a Fujitsu Microelectronics, Inc. -054b New Media Corp. -054c Sony Corp. - 0001 HUB - 0002 Standard HUB - 0010 DSC-S30/S70/S75/F505V/F505/FD92/W1 Cybershot/Mavica Digital Camera - 0014 Nogatech USBVision (SY) - 0022 Storage Adapter V2 (TPP) - 0023 CD Writer - 0024 Mavica CD-1000 Camera - 0025 NW-MS7 Walkman MemoryStick Reader - 002b Portable USB Harddrive V2 - 002c USB Floppy Disk Drive - 002d MSAC-US1 MemoryStick Reader - 002e Sony HandyCam MemoryStick Reader - 0030 Storage Adapter V2 (TPP) - 0032 MemoryStick MSC-U01 Reader - 0035 Network Walkman (E) - 0036 Net MD - 0037 MG Memory Stick Reader/Writer - 0038 Clie PEG-S300/D PalmOS PDA - 0039 Network Walkman (MS) - 003c VAIO-MX LCD Control - 0045 Digital Imaging Video - 0046 Network Walkman - 004a Memory Stick Hi-Fi System - 004b Memory Stick Reader/Writer - 004e DSC-xxx (ptp) - 0056 MG Memory Stick Reader/Writer - 0058 Clie PEG-N7x0C PalmOS PDA Mass Storage - 0066 Clie PEG-N7x0C/PEG-T425 PalmOS PDA Serial - 0067 CMR-PC3 Webcam - 0069 Memorystick MSC-U03 Reader - 006c FeliCa S310 [PaSoRi] - 006d Clie PEG-T425 PDA Mass Storage - 006f Network Walkman (EV) - 0073 Storage CRX1750U - 0075 Net MD - 0076 Storage Adapter ACR-U20 - 007c Net MD - 007f IC Recorder (MS) - 0080 Net MD - 0081 Net MD - 0084 Net MD - 0085 Net MD - 0086 Net MD - 008b Micro Vault 64M Mass Storage - 0095 Sony Clie s360 - 0099 Clie NR70 PDA Mass Storage - 009a Clie NR70 PDA Serial - 00ab Visual Communication Camera (PCGA-UVC10) - 00af DPP-EX Series Digital Photo Printer - 00bf IC Recorder (S) - 00c0 Handycam DCR-30 - 00c6 Net MD - 00c7 Net MD - 00c8 MZ-N710 Minidisc Walkman - 00c9 Net MD - 00ca MZ-DN430 Minidisc Walkman - 00cb MSAC-US20 Memory Stick Reader - 00da Sony Clie nx60 - 00e8 Network Walkman (MS) - 00e9 Handheld - 00eb Net MD - 0101 Net MD - 0103 IC Recorder (ST) - 0105 Micro Vault Hub - 0107 VCC-U01 Visual Communication Camera - 0110 Digital Imaging Video - 0113 Net MD - 0116 IC Recorder (P) - 0144 Clie PEG-TH55 PDA - 0147 Visual Communication Camera (PCGA-UVC11) - 014c Aiwa AM-NX9 Net MD Music Recorder MDLP - 014d Memory Stick Reader/Writer - 0154 Eyetoy Audio Device - 015f IC Recorder (BM) - 0169 Clie PEG-TJ35 PDA Serial - 016a Clie PEG-TJ35 PDA Mass Storage - 016b Mobile HDD - 016d IC Recorder (SX) - 016e DPP-EX50 Digital Photo Printer - 0171 Fingerprint Sensor 3500 - 017e Net MD - 017f Hi-MD WALKMAN - 0180 Net MD - 0181 Hi-MD WALKMAN - 0182 Net MD - 0183 Hi-MD WALKMAN - 0184 Net MD - 0185 Hi-MD WALKMAN - 0186 Net MD - 0187 Hi-MD MZ-NH600 WALKMAN - 0188 Net MD - 018a Net MD - 018b Hi-MD SOUND GATE - 019e Micro Vault 1.0G Mass Storage - 01ad ATRAC HDD PA - 01bb FeliCa S320 [PaSoRi] - 01bd MRW62E Multi-Card Reader/Writer - 01c3 NW-E55 Network Walkman - 01c6 MEMORY P-AUDIO - 01c7 Printing Support - 01c8 PSP Type A - 01c9 PSP Type B - 01d0 DVD+RW External Drive DRU-700A - 01d5 IC RECORDER - 01de VRD-VC10 [Video Capture] - 01e9 Net MD - 01ea Hi-MD WALKMAN - 01ee IC RECORDER - 01fa Sony IC Recorder (P) - 01fb NW-E405 Network Walkman - 020f Device - 0210 ATRAC HDD PA - 0219 Net MD - 021a Hi-MD WALKMAN - 021b Net MD - 021c Hi-MD WALKMAN - 021d Net MD - 0227 Printing Support - 022c Net MD - 022d Hi-MD AUDIO - 0233 ATRAC HDD PA - 0236 Mobile HDD - 023b DVD+RW External Drive DRU-800UL - 023c Net MD - 023d Hi-MD WALKMAN - 0243 MicroVault Flash Drive - 024b Vaio VGX Mouse - 0257 IFU-WLM2 USB Wireless LAN Module (Wireless Mode) - 0258 IFU-WLM2 USB Wireless LAN Module (Memory Mode) - 0259 IC RECORDER - 0267 Tachikoma Device - 0268 Batoh Device / PlayStation 3 Controller - 0269 HDD WALKMAN - 026a HDD WALKMAN - 0271 IC Recorder (P) - 027c NETWORK WALKMAN - 027e SONY Communicator - 027f IC RECORDER - 0286 Net MD - 0287 Hi-MD WALKMAN - 0290 VGP-UVC100 Visual Communication Camera - 029b PRS-500 eBook reader - 02a5 MicroVault Flash Drive - 02af Handycam DCR-DVD306E - 02c4 Device - 02d1 DVD RW - 02d2 PSP Slim - 02e1 FeliCa S330 [PaSoRi] - 02ea PlayStation 3 Memory Card Adaptor - 02f9 DSC-H9 - 0317 WALKMAN - 031a Walkman NWD-B103F - 031e PRS-300/PRS-505 eBook reader - 033e DSC-W120 - 0346 Handycam DCR-SR55E - 0348 HandyCam HDR-TG3E - 0382 Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1) - 03bc Webbie HD - MHS-CM1 - 03d3 DR-BT100CX - 03d5 PlayStation Move motion controller - 03fc WALKMAN [NWZ-E345] - 03fd Walkman NWZ-E443 - 0440 DSC-H55 - 0485 MHS-PM5 HD camcorder - 04cb WALKMAN NWZ-E354 - 1000 Wireless Buzz! Receiver -054d Try Corp. -054e Proside Corp. -054f WYSE Technology Taiwan -0550 Fuji Xerox Co., Ltd - 0002 InkJet Color Printer - 0004 InkJet Color Printer - 0005 InkJet Color Printer -0551 CompuTrend Systems, Inc. -0552 Philips Monitors -0553 STMicroelectronics Imaging Division (VLSI Vision) - 0001 TerraCAM - 0002 CPiA Webcam - 0100 STV0672 Camera - 0140 Video Camera - 0150 CDE CAM 100 - 0151 Digital Blue QX5 Microscope - 0200 Dual-mode Camera0 - 0201 Dual-mode Camera1 - 0202 Aiptek PenCam 1 - 0674 Multi-mode Camera - 0679 NMS Video Camera (Webcam) - 1002 Che-ez! Splash -0554 Dictaphone Corp. -0555 ANAM S&T Co., Ltd -0556 Asahi Kasei Microsystems Co., Ltd - 0001 AK5370 I/F A/D Converter -0557 ATEN International Co., Ltd - 2001 UC-1284 Printer Port - 2002 10Mbps Ethernet [klsi] - 2004 UC-100KM PS/2 Mouse and Keyboard adapter - 2006 UC-1284B Printer Port - 2007 UC-110T 100Mbps Ethernet [pegasus] - 2008 UC-232A Serial Port [pl2303] - 2009 UC-210T Ethernet - 2011 UC-2324 4xSerial Ports [mos7840] - 2202 CS124U Miniview II KVM Switch - 2213 CS682 2-Port USB 2.0 DVI KVM Switch - 2404 4-port switch - 2600 IDE Bridge - 2701 CE700A KVM Extender - 4000 DSB-650 10Mbps Ethernet [klsi] - 7000 Hub - 7820 UC-2322 2xSerial Ports [mos7820] -0558 Truevision, Inc. - 1009 GW Instek GDS-1000 Oscilloscope - 100a GW Instek GDS-1000A Oscilloscope - 2009 GW Instek GDS-2000 Oscilloscope -0559 Cadence Design Systems, Inc. -055a Kenwood USA -055b KnowledgeTek, Inc. -055c Proton Electronic Ind. -055d Samsung Electro-Mechanics Co. - 0001 Keyboard - 0bb1 Bluetooth Device - 1030 Optical Wheel Mouse (OMS3CB/OMGB30) - 1031 Optical Wheel Mouse (OMA3CB/OMGI30) - 1040 Mouse HID Device - 1050 E-Mail Optical Wheel Mouse (OMS3CE) - 1080 Optical Wheel Mouse (OMS3CH) - 2020 Floppy Disk Drive - 6780 Keyboard V1 - 6781 Keyboard Mouse - 8001 E.M. Hub - 9000 AnyCam [pwc] - 9001 MPC-C30 AnyCam Premium for Notebooks [pwc] - a000 SWL-2100U - a010 WLAN Adapter(SWL-2300) - a011 Boot Device - a012 WLAN Adapter(SWL-2300) - a013 WLAN Adapter(SWL-2350) - a230 Boot Device - b000 11Mbps WLAN Mini Adapter - b230 Netopia 802.11b WLAN Adapter - b231 LG Wireless LAN 11b Adapter -055e CTX Opto-Electronics Corp. -055f Mustek Systems, Inc. - 0001 ScanExpress 1200 CU - 0002 ScanExpress 600 CU - 0003 ScanExpress 1200 USB - 0006 ScanExpress 1200 UB - 0007 ScanExpress 1200 USB Plus - 0008 ScanExpress 1200 CU Plus - 0010 BearPaw 1200F - 0210 ScanExpress A3 USB - 0218 BearPaw 2400 TA - 0219 BearPaw 2400 TA Plus - 021a BearPaw 2448 TA Plus - 021b BearPaw 1200 CU Plus - 021c BearPaw 1200 CU Plus - 021d BearPaw 2400 CU Plus - 021e BearPaw 1200 TA/CS - 021f SNAPSCAN e22 - 0400 BearPaw 2400 TA Pro - 0401 P 3600 A3 Pro - 0408 BearPaw 2448 CU Pro - 0409 BearPaw 2448 TA Pro - 040b ScanExpress A3 USB 1200 PRO - 0873 ScanExpress 600 USB - 1000 BearPaw 4800 TA Pro - a350 gSmart 350 Camera - a800 MDC 800 Camera - b500 MDC 3000 Camera - c005 PC CAM 300A - c200 gSmart 300 - c211 Kowa Bs888e Microcamera - c220 gSmart mini - c230 Digicam 330K - c232 MDC3500 Camera - c360 DV 4000 Camera - c420 gSmart mini 2 Camera - c430 gSmart LCD 2 Camera - c440 DV 3000 Camera - c520 gSmart mini 3 Camera - c530 gSmart LCD 2 Camera - c540 gSmart D30 Camera - c630 MDC 4000 Camera - c631 MDC 4000 Camera - c650 MDC 5500Z Camera - d001 WCam 300 - d003 WCam 300A - d004 WCam 300AN -0560 Interface Corp. -0561 Oasis Design, Inc. -0562 Telex Communications, Inc. - 0001 Enhanced Microphone - 0002 Telex Microphone -0563 Immersion Corp. -0564 Kodak Digital Product Center, Japan Ltd. (formerly Chinon Industries Inc.) -0565 Peracom Networks, Inc. - 0001 Serial Port [etek] - 0002 Enet Ethernet [klsi] - 0003 @Home Networks Ethernet [klsi] - 0005 Enet2 Ethernet [klsi] - 0041 Peracom Remote NDIS Ethernet Adapter -0566 Monterey International Corp. - 0110 ViewMate Desktop Mouse CC2201 - 1001 ViewMate Desktop Mouse CC2201 - 1002 ViewMate Desktop Mouse CC2201 - 1003 ViewMate Desktop Mouse CC2201 - 1004 ViewMate Desktop Mouse CC2201 - 1005 ViewMate Desktop Mouse CC2201 - 1006 ViewMate Desktop Mouse CC2201 - 1007 ViewMate Desktop Mouse CC2201 - 2800 MIC K/B - 2801 MIC K/B Mouse - 2802 Kbd Hub - 3004 Genius KB-29E -0567 Xyratex International, Ltd -0568 Quartz Ingenierie -0569 SegaSoft -056a Wacom Co., Ltd - 0000 PenPartner - 0001 PenPartner 4x5 - 0002 PenPartner 6x8 - 0003 Cintiq Partner - 0010 Graphire - 0011 Graphire 2 4x5 - 0012 Graphire 2 5x7 - 0013 Graphire 3 4x5 - 0014 Graphire 3 6x8 - 0015 Graphire 4 4x5 - 0016 Graphire 4 6x8 - 0017 Bamboo Fun 4x5 - 0018 Bamboo Fun 6x8 - 0019 Bamboo One Medium - 0020 Intuos 4x5 - 0021 Intuos 6x8 - 0022 Intuos 9x12 - 0023 Intuos 12x12 - 0024 Intuos 12x18 - 0030 PL400 - 0031 PL500 - 0032 PL600 - 0033 PL600SX - 0034 PL550 - 0035 PL800 - 0037 PL700 - 0038 PL510 - 0039 DTU-710 - 003f Cintiq 21UX - 0041 Intuos2 4x5 - 0042 Intuos2 6x8 - 0043 Intuos2 9x12 - 0044 Intuos2 12x12 - 0045 Intuos2 12x18 - 0047 Intuos2 6x8 - 0060 Volito - 0061 PenStation2 - 0062 Volito2 4x5 - 0063 Volito2 2x3 - 0064 PenPartner2 - 0065 Bamboo - 0069 Bamboo One - 0081 Graphire Wireless 6x8 - 0090 TPC90 - 0093 TPC93 - 009a TPC9A - 00b0 Intuos3 4x5 - 00b1 Intuos3 6x18 - 00b2 Intuos3 9x12 - 00b3 Intuos3 12x12 - 00b4 Intuos3 12x19 - 00b5 Intuos3 6x11 (PTZ-631W) - 00b7 Intuos3 4x6 - 00b8 Intuos4 4x6 - 00b9 Intuos4 6x9 - 00ba Intuos4 8x13 - 00bb Intuos4 12x19 - 00c0 DTF-521 - 00c4 DTF-720 - 00c5 Cintiq 20WSX - 00c6 Cintiq 12WX - 00c7 DTU-1931 - 00d1 Bamboo Pen & Touch (CTH-460-DE) - 00d3 Bamboo Fun (CTH-661) - 00db Bamboo Fun (CTH-661SE-NL) - 0400 PenPartner 4x5 - 4850 PenPartner 6x8 -056b Decicon, Inc. -056c eTEK Labs - 0006 KwikLink Host-Host Connector - 8007 Kwik232 Serial Port - 8100 KwikLink Host-Host Connector - 8101 KwikLink USB-USB Bridge -056d EIZO Corp. - 0000 Hub - 0001 Monitor - 0002 HID Monitor Controls - 0003 Device Bay Controller -056e Elecom Co., Ltd - 0002 29UO Mouse - 200c LD-USB/TX - 4002 Laneed 100Mbps Ethernet LD-USB/TX [pegasus] - 4005 LD-USBL/TX - 400b LD-USB/TX - 4010 LD-USB20 - 5003 UC-SGT - 5004 UC-SGT - 6008 Flash Disk - abc1 LD-USB/TX -056f Korea Data Systems Co., Ltd - cd00 CDM-751 CD organizer -0570 Epson America -0571 Interex, Inc. - 0002 echoFX InterView Lite -0572 Conexant Systems (Rockwell), Inc. - 0001 Ezcam II Webcam - 0002 Ezcam II Webcam - 0040 Wondereye CP-115 Webcam - 0041 Webcam Notebook - 0042 Webcam Notebook - 1232 V.90 modem - 1234 Typhoon Redfun Modem V90 56k - 1252 HCF V90 Data Fax Voice Modem - 1253 Zoom V.92 Faxmodem - 1300 SoftK56 Data Fax Voice CARP - 1301 Modem Enumerator - 2000 SoftGate 802.11 Adapter - 2002 SoftGate 802.11 Adapter - 8390 WinFast PalmTop/Novo TV Video - 8392 WinFast PalmTop/Novo TV Video - cafe AccessRunner ADSL Modem - cb00 ADSL Modem - cb01 ADSL Modem - cb06 StarModem Network Interface -0573 Zoran Co. Personal Media Division (Nogatech) - 0003 USBGear USBG-V1 - 0400 D-Link V100 - 0600 Dazzle USBVision (1006) - 1300 leadtek USBVision (1006) - 2000 X10 va10a Wireless Camera - 2001 Dazzle EmMe (2001) - 2101 Zoran Co. PMD (Nogatech) AV-grabber Manhattan - 2d00 Osprey 50 - 2d01 Hauppauge USB-Live Model 600 - 3000 Dazzle MicroCam (NTSC) - 3001 Dazzle MicroCam (PAL) - 4000 Nogatech TV! (NTSC) - 4001 Nogatech TV! (PAL) - 4002 Nogatech TV! (PAL-I-) - 4003 Nogatech TV! (MF-) - 4008 Nogatech TV! (NTSC) (T) - 4009 Nogatech TV! (PAL) (T) - 4010 Nogatech TV! (NTSC) (A) - 4100 USB-TV FM (NTSC) - 4110 PNY USB-TV (NTSC) FM - 4400 Nogatech TV! Pro (NTSC) - 4401 Nogatech TV! Pro (PAL) - 4450 PixelView PlayTv-USB PRO (PAL) FM - 4451 Nogatech TV! Pro (PAL+) - 4452 Nogatech TV! Pro (PAL-I+) - 4500 Nogatech TV! Pro (NTSC) - 4501 Nogatech TV! Pro (PAL) - 4550 ZTV ZT-721 2.4GHz A/V Receiver - 4551 Dazzle TV! Pro Audio (P+) - 4d00 Hauppauge WinTV-USB USA - 4d01 Hauppauge WinTV-USB - 4d02 Hauppauge WinTV-USB UK - 4d03 Hauppauge WinTV-USB France - 4d04 Hauppauge WinTV (PAL D/K) - 4d10 Hauppauge WinTV-USB with FM USA radio - 4d11 Hauppauge WinTV-USB (PAL) with FM radio - 4d12 Hauppauge WinTV-USB UK with FM Radio - 4d14 Hauppauge WinTV (PAL D/K FM) - 4d20 Hauppauge WinTV-USB II (PAL) with FM radio - 4d21 Hauppauge WinTV-USB II (PAL) - 4d22 Hauppauge WinTV-USB II (PAL) Model 566 - 4d23 Hauppauge WinTV-USB France 4D23 - 4d24 Hauppauge WinTV Pro (PAL D/K) - 4d25 Hauppauge WinTV-USB Model 40209 rev B234 - 4d26 Hauppauge WinTV-USB Model 40209 rev B243 - 4d27 Hauppauge WinTV-USB Model 40204 Rev B281 - 4d28 Hauppauge WinTV-USB Model 40204 rev B283 - 4d29 Hauppauge WinTV-USB Model 40205 rev B298 - 4d2a Hauppague WinTV-USB Model 602 Rev B285 - 4d2b Hauppague WinTV-USB Model 602 Rev B282 - 4d2c Hauppauge WinTV Pro (PAL/SECAM) - 4d30 Hauppauge WinTV-USB FM Model 40211 Rev B123 - 4d31 Hauppauge WinTV-USB III (PAL) with FM radio Model 568 - 4d32 Hauppauge WinTV-USB III (PAL) FM Model 573 - 4d34 Hauppauge WinTV Pro (PAL D/K FM) - 4d35 Hauppauge WinTV-USB III (PAL) FM Model 597 - 4d36 Hauppauge WinTV Pro (PAL B/G FM) - 4d37 Hauppauge WinTV-USB Model 40219 rev E189 - 4d38 Hauppauge WinTV Pro (NTSC FM) -0574 City University of Hong Kong -0575 Philips Creative Display Solutions -0576 BAFO/Quality Computer Accessories -0577 ELSA -0578 Intrinsix Corp. -0579 GVC Corp. -057a Samsung Electronics America -057b Y-E Data, Inc. - 0000 FlashBuster-U Floppy - 0001 Tri-Media Reader Floppy - 0006 Tri-Media Reader Card Reader - 0010 Memory Stick Reader Writer - 0020 HEXA Media Drive 6-in-1 Card Reader Writer - 0030 Memory Card Viewer (TV) -057c AVM GmbH - 0b00 ISDN-Controller B1 Family - 0c00 ISDN-Controller FRITZ!Card - 1000 ISDN-Controller FRITZ!Card v2.0 - 1900 ISDN-Controller FRITZ!Card v2.1 - 2000 ISDN-Connector FRITZ!X - 2200 BlueFRITZ! - 2300 Teledat X130 DSL - 2800 ISDN-Connector TA - 3200 Teledat X130 DSL - 3500 FRITZ!Card DSL SL - 3701 FRITZ!Box SL - 3702 FRITZ!Box - 3800 BlueFRITZ! Bluetooth Stick - 3a00 FRITZ!Box Fon - 3c00 FRITZ!Box WLAN - 3d00 Fritz!Box - 3e01 FRITZ!Box (Annex A) - 4001 FRITZ!Box Fon (Annex A) - 4101 FRITZ!Box WLAN (Annex A) - 4201 FRITZ!Box Fon WLAN (Annex A) - 4601 Eumex 5520PC (WinXP/2000) - 4602 Eumex 400 (WinXP/2000) - 4701 AVM FRITZ!Box Fon ata - 5401 Eumex 300 IP - 5601 AVM Fritz!WLAN [Texas Instruments TNETW1450] - 6201 AVM Fritz!WLAN v1.1 [Texas Instruments TNETW1450] - 62ff AVM Fritz!WLAN USB (in CD-ROM-mode) - 8401 AVM Fritz!WLAN N [Atheros AR9001U] - 8402 AVM Fritz!WLAN N 2.4 [Atheros AR9001U] - 84ff AVM Fritz!WLAN USB N (in CD-ROM-mode) -057d Shark Multimedia, Inc. -057e Nintendo Co., Ltd - 0305 Broadcom BCM2045A Bluetooth Radio [Nintendo Wii] - 0306 Wii Remote Controller RVL-003 -057f QuickShot, Ltd - 6238 USB StrikePad -0580 Denron, Inc. -0581 Racal Data Group -0582 Roland Corp. - 0000 UA-100 - 0002 UM-4/MPU-64 MIDI Interface - 0003 SoundCanvas SC-8850 - 0004 U-8 - 0005 Edirol UM-2 MIDI Adapter - 0007 SoundCanvas SC-8820 - 0008 PC-300 - 0009 Edirol UM-1SX MIDI Adapter - 000b SK-500 - 000c SC-D70 - 0010 EDIROL UA-5 - 0011 Edirol UA-5 Sound Capture - 0012 XV-5050 - 0013 XV-5050 - 0014 EDIROL UM-880 MIDI I/F (native) - 0015 EDIROL UM-880 MIDI I/F (generic) - 0016 EDIROL SD-90 - 0017 EDIROL SD-90 - 0018 UA-1A - 001b MMP-2 - 001c MMP-2 - 001d V-SYNTH - 001e V-SYNTH - 0023 EDIROL UM-550 - 0024 EDIROL UM-550 - 0025 EDIROL UA-20 - 0026 EDIROL UA-20 - 0027 EDIROL SD-20 - 0028 EDIROL SD-20 - 0029 EDIROL SD-80 - 002a EDIROL SD-80 - 002b EDIROL UA-700 - 002c EDIROL UA-700 - 002d XV-2020 Synthesizer - 002e XV-2020 Synthesizer - 002f VariOS - 0030 VariOS - 0033 EDIROL PCR - 0034 EDIROL PCR - 0037 Digital Piano - 0038 Digital Piano - 003b BOSS GS-10 - 003c BOSS GS-10 - 0040 GI-20 - 0041 GI-20 - 0042 RS-70 - 0043 RS-70 - 0044 EDIROL UA-1000 - 0047 EDIROL UR-80 WAVE - 0048 EDIROL UR-80 MIDI - 0049 EDIROL UR-80 WAVE - 004a EDIROL UR-80 MIDI - 004b EDIROL M-100FX - 004c EDIROL PCR-A WAVE - 004d EDIROL PCR-A MIDI - 004e EDIROL PCR-A WAVE - 004f EDIROL PCR-A MIDI - 0050 EDIROL UA-3FX - 0052 EDIROL UM-1SX - 0054 Digital Piano - 0060 EXR Series - 0064 EDIROL PCR-1 WAVE - 0065 EDIROL PCR-1 MIDI - 0066 EDIROL PCR-1 WAVE - 0067 EDIROL PCR-1 MIDI - 006a SP-606 - 006b SP-606 - 006d FANTOM-X - 006e FANTOM-X - 0073 EDIROL UA-25 - 0074 EDIROL UA-25 - 0075 BOSS DR-880 - 0076 BOSS DR-880 - 007a RD - 007b RD - 007d EDIROL UA-101 - 0080 G-70 - 0081 G-70 - 008b EDIROL PC-50 - 008c EDIROL PC-50 - 008d EDIROL UA-101 USB1 - 0092 EDIROL PC-80 WAVE - 0093 EDIROL PC-80 MIDI - 0096 EDIROL UA-1EX - 009a EDIROL UM-3EX - 009d EDIROL UM-1 - 00a2 Digital Piano - 00a3 EDIROL UA-4FX - 00a6 Juno-G - 00ad SH-201 - 00c4 EDIROL M-16DX - 00db BOSS GT-10 Guitar Effects Processor - 00de Fantom-G7 - 00e6 EDIROL UA-25EX (Advanced mode) - 00e7 EDIROL UA-25EX - 010f A-PRO - 0110 A-PRO -0583 Padix Co., Ltd (Rockfire) - 0001 4 Axis 12 button +POV - 0002 4 Axis 12 button +POV - 2030 RM-203 USB Nest [mode 1] - 2031 RM-203 USB Nest [mode 2] - 2032 RM-203 USB Nest [mode 3] - 2033 RM-203 USB Nest [mode 4] - 2050 PX-205 PSX Bridge - 205f PSX/USB converter - 206f USB, 2-axis 8-button gamepad - 3050 QF-305u Gamepad - 3379 Rockfire X-Force - 337f Rockfire USB RacingStar Vibra - 509f USB,4-Axis,12-Button with POV - 5259 Rockfire USB SkyShuttle Vibra - 525f USB Vibration Pad - 5308 USB Wireless VibrationPad - 5359 Rockfire USB SkyShuttle Pro - 535f USB,real VibrationPad - 5659 Rockfire USB SkyShuttle Vibra - 565f USB VibrationPad - 6009 Revenger - 600f USB,GameBoard II - 6258 USB, 4-axis, 6-button joystick w/view finder - 6889 Windstorm Pro - 688f QF-688uv Windstorm Pro Joystick - 7070 QF-707u Bazooka Joystick - a000 MaxFire G-08XU Gamepad - a015 4-Axis,16-Button with POV - a019 USB, Vibration ,4-axis, 8-button joystick w/view finder - a020 USB,4-Axis,10-Button with POV - a021 USB,4-Axis,12-Button with POV - a022 USB,4-Axis,14-Button with POV - a023 USB,4-Axis,16-Button with POV - a024 4axis,12button vibrition audio gamepad - a025 4axis,12button vibrition audio gamepad - a130 USB Wireless 2.4GHz Gamepad - a131 USB Wireless 2.4GHz Joystick - a132 USB Wireless 2.4GHz Wheelpad - a133 USB Wireless 2.4GHz Wheel&Gamepad - a202 ForceFeedbackWheel - a209 MetalStrike FF - b000 USB,4-Axis,12-Button with POV - b001 USB,4-Axis,12-Button with POV - b002 Vibration,12-Button USB Wheel - b005 USB,12-Button Wheel - b008 USB Wireless 2.4GHz Wheel - b009 USB,12-Button Wheel - b00a PSX/USB converter - b00b PSX/USB converter - b00c PSX/USB converter - b00d PSX/USB converter - b00e 4-Axis,12-Button with POV - b00f USB,5-Axis,10-Button with POV - b010 MetalStrike Pro - b012 Wireless MetalStrike - b013 USB,Wiress 2.4GHZ Joystick - b016 USB,5-Axis,10-Button with POV - b018 TW6 Wheel - ff60 USB Wireless VibrationPad -0584 RATOC System, Inc. - 0008 Fujifilm MemoryCard ReaderWriter - 0220 U2SCX SCSI Converter - b000 REX-USB60 -0585 FlashPoint Technology, Inc. - 0001 Digital Camera - 0002 Digital Camera - 0003 Digital Camera - 0004 Digital Camera - 0005 Digital Camera - 0006 Digital Camera - 0007 Digital Camera - 0008 Digital Camera - 0009 Digital Camera - 000a Digital Camera - 000b Digital Camera - 000c Digital Camera - 000d Digital Camera - 000e Digital Camera - 000f Digital Camera -0586 ZyXEL Communications Corp. - 0025 802.11b/g/n USB Wireless Network Adapter - 0102 omni.net II ISDN TA - 1000 Omni NET Modem / ISDN TA - 1500 Omni 56K Plus - 2011 Scorpion-980N keyboard - 3304 LAN Modem - 3309 ADSL Modem Prestige 600 series - 330a ADSL Modem Interface - 330e USB Broadband ADSL Modem Rev 1.10 - 3400 ZyAIR B-220 IEEE 802.11b Adapter - 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 - 3417 NWD271N 802.11n Wireless Adapter [Atheros AR9001U-(2)NG] - 3418 NWD211AN 802.11abgn Wireless Adapter [Ralink RT2870] - 341a NWD-270N Wireless N-lite USB Adapter - 341f NWD2205 802.11n Wireless N Adapter [Realtek RTL8192CU] -0587 America Kotobuki Electronics Industries, Inc. -0588 Sapien Design -0589 Victron -058a Nohau Corp. -058b Infineon Technologies -058c In Focus Systems - 0007 Flash - 0008 LP130 - 000a LP530 - 0010 Projector - 0011 Projector - 0012 Projector - 0013 Projector - 0014 Projector - 0015 Projector - 0016 Projector - 0017 Projector - 0018 Projector - 0019 Projector - 001a Projector - 001b Projector - 001c Projector - 001d Projector - 001e Projector - 001f Projector -058d Micrel Semiconductor -058e Tripath Technology, Inc. -058f Alcor Micro Corp. - 1234 Flash Drive - 2412 SCard R/W CSR-145 - 2802 Monterey Keyboard - 5492 Hub - 6232 Hi-Speed 16-in-1 Flash Card Reader/Writer - 6254 USB Hub - 6331 SD/MMC/MS Card Reader - 6332 Multi-Function Card Reader - 6335 SD/MMC Card Reader - 6360 Multimedia Card Reader - 6361 Multimedia Card Reader - 6362 Flash Card Reader/Writer - 6366 Multi Flash Reader - 6377 Multimedia Card Reader - 6386 Memory Card - 6387 Transcend JetFlash Flash Drive - 6390 USB 2.0-IDE bridge - 9213 MacAlly Kbd Hub - 9215 AU9814 Hub - 9254 Hub - 9310 Mass Storage (UID4/5A & UID7A) - 9320 Micro Storage Driver for Win98 - 9321 Micro Storage Driver for Win98 - 9330 SD Reader - 9331 Micro Storage Driver for Win98 - 9340 Delkin eFilm Reader-32 - 9350 Delkin eFilm Reader-32 - 9360 8-in-1 Media Card Reader - 9361 Multimedia Card Reader - 9368 Multimedia Card Reader - 9380 Flash Drive - 9382 Acer/Sweex Flash drive - 9384 qdi U2Disk T209M - 9410 Keyboard - 9472 Keyboard Hub - 9510 ChunghwaTL USB02 Smartcard Reader - 9520 EMV Certified Smart Card Reader - 9720 USB-Serial Adapter -0590 Omron Corp. - 0004 Cable Modem - 000b MR56SVS - 0028 HJ-720IT Pedometer / Blood Pressure Monitor HEM-7080IT-E -0591 Questra Consulting -0592 Powerware Corp. - 0002 UPS (X-Slot) -0593 Incite -0594 Princeton Graphic Systems -0595 Zoran Microelectronics, Ltd - 1001 Digitrex DSC-1300/DSC-2100 (mass storage mode) - 2002 DIGITAL STILL CAMERA 6M 4X - 4343 Digital Camera EX-20 DSC -0596 MicroTouch Systems, Inc. - 0001 Touchscreen - 0002 Touch Screen Controller - 0500 PCT Multitouch HID Controller -0597 Trisignal Communications -0598 Niigata Canotec Co., Inc. -0599 Brilliance Semiconductor, Inc. -059a Spectrum Signal Processing, Inc. -059b Iomega Corp. - 0001 Zip 100 (Type 1) - 000b Zip 100 (Type 2) - 0021 Win98 Disk Controller - 0030 Zip 250 (Ver 1) - 0031 Zip 100 (Type 3) - 0032 Zip 250 (Ver 2) - 0034 Zip 100 Driver - 0037 Zip 750 MB - 0040 SCSI Bridge - 0042 Rev 70 GB - 0050 Zip CD 650 Writer - 0053 CDRW55292EXT CD-RW External Drive - 0057 Mass Storage Device - 005d Mass Storage Device - 005f CDRW64892EXT3-C CD-RW 52x24x52x External Drive - 0060 PCMCIA PocketZip Dock - 0061 Varo PocketZip 40 MP3 Player - 006d HipZip MP3 Player - 007c Ultra Max USB/1394 - 007e Mini 256MB/512MB Flash Drive [IOM2D5] - 00db FotoShow Zip 250 Driver - 0150 Mass Storage Device - 015d Super DVD Writer - 0173 Hi-Speed USB-to-IDE Bridge Controller - 0174 Hi-Speed USB-to-IDE Bridge Controller - 0176 Hi-Speed USB-to-IDE Bridge Controller - 0177 Hi-Speed USB-to-IDE Bridge Controller - 0178 Hi-Speed USB-to-IDE Bridge Controller - 0179 Hi-Speed USB-to-IDE Bridge Controller - 017a HDD - 017b HDD/1394A - 017c HDD/1394B - 0251 Optical - 0252 Optical - 027a LPHD250-U [Portable Hard Drive Silver Series 250 Go] - 0470 Prestige Portable Hard Drive - 047a Select Portable Hard Drive - 0579 eGo Portable Hard Drive - 1052 DVD+RW External Drive -059c A-Trend Technology Co., Ltd -059d Advanced Input Devices -059e Intelligent Instrumentation -059f LaCie, Ltd - 0201 StudioDrive USB2 - 0202 StudioDrive USB2 - 0203 StudioDrive USB2 - 0211 PocketDrive - 0212 PocketDrive - 0213 PocketDrive USB2 - 0323 LaCie d2 Drive USB2 - 0421 Big Disk G465 - 0641 Mobile Hard Drive - 1010 Desktop Hard Drive - 1019 Desktop Hard Drive - 1021 Little Disk - 1027 iamaKey V2 - 102a Rikiki Hard Drive - 1049 rikiki Harddrive - a601 HardDrive - a602 CD R/W -05a0 Vetronix Corp. -05a1 USC Corp. -05a2 Fuji Film Microdevices Co., Ltd -05a3 ARC International - 8388 Marvell 88W8388 802.11a/b/g WLAN -05a4 Ortek Technology, Inc. - 2000 WKB-2000 Wireless Keyboard with Touchpad - 9720 Keyboard Mouse - 9722 Keyboard - 9731 MCK-600W/MCK-800USB Keyboard - 9783 Wireless Keypad -05a5 Sampo Technology Corp. -05a6 Cisco Systems, Inc. - 0001 CVA124 Cable Voice Adapter (WDM) - 0002 CVA122 Cable Voice Adapter (WDM) - 0003 CVA124E Cable Voice Adapter (WDM) - 0004 CVA122E Cable Voice Adapter (WDM) -05a7 Bose Corp. -05a8 Spacetec IMC Corp. -05a9 OmniVision Technologies, Inc. - 0511 OV511 Webcam - 0518 OV518 Webcam - 0519 OV519 Microphone - 1550 VEHO Filmscanner - 2640 OV2640 Webcam - 2643 Monitor Webcam - 264b Monitor Webcam - 2800 SuperCAM - 4519 Webcam Classic - 7670 OV7670 Webcam - 8519 OV519 Webcam - a511 OV511+ Webcam - a518 D-Link DSB-C310 Webcam -05aa Utilux South China, Ltd -05ab In-System Design - 0002 Parallel Port - 0030 Storage Adapter V2 (TPP) - 0031 ATA Bridge - 0060 USB 2.0 ATA Bridge - 0061 Storage Adapter V3 (TPP-I) - 0101 Storage Adapter (TPP) - 0130 Compact Flash and Microdrive Reader (TPP) - 0200 USS725 ATA Bridge - 0201 Storage Adapter (TPP) - 0202 ATA Bridge - 0300 Portable Hard Drive (TPP) - 0301 Portable Hard Drive V2 - 0350 Portable Hard Drive (TPP) - 0351 Portable Hard Drive V2 - 081a ATA Bridge - 0cda ATA Bridge for CD-R/RW - 1001 BAYI Printer Class Support - 5700 Storage Adapter V2 (TPP) - 5701 USB Storage Adapter V2 - 5901 Smart Board (TPP) - 5a01 ATI Storage Adapter (TPP) - 5d01 DataBook Adapter (TPP) -05ac Apple, Inc. - 0201 USB Keyboard [Alps or Logitech, M2452] - 0202 Keyboard [ALPS] - 0205 Extended Keyboard [Mitsumi] - 0206 Extended Keyboard [Mitsumi] - 020b Pro Keyboard [Mitsumi, A1048/US layout] - 020c Extended Keyboard [Mitsumi] - 020d Pro Keyboard [Mitsumi, A1048/JIS layout] - 020e Internal Keyboard/Trackpad (ANSI) - 020f Internal Keyboard/Trackpad (ISO) - 0214 Internal Keyboard/Trackpad (ANSI) - 0215 Internal Keyboard/Trackpad (ISO) - 0216 Internal Keyboard/Trackpad (JIS) - 0217 Internal Keyboard/Trackpad (ANSI) - 0218 Internal Keyboard/Trackpad (ISO) - 0219 Internal Keyboard/Trackpad (JIS) - 021a Internal Keyboard/Trackpad (ANSI) - 021b Internal Keyboard/Trackpad (ISO) - 021c Internal Keyboard/Trackpad (JIS) - 021d Aluminum Mini Keyboard (ANSI) - 021e Aluminum Mini Keyboard (ISO) - 021f Aluminum Mini Keyboard (JIS) - 0220 Aluminum Keyboard (ANSI) - 0221 Aluminum Keyboard (ISO) - 0222 Aluminum Keyboard (JIS) - 0223 Internal Keyboard/Trackpad (ANSI) - 0224 Internal Keyboard/Trackpad (ISO) - 0225 Internal Keyboard/Trackpad (JIS) - 0229 Internal Keyboard/Trackpad (MacBook Pro) (ANSI) - 022a Internal Keyboard/Trackpad (MacBook Pro) (ISO) - 022b Internal Keyboard/Trackpad (MacBook Pro) (JIS) - 0230 Internal Keyboard/Trackpad (MacBook Pro 4,1) (ANSI) - 0231 Internal Keyboard/Trackpad (MacBook Pro 4,1) (ISO) - 0232 Internal Keyboard/Trackpad (MacBook Pro 4,1) (JIS) - 0236 Internal Keyboard/Trackpad (ANSI) - 0237 Internal Keyboard/Trackpad (ISO) - 0238 Internal Keyboard/Trackpad (JIS) - 0301 USB Mouse [Mitsumi, M4848] - 0302 Optical Mouse [Fujitsu] - 0304 Optical USB Mouse [Mitsumi] - 0306 Optical USB Mouse [Fujitsu] - 030a Internal Trackpad - 030b Internal Trackpad - 030e Wireless Trackpad [Magic Trackpad] - 1000 Bluetooth HCI MacBookPro (HID mode) - 1001 Keyboard Hub [ALPS] - 1002 Extended Keyboard Hub [Mitsumi] - 1003 Hub in Pro Keyboard [Mitsumi, A1048] - 1006 Hub in Aluminum Keyboard - 1101 Speakers - 1201 3G iPod - 1202 iPod 2G - 1203 iPod 4.Gen Grayscale 40G - 1204 iPod [Photo] - 1205 iPod Mini 1.Gen/2.Gen - 1206 iPod '06' - 1207 iPod '07' - 1208 iPod '08' - 1209 iPod Video - 120a iPod Nano - 1223 iPod Classic/Nano 3.Gen (DFU mode) - 1224 iPod Nano 3.Gen (DFU mode) - 1225 iPod Nano 4.Gen (DFU mode) - 1227 Mobile Device (DFU Mode) - 1231 iPod Nano 5.Gen (DFU mode) - 1240 iPod Nano 2.Gen (DFU mode) - 1242 iPod Nano 3.Gen (WTF mode) - 1243 iPod Nano 4.Gen (WTF mode) - 1245 iPod Classic 3.Gen (WTF mode) - 1246 iPod Nano 5.Gen (WTF mode) - 1255 iPod Nano 4.Gen (DFU mode) - 1260 iPod Nano 2.Gen - 1261 iPod Classic - 1262 iPod Nano 3.Gen - 1263 iPod Nano 4.Gen - 1265 iPod Nano 5.Gen - 1266 iPod Nano 6.Gen - 1281 Apple Mobile Device [Recovery Mode] - 1290 iPhone - 1291 iPod Touch 1.Gen - 1292 iPhone 3G - 1293 iPod Touch 2.Gen - 1294 iPhone 3GS - 1296 iPod Touch 3.Gen (8GB) - 1297 iPhone 4 - 1299 iPod Touch 3.Gen - 129a iPad - 129e iPod Touch 4.Gen - 129f iPad 2 - 1300 iPod Shuffle - 1301 iPod Shuffle 2.Gen - 1302 iPod Shuffle 3.Gen - 1303 iPod Shuffle 4.Gen - 1401 Modem - 8202 HCF V.90 Data/Fax Modem - 8203 Bluetooth HCI - 8204 Bluetooth HCI [Bluetooth 2.0 + EDR, built-in] - 8205 Bluetooth HCI - 8206 Bluetooth HCI - 820f Bluetooth HCI - 8215 Bluetooth USB Host Controller - 8216 Bluetooth USB Host Controller - 8217 Bluetooth USB Host Controller - 8218 Bluetooth Host Controller - 8240 IR Receiver [built-in] - 8241 IR Receiver [built-in] - 8242 IR Receiver [built-in] - 8300 Built-in iSight (no firmware loaded) - 8403 Internal Memory Card Reader - 8501 Built-in iSight [Micron] - 8502 Built-in iSight - 8505 Built-in iSight - 8507 Built-in iSight - 911c Hub in A1082 [Cinema HD Display 23"] - 912f Hub in 30" Cinema Display - 921c A1082 [Cinema HD Display 23"] - 9221 30" Cinema Display - ffff Bluetooth in DFU mode - Driver -05ad Y.C. Cable U.S.A., Inc. -05ae Synopsys, Inc. -05af Jing-Mold Enterprise Co., Ltd - 0809 Wireless Keyboard and Mouse - 0821 IDE to - 3062 Cordless Keyboard - 9167 KB 9151B - 678 - 9267 KB 9251B - 678 Mouse -05b0 Fountain Technologies, Inc. -05b1 First International Computer, Inc. - 1389 Bluetooth Wireless Adapter -05b4 LG Semicon Co., Ltd - 4857 M-Any DAH-210 - 6001 Digisette DUO-MP3 AR-100 -05b5 Dialogic Corp. -05b6 Proxima Corp. -05b7 Medianix Semiconductor, Inc. -05b8 Agiler, Inc. - 3002 Scroll Mouse -05b9 Philips Research Laboratories -05ba DigitalPersona, Inc. - 0007 Fingerprint Reader - 0008 Fingerprint Reader - 000a Fingerprint Reader -05bb Grey Cell Systems -05bc 3G Green Green Globe Co., Ltd - 0004 Trackball -05bd RAFI GmbH & Co. KG -05be Tyco Electronics (Raychem) -05bf S & S Research -05c0 Keil Software -05c1 Kawasaki Microelectronics, Inc. -05c2 Media Phonics (Suisse) S.A. -05c5 Digi International, Inc. - 0002 AccelePort USB 2 - 0004 AccelePort USB 4 - 0008 AccelePort USB 8 -05c6 Qualcomm, Inc. - 0114 Select RW-200 CDMA Wireless Modem - 1000 Mass Storage Device - 3100 CDMA Wireless Modem/Phone - 3196 CDMA Wireless Modem - 3197 CDMA Wireless Modem/Phone - 6000 Siemens SG75 - 6503 AnyData APE-540H - 6613 Onda H600/N501HS ZTE MF330 - 9000 SIMCom SIM5218 modem - 9001 Gobi Wireless Modem - 9002 Gobi Wireless Modem - 9008 Gobi Wireless Modem (QDL mode) - 9201 Gobi Wireless Modem (QDL mode) - 9202 Gobi Wireless Modem - 9203 Gobi Wireless Modem - 9211 Acer Gobi Wireless Modem (QDL mode) - 9212 Acer Gobi Wireless Modem - 9214 Acer Gobi 2000 Wireless Modem (QDL mode) - 9215 Acer Gobi 2000 Wireless Modem - 9221 Gobi Wireless Modem (QDL mode) - 9222 Gobi Wireless Modem - 9224 Sony Gobi 2000 Wireless Modem (QDL mode) - 9225 Sony Gobi 2000 Wireless Modem - 9231 Gobi Wireless Modem (QDL mode) - 9234 Top Global Gobi 2000 Wireless Modem (QDL mode) - 9235 Top Global Gobi 2000 Wireless Modem - 9244 Samsung Gobi 2000 Wireless Modem (QDL mode) - 9245 Samsung Gobi 2000 Wireless Modem - 9264 Asus Gobi 2000 Wireless Modem (QDL mode) - 9265 Asus Gobi 2000 Wireless Modem - 9274 iRex Technologies Gobi 2000 Wireless Modem (QDL mode) - 9275 iRex Technologies Gobi 2000 Wireless Modem -05c7 Qtronix Corp. - 0113 PC Line Mouse - 1001 Lynx Mouse - 2001 Keyboard - 2011 SCorpius Keyboard - 6001 Ten-Keypad -05c8 Cheng Uei Precision Industry Co., Ltd (Foxlink) - 0103 FO13FF-65 PC-CAM - 0403 Webcam -05c9 Semtech Corp. -05ca Ricoh Co., Ltd - 0101 RDC-5300 Camera - 0325 Caplio GX (ptp) - 032d Caplio GX 8 (ptp) - 032f Caplio R3 (ptp) - 03a1 IS200e - 0403 Printing Support - 0405 Type 101 - 0406 Type 102 - 1803 V5 camera [R5U870] - 1810 Pavilion Webcam [R5U870] - 1812 Pavilion Webcam - 1814 HD Webcam - 1830 Visual Communication Camera VGP-VCC2 [R5U870] - 1832 Visual Communication Camera VGP-VCC3 [R5U870] - 1833 Visual Communication Camera VGP-VCC2 [R5U870] - 1834 Visual Communication Camera VGP-VCC2 [R5U870] - 1835 Visual Communication Camera VGP-VCC5 [R5U870] - 1836 Visual Communication Camera VGP-VCC4 [R5U870] - 1837 Visual Communication Camera VGP-VCC4 [R5U870] - 1839 Visual Communication Camera VGP-VCC6 [R5U870] - 183a Visual Communication Camera VGP-VCC7 [R5U870] - 183b Visual Communication Camera VGP-VCC8 [R5U870] - 183d Sony Vaio Integrated Webcam - 183e Visual Communication Camera VGP-VCC9 [R5U870] - 1841 Fujitsu F01/ Lifebook U810 [R5U870] - 1870 Webcam 1000 - 18b0 Sony Vaio Integrated Webcam - 18b1 Sony Vaio Integrated Webcam - 18b3 Sony Vaio Integrated Webcam - 2201 RDC-7 Camera - 2202 Caplio RR30 - 2203 Caplio 300G - 2204 Caplio G3 - 2205 Caplio RR30 / Medion MD 6126 Camera - 2206 Konica DG-3Z - 2207 Caplio Pro G3 - 2208 Caplio G4 - 2209 Caplio 400G wide - 220a KONICA MINOLTA DG-4Wide - 220b Caplio RX - 220c Caplio GX - 220d Caplio R1/RZ1 - 220e Sea & Sea 5000G - 220f Rollei dr5 / Rollei dr5 (PTP mode) - 2211 Caplio R1S - 2212 Caplio R1v Camera - 2213 Caplio R2 - 2214 Caplio GX 8 - 2215 DSC 725 - 2216 Caplio R3 - 2222 RDC-i500 -05cb PowerVision Technologies, Inc. - 1483 PV8630 interface (scanners, webcams) -05cc ELSA AG - 2100 MicroLink ISDN Office - 2219 MicroLink ISDN - 2265 MicroLink 56k - 2267 MicroLink 56k (V.250) - 2280 MicroLink 56k Fun - 3000 Micolink USB2Ethernet [pegasus] - 3100 AirLancer USB-11 - 3363 MicroLink ADSL Fun -05cd Silicom, Ltd -05ce sci-worx GmbH -05cf Sung Forn Co., Ltd -05d0 GE Medical Systems Lunar -05d1 Brainboxes, Ltd - 0003 Bluetooth Adapter BL-554 -05d2 Wave Systems Corp. -05d3 Tohoku Ricoh Co., Ltd -05d5 Super Gate Technology Co., Ltd -05d6 Philips Semiconductors, CICT -05d7 Thomas & Betts Corp. - 0099 10Mbps Ethernet [klsi] -05d8 Ultima Electronics Corp. - 4001 Artec Ultima 2000 - 4002 Artec Ultima 2000 (GT6801 based)/Lifetec LT9385/ScanMagic 1200 UB Plus Scanner - 4003 Artec E+ 48U - 4004 Artec E+ Pro - 4005 MEM48U - 4006 TRUST EASY WEBSCAN 19200 - 4007 TRUST 240H EASY WEBSCAN GOLD - 4008 Trust Easy Webscan 19200 - 4009 Umax Astraslim - 4013 IT Scan 1200 - 8105 Artec T1 USB TVBOX (cold) - 8106 Artec T1 USB TVBOX (warm) - 8107 Artec T1 USB TVBOX with AN2235 (cold) - 8108 Artec T1 USB TVBOX with AN2235 (warm) - 8109 Artec T1 USB2.0 TVBOX (cold -05d9 Axiohm Transaction Solutions - a225 A225 Printer - a758 A758 Printer - a794 A794 Printer -05da Microtek International, Inc. - 0091 ScanMaker X6u - 0093 ScanMaker V6USL - 0094 Phantom 336CX/C3 - 0099 ScanMaker X6/X6U - 009a Phantom C6 - 00a0 Phantom 336CX/C3 (#2) - 00a3 ScanMaker V6USL - 00ac ScanMaker V6UL - 00b6 ScanMaker V6UPL - 00ef ScanMaker V6UPL - 1006 Jenoptik JD350 entrance - 1011 NHJ Che-ez! Kiss Digital Camera - 1018 Digital Dream Enigma 1.3 - 1020 Digital Dream l'espion xtra - 1025 Take-it Still Camera Device - 1026 Take-it - 1043 Take-It 1300 DSC Bulk Driver - 1045 Take-it D1 - 1047 Take-it Camera Composite Device - 1048 Take-it Q3 - 1049 3M Still Camera Device - 1051 Camcorder Series - 1052 Mass Storage Device - 1053 Take-it DV Composite Device - 1054 Mass Storage Device - 1055 Digital Camera Series(536) - 1056 Mass Storage Device - 1057 Take-it DSC Camera Device(536) - 1058 Mass Storage Device - 1059 Camcorder DSC Series - 1060 Microtek Take-it MV500 - 2007 ArtixScan DI 1210 - 200c 1394_USB2 Scanner - 200e ArtixScan DI 810 - 2017 UF ICE Scanner - 201c 4800 Scanner - 201d ArtixScan DI 1610 - 201f 4800 Scanner-ICE - 202e ArtixScan DI 2020 - 208b ScanMaker 6800 - 208f ArtixScan DI 2010 - 209e ScanMaker 4700LP - 20a7 ScanMaker 5600 - 20b0 ScanMaker X12USL - 20b1 ScanMaker 8700 - 20b4 ScanMaker 4700 - 20bd ScanMaker 5700 - 20c9 ScanMaker 6700 - 20d2 Microtek ArtixScan 1800f - 20d6 PS4000 - 20de ScanMaker 9800XL - 20e0 ScanMaker 9700XL - 20ed ScanMaker 4700 - 20ee Micortek ScanMaker X12USL - 3008 Scanner - 300a 4800 ICE Scanner - 300b 4800 Scanner - 300f MiniScan C5 - 3020 4800dpi Scanner - 3021 1200dpi Scanner - 3022 Scanner 4800dpi - 3023 USB1200II Scanner - 30c1 USB600 Scanner - 30ce ScanMaker 3800 - 30cf ScanMaker 4800 - 30d4 USB1200 Scanner - 30d8 Scanner - 30d9 USB2400 Scanner - 30e4 ScanMaker 4100 - 30e5 USB3200 Scanner - 30e6 ScanMaker i320 - 40b3 ScanMaker 3600 - 40b8 ScanMaker 3700 - 40c7 ScanMaker 4600 - 40ca ScanMaker 3600 - 40cb ScanMaker 3700 - 40dd ScanMaker 3750i - 40ff ScanMaker 3600 - 5003 Goya - 5013 3200 Scanner - 80a3 ScanMaker V6USL (#2) - 80ac ScanMaker V6UL/SpicyU -05db Sun Corp. (Suntac?) - 0003 SUNTAC U-Cable type D2 - 0005 SUNTAC U-Cable type P1 - 0009 SUNTAC Slipper U - 000a SUNTAC Ir-Trinity - 000b SUNTAC U-Cable type A3 - 0011 SUNTAC U-Cable type A4 -05dc Lexar Media, Inc. - 0001 jumpSHOT CompactFlash Reader - 0002 JumpShot - 0003 JumpShot - 0080 Jumpdrive Secure 64MB - 0081 RBC Compact Flash Drive - 00a7 JumpDrive Impact - 0100 JumpDrive PRO - 0200 JumpDrive 2.0 Pro - 0300 Jumpdrive Geysr - 0301 JumpDrive Classic - 0302 JD Micro - 0303 JD Micro Pro - 0304 JD Secure II - 0310 JumpDrive - 0311 JumpDrive Classic - 0312 JD Micro - 0313 JD Micro Pro - 0320 JumpDrive - 0321 JD Micro - 0322 JD Micro Pro - 0323 UFC - 0330 JumpDrive Expression - 0340 JumpDrive TAD - 0350 Express Card - 0400 UFDC - 0401 UFDC - 0403 Locked B Device - 0405 Locked C Device - 0407 Locked D Device - 0409 Locked E Device - 040b Locked F Device - 040d Locked G Device - 040f Locked H Device - 0410 JumpDrive - 0411 JumpDrive - 0413 Locked J Device - 0415 Locked K Device - 0417 Locked L Device - 0419 Locked M Device - 041b Locked N Device - 041d Locked O Device - 041f Locked P Device - 0420 JumpDrive - 0421 JumpDrive - 0423 Locked R Device - 0425 Locked S Device - 0427 Locked T Device - 0429 Locked U Device - 042b Locked V Device - 042d Locked W Device - 042f Locked X Device - 0431 Locked Y Device - 0433 Locked Z Device - 4d02 MP3 Player - 4d12 MP3 Player - 4d30 MP3 Player - a300 JumpDrive2 - a400 JumpDrive trade; Pro 40-501 - a410 JumpDrive 128MB/256MB - a411 JumpDrive Traveler - a420 JumpDrive Pro - a421 JumpDrive Pro II - a422 JumpDrive Micro Pro - a430 JumpDrive Secure - a431 JumpDrive Secure II - a432 JumpDrive Classic - a440 JumpDrive Lightning - a450 JumpDrive TouchGuard - a460 JD Mercury - a501 JumpDrive Classic - a510 JumpDrive Sport - a530 JumpDrive Expression - a531 JumpDrive Secure II - a560 JumpDrive FireFly - a701 JumpDrive FireFly - a731 JumpDrive FireFly - a790 JumpDrive 2GB - b002 USB CF Reader - b018 Multi-Card Reader - b047 SDHC Reader [RW047-7000] -05dd Delta Electronics, Inc. - ff31 AWU-120 - ff32 FriendlyNET AeroLAN AL2011 - ff35 PCW 100 - Wireless 802.11b Adapter - ff91 2Wire PC Port Phoneline 10Mbps Adapter -05df Silicon Vision, Inc. -05e0 Symbol Technologies - 0700 Bar Code Scanner (CS1504) - 0800 Spectrum24 Wireless LAN Adapter - 1200 DS6608 Bar Code Scanner - 1900 SNAPI Imaging Device - 2000 MC3090 Rugged Mobile Computer - 200d MC70 Rugged Mobile Computer -05e1 Syntek Semiconductor Co., Ltd - 0100 802.11g + Bluetooth Wireless Adapter - 0408 STK1160 Video Capture Device - 0500 DC-112X Webcam - 0501 DC-1125 Webcam - 0890 STK011 Camera - 0892 STK013 Camera - 0895 STK016 Camera - 0896 STK017 Camera -05e2 ElecVision, Inc. -05e3 Genesys Logic, Inc. - 000a Keyboard with PS/2 Port - 000b Mouse - 0100 Nintendo Game Boy Advance SP - 0120 Pacific Image Electronics PrimeFilm 1800u slide/negative scanner - 0131 CF/SM Reader/Writer - 0142 Multiple Slides Scanner-3600 - 0143 Multiple Frames Film Scanner-36series - 0180 Plustek Scanner - 0182 Wize Media 1000 - 0189 ScanJet 4600 series - 018a Xerox 6400 - 0300 GLUSB98PT Parallel Port - 0301 USB2LPT Cable Release2 - 0406 Hub - 0501 GL620USB Host-Host interface - 0502 GL620USB-A GeneLink USB-USB Bridge - 0503 Webcam - 0504 HID Keyboard Filter - 0604 USB 1.1 Hub - 0605 USB 2.0 Hub [ednet] - 0606 USB 2.0 Hub / D-Link DUB-H4 USB 2.0 Hub - 0608 USB-2.0 4-Port HUB - 0660 USB 2.0 Hub - 0700 SIIG US2256 CompactFlash Card Reader - 0701 USB 2.0 IDE Adapter - 0702 USB 2.0 IDE Adapter [GL811E] - 0703 Card Reader - 0704 Card Reader - 0705 Card Reader - 0706 Card Reader - 0707 Card Reader - 0708 Card Reader - 0709 Card Reader - 070a Pen Flash - 070b DMHS1B Rev 3 DFU Adapter - 070e USB 2.0 Card Reader - 070f Pen Flash - 0710 USB 2.0 33-in-1 Card Reader - 0711 Card Reader - 0712 Delkin Mass Storage Device - 0715 USB 2.0 microSD Reader - 0716 USB 2.0 Multislot Card Reader/Writer - 0717 All-in-1 Card Reader - 0718 IDE/SATA Adapter - 0723 GL827L SD/MMC/MS Flash Card Reader - 0760 USB 2.0 Card Reader/Writer - 0761 Genesys Mass Storage Device - 0780 USBFS DFU Adapter - 07a0 Pen Flash - 0880 Wasp (SL-6612) - 0927 Card Reader - 1205 Afilias Optical Mouse H3003 / Trust Optical USB MultiColour Mouse MI-2330 - a700 Pen Flash - f102 VX7012 TV Box - f103 VX7012 TV Box - f104 VX7012 TV Box - fd21 3M TL20 Temperature Logger - fe00 Razer Mouse -05e4 Red Wing Corp. -05e5 Fuji Electric Co., Ltd -05e6 Keithley Instruments -05e8 ICC, Inc. -05e9 Kawasaki LSI - 0008 KL5KUSB101B Ethernet [klsi] - 0009 Sony 10Mbps Ethernet [pegasus] - 000c USB-to-RS-232 - 000d USB-to-RS-232 - 0014 RS-232 J104 - 0040 Ethernet Adapter - 2008 Ethernet Adapter -05eb FFC, Ltd -05ec COM21, Inc. -05ee Cytechinfo Inc. -05ef AVB, Inc. [anko?] - 020a Top Shot Pegasus Joystick - 8884 Mag Turbo Force Wheel - 8888 Top Shot Force Feedback Racing Wheel -05f0 Canopus Co., Ltd - 0101 DA-Port DAC -05f1 Compass Communications -05f2 Dexin Corp., Ltd - 0010 AQ Mouse -05f3 PI Engineering, Inc. - 0007 Kinesis Advantage PRO MPC/USB Keyboard - 0081 Kinesis Integrated Hub - 00ff VEC Footpedal - 020b PS2 Adapter - 0232 X-Keys Switch Interface, Programming Mode - 0261 X-Keys Switch Interface, SPLAT Mode - 0264 X-Keys Switch Interface, Composite Mode -05f5 Unixtar Technology, Inc. -05f6 AOC International -05f7 RFC Distribution(s) PTE, Ltd -05f9 PSC Scanning, Inc. - 2602 Datalogic Magellan 1100i Barcode Scanner -05fa Siemens Telecommunications Systems, Ltd - 3301 Keyboard with PS/2 Mouse Port - 3302 Keyboard - 3303 Keyboard with PS/2 Mouse Port -05fc Harman Multimedia - 7849 Harman/Kardon SoundSticks -05fd InterAct, Inc. - 0239 SV-239 HammerHead Digital - 0251 Raider Pro - 0253 ProPad 8 Digital - 0286 SV-286 Cyclone Digital - 107a PowerPad Pro X-Box pad - 262a 3dfx HammerHead FX - 262f HammerHead Fx - daae Game Shark -05fe Chic Technology Corp. - 0001 Mouse - 0003 Cypress USB Mouse - 0005 Viewmaster 4D Browser Mouse - 0007 Twinhead Mouse - 0009 Inland Pro 4500/5000 Mouse - 0011 Browser Mouse - 0014 Gamepad - 1010 Optical Wireless -05ff LeCroy Corp. -0600 Barco Display Systems -0601 Jazz Hipster Corp. - 0003 Internet Security Co., Ltd. SecureKey -0602 Vista Imaging, Inc. - 1001 ViCam Webcam -0603 Novatek Microelectronics Corp. - 00f1 Keyboard - 6871 Mouse -0604 Jean Co., Ltd -0605 Anchor C&C Co., Ltd -0606 Royal Information Electronics Co., Ltd -0607 Bridge Information Co., Ltd -0608 Genrad Ads -0609 SMK Manufacturing, Inc. - 031d eHome Infrared Receiver - 0322 eHome Infrared Receiver - 0334 eHome Infrared Receiver - ff12 SMK Bluetooth Device -060a Worthington Data Solutions, Inc. -060b Solid Year - 0001 MacAlly Keyboard - 0230 KSK-8003 UX Keyboard - 1006 Japanese Keyboard - 260U - 2101 Keyboard - 2231 KSK-6001 UELX Keyboard - 5811 ACK-571U Wireless Keyboard - 5903 Japanese Keyboard - 595U - 6001 SolidTek USB 2p HUB - 6002 SolidTek USB Keyboard - 6003 Japanese Keyboard - 600HM - a001 Maxwell Compact Pc PM3 -060c EEH Datalink GmbH -060d Auctor Corp. -060e Transmonde Technologies, Inc. -060f Joinsoon Electronics Mfg. Co., Ltd -0610 Costar Electronics, Inc. -0611 Totoku Electric Co., Ltd -0613 TransAct Technologies, Inc. -0614 Bio-Rad Laboratories -0615 Quabbin Wire & Cable Co., Inc. -0616 Future Techno Designs PVT, Ltd -0617 Swiss Federal Insitute of Technology -0618 MacAlly - 0101 Mouse -0619 Seiko Instruments, Inc. - 0101 SLP-100 Driver - 0102 SLP-200 Driver - 0103 SLP-100N Driver - 0104 SLP-200N Driver - 0105 SLP-240 Driver - 0501 SLP-440 Driver - 0502 SLP-450 Driver -061a Veridicom International, Inc. - 0110 5thSense Fingerprint Sensor - 0200 FPS200 Fingerprint Sensor - 8200 VKI-A Fingerprint Sensor/Flash Storage (dumb) - 9200 VKI-B Fingerprint Sensor/Flash Storage (smart) -061b Promptus Communications, Inc. -061c Act Labs, Ltd -061d Quatech, Inc. -061e Nissei Electric Co. - 0001 nissei 128DE-USB - - 0010 nissei 128DE-PNA - -0620 Alaris, Inc. - 0004 QuickVideo weeCam - 0007 QuickVideo weeCam - 000a QuickVideo weeCam - 000b QuickVideo weeCam -0621 ODU-Steckverbindungssysteme GmbH & Co. KG -0622 Iotech, Inc. -0623 Littelfuse, Inc. -0624 Avocent Corp. - 0294 Dell 03R874 KVM dongle -0625 TiMedia Technology Co., Ltd -0626 Nippon Systems Development Co., Ltd -0627 Adomax Technology Co., Ltd -0628 Tasking Software, Inc. -0629 Zida Technologies, Ltd -062a Creative Labs - 0000 Optical mouse - 0001 Notebook Optical Mouse - 0102 Wireless Keyboard/Mouse Combo [MK1152WC] - 0201 Defender Office Keyboard (K7310) S Zodiak KM-9010 - 0252 Emerge Uni-retractable Laser Mouse - 9003 VoIP Conference Hub (A16GH) - 9004 USR9602 USB Internet Mini Phone -062b Greatlink Electronics Taiwan, Ltd -062c Institute for Information Industry -062d Taiwan Tai-Hao Enterprises Co., Ltd -062e Mainsuper Enterprises Co., Ltd -062f Sin Sheng Terminal & Machine, Inc. -0631 JUJO Electronics Corp. -0633 Cyrix Corp. -0634 Micron Technology, Inc. - 0655 Embedded Mass Storage Drive [RealSSD] -0635 Methode Electronics, Inc. -0636 Sierra Imaging, Inc. - 0003 Vivicam 35Xx -0638 Avision, Inc. - 0268 iVina 1200U Scanner - 026a Minolta Dimage Scan Dual II - 0a10 iVina FB1600/UMAX Astra 4500 - 0a13 AV600U - 0a16 SC-215 - 0a30 UMAX Astra 6700 Scanner - 0a41 Avision AM3000/MF3000 Series - 0f01 fi-4010CU - 4004 Minolta Dimage Scan Elite II -0639 Chrontel, Inc. -063a Techwin Corp. -063b Taugagreining HF -063c Yamaichi Electronics Co., Ltd (Sakura) -063d Fong Kai Industrial Co., Ltd -063e RealMedia Technology, Inc. -063f New Technology Cable, Ltd -0640 Hitex Development Tools - 0026 LPC-Stick -0641 Woods Industries, Inc. -0642 VIA Medical Corp. -0644 TEAC Corp. - 0000 Floppy - 0200 All-In-One Multi-Card Reader CA200/B/S - 1000 CD-ROM Drive - 800d TASCAM Portastudio DP-01FX - 800e TASCAM US-122L - 8021 TASCAM US-122mkII - d001 CD-R/RW Unit - d002 CD-R/RW Unit - d010 CD-RW/DVD Unit -0645 Who? Vision Systems, Inc. -0646 UMAX -0647 Acton Research Corp. - 0100 ARC SpectraPro UV/VIS/IR Monochromator/Spectrograph - 0101 ARC AM-VM Mono Airpath/Vacuum Monochromator/Spectrograph - 0102 ARC Inspectrum Mono - 0103 ARC Filterwheel - 03e9 Inspectrum 128x1024 F VIS Spectrograph - 03ea Inspectrum 256x1024 F VIS Spectrograph - 03eb Inspectrum 128x1024 B VIS Spectrograph - 03ec Inspectrum 256x1024 B VIS Spectrograph -0648 Inside Out Networks -0649 Weli Science Co., Ltd -064b Analog Devices, Inc. (White Mountain DSP) - 0165 Blackfin 535 [ADZS HPUSB ICE] -064c Ji-Haw Industrial Co., Ltd -064d TriTech Microelectronics, Ltd -064e Suyin Corp. - a100 Acer OrbiCam - a101 Acer CrystalEye Webcam - a102 Acer/Lenovo Webcam [CN0316] - a103 Acer/HP Integrated Webcam [CN0314] - a110 HP Webcam - a136 Asus Integrated Webcam [CN031B] - a219 1.3M WebCam (notebook emachines E730, Acer sub-brand) - c107 HP webcam [dv6-1190en] - d101 Acer CrystalEye Webcam - e201 Lenovo Integrated Webcam - e203 Lenovo Integrated Webcam - f102 Lenovo Integrated Webcam [R5U877] - f103 Lenovo Integrated Webcam [R5U877] -064f WIBU-Systems AG - 03e9 Propellerhead Record Ignition Key - 03f2 CmStick/M (article no. 1010) - 03f3 CmStick/M (article no. 1011) - 0bd7 BOX/U - 0bd8 BOX/RU -0650 Dynapro Systems -0651 Likom Technology Sdn. Bhd. -0652 Stargate Solutions, Inc. -0653 CNF, Inc. -0654 Granite Microsystems, Inc. - 0005 Device Bay Controller - 0006 Hub - 0007 Device Bay Controller - 0016 Hub -0655 Space Shuttle Hi-Tech Co., Ltd -0656 Glory Mark Electronic, Ltd -0657 Tekcon Electronics Corp. -0658 Sigma Designs, Inc. -0659 Aethra -065a Optoelectronics Co., Ltd - 0001 Barcode scanner -065b Tracewell Systems -065e Silicon Graphics -065f Good Way Technology Co., Ltd & GWC technology Inc. -0660 TSAY-E (BVI) International, Inc. -0661 Hamamatsu Photonics K.K. -0662 Kansai Electric Co., Ltd -0663 Topmax Electronic Co., Ltd - 0103 CobraPad -0664 ET&T Technology Co., Ltd. - 0301 Groovy Technology Corp. GTouch Touch Screen - 0302 Groovy Technology Corp. GTouch Touch Screen - 0303 Groovy Technology Corp. GTouch Touch Screen - 0304 Groovy Technology Corp. GTouch Touch Screen - 0305 Groovy Technology Corp. GTouch Touch Screen - 0306 Groovy Technology Corp. GTouch Touch Screen - 0307 Groovy Technology Corp. GTouch Touch Screen - 0309 Groovy Technology Corp. GTouch Touch Screen -0665 Cypress Semiconductor - 5161 USB to Serial -0667 Aiwa Co., Ltd - 0fa1 TD-U8000 Tape Drive -0668 WordWand -0669 Oce' Printing Systems GmbH -066a Total Technologies, Ltd -066b Linksys, Inc. - 0105 SCM eUSB SmartMedia Card Reader - 010a Melco MCR-U2 SmartMedia / CompactFlash Reader - 200c USB10TX - 2202 USB10TX Ethernet [pegasus] - 2203 USB100TX Ethernet [pegasus] - 2204 USB100TX HomePNA Ethernet [pegasus] - 2206 USB Ethernet [pegasus] - 2207 HomeLink Phoneline 10M Network Adapter - 2211 WUSB11 802.11b Adapter - 2212 WUSB11v2.5 802.11b Adapter - 2213 WUSB12v1.1 802.11b Adapter - 2219 Instant Wireless Network Adapter - 400b USB10TX -066d Entrega, Inc. -066e Acer Semiconductor America, Inc. -066f SigmaTel, Inc. - 003b MP3 Player - 003e MP3 Player - 003f MP3 Player - 0040 MP3 Player - 0041 MP3 Player - 0042 MP3 Player - 0043 MP3 Player - 004b A-Max PA11 MP3 Player - 3400 STMP3400 D-Major MP3 Player - 3410 STMP3410 D-Major MP3 Player - 3500 Player Recovery Device - 4200 STIr4200 IrDA Bridge - 4210 STIr4210 IrDA Bridge - 8000 MSCN MP3 Player - 8001 SigmaTel MSCN Audio Player - 8004 MSCNMMC MP3 Player - 8008 i-Bead 100 MP3 Player - 8020 MP3 Player - 8034 MP3 Player - 8036 MP3 Player - 8038 MP3 Player - 8056 MP3 Player - 8060 MP3 Player - 8066 MP3 Player - 807e MP3 Player - 8092 MP3 Player - 8096 MP3 Player - 809a MP3 Player - 80aa MP3 Player - 80ac MP3 Player - 80b8 MP3 Player - 80ba MP3 Player - 80bc MP3 Player - 80bf MP3 Player - 80c5 MP3 Player - 80c8 MP3 Player - 80ca MP3 Player - 80cc MP3 Player - 8104 MP3 Player - 8106 MP3 Player - 8108 MP3 Player - 810a MP3 Player - 810c MP3 Player - 8122 MP3 Player - 8124 MP3 Player - 8126 MP3 Player - 8128 MP3 Player - 8134 MP3 Player - 8136 MP3 Player - 8138 MP3 Player - 813a MP3 Player - 813e MP3 Player - 8140 MP3 Player - 8142 MP3 Player - 8144 MP3 Player - 8146 MP3 Player - 8148 MP3 Player - 814c MP3 Player - 8201 MP3 Player - 8202 Jens of Sweden / I-BEAD 150M/150H MP3 player - 8203 MP3 Player - 8204 MP3 Player - 8205 MP3 Player - 8206 Digital MP3 Music Player - 8207 MP3 Player - 8208 MP3 Player - 8209 MP3 Player - 820a MP3 Player - 820b MP3 Player - 820c MP3 Player - 820d MP3 Player - 820e MP3 Player - 820f MP3 Player - 8210 MP3 Player - 8211 MP3 Player - 8212 MP3 Player - 8213 MP3 Player - 8214 MP3 Player - 8215 MP3 Player - 8216 MP3 Player - 8217 MP3 Player - 8218 MP3 Player - 8219 MP3 Player - 821a MP3 Player - 821b MP3 Player - 821c MP3 Player - 821d MP3 Player - 821e MP3 Player - 821f MP3 Player - 8220 MP3 Player - 8221 MP3 Player - 8222 MP3 Player - 8223 MP3 Player - 8224 MP3 Player - 8225 MP3 Player - 8226 MP3 Player - 8227 MP3 Player - 8228 MP3 Player - 8229 MP3 Player - 8230 MP3 Player - 829c MP3 Player - 82e0 MP3 Player - 835d MP3 Player - 9000 MP3 Player - 9001 MP3 Player - 9002 MP3 Player -0670 Sequel Imaging - 0001 Calibrator - 0005 Enable Cable -0672 Labtec, Inc. - 1041 LCS1040 Speaker System - 5000 SpaceBall 4000 FLX -0673 HCL - 5000 Keyboard -0674 Key Mouse Electronic Enterprise Co., Ltd -0675 DrayTek Corp. - 0110 Vigor 128 ISDN TA - 0530 Vigor530 IEEE 802.11G Adapter (ISL3880+NET2280) - 0550 Vigor550 - 1688 miniVigor 128 ISDN TA - 6694 USB ISDN TA -0676 Teles AG -0677 Aiwa Co., Ltd - 07d5 TM-ED1285(USB) - 0fa1 TD-U8000 Tape Drive -0678 ACard Technology Corp. -067b Prolific Technology, Inc. - 0000 PL2301 USB-USB Bridge - 0001 PL2302 USB-USB Bridge - 0307 Motorola Serial Adapter - 04bb PL2303 Serial (IODATA USB-RSAQ2) - 0610 Onext EG210U MODEM - 0611 AlDiga AL-11U Quad-band GSM/GPRS/EDGE modem - 2303 PL2303 Serial Port - 2305 PL2305 Parallel Port - 2306 Raylink Bridge Controller - 2307 PL2307 USB-ATAPI4 Bridge - 2313 FITEL PHS U Cable Adaptor - 2315 Flash Disk Embedded Hub - 2316 Flash Disk Security Device - 2317 Mass Storage Device - 2501 PL2501 USB-USB Bridge (USB 2.0) - 2507 PL2507 Hi-speed USB to IDE bridge controller - 2515 Flash Disk Embedded Hub - 2517 Flash Disk Mass Storage Device - 25a1 PL25A1 Host-Host Bridge - 3400 Hi-Speed Flash Disk with TruePrint AES3400 - 3500 Hi-Speed Flash Disk with TruePrint AES3500 - 3507 PL3507 ATAPI6 Bridge - aaa0 Prolific Pharos - aaa2 PL2303 Serial Adapter (IODATA USB-RSAQ3) -067c Efficient Networks, Inc. - 1001 Siemens SpeedStream 100MBps Ethernet - 1022 Siemens SpeedStream 1022 802.11b Adapter - 1023 SpeedStream Wireless - 4020 SpeedStream 4020 ATM/ADSL Installer - 4031 Efficient ADSL Modem - 4032 SpeedStream 4031 ATM/ADSL Installer - 4033 SpeedStream 4031 ATM/ADSL Installer - 4060 Alcatel Speedstream 4060 ADSL Modem - 4062 Efficient Networks 4060 Loader - 5667 Efficient Networks Virtual Bus for ADSL Modem - c031 SpeedStream 4031 ATM/ADSL Installer - c032 SpeedStream 4031 ATM/ADSL Installer - c033 SpeedStream 4031 ATM/ADSL Installer - c060 SpeedStream 4060 Miniport ATM/ADSL Adapter - d667 Efficient Networks Virtual Bus for ADSL Modem - e240 Speedstream Ethernet Adapter E240 - e540 Speedstream Ethernet Adapter E240 -067d Hohner Corp. -067e Intermec Technologies Corp. - 0801 HID Keyboard, Barcode scanner - 0803 VCP, Barcode scanner - 0805 VCP + UVC, Barcode scanner - 1001 Mobile Computer -067f Virata, Ltd - 4552 DSL-200 ADSL Modem - 6542 DSL Modem - 6549 DSL Modem - 7541 DSL Modem -0680 Realtek Semiconductor Corp., CPP Div. (Avance Logic) - 0002 Arowana Optical Wheel Mouse MSOP-01 -0681 Siemens Information and Communication Products - 0001 Dect Base - 0002 Gigaset 3075 Passive ISDN - 0005 ID-Mouse with Fingerprint Reader - 0012 I-Gate 802.11b Adapter - 001b WLL013 - 001d Hipath 1000 - 0022 Gigaset SX353 ISDN - 0026 DECT Data - Gigaset M34 - 002b A-100-I ADSL Modem - 002e ADSL Router_S-141 - 0034 GSM module MC35/ES75 USB Modem - 3c06 54g USB Network Adapter -0682 Victor Company of Japan, Ltd -0684 Actiontec Electronics, Inc. -0686 Minolta Co., Ltd - 2001 PagePro 4110W - 2004 PagePro 1200W - 2005 Magicolor 2300 DL - 3001 PagePro 4100 - 3005 PagePro 1250E - 3006 PagePro 1250W - 3009 Magicolor 2300W - 300b PagePro 1350W - 300c PagePro 1300W - 302e Develop D 1650iD PCL - 3034 Develop D 2050iD PCL - 4001 Dimage 2300 - 4003 Dimage 2330 Zoom Camera - 4004 Scan Elite II - 4005 Minolta DiMAGE E201 Mass Storage Device - 4006 Dimage 7 Camera - 4007 Dimage S304 Camera - 4008 Dimage 5 Camera - 4009 Dimage X Camera - 400a Dimage S404 Camera - 400b Dimage 7i Camera - 400c Dimage F100 Camera - 400d Scan Dual III - 400e Dimage 5400 - 400f Dimage 7Hi Camera - 4010 Dimage Xi Camera - 4011 Dimage F300 Camera - 4012 Dimage F200 Camera - 4014 Dimage S414 Camera - 4015 Dimage XT Camera [storage] - 4016 Dimage XT Camera [remote mode] - 4017 Dimage E223 - 4018 Dimage Z1 Camera - 4019 Dimage A1 Camera [remote mode] - 401a Dimage A1 Camera [storage] - 401c Dimage X20 Camera - 401e Dimage E323 Camera -068a Pertech, Inc. -068b Potrans International, Inc. -068e CH Products, Inc. - 00d3 OEM 3 axis 5 button joystick - 00e2 HFX OEM Joystick - 00f1 Pro Throttle - 00f2 Flight Sim Pedals - 00f3 Fighterstick - 00f4 Combatstick - 00fa Flight Sim Pedals - 00ff Flight Sim Yoke - 0500 GameStick 3D - 0501 CH Pro Pedals - 0504 F-16 Combat Stick -0690 Golden Bridge Electech, Inc. -0693 Hagiwara Sys-Com Co., Ltd - 0002 FlashGate SmartMedia Card Reader - 0003 FlashGate CompactFlash Card Reader - 0005 FlashGate - 0006 SM PCCard R/W and SPD - 0007 FlashGate ME (Authenticated) - 000a SDCard/MMC Reader/Writer -0694 Lego Group - 0001 Mindstorms Tower - 0002 Mindstorms NXT -0698 Chuntex (CTX) - 1786 1300ex Monitor - 2003 CTX M730V built in Camera - 9999 VLxxxx Monitor+Hub -0699 Tektronix, Inc. -069a Askey Computer Corp. - 0001 VC010 Webcam [pwc] - 0303 Cable Modem - 0311 ADSL Router Remote NDIS Device - 0318 Remote NDIS Device - 0319 220V Remote NDIS Device - 0320 IEEE 802.11b Wireless LAN Card - 0321 Dynalink WLL013 / Compex WLU11A 802.11b Adapter - 0402 Scientific Atlanta WebSTAR 100 & 200 series Cable Modem - 0811 BT Virtual Bus for Helium - 0821 BT Voyager 1010 802.11b Adapter - 4402 Scientific Atlanta WebSTAR 2000 series Cable Modem - 4403 Scientific Atlanta WebSTAR 300 series Cable Modem - 4501 Scientific-Atlanta WebSTAR 2000 series Cable Modem -069b Thomson, Inc. - 0704 DCM245 Cable Modem - 0705 THG540K Cable Modem - 070c MP3 Player - 070d MP3 Player - 070e MP3 Player - 070f RCA Lyra RD1071 MP3 Player - 0731 Lyra M200E256 - 0761 RCA H100A - 0778 PEARL USB Device - 2220 RCA Kazoo RD1000 MP3 Player - 300a RCA Lyra MP3 Player - 3012 MP3 Player - 3013 MP3 Player - 5557 RCA CDS6300 -069d Hughes Network Systems (HNS) - 0001 Satellite Receiver Device - 0002 Satellite Device -069e Welcat Inc. - 0005 Marx CryptoBox v1.2 -069f Allied Data Technologies BV - 0010 Tornado Speakerphone FaxModem 56.0 - 0011 Tornado Speakerphone FaxModem 56.0 - 1000 ADT VvBus for CopperJet - 1004 CopperJet 821 RouterPlus -06a2 Topro Technology, Inc. - 0033 USB Mouse -06a3 Saitek PLC - 0006 Cyborg Gold Joystick - 0109 P880 Pad - 0160 ST290 Pro - 0200 Xbox Adrenalin Hub - 0241 Xbox Adrenalin Gamepad - 0255 X52 Flight Controller - 040b P990 Dual Analog Pad - 040c P2900 Wireless Pad - 0422 ST90 Joystick - 0460 ST290 Pro Flight Stick - 0463 ST290 - 0464 Cyborg Evo - 0471 Cyborg Graphite Stick - 0501 R100 Sports Wheel - 0502 ST200 Stick - 0506 R220 Digital Wheel - 051e Cyborg Digital II Stick - 052d P750 Gamepad - 053c X45 Flight Controller - 053f X36F Flightstick - 056c P2000 Tilt Pad - 056f P2000 Tilt Pad - 05d2 PC Dash 2 - 075c X52 Flight Controller - 0762 Saitek X52 Pro Flight Control System - 0805 R440 Force Wheel - 1003 GM2 Action Pad - 1009 Action Pad - 100a SP550 Pad and Joystick Combo - 100b SP550 Pad - 1509 P3000 Wireless Pad - 1589 P3000 Wireless Pad - 2541 X45 Flight Controller - 3509 P3000 RF GamePad - 353e Cyborg Evo Wireless - 3589 P3000 Wireless Pad - 35be Cyborg Evo - 5509 P3000 Wireless Pad - 8000 Gamers' Keyboard - 801e Cyborg 3D Digital Stick II - 8020 Eclipse Keyboard - 8021 Eclipse II Keyboard - 802d P750 Pad - 803f X36 Flight Controller - 806f P2000 Tilt Pad - 80c0 Pro Gamer Command Unit - 80c1 Cyborg Command Pad Unit - a502 Gaming Mouse - f518 P3200 Rumble Force Game Pad - ff04 R440 Force Wheel - ff0c Cyborg Force Rumble Pad - ff0d P2600 Rumble Force Pad - ff12 Cyborg 3D Force Stick - ff17 ST 330 Rumble Force Stick - ff52 Cyborg 3D Rumble Force Joystick - ffb5 Cyborg Evo Force Joystick -06a4 Xiamen Doowell Electron Co., Ltd -06a5 Divio - 0000 Typhoon Webcam 100k [nw8000] - d001 ProLink DS3303u Webcam - d800 Chicony TwinkleCam - d820 Wize Media 1000 -06a7 MicroStore, Inc. -06a8 Topaz Systems, Inc. - 0042 SignatureGem 1X5 Pad - 0043 SignatureGem 1X5-HID Pad -06a9 Westell - 0005 WireSpeed Dual Connect Modem - 0006 WireSpeed Dual Connect Modem - 000a WireSpeed Dual Connect Modem - 000b WireSpeed Dual Connect Modem - 000e A90-211WG-01 802.11g Adapter [Intersil ISL3887] -06aa Sysgration, Ltd -06ac Fujitsu Laboratories of America, Inc. -06ad Greatland Electronics Taiwan, Ltd -06ae Professional Multimedia Testing Centre -06af Harting, Inc. of North America -06b8 Pixela Corp. -06b9 Alcatel Telecom - 0120 SpeedTouch 120g 802.11g Wireless Adapter [Intersil ISL3886] - 0121 SpeedTouch 121g Wireless Dongle - 2001 SPEED TOUCH Card - 4061 SpeedTouch ISDN or ADSL Modem - a5a5 DynaMiTe Modem -06ba Smooth Cord & Connector Co., Ltd -06bb EDA, Inc. -06bc Oki Data Corp. - 000b Okipage 14ex Printer - 0a91 B2500MFP (printer+scanner) - 3801 B6100 Laser Printer -06bd AGFA-Gevaert NV - 0001 SnapScan 1212U - 0002 SnapScan 1236U - 0100 SnapScan Touch - 0101 SNAPSCAN ELITE - 0200 ScanMaker 8700 - 02bf DUOSCAN f40 - 0400 CL30 - 0401 Mass Storage - 0403 ePhoto CL18 Camera - 0404 ePhoto CL20 Camera - 2061 SnapScan 1212U (?) - 208d Snapscan e40 - 208f SnapScan e50 - 2091 SnapScan e20 - 2093 SnapScan e10 - 2095 SnapScan e25 - 2097 SnapScan e26 - 20fd SnapScan e52 - 20ff SnapScan e42 -06be AME Optimedia Technology Co., Ltd - 0800 Optimedia Camera - 1005 Dazzle DPVM! (1005) - d001 P35U Camera Capture -06bf Leoco Corp. -06c2 Phidgets Inc. (formerly GLAB) - 0030 PhidgetRFID - 0038 4-Motor PhidgetServo v3.0 - 0039 1-Motor PhidgetServo v3.0 - 003a 8-Motor PhidgetAvancedServo - 0040 PhidgetInterface Kit 0-0-4 - 0044 PhidgetInterface Kit 0-16-16 - 0045 PhidgetInterface Kit 8-8-8 - 0048 PhidgetStepper (Under Development) - 0049 PhidgetTextLED Ver 1.0 - 004a PhidgetLED Ver 1.0 - 004b PhidgetEncoder Ver 1.0 - 0051 PhidgetInterface Kit 0-5-7 (Custom) - 0052 PhidgetTextLCD - 0053 PhidgetInterfaceKit 0-8-8 - 0058 PhidgetMotorControl Ver 1.0 - 0070 PhidgetTemperatureSensor Ver 1.0 - 0071 PhidgetAccelerometer Ver 1.0 - 0072 PhidgetWeightSensor Ver 1.0 - 0073 PhidgetHumiditySensor - 0074 PhidgetPHSensor - 0075 PhidgetGyroscope -06c4 Bizlink International Corp. -06c5 Hagenuk, GmbH -06c6 Infowave Software, Inc. -06c8 SIIG, Inc. -06c9 Taxan (Europe), Ltd - 0005 Monitor Control - 0007 Monitor Control - 0009 Monitor Control -06ca Newer Technology, Inc. -06cb Synaptics, Inc. - 0001 HID Device - 0002 HID Device - 0003 HID Device - 0005 Touchpad/FPS - 0006 HID Device - 0007 HID Device - 0008 HID Device - 0009 Composite TouchPad and TrackPoint - 000e HID Device - 0010 Composite Human Interface Device - 0013 Human Interface Device -06cc Terayon Communication Systems - 0101 Cable Modem - 0102 Cable Modem - 0103 Cable Modem - 0104 Cable Modem - 0304 Cable Modem -06cd Keyspan - 0101 USA-28 PDA [no firmware] - 0102 USA-28X PDA [no firmware] - 0103 USA-19 PDA [no firmware] - 0104 PDA [prerenum] - 0105 USA-18X PDA [no firmware] - 0106 USA-19W PDA [no firmware] - 0107 USA-19 PDA - 0108 USA-19W PDA - 0109 USA-49W serial adapter [no firmware] - 010a USA-49W serial adapter - 010b USA-19Qi serial adapter [no firmware] - 010c USA-19Qi serial adapter - 010d USA-19Q serial Adapter (no firmware) - 010e USA-19Q serial Adapter - 010f USA-28 PDA - 0110 USA-28Xb PDA - 0111 USA-18 serial Adapter - 0112 USA-18X PDA - 0113 USA-28Xb PDA [no firmware] - 0114 USA-28Xa PDA [no firmware] - 0115 USA-28Xa PDA - 0116 USA-18XA serial Adapter (no firmware) - 0117 USA-18XA serial Adapter - 0118 USA-19QW PDA [no firmware] - 0119 USA-19QW PDA - 011a USA-49Wlc serial adapter [no firmware] - 011b MPR Serial Preloader (MPRQI) - 011c MPR Serial (MPRQI) - 011d MPR Serial Preloader (MPRQ) - 011e MPR Serial (MPRQ) - 0121 USA-19hs serial adapter - 012a USA-49Wlc serial adapter - 0201 UIA-10 Digital Media Remote [Cypress AN2131SC] - 0202 UIA-11 Digital Media Remote -06cf SpheronVR AG - 1010 PanoCam 10 - 1012 PanoCam 12/12X -06d0 LapLink, Inc. - 0622 LapLink Gold USB-USB Bridge [net1080] -06d1 Daewoo Electronics Co., Ltd -06d3 Mitsubishi Electric Corp. - 0380 CP8000D Port - 0381 CP770D Port - 0385 CP900D Port - 0387 CP980D Port - 038b CP3020D Port - 038c CP900DW(ID) Port - 0393 CP9500D/DW Port - 0394 CP9000D/DW Port - 03a1 CP9550D/DW Port -06d4 Cisco Systems -06d5 Toshiba - 4000 Japanese Keyboard -06d6 Aashima Technology B.V. - 0025 Gamepad - 0026 Predator TH 400 Gamepad - 002d Trust PowerC@m 350FT - 002e Trust PowerC@m 350FS - 0030 Trust 710 LCD POWERC@M ZOOM - MSD - 0031 Trust 610/710 LCD POWERC@M ZOOM - 003a Trust PowerC@m 770Z (mass storage mode) - 003b Trust PowerC@m 770Z (webcam mode) - 003c Trust 910z PowerC@m - 003f Trust 735S POWERC@M ZOOM, WDM DSC Bulk Driver - 0050 Trust 738AV LCD PV Digital Camera - 0062 TRUST 782AV LCD P. V. Video Capture - 0066 TRUST Digital PCTV and Movie Editor - 0067 Trust 350FS POWERC@M FLASH - 006b TRUST AUDIO VIDEO EDITOR -06d7 Network Computing Devices (NCD) -06d8 Technical Marketing Research, Inc. -06da Phoenixtec Power Co., Ltd - 0002 UPS - 0003 1300VA UPS -06db Paradyne -06dc Foxlink Image Technology Co., Ltd - 0012 Scan 1200c Scanner - 0014 Prolink Winscan Pro 2448U -06de Heisei Electronics Co., Ltd -06e0 Multi-Tech Systems, Inc. - f101 MT5634ZBA-USB MultiModemUSB (old firmware) - f103 MT5634MU MultiMobileUSB - f104 MT5634ZBA-USB MultiModemUSB (new firmware) - f107 MT5634ZBA-USB-V92 MultiModemUSB -06e1 ADS Technologies, Inc. - 0008 UBS-10BT Ethernet [klsi] - 0009 UBS-10BT Ethernet - 0833 Mass Storage Device - a155 FM Radio Receiver/Instant FM Music (RDX-155-EF) - a160 Instant Video-To-Go RDX-160 (no firmware) - a161 Instant Video-To-Go RDX-160 - a190 Instand VCD Capture - a191 Instant VideoXpress - a337 Mini DigitalTV - a701 DVD Xpress - b337 Mini DigitalTV - b701 DVD Xpress B -06e4 Alcatel Microelectronics -06e6 Tiger Jet Network, Inc. - 0200 Internet Phone - 0201 Internet Phone - 0202 Composite Device - 0203 Internet Phone - 0210 Composite Device - 0211 Internet Phone - 0212 Internet Phone - 031c Internet Phone - 031d Internet Phone - 031e Internet Phone - 3200 Composite Device - 3201 Internet Phone - 3202 Composite Device - 3203 Composite Device - 7200 Composite Device - 7210 Composite Device - 7250 Composite Device - 825c Internet Phone - 831c Internet Phone - 831d Composite Device - 831e Composite Device - b200 Composite Device - b201 Composite Device - b202 Internet Phone - b210 Internet Phone - b211 Composite Device - b212 Composite Device - b250 Composite Device - b251 Internet Phone - b252 Internet Phone - c200 Internet Phone - c201 Internet Phone - c202 Composite Device - c203 Internet Phone - c210 Personal PhoneGateway - c211 Personal PhoneGateway - c212 Personal PhoneGateway - c213 PPG Device - c25c Composite Device - c290 PPG Device - c291 PPG Device - c292 PPG Device - c293 Personal PhoneGateway - c31c Composite Device - c39c Personal PhoneGateway - c39d PPG Device - c39e PPG Device - c39f PPG Device - c700 Internet Phone - c701 Internet Phone - c702 Composite Device - c703 Internet Phone - c710 VoIP Combo Device - c711 VoIP Combo - c712 VoIP Combo Device - c713 VoIP Combo Device - cf00 Composite Device - cf01 Internet Phone - cf02 Internet Phone - cf03 Composite Device - d210 Personal PhoneGateway - d211 PPG Device - d212 PPG Device - d213 Personal PhoneGateway - d700 Composite Device - d701 Composite Device - d702 Internet Phone - d703 Composite Device - d710 VoIP Combo - d711 VoIP Combo Device - d712 VoIP Combo - d713 VoIP Combo - df00 Composite Device - df01 Composite Device - df02 Internet Phone - df03 Internet Phone - f200 Internet Phone - f201 Internet Phone - f202 Composite Device - f203 Composite Device - f210 Internet Phone - f250 Composite Device - f252 Internet Phone - f310 Internet Phone - f350 Composite Device -06ea Sirius Technologies - 0001 NetCom Roadster II 56k - 0002 Roadster II 56k -06eb PC Expert Tech. Co., Ltd -06ef I.A.C. Geometrische Ingenieurs B.V. -06f0 T.N.C Industrial Co., Ltd - de01 DualCam Video Camera - de02 DualCam Still Camera -06f1 Opcode Systems, Inc. - a011 SonicPort - a021 SonicPort Optical -06f2 Emine Technology Co. - 0011 KVM Switch Keyboard -06f6 Wintrend Technology Co., Ltd -06f7 Wailly Technology Ltd - 0003 USB->Din 4 Adaptor -06f8 Guillemot Corp. - 3002 Hercules Blog Webcam - 3004 Hercules Classic Silver - 3005 Hercules Dualpix Exchange - 3007 Hercules Dualpix Chat and Show - a300 Dual Analog Leader GamePad - b000 Hercules DJ Console - c000 Hercules Muse Pocket - d002 Hercules DJ Console - e000 HWGUSB2-54 WLAN - e010 HWGUSB2-54-LB - e020 HWGUSB2-54V2-AP - e031 Hercules HWNUm-300 Wireless N mini [Realtek RTL8191SU] - e032 HWGUm-54 [Hercules Wireless G Ultra Mini Key] - e033 Hercules HWNUp-150 802.11n Wireless N Pico [Realtek RTL8188CUS] -06f9 ASYST electronic d.o.o. -06fa HSD S.r.L -06fc Motorola Semiconductor Products Sector -06fd Boston Acoustics - 0101 Audio Device - 0102 Audio Device - 0201 2-piece Audio Device -06fe Gallant Computer, Inc. -0701 Supercomal Wire & Cable SDN. BHD. -0703 Bvtech Industry, Inc. -0705 NKK Corp. -0706 Ariel Corp. -0707 Standard Microsystems Corp. - 0100 2202 Ethernet [klsi] - 0200 2202 Ethernet [pegasus] - 0201 EZ Connect USB Ethernet - ee04 SMCWUSB32 802.11b Wireless LAN Card - ee06 SMC2862W-G v1 EZ Connect 802.11g Adapter [Intersil ISL3886] - ee13 SMC2862W-G v2 EZ Connect 802.11g Adapter [Intersil ISL3887] -0708 Putercom Co., Ltd - 047e USB-1284 BRIDGE -0709 Silicon Systems, Ltd (SSL) -070a Oki Electric Industry Co., Ltd - 4002 Bluetooth Device - 4003 Bluetooth Device -070d Comoss Electronic Co., Ltd -070e Excel Cell Electronic Co., Ltd -0710 Connect Tech, Inc. - 0001 WhiteHeat (fake ID) - 8001 WhiteHeat -0711 Magic Control Technology Corp. - 0100 Hub - 0180 IRXpress Infrared Device - 0181 IRXpress Infrared Device - 0200 BAY-3U1S1P Serial Port - 0210 MCT1S Serial Port - 0230 MCT-232 Serial Port - 0231 PS/2 Mouse Port - 0232 Serial On Port - 0240 PS/2 to USB Converter - 0300 BAY-3U1S1P Parallel Port - 0302 Parallel Port - 0900 SVGA Adapter - 5001 Trigger UV-002BD[Startech USBVGAE] -0713 Interval Research Corp. -0714 NewMotion, Inc. - 0003 ADB to USB convertor -0717 ZNK Corp. -0718 Imation Corp. - 0002 SuperDisk 120MB - 0003 SuperDisk 120MB (Authenticated) - 0060 Flash Drive - 0061 Flash Drive - 0062 Flash Drive - 0063 Swivel Flash Drive - 0064 Flash Drive - 0065 Flash Drive - 0066 Flash Drive - 0067 Flash Drive - 0068 Flash Drive - 0084 Flash Drive Mini - 0582 Revo Flash Drive - d000 Disc Stakka CD/DVD Manager -0719 Tremon Enterprises Co., Ltd -071b Domain Technologies, Inc. - 0002 DTI-56362-USB Digital Interface Unit - 0101 Audio4-USB DSP Data Acquisition Unit - 0201 Audio4-5410 DSP Data Acquisition Unit - 0301 SB-USB JTAG Emulator - 3203 Rockchip Media Player - 32bb Music Mediatouch -071c Xionics Document Technologies, Inc. -071d Eicon Networks Corp. - 1000 Diva ISDN TA - 1003 Diva - 2000 Teledat Surf -071e Ariston Technologies -0723 Centillium Communications Corp. - 0002 Palladia 300/400 Adsl Modem -0726 Vanguard International Semiconductor-America -0729 Amitm - 1000 USC-1000 Serial Port -072e Sunix Co., Ltd -072f Advanced Card Systems, Ltd - 0001 AC1030-based SmartCard Reader - 0008 ACR 80 Smart Card Reader - 1000 PLDT Drive - 1001 PLDT Drive - 8002 AET63 BioTRUSTKey - 8003 ACR120 - 8103 ACR120 - 9000 ACR38 AC1038-based Smart Card Reader - 90cc ACR38 SmartCard Reader - 90cf ACR38 SAM Smart Card Reader - 90d0 PertoSmart EMV - Card Reader -0731 Susteen, Inc. - 0528 SonyEricsson DCU-11 Cable -0732 Goldfull Electronics & Telecommunications Corp. -0733 ViewQuest Technologies, Inc. - 0101 Digital Video Camera - 0110 VQ110 Video Camera - 0401 CS330 Webcam - 0402 M-318B Webcam - 0430 Intel Pro Share Webcam - 0630 VQ630 Dual Mode Digital Camera(Bulk) - 0631 Hercules Dualpix - 0780 Smart Cam Deluxe(composite) - 1310 Epsilon 1.3/Jenoptik JD C1.3/UMAX AstraPix 470 - 1311 Digital Dream Epsilon 1.3 - 1314 Mercury 2.1MEG Deluxe Classic Cam - 2211 Jenoptik jdc 21 LCD Camera - 2221 Mercury Digital Pro 3.1p - 3261 Concord 3045 spca536a Camera - 3281 Cyberpix S550V -0734 Lasat Communications A/S - 0001 560V Modem - 0002 Lasat 560V Modem - 043a DVS Audio - 043b 3DeMon USB Capture -0735 Asuscom Network - 2100 ISDN Adapter - 2101 ISDN Adapter - 6694 ISDNlink 128K - c541 ISDN TA 280 -0736 Lorom Industrial Co., Ltd -0738 Mad Catz, Inc. - 4507 XBox Device - 4516 XBox Device - 4520 XBox Device - 4526 XBox Device - 4536 XBox Device - 4540 XBox Device - 4556 XBox Device - 4566 XBox Device - 4576 XBox Device - 4586 XBox Device - 4588 XBox Device - 8818 Street Fighter IV Arcade FightStick (PS3) -073a Chaplet Systems, Inc. -073b Suncom Technologies -073c Industrial Electronic Engineers, Inc. - 0305 Pole Display (PC305-3415 2 x 20 Line Display) - 0322 Pole Display (PC322-3415 2 x 20 Line Display) - 0324 Pole Display (LB324-USB 4 x 20 Line Display) - 0330 Pole Display (P330-3415 2 x 20 Line Display) - 0424 Pole Display (SP324-4415 4 x 20 Line Display) - 0450 Pole Display (L450-USB Graphic Line Display) - 0505 Pole Display (SPC505-3415 2 x 20 Line Display) - 0522 Pole Display (SPC522-3415 2 x 20 Line Display) - 0624 Pole Display (SP324-3415 4 x 20 Line Display) -073d Eutron S.p.a. - 0005 Crypto Token - 0007 CryptoIdentity CCID - 0025 SmartKey 3 - 0c00 Pocket Reader - 0d00 StarSign Bio Token 3.0 EU -073e NEC, Inc. - 0301 Game Pad -0745 Syntech Information Co., Ltd -0746 Onkyo Corp. - 5500 SE-U55 Audio Device -0747 Labway Corp. -0748 Strong Man Enterprise Co., Ltd -0749 EVer Electronics Corp. -074a Ming Fortune Industry Co., Ltd -074b Polestar Tech. Corp. -074c C-C-C Group PLC -074d Micronas GmbH - 3553 Composite USB-Device - 3554 Composite USB-Device - 3556 Composite USB-Device -074e Digital Stream Corp. - 0001 PS/2 Adapter - 0002 PS/2 Adapter -0755 Aureal Semiconductor -0757 Network Technologies, Inc. -075b Sophisticated Circuits, Inc. - 0001 Kick-off! Watchdog -0763 Midiman - 0115 O2 / KeyRig 25 - 0117 Trigger Finger - 0119 MidAir - 0150 M-Audio Uno - 0160 M-Audio 1x1 - 0192 M-Audio Keystation 88es - 0193 ProKeys 88 - 0194 ProKeys 88sx - 0195 Oxygen 8 v2 - 0196 Oxygen 49 - 0197 Oxygen 61 - 0198 Axiom 25 - 0199 Axiom 49 - 019a Axiom 61 - 019b KeyRig 49 - 019c KeyStudio - 1001 MidiSport 2x2 - 1002 MidiSport 2x2 - 1003 MidiSport 2x2 - 1010 MidiSport 1x1 - 1011 MidiSport 1x1 - 1014 M-Audio Keystation Loader - 1015 M-Audio Keystation - 1020 Midisport 4x4 - 1021 MidiSport 4x4 - 1030 Midisport 8x8 - 1031 MidiSport 8x8/s Loader - 1033 MidiSport 8x8/s - 1040 M-Audio MidiSport 2x4 Loader - 1041 M-Audio MidiSport 2x4 - 1110 MidiSport 1x1 - 2001 M Audio Quattro - 2002 M Audio Duo - 2003 M Audio AudioPhile - 2004 M-Audio MobilePre - 2006 M-Audio Transit - 2007 M-Audio Sonica Theater - 2008 M-Audio Ozone - 200d M-Audio OmniStudio - 200f M-Audio MobilePre - 2010 M-Audio Fast Track - 2012 M-Audio Fast Track Pro - 2013 M-Audio JamLab - 2015 M-Audio RunTime DFU - 2016 M-Audio RunTime DFU - 2019 M-Audio Ozone Academic - 201a M-Audio Micro - 201b M-Audio RunTime DFU - 201d M-Audio Producer - 2080 M-Audio RunTime DFU - 2081 M-Audio RunTime DFU / Fast Track Ultra 8R - 2803 M-Audio Audiophile DFU - 2804 M-Audio MobilePre DFU - 2806 M-Audio Transit DFU - 2815 M-Audio DFU - 2816 M-Audio DFU - 281b M-Audio DFU - 2880 M-Audio DFU - 2881 M-Audio DFU -0764 Cyber Power System, Inc. - 0005 Cyber Power UPS - 0501 CP1500 AVR UPS -0765 X-Rite, Inc. - d094 X-Rite DTP94 [Quato Silver Haze Pro] -0766 Jess-Link Products Co., Ltd - 0204 TopSpeed Cyberlink Remote Control -0767 Tokheim Corp. -0768 Camtel Technology Corp. - 0006 Camtel Technology USB TV Genie Pro FM Model TVB330 - 0023 eHome Infrared Receiver -0769 Surecom Technology Corp. - 11f2 EP-9001-g 802.11g 54M WLAN Adapter - 11f3 RT2570 - 11f7 802.11g 54M WLAN Adapter - 31f3 RT2573 -076a Smart Technology Enablers, Inc. -076b OmniKey AG - 0596 CardMan 2020 - 1021 CardMan 1021 - 1221 CardMan 1221 - 1784 CardMan 6020 - 3021 CardMan 3121 - 3610 CardMan 3620 - 3621 CardMan 3621 - 3821 CardMan 3821 - 4321 CardMan 4321 - 5121 CardMan 5121 - 5125 CardMan 5125 - 6622 CardMan 6121 - a011 CCID Smart Card Reader Keyboard - a021 CCID Smart Card Reader - a022 CardMan Smart@Link - c000 CardMan 3x21 CS - c001 CardMan 5121 CS -076c Partner Tech -076d Denso Corp. -076e Kuan Tech Enterprise Co., Ltd -076f Jhen Vei Electronic Co., Ltd -0770 Welch Allyn, Inc - Medical Division -0771 Observator Instruments BV - 4455 OMC45III - ae0f OMC45III -0774 AmTRAN Technology Co., Ltd -0775 Longshine Electronics Corp. -0776 Inalways Corp. -0777 Comda Enterprise Corp. -0778 Volex, Inc. -0779 Fairchild Semiconductor -077a Sankyo Seiki Mfg. Co., Ltd -077b Linksys - 08be BEFCMU10 v4 Cable Modem - 2219 WUSB11 V2.6 802.11b Adapter - 2226 USB200M 100baseTX Adapter - 2227 Network Everywhere NWU11B -077c Forward Electronics Co., Ltd - 0005 NEC Keyboard -077d Griffin Technology - 0223 IMic Audio In/Out - 0405 iMate, ADB Adapter - 0410 PowerMate - 041a PowerWave - 04aa SoundKnob - 07af iMic - 1016 AirClick - 627a Radio SHARK -077f Well Excellent & Most Corp. -0780 Sagem Monetel GmbH - 1202 ORGA 900 Smart Card Terminal Virtual Com Port - 1302 ORGA 6000 Smart Card Terminal Virtual Com Port - 1303 ORGA 6000 Smart Card Terminal USB RNDIS - df55 ORGA 900/6000 Smart Card Terminal DFU -0781 SanDisk Corp. - 0001 SDDR-05a ImageMate CompactFlash Reader - 0002 SDDR-31 ImageMate II CompactFlash Reader - 0005 SDDR-05b (CF II) ImageMate CompactFlash Reader - 0100 ImageMate SDDR-12 - 0200 SDDR-09 (SSFDC) ImageMate SmartMedia Reader [eusb] - 0400 SecureMate SD/MMC Reader - 0621 SDDR-86 Imagemate 6-in-1 Reader - 0720 Sansa C200 series in recovery mode - 0729 Sansa E200 series in recovery mode - 0810 SDDR-75 ImageMate CF-SM Reader - 0830 ImageMate CF/MMC/SD Reader - 1234 Cruzer Mini Flash Drive - 5150 SDCZ2 Cruzer Mini Flash Drive (thin) - 5151 Cruzer Micro Flash Drive - 5153 Cruzer Flash Drive - 5402 U3 Cruzer Micro - 5406 Cruzer Micro U3 - 5408 Cruzer Titanium U3 - 540e Cruzer Contour Flash Drive - 5530 Cruzer - 5567 Cruzer Blade - 5e10 Encrypted - 6100 Ultra II SD Plus 2GB - 7100 Cruzer Mini - 7101 Pen Flash - 7102 Cruzer Mini - 7103 Cruzer Mini - 7104 Cruzer Micro Mini 256MB Flash Drive - 7105 Cruzer Mini - 7106 Cruzer Mini - 7112 Cruzer Micro 128MB Flash Drive - 7113 Cruzer Micro 256MB Flash Drive - 7114 Cruzer Mini - 7115 Cruzer Mini - 7301 Sansa e100 series (mtp) - 7302 Sansa e100 series (msc) - 7400 Sansa M200 series (mtp) - 7401 Sansa M200 series (msc) - 7420 Sansa E200 series (mtp) - 7421 Sansa E200 Series (msc) - 7422 Sansa E200 series v2 (mtp) - 7423 Sansa E200 series v2 (msc) - 7430 Sansa M200 series - 7431 Sansa M200 series V4 (msc) - 7432 Sansa Clip (mtp) - 7433 Sansa Clip (msc) - 7434 Sansa Clip V2 (mtp) - 7435 Sansa Clip V2 (msc) - 7450 Sansa C250 - 7451 Sansa C240 - 7460 Sansa Express - 7480 Sansa Connect - 7481 Sansa Connect (in recovery mode) - 74b0 Sansa View (msc) - 74b1 Sansa View (mtp) - 74c0 Sansa Fuze (mtp) - 74c1 Sansa Fuze (msc) - 74c2 Sansa Fuze V2 (mtp) - 74c3 Sansa Fuze V2 (msc) - 74d0 Sansa Clip+ (mtp) - 74d1 Sansa Clip+ (msc) - 8181 Pen Flash - 8183 Hi-Speed Mass Storage Device - 8185 SDCZ2 Cruzer Mini Flash Drive (older, thick) - 8888 Card Reader - 8889 SDDR-88 Imagemate 8-in-1 Reader - 8919 Card Reader - 8989 ImageMate 12-in-1 Reader - 9191 ImageMate CF - 9219 Card Reader - 9292 ImageMate CF Reader/Writer - 9393 ImageMate SD-MMC - 9595 ImageMate xD-SM - 9797 ImageMate MS-PRO - 9919 Card Reader - 9999 SDDR-99 5-in-1 Reader - a7e8 SDDR-113 MicroMate SDHC Reader - b2b3 SDDR-103 MobileMate SD+ Reader - b4b5 SDDR-89 V4 ImageMate 12-in-1 Reader -0782 Trackerball -0783 C3PO - 0003 LTC31 SmartCard Reader - 0006 LTC31v2 - 0009 KBR36 - 0010 LTC32 -0784 Vivitar, Inc. - 0100 Vivicam 2655 - 1310 Vivicam 3305 - 1688 Vivicam 3665 - 1689 Gateway DC-M42/Labtec DC-505/Vivitar Vivicam 3705 - 2620 AOL Photocam Plus - 2888 Polaroid DC700 - 3330 Nytec ND-3200 Camera - 4300 Traveler D1 - 5260 Werlisa Sport PX 100 / JVC GC-A33 Camera - 5300 Pretec dc530 -0785 NTT-ME - 0001 MN128mini-V ISDN TA - 0003 MN128mini-J ISDN TA -0789 Logitec Corp. - 0026 LHD Device - 0033 DVD Multi-plus unit LDR-H443SU2 - 0063 LDR Device - 0064 LDR-R Device - 00b3 DVD Multi-plus unit LDR-H443U2 - 010c Realtek RTL8187 Wireless 802.11g 54Mbps Network Adapter - 0162 LAN-WN22/U2 Wireless LAN Adapter - 0163 LAN-WN12/U2 Wireless LAN Adapter - 0164 LAN-W150/U2M Wireless LAN Adapter - 0166 LAN-W300N/U2 Wireless LAN Adapter - 0168 LAN-W150N/U2 Wireless LAN Adapter -078b Happ Controls, Inc. - 0010 Driving UGCI - 0020 Flying UGCI - 0030 Fighting UGCI -078c GTCO/CalComp - 0090 Tablet Adapter - 0100 Tablet Adapter - 0200 Tablet Adapter - 0300 Tablet Adapter - 0400 Digitizer (Whiteboard) -078e Brincom, Inc. -0790 Pro-Image Manufacturing Co., Ltd -0791 Copartner Wire and Cable Mfg. Corp. -0792 Axis Communications AB -0793 Wha Yu Industrial Co., Ltd -0794 ABL Electronics Corp. -0795 RealChip, Inc. -0796 Certicom Corp. -0797 Grandtech Semiconductor Corp. - 6801 Flatbed Scanner - 6802 InkJet Color Printer - 8001 SmartCam - 801a Typhoon StyloCam - 801c Meade Binoculars/Camera - 8901 ScanHex SX-35a - 8909 ScanHex SX-35b - 8911 ScanHex SX-35c -0798 Optelec - 0001 Braille Voyager -0799 Altera - 7651 Programming Unit -079b Sagem - 0027 USB-Serial Controller - 002f Mobile - 0030 Mobile Communication Device - 0042 Mobile - 004a XG-760A 802.11bg - 004b Wi-Fi 11g adapter - 0056 Agfa AP1100 Photo Printer - 005d Mobile Mass Storage - 0062 XG-76NA 802.11bg - 0078 Laser Pro Monochrome MFP -079d Alfadata Computer Corp. - 0201 GamePort Adapter -07a1 Digicom S.p.A. - d952 Palladio USB V.92 Modem -07a2 National Technical Systems -07a3 Onnto Corp. -07a4 Be, Inc. -07a6 ADMtek, Inc. - 07c2 AN986A Ethernet - 0986 AN986 Pegasus Ethernet - 8266 Infineon WildCard-USB Wireless LAN Adapter - 8511 ADM8511 Pegasus II Ethernet - 8513 AN8513 Ethernet - 8515 AN8515 Ethernet -07aa Corega K.K. - 0001 Ether USB-T Ethernet [klsi] - 0004 FEther USB-TX Ethernet [pegasus] - 000c WirelessLAN USB-11 - 000d FEther USB-TXS - 0011 Wireless LAN USB-11 mini - 0012 Stick-11 802.11b Adapter - 0017 FEther USB2-TX - 0018 Wireless LAN USB-11 mini 2 - 001a ULUSB-11 Key - 001c CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887] - 002f CG-WLUSB2GNL - 003c CG-WLUSB2GNL - 003f CG-WLUSB300AGN - 0041 CG-WLUSB300GNS - 0042 CG-WLUSB300GNM - 0043 CG-WLUSB300N rev A2 [Realtek RTL8192U] - 0047 CG-WLUSBNM - 0051 CG-WLUSB300NM - 7613 Stick-11 V2 802.11b Adapter - 9601 FEther USB-TXC -07ab Freecom Technologies - fc01 IDE bridge - fc02 Cable II USB-2 - fc03 USB2-IDE IDE bridge - fcd6 Freecom HD Classic - fcf6 DataBar 512 MB - fcf8 Freecom Classic SL Network Drive - fcfe Hard Drive 80GB -07af Microtech - 0004 SCSI-DB25 SCSI Bridge [shuttle] - 0005 SCSI-HD50 SCSI Bridge [shuttle] - 0006 CameraMate SmartMedia and CompactFlash Card Reader [eusb/shuttle] - fc01 Freecom USB-IDE -07b0 Trust Technologies - 0001 ISDN TA - 0002 ISDN TA128 Plus - 0003 ISDN TA128 Deluxe - 0005 ISDN TA128 SE - 0006 ISDN TA128 CE - 0007 ISDN TA - 0008 ISDN TA -07b1 IMP, Inc. -07b2 Motorola BCS, Inc. - 0100 SURFboard Voice over IP Cable Modem - 0900 SURFboard Gateway - 0950 SURFboard SBG950 Gateway - 1000 SURFboard SBG1000 Gateway - 4100 SurfBoard SB4100 Cable Modem - 4200 SurfBoard SB4200 Cable Modem - 4210 SurfBoard 4210 Cable Modem - 4220 SURFboard SB4220 Cable Modem - 4500 CG4500 Communications Gateway - 450b CG4501 Communications Gateway - 450e CG4500E Communications Gateway - 5100 SurfBoard SB5100 Cable Modem - 5101 SurfBoard SB5101 Cable Modem - 5120 SurfBoard SB5120 Cable Modem (RNDIS) - 5121 Surfboard 5121 Cable Modem - 7030 WU830G 802.11bg Wireless Adapter [Envara WiND512] -07b3 Plustek, Inc. - 0001 OpticPro 1212U Scanner - 0003 Scanner - 0010 OpticPro U12 Scanner - 0011 OpticPro U24 Scanner - 0013 OpticPro UT12 Scanner - 0014 Scanner - 0015 OpticPro U24 Scanner - 0017 OpticPro UT12/16/24 Scanner - 0204 Scanner - 0400 OpticPro 1248U Scanner - 0401 OpticPro 1248U Scanner #2 - 0403 OpticPro U16B Scanner - 0404 Scanner - 0405 A8 Namecard-s Controller - 0406 A8 Namecard-D Controller - 0410 Scanner - 0412 Scanner - 0413 OpticSlim 1200 Scanner - 0601 OpticPro ST24 Scanner - 0800 OpticPro ST48 Scanner - 0906 OpticBook 3600 Scanner - 0a06 TVcam VD100 - 0b00 SmartPhoto F50 - 0c03 OpticPro ST64+ Scanner - 0c04 Optic Film 7200i scanner - 0c0c PL806 - 0c26 OpticBook 4600 Scanner - 0c2b Mobile Office D428 Scanner -07b4 Olympus Optical Co., Ltd - 0100 Camedia C-2100/C-3000 Ultra Zoom Camera - 0102 Camedia E-10/C-220/C-50 Camera - 0105 Camedia C-310Z/C-700/C-750UZ/C-755/C-765UZ/C-3040/C-4000/C-5050Z/D-560/C-3020Z Zoom Camera - 0109 C-370Z/C-500Z/D-535Z/X-450 - 010a MAUSB-10 xD and SmartMedia Card Reader - 0112 MAUSB-100 xD Card Reader - 0113 Mju 500 - 0114 C-350Z Camera - 0118 Digital Camera - 0184 P-S100 port - 0203 Digital Voice Recorder DW-90 - 0206 Digital Voice Recorder DS-330 - 0207 Digital Voice Recorder & Camera W-10 - 0209 Digital Voice Recorder DM-20 - 020d Digital Voice Recorder VN-240PC - 0280 m:robe 100 -07b5 Mega World International, Ltd - 0017 Joystick - 0213 Thrustmaster Firestorm Digital 3 Gamepad - 0312 Gamepad - 9902 GamePad -07b6 Marubun Corp. -07b7 TIME Interconnect, Ltd -07b8 AboCom Systems Inc - 110c XX1 - 1201 IEEE 802.11b Adapter - 200c XX2 - 2573 Wireless LAN Card - 2770 802.11n/b/g Mini Wireless LAN USB2.0 Adapter - 2870 802.11n/b/g Wireless LAN USB2.0 Adapter - 3070 802.11n/b/g Mini Wireless LAN USB2.0 Adapter - 3071 802.11n/b/g Mini Wireless LAN USB2.0 Adapter - 3072 802.11n/b/g Mini Wireless LAN USB2.0 Adapter - 4000 DU-E10 Ethernet [klsi] - 4002 DU-E100 Ethernet [pegasus] - 4003 1/10/100 Ethernet Adapter - 4004 XX4 - 4007 XX5 - 400b XX6 - 400c XX7 - 401a RTL8151 - 4102 USB 1.1 10/100M Fast Ethernet Adapter - 4104 XX9 - 420a UF200 Ethernet - 5301 GW-US54ZGL 802.11bg - 6001 802.11bg - a001 WUG2200 802.11g Wireless Adapter [Envara WiND512] - abc1 DU-E10 Ethernet [pegasus] - b000 BWU613 - b02a AboCom Bluetooth Device - b02b Bluetooth dongle - b02c BCM92045DG-Flash with trace filter - b02d BCM92045DG-Flash with trace filter - b02e BCM92045DG-Flash with trace filter - b030 BCM92045DG-Flash with trace filter - b031 BCM92045DG-Flash with trace filter - b032 BCM92045DG-Flash with trace filter - b033 BCM92045DG-Flash with trace filter - b21a WUG2400 802.11g Wireless Adapter [Texas Instruments TNETW1450] - b21b HWU54DM - b21c RT2573 - b21d RT2573 - b21e RT2573 - b21f WUG2700 - d011 MP3 Player - e001 Mass Storage Device - e002 Mass Storage Device - e003 Mass Storage Device - e004 Mass Storage Device - e005 Mass Storage Device - e006 Mass Storage Device - e007 Mass Storage Device - e008 Mass Storage Device - e009 Mass Storage Device - e00a Mass Storage Device - e4f0 Card Reader Driver - f101 DSB-560 Modem [atlas] -07bc Canon Computer Systems, Inc. -07bd Webgear, Inc. -07be Veridicom -07c0 Code Mercenaries Hard- und Software GmbH - 1121 The Claw - 1500 IO-Warrior 40 - 1501 IO-Warrior 24 - 1502 IO-Warrior 48 - 1503 IO-Warrior 28 - 1511 IO-Warrior 24 Power Vampire - 1512 IO-Warrior 24 Power Vampire -07c1 Keisokugiken - 0068 HKS-0200 USBDAQ -07c4 Datafab Systems, Inc. - 0102 USB to LS120 - 0103 USB to IDE - 1234 USB to ATAPI - a000 CompactFlash Card Reader - a001 CompactFlash & SmartMedia Card Reader [eusb] - a002 Disk Drive - a003 Datafab-based Reader - a004 USB to MMC Class Drive - a005 CompactFlash & SmartMedia Card Reader - a006 SmartMedia Card Reader - a007 Memory Stick Class Drive - a103 MDSM-B reader - a107 USB to Memory Stick (LC1) Drive - a109 LC1 CompactFlash & SmartMedia Card Reader - a10b USB to CF+MS(LC1) - a200 DF-UT-06 Hama MMC/SD Reader - a400 CompactFlash & Microdrive Reader - a600 Card Reader - ad01 Mass Storage Device - ae01 Mass Storage Device - af01 Mass Storage Device - b000 USB to CF(LC1) - b001 USB to CF+PCMCIA - b004 MMC/SD Reader - b006 USB to PCMCIA - b00a USB to CF+SD Drive(LC1) - b00b USB to Memory Stick(LC1) -07c5 APG Cash Drawer -07c6 ShareWave, Inc. - 0002 Bodega Wireless Access Point - 0003 Bodega Wireless Network Adapter -07c7 Powertech Industrial Co., Ltd -07c8 B.U.G., Inc. - 0202 MN128-SOHO PAL -07c9 Allied Telesyn International - b100 AT-USB100 -07ca AVerMedia Technologies, Inc. - 0002 AVerTV PVR USB/EZMaker Pro Device - 0026 AVerTV - 0337 A867 DVB-T dongle - 1228 MPEG-2 Capture Device (M038) - 1830 AVerTV Volar Video Capture (H830) - 850a AverTV Volar Black HD (A850) - 850b AverTV Red HD+ (A850T) - a309 AVerTV DVB-T (A309) - a801 AVerTV DVB-T (A800) - a815 AVerTV DVB-T Volar X (A815) - a867 AVerTV DVB-T (A867) - b800 MR800 FM Radio - e880 MPEG-2 Capture Device (E880) - e882 MPEG-2 Capture Device (E882) -07cb Kingmax Technology, Inc. -07cc Carry Computer Eng., Co., Ltd - 0000 CF Card Reader - 0001 Reader (UICSE) - 0002 Reader (UIS) - 0003 SM Card Reader - 0004 SM/CF/PCMCIA Card Reader - 0005 Reader (UISA2SE) - 0006 SM/CF/PCMCIA Card Reader - 0007 Reader (UISA6SE) - 000c SM/CF Card Reader - 000d SM/CF Card Reader - 000e Reader (UISDA) - 000f Reader (UICLIK) - 0010 Reader (UISMA) - 0012 Reader (UISC6SE-FLASH) - 0014 Litronic Fortezza Reader - 0030 Mass Storage (UISDMC12S) - 0040 Mass Storage (UISDMC13S) - 0100 Reader (UID) - 0101 Reader (UIM) - 0102 Reader (UISDMA) - 0103 Reader (UISDMC) - 0104 Reader (UISDM) - 0200 6-in-1 Card Reader - 0201 Mass Storage (UISDMC1S & UISDMC3S) - 0202 Mass Storage (UISDMC5S) - 0203 Mass Storage (UISMC5S) - 0204 Mass Storage (UIM4/5S & UIM7S) - 0205 Mass Storage (UIS4/5S & UIS7S) - 0206 Mass Storage (UISDMC10S & UISDMC11S) - 0207 Mass Storage (UPIDMA) - 0208 Mass Storage (UCFC II) - 0210 Mass Storage (UPIXXA) - 0213 Mass Storage (UPIDA) - 0214 Mass Storage (UPIMA) - 0215 Mass Storage (UPISA) - 0217 Mass Storage (UPISDMA) - 0223 Mass Storage (UCIDA) - 0224 Mass Storage (UCIMA) - 0225 Mass Storage (UIS7S) - 0227 Mass Storage (UCIDMA) - 0234 Mass Storage (UIM7S) - 0235 Mass Storage (UIS4S-S) - 0237 Velper (UISDMC4S) - 0300 6-in-1 Card Reader - 0301 6-in-1 Card Reader - 0303 Mass Storage (UID10W) - 0304 Mass Storage (UIM10W) - 0305 Mass Storage (UIS10W) - 0308 Mass Storage (UIC10W) - 0309 Mass Storage (UISC3W) - 0310 Mass Storage (UISDMA2W) - 0311 Mass Storage (UISDMC14W) - 0320 Mass Storage (UISDMC4W) - 0321 Mass Storage (UISDMC37W) - 0330 WINTERREADER Reader - 0350 9-in-1 Card Reader - 0500 Mass Storage - 0501 Mass Storage -07cd Elektor - 0001 USBuart Serial Port -07cf Casio Computer Co., Ltd - 1001 QV-8000SX/5700/3000EX Digicam; Exilim EX-M20 - 1003 Exilim EX-S500 - 1004 Exilim EX-Z120 - 1011 USB-CASIO PC CAMERA - 1116 EXILIM EX-Z19 - 1133 Exilim EX-Z350 Digital Camera (mass storage mode) - 1233 Exilim EX-Z350 Digital Camera (PictBridge mode) - 2002 E-125 Cassiopeia Pocket PC - 3801 WMP-1 MP3-Watch - 4001 Label Printer KL-P1000 - 4007 CW50 Device - 4104 Cw75 Device - 4107 CW-L300 Device - 4500 LV-20 Digital Camera - 6801 PL-40R - 6802 MIDI Keyboard -07d0 Dazzle - 0001 Digital Video Creator I - 0002 Global Village VideoFX Grabber - 0003 Fusion Model DVC-50 Rev 1 (NTSC) - 0004 DVC-800 (PAL) Grabber - 0005 Fusion Video and Audio Ports - 0006 DVC 150 Loader Device - 0007 DVC 150 - 0327 Fusion Digital Media Reader - 1001 DM-FLEX DFU Adapter - 1002 DMHS2 DFU Adapter - 1102 CF Reader/Writer - 1103 SD Reader/Writer - 1104 SM Reader/Writer - 1105 MS Reader/Writer - 1106 xD/SM Reader/Writer - 1202 MultiSlot Reader/Writer - 2000 FX2 DFU Adapter - 2001 eUSB CompactFlash Reader - 4100 Kingsun SF-620 Infrared Adapter - 4101 Connectivity Cable (CA-42 clone) - 4959 Kingsun KS-959 Infrared Adapter -07d1 D-Link System - 13ec VvBus for Helium 2xx - 13ed VvBus for Helium 2xx - 13f1 DSL-302G Modem - 13f2 DSL-502G Router - 3300 DWA-130 802.11n Wireless N Adapter(rev.E) [Realtek RTL8192SU] - 3302 DWA-130 802.11n Wireless N Adapter(rev.C2) [Realtek RTL8192SU] - 3303 DWA-131 802.11n Wireless N Nano Adapter(rev.A1) [Realtek RTL8192SU] - 3a07 WUA-2340 RangeBooster G Adapter(rev.A) [Atheros AR5523] - 3a08 WUA-2340 RangeBooster G Adapter(rev.A) (no firmware) [Atheros AR5523] - 3a09 DWA-160 802.11abgn Xtreme N Dual Band Adapter(rev.A2) [Atheros AR9170+AR9104] - 3a0d DWA-120 802.11g Wireless 108G Adapter [Atheros AR5523] - 3a0f DWA-130 802.11n Wireless N Adapter(rev.D) [Atheros AR9001U-(2)NG] - 3a10 DWA-126 802.11n Wireless Adapter [Atheros AR9271] - 3b01 AirPlus G DWL-G122 Wireless Adapter(rev.D) [Marvell 88W8338+88W8010] - 3b10 RangeBooster N Adapter - 3b11 DWA-130 802.11n Wireless N Adapter(rev.A1) [Marvell W8360USB] - 3c03 AirPlus G DWL-G122 Wireless Adapter(rev.C1) [Ralink RT73] - 3c04 WUA-1340 - 3c05 EH103 Wireless G Adapter - 3c07 Wireless G DWA-110 Adapter - 3c09 DWA-140 RangeBooster N Adapter(rev.B1) [Ralink RT2870] - 3c0a DWA-140 RangeBooster N Adapter(rev.B2) [Ralink RT2870] - 3c0b DWA-110 Wireless G USB Adapter(rev.B) - 3c0d DWA-125 Wireless N 150 Adapter(rev.A1) [Ralink RT3070] - 3c0e WUA-2340 RangeBooster G Adapter(rev.B) [Ralink RT2070] - 3c0f AirPlus G DWL-G122 Wireless Adapter(rev.E) [Ralink RT2870] - 3c10 DWA-160 802.11abgn Xtreme N Dual Band Adapter(rev.A1) [Atheros AR9170+AR9104] - 3c11 DWA-160 Xtreme N Dual Band USB Adapter(rev.B) [Ralink RT2870] - 3c13 DWA-130 802.11n Wireless N Adapter(rev.B) [Ralink RT2870] - 3c15 DWA-140 RangeBooster N Adapter(rev.B3) [Ralink RT2870] - 3c16 DWA-125 Wireless N 150 Adapter(rev.A2) [Ralink RT3070] - 3e02 DWM-156 3.75G HSUPA Adapter - 5100 Remote NDIS Device - a800 DWM-152 3.75G HSUPA Adapter - f101 DBT-122 Bluetooth - fc01 DBT-120 Bluetooth Adapter -07d2 Aptio Products, Inc. -07d3 Cyberdata Corp. -07d5 Radiant Systems -07d7 GCC Technologies, Inc. -07da Arasan Chip Systems -07de Diamond Multimedia - 2820 VC500 Video Capture Dongle -07df David Electronics Co., Ltd -07e1 Ambient Technologies, Inc. - 5201 V.90 Modem -07e2 Elmeg GmbH & Co., Ltd -07e3 Planex Communications, Inc. -07e4 Movado Enterprise Co., Ltd - 0967 SCard R/W CSR-145 - 0968 SCard R/W CSR-145 -07e5 QPS, Inc. - 05c2 IDE-to-USB2.0 PCA - 5c01 Que! CDRW -07e6 Allied Cable Corp. -07e7 Mirvo Toys, Inc. -07e8 Labsystems -07ea Iwatsu Electric Co., Ltd -07eb Double-H Technology Co., Ltd -07ec Taiyo Electric Wire & Cable Co., Ltd -07ee Torex Retail (formerly Logware) - 0002 Cash Drawer I/F -07ef STSN - 0001 Internet Access Device -07f2 Microcomputer Applications, Inc. - 0001 KEYLOK II -07f6 Circuit Assembly Corp. -07f7 Century Corp. - 0005 ScanLogic/Century Corporation uATA - 011e Century USB Disk Enclosure -07f9 Dotop Technology, Inc. -07fa DrayTek Corp. - 0778 miniVigor 128 ISDN TA - 1012 BeWAN ADSL USB ST (grey) - 1196 BWIFI-USB54AR 802.11bg - a904 BeWAN ADSL - a905 BeWAN ADSL ST -07fd Mark of the Unicorn - 0000 FastLane MIDI Interface - 0001 FastLane Quad MIDI Interface - 0002 MOTU Audio for 64 bit -07ff Unknown - 00ff Portable Hard Drive -0801 Mag-Tek - 0001 Mini Swipe Reader (Keyboard Emulation) - 0002 Mini Swipe Reader -0802 Mako Technologies, LLC -0803 Zoom Telephonics, Inc. - 1300 V92 Faxmodem - 4310 Wireless-G - 5241 Cable Modem - 5551 DSL Modem - 9700 2986L FaxModem - 9800 Cable Modem - a312 Wireless-G -0809 Genicom Technology, Inc. -080a Evermuch Technology Co., Ltd -080b Cross Match Technologies - 0002 Fingerprint Scanner (After ReNumeration) - 0010 300LC Series Fingerprint Scanner (Before ReNumeration) -080c Datalogic S.p.A. - 0300 Gryphon D120 Barcode Scanner - 0400 Gryphon D120 Barcode Scanner - 0500 Gryphon D120 Barcode Scanner - 0600 Gryphon M100 Barcode Scanner -080d Teco Image Systems Co., Ltd - 0102 Hercules Scan@home 48 - 0104 3.2Slim - 0110 UMAX AstraSlim 1200 Scanner -0810 Personal Communication Systems, Inc. - 0001 Dual PSX Adaptor - 0002 Dual PCS Adaptor -0813 Mattel, Inc. - 0001 Intel Play QX3 Microscope - 0002 Dual Mode Camera Plus -0819 eLicenser - 0101 License Management and Copy Protection -081a MG Logic - 1000 Duo Pen Tablet -081b Indigita Corp. - 0600 Storage Adapter - 0601 Storage Adapter -081c Mipsys -081e AlphaSmart, Inc. - df00 Handheld -0822 Reudo Corp. - 2001 IRXpress Infrared Device -0825 GC Protronics -0826 Data Transit -0827 BroadLogic, Inc. -0828 Sato Corp. -0829 DirecTV Broadband, Inc. (Telocity) -082d Handspring - 0100 Visor - 0200 Treo - 0300 Treo 600 - 0400 Handheld - 0500 Handheld - 0600 Handheld -0830 Palm, Inc. - 0001 m500 - 0002 m505 - 0003 m515 - 0004 Handheld - 0005 Handheld - 0006 Handheld - 0010 Handheld - 0011 Handheld - 0012 Handheld - 0013 Handheld - 0014 Handheld - 0020 i705 - 0021 Handheld - 0022 Handheld - 0023 Handheld - 0024 Handheld - 0030 Handheld - 0031 Tungsten W - 0032 Handheld - 0033 Handheld - 0034 Handheld - 0040 m125 - 0041 Handheld - 0042 Handheld - 0043 Handheld - 0044 Handheld - 0050 m130 - 0051 Handheld - 0052 Handheld - 0053 Handheld - 0054 Handheld - 0060 Tungsten C/E/T/T2/T3 / Zire 71 - 0061 Lifedrive / Treo 650/680 / Tunsten E2/T5/TX / Centro / Zire 21/31/72 / Z22 - 0062 Handheld - 0063 Handheld - 0064 Handheld - 0070 Zire - 0071 Handheld - 0072 Handheld - 0080 Serial Adapter [for Palm III] - 0081 Handheld - 0082 Handheld - 00a0 Treo 800w - 0101 Pre -0832 Kouwell Electronics Corp. - 5850 Cable -0833 Sourcenext Corp. - 012e KeikaiDenwa 8 with charger - 039f KeikaiDenwa 8 -0835 Action Star Enterprise Co., Ltd -0839 Samsung Techwin Co., Ltd - 0005 Digimax Camera - 0008 Digimax 230 Camera - 0009 Digimax 340 - 000a Digimax 410 - 000e Digimax 360 - 0010 Digimax 300 - 1003 Digimax 210SE - 1005 Digimax 220 - 1009 Digimax V4 - 1012 6500 Document Camera - 1058 S730 Camera - 1064 Digimax D830 Camera - 1542 Digimax 50 Duo - 3000 Digimax 35 MP3 -083a Accton Technology Corp. - 1046 10/100 Ethernet [pegasus] - 1060 HomeLine Adapter - 1f4d SMC8013WG Broadband Remote NDIS Device - 3046 10/100 Series Adapter - 3060 1/10/100 Adapter - 3501 2664W - 3502 WN3501D Wireless Adapter - 3503 T-Sinus 111 Wireless Adapter - 4501 T-Sinus 154data - 4502 Siemens S30853-S1016-R107 802.11g Wireless Adapter [Intersil ISL3886] - 4505 SMCWUSB-G 802.11bg - 4507 SMCWUSBT-G2 802.11g Wireless Adapter [Atheros AR5523] - 4521 Siemens S30863-S1016-R107-2 802.11g Wireless Adapter [Intersil ISL3887] - 5046 SpeedStream 10/100 Ethernet [pegasus] - 5501 Wireless Adapter 11g - 6500 Cable Modem - 6618 802.11n Wireless Adapter - 7511 Arcadyan 802.11N Wireless Adapter - 7512 Arcadyan 802.11N Wireless Adapter - 7522 Arcadyan 802.11N Wireless Adapter - 8522 Arcadyan 802.11N Wireless Adapter - 8541 WN4501F 802.11g Wireless Adapter [Intersil ISL3887] - a512 Arcadyan 802.11N Wireless Adapter - a618 SMCWUSBS-N EZ Connect N Draft 11n Wireless Adapter [Ralink RT2870] - a701 SMCWUSBS-N3 EZ Connect N Wireless Adapter [Ralink RT3070] - b004 CPWUE001 USB/Ethernet Adapter - b522 SMCWUSBS-N2 EZ Connect N Wireless Adapter [Ralink RT2870] - bb01 BlueExpert Bluetooth Device - c003 802.11b Wireless Adapter - c501 Zoom Wireless-G - c561 802.11a/g Wireless Adapter - d522 Speedport W 102 Stick IEEE 802.11n USB 2.0 Adapter - e501 ZD1211B - e503 Arcadyan WN4501 802.11b/g - e506 WUS-201 802.11bg - f501 802.11g Wireless Adapter - f502 802.11g Wireless Adapter - f522 Arcadyan WN7512 802.11n -083f Global Village - b100 TelePort V.90 Fax/Modem -0840 Argosy Research, Inc. - 0060 Storage Adapter Bridge Module -0841 Rioport.com, Inc. - 0001 Rio 500 -0844 Welland Industrial Co., Ltd -0846 NetGear, Inc. - 1001 EA101 10 Mbps 10BASE-T Ethernet [Kawasaki LSI KL5KLUSB101B] - 1002 Ethernet - 1020 FA101 Fast Ethernet USB 1.1 - 1040 FA120 Fast Ethernet USB 2.0 [Asix AX88172 / AX8817x] - 4110 MA111(v1) 802.11b Wireless [Intersil Prism 3.0] - 4200 WG121(v1) 54 Mbps Wireless [Intersil ISL3886] - 4210 WG121(v2) 54 Mbps Wireless [Intersil ISL3886] - 4220 WG111(v1) 54 Mbps Wireless [Intersil ISL3886] - 4230 MA111(v2) 802.11b Wireless [SIS SIS 162] - 4240 WG111(v1) rev 2 54 Mbps Wireless [Intersil ISL3887] - 4250 WG111T 802.11g Wireless Adapter [Atheros AR5523] - 4260 WG111v3 54 Mbps Wireless [realtek RTL8187B] - 4300 WG111U Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX] - 4301 WG111U (no firmware) Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX] - 5f00 WPN111 802.11g Wireless Adapter [Atheros AR5523] - 6a00 WG111v2 54 Mbps Wireless [RealTek RTL8187L] - 7100 WN121T RangeMax Next Wireless-N [Marvell TopDog] - 9000 WN111(v1) RangeMax Next Wireless [Marvell 88W8362+88W8060] - 9001 WN111(v2) RangeMax Next Wireless [Atheros AR9170+AR9101] - 9010 WNDA3100v1 802.11abgn [Atheros AR9170+AR9104] - 9011 WNDA3100v2 802.11abgn [Broadcom BCM4323] - 9018 WNDA3200 802.11abgn Wireless Adapter [Atheros AR7010+AR9280] - 9020 WNA3100(v1) Wireless-N 300 [Broadcom BCM43231] - 9030 WNA1100 Wireless-N 150 [Atheros AR9271] - 9040 WNA1000 Wireless-N 150 [Atheros AR9170+AR9101] - 9041 WNA1000M 802.11bgn [Realtek RTL8188CUS] - a001 PA101 10 Mbps HPNA Home Phoneline RJ-1 -084d Minton Optic Industry Co., Inc. - 0001 Jenoptik JD800i - 0003 S-Cam F5/D-Link DSC-350 Digital Camera - 0011 Argus DC3500 Digital Camera - 0014 Praktica DC 32 - 0019 Praktica DPix3000 - 0025 Praktica DC 60 - 1001 ScanHex SX-35d -084e KB Gear - 0001 JamCam Camera - 1001 Jam Studio Tablet - 1002 Pablo Tablet -084f Empeg - 0001 Empeg-Car Mark I/II Player -0850 Fast Point Technologies, Inc. -0851 Macronix International Co., Ltd - 1542 SiPix Blink - 1543 Maxell WS30 Slim Digital Camera, or Pandigital PI8004W01 digital photo frame - a168 MXIC -0852 CSEM -0853 Topre Corporation - 0100 HHKB Professional -0854 ActiveWire, Inc. - 0100 I/O Board - 0101 I/O Board, rev1 -0856 B&B Electronics - ac01 uLinks USOTL4 RS422/485 Adapter -0858 Hitachi Maxell, Ltd - 3102 Bluetooth Device - ffff Maxell module with BlueCore in DFU mode -0859 Minolta Systems Laboratory, Inc. -085a Xircom - 0001 Portstation Dual Serial Port - 0003 Portstation Paraller Port - 0008 Ethernet - 0009 Ethernet - 000b Portstation Dual PS/2 Port - 0021 1 port to Serial Converter - 0022 Parallel Port - 0023 2 port to Serial Converter - 0024 Parallel Port - 0027 1 port to Serial Converter - 0028 PortGear to SCSI Converter - 0032 PortStation SCSI Module - 003c Bluetooth Adapter - 0299 Colorvision, Inc. Monitor Spyder - 8021 1 port to Serial - 8023 2 port to Serial - 8027 PGSDB9 Serial Port -085c ColorVision, Inc. - 0200 Monitor Spyder -0862 Teletrol Systems, Inc. -0863 Filanet Corp. -0864 NetGear, Inc. - 4100 MA101 802.11b Adapter - 4102 MA101 802.11b Adapter -0867 Data Translation, Inc. - 9812 ECON Data acquisition unit - 9816 DT9816 ECON data acquisition module - 9836 DT9836 data acquisition card -086a Emagic Soft- und Hardware GmbH - 0001 Unitor8 - 0002 AMT8 - 0003 MT4 -086c DeTeWe - Deutsche Telephonwerke AG & Co. - 1001 Eumex 504PC ISDN TA - 1002 Eumex 504PC (FlashLoad) - 1003 TA33 ISDN TA - 1004 TA33 (FlashLoad) - 1005 Eumex 604PC HomeNet - 1006 Eumex 604PC HomeNet (FlashLoad) - 1007 Eumex 704PC DSL - 1008 Eumex 704PC DSL (FlashLoad) - 1009 Eumex 724PC DSL - 100a Eumex 724PC DSL (FlashLoad) - 100b OpenCom 30 - 100c OpenCom 30 (FlashLoad) - 100d BeeTel Home 100 - 100e BeeTel Home 100 (FlashLoad) - 1011 USB2DECT - 1012 USB2DECT (FlashLoad) - 1013 Eumex 704PC LAN - 1014 Eumex 704PC LAN (FlashLoad) - 1019 Eumex 504 SE - 101a Eumex 504 SE (Flash-Mode) - 1021 OpenCom 40 - 1022 OpenCom 40 (FlashLoad) - 1023 OpenCom 45 - 1024 OpenCom 45 (FlashLoad) - 1025 Sinus 61 data - 1029 dect BOX - 102c Eumex 604PC HomeNet [FlashLoad] - 1030 Eumex 704PC DSL [FlashLoad] - 1032 OpenCom 40 [FlashLoad] - 1033 OpenCom 30 plus - 1034 OpenCom 30 plus (FlashLoad) - 1041 Eumex 220PC - 1042 Eumex 220PC (FlashMode) - 1055 Eumex 220 Version 2 ISDN TA - 1056 Eumex 220 Version 2 ISDN TA (Flash-Mode) - 2000 OpenCom 1000 -086e System TALKS, Inc. - 1920 SGC-X2UL -086f MEC IMEX, Inc. -0870 Metricom - 0001 Ricochet GS -0871 SanDisk, Inc. - 0001 SDDR-01 Compact Flash Reader - 0002 SDDR-31 Compact Flash Reader - 0005 SDDR-05 Compact Flash Reader -0873 Xpeed, Inc. -0874 A-Tec Subsystem, Inc. -0879 Comtrol Corp. -087c Adesso/Kbtek America, Inc. -087d Jaton Corp. - 5704 Ethernet -087e Fujitsu Computer Products of America -087f Virtual IP Group, Inc. -0880 APT Technologies, Inc. -0883 Recording Industry Association of America (RIAA) -0885 Boca Research, Inc. -0886 XAC Automation Corp. - 0630 Intel PC Camera CS630 -0887 Hannstar Electronics Corp. -088b MassWorks, Inc. - 4944 MassWorks ID-75 TouchScreen -088c Swecoin AB - 2030 Ticket Printer TTP 2030 -088e iLok - 5036 Portable secure storage for software licenses -0892 DioGraphy, Inc. - 0101 Smartdio Reader/Writer -0897 Lauterbach - 0002 Power Debug/Power Debug II -089c United Technologies Research Cntr. -089d Icron Technologies Corp. -089e NST Co., Ltd -089f Primex Aerospace Co. -08a5 e9, Inc. -08a8 Andrea Electronics -08ae Macally (Mace Group, Inc.) -08b4 Sorenson Vision, Inc. -08b7 NATSU - 0001 Playstation adapter -08b8 J. Gordon Electronic Design, Inc. - 01f4 USBSIMM1 -08b9 RadioShack Corp. (Tandy) -08bb Texas Instruments Japan - 2702 Speakers - 2900 PCM2900 Audio Codec - 2901 PCM2901 Audio Codec - 2902 PCM2902 Audio Codec - 2904 PCM2904 Audio Codec - 2910 PCM2912 Audio Codec -08bd Citizen Watch Co., Ltd - 0208 CLP-521 Label Printer - 1100 X1-USB Floppy -08c3 Precise Biometrics - 0001 100 SC - 0002 100 A - 0003 100 SC BioKeyboard - 0006 100 A BioKeyboard - 0100 100 MC ISP - 0101 100 MC FingerPrint and SmartCard Reader - 0300 100 AX - 0400 100 SC - 0401 150 MC - 0402 200 MC FingerPrint and SmartCard Reader - 0404 100 SC Upgrade - 0405 150 MC Upgrade - 0406 100 MC Upgrade -08c4 Proxim, Inc. - 0100 Skyline 802.11b Wireless Adapter - 02f2 Farallon Home Phoneline Adapter -08c7 Key Nice Enterprise Co., Ltd -08c8 2Wire, Inc. -08c9 Nippon Telegraph and Telephone Corp. -08ca Aiptek International, Inc. - 0001 Tablet - 0010 Tablet - 0020 APT-6000U Tablet - 0021 APT-2 Tablet - 0022 Tablet - 0023 Tablet - 0024 Tablet - 0100 Pen Drive - 0102 DualCam - 0103 Pocket DV Digital Camera - 0104 Pocket DVII - 0105 Mega DV(Disk) - 0106 Pocket DV3100+ - 0107 Pocket DV3100 - 0109 Nisis DV4 Digital Camera - 010a Trust 738AV LCD PV Mass Storage - 0111 PenCam VGA Plus - 2008 Mini PenCam 2 - 2010 Pocket CAM 3 Mega (webcam) - 2011 Pocket CAM 3 Mega (storage) - 2016 PocketCam 2 Mega - 2018 Pencam SD 2M - 2020 Slim 3000F - 2022 Slim 3200 - 2024 Pocket DV3500 - 2028 Pocket Cam4M - 2040 Pocket DV4100M - 2042 Pocket DV5100M Composite Device - 2043 Pocket DV5100M (Disk) - 2060 Pocket DV5300 -08cd Jue Hsun Ind. Corp. -08ce Long Well Electronics Corp. -08cf Productivity Enhancement Products -08d1 smartBridges, Inc. - 0001 smartNIC Ethernet [catc] - 0003 smartNIC 2 PnP Ethernet -08d3 Virtual Ink -08d4 Fujitsu Siemens Computers - 0009 SCR SmartCard Reader -08d8 IXXAT Automation GmbH - 0002 USB-to-CAN compact - 0003 USB-to-CAN II - 0100 USB-to-CAN -08d9 Increment P Corp. -08dd Billionton Systems, Inc. - 0112 Wireless LAN Adapter - 0113 Wireless LAN Adapter - 0986 USB-100N Ethernet [pegasus] - 0987 USBLP-100 HomePNA Ethernet [pegasus] - 0988 USBEL-100 Ethernet [pegasus] - 1986 10/100 LAN Adapter - 2103 DVB-T TV-Tuner Card-R - 8511 USBE-100 Ethernet [pegasus2] - 90ff USB2AR Ethernet -08de ??? - 7a01 802.11b Adapter -08df Spyrus, Inc. - 0001 Rosetta Token V1 - 0002 Rosetta Token V2 - 0003 Rosetta Token V3 - 0a00 Lynks Interface -08e3 Olitec, Inc. - 0002 USB-RS232 Bridge - 0100 Interface ADSL - 0101 Interface ADSL - 0102 ADSL - 0301 RNIS -08e4 Pioneer Corp. -08e5 Litronic -08e6 Gemplus - 0001 GemPC-Touch 430 - 0430 GemPC430 SmartCard Reader - 0432 GemPC432 SmartCard Reader - 0435 GemPC435 SmartCard Reader - 0437 GemPC433 SL SmartCard Reader - 1359 UA SECURE STORAGE TOKEN - 2202 Gem e-Seal Pro Token - 3437 GemPC Twin SmartCard Reader - 3438 GemPC Key SmartCard Reader - 3478 PinPad Smart Card Reader - 4433 GemPC433-Swap - 5501 GemProx-PU Contactless Smart Card Reader - ace0 UA HYBRID TOKEN -08e7 Pan-International Wire & Cable -08e8 Integrated Memory Logic -08e9 Extended Systems, Inc. - 0100 XTNDAccess IrDA Dongle -08ea Ericsson, Inc., Blue Ridge Labs - 00c9 ADSL Modem HM120dp Loader - 00ca ADSL WAN Modem HM120dp - 00ce HM230d Virtual Bus for Helium - abba USB Driver for Bluetooth Wireless Technology - abbb Bluetooth Device in DFU State -08ec M-Systems Flash Disk Pioneers - 0001 TravelDrive 2C - 0002 TravelDrive 2C - 0005 TravelDrive 2C - 0008 TravelDrive 2C - 0010 DiskOnKey - 0011 DiskOnKey - 0012 TravelDrive 2C - 0014 TravelDrive 2C - 0015 Kingston DataTraveler ELITE - 0016 Kingston DataTraveler U3 - 0020 TravelDrive - 0021 TravelDrive - 0022 TravelDrive - 0023 TravelDrive - 0024 TravelDrive - 0025 TravelDrive - 0026 TravelDrive - 0027 TravelDrive - 0028 TravelDrive - 0029 TravelDrive - 0030 TravelDrive - 0822 TravelDrive 2C - 0832 Hi-Speed Mass Storage Device - 0834 M-Disk 220 - 0998 Kingston Data Traveler2.0 Disk Driver - 0999 Kingston Data Traveler2.0 Disk Driver - 1000 TravelDrive 2C - 2000 TravelDrive 2C - 2038 TravelDrive - 2039 TravelDrive - 204a TravelDrive - 204b TravelDrive -08ed MediaTek Inc. - 0002 CECT M800 memory card -08ee CCSI/Hesso -08f0 Corex Technologies -08f1 CTI Electronics Corp. -08f2 Gotop Information Inc. - 007f Super Q2 Tablet -08f5 SysTec Co., Ltd -08f6 Logic 3 International, Ltd -08f7 Vernier - 0001 LabPro - 0002 EasyTemp/Go!Temp - 0003 Go!Link - 0004 Go!Motion -08f8 Keen Top International Enterprise Co., Ltd -08f9 Wipro Technologies -08fa Caere -08fb Socket Communications -08fc Sicon Cable Technology Co., Ltd -08fd Digianswer A/S - 0001 Bluetooth Device -08ff AuthenTec, Inc. - 1600 AES1600 - 1610 AES1600 - 2500 AES2501 - 2501 AES2501 - 2502 AES2501 - 2503 AES2501 - 2504 AES2501 - 2505 AES2501 - 2506 AES2501 - 2507 AES2501 - 2508 AES2501 - 2509 AES2501 - 250a AES2501 - 250b AES2501 - 250c AES2501 - 250d AES2501 - 250e AES2501 - 250f AES2501 - 2510 AES2510 - 2580 AES2501 Fingerprint Sensor - 2588 AES2501 - 2589 AES2501 - 258a AES2501 - 258b AES2501 - 258c AES2501 - 258d AES2501 - 258e AES2501 - 258f AES2501 - 2810 AES2810 - 3400 AES3400 TruePrint Sensor - 3401 AES3400 Sensor - 3402 AES3400 Sensor - 3403 AES3400 Sensor - 3404 AES3400 TruePrint Sensor - 3405 AES3400 TruePrint Sensor - 3406 AES3400 TruePrint Sensor - 3407 AES3400 TruePrint Sensor - 4902 BioMV with TruePrint AES3500 - 4903 BioMV with TruePrint AES3400 - 5500 AES4000 - 5501 AES4000 TruePrint Sensor - 5503 AES4000 TruePrint Sensor - 5505 AES4000 TruePrint Sensor - 5507 AES4000 TruePrint Sensor - 55ff AES4000 TruePrint Sensor. - 5700 AES3500 Fingerprint Reader - 5701 AES3500 TruePrint Sensor - 5702 AES3500 TruePrint Sensor - 5703 AES3500 TruePrint Sensor - 5704 AES3500-BZ TruePrint Sensor - 5705 AES3500-BZ TruePrint Sensor - 5706 AES3500-BZ TruePrint Sensor - 5707 AES3500-BZ TruePrint Sensor - 5710 AES3500 TruePrint Sensor - 5711 AES3500 TruePrint Sensor - 5712 AES3500 TruePrint Sensor - 5713 AES3500 TruePrint Sensor - 5714 AES3500-BZ TruePrint Sensor - 5715 AES3500-BZ TruePrint Sensor - 5716 AES3500-BZ TruePrint Sensor - 5717 AES3500-BZ TruePrint Sensor - 5730 AES3500 TruePrint Sensor - 5731 AES3500 TruePrint Sensor - 5732 AES3500 TruePrint Sensor - 5733 AES3500 TruePrint Sensor - 5734 AES3500-BZ TruePrint Sensor - 5735 AES3500-BZ TruePrint Sensor - 5736 AES3500-BZ TruePrint Sensor - 5737 AES3500-BZ TruePrint Sensor - afe3 FingerLoc Sensor Module (Anchor) - afe4 FingerLoc Sensor Module (Anchor) - afe5 FingerLoc Sensor Module (Anchor) - afe6 FingerLoc Sensor Module (Anchor) - fffd AES2510 Sensor (USB Emulator) - ffff Sensor (Emulator) -0900 Pinnacle Systems, Inc. -0901 VST Technologies - 0001 Hard Drive Adapter (TPP) - 0002 SigmaDrive Adapter (TPP) -0906 Faraday Technology Corp. -0908 ShenZhen SANZHAI Technology Co.,Ltd - 2701 Spy Pen VGA -0909 Audio-Technica Corp. -090a Trumpion Microelectronics, Inc. - 1001 T33520 Flash Card Controller - 1100 Comotron C3310 MP3 player - 1200 MP3 player - 1540 Digitex Container Flash Disk -090b Neurosmith -090c Silicon Motion, Inc. - Taiwan (formerly Feiya Technology Corp.) - 0371 Silicon Motion SM371 Camera - 0373 Silicon Motion Camera - 037a Silicon Motion Camera - 037b Silicon Motion Camera - 1000 64MB QDI U2 DISK - 1132 5-in-1 Card Reader - 337b Silicon Motion Camera - 3710 Silicon Motion Camera - 3720 Silicon Motion Camera - 37c0 Silicon Motion Camera - 6000 SD/SDHC Card Reader (SG365 / FlexiDrive XC+) - 6200 microSD card reader - 837b Silicon Motion Camera - 937b Silicon Motion Camera - b370 Silicon Motion SM370 Camera - b371 Silicon Motion SM371 Camera -090d Multiport Computer Vertriebs GmbH -090e Shining Technology, Inc. -090f Fujitsu Devices, Inc. -0910 Alation Systems, Inc. -0911 Philips Speech Processing - 149a SpeechMike II Pro Plus LFH5276 - 2512 SpeechMike Pro -0912 Voquette, Inc. -0915 GlobeSpan, Inc. - 0001 DSL Modem - 0002 ADSL ATM Modem - 0005 LAN Modem - 2000 802.11 Adapter - 2002 802.11 Adapter - 8000 ADSL LAN Modem - 8005 DSL-302G Modem - 8101 ADSL WAN Modem - 8102 DSL-200 ADSL Modem - 8103 DSL-200 ADSL Modem - 8104 DSL-200 Modem - 8400 DSL Modem - 8401 DSL Modem - 8402 DSL Modem - 8500 DSL Modem - 8501 DSL Modem -0917 SmartDisk Corp. - 0001 eFilm Reader-11 SM/CF - 0002 eFilm Reader-11 SM - 0003 eFilm Reader-11 CF - 0200 FireFly - 0201 FireLite - 0202 STORAGE ADAPTER (FirePower) - 0204 FlashTrax Storage - 0205 STORAGE ADAPTER (CrossFire) - 0206 FireFly 20G HDD - 0207 FireLite - 020f STORAGE ADAPTER (FireLite) - da01 eFilm Reader-11 Test - ffff eFilm Reader-11 (Class/PDR) -0919 Tiger Electronics - 0100 Fast Flicks Digital Camera -091e Garmin International - 0003 GPS (various models) - 0004 iQue 3600 - 0200 Data Card Programmer (install) - 1200 Data Card Programmer - 21a5 etrex Cx (msc) - 2271 Edge 605/705 - 2295 Colorado 300 - 22b6 eTrex Vista HCx (Mass Storage mode) - 2353 Nüvi 205T - 2535 Edge 800 -0920 Echelon Co. - 7500 Network Interface -0921 GoHubs, Inc. - 1001 GoCOM232 Serial -0922 Dymo-CoStar Corp. - 0007 LabelWriter 330 - 0009 LabelWriter 310 - 001a LabelWriter 400 Turbo - 0020 LabelWriter 450 -0923 IC Media Corp. - 010f SIIG MobileCam -0924 Xerox - 23dd DocuPrint M760 (X760_USB) - 3ce8 Phaser 3428 Printer - 3d5b Phaser 6115MFP TWAIN Scanner - 420f WorkCentre PE220 Series - 421f M20 Scanner - 423b Printing Support - ffef WorkCenter M15 - fffb DocuPrint M750 (X750_USB) -0925 Lakeview Research - 0005 Gamtec.,Ltd SmartJoy PLUS Adapter - 8101 Phidgets, Inc., 1-Motor PhidgetServo v2.0 - 8104 Phidgets, Inc., 4-Motor PhidgetServo v2.0 - 8800 WiseGroup Ltd, MP-8800 Quad Joypad - 8866 WiseGroup Ltd, MP-8866 Dual Joypad -0927 Summus, Ltd -0928 Oxford Semiconductor, Ltd -0929 American Biometric Co. -092a Toshiba Information & Industrial Sys. And Services -092b Sena Technologies, Inc. -092f Northern Embedded Science/CAVNEX - 0004 JTAG-4 - 0005 JTAG-5 -0930 Toshiba Corp. - 0009 Gigabeat F/X (HDD audio player) - 000c Gigabeat F (mtp) - 0010 Gigabeat S (mtp) - 0301 PCX1100U Cable Modem (WDM) - 0302 PCX2000 Cable Modem (WDM) - 0305 Cable Modem PCX3000 - 0307 Cable Modem PCX2500 - 0308 PCX2200 Cable Modem (WDM) - 0309 PCX5000 Cable Modem (WDM) - 030b Cable Modem PCX2600 - 0501 Bluetooth Controller - 0502 Integrated Bluetooth - 0503 Bluetooth Controller - 0505 Integrated Bluetooth - 0506 Integrated Bluetooth - 0507 Bluetooth Adapter - 0508 Integrated Bluetooth HCI - 0509 BT EDR Dongle - 0706 PocketPC e740 - 0707 Pocket PC e330 Series - 0708 Pocket PC e350 Series - 0709 Pocket PC e750 Series - 070a Pocket PC e400 Series - 070b Pocket PC e800 Series - 0a07 WLM-10U1 802.11abgn Wireless Adapter [Ralink RT3572] - 0b05 PX1220E-1G25 External hard drive - 0b09 PX1396E-3T01 External hard drive - 1300 Wireless Broadband (CDMA EV-DO) SM-Bus Minicard Status Port - 1301 Wireless Broadband (CDMA EV-DO) Minicard Status Port - 1302 Wireless Broadband (3G HSDPA) SM-Bus Minicard Status Port - 1303 Wireless Broadband (3G HSDPA) Minicard Status Port - 1308 Broadband (3G HSDPA) SM-Bus Minicard Diagnostics Port - 130b F3507g Mobile Broadband Module - 130c F3607gw Mobile Broadband Module - 1311 F3607gw v2 Mobile Broadband Module - 642f TravelDrive - 6506 TravelDrive 2C - 6507 TravelDrive 2C - 6508 TravelDrive 2C - 6509 TravelDrive 2C - 6510 TravelDrive 2C - 6517 TravelDrive 2C - 6518 TravelDrive 2C - 6519 Kingston DataTraveler 2.0 USB Stick - 651a TravelDrive 2C - 651b TravelDrive 2C - 651c TravelDrive 2C - 651d TravelDrive 2C - 651e TravelDrive 2C - 651f TravelDrive 2C - 6520 TravelDrive 2C - 6521 TravelDrive 2C - 6522 TravelDrive 2C - 6523 TravelDrive - 6524 TravelDrive - 6525 TravelDrive - 6526 TravelDrive - 6527 TravelDrive - 6528 TravelDrive - 6529 TravelDrive - 652a TravelDrive - 652b TravelDrive - 652c TravelDrive - 652d TravelDrive - 652f TravelDrive - 6530 TravelDrive - 6531 TravelDrive - 6532 256M Stick - 6533 512M Stick - 6534 TravelDrive - 653c Kingston DataTraveler 2.0 Stick (512M) - 653d Kingston DataTraveler 2.0 Stick (1GB) - 653e Flash Memory - 6540 TransMemory Flash Memory - 6544 Kingston DataTraveler 2.0 Stick (2GB) - 6545 Kingston DataTraveler 102 Flash Drive / HEMA Flash Drive 2 GB / PNY Attache 4GB Stick -0931 Harmonic Data Systems, Ltd -0932 Crescentec Corp. - 0300 VideoAdvantage - 0302 Syntek DC-112X - 0320 VideoAdvantage - 0482 USB2.0 TVBOX - 1100 DC-1100 Video Enhamcement Device - 1112 Veo Web Camera - a311 Video Enhancement Device -0933 Quantum Corp. -0934 Netcom Systems -0936 NuTesla - 0030 Composite Device, Mass Storage Device (Flash Drive) amd HID - 003c Rhythmedics HID Bootloader -0939 Lumberg, Inc. -093a Pixart Imaging, Inc. - 0007 CMOS 100K-R Rev. 1.90 - 010e Digital camera, CD302N/Elta Medi@ digi-cam/HE-501A - 010f Argus DC-1610/DC-1620/Emprex PCD3600/Philips P44417B keychain camera/Precision Mini,Model HA513A/Vivitar Vivicam 55 - 020f Bullet Line Photo Viewer - 050f Mars-Semi Pc-Camera - 2460 Q-TEC WEBCAM 100 - 2468 SoC PC-Camera - 2470 SoC PC-Camera - 2471 SoC PC-Camera - 2500 USB Optical Mouse - 2510 Optical Mouse - 2600 Typhoon Easycam USB 330K (newer)/Typhoon Easycam USB 2.0 VGA 1.3M/Sansun SN-508 - 2601 SPC 610NC Laptop Camera - 2603 PAC7312 Camera - 2608 PAC7311 Trust WB-3300p - 260e PAC7311 Gigaware VGA PC Camera:Trust WB-3350p:SIGMA cam 2350 - 260f PAC7311 SnakeCam - 2621 PAC731x Trust Webcam - 2624 Webcam -093b Plextor Corp. - 0010 Storage Adapter - 0011 PlexWriter 40/12/40U - 0041 PX-708A DVD RW - 0042 PX-712UF DVD RW - a002 ConvertX M402U XLOADER - a003 ConvertX AV100U A/V Capture Audio - a004 ConvertX TV402U XLOADER - a005 ConvertX TV100U A/V Capture - a102 ConvertX M402U A/V Capture - a104 ConvertX PX-TV402U/NA -093c Intrepid Control Systems, Inc. - 0601 ValueCAN - 0701 NeoVI Blue vehicle bus interface -093d InnoSync, Inc. -093e J.S.T. Mfg. Co., Ltd -093f Olympia Telecom Vertriebs GmbH -0940 Japan Storage Battery Co., Ltd -0941 Photobit Corp. -0942 i2Go.com, LLC -0943 HCL Technologies India Private, Ltd -0944 KORG, Inc. - 0001 PXR4 4-Track Digital Recorder - 0020 KAOSS Pad KP3 Dynamic Effect/Sampler - 010d nanoKEY MIDI keyboard - 010e nanoPAD pad controller - 010f nanoKONTROL studio controller - 0f03 K-Series K61P MIDI studio controller -0945 Pasco Scientific -0948 Kronauer music in digital - 0301 USB Pro (24/48) - 0302 USB Pro (24/96 playback) - 0303 USB Pro (24/96 record) - 0304 USB Pro (16/48) - 1105 USB One -094b Linkup Systems Corp. - 0001 neonode N2 -094d Cable Television Laboratories -094f Yano - 0101 U640MO-03 - 05fc METALWEAR-HDD -0951 Kingston Technology - 0008 Ethernet - 000a KNU101TX 100baseTX Ethernet - 1600 DataTraveler II Pen Drive - 1601 DataTraveler II+ Pen Drive - 1602 DataTraveler Mini - 1603 DataTraveler 1GB/2GB Pen Drive - 1607 DataTraveler 100 - 1613 DataTraveler DT101C Flash Drive - 1616 Kingston DataTraveler Locker (4GB) - 1624 DataTraveler G2 4GB Pen Drive - 1625 DataTraveler 101 II - 162a DataTraveler 112 4GB Pen Drive - 1643 DataTraveler G3 4GB -0954 RPM Systems Corp. -0955 NVidia Corp. -0956 BSquare Corp. -0957 Agilent Technologies, Inc. - 0200 E-Video DC-350 Camera - 0202 E-Video DC-350 Camera -0958 CompuLink Research, Inc. -0959 Cologne Chip AG - 2bd0 Intelligent ISDN (Ver. 3.60.04) -095a Portsmith - 3003 Express Ethernet -095b Medialogic Corp. -095c K-Tec Electronics -095d Polycom, Inc. - 0001 Polycom ViaVideo -0967 Acer (??) - 0204 WarpLink 802.11b Adapter -0968 Catalyst Enterprises, Inc. -096e Feitian Technologies, Inc. - 0802 ePass2000 (G&D STARCOS SPK 2.4) -0971 Gretag-Macbeth AG - 2003 Eye-One display - 2005 Huey - 2007 ColorMunki -0973 Schlumberger - 0001 e-gate Smart Card -0974 Datagraphix, a business unit of Anacomp -0975 OL'E Communications, Inc. -0976 Adirondack Wire & Cable -0977 Lightsurf Technologies -0978 Beckhoff GmbH -0979 Jeilin Technology Corp., Ltd - 0224 JL2005A Toy Camera - 0226 JL2005A Toy Camera - 0227 JL2005B/C/D Toy Camera -097a Minds At Work LLC - 0001 Digital Wallet -097b Knudsen Engineering, Ltd -097c Marunix Co., Ltd -097d Rosun Technologies, Inc. -097f Barun Electronics Co., Ltd -0981 Oak Technology, Ltd -0984 Apricorn - 0200 Hard Drive Storage (TPP) -0985 cab Produkttechnik GmbH & Co KG - 0045 Mach4/200 Label Printer - 00a3 A3/200 or A3/300 Label Printer -0986 Matsushita Electric Works, Ltd. -098c Vitana Corp. -098d INDesign -098e Integrated Intellectual Property, Inc. -098f Kenwood TMI Corp. -0993 Gemstar eBook Group, Ltd - 0001 REB1100 eBook Reader - 0002 eBook -0996 Integrated Telecom Express, Inc. -099a Zippy Technology Corp. - 0638 Sanwa Supply Inc. Small Keyboard - 610c EL-610 Super Mini Electron luminescent Keyboard - 7160 Hyper Slim Keyboard -09a3 PairGain Technologies -09a4 Contech Research, Inc. -09a5 VCON Telecommunications -09a6 Poinchips - 8001 Mass Storage Device -09a7 Data Transmission Network Corp. -09a8 Lin Shiung Enterprise Co., Ltd -09a9 Smart Card Technologies Co., Ltd -09aa Intersil Corp. - 1000 Prism GT 802.11b/g Adapter - 3642 Prism 2.x 802.11b Adapter -09ab Japan Cash Machine Co., Ltd. -09ae Tripp Lite -09b2 Franklin Electronic Publishers, Inc. - 0001 eBookman Palm Computer -09b3 Altius Solutions, Inc. -09b4 MDS Telephone Systems -09b5 Celltrix Technology Co., Ltd -09bc Grundig - 0002 MPaxx MP150 MP3 Player -09be MySmart.Com - 0001 MySmartPad -09bf Auerswald GmbH & Co. KG - 00c0 COMpact 2104 ISDN PBX - 00db COMpact 4410/2206 ISDN ISDN - 00f1 COMfort System Telephones -09c0 Genpix Electronics, LLC - 0202 8PSK DVB-S tuner - 0203 Skywalker-1 DVB-S tuner - 0204 Skywalker-CW3K DVB-S tuner - 0205 Skywalker-CW3K DVB-S tuner - 0206 Skywalker-2 DVB-S tuner -09c1 Arris Interactive LLC - 1337 TOUCHSTONE DEVICE -09c2 Nisca Corp. -09c3 ActivCard, Inc. - 0007 Reader V2 - 0008 ZFG-9800-AC SmartCard Reader - 0014 ActivIdentity ActivKey SIM USB Token -09c4 ACTiSYS Corp. - 0011 ACT-IR2000U IrDA Dongle -09c5 Memory Corp. -09cc Workbit Corp. - 0404 BAFO USB-ATA/ATAPI Bridge Controller -09cd Psion Dacom Home Networks, Ltd - 2001 Psion WaveFinder DAB radio receiver -09ce City Electronics, Ltd -09cf Electronics Testing Center, Taiwan -09d1 NeoMagic, Inc. -09d2 Vreelin Engineering, Inc. -09d3 Com One - 0001 ISDN TA -09d7 Novatel Wireless - 0100 NovAtel FlexPack GPS receiver -09d9 KRF Tech, Ltd -09da A4 Tech Co., Ltd - 0006 Optical Mouse WOP-35 / Trust 450L Optical Mouse - 000a Port Mouse - 0018 Trust Human Interface Device - 001a Wireless Mouse & RXM-15 Receiver - 002a Wireless Optical Mouse NB-30 - 022b Wireless Mouse (Battery Free) - 024f RF Receiver and G6-20D Wireless Optical Mouse - 032b Wireless Mouse (Battery Free) - 8090 X-718BK Oscar Optical Gaming Mouse - 9090 XL-750BK Laser Mouse -09db Measurement Computing Corp. - 0075 MiniLab 1008 - 0076 PMD-1024 - 007a PMD-1208LS - 0081 USB-1616FS - 0082 USB-1208FS - 0088 USB-1616FS internal hub -09dc Aimex Corp. -09dd Fellowes, Inc. -09df Addonics Technologies Corp. -09e1 Intellon Corp. - 5121 MicroLink dLAN -09e5 Jo-Dan International, Inc. -09e6 Silutia, Inc. -09e7 Real 3D, Inc. -09e8 AKAI Professional M.I. Corp. - 0062 MPD16 MIDI Pad Controller Unit - 006d EWI electronic wind instrument - 0071 MPK25 MIDI Keyboard - 0076 LPK25 MIDI Keyboard -09e9 Chen-Source, Inc. -09eb IM Networks, Inc. - 4331 iRhythm Tuner Remote -09ef Xitel - 0101 MD-Port DG2 MiniDisc Interface -09f3 GoFlight, Inc. - 0018 GF-46 Multi-Mode Display Module - 0028 RP-48 Combination Pushbutton-Rotary Module - 0048 LGTII - Landing Gear and Trim Control Module - 0064 MCPPro - Airliner Mode Control Panel (Autopilot) - 0300 EFIS - Electronic Flight Information System -09f5 AresCom - 0168 Network Adapter - 0188 LAN Adapter - 0850 Adapter -09f6 RocketChips, Inc. -09f7 Edu-Science (H.K.), Ltd -09f8 SoftConnex Technologies, Inc. -09f9 Bay Associates -09fa Mtek Vision -09fb Altera - 6001 Blaster -09ff Gain Technology Corp. -0a00 Liquid Audio -0a01 ViA, Inc. -0a07 Ontrak Control Systems Inc. - 0064 ADU100 Data Acquisition Interface - 0078 ADU120 Data Acquisition Interface - 0082 ADU130 Data Acquisition Interface - 00c8 ADU200 Relay I/O Interface - 00d0 ADU208 Relay I/O Interface - 00da ADU218 Solid-State Relay I/O Interface -0a0b Cybex Computer Products Co. -0a11 Xentec, Inc. -0a12 Cambridge Silicon Radio, Ltd - 0001 Bluetooth Dongle (HCI mode) - 0002 Frontline Test Equipment Bluetooth Device - 0003 Nanosira - 0004 Nanosira WHQL Reference Radio - 0005 Nanosira-Multimedia - 0006 Nanosira-Multimedia WHQL Reference Radio - 0007 Nanosira3-ROM - 0008 Nanosira3-ROM - 0009 Nanosira4-EDR WHQL Reference Radio - 000a Nanosira4-EDR-ROM - 000b Nanosira5-ROM - 0043 Bluetooth Device - 0100 Casira with BlueCore2-External Module - 0101 Casira with BlueCore2-Flash Module - 0102 Casira with BlueCore3-Multimedia Module - 0103 Casira with BlueCore3-Flash Module - 0104 Casira with BlueCore4-External Module - 0105 Casira with BlueCore4-Multimedia Module - 1000 Bluetooth Dongle (HID proxy mode) - 1010 Bluetooth Device - 1011 Bluetooth Device - 1012 Bluetooth Device - ffff USB Bluetooth Device in DFU State -0a13 Telebyte, Inc. -0a14 Spacelabs Medical, Inc. -0a15 Scalar Corp. -0a16 Trek Technology (S) PTE, Ltd - 1111 ThumbDrive - 8888 IBM USB Memory Key - 9988 Trek2000 TD-G2 -0a17 Pentax Corp. - 0004 Optio 330 - 0006 Optio S - 0007 Optio 550 - 0009 Optio 33WR - 000a Optio 555 - 000c Optio 43WR (mass storage mode) - 000d Optio 43WR - 0015 Optio S40/S5i - 003b Optio 50 (mass storage mode) - 003d Optio S55 - 0043 *ist DL - 0047 Optio S60 - 0052 Optio 60 Digital Camera - 006e K10D - 0070 K100D - 0093 K200D - 00a7 Optio E50 - 1001 EI2000 Camera powered by Digita! -0a18 Heidelberger Druckmaschinen AG -0a19 Hua Geng Technologies, Inc. -0a21 Medtronic Physio Control Corp. - 8001 MMT-7305WW [Medtronic Minimed CareLink] -0a22 Century Semiconductor USA, Inc. -0a27 Datacard Group - 0102 SP35 -0a2c AK-Modul-Bus Computer GmbH - 0008 GPIO Ports -0a34 TG3 Electronics, Inc. - 0101 TG82tp - 0110 Deck 82-key backlit keyboard -0a35 Radikal Technologies - 002a SAC - Software Assigned Controller - 008a SAC Hub -0a39 Gilat Satellite Networks, Ltd -0a3a PentaMedia Co., Ltd - 0163 KN-W510U 1.0 Wireless LAN Adapter -0a3c NTT DoCoMo, Inc. -0a3d Varo Vision -0a3f Swissonic AG -0a43 Boca Systems, Inc. -0a46 Davicom Semiconductor, Inc. - 0268 ST268 - 6688 ZT6688 Fast Ethernet Adapter - 8515 ADMtek ADM8515 NIC - 9000 DM9000E Fast Ethernet Adapter - 9601 DM9601 Fast Ethernet Adapter -0a47 Hirose Electric -0a48 I/O Interconnect - 3233 Multimedia Card Reader - 3239 Multimedia Card Reader - 3258 Dane Elec zMate SD Reader - 3259 Dane Elec zMate CF Reader - 5000 MediaGear xD-SM - 500a Mass Storage Device - 500f Mass Storage Device - 5010 Mass Storage Device - 5011 Mass Storage Device - 5014 Mass Storage Device - 5020 Mass Storage Device - 5021 Mass Storage Device - 5022 Mass Storage Device - 5023 Mass Storage Device - 5024 Mass Storage Device - 5025 Mass Storage Device -0a4b Fujitsu Media Devices, Ltd -0a4c Computex Co., Ltd - 15d9 OPTICAL MOUSE -0a4d Evolution Electronics, Ltd - 0064 MK-225 Driver - 0065 MK-225C Driver - 0066 MK-225C Driver - 0067 MK-425C Driver - 0078 MK-37 Driver - 0079 MK-37C Driver - 007a MK-37C Driver - 008c TerraTec MIDI MASTER - 008d MK-249C Driver - 008e MK-249C MIDI Keyboard - 008f MK-449C Driver - 0090 Keystation 49e Driver - 0091 Keystation 61es Driver - 00a0 MK-361 Driver - 00a1 MK-361C Driver - 00a2 MK-361C Driver - 00a3 MK-461C MIDI Keyboard - 00b5 Keystation Pro 88 Driver - 00d2 E-Keys Driver - 00f0 UC-16 Driver - 00f1 X-Session Driver - 00f5 UC-33e MIDI Controller -0a4e Steinberg Soft-und Hardware GmbH -0a4f Litton Systems, Inc. -0a50 Mimaki Engineering Co., Ltd -0a51 Sony Electronics, Inc. -0a52 Jebsee Electronics Co., Ltd -0a53 Portable Peripheral Co., Ltd - 1000 Scanner - 2000 Q-Scan A6 Scanner - 2001 Q-Scan A6 Scanner - 2013 Media Drive A6 Scanner - 2014 Media Drive A6 Scanner - 2015 BizCardReader 600C - 2016 BizCardReader 600C - 202a Scanshell-CSSN - 3000 Q-Scan A8 Scanner - 3002 Q-Scan A8 Reader - 3015 BizCardReader 300G - 302a LM9832 - PA570 Mini Business Card Scanner [Targus] - 5001 BizCardReader 900C -0a5a Electronics For Imaging, Inc. -0a5b EAsics NV -0a5c Broadcom Corp. - 0201 iLine10(tm) Network Adapter - 2000 Bluetooth Device - 2001 Bluetooth Device - 2009 Bluetooth Controller - 200a BCM2035 Bluetooth dongle - 200f Bluetooth Controller - 201d Bluetooth Device - 201e IBM Integrated Bluetooth IV - 2020 Bluetooth dongle - 2033 BCM2033 Bluetooth - 2035 BCM2035 Bluetooth - 2038 Blutonium Device - 2039 Bluetooth Device - 2045 Bluetooth Controller - 2046 Bluetooth Device - 2047 Bluetooth Device - 205e Bluetooth Device - 2100 Bluetooth 2.0+eDR dongle - 2101 Bluetooth Controller - 2102 ANYCOM Blue USB-200/250 - 2110 Bluetooth Controller - 2111 ANYCOM Blue USB-UHE 200/250 - 2120 2045 Bluetooth 2.0 USB-UHE Device with trace filter - 2121 BCM2210 Bluetooth - 2122 Bluetooth 2.0+EDR dongle - 2123 Bluetooth dongle - 2130 2045 Bluetooth 2.0 USB-UHE Device with trace filter - 2131 2045 Bluetooth 2.0 Device with trace filter - 2145 Bluetooth with Enhanced Data Rate II - 2148 BCM92046DG-CL1ROM Bluetooth 2.1 Adapter - 2150 BCM2046 Bluetooth Device - 2151 Bluetooth - 217f Bluetooth Controller - 219b Bluetooth 2.1 Device - 21b1 HP Bluetooth Module - 21b4 BCM2070 Bluetooth 2.1 + EDR - 21b9 BCM2070 Bluetooth 2.1 + EDR - 21ba BCM2070 Bluetooth 2.1 + EDR - 21bb BCM2070 Bluetooth 2.1 + EDR - 21bc BCM2070 Bluetooth 2.1 + EDR - 21bd BCM2070 Bluetooth 2.1 + EDR - 22be BCM2070 Bluetooth 3.0 + HS - 4500 BCM2046B1 USB 2.0 Hub (part of BCM2046 Bluetooth) - 4502 Keyboard (Boot Interface Subclass) - 4503 Mouse (Boot Interface Subclass) - 5800 BCM5880 Secure Applications Processor - 5801 BCM5880 Secure Applications Processor with fingerprint swipe sensor - 5802 BCM5880 Secure Applications Processor with fingerprint touch sensor - 5803 BCM5880 Secure Applications Processor with secure keyboard - 6300 Pirelli Remote NDIS Device - bd13 Arcadyan WN8522B [Broadcom BCM4323] - d11b Eminent EM4045 [Broadcom 4320 USB] -0a5d Diatrend Corp. -0a5f Zebra - 0009 LP2844 Printer - 0081 GK420t Label Printer - 008b HC100 wristbands Printer - 930a Printer -0a62 MPMan - 0010 MPMan MP-F40 MP3 Player -0a66 ClearCube Technology -0a67 Medeli Electronics Co., Ltd -0a68 Comaide Corp. -0a69 Chroma ate, Inc. -0a6b Green House Co., Ltd - 0001 Compact Flash R/W with MP3 player - 000f FlashDisk -0a6c Integrated Circuit Systems, Inc. -0a6d UPS Manufacturing -0a6e Benwin -0a6f Core Technology, Inc. - 0400 Xanboo -0a70 International Game Technology -0a71 VIPColor Technologies USA, Inc. - 0001 VP485 Printer -0a72 Sanwa Denshi -0a7d NSTL, Inc. -0a7e Octagon Systems Corp. -0a80 Rexon Technology Corp., Ltd -0a81 Chesen Electronics Corp. - 0101 Keyboard - 0103 Keyboard - 0203 Mouse - 0205 PS/2 Keyboard+Mouse Adapter - 0701 USB Missile Launcher -0a82 Syscan - 4600 TravelScan 460/464 -0a83 NextComm, Inc. -0a84 Maui Innovative Peripherals -0a85 Idexx Labs -0a86 NITGen Co., Ltd -0a8d Picturetel -0a8e Japan Aviation Electronics Industry, Ltd - 2011 Filter Driver For JAE XMC R/W -0a90 Candy Technology Co., Ltd -0a91 Globlink Technology, Inc. - 3801 Targus PAKP003 Mouse -0a92 EGO SYStems, Inc. - 0011 SYS WaveTerminal U2A - 0021 GIGAPort - 0031 GIGAPortAG - 0053 AudioTrak Optoplay - 0061 Waveterminal U24 - 0071 MAYA EX7 - 0091 Maya 44 - 00b1 MAYA EX5 - 1000 MIDI Mate - 1010 RoMI/O - 1020 M4U - 1030 M8U - 1090 KeyControl49 - 10a0 KeyControl25 -0a93 C Technologies AB - 0002 C-Pen 10 - 0005 MyPen Light - 000d Input Pen - 0010 C-Pen 20 - 0a93 PayPen -0a94 Intersense -0aa3 Lava Computer Mfg., Inc. -0aa4 Develco Elektronik -0aa5 First International Digital - 0002 irock! 500 Series - 0801 MP3 Player -0aa6 Perception Digital, Ltd - 0101 Hercules Jukebox - 1501 Store 'n' Go HD Drive -0aa7 Wincor Nixdorf International GmbH - 0100 POS Keyboard, TA58P-USB - 0101 POS Keyboard, TA85P-USB - 0102 POS Keyboard, TA59-USB - 0103 POS Keyboard, TA60-USB - 0104 SNIkey Keyboard, SNIKey-KB-USB - 0200 Operator Display, BA63-USB - 0201 Operator Display, BA66-USB - 0202 Operator Display & Scanner, XiCheck-BA63 - 0203 Operator Display & Scanner, XiCheck-BA66 - 0204 Graphics Operator Display, BA63GV - 0300 POS Printer (printer class mode), TH210 - 0301 POS Printer (native mode), TH210 - 0302 POS Printer (printer class mode), TH220 - 0303 POS Printer (native mode), TH220 - 0304 POS Printer, TH230 - 0305 Lottery Printer, XiPrintPlus - 0306 POS Printer (printer class mode), TH320 - 0307 POS Printer (native mode), TH320 - 0308 POS Printer (printer class mode), TH420 - 0309 POS Printer (native mode), TH420 - 030a POS Printer, TH200B - 0400 Lottery Scanner, Xiscan S - 0401 Lottery Scanner, Xiscan 3 - 0402 Programmable Magnetic Swipe Card Reader, MSRP-USB - 0500 IDE Adapter - 0501 Hub Printer Interface - 0502 Hub SNIKey Keyboard - 4304 Banking Printer TP07 - 4305 Banking Printer TP07c - 4500 WN Central Special Electronics -0aa8 TriGem Computer, Inc. - 0060 TG 11Mbps WLAN Mini Adapter - 1001 DreamComboM4100 - 3002 InkJet Color Printer - 8001 TG_iMON - 8002 TG_KLOSS - a001 TG_X2 - a002 TGVFD_KLOSS - ffda iMON_VFD -0aa9 Baromtec Co. - f01b Medion MD 6242 MP3 Player -0aaa Japan CBM Corp. -0aab Vision Shape Europe SA -0aac iCompression, Inc. -0aad Rohde & Schwarz GmbH & Co. KG -0aae NEC infrontia Corp. (Nitsuko) -0aaf Digitalway Co., Ltd -0ab0 Arrow Strong Electronics Co., Ltd -0ab1 FEIG ELECTRONIC GmbH - 0002 OBID RFID-Reader -0aba Ellisys - 8001 Tracker 110 Protocol Analyzer - 8002 Explorer 200 Protocol Analyzer -0abe Stereo-Link - 0101 SL1200 DAC -0abf Diolan - 3370 I2C/SPI Adapter - U2C-12 -0ac3 Sanyo Semiconductor Company Micro -0ac4 Leco Corp. -0ac5 I & C Corp. -0ac6 Singing Electrons, Inc. -0ac7 Panwest Corp. -0ac8 Z-Star Microelectronics Corp. - 0301 Web Camera - 0302 ZC0302 Webcam - 0321 Vimicro generic vc0321 Camera - 0323 Luxya WC-1200 USB 2.0 Webcam - 0328 A4Tech PK-130MG - 0336 Elecom UCAM-DLQ30 - 301b ZC0301 Webcam - 303b ZC0303 Webcam - 305b ZC0305 Webcam - 307b USB 1.1 Webcam - 332d Vega USB 2.0 Camera - 3343 Sirius USB 2.0 Camera - 3420 Venus USB2.0 Camera - c001 Sony embedded vimicro Camera - c002 Visual Communication Camera VGP-VCC1 - c302 Vega USB 2.0 Camera - c303 Saturn USB 2.0 Camera - c326 Namuga 1.3M Webcam - c33f Webcam -0ac9 Micro Solutions, Inc. - 0000 Backpack CD-ReWriter - 0001 BACKPACK 2 Cable - 0010 BACKPACK - 0011 Backpack 40GB Hard Drive - 0110 BACKPACK - 0111 BackPack - 1234 BACKPACK -0aca OPEN Networks Ltd - 1060 OPEN NT1 Plus II -0acc Koga Electronics Co. -0acd ID Tech - 0401 ID TECH Spectrum III Hybrid Smartcard Reader - 0630 ID TECH Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC -0ace ZyDAS - 1201 ZD1201 802.11b - 1211 ZD1211 802.11g - 1215 ZD1211B 802.11g - 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 - 20ff Virtual media for 802.11bg - a211 ZD1211 802.11b/g Wireless Adapter - b215 802.11bg -0acf Intoto, Inc. -0ad0 Intellix Corp. -0ad1 Remotec Technology, Ltd -0ad2 Service & Quality Technology Co., Ltd -0ada Data Encryption Systems Ltd. - 0005 DK2 -0ae3 Allion Computer, Inc. -0ae4 Taito Corp. -0ae7 Neodym Systems, Inc. -0ae8 System Support Co., Ltd -0ae9 North Shore Circuit Design L.L.P. -0aea SciEssence, LLC -0aeb TTP Communications, Ltd -0aec Neodio Technologies Corp. - 2101 SmartMedia Card Reader - 2102 CompactFlash Card Reader - 2103 MMC/SD Card Reader - 2104 MemoryStick Card Reader - 2201 SmartMedia+CompactFlash Card Reader - 2202 SmartMedia+MMC/SD Card Reader - 2203 SmartMedia+MemoryStick Card Reader - 2204 CompactFlash+MMC/SD Card Reader - 2205 CompactFlash+MemoryStick Card Reader - 2206 MMC/SD+MemoryStick Card Reader - 2301 SmartMedia+CompactFlash+MMC/SD Card Reader - 2302 SmartMedia+CompactFlash+MemoryStick Card Reader - 2303 SmartMedia+MMC/SD+MemoryStick Card Reader - 2304 CompactFlash+MMC/SD+MemoryStick Card Reader - 3016 MMC/SD+Memory Stick Card Reader - 3050 ND3050 8-in-1 Card Reader - 3060 1.1 FS Card Reader - 3101 MMC/SD Card Reader - 3102 MemoryStick Card Reader - 3201 MMC/SD+MemoryStick Card Reader - 3216 HS Card Reader - 3260 7-in-1 Card Reader - 5010 ND5010 Card Reader -0af0 Option - 5000 UMTS Card - 6000 GlobeTrotter 3G datacard - 6300 GT 3G Quad UMTS/GPRS Card - 6600 GlobeTrotter 3G+ datacard - 6711 GlobeTrotter Express 7.2 v2 - 6971 Globetrotter HSDPA Modem - 7251 Globetrotter HSUPA Modem (aka iCON HSUPA E) - 7501 Globetrotter HSUPA Modem (icon 411 aka "Vodafone K3760") - 7601 Globetrotter MO40x 3G Modem (GTM 382) - 7701 Globetrotter HSUPA Modem (aka icon 451) -0af6 Silver I Co., Ltd -0af7 B2C2, Inc. - 0101 Digital TV USB Receiver (DVB-S/T/C / ATSC) -0af9 Hama, Inc. - 0010 USB SightCam 100 - 0011 Micro Innovations IC50C Webcam -0afc Zaptronix Ltd -0afd Tateno Dennou, Inc. -0afe Cummins Engine Co. -0aff Jump Zone Network Products, Inc. -0b00 INGENICO -0b05 ASUSTek Computer, Inc. - 1101 Mass Storage (UISDMC4S) - 1706 WL-167G v1 802.11g Adapter [Ralink RT2571] - 1707 WL-167G v1 802.11g Adapter [Ralink RT2571] - 1708 Mass Storage Device - 170b Mass Storage Device - 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 - 1717 WL169gE 802.11g Adapter [Broadcom 4320 USB] - 171b A9T wireless 802.11bg - 171c 802.11b/g Wireless Network Adapter - 171f My Cinema U3000 Mini [DiBcom DiB7700P] - 1723 WL-167G v2 802.11g Adapter [Ralink RT2571W] - 1724 RT2573 - 1726 Laptop OLED Display - 172a ASUS 802.11n Network Adapter - 172b 802.11n Network Adapter - 1731 802.11n Network Adapter - 1732 802.11n Network Adapter - 1734 ASUS AF-200 - 173c BT-183 Bluetooth 2.0 - 173f My Cinema U3100 Mini - 1742 802.11n Network Adapter - 1743 Xonar U1 Audio Station - 1751 BT-253 Bluetooth Adapter - 175b Laptop OLED Display - 1760 802.11n Network Adapter - 1761 802.11n Network Adapter - 1774 Gobi Wireless Modem (QDL mode) - 1776 Gobi Wireless Modem - 1779 My Cinema U3100 Mini Plus [AF9035A] - 1784 USB-N13 802.11n Network Adapter [Ralink RT3072] - 1786 USB-N10 802.11n Network Adapter [Realtek RTL8192SU] - 1791 WL-167G v3 802.11n Adapter [Realtek RTL8188SU] - 6101 Cable Modem - 620a Remote NDIS Device - b700 Broadcom Bluetooth 2.1 -0b0b Datamax-O'Neil - 106e Datamax E-4304 -0b0c Todos AB - 0009 Todos Argos Mini II Smart Card Reader - 001e e.dentifier2 (ABN AMRO electronic banking card reader NL) - 002e C200 smartcard controller (Nordea card reader) - 003f Todos C400 smartcard controller (Handelsbanken card reader) - 0050 Argos Mini II Smart Card Reader (CCID) -0b0d ProjectLab - 0000 CenturyCD -0b0e GN Netcom -0b0f AVID Technology -0b10 Pcally -0b11 I Tech Solutions Co., Ltd -0b1e Electronic Warfare Assoc., Inc. (EWA) - 8007 Blackhawk USB560-BP JTAG Emulator -0b1f Insyde Software Corp. -0b20 TransDimension, Inc. -0b21 Yokogawa Electric Corp. -0b22 Japan System Development Co., Ltd -0b23 Pan-Asia Electronics Co., Ltd -0b24 Link Evolution Corp. -0b27 Ritek Corp. -0b28 Kenwood Corp. -0b2c Village Center, Inc. -0b30 PNY Technologies, Inc. - 0006 SM Media-Shuttle Card Reader -0b33 Contour Design, Inc. - 0020 ShuttleXpress -0b37 Hitachi ULSI Systems Co., Ltd -0b38 Gear Head - 0003 Keyboard - 0010 107-Key Keyboard -0b39 Omnidirectional Control Technology, Inc. - 0001 Composite USB PS2 Converter - 0109 USB TO Ethernet - 0421 Serial - 0801 USB-Parallel Bridge - 0901 OCT To Fast Ethernet Converter - 0c03 LAN DOCK Serial Converter -0b3a IPaxess -0b3b Tekram Technology Co., Ltd - 0163 TL-WN320G 1.0 WLAN Adapter - 1601 Allnet 0193 802.11b Adapter - 1602 ZyXEL ZyAIR B200 802.11b Adapter - 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 - 5630 802.11bg - 6630 ZD1211 -0b3c Olivetti Techcenter - a010 Simple_Way Printer/Scanner/Copier - c000 Olicard 100 - c700 Olicard 100 (Mass Storage mode) -0b3e Kikusui Electronics Corp. -0b41 Hal Corp. - 0011 Crossam2+USB IR commander -0b43 Play.com, Inc. - 0003 PS2 Controller Converter -0b47 Sportbug.com, Inc. -0b48 TechnoTrend AG - 1003 Technotrend/Hauppauge USB-Nova - 1004 TT-PCline - 1005 Technotrend/Hauppauge USB-Nova - 1006 Technotrend/Hauppauge DEC3000-s - 1007 TT-micro plus Device - 1008 Technotrend/Hauppauge DEC2000-t - 1009 Technotrend/Hauppauge DEC2540-t - 3001 DVB-S receiver - 3002 DVB-C receiver - 3003 DVB-T receiver - 3004 TT TV-Stick - 3005 TT TV-Stick (8kB EEPROM) - 3006 TT-connect S-2400 DVB-S receiver - 3007 TT-connect S2-3600 - 3008 TT-connect - 3009 TT-connect S-2400 DVB-S receiver (8kB EEPROM) - 300a TT-connect S2-3650 CI - 300b TT-connect C-3650 CI - 300c TT-connect T-3650 CI - 300d TT-connect CT-3650 CI - 300e TT-connect C-2400 -0b49 ASCII Corp. - 064f Trance Vibrator -0b4b Pine Corp. Ltd. - 0100 D'music MP3 Player -0b4d Graphtec America, Inc. - 110a Graphtec CC200-20 -0b4e Musical Electronics, Ltd - 6500 MP3 Player - 8028 MP3 Player - 8920 MP3 Player -0b50 Dumpries Co., Ltd -0b51 Comfort Keyboard Co. - 0020 Comfort Keyboard -0b52 Colorado MicroDisplay, Inc. -0b54 Sinbon Electronics Co., Ltd -0b56 TYI Systems, Ltd -0b57 Beijing HanwangTechnology Co., Ltd -0b59 Lake Communications, Ltd -0b5a Corel Corp. -0b5f Green Electronics Co., Ltd -0b60 Nsine, Ltd -0b61 NEC Viewtechnology, Ltd -0b62 Orange Micro, Inc. - 000b Bluetooth Device - 0059 iBOT2 Webcam -0b63 ADLink Technology, Inc. -0b64 Wonderful Wire Cable Co., Ltd -0b65 Expert Magnetics Corp. -0b69 CacheVision -0b6a Maxim Integrated Products -0b6f Nagano Japan Radio Co., Ltd -0b70 PortalPlayer, Inc. - 00ba iRiver H10 20GB -0b71 SHIN-EI Sangyo Co., Ltd -0b72 Embedded Wireless Technology Co., Ltd -0b73 Computone Corp. -0b75 Roland DG Corp. -0b79 Sunrise Telecom, Inc. -0b7a Zeevo, Inc. - 07d0 Bluetooth Dongle -0b7b Taiko Denki Co., Ltd -0b7c ITRAN Communications, Ltd -0b7d Astrodesign, Inc. -0b81 id3 Semiconductors - 0001 Biothentic II smartcard reader with fingerprint sensor - 0002 DFU-Enabled Devices (DFU) - 0012 BioPAD biometric module (DFU + CDC) - 0102 Certis V1 fingerprint reader - 0103 Certis V2 fingerprint reader - 0200 CL1356T / CL1356T5 / CL1356A smartcard readers (CCID) - 0201 CL1356T / CL1356T5 / CL1356A smartcard readers (DFU + CCID) - 0220 CL1356A FFPJP smartcard reader (CCID + HID) - 0221 CL1356A smartcard reader (DFU + CCID + HID) -0b84 Rextron Technology, Inc. -0b85 Elkat Electronics, Sdn., Bhd. -0b86 Exputer Systems, Inc. - 5100 XMC5100 Zippy Drive - 5110 XMC5110 Flash Drive - 5200 XMC5200 Zippy Drive - 5201 XMC5200 Zippy Drive - 5202 XMC5200 Zippy Drive - 5280 XMC5280 Storage Drive - fff0 ISP5200 Debugger -0b87 Plus-One I & T, Inc. -0b88 Sigma Koki Co., Ltd, Technology Center -0b89 Advanced Digital Broadcast, Ltd -0b8c SMART Technologies Inc. - 00c3 Sympodium ID350 -0b95 ASIX Electronics Corp. - 1720 10/100 Ethernet - 1780 AX88178 - 7720 AX88772 -0b96 Sewon Telecom -0b97 O2 Micro, Inc. - 7732 Smart Card Reader - 7761 Oz776 1.1 Hub - 7762 Oz776 SmartCard Reader - 7772 OZ776 CCID Smartcard Reader -0b98 Playmates Toys, Inc. -0b99 Audio International, Inc. -0b9b Dipl.-Ing. Stefan Kunde - 4012 Reflex RC-controller Interface -0b9d Softprotec Co. -0b9f Chippo Technologies -0baf U.S. Robotics - 00e5 USR6000 - 00eb USR1120 802.11b Adapter - 00ec 56K Faxmodem - 00f1 SureConnect ADSL ATM Adapter - 00f2 SureConnect ADSL Loader - 00f5 SureConnect ADSL ATM Adapter - 00f6 SureConnect ADSL Loader - 00f7 SureConnect ADSL ATM Adapter - 00f8 SureConnect ADSL Loader - 00f9 SureConnect ADSL ATM Adapter - 00fa SureConnect ADSL Loader - 00fb SureConnect ADSL Ethernet/USB Router - 0111 USR5420 802.11g Adapter [Broadcom 4320 USB] - 0118 U5 802.11g Adapter - 011b Wireless MAXg Adapter [Broadcom 4320] - 0121 USR5423 802.11bg - 6112 FaxModem Model 5633 -0bb0 Concord Camera Corp. - 0100 Sound Vision Stream - 5007 3340z/Rollei DC3100 -0bb1 Infinilink Corp. -0bb2 Ambit Microsystems Corp. - 0302 U10H010 802.11b Wireless Adapter [Intersil PRISM 3] - 6098 USB Cable Modem -0bb3 Ofuji Technology -0bb4 High Tech Computer Corp. - 00ce mmO2 XDA GSM/GPRS Pocket PC - 00cf SPV C500 Smart Phone - 0a01 PocketPC Sync - 0a02 Himalaya GSM/GPRS Pocket PC - 0a03 PocketPC Sync - 0a04 PocketPC Sync - 0a05 PocketPC Sync - 0a06 PocketPC Sync - 0a07 Magician PocketPC SmartPhone / O2 XDA - 0a08 PocketPC Sync - 0a09 PocketPC Sync - 0a0a PocketPC Sync - 0a0b PocketPC Sync - 0a0c PocketPC Sync - 0a0d PocketPC Sync - 0a0e PocketPC Sync - 0a0f PocketPC Sync - 0a10 PocketPC Sync - 0a11 PocketPC Sync - 0a12 PocketPC Sync - 0a13 PocketPC Sync - 0a14 PocketPC Sync - 0a15 PocketPC Sync - 0a16 PocketPC Sync - 0a17 PocketPC Sync - 0a18 PocketPC Sync - 0a19 PocketPC Sync - 0a1a PocketPC Sync - 0a1b PocketPC Sync - 0a1c PocketPC Sync - 0a1d PocketPC Sync - 0a1e PocketPC Sync - 0a1f PocketPC Sync - 0a20 PocketPC Sync - 0a21 PocketPC Sync - 0a22 PocketPC Sync - 0a23 PocketPC Sync - 0a24 PocketPC Sync - 0a25 PocketPC Sync - 0a26 PocketPC Sync - 0a27 PocketPC Sync - 0a28 PocketPC Sync - 0a29 PocketPC Sync - 0a2a PocketPC Sync - 0a2b PocketPC Sync - 0a2c PocketPC Sync - 0a2d PocketPC Sync - 0a2e PocketPC Sync - 0a2f PocketPC Sync - 0a30 PocketPC Sync - 0a31 PocketPC Sync - 0a32 PocketPC Sync - 0a33 PocketPC Sync - 0a34 PocketPC Sync - 0a35 PocketPC Sync - 0a36 PocketPC Sync - 0a37 PocketPC Sync - 0a38 PocketPC Sync - 0a39 PocketPC Sync - 0a3a PocketPC Sync - 0a3b PocketPC Sync - 0a3c PocketPC Sync - 0a3d PocketPC Sync - 0a3e PocketPC Sync - 0a3f PocketPC Sync - 0a40 PocketPC Sync - 0a41 PocketPC Sync - 0a42 PocketPC Sync - 0a43 PocketPC Sync - 0a44 PocketPC Sync - 0a45 PocketPC Sync - 0a46 PocketPC Sync - 0a47 PocketPC Sync - 0a48 PocketPC Sync - 0a49 PocketPC Sync - 0a4a PocketPC Sync - 0a4b PocketPC Sync - 0a4c PocketPC Sync - 0a4d PocketPC Sync - 0a4e PocketPC Sync - 0a4f PocketPC Sync - 0a50 HTC SmartPhone Sync - 0a51 SPV C400 / T-Mobile SDA GSM/GPRS Pocket PC - 0a52 SmartPhone Sync - 0a53 SmartPhone Sync - 0a54 SmartPhone Sync - 0a55 SmartPhone Sync - 0a56 SmartPhone Sync - 0a57 SmartPhone Sync - 0a58 SmartPhone Sync - 0a59 SmartPhone Sync - 0a5a SmartPhone Sync - 0a5b SmartPhone Sync - 0a5c SmartPhone Sync - 0a5d SmartPhone Sync - 0a5e SmartPhone Sync - 0a5f SmartPhone Sync - 0a60 SmartPhone Sync - 0a61 SmartPhone Sync - 0a62 SmartPhone Sync - 0a63 SmartPhone Sync - 0a64 SmartPhone Sync - 0a65 SmartPhone Sync - 0a66 SmartPhone Sync - 0a67 SmartPhone Sync - 0a68 SmartPhone Sync - 0a69 SmartPhone Sync - 0a6a SmartPhone Sync - 0a6b SmartPhone Sync - 0a6c SmartPhone Sync - 0a6d SmartPhone Sync - 0a6e SmartPhone Sync - 0a6f SmartPhone Sync - 0a70 SmartPhone Sync - 0a71 SmartPhone Sync - 0a72 SmartPhone Sync - 0a73 SmartPhone Sync - 0a74 SmartPhone Sync - 0a75 SmartPhone Sync - 0a76 SmartPhone Sync - 0a77 SmartPhone Sync - 0a78 SmartPhone Sync - 0a79 SmartPhone Sync - 0a7a SmartPhone Sync - 0a7b SmartPhone Sync - 0a7c SmartPhone Sync - 0a7d SmartPhone Sync - 0a7e SmartPhone Sync - 0a7f SmartPhone Sync - 0a80 SmartPhone Sync - 0a81 SmartPhone Sync - 0a82 SmartPhone Sync - 0a83 SmartPhone Sync - 0a84 SmartPhone Sync - 0a85 SmartPhone Sync - 0a86 SmartPhone Sync - 0a87 SmartPhone Sync - 0a88 SmartPhone Sync - 0a89 SmartPhone Sync - 0a8a SmartPhone Sync - 0a8b SmartPhone Sync - 0a8c SmartPhone Sync - 0a8d SmartPhone Sync - 0a8e SmartPhone Sync - 0a8f SmartPhone Sync - 0a90 SmartPhone Sync - 0a91 SmartPhone Sync - 0a92 SmartPhone Sync - 0a93 SmartPhone Sync - 0a94 SmartPhone Sync - 0a95 SmartPhone Sync - 0a96 SmartPhone Sync - 0a97 SmartPhone Sync - 0a98 SmartPhone Sync - 0a99 SmartPhone Sync - 0a9a SmartPhone Sync - 0a9b SmartPhone Sync - 0a9c SmartPhone Sync - 0a9d SmartPhone Sync - 0a9e SmartPhone Sync - 0a9f SmartPhone Sync - 0b03 Ozone Mobile Broadband - 0b04 Hermes / TyTN / T-Mobile MDA Vario II / O2 Xda Trion - 0b05 P3600 - 0b06 Athena / Advantage x7500 / Dopod U1000 / T-Mobile AMEO - 0b0c Elf / Touch / P3450 / T-Mobile MDA Touch / O2 Xda Nova / Dopod S1 - 0b1f Sony Ericsson XPERIA X1 - 0b2f Rhodium - 0b51 Qtek 8310 mobile phone [Tornado Noble] - 0bce Vario MDA - 0c01 Dream / ADP1 / G1 / Magic / Tattoo - 0c02 Dream / ADP1 / G1 / Magic / Tattoo (Debug) - 0c13 Diamond - 0c1f Sony Ericsson XPERIA X1 - 0c5f Snap - 0c87 Desire (debug) - 0c8d EVO 4G (debug) - 0c91 Vision - 0c94 Vision - 0c97 Legend - 0c99 Desire (debug) - 0c9e Incredible - 0ca2 Desire HD (debug mode) - 0ff8 Desire HD (Tethering Mode) - 0ff9 Desire / Desire HD / Hero (Charge Mode) - 0ffe Desire HD (modem mode) - 0fff Android Fastboot Bootloader -0bb5 Murata Manufacturing Co., Ltd -0bb6 Network Alchemy -0bb7 Joytech Computer Co., Ltd -0bb8 Hitachi Semiconductor and Devices Sales Co., Ltd -0bb9 Eiger M&C Co., Ltd -0bba ZAccess Systems -0bbb General Meters Corp. -0bbc Assistive Technology, Inc. -0bbd System Connection, Inc. -0bc0 Knilink Technology, Inc. -0bc1 Fuw Yng Electronics Co., Ltd -0bc2 Seagate RSS LLC - 2000 Storage Adapter V3 (TPP) - 2200 FreeAgent Go FW - 5021 FreeAgent GoFlex USB 2.0 - 5031 FreeAgent GoFlex USB 3.0 -0bc3 IPWireless, Inc. - 0001 UMTS-TDD (TD-CDMA) modem -0bc4 Microcube Corp. -0bc5 JCN Co., Ltd -0bc6 ExWAY, Inc. -0bc7 X10 Wireless Technology, Inc. - 0001 ActiveHome (ACPI-compliant) - 0002 Firecracker Interface (ACPI-compliant) - 0003 VGA Video Sender (ACPI-compliant) - 0004 X10 Receiver - 0005 Wireless Transceiver (ACPI-compliant) - 0006 Wireless Transceiver (ACPI-compliant) - 0007 Wireless Transceiver (ACPI-compliant) - 0008 Wireless Transceiver (ACPI-compliant) - 0009 Wireless Transceiver (ACPI-compliant) - 000a Wireless Transceiver (ACPI-compliant) - 000b Transceiver (ACPI-compliant) - 000c Transceiver (ACPI-compliant) - 000d Transceiver (ACPI-compliant) - 000e Transceiver (ACPI-compliant) - 000f Transceiver (ACPI-compliant) -0bc8 Telmax Communications -0bc9 ECI Telecom, Ltd -0bca Startek Engineering, Inc. -0bcb Perfect Technic Enterprise Co., Ltd -0bd7 Andrew Pargeter & Associates - a021 Amptek DP4 multichannel signal analyzer -0bda Realtek Semiconductor Corp. - 0103 USB 2.0 Card Reader - 0104 Mass Storage Device - 0106 Mass Storage Device - 0107 Mass Storage Device - 0108 Mass Storage Device - 0111 Card Reader - 0113 Mass Storage Device - 0115 Mass Storage Device (Multicard Reader) - 0116 Mass Storage Device - 0117 Mass Storage Device - 0118 Mass Storage Device - 0138 Card reader - 0151 Mass Storage Device (Multicard Reader) - 0152 Mass Storage Device - 0153 Mass Storage Device - 0156 Mass Storage Device - 0157 Mass Storage Device - 0158 USB 2.0 multicard reader - 0159 Digital Media Card Reader - 0161 Mass Storage Device - 0168 Mass Storage Device - 0169 Mass Storage Device - 0171 Mass Storage Device - 0176 Mass Storage Device - 0178 Mass Storage Device - 2831 RTL2831U DVB-T - 2832 RTL2832U DVB-T - 8150 RTL8150 Fast Ethernet Adapter - 8151 RTL8151 Adapteon Business Mobile Networks BV - 8171 RTL8188SU 802.11n WLAN Adapter - 8172 RTL8191SU 802.11n WLAN Adapter - 8176 RTL8188CUS 802.11n WLAN - 8187 RTL8187 Wireless Adapter - 8189 RTL8187B Wireless 802.11g 54Mbps Network Adapter - 8192 RTL8192U 802.11n Wireless Adapter - 8197 RTL8187B Wireless Adapter - 8198 RTL8187B Wireless Adapter -0bdb Ericsson Business Mobile Networks BV - 1000 BV Bluetooth Device - 1002 Bluetooth Device 1.2 - 1049 C3607w Mobile Broadband Module - 1900 F3507g Mobile Broadband Module - 1902 F3507g v2 Mobile Broadband Module - 1904 F3607gw Mobile Broadband Module - 1905 F3607gw v2 Mobile Broadband Module - 1906 F3607gw v3 Mobile Broadband Module - 1909 F3307 v2 Mobile Broadband Module - 190a F3307 Mobile Broadband Module - 190b C3607w v2 Mobile Broadband Module -0bdc Y Media Corp. -0bdd Orange PCS -0be2 Kanda Tsushin Kogyo Co., Ltd -0be3 TOYO Corp. -0be4 Elka International, Ltd -0be5 DOME imaging systems, Inc. -0be6 Dong Guan Humen Wonderful Wire Cable Factory -0bed Silicon Labs - 1100 MEI (TM) Cashflow-SC Bill/Voucher Acceptor -0bee LTK Industries, Ltd -0bef Way2Call Communications -0bf0 Pace Micro Technology PLC -0bf1 Intracom S.A. - 0001 netMod Driver Ver 2.4.17 (CAPI) - 0002 netMod Driver Ver 2.4 (CAPI) - 0003 netMod Driver Ver 2.4 (CAPI) -0bf2 Konexx -0bf6 Addonics Technologies, Inc. - 0103 Storage Device - 1234 Storage Device - a000 Cable 205 (TPP) - a001 Cable 205 - a002 IDE Bridge -0bf7 Sunny Giken, Inc. -0bf8 Fujitsu Siemens Computers - 1001 Fujitsu Pocket Loox 600 PDA - 1006 SmartCard Reader 2A - 1007 Connect2Air E-5400 802.11g Wireless Adapter - 1009 Connect2Air E-5400 D1700 802.11g Wireless Adapter [Intersil ISL3887] - 100f miniCard D2301 802.11bg Wireless Module [SiS 163U] -0bfd Kvaser AB - 0004 USBcan II - 000b Leaf Light HS - 000e Leaf SemiPro HS -0c04 MOTO Development Group, Inc. -0c05 Appian Graphics -0c06 Hasbro Games, Inc. -0c07 Infinite Data Storage, Ltd -0c08 Agate - 0378 Q 16MB Storage Device -0c09 Comjet Information System - a5a5 Litto Version USB2.0 -0c0a Highpoint Technologies, Inc. -0c0b Dura Micro, Inc. (Acomdata) - 27cb 6-in-1 Flash Reader and Writer - 27d7 Multi Memory reader/writer MD-005 - 27da Multi Memory reader/writer MD-005 - 27dc Multi Memory reader/writer MD-005 - 27e7 3,5'' HDD case MD-231 - 27ee 3,5'' HDD case MD-231 - 2814 3,5'' HDD case MD-231 - 2815 3,5'' HDD case MD-231 - 281d 3,5'' HDD case MD-231 - 5fab Storage Adaptor - a109 CF/SM Reader and Writer - a10c SD/MS Reader and Writer - b001 USB 2.0 Mass Storage IDE adapter - b004 MMC/SD Reader and Writer -0c12 Zeroplus - 0005 PSX Vibration Feedback Converter - 0030 PSX Vibration Feedback Converter - 700e Logic Analyzer (LAP-C-16032) - 8801 Xbox Controller - 8802 Xbox Controller - 8809 Red Octane Ignition Xbox DDR Pad - 880a Pelican Eclipse PL-2023 - 8810 Xbox Controller - 9902 VibraX -0c15 Iris Graphics -0c16 Gyration, Inc. - 0002 RF Technology Receiver - 0003 RF Technology Receiver - 0008 RF Technology Receiver - 0080 eHome Infrared Receiver - 0081 eHome Infrared Receiver -0c17 Cyberboard A/S -0c18 SynerTek Korea, Inc. -0c19 cyberPIXIE, Inc. -0c1a Silicon Motion, Inc. -0c1b MIPS Technologies -0c1c Hang Zhou Silan Electronics Co., Ltd -0c22 Tally Printer Corp. -0c23 Lernout + Hauspie -0c24 Taiyo Yuden - 0001 Bluetooth Adaptor - 0002 Bluetooth Device2 - 0005 Bluetooth Device(BC04-External) - 000b Bluetooth Device(BC04-External) - 000c Bluetooth Adaptor - 000e Bluetooth Device(BC04-External) - 000f Bluetooth Device (V2.0+EDR) - 0010 Bluetooth Device(BC04-External) - 0012 Bluetooth Device(BC04-External) - 0018 Bluetooth Device(BC04-External) - 0019 Bluetooth Device - 0c24 Bluetooth Device(SAMPLE) - ffff Bluetooth module with BlueCore in DFU mode -0c25 Sampo Corp. - 0310 Scream Cam -0c26 Prolific Technology Inc. - 0018 USB-Serial Controller [Icom Inc. OPC-478UC] -0c27 RFIDeas, Inc - 3bfa pcProx Card Reader -0c2e Metro - 0007 Metrologic MS7120 Barcode Scanner (IBM SurePOS mode) - 0200 Metrologic Scanner - 0204 Metrologic MS7120 Barcode Scanner (keyboard mode) - 0700 Metrologic MS7120 Barcode Scanner (uni-directional serial mode) - 0720 Metrologic MS7120 Barcode Scanner (bi-directional serial mode) -0c35 Eagletron, Inc. -0c36 E Ink Corp. -0c37 e.Digital -0c38 Der An Electric Wire & Cable Co., Ltd -0c39 IFR -0c3a Furui Precise Component (Kunshan) Co., Ltd -0c3b Komatsu, Ltd -0c3c Radius Co., Ltd -0c3d Innocom, Inc. -0c3e Nextcell, Inc. -0c44 Motorola iDEN - 0021 iDEN P2k0 Device - 0022 iDEN P2k1 Device - 03a2 iDEN Smartphone - 41d9 i1 phone -0c45 Microdia - 0011 EBUDDY - 1020 Mass Storage Reader - 1028 Mass Storage Reader - 1030 Mass Storage Reader - 1031 Sonix Mass Storage Device - 1032 Mass Storage Reader - 1033 Sonix Mass Storage Device - 1034 Mass Storage Reader - 1035 Mass Storage Reader - 1036 Mass Storage Reader - 1037 Sonix Mass Storage Device - 1050 CF Card Reader - 1058 HDD Reader - 1060 iFlash SM-Direct Card Reader - 1061 Mass Storage Reader - 1062 Mass Storage Reader - 1063 Sonix Mass Storage Device - 1064 Mass Storage Reader - 1065 Mass Storage Reader - 1066 Mass Storage Reader - 1067 Mass Storage Reader - 1158 A56AK - 184c VoIP Phone - 6001 Genius VideoCAM NB - 6005 Sweex Mini Webcam - 6007 VideoCAM Eye - 6009 VideoCAM ExpressII - 600d TwinkleCam USB camera - 6011 PC Camera (SN9C102) - 6019 PC Camera (SN9C102) - 6024 VideoCAM ExpressII - 6025 VideoCAM ExpressII - 6028 Typhoon Easycam USB 330K (older) - 6029 Triplex i-mini PC Camera - 602a Meade ETX-105EC Camera - 602b VideoCAM NB 300 - 602c Clas Ohlson TWC-30XOP Webcam - 602d VideoCAM ExpressII - 602e VideoCAM Messenger - 6030 VideoCAM ExpressII - 603f VideoCAM ExpressII - 6040 CCD PC Camera (PC390A) - 606a CCD PC Camera (PC390A) - 607a CCD PC Camera (PC390A) - 607b Win2 PC Camera - 607c CCD PC Camera (PC390A) - 607e CCD PC Camera (PC390A) - 6080 Audio (Microphone) - 6082 VideoCAM Look - 6083 VideoCAM Look - 608c VideoCAM Look - 608e VideoCAM Look - 608f PC Camera (SN9C103 + OV7630) - 60a8 VideoCAM Look - 60aa VideoCAM Look - 60ab PC Camera - 60af VideoCAM Look - 60b0 Genius VideoCam Look - 60c0 PC Camera with Mic (SN9C105) - 60c8 Win2 PC Camera - 60cc PC Camera with Mic (SN9C105) - 60ec PC Camera with Mic (SN9C105) - 60ef Win2 PC Camera - 60fa PC Camera with Mic (SN9C105) - 60fb Composite Device - 60fc PC Camera with Mic (SN9C105) - 60fe Audio (Microphone) - 6108 Win2 PC Camera - 6122 PC Camera (SN9C110) - 6123 PC Camera (SN9C110) - 6128 PC Camera (SN9C325 + OM6802) - 612a PC Camera (SN9C325) - 612c PC Camera (SN9C110) - 612e PC Camera (SN9C110) - 612f PC Camera (SN9C110) - 6130 PC Camera (SN9C120) - 6138 Win2 PC Camera - 613a PC Camera (SN9C120) - 613b Win2 PC Camera - 613c PC Camera (SN9C120) - 613e PC Camera (SN9C120) - 6143 PC Camera (SN9C120 + SP80708) - 6240 PC Camera (SN9C201 + MI1300) - 6242 PC Camera (SN9C201 + MI1310) - 6243 PC Camera (SN9C201 + S5K4AAFX) - 6248 PC Camera (SN9C201 + OV9655) - 624b PC Camera (SN9C201 + CX1332) - 624c PC Camera (SN9C201 + MI1320) - 624e PC Camera (SN9C201 + SOI968) - 624f PC Camera (SN9C201 + OV9650) - 6251 PC Camera (SN9C201 + OV9650) - 6253 PC Camera (SN9C201 + OV9650) - 6260 PC Camera (SN9C201 + OV7670ISP) - 6262 PC Camera (SN9C201 + OM6802) - 6270 PC Camera (SN9C201 + MI0360/MT9V011 or MI0360SOC/MT9V111) U-CAM PC Camera NE878, Whitcom WHC017, ... - 627a PC Camera (SN9C201 + S5K53BEB) - 627b PC Camera (SN9C201 + OV7660) - 627c PC Camera (SN9C201 + HV7131R) - 627f PC Camera (SN9C201 + OV965x + EEPROM) - 6280 PC Camera with Microphone (SN9C202 + MI1300) - 6282 PC Camera with Microphone (SN9C202 + MI1310) - 6283 PC Camera with Microphone (SN9C202 + S5K4AAFX) - 6288 PC Camera with Microphone (SN9C202 + OV9655) - 628a PC Camera with Microphone (SN9C202 + ICM107) - 628b PC Camera with Microphone (SN9C202 + CX1332) - 628c PC Camera with Microphone (SN9C202 + MI1320) - 628e PC Camera with Microphone (SN9C202 + SOI968) - 628f PC Camera with Microphone (SN9C202 + OV9650) - 62a0 PC Camera with Microphone (SN9C202 + OV7670ISP) - 62a2 PC Camera with Microphone (SN9C202 + OM6802) - 62b0 PC Camera with Microphone (SN9C202 + MI0360/MT9V011 or MI0360SOC/MT9V111) - 62b3 PC Camera with Microphone (SN9C202 + OV9655) - 62ba PC Camera with Microphone (SN9C202 + S5K53BEB) - 62bb PC Camera with Microphone (SN9C202 + OV7660) - 62bc PC Camera with Microphone (SN9C202 + HV7131R) - 62be PC Camera with Microphone (SN9C202 + OV7663) - 62c0 Sonix USB 2.0 Camera - 62e0 MSI Starcam Racer - 6310 Sonix USB 2.0 Camera - 63e0 Sonix Integrated Webcam - 63f1 Integrated Webcam - 63f8 Sonix Integrated Webcam - 6409 Webcam - 6417 Integrated Webcam - 641d 1.3 MPixel Integrated Webcam - 6480 Sonix 1.3 MP Laptop Integrated Webcam - 8000 DC31VC - 8006 Dual Mode Camera (8006 VGA) - 800a Vivitar Vivicam3350B -0c46 WaveRider Communications, Inc. -0c4b Reiner SCT Kartensysteme GmbH - 0100 cyberJack e-com/pinpad - 0300 cyberJack pinpad(a) - 9102 cyberJack RFID basis contactless smartcard reader -0c52 Sealevel Systems, Inc. - 2101 Serial Converter -0c53 ViewPLUS, Inc. -0c54 Glory, Ltd -0c55 Spectrum Digital, Inc. - 0510 Spectrum Digital XDS510 JTAG Debugger - 0540 SPI540 - 5416 TMS320C5416 DSK - 6416 TMS320C6416 DDB -0c56 Billion Bright, Ltd -0c57 Imaginative Design Operation Co., Ltd -0c58 Vidar Systems Corp. -0c59 Dong Guan Shinko Wire Co., Ltd -0c5a TRS International Mfg., Inc. -0c5e Xytronix Research & Design -0c60 Apogee Electronics Corp. -0c62 Chant Sincere Co., Ltd -0c63 Toko, Inc. -0c64 Signality System Engineering Co., Ltd -0c65 Eminence Enterprise Co., Ltd -0c66 Rexon Electronics Corp. -0c67 Concept Telecom, Ltd -0c70 MCT Elektronikladen - 0000 USB08 Development board -0c72 PEAK System - 000c PCAN-USB -0c74 Optronic Laboratories Inc. - 0002 OL 700-30 Goniometer -0c76 JMTek, LLC. - 0001 Mass Storage Controller - 0002 Mass Storage Controller - 0003 USBdisk - 0004 Mass Storage Controller - 0005 Transcend Flash disk - 0006 Transcend JetFlash - 0007 Mass Storage Device - 1605 SSS Headphone Set - 1607 audio controller -0c77 Sipix Group, Ltd - 1001 SiPix Web2 - 1002 SiPix SC2100 - 1010 SiPix Snap - 1011 SiPix Blink 2 - 1015 SiPix CAMeleon -0c78 Detto Corp. -0c79 NuConnex Technologies Pte., Ltd -0c7a Wing-Span Enterprise Co., Ltd -0c86 NDA Technologies, Inc. -0c88 Kyocera Wireless Corp. - 0021 Handheld - 17da Qualcomm Kyocera CDMA Technologies MSM -0c89 Honda Tsushin Kogyo Co., Ltd -0c8a Pathway Connectivity, Inc. -0c8b Wavefly Corp. -0c8c Coactive Networks -0c8d Tempo -0c8e Cesscom Co., Ltd - 6000 Luxian Series -0c8f Applied Microsystems -0c98 Berkshire Products, Inc. - 1140 USB PC Watchdog -0c99 Innochips Co., Ltd -0c9a Hanwool Robotics Corp. -0c9b Jobin Yvon, Inc. -0c9d SemTek - 0170 3873 Manual Insert card reader -0ca2 Zyfer -0ca3 Sega Corp. -0ca4 ST&T Instrument Corp. -0ca5 BAE Systems Canada, Inc. -0ca6 Castles Technology Co., Ltd - 0010 EZUSB PC/SC Smart Card Reader - 0050 EZ220PU Reader Controller - 1077 Bludrive Family Smart Card Reader - 107e Reader Controller - 2010 myPad110 PC/SC Smart Card Reader - 3050 EZ710 Smart Card Reader -0ca7 Information Systems Laboratories -0cad Motorola CGISS - 9001 PowerPad Pocket PC Device -0cae Ascom Business Systems, Ltd -0caf Buslink - 2507 Hi-Speed USB-to-IDE Bridge Controller - 2515 Flash Disk Embedded Hub - 2516 Flash Disk Security Device - 2517 Flash Disk Mass Storage Device - 25c7 Hi-Speed USB-to-IDE Bridge Controller - 3a00 Hard Drive - 3a20 Mass Storage Device - 3acd Mass Storage Device -0cb0 Flying Pig Systems -0cb1 Innovonics, Inc. -0cb6 Celestix Networks, Pte., Ltd -0cb7 Singatron Enterprise Co., Ltd -0cb8 Opticis Co., Ltd -0cba Trust Electronic (Shanghai) Co., Ltd -0cbb Shanghai Darong Electronics Co., Ltd -0cbc Palmax Technology Co., Ltd - 0101 Pocket PC P6C - 0201 Personal Digital Assistant - 0301 Personal Digital Assistant P6M+ - 0401 Pocket PC -0cbd Pentel Co., Ltd (Electronics Equipment Div.) -0cbe Keryx Technologies, Inc. -0cbf Union Genius Computer Co., Ltd -0cc0 Kuon Yi Industrial Corp. -0cc1 Given Imaging, Ltd -0cc2 Timex Corp. -0cc3 Rimage Corp. -0cc4 emsys GmbH -0cc5 Sendo -0cc6 Intermagic Corp. -0cc7 Kontron Medical AG -0cc8 Technotools Corp. -0cc9 BroadMAX Technologies, Inc. -0cca Amphenol -0ccb SKNet Co., Ltd -0ccc Domex Technology Corp. -0ccd TerraTec Electronic GmbH - 0012 PHASE 26 - 0013 PHASE 26 - 0014 PHASE 26 - 0015 Flash Update for TerraTec PHASE 26 - 0021 Cameo Grabster 200 - 0023 Mystify Claw - 0028 Aureon 5.1 MkII - 0032 MIDI HUBBLE - 0035 Miditech Play'n Roll - 0036 Cinergy 250 Audio - 0037 Cinergy 250 Audio - 0038 Cinergy T² DVB-T Receiver - 0039 Grabster AV 400 - 003b Cinergy 400 - 003c Grabster AV 250 - 0042 Cinergy Hybrid T XS - 0043 Cinergy T XS - 004e Cinergy T XS - 004f Cinergy Analog XS - 0055 Cinergy T XE (Version 1, AF9005) - 005c Cinergy T² - 0069 Cinergy T XE (Version 2, AF9015) - 006b Cinergy HT PVR (EU) - 0072 Cinergy Hybrid T - 0077 Aureon Dual USB - 0078 Cinergy T XXS - 0086 Cinergy Hybrid XE - 0097 Cinergy T RC MKII - 00a5 Cinergy Hybrid Stick - 00a9 RTL2838 DVB-T COFDM Demodulator [TerraTec Cinergy T Stick Black] -0cd4 Bang Olufsen - 0101 BeolinkPC2 -0cd5 LabJack Corporation - 0003 U3 - 0009 UE9 -0cd7 NewChip S.r.l. -0cd8 JS Digitech, Inc. - 2007 Smart Card Reader/JSTU-9700 -0cd9 Hitachi Shin Din Cable, Ltd -0cde Z-Com - 0001 XI-750 802.11b Wireless Adapter [Atmel AT76C503A] - 0002 XI-725/726 Prism2.5 802.11b Adapter - 0003 Sagem 802.11b Dongle - 0004 Sagem 802.11b Dongle - 0005 XI-735 Prism3 802.11b Adapter - 0006 XG-300 802.11b Adapter - 0008 XG-703A 802.11g Wireless Adapter [Intersil ISL3887] - 0009 (ZD1211)IEEE 802.11b+g Adapter - 0011 ZD1211 - 0012 AR5523 - 0013 AR5523 driver (no firmware) - 0014 NB 802.11g Wireless LAN Adapter(3887A) - 0015 XG-705A 802.11g Wireless Adapter [Intersil ISL3887] - 0016 NB 802.11g Wireless LAN Adapter(3887A) - 0018 NB 802.11a/b/g Wireless LAN Adapter(3887A) - 001a 802.11bg - 001c 802.11b/g Wireless Network Adapter - 0020 AG-760A 802.11abg Wireless Adapter [ZyDAS ZD1211B] - 0022 802.11b/g/n Wireless Network Adapter - 0023 UB81 802.11bgn - 0025 802.11b/g/n USB Wireless Network Adapter - 0026 UB82 802.11abgn -0ce5 Validation Technologies International - 0003 Matrix -0ce9 pico Technology - 1001 PicoScope3204 -0cf1 e-Conn Electronic Co., Ltd -0cf2 ENE Technology, Inc. - 6220 SD Card Reader (SG361) - 6225 SD card reader (UB6225) - 6250 SD card reader (UB6250) -0cf3 Atheros Communications, Inc. - 0001 AR5523 - 0002 AR5523 (no firmware) - 0003 AR5523 - 0004 AR5523 (no firmware) - 0005 AR5523 - 0006 AR5523 (no firmware) - 1001 Thomson TG121N [Atheros AR9001U-(2)NG] - 1002 TP-Link TL-WN821N v2 802.11n [Atheros AR9170] - 1006 TP-Link TL-WN322G v3 / TL-WN422G v2 802.11g [Atheros AR9271] - 1010 3Com 3CRUSBN275 802.11abgn Wireless Adapter [Atheros AR9170] - 20ff Virtual CD-ROM - 3000 AR3011 Bluetooth (no firmware) - 3005 AR3011 Bluetooth - 7015 TP-Link TL-WN821N v3 802.11n [Atheros AR7010+AR9287] - 9170 AR9170 802.11n - 9271 AR9271 802.11n - b002 Ubiquiti WiFiStation 802.11n [Atheros AR9271] - b003 Ubiquiti WiFiStationEXT 802.11n [Atheros AR9271] -0cf4 Fomtex Corp. -0cf5 Cellink Co., Ltd -0cf6 Compucable Corp. -0cf7 ishoni Networks -0cf8 Clarisys, Inc. - 0750 Claritel-i750 - vp -0cf9 Central System Research Co., Ltd -0cfa Inviso, Inc. -0cfc Minolta-QMS, Inc. - 2301 Magicolor 2300 DL - 2350 Magicolor 2350EN/3300 - 3100 Magicolor 3100 - 7300 Magicolor 5450/5550 -0cff SAFA MEDIA Co., Ltd. - 0320 SR-380N -0d06 telos EDV Systementwicklung GmbH -0d08 UTStarcom - 0602 DV007 [serial] - 0603 DV007 [storage] -0d0b Contemporary Controls -0d0c Astron Electronics Co., Ltd -0d0d MKNet Corp. -0d0e Hybrid Networks, Inc. -0d0f Feng Shin Cable Co., Ltd -0d10 Elastic Networks - 0001 StormPort (WDM) -0d11 Maspro Denkoh Corp. -0d12 Hansol Electronics, Inc. -0d13 BMF Corp. -0d14 Array Comm, Inc. -0d15 OnStream b.v. -0d16 Hi-Touch Imaging Technologies Co., Ltd - 0001 PhotoShuttle - 0002 Photo Printer 730 series - 0004 Photo Printer 63xPL/PS - 0100 Photo Printer 63xPL/PS - 0102 Photo Printer 64xPS - 0103 Photo Printer 730 series - 0104 Photo Printer 63xPL/PS - 0105 Photo Printer 64xPS - 0200 Photo Printer 64xDL -0d17 NALTEC, Inc. -0d18 coaXmedia -0d19 Hank Connection Industrial Co., Ltd -0d28 NXP - 0204 LPC1768 -0d32 Leo Hui Electric Wire & Cable Co., Ltd -0d33 AirSpeak, Inc. -0d34 Rearden Steel Technologies -0d35 Dah Kun Co., Ltd -0d3a Posiflex Technologies, Inc. -0d3c Sri Cable Technology, Ltd -0d3d Tangtop Technology Co., Ltd - 0001 HID Keyboard -0d3e Fitcom, inc. -0d3f MTS Systems Corp. -0d40 Ascor, Inc. -0d41 Ta Yun Terminals Industrial Co., Ltd -0d42 Full Der Co., Ltd -0d46 Kobil Systems GmbH - 2012 KAAN Standard Plus (Smartcard reader) - 3003 mIDentity Light / KAAN SIM III - 4000 mIDentity (mass storage) - 4001 mIDentity Basic/Classic (composite device) - 4081 mIDentity Basic/Classic (installationless) -0d49 Maxtor - 3000 Drive - 3010 3000LE Drive - 3100 Hi-Speed USB-IDE Bridge Controller - 3200 Personal Storage 3200 - 5000 5000XT Drive - 5010 5000LE Drive - 5020 Mobile Hard Disk Drive - 7000 OneTouch - 7010 OneTouch - 7410 Mobile Hard Disk Drive (1TB) - 7450 Basics Portable USB Device -0d4a NF Corp. -0d4b Grape Systems, Inc. -0d4c Tedas AG -0d4d Coherent, Inc. -0d4e Agere Systems Netherland BV - 047a WLAN Card - 1000 Wireless Card Model 0801 - 1001 Wireless Card Model 0802 -0d4f EADS Airbus France -0d50 Cleware GmbH - 0011 USB-Temp2 Thermometer -0d51 Volex (Asia) Pte., Ltd -0d53 HMI Co., Ltd -0d54 Holon Corp. -0d55 ASKA Technologies, Inc. -0d56 AVLAB Technology, Inc. -0d57 Solomon Microtech, Ltd -0d5c SMC Networks, Inc. - a001 SMC2662W (v1) EZ Connect 802.11b Wireless Adapter [Atmel AT76C503A] - a002 SMC2662W v2 / SMC2662W-AR / Belkin F5D6050 [Atmel at76c503a] -0d5e Myacom, Ltd - 2346 BT Digital Access adapter -0d5f CSI, Inc. -0d60 IVL Technologies, Ltd -0d61 Meilu Electronics (Shenzhen) Co., Ltd -0d62 Darfon Electronics Corp. - 0003 Smartcard Reader - 0004 Filter Driver - 001c Benq X120 Internet Keyboard Pro - 0306 M530 Mouse - 0800 Magic Wheel - 2021 AM805 Keyboard - 2026 TECOM Bluetooth Device - 2050 Mouse - 2106 Dell L20U Multimedia Keyboard - a100 Optical Mouse -0d63 Fritz Gegauf AG -0d64 DXG Technology Corp. - 0105 Dual Mode Digital Camera 1.3M - 0107 Horus MT-409 Camera - 0108 Dual Mode Digital Camera - 0202 Dual Mode Video Camera Device - 0303 DXG-305V Camera - 1001 SiPix Stylecam/UMAX AstraPix 320s - 1002 Fashion Cam 01 Dual-Mode DSC (Video Camera) - 1003 Fashion Cam Dual-Mode DSC (Controller) - 1021 D-Link DSC 350F - 1208 Dual Mode Still Camera Device - 2208 Mass Storage - 3105 Dual Mode Digital Camera Disk - 3108 Digicam Mass Storage Device -0d65 KMJP Co., Ltd -0d66 TMT -0d67 Advanet, Inc. -0d68 Super Link Electronics Co., Ltd -0d69 NSI -0d6a Megapower International Corp. -0d6b And-Or Logic -0d70 Try Computer Co., Ltd -0d71 Hirakawa Hewtech Corp. -0d72 Winmate Communication, Inc. -0d73 Hit's Communications, Inc. -0d76 MFP Korea, Inc. -0d77 Power Sentry/Newpoint -0d78 Japan Distributor Corp. -0d7a MARX Datentechnik GmbH -0d7b Wellco Technology Co., Ltd -0d7c Taiwan Line Tek Electronic Co., Ltd -0d7d Phison Electronics Corp. - 0100 PS1001/1011/1006/1026 Flash Disk - 0110 Gigabyte FlexDrive - 0120 Disk Pro 64MB - 0124 GIGABYTE Disk - 0240 I/O-Magic/Transcend 6-in-1 Card Reader - 110e NEC uPD720121/130 USB-ATA/ATAPI Bridge - 1240 Apacer 6-in-1 Card Reader 2.0 - 1270 Wolverine SixPac 6000 - 1300 Flash Disk - 1320 PS2031 Flash Disk - 1400 Attache 256MB USB 2.0 Flash Drive - 1420 PS2044 Pen Drive - 1470 Vosonic X's-Drive II+ VP2160 - 1620 USB Disk Pro - 1900 USB Thumb Drive -0d7e American Computer & Digital Components - 2507 Hi-Speed USB-to-IDE Bridge Controller - 2517 Hi-Speed Mass Storage Device - 25c7 Hi-Speed USB-to-IDE Bridge Controller -0d7f Essential Reality LLC - 0100 P5 Glove glove controller -0d80 H.R. Silvine Electronics, Inc. -0d81 TechnoVision -0d83 Think Outside, Inc. -0d87 Dolby Laboratories Inc. -0d89 Oz Software -0d8a King Jim Co., Ltd - 0101 TEPRA PRO -0d8b Ascom Telecommunications, Ltd -0d8c C-Media Electronics, Inc. - 0001 Audio Device - 0002 Composite Device - 0003 Sound Device - 0006 Storm HP-USB500 5.1 Headset - 000c Audio Adapter - 000d Composite Device - 000e Audio Adapter (Planet UP-100, Genius G-Talk) - 001f CM108 Audio Controller - 0102 CM106 Like Sound Device - 0103 CM102-A+/102S+ Audio Controller - 0104 CM103+ Audio Controller - 0105 CM108 Audio Controller - 0107 CM108 Audio Controller - 010f CM108 Audio Controller - 0115 CM108 Audio Controller - 0201 CM6501 - 5000 Mass Storage Controller - 5200 Mass Storage Controller(0D8C,5200) - b213 USB Phone CM109 (aka CT2000,VPT1000) -0d8d Promotion & Display Technology, Ltd - 0234 V-234 Composite Device - 0550 V-550 Composite Device - 0551 V-551 Composite Device - 0552 V-552 Composite Device - 0651 V-651 Composite Device - 0652 V-652 Composite Device - 0653 V-653 Composite Device - 0654 V-654 Composite Device - 0655 V-655 Composite Device - 0656 V-656 Composite Device - 0657 V-657 Composite Device - 0658 V-658 Composite Device - 0659 V-659 Composite Device - 0660 V-660 Composite Device - 0661 V-661 Composite Device - 0662 V-662 Composite Device - 0850 V-850 Composite Device - 0851 V-851 Composite Device - 0852 V-852 Composite Device - 0901 V-901 Composite Device - 0902 V-902 Composite Device - 0903 V-903 Composite Device - 4754 Voyager DMP Composite Device - bb00 Bloomberg Composite Device - bb01 Bloomberg Composite Device - bb02 Bloomberg Composite Device - bb03 Bloomberg Composite Device - bb04 Bloomberg Composite Device - bb05 Bloomberg Composite Device - fffe Global Tuner Composite Device - ffff Voyager DMP Composite Device -0d8e Global Sun Technology, Inc. - 0163 802.11g 54 Mbps Wireless Dongle - 1621 802.11b Wireless Adapter - 3762 Cohiba 802.11g Wireless Mini adapter [Intersil ISL3887] - 3763 802.11g Wireless dongle - 7100 802.11b Adapter - 7110 WL-210 / WU210P 802.11b Wireless Adapter [Atmel AT76C503A] - 7605 TRENDnet TEW-224UB 802.11b Wireless Adapter [Atmel AT76C503A] - 7801 AR5523 - 7802 AR5523 (no firmware) - 7811 AR5523 - 7812 AR5523 (no firmware) - 7a01 PRISM25 802.11b Adapter -0d8f Pitney Bowes -0d90 Sure-Fire Electrical Corp. -0d96 Skanhex Technology, Inc. - 0000 Jenoptik JD350 video - 3300 SX330z Camera - 4100 SX410z Camera - 4102 MD 9700 Camera - 4104 Jenoptik JD-4100z3s - 410a Medion 9801/Novatech SX-410z - 5200 SX-520z Camera -0d97 Santa Barbara Instrument Group - 0001 SBIG Astronomy Camera (without firmware) - 0101 SBIG Astronomy Camera (with firmware) -0d98 Mars Semiconductor Corp. - 0300 Avaya Wireless Card -0d99 Trazer Technologies, Inc. -0d9a RTX Telecom AS - 0001 Bluetooth Device -0d9b Tat Shing Electrical Co. -0d9c Chee Chen Hi-Technology Co., Ltd -0d9d Sanwa Supply, Inc. -0d9e Avaya - 0300 Wireless Card -0d9f Powercom Co., Ltd - 0001 Uninterruptible Power Supply - 0002 Black Knight PRO / WOW Uninterruptible Power Supply (Cypress HID->COM RS232) - 00a2 Imperial Uninterruptible Power Supply (HID PDC) - 00a3 Smart King PRO Uninterruptible Power Supply (HID PDC) - 00a4 WOW Uninterruptible Power Supply (HID PDC) - 00a5 Vanguard Uninterruptible Power Supply (HID PDC) - 00a6 Black Knight PRO Uninterruptible Power Supply (HID PDC) -0da0 Danger Research -0da1 Suzhou Peter's Precise Industrial Co., Ltd -0da2 Land Instruments International, Ltd -0da3 Nippon Electro-Sensory Devices Corp. -0da4 Polar Electro OY - 0001 Interface -0da7 IOGear, Inc. -0da8 softDSP Co., Ltd - 0001 SDS 200A Oscilloscope -0dab Cubig Group - 0100 DVR/CVR-M140 MP3 Player -0dad Westover Scientific -0db0 Micro Star International - 1020 PC2PC WLAN Card - 1967 Bluetooth Dongle - 3801 Motorola Bluetooth 2.1+EDR Device - 4011 Medion Flash XL V2.0 Card Reader - 4600 802.11b/g Turbo Wireless Adapter - 5501 Mass Storage Device - 5502 Mass Storage Device - 5513 MP3 Player - 5515 MP3 Player - 5516 MP3 Player - 5580 Mega Sky 580 DVB-T Tuner [M902x] - 5581 Mega Sky 580 DVB-T Tuner [GL861] - 6823 UB11B/MS-6823 802.11b Wi-Fi adapter - 6826 IEEE 802.11g Wireless Network Adapter - 6855 Bluetooth Device - 6861 MSI-6861 802.11g WiFi adapter - 6865 RT2570 - 6869 RT2570 - 6874 RT2573 - 6877 RT2573 - 6881 Bluetooth Class I EDR Device - 688a Bluetooth Class I EDR Device - 6899 802.11bgn 1T1R Mini Card Wireless Adapter - 6970 MS-6970 BToes Bluetooth adapter - 697a Bluetooth Dongle - 6982 Medion Flash XL Card Reader - a861 RT2573 - a874 RT2573 - a970 Bluetooth dongle - a97a Bluetooth EDR Device - b970 Bluetooth EDR Device - b97a Bluetooth EDR Device -0db1 Wen Te Electronics Co., Ltd -0db2 Shian Hwi Plug Parts, Plastic Factory -0db3 Tekram Technology Co., Ltd -0db4 Chung Fu Chen Yeh Enterprise Corp. -0db7 ELCON Systemtechnik - 0002 Goldpfeil P-LAN -0dbc A&D Medical - 0003 AND Serial Cable [AND Smart Cable] -0dbe Jiuh Shiuh Precision Industry Co., Ltd -0dbf Jess-Link International - 0002 SmartDongle Security Key - 0200 HDD Storage Solution - 021b USB-2.0 IDE Adapter - 0300 Storage Adapter - 0333 Storage Adapter - 0707 ZIV Drive -0dc0 G7 Solutions (formerly Great Notions) -0dc1 Tamagawa Seiki Co., Ltd -0dc3 Athena Smartcard Solutions, Inc. - 0801 ASEDrive III - 0802 ASEDrive IIIe - 1104 ASEDrive IIIe KB - 1701 ASEKey - 1702 ASEKey -0dc4 Macpower Peripherals, Ltd - 0040 Mass Storage Device - 0041 Mass Storage Device - 0042 Mass Storage Device - 0101 Hi-Speed Mass Storage Device -0dc5 SDK Co., Ltd -0dc6 Precision Squared Technology Corp. - 2301 Wireless Touchpad Keyboard -0dc7 First Cable Line, Inc. -0dcd NetworkFab Corp. - 0001 Remote Interface Adapter - 0002 High Bandwidth Codec -0dd0 Access Solutions - 1002 Triple Talk Speech Synthesizer -0dd1 Contek Electronics Co., Ltd -0dd2 Power Quotient International Co., Ltd - 0003 Mass Storage (P) -0dd3 MediaQ -0dd4 Custom Engineering SPA -0dd5 California Micro Devices -0dd7 Kocom Co., Ltd -0dd8 Netac Technology Co., Ltd - 1060 USB-CF-Card - e007 OnlyDisk U222 Pendrive - f607 OnlyDisk U208 1G flash drive [U-SAFE] -0dd9 HighSpeed Surfing -0dda Integrated Circuit Solution, Inc. - 0001 Multi-Card Reader 6in1 - 0002 Multi-Card Reader 7in1 - 0003 Flash Disk - 0005 Internal Multi-Card Reader 6in1 - 0008 SD single card reader - 0009 MS single card reader - 000a MS+SD Dual Card Reader - 000b SM single card reader - 0101 All-In-One Card Reader - 0102 All-In-One Card Reader - 0301 MP3 Player - 0302 Multi-Card MP3 Player - 1001 Multi-Flash Disk - 2001 Multi-Card Reader - 2002 Q018 default PID - 2003 Multi-Card Reader - 2005 Datalux DLX-1611 16in1 Card Reader - 2006 All-In-One Card Reader - 2007 USB to ATAPI bridge - 2008 All-In-One Card Reader - 2013 SD/MS Combo Card Reader - 2014 SD/MS Single Card Reader - 2023 card reader SD/MS DEMO board with ICSI brand name (MaskROM version) - 2024 card reader SD/MS DEMO board with Generic brand name (MaskROM version) - 2026 USB2.0 Card Reader - 2027 USB 2.0 Card Reader - 2315 UFD MP3 player (model 2) - 2318 UFD MP3 player (model 1) - 2321 UFD MP3 player -0ddb Tamarack, Inc. -0ddd Datelink Technology Co., Ltd -0dde Ubicom, Inc. -0de0 BD Consumer Healthcare -0dea UTECH Electronic (D.G.) Co., Ltd. -0ded Novasonics -0dee Lifetime Memory Products - 4010 Storage Adapter -0def Full Rise Electronic Co., Ltd -0df4 NET&SYS - 0201 MNG-2005 -0df6 Sitecom Europe B.V. - 0001 C-Media VOIP Device - 0004 Bluetooth 2.0 Adapter 100m - 0007 Bluetooth 2.0 Adapter 10m - 000b Bluetooth 2.0 Adapter DFU - 000d WL-168 Wireless Network Adapter 54g - 0017 WL-182 Wireless-N Network USB Card - 0019 Bluetooth 2.0 adapter 10m CN-512v2 001 - 001a Bluetooth 2.0 adapter 100m CN-521v2 001 - 002b WL-188 Wireless Network 300N USB Adapter - 002c WL-301 Wireless Network 300N USB Adapter - 002d WL-302 Wireless Network 300N USB dongle - 0036 WL-603 Wireless Adapter - 0039 WL-315 Wireless-N USB Adapter - 003b WL-321 Wireless USB Gaming Adapter 300N - 003c WL-323 Wireless-N USB Adapter - 003d WL-324 Wireless USB Adapter 300N - 003e WL-343 Wireless USB Adapter 150N X1 - 003f WL-608 Wireless USB Adapter 54g - 0040 WL-344 Wireless Adapter 300N X2 [Ralink RT3071] - 0041 WL-329 Wireless Dualband USB adapter 300N - 0042 WL-345 Wireless USB adapter 300N X3 - 0045 WL-353 Wireless USB Adapter 150N Nano - 0047 WL-352v1 Wireless USB Adapter 300N 002 - 0048 WL-349v1 Wireless Adapter 150N 002 [Ralink RT3070] - 004a WL-358v1 Wireless Micro USB Adapter 300N X3 002 - 004b WL-349v3 Wireless Micro Adapter 150N X1 [Realtek RTL8192SU] - 004c WL-352 802.11n Adapter [Realtek RTL8191SU] - 0050 WL-349v4 Wireless Micro Adapter 150N X1 [Ralink RT3370] - 061c LN-028 Network USB 2.0 Adapter - 21f4 44 St Bluetooth Device - 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 WL-113 rev 1 Wireless Network USB Adapter - 9075 WL-117 Hi-Speed USB Adapter - 90ac WL-172 Wireless Network USB Adapter 54g Turbo - 9712 WL-113 rev 2 Wireless Network USB Adapter -0df7 Mobile Action Technology, Inc. - 0620 MA-620 Infrared Adapter - 0700 MA-700 Bluetooth Adapter - 0720 MA-720 Bluetooth Adapter - 0722 Bluetooth Dongle - 0730 MA-730/MA-730G Bluetooth Adapter - 0800 Data Cable - 0820 Data Cable - 0900 MA i-gotU Travel Logger GPS - 1800 Generic Card Reader - 1802 Card Reader -0dfa Toyo Communication Equipment Co., Ltd -0dfc GeneralTouch Technology Co., Ltd - 0001 Touchscreen -0e03 Nippon Systemware Co., Ltd -0e08 Winbest Technology Co., Ltd -0e0b Amigo Technology Inc. - 9031 802.11n Wireless USB Card - 9041 802.11n Wireless USB Card -0e0c Gesytec - 0101 LonUSB LonTalk Network Adapter -0e0f VMware, Inc. - 0001 Device - 0002 Virtual USB Hub - 0003 Virtual Mouse - 0004 Virtual CCID - 0005 Virtual Mass Storage - 0006 Virtual Keyboard - f80a Smoker FX2 -0e16 JMTek, LLC -0e17 Walex Electronic, Ltd -0e1b Crewave -0e20 Pegasus Technologies Ltd. - 0101 NoteTaker -0e21 Cowon Systems, Inc. - 0300 iAudio CW200 - 0400 MP3 Player - 0500 iAudio M3 - 0510 iAudio X5, subpack USB port - 0513 iAudio X5, side USB port - 0520 iAudio M5, side USB port - 0601 iAudio G3 - 0700 iAudio U3 - 0751 iAudio 7 - 0760 iAUDIO U5 / iAUDIO G2 - 0800 Cowon D2 (UMS mode) - 0801 Cowon D2 (MTP mode) - 0910 iAUDIO 9 - 0920 J3 -0e22 Symbian Ltd. -0e23 Liou Yuane Enterprise Co., Ltd -0e25 VinChip Systems, Inc. -0e26 J-Phone East Co., Ltd -0e30 HeartMath LLC -0e34 Micro Computer Control Corp. -0e35 3Pea Technologies, Inc. -0e36 TiePie engineering - 0008 Handyscope HS3 - 0009 Handyscope HS3 (br) - 000a Handyscope HS4 - 000b Handyscope HS4 (br) - 000e Handyscope HS4-DIFF - 000f Handyscope HS4-DIFF (br) - 0010 Handyscope HS2 - 0011 TiePieSCOPE HS805 (br) - 0012 TiePieSCOPE HS805 - 0018 Handyprobe HP2 - 0042 TiePieSCOPE HS801 - 00fd USB To Parallel adapter - 00fe USB To Parallel adapter -0e38 Stratitec, Inc. -0e39 Smart Modular Technologies, Inc. - 0137 Bluetooth Device -0e3a Neostar Technology Co., Ltd - 1100 CW-1100 Wireless Network Adapter -0e3b Mansella, Ltd -0e41 Line6, Inc. - 4147 TonePort GX - 4250 BassPODxt - 4252 BassPODxt Pro - 4642 BassPODxt Live - 4650 PODxt Live - 4750 GuitarPort - 5044 PODxt - 5050 PODxt Pro - 534d SeaMonkey -0e44 Sun-Riseful Technology Co., Ltd. -0e48 Julia Corp., Ltd - 0100 CardPro SmartCard Reader -0e4a Shenzhen Bao Hing Electric Wire & Cable Mfr. Co. -0e4c Radica Games, Ltd - 1097 Gamester Controller - 2390 Games Jtech Controller - 7288 funkey reader -0e55 Speed Dragon Multimedia, Ltd - 110a Tanic S110-SG1 + ISSC IS1002N [Slow Infra-Red (SIR) & Bluetooth 1.2 (Class 2) Adapter] - 110b MS3303H USB-to-Serial Bridge -0e56 Kingston Technology Company, Inc. - 6021 K-PEX 100 -0e5a Active Co., Ltd -0e5b Union Power Information Industrial Co., Ltd -0e5c Bitland Information Technology Co., Ltd - 6118 LCD Device - 6119 remote receive and control device - 6441 C-Media Sound Device -0e5d Neltron Industrial Co., Ltd -0e5e Conwise Technology Co., Ltd. - 6622 CW6622 -0e66 Hawking Technologies - 0001 HWUN1 Hi-Gain Wireless-300N Adapter w/ Upgradable Antenna [Ralink RT2870] - 0003 HWDN1 Hi-Gain Wireless-300N Dish Adapter [Ralink RT2870] - 0009 HWUN2 Hi-Gain Wireless-150N Adapter w/ Upgradable Antenna [Ralink RT2770] - 000b HWDN2 Hi-Gain Wireless-150N Dish Adapter [Ralink RT2770] - 0013 HWUN3 Hi-Gain Wireless-N Adapter [Ralink RT3070] - 0017 HAWNU1 Hi-Gain Wireless-150N Network Adapter with Range Amplifier [Ralink RT3070] - 0018 Wireless-N Network Adapter [Ralink RT2870] - 400b UF100 10/100 Network Adapter - 400c UF100 Ethernet [pegasus2] -0e67 Fossil, Inc. - 0002 Wrist PDA -0e6a Megawin Technology Co., Ltd - 0101 MA100 [USB-UART Bridge IC] - 6001 GEMBIRD Flexible keyboard KB-109F-B-DE -0e6f Logic3 - 0003 Freebird wireless Controller - 0005 Eclipse wireless Controller - 0006 Edge wireless Controller -0e70 Tokyo Electronic Industry Co., Ltd -0e72 Hsi-Chin Electronics Co., Ltd -0e75 TVS Electronics, Ltd -0e79 Archos, Inc. - 1106 Pocket Media Assistant - PMA400 - 1204 Gmini XS 200 - 1306 504 Portable Multimedia Player - 1330 5 Tablet - 1332 5 IMT - 1416 32 IT -0e7b On-Tech Industry Co., Ltd -0e7e Gmate, Inc. - 0001 Yopy 3000 PDA - 1001 YP3X00 PDA -0e82 Ching Tai Electric Wire & Cable Co., Ltd -0e83 Shin An Wire & Cable Co. -0e8c Well Force Electronic Co., Ltd -0e8d MediaTek Inc. - 0003 MT6227 phone - 0004 MT6227 phone -0e8f GreenAsia Inc. - 0003 MaxFire Blaze2 - 0012 USB Wireless 2.4GHz Gamepad - 0016 4 port USB 1.1 hub UH-174 - 0020 USB to PS/2 Adapter - 0021 Multimedia Keyboard Controller - 0201 SmartJoy Frag Xpad/PS2 adaptor -0e90 WiebeTech, LLC - 0100 Storage Adapter V1 -0e91 VTech Engineering Canada, Ltd -0e92 C's Glory Enterprise Co., Ltd -0e93 eM Technics Co., Ltd -0e95 Future Technology Co., Ltd -0e96 Aplux Communications, Ltd - c001 TRUST 380 USB2 SPACEC@M -0e97 Fingerworks, Inc. - 0908 Composite HID (Keyboard and Mouse) -0e98 Advanced Analogic Technologies, Inc. -0e99 Parallel Dice Co., Ltd -0e9a TA HSING Industries, Ltd -0e9b ADTEC Corp. -0e9c Streamzap, Inc. - 0000 Streamzap Remote Control -0e9f Tamura Corp. -0ea0 Ours Technology, Inc. - 2126 7-in-1 Card Reader - 2153 SD Card Reader Key - 2168 Transcend JetFlash 2.0 / Astone USB Drive - 6803 OTI-6803 Flash Disk - 6808 OTI-6808 Flash Disk - 6828 OTI-6828 Flash Disk -0ea6 Nihon Computer Co., Ltd -0ea7 MSL Enterprises Corp. -0ea8 CenDyne, Inc. -0ead Humax Co., Ltd -0eb0 NovaTech - 9020 NovaTech NV-902W - 9021 RT2573 -0eb1 WIS Technologies, Inc. - 6666 WinFast WalkieTV TV Loader - 6668 WinFast WalkieTV TV Loader - 7007 WinFast WalkieTV WDM Capture -0eb2 Y-S Electronic Co., Ltd -0eb3 Saint Technology Corp. -0eb7 Endor AG -0ebe VWeb Corp. -0ebf Omega Technology of Taiwan, Inc. -0ec0 LHI Technology (China) Co., Ltd -0ec1 Abit Computer Corp. -0ec2 Sweetray Industrial, Ltd -0ec3 Axell Co., Ltd -0ec4 Ballracing Developments, Ltd -0ec5 GT Information System Co., Ltd -0ec6 InnoVISION Multimedia, Ltd -0ec7 Theta Link Corp. - 1008 So., Show 301 Digital Camera -0ecd Lite-On IT Corp. - 1400 CD\RW 40X - a100 LDW-411SX DVD/CD Rewritable Drive -0ece TaiSol Electronics Co., Ltd -0ecf Phogenix Imaging, LLC -0ed1 WinMaxGroup - 6660 Flash Disk 64M-C - 6680 Flash Disk 64M-B - 7634 MP3 Player -0ed2 Kyoto Micro Computer Co., Ltd -0ed3 Wing-Tech Enterprise Co., Ltd -0ed5 Fiberbyte - e000 USB-inSync Device - f000 Fiberbyte USB-inSync Device - f201 Fiberbyte USB-inSync DAQ-2500X -0eda Noriake Itron Corp. -0edf e-MDT Co., Ltd - 2060 FID irock! 100 Series -0ee0 Shima Seiki Mfg., Ltd -0ee1 Sarotech Co., Ltd -0ee2 AMI Semiconductor, Inc. -0ee3 ComTrue Technology Corp. - 1000 Image Tank 1.5 -0ee4 Sunrich Technology, Ltd -0eee Digital Stream Technology, Inc. - 8810 Mass Storage Drive -0eef D-WAV Scientific Co., Ltd - 0001 eGalax TouchScreen - 0002 Touchscreen Controller(Professional) -0ef0 Hitachi Cable, Ltd -0ef1 Aichi Micro Intelligent Corp. -0ef2 I/O Magic Corp. -0ef3 Lynn Products, Inc. -0ef4 DSI Datotech -0ef5 PointChips - 2202 Flash Disk - 2366 Flash Disk -0ef6 Yield Microelectronics Corp. -0ef7 SM Tech Co., Ltd (Tulip) -0efd Oasis Semiconductor -0efe Wem Technology, Inc. -0f06 Visual Frontier Enterprise Co., Ltd -0f08 CSL Wire & Plug (Shen Zhen) Co. -0f0c CAS Corp. -0f0d Hori Co., Ltd - 0011 Real Arcade Pro 3 -0f0e Energy Full Corp. -0f11 LD Didactic GmbH - 1000 CASSY-S - 1010 Pocket-CASSY - 1020 Mobile-CASSY - 1080 Joule and Wattmeter - 1081 Digital Multimeter P - 1090 UMI P - 1100 X-Ray Apparatus - 1101 X-Ray Apparatus - 1200 VideoCom - 2000 COM3LAB - 2010 Terminal Adapter - 2020 Network Analyser - 2030 Converter Control Unit - 2040 Machine Test System -0f12 Mars Engineering Corp. -0f13 Acetek Technology Co., Ltd -0f18 Finger Lakes Instrumentation - 0002 CCD - 0006 Focuser - 0007 Filter Wheel - 000a ProLine CCD - 000b Color Filter Wheel 4 - 000c PDF2 - 000d Guider -0f19 Oracom Co., Ltd -0f1b Onset Computer Corp. -0f1c Funai Electric Co., Ltd -0f1d Iwill Corp. -0f21 IOI Technology Corp. -0f22 Senior Industries, Inc. -0f23 Leader Tech Manufacturer Co., Ltd -0f24 Flex-P Industries, Snd., Bhd. -0f2d ViPower, Inc. -0f2e Geniality Maple Technology Co., Ltd -0f2f Priva Design Services -0f30 Jess Technology Co., Ltd - 001c PS3 Guitar Controller Dongle - 0110 Dual Analog Rumble Pad - 0111 Colour Rumble Pad - 0208 Xbox & PC Gamepad -0f31 Chrysalis Development -0f32 YFC-BonEagle Electric Co., Ltd -0f37 Kokuyo Co., Ltd -0f38 Nien-Yi Industrial Corp. -0f3d Airprime, Incorporated - 0112 CDMA 1xEVDO PC Card, PC 5220 -0f41 RDC Semiconductor Co., Ltd -0f42 Nital Consulting Services, Inc. -0f44 Polhemus - ef11 Patriot (firmware not loaded) - ef12 Patriot - ff11 Liberty (firmware not loaded) - ff12 Liberty -0f4b St. John Technology Co., Ltd -0f4c WorldWide Cable Opto Corp. -0f4d Microtune, Inc. - 1000 Bluetooth Dongle -0f4e Freedom Scientific -0f52 Wing Key Electrical Co., Ltd -0f53 Dongguan White Horse Cable Factory, Ltd -0f54 Kawai Musical Instruments Mfg. Co., Ltd -0f55 AmbiCom, Inc. -0f5c Prairiecomm, Inc. -0f5d NewAge International, LLC - 9455 Compact Drive -0f5f Key Technology Corp. -0f60 NTK, Ltd -0f61 Varian, Inc. -0f62 Acrox Technologies Co., Ltd - 1001 Targus Mini Trackball Optical Mouse -0f63 LeapFrog Enterprises - 0010 Leapster Explorer - 0500 Fly Fusion - 0600 Leap Port Turbo - 0700 POGO - 0800 Didj - 0900 TAGSchool - 0a00 Leapster 2 - 0b00 Crammer - 0c00 Tag Jr - 0d00 My Pal Scout - 0e00 Tag32 - 0f00 Tag64 - 1000 Kiwi16 - 1100 Leapster L2x - 1111 Fly Fusion - 1300 Didj UK/France (Leapster Advance) -0f68 Kobe Steel, Ltd -0f69 Dionex Corp. -0f6a Vibren Technologies, Inc. -0f6e INTELLIGENT SYSTEMS - 0100 GameBoy Color Emulator - 0201 GameBoy Advance Flash Gang Writer - 0202 GameBoy Advance Capture - 0300 Gamecube DOL Viewer - 0400 NDS Emulator - 0401 NDS UIC - 0402 NDS Writer - 0403 NDS Capture - 0404 NDS Emulator (Lite) -0f73 DFI -0f7c DQ Technology, Inc. -0f7d NetBotz, Inc. -0f7e Fluke Corp. -0f88 VTech Holdings, Ltd - 3012 RT2570 - 3014 ZD1211B -0f8b Yazaki Corp. -0f8c Young Generation International Corp. -0f8d Uniwill Computer Corp. -0f8e Kingnet Technology Co., Ltd -0f8f Soma Networks -0f97 CviLux Corp. -0f98 CyberBank Corp. -0f9c Hyun Won, Inc. - 0301 M-Any Premium DAH-610 MP3/WMA Player - 0332 mobiBLU DAH-1200 MP3/Ogg Player -0f9e Lucent Technologies -0fa3 Starconn Electronic Co., Ltd -0fa4 ATL Technology -0fa5 Sotec Co., Ltd -0fa7 Epox Computer Co., Ltd -0fa8 Logic Controls, Inc. -0faf Winpoint Electronic Corp. -0fb0 Haurtian Wire & Cable Co., Ltd -0fb1 Inclose Design, Inc. -0fb2 Juan-Chern Industrial Co., Ltd -0fb8 Wistron Corp. - 0002 eHome Infrared Receiver -0fb9 AACom Corp. -0fba San Shing Electronics Co., Ltd -0fbb Bitwise Systems, Inc. -0fc1 Mitac Internatinal Corp. -0fc2 Plug and Jack Industrial, Inc. -0fc5 Delcom Engineering - 1222 I/O Development Board -0fc6 Dataplus Supplies, Inc. -0fca Research In Motion, Ltd. - 0001 Blackberry Handheld - 0004 Blackberry Handheld - 0006 Blackberry Pearl - 0008 Blackberry Pearl - 8001 Blackberry Handheld - 8004 Blackberry Handheld - 8007 Blackberry Handheld -0fce Sony Ericsson Mobile Communications AB - 0076 W910i (Multimedia mode) - 00af V640i Phone [PTP Camera] - 00d4 C902 [MTP] - 00d9 C702 Phone - 0112 W995 Walkman Phone - 1010 WMC Modem - 10af V640i Phone [PictBridge] - 10d4 C902 Phone [PictBridge] - 2105 W715 Phone - 2137 Xperia X10 mini (USB debug) - 2138 Xperia X10 mini pro (Debug) - 2149 Xperia X8 (debug) - 3137 Xperia X10 mini - 3138 Xperia X10 mini pro - 3149 Xperia X8 - 8004 9000 Phone [Mass Storage] - d008 V800-Vodafone 802SE Phone - d016 K750i Phone - d017 K608i Phone - d019 VDC EGPRS Modem - d025 520 WMC Data Modem - d028 W800i - d038 W850i Phone - d039 K800i (phone mode) - d041 K510i Phone - d042 W810i Phone - d043 V630i Phone - d046 K610i Phone - d065 W960i Phone (PC Suite) - d076 W910i (Phone mode) - d089 W580i Phone (mass storage) - d0af V640i Phone - d0cf MD300 Mobile Broadband Modem - d0d4 C902 Phone [Modem] - d0e1 MD400 Mobile Broadband Modem - d12e Xperia X10 - e039 K800i (msc mode) - e042 W810i Phone - e043 V630i Phone [Mass Storage] - e075 K850i - e076 W910i (Mass storage) - e089 W580i Phone - e090 W200 Phone (Mass Storage) - e0a3 W660i - e0af V640i Phone [Mass Storage] - e0d4 C902 Phone [Mass Storage] - e0ef C905 Phone [Mass Storage] - e0f3 W595 - e112 W995 Phone (Mass Storage) - e12e X10i Phone - e14f Xperia Arc -0fcf Dynastream Innovations, Inc. -0fd0 Tulip Computers B.V. -0fd1 Giant Electronics Ltd. -0fd4 Tenovis GmbH & Co., KG -0fd5 Direct Access Technology, Inc. -0fd9 Elgato Systems GmbH - 0011 EyeTV Diversity - 0018 EyeTV Hybrid - 0020 EyeTV DTT Deluxe - 0021 EyeTV DTT - 002a EyeTV Sat - 002c EyeTV DTT Deluxe v2 - 0033 Video Capture - 0037 Video Capture v2 -0fdc Micro Plus -0fe4 IN-Tech Electronics, Ltd -0fe5 Greenconn (U.S.A.), Inc. -0fe6 Kontron (Industrial Computer Source / ICS Advent) - 8101 DM9601 Fast Ethernet Adapter - 811e Parallel Adapter - 9700 DM9601 Fast Ethernet Adapter -0fe9 DVICO - 4020 TViX M-6500 - db00 FusionHDTV DVB-T (MT352+LgZ201) (uninitialized) - db01 FusionHDTV DVB-T (MT352+LgZ201) (initialized) - db10 FusionHDTV DVB-T (MT352+Thomson7579) (uninitialized) - db11 FusionHDTV DVB-T (MT352+Thomson7579) (initialized) - db78 FusionHDTV DVB-T Dual Digital 4 (ZL10353+xc2028/xc3028) (initialized) -0fea United Computer Accessories -0feb CRS Electronic Co., Ltd -0fec UMC Electronics Co., Ltd -0fed Access Co., Ltd -0fee Xsido Corp. -0fef MJ Research, Inc. -0ff6 Core Valley Co., Ltd -0ff7 CHI SHING Computer Accessories Co., Ltd -0fff Aopen, Inc. -1000 Speed Tech Corp. -1001 Ritronics Components (S) Pte., Ltd -1003 Sigma Corp. - 0003 SD14 - 0100 Sigma SD10 -1004 LG Electronics, Inc. - 1fae U8120 3G Cellphone - 6000 KU330/KU990/VX4400/VX6000 - 6005 T5100 - 6018 GM360/GD510/GW520/KP501 - 618e Ally/Optimus One/Vortex (debug mode) - 618f Ally/Optimus One - 61c6 Vortex (msc) - 6800 CDMA Modem - 7000 LG LDP-7024D(LD)USB - a400 Renoir (KC910) -1005 Apacer Technology, Inc. - 1001 MP3 Player - 1004 MP3 Player - 1006 MP3 Player - b113 Handy Steno 2.0/HT203 - b223 CD-RW + 6in1 Card Reader Digital Storage / Converter -1006 iRiver, Ltd. - 3001 iHP-100 - 3002 iHP-120/140 MP3 Player - 3003 H320/H340 - 3004 H340 (mtp) -1009 Emuzed, Inc. - 000e eHome Infrared Receiver - 0013 Angel MPEG Device - 0015 Lumanate Wave PAL SECAM DVBT Device - 0016 Lumanate Wave NTSC/ATSC Combo Device -100a AV Chaseway, Ltd - 2402 MP3 Player - 2404 MP3 Player - 2405 MP3 Player - 2406 MP3 Player - a0c0 MP3 Player -100b Chou Chin Industrial Co., Ltd -100d Netopia, Inc. - 3342 Cayman 3352 DSL Modem - 3382 3380 Series Network Interface - 6072 DSL Modem - 9031 Motorola 802.11n Dualband USB Wireless Adapter - 9032 Motorola 802.11n 5G USB Wireless Adapter - cb01 Cayman 3341 Ethernet DSL Router -1010 Fukuda Denshi Co., Ltd -1011 Mobile Media Tech. - 0001 AccFast Mp3 -1012 SDKM Fibres, Wires & Cables Berhad -1013 TST-Touchless Sensor Technology AG -1014 Densitron Technologies PLC -1015 Softronics Pty., Ltd -1016 Xiamen Hung's Enterprise Co., Ltd -1017 Speedy Industrial Supplies, Pte., Ltd -1019 Elitegroup Computer Systems (ECS) - 0c55 Flash Reader, Desknote UCR-61S2B - 0f38 Infrared Receiver -1020 Labtec - 0006 Wireless Keyboard - 000a Wireless Optical Mouse - 0106 Wireless Optical Mouse -1022 Shinko Shoji Co., Ltd -1025 Hyper-Paltek - 005e USB DVB-T device - 005f USB DVB-T device - 0300 MP3 Player - 0350 MP3 Player -1026 Newly Corp. -1027 Time Domain -1028 Inovys Corp. -1029 Atlantic Coast Telesys -102a Ramos Technology Co., Ltd -102b Infotronic America, Inc. -102c Etoms Electronics Corp. - 6151 Q-Cam Sangha CIF - 6251 Q-Cam VGA -102d Winic Corp. -1031 Comax Technology, Inc. -1032 C-One Technology Corp. -1033 Nucam Corp. - 0068 3,5'' HDD case MD-231 -1038 Ideazon, Inc. - 0100 Zboard -1039 devolo AG - 2140 dsl+ 1100 duo -103d Stanton - 0100 ScratchAmp - 0101 ScratchAmp -1043 iCreate Technologies Corp. - 160f Wireless Network Adapter - 4901 AV-836 Video Capture Device - 8006 Flash Disk 32-256 MB - 8012 Flash Disk 256 MB -1044 Chu Yuen Enterprise Co., Ltd - 7001 Gigabyte U7000 DVB-T tuner - 7002 Gigabyte U8000 DVB-T tuner - 7004 Gigabyte U7100 DVB-T tuner - 7005 Gigabyte U7200 DVB-T tuner [AF9035] - 7006 Gigabyte U6000 DVB-T tuner [em2863] - 8001 GN-54G - 8002 GN-BR402W - 8003 GN-WLBM101 - 8004 GN-WLBZ101 802.11b Adapter - 8005 GN-WLBZ201 802.11b Adapter - 8006 GN-WBZB-M 802.11b Adapter - 8007 GN-WBKG - 8008 GN-WB01GS - 800a GN-WI05GS - 800b GN-WB30N 802.11n WLAN Card - 800c GN-WB31N 802.11n USB WLAN Card - 800d GN-WB32L 802.11n USB WLAN Card -1046 Winbond Electronics Corp. [hex] - 6694 Generic W6694 USB - 8901 Bluetooth Device - 9967 W9967CF/W9968CF Webcam IC -1048 Targus Group International -104b Mylex / Buslogic -104c AMCO TEC International, Inc. -104d Newport Corporation - 1003 Model-52 LED Light Source Power Supply and Driver -104f WB Electronics - 0001 Infinity Phoenix - 0002 Smartmouse - 0003 FunProgrammer - 0004 Infinity Unlimited - 0006 Infinity Smart - 0007 Infinity Smart module - 0008 Infinity CryptoKey - 0009 RE-BL PlayStation 3 IR-to-Bluetooth converter -1050 Yubico.com - 0010 Yubikey -1053 Immanuel Electronics Co., Ltd -1054 BMS International Beheer N.V. - 5004 DSL 7420 Loader - 5005 DSL 7420 LAN Modem -1055 Complex Micro Interconnection Co., Ltd -1056 Hsin Chen Ent Co., Ltd -1057 ON Semiconductor -1058 Western Digital Technologies, Inc. - 0200 Firewire USB Combo - 0400 External HDD - 0500 hub - 0702 Passport External HDD - 0704 Passport External HDD - 070a My Passport Essential SE - 071a My Passport 1TB - 0900 MyBook Essential External HDD - 0901 MyBook External HDD - 0903 My Book Premium Edition - 0910 MyBook Essential External HDD - 1001 External Hard Disk [Elements] - 1021 Elements 2TB - 1104 MyBook Mirror Edition External HDD - 1123 My Book 3.0 -1059 Giesecke & Devrient GmbH - 000b StarSign Bio Token 3.0 -105c Hong Ji Electric Wire & Cable (Dongguan) Co., Ltd -105d Delkin Devices, Inc. -105e Valence Semiconductor Design, Ltd -105f Chin Shong Enterprise Co., Ltd -1060 Easthome Industrial Co., Ltd -1063 Motorola Electronics Taiwan, Ltd [hex] - 1555 MC141555 Hub - 4100 SB4100 USB Cable Modem -1065 CCYU Technology - 0020 USB-DVR2 Dev Board - 2136 EasyDisk ED1064 -106a Loyal Legend, Ltd -106c Curitel Communications, Inc. - 1101 CDMA 2000 1xRTT USB modem (HX-550C) - 1102 Packet Service - 1103 Packet Service Diagnostic Serial Port (WDM) - 1104 Packet Service Diagnostic Serial Port (WDM) - 1105 Composite Device - 1106 Packet Service Diagnostic Serial Port (WDM) - 1301 Composite Device - 1302 Packet Service Diagnostic Serial Port (WDM) - 1303 Packet Service - 1304 Packet Service - 1401 Composite Device - 1402 Packet Service - 1403 Packet Service Diagnostic Serial Port (WDM) - 1501 Packet Service - 1502 Packet Service Diagnostic Serial Port (WDM) - 1503 Packet Service - 1601 Packet Service - 1602 Packet Service Diagnostic Serial Port (WDM) - 1603 Packet Service - 2101 AudioVox 8900 Cell Phone - 2102 Packet Service - 2103 Packet Service Diagnostic Serial Port (WDM) - 2301 Packet Service - 2302 Packet Service Diagnostic Serial Port (WDM) - 2303 Packet Service - 2401 Packet Service Diagnostic Serial Port (WDM) - 2402 Packet Service - 2403 Packet Service Diagnostic Serial Port (WDM) - 2501 Packet Service - 2502 Packet Service Diagnostic Serial Port (WDM) - 2503 Packet Service - 2601 Packet Service - 2602 Packet Service Diagnostic Serial Port (WDM) - 2603 Packet Service - 3701 Broadband Wireless modem - 3702 Pantech PX-500 - 3714 PANTECH USB MODEM [UM175] - 3eb4 Packet Service Diagnostic Serial Port (WDM) - 4101 Packet Service Diagnostic Serial Port (WDM) - 4102 Packet Service - 4301 Composite Device - 4302 Packet Service Diagnostic Serial Port (WDM) - 4401 Composite Device - 4402 Packet Service - 4501 Packet Service - 4502 Packet Service Diagnostic Serial Port (WDM) - 4601 Composite Device - 4602 Packet Service Diagnostic Serial Port (WDM) - 5101 Packet Service - 5102 Packet Service Diagnostic Serial Port (WDM) - 5301 Packet Service Diagnostic Serial Port (WDM) - 5302 Packet Service - 5401 Packet Service - 5402 Packet Service Diagnostic Serial Port (WDM) - 5501 Packet Service Diagnostic Serial Port (WDM) - 5502 Packet Service - 5601 Packet Service Diagnostic Serial Port (WDM) - 5602 Packet Service - 7101 Composite Device - 7102 Packet Service - a000 Packet Service - a001 Packet Service Diagnostic Serial Port (WDM) - c100 Packet Service - c200 Packet Service - c500 Packet Service Diagnostic Serial Port (WDM) - e200 Packet Service -106d San Chieh Manufacturing, Ltd -106e ConectL -106f Money Controls -1076 GCT Semiconductor, Inc. - 0031 Bluetooth Device - 0032 Bluetooth Device -107b Gateway, Inc. - 3009 eHome Infrared Transceiver - 55b2 WBU-110 802.11b Wireless Adapter [Intersil PRISM 3] - 55f2 WGU-210 802.11g Adapter [Intersil ISL3886] -107d Arlec Australia, Ltd -107e Midoriya Electric Co., Ltd -107f KidzMouse, Inc. -1082 Shin-Etsukaken Co., Ltd -1083 Canon Electronics, Inc. - 162c P-150 Scanner -1084 Pantech Co., Ltd -108a Chloride Power Protection -108b Grand-tek Technology Co., Ltd -108c Robert Bosch GmbH -108e Lotes Co., Ltd. -1099 Surface Optics Corp. -109a DATASOFT Systems GmbH -109f eSOL Co., Ltd - 3163 Trigem Mobile SmartDisplay84 - 3164 Trigem Mobile SmartDisplay121 -10a0 Hirotech, Inc. -10a3 Mitsubishi Materials Corp. -10a9 SK Teletech Co., Ltd - 1102 Sky Love Actually IM-U460K - 1104 Sky Vega IM-A650S - 6021 SIRIUS alpha -10aa Cables To Go -10ab USI Co., Ltd - 1002 Bluetooth Device - 1003 BC02-EXT in DFU - 1005 Bluetooth Adptr - 1006 BC04-EXT in DFU - 10c5 Sony-Ericsson / Samsung DataCable -10ac Honeywell, Inc. -10ae Princeton Technology Corp. -10af Liebert Corp. - 0000 UPS - 0001 PowerSure PSA UPS - 0002 PowerSure PST UPS - 0003 PowerSure PSP UPS - 0004 PowerSure PSI UPS - 0005 UPStation GXT 2U UPS - 0006 UPStation GXT UPS - 0007 Nfinity Power Systems UPS - 0008 PowerSure Interactive UPS -10b5 Comodo (PLX?) - 9060 Test Board -10b8 DiBcom - 0bb8 DiBcom USB DVB-T reference design (MOD300) (cold) - 0bb9 DiBcom USB DVB-T reference design (MOD300) (warm) - 0bc6 DiBcom USB2.0 DVB-T reference design (MOD3000P) (cold) - 0bc7 DiBcom USB2.0 DVB-T reference design (MOD3000P) (warm) -10bb TM Technology, Inc. -10bc Dinging Technology Co., Ltd -10bd TMT Technology, Inc. - 1427 Ethernet -10bf SmartHome - 0001 SmartHome PowerLinc -10c4 Cygnal Integrated Products, Inc. - 0002 F32x USBXpress Device - 0003 CommandIR - 8044 USB Debug Adapter - 804e Software Bisque Paramount ME - 80a9 CP210x to UART Bridge Controller - 80ca ATM2400 Sensor Device - 818a Silicon Labs FM Radio Reference Design - 8461 Sangoma U100 - ea60 CP210x Composite Device -10c5 Sanei Electric, Inc. - 819a FM Radio -10c6 Intec, Inc. -10cb Eratech -10cc GBM Connector Co., Ltd - 1101 MP3 Player -10cd Kycon, Inc. -10ce Silicon Labs - ea6a MobiData EDGE USB Modem -10cf Velleman Components, Inc. - 2011 R-Engine MPEG2 encoder/decoder - 5500 8055 Experiment Interface Board (address=0) - 5501 8055 Experiment Interface Board (address=1) - 5502 8055 Experiment Interface Board (address=2) - 5503 8055 Experiment Interface Board (address=3) -10d1 Hottinger Baldwin Measurement - 0101 USB-Module for Spider8, CP32 - 0202 CP22 - Communication Processor - 0301 CP42 - Communication Processor -10d4 Man Boon Manufactory, Ltd -10d5 Uni Class Technology Co., Ltd - 5552 KVM Human Interface Composite Device (Keyboard/Mouse ports) - 55a2 2Port KVMSwitcher -10d6 Actions Semiconductor Co., Ltd - 1000 MP3 Player - 1100 MPMan MP-Ki 128 MP3 Player/Recorder - 1101 D-Wave 2GB MP4 Player / AK1025 MP3/MP4 Player - 2200 Acer MP-120 MP3 player - 8888 ADFU Device - ff51 ADFU Device - ff61 MP4 Player - ff66 Craig 2GB MP3/Video Player -10de Authenex, Inc. -10df In-Win Development, Inc. - 0500 iAPP CR-e500 Card reader -10e0 Post-Op Video, Inc. -10e1 CablePlus, Ltd -10e2 Nada Electronics, Ltd -10ec Vast Technologies, Inc. -10f0 Nexio Co., Ltd - 2002 iNexio Touchscreen controller -10f1 Importek - 1a08 Internal Webcam - 1a1e Laptop Integrated Webcam 1.3M -10f5 Turtle Beach - 0200 Audio Advantage Roadie -10fb Pictos Technologies, Inc. -10fd Anubis Electronics, Ltd - 7e50 FlyCam Usb 100 - 804d Typhoon Webshot II Webcam [zc0301] - 8050 FlyCAM-USB 300 XP2 - de00 WinFast WalkieTV WDM Capture Driver. -1100 VirTouch, Ltd - 0001 VTPlayer VTP-1 Braille Mouse -1101 EasyPass Industrial Co., Ltd - 0001 FSK Electronics Super GSM Reader -1108 Brightcom Technologies, Ltd -110a Moxa Technologies Co., Ltd. - 1250 UPort 1250 2-Port RS-232/422/485 - 1251 UPort 1250I 2-Port RS-232/422/485 with Isolation - 1410 UPort 1410 4-Port RS-232 - 1450 UPort 1450 4-Port RS-232/422/485 - 1451 UPort 1450I 4-Port RS-232/422/485 with Isolation - 1613 UPort 1610-16 16-Port RS-232 - 1618 UPort 1610-8 8-Port RS-232 - 1653 UPort 1650-16 16-Port RS-232/422/485 - 1658 UPort 1650-8 8-Port RS-232/422/485 -1110 Analog Devices Canada, Ltd (Allied Telesyn) - 5c01 Huawei MT-882 Remote NDIS Network Device - 6489 ADSL ETH/USB RTR - 9000 ADSL LAN Adapter - 9001 ADSL Loader - 900f AT-AR215 DSL Modem - 9010 AT-AR215 DSL Modem - 9021 ADSL WAN Adapter - 9022 ADSL Loader - 9023 ADSL WAN Adapter - 9024 ADSL Loader - 9031 ADSL LAN Adapter - 9032 ADSL Loader -1111 Pandora International Ltd. - 8888 Evolution Device -1112 YM ELECTRIC CO., Ltd -1113 Medion AG - a0a2 Active Sync device -111e VSO Electric Co., Ltd -112a RedRat - 0001 RedRat3 IR Transceiver - 0005 RedRat3II IR Transceiver -112e Master Hill Electric Wire and Cable Co., Ltd -112f Cellon International, Inc. -1130 Tenx Technology, Inc. - 0002 iBuddy - 6604 MCE IR-Receiver - 660c Foot Pedal/Thermometer - 6806 Keychain photo frame - f211 TP6911 Audio Headset -1131 Integrated System Solution Corp. - 1001 KY-BT100 Bluetooth Adapter - 1002 Bluetooth Device - 1003 Bluetooth Device - 1004 Bluetooth Device -1132 Toshiba Corp., Digital Media Equipment [hex] - 4331 PDR-M4/M5/M70 Digital Camera - 4332 PDR-M60 Digital Camera - 4333 PDR-M2300/PDR-M700 - 4334 PDR-M65 - 4335 PDR-M61 - 4337 PDR-M11 - 4338 PDR-M25 -1136 CTS Electronincs - 3131 CTS LS515 -113c Arin Tech Co., Ltd -113d Mapower Electronics Co., Ltd -1141 V One Multimedia, Pte., Ltd -1142 CyberScan Technologies, Inc. -1145 Japan Radio Company - 0001 AirH PHONE AH-J3001V/J3002V -1146 Shimane SANYO Electric Co., Ltd. -1147 Ever Great Electric Wire and Cable Co., Ltd -114b Sphairon Access Systems GmbH - 0110 Turbolink UB801R WLAN Adapter - 0150 Turbolink UB801RE Wireless 802.11g 54Mbps Network Adapter [RTL8187] -114c Tinius Olsen Testing Machine Co., Inc. -114d Alpha Imaging Technology Corp. -114f Wavecom -115b Salix Technology Co., Ltd. -1162 Secugen Corp. -1163 DeLorme Publishing, Inc. - 0100 Earthmate GPS (orig) - 0200 Earthmate GPS (LT-20, LT-40) - 2020 Earthmate GPS (PN-40) -1164 YUAN High-Tech Development Co., Ltd - 0300 ELSAVISION 460D - 0601 Analog TV Tuner - 0900 TigerBird BMP837 USB2.0 WDM Encoder - 0bc7 Digital TV Tuner - 521b MC521A mini Card ATSC Tuner - 6601 Digital TV Tuner Card [RTL2832U] -1165 Telson Electronics Co., Ltd -1166 Bantam Interactive Technologies -1167 Salient Systems Corp. -1168 BizConn International Corp. -116e Gigastorage Corp. -116f Silicon 10 Technology Corp. - 0005 Flash Card Reader - c108 Flash Card Reader - c109 Flash Card Reader -1175 Shengyih Steel Mold Co., Ltd -117d Santa Electronic, Inc. -117e JNC, Inc. -1182 Venture Corp., Ltd -1183 Compaq Computer Corp. [hex] (Digital Dream ??) - 0001 DigitalDream l'espion XS - 19c7 ISDN TA - 4008 56k FaxModem - 504a PJB-100 Personal Jukebox -1184 Kyocera Elco Corp. -1188 Bloomberg L.P. -1189 Acer Communications & Multimedia - 0893 EP-1427X-2 Ethernet Adapter -118f You Yang Technology Co., Ltd -1190 Tripace -1191 Loyalty Founder Enterprise Co., Ltd -1196 Yankee Robotics, LLC - 0010 Trifid Camera without code - 0011 Trifid Camera -1197 Technoimagia Co., Ltd -1198 StarShine Technology Corp. -1199 Sierra Wireless, Inc. - 0019 AC595U - 0021 AC597E - 0024 MC5727 CDMA modem - 0110 Composite Device - 0112 CDMA 1xEVDO PC Card, AirCard 580 - 0120 AC595U - 0218 MC5720 Wireless Modem - 6467 MP Series Network Adapter - 6468 MP Series Network Adapter - 6469 MP Series Network Adapter - 6802 MC8755 Device - 6803 MC8765 Device - 6804 MC8755 Device - 6805 MC8765 Device - 6812 MC8775 Device - 6820 AC875 Device - 6832 MC8780 Device - 6833 MC8781 Device - 683a MC8785 Device - 6850 AirCard 880 Device - 6851 AirCard 881 Device - 6852 AirCard 880E Device - 6853 AirCard 881E Device - 6854 AirCard 885 Device - 6856 ATT "USB Connect 881" - 6870 MC8780 Device - 6871 MC8781 Device - 6893 MC8777 Device - 9000 Gobi 2000 Wireless Modem (QDL mode) - 9001 Gobi 2000 Wireless Modem - 9002 Gobi 2000 Wireless Modem - 9003 Gobi 2000 Wireless Modem - 9004 Gobi 2000 Wireless Modem - 9005 Gobi 2000 Wireless Modem - 9006 Gobi 2000 Wireless Modem - 9007 Gobi 2000 Wireless Modem - 9008 Gobi 2000 Wireless Modem - 9009 Gobi 2000 Wireless Modem - 900a Gobi 2000 Wireless Modem -119a ZHAN QI Technology Co., Ltd -119b ruwido austria GmbH - 0400 Infrared Keyboard V2.01 -11a0 Chipcon AS - eb11 CC2400EB 2.0 ZigBee Sniffer -11a3 Technovas Co., Ltd - 8031 MP3 Player - 8032 MP3 Player -11aa GlobalMedia Group, LLC - 1518 iREZ K2 -11ab Exito Electronics Co., Ltd -11b0 ATECH FLASH TECHNOLOGY -11c5 Inmax - 0521 IMT-0521 Smartcard Reader -11db Topfield Co., Ltd. - 1000 PVR - 1100 PVR -11e6 K.I. Technology Co. Ltd. -11f5 Siemens AG - 0001 SX1 - 0003 Mobile phone USB cable - 0004 X75 - 0005 SXG75/EF81 - 0008 UMTS/HSDPA Data Card -11f6 Prolific - 2001 Willcom WSIM -11f7 Alcatel (?) - 02df TD10 Mobile phone USB cable -1203 TSC Auto ID Technology Co., Ltd - 0140 TTP-245C -1209 InterBiometrics - 1001 USB Hub - 1002 USB Relais - 1003 IBSecureCam-P - 1004 IBSecureCam-O - 1005 IBSecureCam-N -120e Hudson Soft Co., Ltd -120f Magellan - 5260 Triton Handheld GPS Receiver (300/400/500/1500/2000) -1210 DigiTech - 001b RP155 Guitar Multi-Effects Processor - 001c RP255 Guitar Multi-Effects Processor -121e Jungsoft Co., Ltd - 3403 Muzio JM250 Audio Player -1223 SKYCABLE ENTERPRISE. CO., LTD. -1230 Chipidea-Microelectronica, S.A. -1233 Denver Electronics - 5677 FUSB200 mp3 player -1234 Unknown - ed02 Emotiv EPOC Developer Headset Wireless Dongle -1235 Novation EMS - 0001 ReMOTE Audio/XStation - 0002 Speedio - 0003 ReMOTE ZeRO SL - 4661 ReMOTE25 -1241 Belkin - 1111 Mouse - 1122 Typhoon Stream Optical Mouse USB+PS/2 - 1155 PS2/USB Browser Combo Mouse - 1166 MI-2150 Trust Mouse - 1177 F8E842-DL Mouse - 1503 Keyboard - 1603 Keyboard -124a AirVast - 168b PRISM3 WLAN Adapter - 4017 PC-Chips 802.11b Adapter -124b Nyko (Honey Bee) - 4d01 Airflo EX Joystick -124c MXI - Memory Experts International, Inc. - 3200 Stealth MXP 1GB -125c Apogee Inc. - 0010 Alta series CCD -125f A-DATA Technology Co., Ltd. - 312a Superior S102 - a91a Portable HDD CH91 - c81a Flash drive - c93a Flash drive -1260 Standard Microsystems Corp. - ee22 SMC2862W-G v3 EZ Connect 802.11g Adapter [Intersil ISL3887] -1264 Covidien Energy-based Devices -1266 Pirelli Broadband Solutions - 6302 Fastweb DRG A226M ADSL Router -1267 Logic3 / SpectraVideo plc - 0103 G-720 Keyboard - 0201 A4Tech SWOP-3 Mouse - a001 JP260 PC Game Pad - c002 Wireless Optical Mouse -126c Aristocrat Technologies -126d Bel Stewart -126e Strobe Data, Inc. -126f TwinMOS - 1325 Mobile Disk - 2168 Mobile Disk III - a006 G240 802.11bg -1274 Ensoniq -1275 Xaxero Marine Software Engineering, Ltd. - 0002 WeatherFax 2000 Demodulator - 0080 SkyEye Weather Satellite Receiver -1278 Starlight Xpress - 0105 SXV-M5 - 0107 SXV-M7 - 0109 SXV-M9 - 0110 SXVF-H16 - 0115 SXVF-H5 - 0119 SXV-H9 - 0135 SXVF-H35 - 0136 SXVF-H36 - 0200 SXV interface for paraller MX cameras - 0305 SXV-M5C - 0307 SXV-M7C - 0319 SXV-H9C - 0325 SXV-M25C - 0326 SXVR-M26C - 0507 Lodestar autoguider - 0517 CoStar -1283 zebris Medical GmbH - 0100 USB-RS232 Adaptor - 0110 CMS20 - 0111 CMS 10 - 0112 CMS 05 - 0114 ARCUS digma PC-Interface - 0115 SAM Axioquick recorder - 0116 SAM Axioquick recorder - 0120 emed-X - 0121 emed-AT - 0130 PDM - 0150 CMS10GI (Golf) -1286 Marvell Semiconductor, Inc. - 1fab 88W8338 [Libertas] 802.11g - 2001 88W8388 802.11a/b/g WLAN - 2006 88W8360 802.11n WLAN - 8001 BLOB boot loader firmware -1291 Qualcomm Flarion Technologies, Inc. / Leadtek Research, Inc. - 0010 FDM 2xxx Flash-OFDM modem - 0011 LR7F06/LR7F14 Flash-OFDM modem -1292 Innomedia - 0258 Creative Labs VoIP Blaster -1293 Belkin Components [hex] - 0002 F5U002 Parallel Port [uss720] - 2101 104-key keyboard -1294 RISO KAGAKU CORP. -129b CyberTAN Technology - 160b Siemens S30853-S1031-R351 802.11g Wireless Adapter [Atheros AR5523] - 160c Siemens S30853-S1038-R351 802.11g Wireless Adapter [Atheros AR5523] - 1666 TG54USB 802.11bg - 1667 802.11bg - 1828 Gigaset USB Adapter 300 -12a7 Trendchip Technologies Corp. -12ab Honey Bee Electronic International Ltd. -12b8 Zhejiang Xinya Electronic Technology Co., Ltd. -12ba Licensed by Sony Computer Entertainment America - 0100 RedOctane Guitar for PlayStation(R)3 - 0120 RedOctane Drum Kit for PlayStation(R)3 - 0200 Harmonix Guitar for PlayStation(R)3 - 0210 Harmonix Drum Kit for PlayStation(R)3 -12c4 Autocue Group Ltd - 0006 Teleprompter Two-button Hand Control (v1) - 0008 Teleprompter Foot Control (v1) -12d1 Huawei Technologies Co., Ltd. - 1001 E169/E620/E800 HSDPA Modem - 1003 E220 HSDPA Modem / E230/E270/E870 HSDPA/HSUPA Modem - 1009 U120 - 1010 ETS2252+ CDMA Fixed Wireless Terminal - 1037 Ideos - 1038 Ideos (debug mode) - 1406 E1750 - 140b EC1260 Wireless Data Modem HSD USB Card - 1446 E1552 (HSPA modem) - 1501 Pulse - 1505 E398 LTE/UMTS/GSM Modem/Networkcard - 1506 E398 LTE/UMTS/GSM Modem/Networkcard - 1520 K3765 HSPA - 1521 K4505 HSPA+ - 380b WiMAX USB modem(s) -12d2 LINE TECH INDUSTRIAL CO., LTD. -12d6 EMS Dr. Thomas Wuensche - 0444 CPC-USB/ARM7 - 0888 CPC-USB/M16C -12d7 BETTER WIRE FACTORY CO., LTD. -12e6 Waldorf Music GmbH - 0013 Blofeld -12ef Tapwave, Inc. - 0100 Tapwave Handheld [Tapwave Zodiac] -12f5 Dynamic System Electronics Corp. -12f7 Memorex Products, Inc. - 1a00 TD Classic 003B - 1e23 TravelDrive 2007 Flash Drive -12fd AIN Comm. Technology Co., Ltd - 1001 AWU2000b 802.11b Stick -12ff Fascinating Electronics, Inc. - 0101 Advanced RC Servo Controller -1307 Transcend Information, Inc. - 0163 256MB/512MB/1GB Flash Drive - 0165 2GB/4GB Flash Drive - 0330 63-in-1 Multi-Card Reader/Writer - 0361 CR-75: 51-in-1 Card Reader/Writer - 1169 TS2GJF210 JetFlash 210 2GB - 1171 Fingerprint Reader -1308 Shuttle, Inc. - 0003 VFD Module - c001 eHome Infrared Transceiver -1310 Roper - 0001 Class 1 Bluetooth Dongle -1312 ICS Electronics -131d Natural Point - 0155 TrackIR 3 Pro Head Tracker - 0156 TrackIR 4 Pro Head Tracker -132a Envara Inc. - 1502 WiND 802.11abg / 802.11bg WLAN -132b Konica Minolta - 0000 Dimage A2 Camera - 0001 Minolta DiMAGE A2 (ptp) - 0003 Dimage Xg Camera - 0006 Dimage Z2 Camera - 0007 Minolta DiMAGE Z2 (PictBridge mode) - 0008 Dimage X21 Camera - 000a Dimage Scan Dual IV - 000b Dimage Z10 Camera - 000d Dimage X50 Camera [storage?] - 000f Dimage X50 Camera [p2p?] - 0010 Dimage G600 Camera - 0012 Dimage Scan Elite5400 2 - 0013 Dimage X31 Camera - 0015 Dimage G530 Camera - 0017 Dimage Z3 Camera - 0018 Minolta DiMAGE Z3 (PictBridge mode) - 0019 Dimage A200 Camera - 0021 Dimage Z5 Camera - 0022 Minolta DiMAGE Z5 (PictBridge mode) - 002c Dynax 5D camera - 2001 Magicolor 2400w - 2004 Magicolor 5430DL - 2005 Magicolor 2430 DL - 2029 Magicolor 5440DL - 2030 PagePro 1350E(N) - 2033 PagePro 1400W - 2043 Magicolor 2530DL - 2045 Magicolor 2500W - 2049 Magicolor 2490MF -1342 Mobility - 0200 EasiDock 200 Hub - 0201 EasiDock 200 Keyboard and Mouse Port - 0202 EasiDock 200 Serial Port - 0203 EasiDock 200 Printer Port - 0204 Ethernet - 0304 EasiDock Ethernet -1345 Sino Lite Technology Corp. - 001c Xbox Controller Hub -1347 Moravian Instruments - 0400 G2CCD USB 1.1 obsolete - 0401 G2CCD-S with Sony ICX285 CCD - 0402 G2CCD2 - 0403 G2/G3CCD-I KAI CCD - 0404 G2/G3CCD-F KAF CCD - 0410 G1-0400 CCD - 0411 G1-0800 CCD - 0412 G1-0300 CCD - 0413 G1-2000 CCD - 0414 G1-1400 CCD -1348 Katsuragawa Electric Co., Ltd. -134c PanJit International Inc. - 0001 Touch Panel Controller - 0002 Touch Panel Controller - 0003 Touch Panel Controller - 0004 Touch Panel Controller -134e Digby's Bitpile, Inc. DBA D Bit -1357 P&E Microcomputer Systems - 0503 USB-ML-12 HCS08/HCS12 Multilink - 0504 DEMOJM -1366 SEGGER - 0101 J-Link ARM -136b STEC -1370 Swissbit - 0323 Swissmemory cirrusWHITE - 6828 Victorinox Flash Drive -1371 CNet Technology Inc. - 0001 CNUSB-611AR Wireless Adapter-G [AT76C503] - 0002 CNUSB-611AR Wireless Adapter-G [AT76C503] (FiberLine WL-240U) - 0013 CNUSB-611 Wireless Adapter [AT76C505] - 0014 CNUSB-611 Wireless Adapter [AT76C505] (FiberLine WL-240U) - 5743 CNUSB-611 (D) Wireless Adapter [AT76C503] - 9022 CWD-854 [RT2573] - 9032 CWD-854 rev F - 9401 CWD-854 Wireless 802.11g 54Mbps Network Adapter [RTL8187] -1376 Vimtron Electronics Co., Ltd. -137b SCAPS GmbH - 0002 SCAPS USC-2 Scanner Controller -1385 Netgear, Inc - 4250 WG111T - 4251 WG111T (no firmware) - 5f00 WPN111 RangeMax(TM) Wireless USB 2.0 Adapter - 5f01 WPN111 (no firmware) - 6e00 WPNT121 802.11g 240Mbps Wireless Adapter [Airgo AGN300] -138a Validity Sensors, Inc. - 0001 VFS101 Fingerprint Reader - 0005 VFS301 Fingerprint Reader - 0007 VFS451 Fingerprint Reader - 0008 VFS300 Fingerprint Reader - 0011 VFS5011 Fingerprint Reader -138e Jungo LTD - 9000 Raisonance S.A. STM32 ARM evaluation board -1390 TOMTOM B.V. - 0001 GO 520 T -1391 IdealTEK, Inc. - 1000 URTC-1000 -1395 Sennheiser Communications - 3556 USB Headset -1397 BEHRINGER International GmbH - 00bc BCF2000 -1398 Q-tec - 2103 USB 2.0 Storage Device -13ad Baltech - 9999 Card reader -13b0 PerkinElmer Optoelectronics - 000a Alesis Photon X25 MIDI Controller -13b1 Linksys - 000a WUSB54G v2 802.11g Adapter [Intersil ISL3887] - 000b WUSB11 v4.0 802.11b Adapter [ALi M4301] - 000c WUSB54AG 802.11a/g Adapter [Intersil ISL3887] - 000d WUSB54G v4 802.11g Adapter [Ralink RT2500USB] - 000e WUSB54GS v1 802.11g Adapter [Broadcom 4320 USB] - 0011 WUSB54GP v4.0 802.11g Adapter [Ralink RT2500USB] - 0014 WUSB54GS v2 802.11g Adapter [Broadcom 4320 USB] - 0018 USB200M 10/100 Ethernet Adapter - 001a HU200TS Wireless Adapter - 001e WUSBF54G 802.11bg - 0020 WUSB54GC v1 802.11g Adapter [Ralink RT73] - 0022 WUSB54GX4 802.11g 240Mbps Wireless Adapter [Airgo AGN300] - 0023 WUSB54GR - 0024 WUSBF54G v1.1 802.11bg - 0026 WUSB54GSC v1 802.11g Adapter [Broadcom 4320 USB] - 002f AE1000 v1 802.11n [Ralink RT3572] - 0031 AM10 v1 802.11n [Ralink RT3072] - 13b1 WUSB200: Wireless-G Business Network Adapter with Rangebooster -13b2 Alesis - 0030 Multimix 8 -13b3 Nippon Dics Co., Ltd. -13ba Unknown - 0017 PS/2 Keyboard+Mouse Adapter -13be Ricoh Printing Systems, Ltd. -13ca JyeTai Precision Industrial Co., Ltd. -13cf Wisair Ltd. - 1200 Olidata Wireless Multimedia Adapter -13d0 Techsan Electronics Co., Ltd. - 2282 TechniSat DVB-PC TV Star 2 -13d1 A-Max Technology Macao Commercial Offshore Co. Ltd. - 7019 MD 82288 - abe6 Wireless 802.11g 54Mbps Network Adapter [RTL8187] -13d2 Shark Multimedia - 0400 Pocket Ethernet [klsi] -13d3 IMC Networks - 3201 VisionDTV USB-Ter/HAMA USB DVB-T device cold - 3202 VisionDTV USB-Ter/HAMA USB DVB-T device warm - 3203 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 3204 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 3205 DNTV Live! Tiny USB2 BDA (No Remote) - 3206 DNTV Live! Tiny USB2 BDA (No Remote) - 3207 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 3208 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 3209 DTV-DVB UDST7022BDA DVB-S Box(Without HID) - 3211 DTV-DVB Hybrid Analog/Capture / Pinnacle PCTV 310e - 3212 DTV-DVB UDTT704C - DVBT/NTSC/PAL Driver(PCM4) - 3213 DTV-DVB UDTT704D - DVBT/NTSC/PAL Driver (PCM4) - 3214 DTV-DVB UDTT704F -(MiniCard) DVBT/NTSC/PAL Driver(Without HID) - 3215 DTV-DVB UDAT7240 - ATSC/NTSC/PAL Driver(PCM4) - 3216 DTV-DVB UDTT 7047-USB 2.0 DVB-T Driver - 3217 Digital-TV Receiver. - 3219 DTV-DVB UDTT7049 - DVB-T Driver(Without HID) - 3220 DTV-DVB UDTT 7047M-USB 2.0 DVB-T Driver - 3223 DNTV Live! Tiny USB2 BDA (No Remote) - 3224 DNTV Live! Tiny USB2 BDA (No Remote) - 3226 DigitalNow TinyTwin DVB-T Receiver - 3234 DVB-T FTA Half Minicard [RTL2832U] - 3236 DTV-DVB UDTT 7047A-USB 2.0 DVB-T Driver - 3237 DTV-DVB UDTT 704J - dual DVB-T Driver - 3239 DTV-DVB UDTT704D - DVBT/NTSC/PAL Driver(Without HID) - 3240 DTV-DVB UDXTTM6010 - A/D Driver(Without HID) - 3241 DTV-DVB UDXTTM6010 - A/D Driver(Without HID) - 3242 DTV-DVB UDAT7240LP - ATSC/NTSC/PAL Driver(Without HID) - 3243 DTV-DVB UDXTTM6010 - A/D Driver(Without HID) - 3244 DTV-DVB UDTT 7047Z-USB 2.0 DVB-T Driver - 3247 802.11 n/g/b Wireless LAN Adapter - 3249 Internal Bluetooth - 3262 802.11 n/g/b Wireless LAN USB Adapter - 3273 802.11 n/g/b Wireless LAN USB Mini-Card - 3274 DVB-T Dongle [RTL2832U] - 3282 DVB-T + GPS Minicard [RTL2832U] - 3284 Wireless LAN USB Mini-Card - 3306 Mediao 802.11n WLAN [Realtek RTL8191SU] - 3315 Bluetooth module - 5070 Webcam - 5111 Integrated Webcam - 5115 Integrated Webcam - 5116 Integrated Webcam - 5702 UVC VGA Webcam - 7020 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) - 7022 DTV-DVB UDST7022BDA DVB-S Box(Without HID) -13dc ALEREON, INC. -13dd i.Tech Dynamic Limited -13e1 Kaibo Wire & Cable (Shenzhen) Co., Ltd. -13e5 Rane - 0001 SL-1 -13e6 TechnoScope Co., Ltd. -13ec Zydacron - 0006 HID Remote Control -13ee MosArt - 0003 Optical Mouse -13fd Initio Corporation - 0841 Samsung SE-T084M DVD-RW - 1340 Hi-Speed USB to SATA Bridge - 160f RocketFish SATA Bridge [INIC-1611] - 1640 ASUS SDRW-08D1S-U DVD-RW - 1840 Shintaro SH23SDOCK Hard Drive Docker [INIC-1608L] -13fe Kingston Technology Company Inc. - 1a00 512MB/1GB Flash Drive - 1a23 512MB Flash Drive - 1d00 DataTraveler 2.0 1GB/4GB Flash Drive / Patriot Xporter 4GB Flash Drive - 1e00 Flash Drive 2 GB [ICIDU 2 GB] - 1f00 DataTraveler 2.0 4GB Flash Drive / Patriot Xporter 32GB (PEF32GUSB) Flash Drive - 2240 microSD card reader - 3100 2/4 GB stick -1400 Axxion Group Corp. -1402 Bowe Bell & Howell -1403 Sitronix - 0001 Digital Photo Frame -140e Telechips, Inc. - b011 TCC780X-based player (USB Boot mode) - b021 TCC77X-based players (USB Boot mode) -1410 Novatel Wireless - 1110 Merlin S620 - 1120 Merlin EX720 - 1130 Merlin S720 - 1400 Merlin U730/U740 (Vodafone) - 1410 Merlin U740 (non-Vodafone) - 1430 Merlin XU870 - 1450 Merlin X950D - 2110 Ovation U720/MCD3000 - 2410 Expedite EU740 - 2420 Expedite EU850D/EU860D/EU870D - 4100 U727 - 4400 Ovation MC930D/MC950D - a001 Gobi Wireless Modem - a008 Gobi Wireless Modem (QDL mode) -1415 Nam Tai E&E Products Ltd. or OmniVision Technologies, Inc. - 0000 Sony SingStar USBMIC - 0020 Sony Wireless SingStar - 2000 Sony Playstation Eye -1419 ABILITY ENTERPRISE CO., LTD. -1429 Vega Technologies Industrial (Austria) Co. -142a Thales E-Transactions - 0003 Artema Hybrid - 0005 Artema Modular - 0043 medCompact -142b Arbiter Systems, Inc. - 03a5 933A Portable Power Sentinel -1430 RedOctane - 4734 Guitar Hero4 hub - 474b Guitar Hero MIDI interface -1431 Pertech Resources, Inc. -1435 Wistron NeWeb - 0427 UR054g 802.11g Wireless Adapter [Intersil ISL3887] - 0711 UR055G 802.11bg - 0804 AR9170+AR9104 802.11abgn Wireless Adapter - 0826 AR5523 - 0827 AR5523 (no firmware) - 0828 AR5523 - 0829 AR5523 (no firmware) -1436 Denali Software, Inc. -143c Altek Corporation -1443 Digilent - 0007 CoolRunner-II CPLD Starter Kit -1453 Radio Shack - 4026 26-183 Serial Cable -1456 Extending Wire & Cable Co., Ltd. -1457 First International Computer, Inc. - 5117 OpenMoko Neo1973 kernel usbnet (g_ether, CDC Ethernet) mode - 5118 OpenMoko Neo1973 Debug board (V2+) - 5119 OpenMoko Neo1973 u-boot cdc_acm serial port - 5120 OpenMoko Neo1973 u-boot usbtty generic serial - 5121 OpenMoko Neo1973 kernel mass storage (g_storage) mode - 5122 OpenMoko Neo1973 / Neo Freerunner kernel cdc_ether USB network - 5123 OpenMoko Neo1973 internal USB CSR4 module - 5124 OpenMoko Neo1973 Bluetooth Device ID service -145f Trust - 0106 Trust K56 V92 USB Modem - 013d PC Camera (SN9C201 + OV7660) - 013f Megapixel Auto Focus Webcam - 0142 WB-6250X Webcam - 015a WB-8300X 2MP Webcam -1460 Tatung Co. - 9150 eHome Infrared Transceiver -1461 Staccato Communications -1462 Micro Star International - 5512 MegaStick-1 Flash Stick - 8807 DIGIVOX mini III [af9015] -1472 Huawei-3Com - 0007 Aolynk WUB300g [ZyDAS ZD1211] - 0009 Aolynk WUB320g -147a Formosa Industrial Computing, Inc. - e015 eHome Infrared Receiver - e016 eHome Infrared Receiver - e017 eHome Infrared Receiver - e018 eHome Infrared Receiver - e03a eHome Infrared Receiver - e03c eHome Infrared Receiver - e03e Infrared Receiver [IR605A/Q] -147e Upek - 1000 Biometric Touchchip/Touchstrip Fingerprint Sensor - 2016 Biometric Touchchip/Touchstrip Fingerprint Sensor -147f Hama GmbH & Co., KG -1482 Vaillant - 1005 VRD PC-Interface -1484 Elsa AG [hex] - 1746 Ecomo 19H99 Monitor - 7616 Elsa Hub -1485 Silicom - 0001 U2E - 0002 Psion Gold Port Ethernet -1487 DSP Group, Ltd. -148e EVATRONIX SA -148f Ralink Technology, Corp. - 1706 RT2500USB Wireless Adapter - 2070 RT2070 Wireless Adapter - 2570 RT2570 Wireless Adapter - 2573 RT2501/RT2573 Wireless Adapter - 2671 RT2601/RT2671 Wireless Adapter - 2770 RT2770 Wireless Adapter - 2870 RT2870 Wireless Adapter - 3070 RT2870/RT3070 Wireless Adapter - 3071 RT3071 Wireless Adapter - 3072 RT3072 Wireless Adapter - 3572 RT3572 Wireless Adapter - 5370 RT5370 Wireless Adapter - 9020 RT2500USB Wireless Adapter - 9021 RT2501USB Wireless Adapter -1497 Panstrong Company Ltd. -1498 Microtek International Inc. - a090 DVB-T Tuner -149a Imagination Technologies - 2107 DBX1 DSP core -14aa WideView Technology Inc. - 0001 Avermedia AverTV DVBT USB1.1 (cold) - 0002 Avermedia AverTV DVBT USB1.1 (warm) - 0201 AVermedia/Yakumo/Hama/Typhoon DVB-T USB2.0 (cold) - 0221 WT-220U DVB-T dongle - 022b WT-220U DVB-T dongle - 0301 AVermedia/Yakumo/Hama/Typhoon DVB-T USB2.0 (warm) -14ad CTK Corporation -14ae Printronix Inc. -14af ATP Electronics Inc. -14b0 StarTech.com Ltd. -14b2 Ralink Technology, Corp. - 3a95 Toshiba WUS-G06G-JT 802.11bg Wireless Adapter - 3a98 Airlink101 AWLL4130 802.11bg Wireless Adapter [Atheros AR5523] - 3c02 rt2500 802.11g WLAN - 3c05 rt2570 802.11g WLAN - 3c06 Conceptronic C300RU v1 802.11bgn Wireless Adapter [Ralink RT2870] - 3c07 802.11n adapter - 3c09 802.11n adapter - 3c22 Conceptronic C54RU 802.11bg Wireless Adapter [Ralink RT73] - 3c23 Airlink101 AWLL6080 802.11bgn Wireless Adapter [Ralink RT2870] - 3c25 DrayTek Vigor N61 802.11bgn Wireless Adapter [Ralink RT2870] - 3c27 Airlink101 AWLL6070 802.11bgn Wireless Adapter [Ralink RT2770] - 3c28 Conceptronic C300RU v2 802.11bgn Wireless Adapter [Ralink RT2770] - 3c2c Keebox W150NU 802.11bgn Wireless Adapter [Ralink RT3070] -14c0 Rockwell Automation, Inc. -14c2 Gemlight Computer, Ltd - 0250 Storage Adapter V2 - 0350 Storage Adapter V2 -14cd Super Top - 121c microSD card reader - 123a SD/MMC/RS-MMC Card Reader - 127b SDXC Reader - 6116 M6116 SATA Bridge - 6600 USB 2.0 IDE DEVICE - 6700 Card Reader - 6900 Card Reader - 8123 SD MMC Reader - 8125 SD MMC Reader -14d8 JAMER INDUSTRIES CO., LTD. -14dd Raritan Computer, Inc. -14e1 Dialogue Technology Corp. - 5000 PenMount 5000 Touch Controller -14e5 SAIN Information & Communications Co., Ltd. -14ea Planex Communications - ab10 GW-US54GZ - ab11 GU-1000T - ab13 GW-US54Mini 802.11bg -14ed Shure Inc. -14f7 TechniSat Digital GmbH - 0001 SkyStar 2 HD CI - 0002 SkyStar 2 HD CI - 0003 CableStar Combo HD CI - 0004 AirStar TeleStick 2 - 0500 DVB-PC TV Star HD -1500 Ellisys -1501 Pine-Tum Enterprise Co., Ltd. -1509 First International Computer, Inc. - 9242 eHome Infrared Transceiver -1513 medMobile - 0444 medMobile -1514 Actel - 2003 FlashPro3 Programmer - 2004 FlashPro3 Programmer - 2005 FlashPro3 Programmer -1516 CompUSA - 1603 Flash Drive - 8628 Pen Drive -1518 Cheshire Engineering Corp. - 0001 HDReye High Dynamic Range Camera - 0002 HDReye (before firmware loads) -1520 Bitwire Corp. -1524 ENE Technology Inc - 6680 UTS 6680 -1527 Silicon Portals - 0200 YAP Phone (no firmware) - 0201 YAP Phone -1529 UBIQUAM Co., Ltd. - 3100 CDMA 1xRTT USB Modem (U-100/105/200/300/520) -152d JMicron Technology Corp. / JMicron USA Technology Corp. - 2329 JM20329 SATA Bridge - 2335 ATA/ATAPI Bridge - 2336 Hard Disk Drive - 2337 ATA/ATAPI Bridge - 2338 JM20337 Hi-Speed USB to SATA & PATA Combo Bridge - 2339 JM20339 SATA Bridge - 2352 ATA/ATAPI Bridge - 2509 JMS539 SuperSpeed SATA II 3.0G Bridge -152e LG (HLDS) - 2507 PL-2507 IDE Controller - e001 GSA-5120D DVD-RW -1532 Razer USA, Ltd - 0001 RZ01-020300 Optical Mouse [Diamondback] - 0003 Krait Mouse - 0007 DeathAdder Mouse - 0017 Imperator Mouse - 001c RZ01-0036 Optical Gaming Mouse [Abyssus] - 0101 Copperhead Mouse - 0102 Tarantula Keyboard - 0109 Lycosa Keyboard -1546 U-Blox AG -154a Celectronic GmbH - 8180 CARD STAR/medic2 -154b PNY - 0010 USB 2.0 Flash Drive - 6545 FD Device -154d ConnectCounty Holdings Berhad -154e D&M Holdings, Inc. (Denon/Marantz) - 3000 Marantz RC9001 Remote Control -1554 Prolink Microsystems Corp. -1557 OQO - 0002 model 01 WiFi interface - 0003 model 01 Bluetooth interface - 0a80 Gobi Wireless Modem (QDL mode) - 7720 model 01+ Ethernet - 8150 model 01 Ethernet interface -1568 Sunf Pu Technology Co., Ltd -156f Quantum Corporation -1570 ALLTOP TECHNOLOGY CO., LTD. -157b Ketron SRL -157e TRENDnet - 3006 TEW-444UB EU - 3007 TEW-444UB EU (no firmware) - 300a TEW-429UB 802.11bg - 300b TEW-429UB 802.11bg - 300d TEW-429UB C1 802.11bg - 3204 Allnet ALL0298 v2 802.11bg - 3205 Allnet ALL0283 [AR5523] - 3206 Allnet ALL0283 [AR5523](no firmware) -1582 Fiberline - 6003 WL-430U 802.11bg -1587 SMA Technologie AG -158d Oakley Inc. -158e JDS Uniphase Corporation (JDSU) - 0820 SmartPocket Class Device -1598 Kunshan Guoji Electronics Co., Ltd. -15a2 Freescale Semiconductor, Inc. -15a4 Afatech Technologies, Inc. - 1000 AF9015/AF9035 DVB-T stick - 1001 AF9015/AF9035 DVB-T stick - 1336 SDHC/MicroSD/MMC/MS/M2/CF/XD Flash Card Reader - 9015 AF9015 DVB-T USB2.0 stick - 9016 AF9015 DVB-T USB2.0 stick -15a8 Teams Power Limited -15a9 Gemtek - 0004 WUBR177G - 0006 Wireless 11n USB Adapter - 0010 802.11n USB Wireless Card - 0012 WUBR-208N 802.11abgn Wireless Adapter [Ralink RT2870] -15aa Gearway Electronics (Dong Guan) Co., Ltd. -15ad VMware Inc. -15ba Olimex Ltd. - 0003 OpenOCD JTAG - 0004 OpenOCD JTAG TINY -15c0 XL Imaging - 0001 2M pixel Microscope Camera - 0002 3M pixel Microscope Camera - 0003 1.3M pixel Microscope Camera (mono) - 0004 1.3M pixel Microscope Camera (colour) - 0005 3M pixel Microscope Camera (Mk 2) - 0006 2M pixel Microscope Camera (with capture button) - 0007 3M pixel Microscope Camera (with capture button) - 0008 1.3M pixel Microscope Camera (colour, with capture button) - 0009 1.3M pixel Microscope Camera (colour, with capture button) - 000a 2M pixel Microscope Camera (Mk 2) - 0010 1.3M pixel "Tinycam" - 0101 3M pixel Microscope Camera -15c2 SoundGraph Inc. - 0036 LC16M VFD Display/IR Receiver - 0038 GD01 MX VFD Display/IR Receiver - ffda iMON PAD Remote Controller - ffdc iMON PAD Remote Controller -15c5 Advance Multimedia Internet Technology Inc. (AMIT) - 0008 WL532U 802.11g Adapter -15c6 Laboratoires MXM - 1000 DigistimSP (cold) - 1001 DigistimSP (warm) - 1002 DigimapSP USB (cold) - 1003 DigimapSP USB (warm) -15c8 KTF Technologies - 3201 EVER EV-W100/EV-W250 -15c9 D-Box Technologies -15ca Textech International Ltd. - 00c3 Mini Optical Mouse - 0101 MIDI Interface cable - 1806 MIDI Interface cable -15d5 Coulomb Electronics Ltd. -15d9 Trust International B.V. - 0a33 Optical Mouse - 0a37 Mouse - 0a41 MI-2540D [Optical mouse] - 0a4c USB+PS/2 Optical Mouse -15dc Hynix Semiconductor Inc. -15e0 Seong Ji Industrial Co., Ltd. -15e1 RSA - 2007 RSA SecurID (R) Authenticator -15e4 Numark - 0024 Mixtrack -15e8 SohoWare - 9100 NUB100 Ethernet [pegasus] - 9110 10/100 USB Ethernet -15e9 Pacific Digital Corp. - 04ce MemoryFrame MF-570 - 1968 MemoryFrame MF-570 - 1969 Digital Frame -15ec Belcarra Technologies Corp. -15f4 HanfTek - 0001 HanfTek UMT-010 USB2.0 DVB-T (cold) - 0025 HanfTek UMT-010 USB2.0 DVB-T (warm) -1604 Tascam - 8000 US-428 Audio/Midi Controller (without fw) - 8001 US-428 Audio/Midi Controller - 8004 US-224 Audio/Midi Controller (without fw) - 8005 US-224 Audio/Midi Controller - 8006 US-122 Audio/Midi Interface (without fw) - 8007 US-122 Audio/Midi Interface -1606 Umax - 0002 Astra 1236U Scanner - 0010 Astra 1220U - 0030 Astra 1600U/2000U - 0050 Scanner - 0060 Astra 3400/3450 - 0070 Astra 4400/4450 - 0130 Astra 2100U - 0160 Astra 5400U - 0170 Uniscan D50 - 0230 Astra 2200/2200SU - 0350 Astra 4800/4850 Scanner - 1030 Astra 4000U - 1220 Genesys Logic Scanner Controller NT5.0 - 2010 AstraCam Digital Camera - 2020 AstraCam 1000 - 2030 AstraCam 1800 Digital Camera -1608 Inside Out Networks [hex] - 0001 EdgePort/4 Serial Port - 0002 Edgeport/8 - 0003 Rapidport/4 - 0004 Edgeport/4 - 0005 Edgeport/2 - 0006 Edgeport/4i - 0007 Edgeport/2i - 0008 Edgeport/8 - 000c Edgeport/421 - 000d Edgeport/21 - 000e Edgeport/4 - 000f Edgeport/8 - 0010 Edgeport/2 - 0011 Edgeport/4 - 0012 Edgeport/416 - 0014 Edgeport/8i - 0018 Edgeport/412 - 0019 Edgeport/412 - 001a Edgeport/2+2i - 0101 Edgeport/4 - 0105 Edgeport/2 - 0106 Edgeport/4i - 0107 Edgeport/2i - 010c Edgeport/421 - 010d Edgeport/21 - 0110 Edgeport/2 - 0111 Edgeport/4 - 0112 Edgeport/416 - 0114 Edgeport/8i - 0201 Edgeport/4 - 0203 Rapidport/4 - 0204 Edgeport/4 - 0205 Edgeport/2 - 0206 Edgeport/4i - 0207 Edgeport/2i - 020c Edgeport/421 - 020d Edgeport/21 - 020e Edgeport/4 - 020f Edgeport/8 - 0210 Edgeport/2 - 0211 Edgeport/4 - 0212 Edgeport/416 - 0214 Edgeport/8i - 0215 Edgeport/1 - 0216 EPOS/44 - 0217 Edgeport/42 - 021a Edgeport/2+2i - 021b Edgeport/2c - 021c Edgeport/221c - 021d Edgeport/22c - 021e Edgeport/21c - 021f Edgeport/62 - 0240 Edgeport/1 - 0241 Edgeport/1i - 0242 Edgeport/4s - 0243 Edgeport/8s - 0244 Edgeport/8 - 0245 Edgeport/22c - 0301 Watchport/P - 0302 Watchport/M - 0303 Watchport/W - 0304 Watchport/T - 0305 Watchport/H - 0306 Watchport/E - 0307 Watchport/L - 0308 Watchport/R - 0309 Watchport/A - 030a Watchport/D - 030b Watchport/D - 030c Power Management Port - 030e Power Management Port - 030f Watchport/G - 0310 Watchport/Tc - 0311 Watchport/Hc - 1403 MultiTech Systems MT4X56 Modem - 1a17 Agilent Technologies (E6473) -160a VIA Technologies, Inc. - 3184 VIA VNT-6656 [WiFi 802.11b/g USB Dongle] -1614 Amoi Electronics - 0404 WMA9109 UMTS Phone - 0600 Vodafone VDA GPS / Toschiba Protege G710 - 0804 WP-S1 Phone -1619 L & K Precision Technology Co., Ltd. -1621 Wionics Research -1628 Stonestreet One, Inc. -162a Airgo Networks Inc. -162f WiQuest Communications, Inc. -1630 2Wire, Inc. - 0005 802.11g Wireless Adapter [Intersil ISL3886] - ff81 802.11b Wireless Adapter [Lucent/Agere Hermes I] -1631 Good Way Technology - 6200 GWUSB2E - c019 RT2573 -1645 Cross Match Technologies GmbH - 0001 1S Serial Port - 0002 2S Serial Port - 0003 1S25 Serial Port - 0004 4S Serial Port - 0005 E45 Ethernet [klsi] - 0006 Parallel Port - 0007 U1-SC25 SCSI - 0008 Ethernet - 0016 Bi-directional to Parallel Printer Converter - 0080 1 port to Serial Converter - 0081 1 port to Serial Converter - 0093 1S9 Serial Port - 8000 EZ-USB - 8001 1 port to Serial - 8002 2x Serial Port - 8003 1 port to Serial - 8004 2U4S serial/usb hub - 8005 Ethernet - 8080 1 port to Serial - 8081 1 port to Serial - 8093 PortGear Serial Port -1649 SofTec Microsystems - 0102 uDART In-Circuit Debugger - 0200 SpYder USBSPYDER08 -164a ChipX -164c Matrix Vision GmbH - 0101 mvBlueFOX camera (no firmware) - 0103 mvBlueFOX camera - 0201 mvBlueLYNX-X intelligent camera (bootloader) - 0203 mvBlueLYNX-X intelligent camera -1657 Struck Innovative Systeme GmbH - 3150 SIS3150 USB2.0 to VME interface -165b Frontier Design Group - 8101 Tranzport Control Surface - fad1 Alphatrack Control Surface -1660 Creatix Polymedia GmbH -1668 Actiontec Electronics, Inc. [hex] - 0009 Gateway - 0333 Modem - 0358 InternetPhoneWizard - 0405 Gateway - 0408 Prism2.5 802.11b Adapter - 0413 Gateway - 0421 Prism2.5 802.11b Adapter - 0441 IBM Integrated Bluetooth II - 0500 BTM200B BlueTooth Adapter - 1050 802UIG-1 802.11g Wireless Mini Adapter [Intersil ISL3887] - 1200 802AIN Wireless N Network Adapter [Atheros AR9170+AR9101] - 1441 IBM Integrated Bluetooth II - 2441 BMDC-2 IBM Bluetooth III w.56k - 3441 IBM Integrated Bluetooth III - 6010 Gateway - 6097 802.11b Wireless Adapter - 6106 ROPEX FreeLan 802.11b - 7605 UAT1 Wireless Ethernet Adapter -1669 PiKRON Ltd. [hex] - 1001 uLan2USB Converter - PS1 protocol -1677 China Huada Integrated Circuit Design (Group) Co., Ltd. (CIDC Group) - 0103 Token -1679 Total Phase - 2001 Beagle Protocol Analyzer - 2002 Cheetah SPI Host Adapter -1680 Golden Bridge Electech Inc. - a332 DVB-T Dongle [RTL2832U] -1681 Prevo Technologies, Inc. - 0001 Tuner's Dashboard - 0002 Tubachron -1682 Maxwise Production Enterprise Ltd. -1684 Godspeed Computer Corp. -1685 Delock - 0200 Infrared adapter -1686 ZOOM Corporation - 0045 H4 Digital Recorder -1687 Kingmax Digital Inc. - 5289 FlashDisk - 6211 FlashDisk -1688 Saab AB -168c Atheros Communications - 0001 AR5523 - 0002 AR5523 (no firmware) -1690 Askey Computer Corp. [hex] - 0101 Creative Modem Blaster DE5670 - 0102 V1456 VQE-R2 Modem [conexant] - 0103 1456 VQE-R3 Modem [conexant] - 0104 HCF V90 Data Fax RTAD Modem - 0107 HCF V.90 Data,Fax,RTAD Modem - 0109 MagicXpress V.90 Pocket Modem [conexant] - 0203 Voyager ADSL Modem Loader - 0204 Voyager ADSL Modem - 0205 DSL Modem - 0206 GlobeSpan ADSL WAN Modem - 0208 DSL Modem - 0209 Voyager 100 ADSL Modem - 0211 Globespan Virata ADSL LAN Modem - 0212 DSL Modem - 0213 HM121d DSL Modem - 0214 HM121d DSL Modem - 0215 Voyager 105 ADSL Modem - 0701 WLAN - 0710 SMCWUSBT-G - 0711 SMCWUSBT-G (no firmware) - 0712 AR5523 - 0713 AR5523 (no firmware) - 0715 Name: Voyager 1055 Laptop 802.11g Adapter [Broadcom 4320] - 0722 RT2573 - 0726 Wi-Fi Wireless LAN Adapter - 0740 802.11n Wireless LAN Card - 0901 Voyager 205 ADSL Router -1696 Hitachi Video and Information System, Inc. -1697 VTec Test, Inc. -16a5 Shenzhen Zhengerya Cable Co., Ltd. -16a6 Unigraf - 3000 VTG-3xxx Video Test Generator family - 4000 VTG-4xxx Video Test Generator family - 5000 VTG-5xxx Video Test Generator family - 5001 VTG-5xxx Special (update) mode of VTG-5xxx family -16ab Global Sun Technology - 7801 AR5523 - 7802 AR5523 (no firmware) - 7811 AR5523 - 7812 AR5523 (no firmware) -16ac Dongguan ChingLung Wire & Cable Co., Ltd. -16b4 iStation - 0801 U43 -16b5 Persentec, Inc. - 0002 Otto driving companion -16c0 VOTI - 03e8 free for internal lab use 1000 - 03e9 free for internal lab use 1001 - 03ea free for internal lab use 1002 - 03eb free for internal lab use 1003 - 03ec free for internal lab use 1004 - 03ed free for internal lab use 1005 - 03ee free for internal lab use 1006 - 03ef free for internal lab use 1007 - 03f0 free for internal lab use 1008 - 03f1 free for internal lab use 1009 - 0477 Teensy Rebootor - 0478 Teensy Halfkay Bootloader - 05dc shared ID for use with libusb - 05dd BlackcatUSB2 - 05e1 CDC-ACM class devices (modems) - 05e4 MIDI class devices - 076b OpenPCD 13.56MHz RFID Reader - 076c OpenPICC 13.56MHz RFID Simulator (native) - 08ac OpenBeacon USB stick - 08ca Alpermann+Velte Universal Display - 08cb Alpermann+Velte Studio Clock - 08cc Alpermann+Velte SAM7S MT Boot Loader - 08cd Alpermann+Velte SAM7X MT Boot Loader - 27da Mouse - 27db Keyboard - 27dc Joystick - 27dd CDC-ACM class devices (modems) - 27de MIDI class devices -16ca Wireless Cables, Inc. - 1502 Bluetooth Dongle -16cc silex technology, Inc. -16d0 GrauTec - 054b ReelBox OLED Display (external) -16d3 Frontline Test Equipment, Inc. -16d5 AnyDATA Corporation - 6202 CDMA/UMTS/GPRS modem - 6501 CDMA 2000 1xRTT/EV-DO Modem - 6502 CDMA/UMTS/GPRS modem -16d6 JABLOCOM s.r.o. - 8000 GDP-04 desktop phone - 8001 EYE-02 - 8003 GDP-04 modem - 8004 Bootloader - 8005 GDP-04i - 8007 BTP-06 modem -16d8 CMOTECH Co., Ltd. - 5141 CMOTECH CDMA Technologies modem - 5533 CCU-550 CDMA EV-DO modem - 5543 CDMA 2000 1xRTT/1xEVDO modem - 6280 CMOTECH CDMA Technologies modem - 6803 CNU-680 CDMA EV-DO modem - 8001 Gobi 2000 Wireless Modem (QDL mode) - 8002 Gobi 2000 Wireless Modem -16dc Wiener, Plein & Baus - 0001 CC - 000b VM -16df King Billion Electronics Co., Ltd. -16f0 GN ReSound A/S - 0003 Airlink Wireless Programming Interface -16f5 Futurelogic Inc. -1706 BlueView Technologies, Inc. -1707 ARTIMI -170b Swissonic - 0011 MIDI-USB 1x1 -170d Avnera -1725 Vitesse Semiconductor -1726 Axesstel, Inc. - 1000 wireless modem - 2000 wireless modem - 3000 wireless modem -172f Waltop International Corp. - 0022 Tablet - 0024 Tablet - 0025 Tablet - 0026 Tablet - 0031 Slim Tablet 12.1" - 0032 Slim Tablet 5.8" - 0034 Slim Tablet 12.1" - 0038 Genius G-Pen F509 - 0500 Media Tablet 14.1" - 0501 Media Tablet 10.6" - 0502 Sirius Battery Free Tablet -1733 Cellink Technology Co., Ltd - 0101 RF Wireless Optical Mouse OP-701 -1736 CANON IMAGING SYSTEM TECHNOLOGIES INC. -1737 Linksys - 0039 USB1000 - 0070 WUSB100 v1 RangePlus Wireless Network Adapter [Ralink RT2870] - 0071 WUSB600N v1 Dual-Band Wireless-N Network Adapter [Ralink RT2870] - 0073 WUSB54GC v2 802.11g Adapter [Realtek RTL8187B] - 0075 WUSB54GSC v2 802.11g Adapter - 0077 WUSB54GC v3 802.11g Adapter [Ralink RT2070L] - 0078 WUSB100 v2 RangePlus Wireless Network Adapter [Ralink RT3070] - 0079 WUSB600N v2 Dual-Band Wireless-N Network Adapter [Ralink RT3572] -1740 Senao - 0605 LevelOne WUA-0605 N_Max Wireless USB Adapter - 0615 LevelOne WUA-0615 N_Max Wireless USB Adapter - 2000 NUB-8301 802.11bg - 3701 EUB-3701 EXT 802.11g Wireless Adapter [Ralink RT2571W] - 9701 EnGenius 802.11n Wireless USB Adapter - 9702 EnGenius 802.11n Wireless USB Adapter - 9703 EnGenius 802.11n Wireless USB Adapter - 9705 EnGenius 802.11n Wireless USB Adapter - 9706 EUB9706 802.11n Wireless Adapter [Ralink RT3072] - 9801 EUB9801 802.11abgn Wireless Adapter [Ralink RT3572] -1743 General Atomics -174c ASMedia Technology Inc. -174f Syntek - 1105 SM-MS/Pro-MMC-XD Card Reader - 1403 Integrated Webcam - 1404 USB Camera device, 1.3 MPixel Web Cam - 5212 USB 2.0 UVC PC Camera - 5a11 PC Camera - 5a31 Sonix USB 2.0 Camera - 5a35 Sonix 1.3MPixel USB 2.0 Camera - 6a31 Web Cam - Asus A8J, F3S, F5R, VX2S, V1S - 6a33 Web Cam - Asus F3SA, F9J, F9S - 6a51 2.0MPixel Web Cam - Asus Z96J, Z96S, S96S - 6a54 Web Cam - 6d51 2.0Mpixel Web Cam - Eurocom D900C - 8a12 Syntek 0.3MPixel USB 2.0 UVC PC Camera - 8a33 Syntek USB 2.0 UVC PC Camera - a311 1.3MPixel Web Cam - Asus A3A, A6J, A6K, A6M, A6R, A6T, A6V, A7T, A7sv, A7U - a312 1.3MPixel Web Cam - a821 Web Cam - Packard Bell BU45, PB Easynote MX66-208W - aa11 Web Cam -1753 GERTEC Telecomunicacoes Ltda. - c901 PPC900 Pinpad Terminal -1759 LucidPort Technology, Inc. -1761 ASUSTek Computer, Inc. (wrong ID) - 0b05 802.11n Network Adapter (wrong ID - swapped vendor and device) -1772 System Level Solutions, Inc. -1776 Arowana - 501c 300K CMOS Camera -177f Sweex - 0153 LW153 802.11n Adapter [ralink rt3070] - 0313 LW313 802.11n Adapter [ralink rt2770 + rt2720] -1781 Multiple Vendors - 083e MetaGeek Wi-Spy - 083f MetaGeek Wi-Spy 2.4x - 0938 Iguanaworks USB IR Transceiver - 0c9f USBtiny -1782 Spreadtrum Communications Inc. -1784 TopSeed Technology Corp. - 0001 eHome Infrared Transceiver - 0004 RF Combo Device - 0006 eHome Infrared Transceiver - 0007 eHome Infrared Transceiver - 0008 eHome Infrared Transceiver - 000a eHome Infrared Transceiver -1787 ATI AIB -1788 ShenZhen Litkconn Technology Co., Ltd. -1796 Printrex, Inc. -1797 JALCO CO., LTD. -1799 Belkin Components - 7051 F5D7051 802.11g Adapter v1000 [Broadcom 4320] -179d Ricavision International, Inc. - 0010 Internal Infrared Transceiver -17a0 Samson Technologies Corp. - 0001 C01U condenser microphone - 0002 Q1U dynamic microphone - 0100 C03U multi-pattern microphone - 0101 UB1 boundary microphone - 0200 StudioDock monitors (internal hub) - 0201 StudioDock monitors (audio) - 0301 Q2U handheld microphone with XLR - 0302 GoMic compact condenser microphone -17a4 Concept2 - 0001 Performance Monitor 3 - 0002 Performance Monitor 4 -17a5 Advanced Connection Technology Inc. -17a7 MICOMSOFT CO., LTD. -17b3 Grey Innovation - 0004 Linux-USB Midi Gadget -17c3 Singim International Corp. -17cc Native Instruments - 041c Audio 2 DJ - 0808 Maschine Controller - 0815 Audio Kontrol 1 - 0839 Audio 4 DJ - 0d8d Guitarrig Mobile - 1915 Session I/O - 1940 RigKontrol3 - 1969 RigKontrol2 - 1978 Audio 8 DJ - 2305 Traktor Kontrol X1 - 4711 Kore Controller - 4712 Kore Controller 2 - baff Traktor Kontrol S4 -17cf Hip Hing Cable & Plug Mfy. Ltd. -17d0 Sanford L.P. -17d3 Korea Techtron Co., Ltd. -17e9 Newnham Research - 0051 USB VGA Adaptor -17eb Cornice, Inc. -17ef Lenovo - 1003 Integrated Smart Card Reader - 1004 Integrated Webcam - 100a ThinkPad Mini Dock Plus Series 3 - 3815 ChipsBnk 2GB USB Stick - 4802 Lenovo Vc0323+MI1310_SOC Camera - 4807 UVC Camera - 480c Integrated Webcam - 480d Integrated Webcam [R5U877] - 480e Integrated Webcam [R5U877] - 480f Integrated Webcam [R5U877] - 4810 Integrated Webcam [R5U877] - 4811 Integrated Webcam [R5U877] - 4812 Integrated Webcam [R5U877] - 4813 Integrated Webcam [R5U877] - 4814 Integrated Webcam [R5U877] - 4815 Integrated Webcam [R5U877] - 481c Integrated Webcam - 6009 ThinkPad Keyboard with TrackPoint -17f5 K.K. Rocky -17f6 Unicomp, Inc - 0709 Model M Keyboard -1809 Advantech - 4761 USB-4761 Portable Data Acquisition Module -1822 Twinhan - 3201 VisionDTV USB-Ter/HAMA USB DVB-T device cold - 3202 VisionDTV USB-Ter/HAMA USB DVB-T device warm -1831 Gwo Jinn Industries Co., Ltd. -1832 Huizhou Shenghua Industrial Co., Ltd. -183d VIVOphone - 0010 VoiceKey -1843 Vaisala -1849 ASRock Incorporation -1852 GYROCOM C&C Co., LTD - 7922 Audiotrak DR.DAC2 DX -1854 Memory Devices Ltd. -185b Compro - 3020 K100 Infrared Receiver - 3082 K100 Infrared Receiver v2 - d000 Compro Videomate DVB-U2000 - DVB-T USB cold - d001 Compro Videomate DVB-U2000 - DVB-T USB warm -1861 Tech Technology Industrial Company -1862 Teridian Semiconductor Corp. -1870 Nexio Co., Ltd - 0001 iNexio Touchscreen controller -1871 Aveo Technology Corp. - 0d01 USB2.0 Camera -187c Alienware Corporation - 0600 Dual Compatible Game Pad -187f Siano Mobile Silicon - 0010 Stallar Board - 0100 Stallar Board - 0200 Nova A - 0201 Nova B - 0202 Nice - 0300 Vega - 0301 VeNice -1892 Vast Technologies, Inc. -1894 Topseed - 5632 Atek Tote Remote - 5641 TSAM-004 Presentation Remote -1897 Evertop Wire Cable Co. -18a5 Verbatim, Ltd - 0214 Portable Hard Drive - 0216 External Hard Drive - 0218 External Hard Drive -18b1 Petalynx - 0037 Maxter Remote Control -18b4 e3C Technologies - 1001 DUTV007 - 1002 EC168 (v5) based USB DVB-T receiver - 1689 DUTV009 - fffa EC168 (v2) based USB DVB-T receiver - fffb EC168 (v3) based USB DVB-T receiver -18b6 Mikkon Technology Limited -18b7 Zotek Electronic Co., Ltd. -18c5 AMIT Technology, Inc. - 0002 CG-WLUSB2GO - 0008 CG-WLUSB2GNR Corega Wireless USB Adapter - 0012 CG-WLUSB10 Corega Wireless USB Adapter -18cd Ecamm - cafe Pico iMage -18d1 Google Inc. - 4e11 Nexus One - 4e12 Nexus One (debug) - 4e13 Nexus One (tether) - 4e21 Nexus S - 4e22 Nexus S (debug) -18d5 Starline International Group Limited -18d9 Kaba - 01a0 B-Net 91 07 -18dd Planon System Solutions Inc. - 1000 DocuPen RC800 -18e3 Fitipower Integrated Technology Inc - 7102 Multi Card Reader (Internal) - 9101 All-in-1 Card Reader - 9102 Multi Card Reader - 9512 Webcam -18e8 Qcom - 6196 RT2573 - 6229 RT2573 - 6232 Wireless 802.11g 54Mbps Network Adapter [RTL8187] -18ea Matrox Graphics, Inc. - 0002 DualHead2Go [Analog Edition] - 0004 TripleHead2Go [Digital Edition] -18ec Arkmicro Technologies Inc. - 3118 USB to IrDA adapter [ARK3116T] - 3188 ARK3188 UVC Webcam -18fd FineArch Inc. -1908 GEMBIRD - 1320 PhotoFrame PF-15-1 -190d Motorola GSG -1914 Alco Digital Devices Limited -1915 Nordic Semiconductor ASA - 2233 Linksys WUSB11 v2.8 802.11b Adapter [Atmel AT76C505] - 2234 Linksys WUSB54G v1 OEM 802.11g Adapter [Intersil ISL3886] - 2235 Linksys WUSB54GP v1 OEM 802.11g Adapter [Intersil ISL3886] - 2236 Linksys WUSB11 v3.0 802.11b Adapter [Intersil PRISM 3] -1926 NextWindow - 0003 1900 HID Touchscreen - 0006 1950 HID Touchscreen - 0064 1950 HID Touchscreen - 0065 1950 HID Touchscreen - 0066 1950 HID Touchscreen - 0067 1950 HID Touchscreen - 0068 1950 HID Touchscreen - 0069 1950 HID Touchscreen - 0071 1950 HID Touchscreen - 0072 1950 HID Touchscreen - 0073 1950 HID Touchscreen - 0074 1950 HID Touchscreen - 0075 1950 HID Touchscreen - 0076 1950 HID Touchscreen - 0077 1950 HID Touchscreen - 0078 1950 HID Touchscreen - 0079 1950 HID Touchscreen - 007a 1950 HID Touchscreen - 007e 1950 HID Touchscreen - 007f 1950 HID Touchscreen - 0080 1950 HID Touchscreen - 0081 1950 HID Touchscreen - 0082 1950 HID Touchscreen - 0083 1950 HID Touchscreen - 0084 1950 HID Touchscreen - 0085 1950 HID Touchscreen - 0086 1950 HID Touchscreen - 0087 1950 HID Touchscreen -192f Avago Technologies, Pte. - 0000 Mouse -1930 Shenzhen Xianhe Technology Co., Ltd. -1931 Ningbo Broad Telecommunication Co., Ltd. -1934 Feature Integration Technology Inc. (Fintek) - 0602 F71610 or F71612 Consumer Infrared Receiver/Transceiver - 0702 Integrated Consumer Infrared Receiver/Transceiver - 5168 F71610A or F71612A Consumer Infrared Receiver/Transceiver -1941 Dream Link - 8021 WH1080 Weather Station / USB Missile Launcher -1943 Sensoray Co., Inc. - 2250 Model 2250 MPEG and JPEG Capture Card - 2253 Model 2253 Audio/Video Codec Card - 2255 Model 2255 4 Channel Capture Card - 2257 Model 2257 4 Channel Capture Card - a250 Model 2250 MPEG and JPEG Capture Card (cold) - a253 Model 2253 Audio/Video Codec Card (cold) -1949 Lab126 - 0002 Amazon Kindle - 0004 Amazon Kindle 3 -1951 Hyperstone AG -1953 Ironkey Inc. -1954 Radiient Technologies -195d Itron Technology iONE - 7002 Libra-Q11 IR remote - 7006 Libra-Q26 / 1.0 Remote - 7777 Scorpius wireless keyboard - 7779 Scorpius-P20MT -1967 CASIO HITACHI Mobile Communications Co., Ltd. -196b Wispro Technology Inc. -1970 Dane-Elec Corp. USA -1975 Dongguan Guneetal Wire & Cable Co., Ltd. -1976 Chipsbrand Microelectronics (HK) Co., Ltd. -1977 T-Logic - 0111 TL203 MP3 Player and Voice Recorder -1989 Nuconn Technology Corp. -198f Beceem Communications Inc. - 0210 BCS200 WiMAX Adapter -1990 Acron Precision Industrial Co., Ltd. -1995 Trillium Technology Pty. Ltd. - 3202 REC-ADPT-USB (recorder) - 3203 REC-A-ADPT-USB (recorder) -199e The Imaging Source Europe GmbH - 8101 DFx 21BU04 Camera -199f Benica Corporation -19a8 Biforst Technology Inc. -19ab Bodelin - 1000 ProScope HR -19af S Life - 6611 Celestia VoIP Phone -19b2 Batronix - 0010 BX32 Batupo - 0011 BX32P Barlino - 0012 BX40 Bagero - 0013 BX48 Batego -19b4 Celestron - 0002 SkyScout Personal Planetarium - 0101 Handheld Digital Microscope 44302 -19b5 B & W Group -19b6 Infotech Logistic, LLC -19b9 Data Robotics - 8d20 Drobo Elite -19ca Mindtribe - 0001 Sandio 3D HID Mouse -19cf Parrot SA -19d2 ONDA Communication S.p.A. - 0002 ET502HS/MT505UP ZTE MF632 - 0007 ZTE TU25 WiMAX Adapter [Beceem BCS200] - 0031 ZTE MF110/MF636 - 0063 ZTE K3565-Z HSDPA - 0064 ZTE MF627 AU - 0083 ZTE MF190 - 0103 ZTE MF112 - 2000 ZTE MF627/MF628/MF628+/MF636+ HSDPA/HSUPA - fff2 Gobi Wireless Modem (QDL mode) - fff3 Gobi Wireless Modem -19e1 WeiDuan Electronic Accessory (S.Z.) Co., Ltd. -19e8 Industrial Technology Research Institute -19ef Pak Heng Technology (Shenzhen) Co., Ltd. -19f7 RODE Microphones - 0001 Podcaster -19fa Gampaq Co.Ltd - 0703 Steering Wheel -19ff Dynex - 0102 1.3MP Webcam - 0201 Rocketfish Wireless 2.4G Laser Mouse -1a08 Bellwood International, Inc. -1a0a USB-IF non-workshop - badd USB OTG Compliance test device -1a12 KES Co., Ltd. -1a25 Amphenol East Asia Ltd. -1a2a Seagate Branded Solutions -1a32 Quanta Microsystems, Inc. - 0304 802.11n Wireless LAN Card -1a36 Biwin Technology Ltd. -1a40 TERMINUS TECHNOLOGY INC. - 0101 USB-2.0 4-Port HUB -1a41 Action Electronics Co., Ltd. -1a44 VASCO Data Security International - 0001 Digipass 905 SmartCard Reader -1a4a Silicon Image -1a4b SafeBoot International B.V. -1a61 Abbott Diabetes Care -1a6a Spansion Inc. -1a6d SamYoung Electronics Co., Ltd -1a6e Global Unichip Corp. -1a6f Sagem Orga GmbH -1a79 Bayer Health Care LLC -1a7b Lumberg Connect GmbH & Co. KG -1a7c Evoluent - 0068 VerticalMouse 3 - 0168 VerticalMouse 3 Wireless - 0191 VerticalMouse 4 -1a86 QinHeng Electronics - 5523 CH341 in serial mode, usb to serial port converter - 5584 CH341 in parallel mode, usb to printer port converter - 7523 HL-340 USB-Serial adapter - 752d CH345 MIDI adapter - 7584 CH340S - e008 HID-based USB-serial converter, full-speed, similar to HE2325U -1a89 Dynalith Systems Co., Ltd. -1a8b SGS Taiwan Ltd. -1a8d BandRich, Inc. - 1002 BandLuxe 3.5G HSDPA Adapter - 1009 BandLuxe 3.5G HSPA Adapter -1a90 Corsair Voyager GT 16GB -1a98 Leica Camera AG -1aa4 Data Drive Thru, Inc. -1aa5 UBeacon Technologies, Inc. -1aa6 eFortune Technology Corp. -1acb Salcomp Plc -1ad1 Desay Wire Co., Ltd. -1ae4 ic-design Reinhard Gottinger GmbH -1ae7 X-TENSIONS - 0381 VS-DVB-T 380U (af9015 based) - 2001 SpeedLink SL-6825 -1aed High Top Precision Electronic Co., Ltd. -1aef Conntech Electronic (Suzhou) Corporation -1b04 Meilhaus Electronic GmBH - 0630 ME-630 - 0940 ME-94 - 0950 ME-95 - 0960 ME-96 - 1000 ME-1000 - 100a ME-1000 - 100b ME-1000 - 1400 ME-1400 - 140a ME-1400A - 140b ME-1400B - 140c ME-1400C - 140d ME-1400D - 140e ME-1400E - 14ea ME-1400EA - 14eb ME-1400EB - 1604 ME-1600/4U - 1608 ME-1600/8U - 160c ME-1600/12U - 160f ME-1600/16U - 168f ME-1600/16U8I - 4610 ME-4610 - 4650 ME-4650 - 4660 ME-4660 - 4661 ME-4660I - 4662 ME-4660 - 4663 ME-4660I - 4670 ME-4670 - 4671 ME-4670I - 4672 ME-4670S - 4673 ME-4670IS - 4680 ME-4680 - 4681 ME-4680I - 4682 ME-4680S - 4683 ME-4680IS - 6004 ME-6000/4 - 6008 ME-6000/8 - 600f ME-6000/16 - 6014 ME-6000I/4 - 6018 ME-6000I/8 - 601f ME-6000I/16 - 6034 ME-6000ISLE/4 - 6038 ME-6000ISLE/8 - 603f ME-6000ISLE/16 - 6044 ME-6000/4/DIO - 6048 ME-6000/8/DIO - 604f ME-6000/16/DIO - 6054 ME-6000I/4/DIO - 6058 ME-6000I/8/DIO - 605f ME-6000I/16/DIO - 6074 ME-6000ISLE/4/DIO - 6078 ME-6000ISLE/8/DIO - 607f ME-6000ISLE/16/DIO - 6104 ME-6100/4 - 6108 ME-6100/8 - 610f ME-6100/16 - 6114 ME-6100I/4 - 6118 ME-6100I/8 - 611f ME-6100I/16 - 6134 ME-6100ISLE/4 - 6138 ME-6100ISLE/8 - 613f ME-6100ISLE/16 - 6144 ME-6100/4/DIO - 6148 ME-6100/8/DIO - 614f ME-6100/16/DIO - 6154 ME-6100I/4/DIO - 6158 ME-6100I/8/DIO - 615f ME-6100I/16/DIO - 6174 ME-6100ISLE/4/DIO - 6178 ME-6100ISLE/8/DIO - 617f ME-6100ISLE/16/DIO - 6259 ME-6200I/9/DIO - 6359 ME-6300I/9/DIO - 810a ME-8100A - 810b ME-8100B - 820a ME-8200A - 820b ME-8200B -1b20 MStar Semiconductor, Inc. -1b22 WiLinx Corp. -1b26 Cellex Power Products, Inc. -1b27 Current Electronics Inc. -1b28 NAVIsis Inc. -1b32 Ugobe Life Forms, Inc. - 0064 Pleo robotic dinosaur -1b36 ViXS Systems, Inc. -1b3b iPassion Technology Inc. - 2933 PC Camera/Webcam controller - 2935 PC Camera/Webcam controller - 2936 PC Camera/Webcam controller - 2937 PC Camera/Webcam controller - 2938 PC Camera/Webcam controller - 2939 PC Camera/Webcam controller - 2950 PC Camera/Webcam controller - 2951 PC Camera/Webcam controller - 2952 PC Camera/Webcam controller - 2953 PC Camera/Webcam controller - 2955 PC Camera/Webcam controller - 2956 PC Camera/Webcam controller - 2957 PC Camera/Webcam controller - 2958 PC Camera/Webcam controller - 2959 PC Camera/Webcam controller - 2960 PC Camera/Webcam controller - 2961 PC Camera/Webcam controller - 2962 PC Camera/Webcam controller - 2963 PC Camera/Webcam controller - 2965 PC Camera/Webcam controller - 2966 PC Camera/Webcam controller - 2967 PC Camera/Webcam controller - 2968 PC Camera/Webcam controller - 2969 PC Camera/Webcam controller -1b3f Generalplus Technology Inc. -1b47 Energizer Holdings, Inc. - 0001 CHUSB Duo Charger (NiMH AA/AAA USB smart charger) -1b48 Plastron Precision Co., Ltd. -1b59 K.S. Terminals Inc. -1b5a Chao Zhou Kai Yuan Electric Co., Ltd. -1b65 The Hong Kong Standards and Testing Centre Ltd. -1b72 ATERGI TECHNOLOGY CO., LTD. -1b73 Fresco Logic - 1000 xHC1 Controller -1b75 Ovislink Corp. - 3072 AirLive WN-360USB adapter -1b76 Legend Silicon Corp. -1b80 Afatech - c810 MC810 [af9015] - d393 DVB-T receiver [RTL2832U] - d396 UB396-T [RTL2832U] - d397 DVB-T receiver [RTL2832U] - d398 DVB-T receiver [RTL2832U] - d700 FM Radio SnapMusic Mobile 700 (FM700) - e383 DVB-T UB383-T [af9015] - e385 DVB-T UB385-T [af9015] - e386 DVB-T UB385-T [af9015] - e39a DVB-T395U [af9015] - e39b DVB-T395U [af9015] - e409 IT9137FN Dual DVB-T [KWorld UB499-2T] -1b86 Dongguan Guanshang Electronics Co., Ltd. -1b88 ShenMing Electron (Dong Guan) Co., Ltd. -1b8c Altium Limited -1b8d e-MOVE Technology Co., Ltd. -1b8e Amlogic, Inc. -1b8f MA LABS, Inc. -1b96 N-Trig - 0001 Duosense Transparent Electromagnetic Digitizer -1b98 YMax Communications Corp. -1b99 Shenzhen Yuanchuan Electronic -1ba1 JINQ CHERN ENTERPRISE CO., LTD. -1ba2 Lite Metals & Plastic (Shenzhen) Co., Ltd. -1ba4 Ember Corporation - 0001 InSight USB Link -1ba6 Abilis Systems -1ba8 China Telecommunication Technology Labs -1bad Harmonix Music - 0002 Guitar for Xbox 360 - 0003 Drum Kit for Xbox 360 -1bae Vuzix Corporation - 0002 VR920 Immersive Eyewear -1bbb T & A Mobile Phones -1bc4 Ford Motor Co. -1bc5 AVIXE Technology (China) Ltd. -1bce Contac Cable Industrial Limited -1bcf Sunplus Innovation Technology Inc. - 0007 Optical Mouse - 05c5 SPRF2413A [2.4GHz Wireless Keyboard/Mouse Receiver] - 05cf Micro keyboard & mouse receiver -1bd0 Hangzhou Riyue Electronic Co., Ltd. -1bde P-TWO INDUSTRIES, INC. -1bef Shenzhen Tongyuan Network-Communication Cables Co., Ltd -1bf0 RealVision Inc. -1bf5 Extranet Systems Inc. -1bf6 Orient Semiconductor Electronics, Ltd. -1bfd TouchPack - 1268 Touch Screen - 1368 Touch Screen - 1568 Capacitive Touch Screen - 1668 IR Touch Screen - 1688 Resistive Touch Screen - 2968 Touch Screen - 5968 Touch Screen - 6968 Touch Screen -1c02 Kreton Corporation -1c04 QNAP System Inc. -1c0d Relm Wireless -1c10 Lanterra Industrial Co., Ltd. -1c13 ALECTRONIC LIMITED -1c1a Datel Electronics Ltd. -1c1b Volkswagen of America, Inc. -1c1f Goldvish S.A. -1c20 Fuji Electric Device Technology Co., Ltd. -1c21 ADDMM LLC -1c22 ZHONGSHAN CHIANG YU ELECTRIC CO., LTD. -1c26 Shanghai Haiying Electronics Co., Ltd. -1c27 HuiYang D & S Cable Co., Ltd. -1c31 LS Cable Ltd. -1c34 SpringCard - 7241 Prox'N'Roll RFID Scanner -1c37 Authorizer Technologies, Inc. -1c3d NONIN MEDICAL INC. -1c3e Wep Peripherals -1c49 Cherng Weei Technology Corp. -1c4f SiGma Micro - 0003 HID controller - 3000 Micro USB Web Camera -1c6b Philips & Lite-ON Digital Solutions Corporation -1c6c Skydigital Inc. -1c73 AMT - 861f Anysee E30 USB 2.0 DVB-T Receiver -1c77 Kaetat Industrial Co., Ltd. -1c78 Datascope Corp. -1c79 Unigen Corporation -1c7a LighTuning Technology Inc. -1c7b LUXSHARE PRECISION INDUSTRY (SHENZHEN) CO., LTD. -1c87 2N TELEKOMUNIKACE a.s. -1c88 Somagic, Inc. -1c89 HONGKONG WEIDIDA ELECTRON LIMITED -1c8e ASTRON INTERNATIONAL CORP. -1c98 ALPINE ELECTRONICS, INC. -1ca0 ACCARIO Inc. -1cac Kinstone - a332 C8 Webcam - b288 C18 Webcam -1cb3 Aces Electronic Co., Ltd. -1cb4 OPEX CORPORATION -1cbe Luminary Micro Inc. -1cbf FORTAT SKYMARK INDUSTRIAL COMPANY -1cc0 PlantSense -1cca NextWave Broadband Inc. -1ccd Bodatong Technology (Shenzhen) Co., Ltd. -1cd4 adp corporation -1cd5 Firecomms Ltd. -1cd6 Antonio Precise Products Manufactory Ltd. -1cde Telecommunications Technology Association (TTA) -1cdf WonTen Technology Co., Ltd. -1ce0 EDIMAX TECHNOLOGY CO., LTD. -1ce1 Amphenol KAE -1cfc ANDES TECHNOLOGY CORPORATION -1cfd Flextronics Digital Design Japan, LTD. -1d07 Solid-Motion -1d08 NINGBO HENTEK DRAGON ELECTRONICS CO., LTD. -1d09 TechFaith Wireless Technology Limited - 1026 HSUPA Modem FLYING-LARK46-VER0.07 [Flying Angel] -1d0a Johnson Controls, Inc. The Automotive Business Unit -1d0b HAN HUA CABLE & WIRE TECHNOLOGY (J.X.) CO., LTD. -1d14 ALPHA-SAT TECHNOLOGY LIMITED -1d17 C-Thru Music Ltd. - 0001 AXiS-49 Harmonic Table MIDI Keyboard -1d19 Dexatek Technology Ltd. - 1101 DK DVB-T Dongle - 1102 DK mini DVB-T Dongle - 1103 DK 5217 DVB-T Dongle - 6105 Video grabber - 8202 DK DVBC/T DONGLE -1d1f Diostech Co., Ltd. -1d20 SAMTACK INC. -1d4d PEGATRON CORPORATION - 0002 Ralink RT2770/2720 802.11b/g/n Wireless LAN Mini-USB Device - 000c Ralink RT3070 802.11b/g/n Wireless Lan USB Device - 000e Ralink RT3070 802.11b/g/n Wireless Lan USB Device -1d50 OpenMoko, Inc. - 5119 GTA01/GTA02 U-Boot Bootloader -1d5b Smartronix, Inc. -1d6b Linux Foundation - 0001 1.1 root hub - 0002 2.0 root hub - 0003 3.0 root hub - 0100 PTP Gadget - 0101 Audio Gadget - 0102 EEM Gadget - 0103 NCM (Ethernet) Gadget - 0104 Multifunction Composite Gadget - 0105 FunctionFS Gadget - 0200 Qemu Audio Device -1e0e Qualcomm / Option -1e10 Point Grey Research, Inc. - 2004 Sony 1.3MP 1/3" ICX445 IIDC video camera [Chameleon] -1e1d Lumension Security - 0165 Secure Pen drive -1e1f INVIA -1e29 Festo AG & Co. KG - 0101 CPX Adapter - 0102 CPX Adapter >=HW10.09 [CP2102] - 0401 iL3-TP [AT90USB646] - 0402 FTDI232 [EasyPort] - 0403 FTDI232 [EasyPort Mini] - 0404 FTDI232 [Netzteil-GL] - 0405 FTDI232 [MotorPrüfstand] - 0406 STM32F103 [EasyKit] - 0407 LPC2378 [Robotino] - 0408 LPC2378 [Robotino-Arm] - 0409 LPC2378 [Robotino-Arm Bootloader] - 040a LPC2378 [Robotino Bootloader] - 0501 CP2102 [CMSP] - 0601 CMMP-AS -1e41 Cleverscope - 0001 CS328A PC Oscilloscope -1e54 TypeMatrix - 2030 2030 USB Keyboard -1e68 TrekStor GmbH & Co. KG - 001b DataStation maxi g.u -1e71 NZXT - 0001 Avatar Optical Mouse -1e74 Coby Electronics Corporation - 6511 MP705-8G MP3 player - 6512 MP705-4G -1e7d ROCCAT - 2c24 Pyra Mouse (wired) - 2ced Kone Mouse - 2d51 Kone+ Mouse - 30d4 Arvo Keyboard -1ebb NuCORE Technology, Inc. -1eda AirTies Wireless Networks - 2310 802.11n USB Wireless LAN Card -1ef6 EADS Deutschland GmbH -1f28 Cal-Comp - 0020 CDMA USB Modem A600 - 0021 CD INSTALLER USB Device -1f4d G-Tek Electronics Group - b803 Lifeview LV5TDLX DVB-T [RTL2832U] -1f82 TANDBERG - 0001 PrecisionHD Camera -1f84 Alere, Inc. -1f87 Stantum - 0002 Multi-touch HID Controller -1fbd Delphin Technology AG - 0001 Expert Key - Data aquisition system -1fc9 NXP Semiconductors -1fe7 Vertex Wireless Co., Ltd. - 1000 VW100 series CDMA EV-DO Rev.A modem -2001 D-Link Corp. - 0001 DWL-120 WIRELESS ADAPTER - 0201 DHN-120 10Mb Home Phoneline Adapter - 1a00 10/100 Ethernet - 200c 10/100 Ethernet - 3200 DWL-120 802.11b Wireless Adapter(rev.E1) [Atmel at76c503a] - 3301 DWA-130 802.11n Wireless N Adapter(rev.C1) [Realtek RTL8192U] - 3500 Elitegroup Computer Systems WLAN card WL-162 - 3700 DWL-122 802.11b [Intersil Prism 3] - 3701 DWL-G120 Spinnaker 802.11g [Intersil ISL3886] - 3702 DWL-120 802.11b Wireless Adapter(rev.F) [Intersil ISL3871] - 3703 AirPlus G DWL-G122 Wireless Adapter [Intersil ISL3886] - 3704 AirPlus G DWL-G122 Wireless Adapter(rev.A2) [Intersil ISL3887] - 3705 AirPlus G DWL-G120 Wireless Adapter(rev.C) [Intersil ISL3887] - 3761 IEEE 802.11g USB2.0 Wireless Network Adapter-PN - 3a00 DWL-AG132 [Atheros AR5523] - 3a01 DWL-AG132 (no firmware) [Atheros AR5523] - 3a02 DWL-G132 [Atheros AR5523] - 3a03 DWL-G132 (no firmware) [Atheros AR5523] - 3a04 DWL-AG122 [Atheros AR5523] - 3a05 DWL-AG122 (no firmware) [Atheros AR5523] - 3a80 AirPlus Xtreme G DWL-G132 Wireless Adapter - 3a81 predator Bootloader Download - 3a82 AirPremier AG DWL-AG132 Wireless Adapter - 3a83 predator Bootloader Download - 3b00 AirPlus DWL-120+ Wireless Adapter [Texas Instruments ACX100USB] - 3b01 WLAN Boot Device - 3c00 AirPlus G DWL-G122 Wireless Adapter(rev.B1) [Ralink RT2500USB] - 3c01 AirPlus AG DWL-AG122 Wireless Adapter - 3c02 AirPlus G DWL-G122 Wireless Adapter - 3c05 DUB-E100 Fast Ethernet [asix] - 4000 DSB-650C Ethernet [klsi] - 4001 DSB-650TX Ethernet [pegasus] - 4002 DSB-650TX Ethernet [pegasus] - 4003 DSB-650TX-PNA Ethernet [pegasus] - 400b 10/100 Ethernet - 4102 10/100 Ethernet - 5100 DSL-200 ADSL ATM Modem - 5102 DSL-200 ADSL Loader - 5b00 Remote NDIS Network Device - 9414 Cable Modem - 9b00 Broadband Cable Modem Remote NDIS Device - abc1 DSB-650 Ethernet [pegasus] - f013 DLink 7 port USB2.0 Hub - f103 DUB-H7 7-port USB 2.0 hub - f10d Accent Communications Modem - f110 DUB-AV300 A/V Capture - f111 DBT-122 Bluetooth adapter - f112 DUB-T210 Audio Device - f116 Formosa 2 - f117 Formosa 3 - f118 Formosa 4 -2013 Unknown (Pinnacle?) - 0245 PCTV 73ESE - 0246 PCTV 74E - 0248 PCTV 282E -2019 PLANEX - 3220 GW-US11S WLAN [Atmel AT76C503A] - 5303 GW-US54GXS 802.11bg - 5304 GWUS300 802.11n - ab01 GW-US54HP - ab24 GW-US300MiniS - ab25 GW-USMini2N 802.11n Wireless Adapter [Ralink RT2870] - ab28 GW-USNano - ab29 GW-USMicro300 - ab50 GW-US54Mini2 - c002 GW-US54SG - c007 GW-US54GZL - ed02 GW-USMM - ed06 802.11n Wireless LAN Adapter - ed10 GW-US300Mini2 - ed14 GW-USMicroN - ed17 GW-USValue-EZ -2040 Hauppauge - 0c80 Windham - 0c90 Windham - 1700 CataMount - 1800 Okemo A - 1801 Okemo B - 2000 Tiger Minicard - 2009 Tiger Minicard R2 - 200a Tiger Minicard - 2010 Tiger Minicard - 2011 WinTV MiniCard [Dell Digital TV Receiver] - 2019 Tiger Minicard - 2400 WinTV PVR USB2 (Model 24019) - 4700 WinTV Nova-S-USB2 - 4902 HD PVR - 4982 HD PVR - 5500 Windham - 5510 Windham - 5520 Windham - 5530 Windham - 5580 Windham - 5590 Windham - 6500 WinTV HVR-900 - 6502 WinTV HVR-900 - 6503 WinTV HVR-930 - 6513 WinTV HVR-980 - 7050 Nova-T Stick - 7060 Nova-T Stick 2 - 7070 Nova-T Stick 3 - 7240 WinTV HVR-850 - 8400 WinTV Nova-T-500 - 9300 WinTV NOVA-T USB2 (cold) - 9301 WinTV NOVA-T USB2 (warm) - 9941 WinTV Nova-T-500 - 9950 WinTV Nova-T-500 - b910 Windham - b980 Windham - b990 Windham - c000 Windham - c010 Windham -2047 Texas Instruments - 0200 MSP430 USB HID Bootstrap Loader -2080 Barnes & Noble - 0001 nook - 0002 NOOKcolor -2087 Cando - 0a01 Multi Touch Panel - 0a02 Multi Touch Panel - 0b03 Multi Touch Panel -20a0 Clay Logic - 414a MDE SPI Interface -20b1 XMOS Ltd - 10ad XUSB Loader - f7d1 XTAG2 - JTAG Adapter -20b3 Hanvon - 0a18 10.1 Touch screen overlay -20b7 Qi Hardware - 0713 Milkymist JTAG/serial - 1540 ben-wpan, AT86RF230-based - 1db5 IDBG in DFU mode - 1db6 IDBG in normal mode - c25b C2 Dongle - cb72 ben-wpan, cntr -20df Simtec Electronics - 0001 Entropy Key [UDEKEY01] -2101 ActionStar - 0201 SIIG 4-to-2 Printer Switch -2162 Creative (?) - 2031 Network Blaster Wireless Adapter - 500c DE5771 Modem Blaster - 8001 Broadxent BritePort DSL Bridge 8010U -2184 GW Instek - 0005 GDS-3000 Oscilloscope - 0006 GDS-3000 Oscilloscope - 0011 AFG Function Generator (CDC) -21a1 Emotiv Systems Pty. Ltd. - 0001 EPOC Consumer Headset Wireless Dongle -21d6 Agecodagis SARL - 0002 Seismic recorder [Tellus] -2222 MacAlly - 0004 iWebKey Keyboard - 2520 Mini Tablet - 4050 AirStick joystick -2227 SAMWOO Enterprise - 3105 SKYDATA SKD-U100 -2233 RadioShack Corporation - 6323 USB Electronic Scale -2237 Kobo Inc. - 4161 eReader White -22a6 Pie Digital, Inc. - ffff PieKey "beta" 4GB model 4E4F41482E4F5247 (SM3251Q BB) -22b8 Motorola PCS - 0001 Wally 2.2 chipset - 0002 Wally 2.4 chipset - 0005 V.60c/V.60i GSM Phone - 0830 2386C-HT820 - 0833 2386C-HT820 [Flash Mode] - 0850 Bluetooth Device - 1001 Patriot 1.0 (GSM) chipset - 1002 Patriot 2.0 chipset - 1005 T280e GSM/GPRS Phone - 1101 Patriot 1.0 (TDMA) chipset - 1801 Rainbow chipset flash - 2035 Bluetooth Device - 2805 GSM Modem - 2821 T720 GSM Phone - 2822 V.120e GSM Phone - 2823 Flash Interface - 2a01 MSM6050 chipset - 2a02 CDMA modem - 2a03 MSM6050 chipset flash - 2a21 V710 GSM Phone (P2K) - 2a22 V710 GSM Phone (AT) - 2a23 MSM6100 chipset flash - 2a41 MSM6300 chipset - 2a42 Usb Modem - 2a43 MSM6300 chipset flash - 2a61 E815 GSM Phone (P2K) - 2a62 E815 GSM Phone (AT) - 2a63 MSM6500 chipset flash - 2a81 MSM6025 chipset - 2a83 MSM6025 chipset flash - 2ac1 MSM6100 chipset - 2ac3 MSM6100 chipset flash - 2d78 XT300[SPICE] - 3001 A835/E1000 GSM Phone (P2K) - 3002 A835/E1000 GSM Phone (AT) - 3801 C350L/C450 (P2K) - 3802 C330/C350L/C450/EZX GSM Phone (AT) - 3803 Neptune LT chipset flash - 4001 OMAP 1.0 chipset - 4002 A920/A925 UMTS Phone - 4003 OMAP 1.0 chipset flash - 4008 OMAP 1.0 chipset RDL - 41d6 Droid X (Windows media mode) - 41d9 Droid/Milestone - 41db Droid/Milestone (Debug mode) - 41de Droid X (PC mode) - 4204 MPx200 Smartphone - 4214 MPc GSM - 4224 MPx220 Smartphone - 4234 MPc CDMA - 4244 MPx100 Smartphone - 4285 Droid X (Mass storage) - 4801 Neptune LTS chipset - 4803 Neptune LTS chipset flash - 4810 Triplet GSM Phone (storage) - 4901 Triplet GSM Phone (P2K) - 4902 Triplet GSM Phone (AT) - 4903 Neptune LTE chipset flash - 4a01 Neptune LTX chipset - 4a03 Neptune LTX chipset flash - 4a32 L6-imode Phone - 5801 Neptune ULS chipset - 5803 Neptune ULS chipset flash - 5901 Neptune VLT chipset - 5903 Neptune VLT chipset flash - 6001 Dalhart EZX - 6003 Dalhart flash - 6004 EZX GSM Phone (CDC Net) - 6006 MOTOROKR E6 - 6008 Dalhart RDL - 6009 EZX GSM Phone (P2K) - 600a Dalhart EZX config 17 - 600b Dalhart EZX config 18 - 600c EZX GSM Phone (USBLAN) - 6021 JUIX chipset - 6023 JUIX chipset flash - 6026 Flash RAM Downloader/miniOS - 6027 USBLAN - 604c EZX GSM Phone (Storage) - 6101 Talon integrated chipset - 6401 Argon chipset - 6403 Argon chipset flash - 6415 ROKR Z6 (MTP mode) - 6604 Washington CDMA Phone - 6631 CDC Modem - 7001 Q Smartphone - fe01 StarTAC III MS900 -22b9 eTurboTouch Technology, Inc. - 0006 Touch Screen -22ba Technology Innovation Holdings, Ltd -2304 Pinnacle Systems, Inc. - 0109 Studio PCTV USB (SECAM) - 0110 Studio PCTV USB (PAL) - 0111 Miro PCTV USB - 0112 Studio PCTV USB (NTSC) with FM radio - 0201 Systems MovieBox Device - 0204 MovieBox USB_B - 0205 DVC 150B - 0206 Systems MovieBox Deluxe Device - 0207 Dazzle DVC90 Video Device - 0208 Studio PCTV USB2 - 020e PCTV 200e - 020f PCTV 400e BDA Device - 0210 Studio PCTV USB (PAL) with FM radio - 0212 Studio PCTV USB (NTSC) - 0213 500-USB Device - 0214 Studio PCTV USB (PAL) with FM radio - 0216 PCTV 60e - 0219 PCTV 260e - 021a Dazzle DVC100 Audio Device - 021b Dazzle DVC130/DVC170 - 021d Dazzle DVC130 - 021e Dazzle DVC170 - 021f PCTV Sat HDTV Pro BDA Device - 0222 PCTV Sat Pro BDA Device - 0223 DazzleTV Sat BDA Device - 0225 Remote Kit Infrared Transceiver - 0226 PCTV 330e - 0227 PCTV for Mac, HD Stick - 0228 PCTV DVB-T Flash Stick - 0229 PCTV Dual DVB-T 2001e - 022a PCTV 160e - 022b PCTV 71e [Afatech AF9015] - 0232 PCTV 170e - 0236 PCTV 72e [DiBcom DiB7000PC] - 0237 PCTV 73e [DiBcom DiB7000PC] - 023a PCTV 801e - 023b PCTV 801e SE - 023d PCTV 340e - 023e PCTV 340e SE - 0300 Studio Linx Video input cable (NTSC) - 0301 Studio Linx Video input cable (PAL) - 0302 Dazzle DVC120 - 0419 PCTV Bungee USB (PAL) with FM radio - 061d PCTV Deluxe (NTSC) Device - 061e PCTV Deluxe (PAL) Device -2318 Shining Technologies, Inc. [hex] - 0011 CitiDISK Jr. IDE Enclosure -2373 Pumatronix Ltda - 0001 5 MegaPixel Digital Still Camera [DSC5M] -2375 Digit@lway, Inc. - 0001 Digital Audio Player -2406 SANHO Digital Electronics Co., Ltd. - 6688 PD7X Portable Storage -2478 Tripp-Lite - 2008 U209-000-R Serial Port -2632 TwinMOS - 3209 7-in-1 Card Reader -2650 Electronics For Imaging, Inc. [hex] -2730 Citizen - 200f CT-S310 Label printer -2735 DigitalWay - 0003 MPIO HS100 - 1001 MPIO FY200 - 1002 MPIO FL100 - 1003 MPIO FD100 - 1004 MPIO HD200 - 1005 MPIO HD300 - 1006 MPIO FG100 - 1007 MPIO FG130 - 1008 MPIO FY300 - 1009 MPIO FY400 - 100a MPIO FL300 - 100b MPIO HS200 - 100c MPIO FL350 - 100d MPIO FY500 - 100e MPIO FY500 - 100f MPIO FY600 - 1012 MPIO FL400 - 1013 MPIO HD400 - 1014 MPIO HD400 - 1016 MPIO FY700 - 1017 MPIO FY700 - 1018 MPIO FY800 - 1019 MPIO FY800 - 101a MPIO FY900 - 101b MPIO FY900 - 102b MPIO FL500 - 102c MPIO FL500 - 103f MPIO FY570 - 1040 MPIO FY570 - 1041 MPIO FY670 - 1042 MPIO FY670 - 1043 HCT HMD-180A - 1044 HCT HMD-180A -2770 NHJ, Ltd - 0a01 ScanJet 4600 series - 905c Che-Ez Snap SNAP-U/Digigr8/Soundstar TDC-35 - 9060 A130 - 9120 Che-ez! Snap / iClick Tiny VGA Digital Camera - 9130 TCG 501 - 913c Argus DC-1730 - 9150 Mini Cam - 9153 iClick 5X - 915d Cyberpix S-210S / Little Tikes My Real Digital Camera - 930b CCD Webcam(PC370R) - 930c CCD Webcam(PC370R) -2821 ASUSTek Computer Inc. - 0161 WL-161 802.11b Wireless Adapter [SiS 162U] - 160f WL-160g 802.11g Wireless Adapter [Envara WiND512] - 3300 WL-140 / Hawking HWU36D 802.11b Wireless Adapter [Intersil PRISM 3] -2899 Toptronic Industrial Co., Ltd - 012c Camera Device -2c02 Planex Communications - 14ea GW-US11H WLAN -2c1a Dolphin Peripherals - 0000 Wireless Optical Mouse -2fb2 Fujitsu, Ltd -3125 Eagletron - 0001 TrackerPod Camera Stand -3176 Whanam Electronics Co., Ltd -3275 VidzMedia Pte Ltd - 4fb1 MonsterTV P2H -3334 AEI - 1701 Fast Ethernet -3340 Yakumo - 043a Mio A701 DigiWalker PPCPhone - 0e3a Pocket PC 300 GPS SL / Typhoon MyGuide 3500 - a0a3 deltaX 5 BT (D) PDA -3504 Micro Star - f110 Security Key -3538 Power Quotient International Co., Ltd - 0001 Travel Flash - 0015 Mass Storge Device - 0022 Hi-Speed Mass Storage Device - 0042 Cool Drive U339 Flash Disk - 0054 Flash Drive (2GB) -3579 DIVA - 6901 Media Reader -3636 InVibro -3838 WEM - 0001 5-in-1 Card Reader -3923 National Instruments Corp. - 12c0 DAQPad-6020E - 12d0 DAQPad-6507 - 12e0 NI 4350 - 12f0 NI 5102 - 1750 DAQPad-6508 - 17b0 USB-ISA-Bridge - 1820 DAQPad-6020E (68 pin I/O) - 1830 DAQPad-6020E (BNC) - 1f00 DAQPad-6024E - 1f10 DAQPad-6024E - 1f20 DAQPad-6025E - 1f30 DAQPad-6025E - 1f40 DAQPad-6036E - 1f50 DAQPad-6036E - 2f80 DAQPad-6052E - 2f90 DAQPad-6052E - 702b GPIB-USB-B - 703c USB-485 RS485 Cable - 709b GPIB-USB-HS - 7254 NI MIO (data acquisition card) firmware updater - 729e USB-6251 (OEM) data acquisition card -40bb I-O Data - 0a09 USB2.0-SCSI Bridge USB2-SC -4101 i-rocks - 1301 IR-2510 usb phone -4102 iRiver, Ltd. - 1001 iFP-100 series mp3 player - 1003 iFP-300 series mp3 player - 1005 iFP-500 series mp3 player - 1007 iFP-700 series mp3/ogg vorbis player - 1008 iFP-800 series mp3/ogg vorbis player - 100a iFP-1000 series mp3/ogg vorbis player - 1014 T20 series mp3/ogg vorbis player (ums firmware) - 1019 T30 - 1034 T60 - 1040 M1Player - 1041 E100 (ums) - 1101 iFP-100 series mp3 player (ums firmware) - 1103 iFP-300 series mp3 player (ums firmware) - 1105 iFP-500 series mp3 player (ums firmware) - 1113 T10 (alternate) - 1117 T10 - 1119 T30 series mp3/ogg/wma player - 1141 E100 (mtp) - 2002 H10 6GB - 2101 H10 20GB (mtp) - 2102 H10 5GB (mtp) - 2105 H10 5/6GB (mtp) -413c Dell Computer Corp. - 0000 DRAC 5 Virtual Keyboard and Mouse - 0001 DRAC 5 Virtual Media - 0058 Port Replicator - 1001 Keyboard Hub - 1002 Keyboard Hub - 1003 Keyboard Hub - 1005 Multimedia Pro Keyboard Hub - 2001 Keyboard HID Support - 2002 SK-8125 Keyboard - 2003 Keyboard - 2005 RT7D50 Keyboard - 2010 Keyboard - 2011 Multimedia Pro Keyboard - 2100 SK-3106 Keyboard - 2101 SmartCard Reader Keyboard - 2105 Model L100 Keyboard - 2106 Dell QuietKey Keyboard - 2500 DRAC4 Remote Access Card - 2513 internal USB Hub of E-Port Replicator - 3010 Optical Wheel Mouse - 3012 Optical Wheel Mouse - 3016 Optical 5-Button Wheel Mouse - 3200 Mouse - 4001 Axim X5 - 4002 Axim X3 - 4003 Axim X30 - 4004 Axim Sync - 4005 Axim Sync - 4006 Axim Sync - 4007 Axim Sync - 4008 Axim Sync - 4009 Axim Sync - 4011 Axim X51v - 5103 AIO Printer A940 - 5105 AIO Printer A920 - 5107 AIO Printer A960 - 5109 Photo AIO Printer 922 - 5110 Photo AIO Printer 962 - 5111 Photo AIO Printer 942 - 5112 Photo AIO Printer 924 - 5113 Photo AIO Printer 944 - 5114 Photo AIO Printer 964 - 5115 Photo AIO Printer 926 - 5116 AIO Printer 946 - 5117 Photo AIO Printer 966 - 5118 AIO 810 - 5124 Laser MFP 1815 - 5128 Photo AIO 928 - 5200 Laser Printer - 5202 Printing Support - 5203 Printing Support - 5210 Printing Support - 5211 1110 Laser Printer - 5220 Laser MFP 1600n - 5225 Printing Support - 5226 Printing Support - 5300 Laser Printer - 5400 Laser Printer - 5401 Laser Printer - 5513 WLA3310 Wireless Adapter [Intersil ISL3887] - 5601 Laser Printer 3100cn - 5602 Laser Printer 3000cn - 5631 Laser Printer 5100cn - 5905 Printing Support - 8000 BC02 Bluetooth Adapter - 8010 TrueMobile Bluetooth Module in - 8100 TrueMobile 1180 802.11b Adapter [Intersil PRISM 3] - 8102 TrueMobile 1300 802.11g Wireless Adapter [Intersil ISL3880] - 8103 Wireless 350 Bluetooth - 8104 Wireless 1450 Dual-band (802.11a/b/g) Adapter [Intersil ISL3887] - 8105 U2 in HID - Driver - 8106 Wireless 350 Bluetooth Internal Card in - 8110 Wireless 3xx Bluetooth Internal Card - 8111 Wireless 3xx Bluetooth Internal Card in - 8114 Wireless 5700 Mobile Broadband (CDMA EV-DO) Minicard Modem - 8115 Wireless 5500 Mobile Broadband (3G HSDPA) Minicard Modem - 8116 Wireless 5505 Mobile Broadband (3G HSDPA) Minicard Modem - 8117 Wireless 5700 Mobile Broadband (CDMA EV-DO) Expresscard Modem - 8118 Wireless 5510 Mobile Broadband (3G HSDPA) Expresscard Status Port - 8120 Bluetooth adapter - 8121 Eastfold in HID - 8122 Eastfold in DFU - 8123 eHome Infrared Receiver - 8124 eHome Infrared Receiver - 8126 Wireless 355 Bluetooth - 8127 Wireless 355 Module with Bluetooth 2.0 + EDR Technology. - 8128 Wireless 5700-Sprint Mobile Broadband (CDMA EV-DO) Mini-Card Status Port - 8129 Wireless 5700-Telus Mobile Broadband (CDMA EV-DO) Mini-Card Status Port - 8131 Wireless 360 Bluetooth 2.0 + EDR module. - 8133 Wireless 5720 VZW Mobile Broadband (EVDO Rev-A) Minicard GPS Port - 8134 Wireless 5720 Sprint Mobile Broadband (EVDO Rev-A) Minicard Status Port - 8135 Wireless 5720 TELUS Mobile Broadband (EVDO Rev-A) Minicard Diagnostics Port - 8136 Wireless 5520 Cingular Mobile Broadband (3G HSDPA) Minicard Diagnostics Port - 8137 Wireless 5520 Voda L Mobile Broadband (3G HSDPA) Minicard Status Port - 8138 Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard EAP-SIM Port - 8140 Wireless 360 Bluetooth - 8142 Mobile 360 in DFU - 8147 F3507g Mobile Broadband Module - 8156 Wireless 370 Bluetooth Mini-card - 8157 Integrated Keyboard - 8158 Integrated Touchpad / Trackstick - 8160 Wireless 365 Bluetooth - 8161 Integrated Keyboard - 8162 Integrated Touchpad [Synaptics] - 8171 Gobi Wireless Modem (QDL mode) - 8172 Gobi Wireless Modem - 8183 F3607gw Mobile Broadband Module - 8184 F3607gw v2 Mobile Broadband Module - 8185 Gobi 2000 Wireless Modem (QDL mode) - 8186 Gobi 2000 Wireless Modem - 8187 DW375 Bluetooth Module - 8501 Bluetooth Adapter - 9500 USB CP210x UART Bridge Controller [DW700] - a001 Hub - a005 Internal 2.0 Hub - a700 Hub (in 1905FP LCD Monitor) -4146 USBest Technology - 9281 Iomega Micro Mini 128MB Flash Drive - ba01 Intuix Flash Drive -4242 USB Design by Example - 4201 Buttons and Lights HID device - 4220 Echo 1 Camera -4317 Broadcom Corp. - 0700 U.S. Robotics USR5426 802.11g Adapter - 0701 U.S. Robotics USR5425 Wireless MAXg Adapter - 0711 Belkin F5D7051 v3000 802.11g - 0720 Dynex DX-BUSB -4348 WinChipHead - 5523 USB->RS 232 adapter with Prolifec PL 2303 chipset - 5537 13.56Mhz RFID Card Reader and Writer - 5584 CH34x printer adapter cable -4572 Shuttle, Inc. - 4572 Shuttle PN31 Remote -4586 Panram - 1026 Crystal Bar Flash Drive -4670 EMS Production - 9394 Game Cube USB Memory Adaptor 64M -4752 Miditech - 0011 Midistart-2 -4757 GW Instek - 2009 PEL-2000 Series Electronic Load (CDC) - 2010 PEL-2000 Series Electronic Load (CDC) -4766 Aceeca - 0001 MEZ1000 RDA -4855 Memorex - 7288 Ultra Traveldrive 160G 2.5" HDD -4971 SimpleTech - cb01 SP-U25/120G - ce17 1TB SimpleDrive II USB External Hard Drive -5032 Grandtec - 0bb8 Grandtec USB1.1 DVB-T (cold) - 0bb9 Grandtec USB1.1 DVB-T (warm) - 0fa0 Grandtec USB1.1 DVB-T (cold) - 0fa1 Grandtec USB1.1 DVB-T (warm) -5041 Linksys (?) - 2234 WUSB54G v1 802.11g Adapter [Intersil ISL3886] - 2235 WUSB54GP v1 802.11g Adapter [Intersil ISL3886] -50c2 Averatec (?) - 4013 WLAN Adapter -5173 Sweex - 1809 ZD1211 -5219 I-Tetra - 1001 Cetus CDC Device -5345 Owon - 1234 PDS6062T Oscilloscope -544d Transmeta Corp. -5543 UC-Logic Technology Corp. - 0002 SuperPen WP3325U Tablet - 0003 Tablet WP4030U - 0004 Tablet WP5540U - 0005 Tablet WP8060U - 0041 Genius PenSketch 6x8 Tablet - 0042 Tablet PF1209 - 0064 Aiptek HyperPen 10000U -5555 Epiphan Systems Inc. - 1110 VGA2USB - 1120 KVM2USB - 2222 DVI2USB - 3333 VGA2USB Pro - 3337 KVM2USB Pro - 3340 VGA2USB LR - 3344 KVM2USB LR - 3411 DVI2USB Solo - 3422 DVI2USB Duo -55aa OnSpec Electronic, Inc. - 0015 Hard Drive - 0102 SuperDisk - 0103 IDE Hard Drive - 0201 DDI to Reader-19 - 1234 ATAPI Bridge - a103 Sandisk SDDR-55 SmartMedia Card Reader - b000 USB to CompactFlash Card Reader - b004 OnSpec MMC/SD Reader/Writer - b00b USB to Memory Stick Card Reader - b00c USB to SmartMedia Card Reader - b012 Mitsumi FA402M 8-in-2 Card Reader - b200 Compact Flash Reader - b204 MMC/ SD Reader - b207 Memory Stick Reader -5656 Uni-Trend Group Limited - 0832 UT2000/UT3000 Digital Storage Oscilloscope -595a IRTOUCHSYSTEMS Co. Ltd. - 0001 Touchscreen -5986 Acer, Inc - 0100 Orbicam - 0101 USB2.0 Camera - 0102 Crystal Eye Webcam - 01a6 Lenovo Integrated Webcam - 01a7 Lenovo Integrated Webcam - 01a9 Lenovo Integrated Webcam - 0200 OrbiCam - 0203 BisonCam NB Pro 1300 - 0241 BisonCam, NB Pro - 02d0 Lenovo Integrated Webcam [R5U877] - 03d0 Lenovo Integrated Webcam [R5U877] -5a57 Zinwell - 0260 RT2570 - 0280 802.11a/b/g/n USB Wireless LAN Card - 0282 802.11b/g/n USB Wireless LAN Card - 0283 802.11b/g/n USB Wireless LAN Card - 0284 802.11a/b/g/n USB Wireless LAN Card - 0290 ZW-N290 802.11n [Realtek RTL8192SU] - 5257 Metronic 495257 wifi 802.11ng -6000 Beholder International Ltd. - dec0 TV Wander - dec1 TV Voyage -601a Ingenic Semiconductor Ltd. - 4740 XBurst Jz4740 boot mode -6189 Sitecom - 182d USB 2.0 Ethernet - 2068 USB to serial cable (v2) -6253 TwinHan Technology Co., Ltd - 0100 Ir reciver f. remote control -636c CoreLogic, Inc. -6472 Unknown (Sony?) - 01c8 PlayStation Portable [Mass Storage] -6547 Arkmicro Technologies Inc. - 0232 ARK3116 Serial -6615 IRTOUCHSYSTEMS Co. Ltd. - 0001 Touchscreen -6666 Prototype product Vendor ID - 0667 WiseGroup Smart Joy PSX, PS-PC Smart JoyPad - 2667 JCOP BlueZ Smartcard reader - 8802 SmartJoy Dual Plus PS2 converter - 8804 WiseGroup SuperJoy Box 5 -6677 WiseGroup, Ltd. - 8802 SmartJoy Dual Plus PS2 converter - 8811 Deluxe Dance Mat -6891 3Com - a727 3CRUSB10075 802.11bg [ZyDAS ZD1211] -695c Opera1 - 3829 Opera1 DVB-S (warm state) -6993 Yealink Network Technology Co., Ltd. - b001 VoIP Phone -6a75 Shanghai Jujo Electronics Co., Ltd -7104 CME (Central Music Co.) - 2202 UF5/UF6/UF7/UF8 MIDI Master Keyboard -726c StackFoundry LLC - 2149 EntropyKing Random Number Generator -734c TBS Technologies China - 5920 Q-Box II DVB-S2 HD - 5928 Q-Box II DVB-S2 HD -7392 Edimax Technology Co., Ltd - 7711 EW-7711UTn nLite Wireless Adapter [Ralink RT2870] - 7717 EW-7717UN 802.11n Wireless Adapter [Ralink RT2870] - 7718 EW-7718UN 802.11n Wireless Adapter [Ralink RT2870] - 7722 EW-7722UTn 802.11n Wireless Adapter [Ralink RT307x] - 7811 EW-7811Un 802.11n Wireless Adapter [Realtek RTL8188CUS] -8086 Intel Corp. - 0001 AnyPoint (TM) Home Network 1.6 Mbps Wireless Adapter - 0044 CPU DRAM Controller - 0046 HD Graphics - 0100 Personal Audio Player 3000 - 0101 Personal Audio Player 3000 - 0110 Easy PC Camera - 0120 PC Camera CS120 - 0180 WiMAX Connection 2400m - 0181 WiMAX Connection 2400m - 0182 WiMAX Connection 2400m - 0186 WiMAX Connection 2400m - 0188 WiMAX Connection 2400m - 0200 AnyPoint(TM) Wireless II Network 11Mbps Adapter [Atmel AT76C503A] - 0431 Intel Pro Video PC Camera - 0510 Digital Movie Creator - 0630 Pocket PC Camera - 0780 CS780 Microphone Input - 07d3 BLOB boot loader firmware - 0dad Cherry MiniatureCard Keyboard - 1010 AnyPoint(TM) Home Network 10 Mbps Phoneline Adapter - 110a Bluetooth Controller from (Ericsson P4A) - 110b Bluetooth Controller from (Intel/CSR) - 1110 PRO/Wireless LAN Module - 1111 PRO/Wireless 2011B 802.11b Adapter [Intersil PRISM 2.5] - 1134 Hollister Mobile Monitor - 1139 In-Target Probe (ITP) - 1234 Prototype Reader/Writer - 1403 WiMAX Connection 2400m - 1405 WiMAX Connection 2400m - 1406 WiMAX Connection 2400m - 2448 82801 PCI Bridge - 3100 PRO/DSL 3220 Modem - WAN - 3101 PRO/DSL 3220 Modem - 3240 AnyPoint® 3240 Modem - WAN - 3241 AnyPoint® 3240 Modem - 8602 Miniature Card Slot - 9303 Intel 8x930Hx Hub - 9500 CE 9500 DVB-T - 9890 82930 Test Board - beef SCM Miniature Card Reader/Writer - c013 Wireless HID Station - f001 XScale PXA27x Bulverde flash - f1a5 Z-U130 [Value Solid State Drive] -8087 Intel Corp. - 0020 Integrated Rate Matching Hub - 0024 Integrated Rate Matching Hub -80ee VirtualBox - 0021 USB Tablet -8282 Keio - 3201 Retro Adapter - 3301 Retro Adapter Mouse -8341 EGO Systems, Inc. - 2000 Flashdisk -9016 Sitecom - 182d WL-022 802.11b Adapter -9022 TeVii Technology Ltd. - d630 DVB-S S630 - d650 DVB-S2 S650 - d660 DVB-S2 S660 -9148 GeoLab, Ltd -# All of GeoLab's devices share the same ID 0004. - 0004 R3 Compatible Device -9710 MosChip Semiconductor - 7703 MCS7703 Serial Port Adapter - 7705 MCS7705 Parallel port adapter - 7715 MCS7715 Parallel and serial port adapter - 7717 MCS7717 3-port hub with serial and parallel adapter - 7720 MCS7720 Dual serial port adapter - 7730 MCS7730 10/100 Mbps Ethernet adapter - 7780 MCS7780 4Mbps Fast IrDA Adapter - 7830 MCS7830 10/100 Mbps Ethernet adapter - 7832 MCS7832 10/100 Mbps Ethernet adapter - 7840 MCS7820/MCS7840 2/4 port serial adapter -99fa Grandtec - 8988 V.cap Camera Device -9ac4 J. Westhues - 4b8f ProxMark-3 RFID Instrument -a128 AnMo Electronics Corp. / Dino-Lite (?) - 0610 Dino-Lite Digital Microscope (SN9C201 + HV7131R) - 0611 Dino-Lite Digital Microscope (SN9C201 + HV7131R) - 0612 Dino-Lite Digital Microscope (SN9C120 + HV7131R) - 0613 Dino-Lite Digital Microscope (SN9C201 + HV7131R) - 0614 Dino-Lite Digital Microscope (SN9C201 + MI1310/MT9M111) - 0615 Dino-Lite Digital Microscope (SN9C201 + MI1310/MT9M111) - 0616 Dino-Lite Digital Microscope (SN9C120 + HV7131R) - 0617 Dino-Lite Digital Microscope (SN9C201 + MI1310/MT9M111) - 0618 Dino-Lite Digital Microscope (SN9C201 + HV7131R) -a168 AnMo Electronics Corporation - 0610 Dino-Lite Digital Microscope - 0611 Dino-Lite Digital Microscope - 0613 Dino-Lite Digital Microscope - 0614 Dino-Lite Pro Digital Microscope - 0615 Dino-Lite Pro Digital Microscope - 0617 Dino-Lite Pro Digital Microscope - 0618 Dino-Lite Digital Microscope -a600 Asix - e110 OK1ZIA Davac 4.x -a727 3Com - 6893 3CRUSB20075 OfficeConnect Wireless 108Mbps 11g Adapter [Atheros AR5523] - 6895 AR5523 - 6897 AR5523 -abcd Unknown - cdee Petcam -c251 Keil Software, Inc. - 2710 ULink -cace CACE Technologies Inc. - 0002 AirPCAP Classic 802.11 packet capture adapter - 0300 AirPcap NX [Atheros AR9001U-(2)NG] -d209 Ultimarc - 0301 I-PAC Arcade Control Interface - 0501 Ultra-Stik Ultimarc Ultra-Stik Player 1 -e4e4 Xorcom Ltd. - 1130 Astribank series - 1131 Astribank series - 1132 Astribank series - 1140 Astribank series - 1141 Astribank series - 1142 Astribank series - 1150 Astribank series - 1151 Astribank series - 1152 Astribank series - 1160 Astribank 2 series - 1161 Astribank 2 series - 1162 Astribank 2 series -eb03 MakingThings - 0920 Make Controller Kit -eb1a eMPIA Technology, Inc. - 17de KWorld V-Stream XPERT DTV - DVB-T USB cold - 17df KWorld V-Stream XPERT DTV - DVB-T USB warm - 2571 M035 Compact Web Cam - 2710 SilverCrest Webcam - 2750 ECS Elitegroup G220 integrated Webcam - 2761 EeePC 701 integrated Webcam - 2776 Combined audio and video input device - 2800 Terratec Cinergy 200 - 2801 GrabBeeX+ Video Encoder - 2863 Video Grabber - 2870 Pinnacle PCTV Stick - 2881 EM2881 Video Controller - 50a3 Gadmei UTV380 TV Box - 50a6 Gadmei UTV330 TV Box - e355 KWorld DVB-T 355U Digital TV Dongle -eb2a KWorld -f003 Hewlett Packard - 6002 PhotoSmart C500 -f4ec Atten Electronics / Siglent Technologies - ee38 Digital Storage Oscilloscope - -# List of known device classes, subclasses and protocols - -# Syntax: -# C class class_name -# subclass subclass_name <-- single tab -# protocol protocol_name <-- two tabs - -C 00 (Defined at Interface level) -C 01 Audio - 01 Control Device - 02 Streaming - 03 MIDI Streaming -C 02 Communications - 01 Direct Line - 02 Abstract (modem) - 00 None - 01 AT-commands (v.25ter) - 02 AT-commands (PCCA101) - 03 AT-commands (PCCA101 + wakeup) - 04 AT-commands (GSM) - 05 AT-commands (3G) - 06 AT-commands (CDMA) - fe Defined by command set descriptor - ff Vendor Specific (MSFT RNDIS?) - 03 Telephone - 04 Multi-Channel - 05 CAPI Control - 06 Ethernet Networking - 07 ATM Networking - 08 Wireless Handset Control - 09 Device Management - 0a Mobile Direct Line - 0b OBEX - 0c Ethernet Emulation - 07 Ethernet Emulation (EEM) -C 03 Human Interface Device - 00 No Subclass - 00 None - 01 Keyboard - 02 Mouse - 01 Boot Interface Subclass - 00 None - 01 Keyboard - 02 Mouse -C 05 Physical Interface Device -C 06 Imaging - 01 Still Image Capture - 01 Picture Transfer Protocol (PIMA 15470) -C 07 Printer - 01 Printer - 00 Reserved/Undefined - 01 Unidirectional - 02 Bidirectional - 03 IEEE 1284.4 compatible bidirectional - ff Vendor Specific -C 08 Mass Storage - 01 RBC (typically Flash) - 00 Control/Bulk/Interrupt - 01 Control/Bulk - 50 Bulk (Zip) - 02 SFF-8020i, MMC-2 (ATAPI) - 03 QIC-157 - 04 Floppy (UFI) - 00 Control/Bulk/Interrupt - 01 Control/Bulk - 50 Bulk (Zip) - 05 SFF-8070i - 06 SCSI - 00 Control/Bulk/Interrupt - 01 Control/Bulk - 50 Bulk (Zip) -C 09 Hub - 00 Unused - 00 Full speed (or root) hub - 01 Single TT - 02 TT per port -C 0a CDC Data - 00 Unused - 30 I.430 ISDN BRI - 31 HDLC - 32 Transparent - 50 Q.921M - 51 Q.921 - 52 Q.921TM - 90 V.42bis - 91 Q.932 EuroISDN - 92 V.120 V.24 rate ISDN - 93 CAPI 2.0 - fd Host Based Driver - fe CDC PUF - ff Vendor specific -C 0b Chip/SmartCard -C 0d Content Security -C 0e Video - 00 Undefined - 01 Video Control - 02 Video Streaming - 03 Video Interface Collection -C 58 Xbox - 42 Controller -C dc Diagnostic - 01 Reprogrammable Diagnostics - 01 USB2 Compliance -C e0 Wireless - 01 Radio Frequency - 01 Bluetooth - 02 Ultra WideBand Radio Control - 03 RNDIS - 02 Wireless USB Wire Adapter - 01 Host Wire Adapter Control/Data Streaming - 02 Device Wire Adapter Control/Data Streaming - 03 Device Wire Adapter Isochronous Streaming -C ef Miscellaneous Device - 01 ? - 01 Microsoft ActiveSync - 02 Palm Sync - 02 ? - 01 Interface Association - 02 Wire Adapter Multifunction Peripheral - 03 ? - 01 Cable Based Association -C fe Application Specific Interface - 01 Device Firmware Update - 02 IRDA Bridge - 03 Test and Measurement - 01 TMC - 02 USB488 -C ff Vendor Specific Class - ff Vendor Specific Subclass - ff Vendor Specific Protocol - -# List of Audio Class Terminal Types - -# Syntax: -# AT terminal_type terminal_type_name - -AT 0100 USB Undefined -AT 0101 USB Streaming -AT 01ff USB Vendor Specific -AT 0200 Input Undefined -AT 0201 Microphone -AT 0202 Desktop Microphone -AT 0203 Personal Microphone -AT 0204 Omni-directional Microphone -AT 0205 Microphone Array -AT 0206 Processing Microphone Array -AT 0300 Output Undefined -AT 0301 Speaker -AT 0302 Headphones -AT 0303 Head Mounted Display Audio -AT 0304 Desktop Speaker -AT 0305 Room Speaker -AT 0306 Communication Speaker -AT 0307 Low Frequency Effects Speaker -AT 0400 Bidirectional Undefined -AT 0401 Handset -AT 0402 Headset -AT 0403 Speakerphone, no echo reduction -AT 0404 Echo-suppressing speakerphone -AT 0405 Echo-canceling speakerphone -AT 0500 Telephony Undefined -AT 0501 Phone line -AT 0502 Telephone -AT 0503 Down Line Phone -AT 0600 External Undefined -AT 0601 Analog Connector -AT 0602 Digital Audio Interface -AT 0603 Line Connector -AT 0604 Legacy Audio Connector -AT 0605 SPDIF interface -AT 0606 1394 DA stream -AT 0607 1394 DV stream soundtrack -AT 0700 Embedded Undefined -AT 0701 Level Calibration Noise Source -AT 0702 Equalization Noise -AT 0703 CD Player -AT 0704 DAT -AT 0705 DCC -AT 0706 MiniDisc -AT 0707 Analog Tape -AT 0708 Phonograph -AT 0709 VCR Audio -AT 070a Video Disc Audio -AT 070b DVD Audio -AT 070c TV Tuner Audio -AT 070d Satellite Receiver Audio -AT 070e Cable Tuner Audio -AT 070f DSS Audio -AT 0710 Radio Receiver -AT 0711 Radio Transmitter -AT 0712 Multitrack Recorder -AT 0713 Synthesizer - -# List of HID Descriptor Types - -# Syntax: -# HID descriptor_type descriptor_type_name - -HID 21 HID -HID 22 Report -HID 23 Physical - -# List of HID Descriptor Item Types -# Note: 2 bits LSB encode data length following - -# Syntax: -# R item_type item_type_name - -R 04 Usage Page -R 08 Usage -R 14 Logical Minimum -R 18 Usage Minimum -R 24 Logical Maximum -R 28 Usage Maximum -R 34 Physical Minimum -R 38 Designator Index -R 44 Physical Maximum -R 48 Designator Minimum -R 54 Unit Exponent -R 58 Designator Maximum -R 64 Unit -R 74 Report Size -R 78 String Index -R 80 Input -R 84 Report ID -R 88 String Minimum -R 90 Output -R 94 Report Count -R 98 String Maximum -R a0 Collection -R a4 Push -R a8 Delimiter -R b0 Feature -R b4 Pop -R c0 End Collection - -# List of Physical Descriptor Bias Types - -# Syntax: -# BIAS item_type item_type_name - -BIAS 0 Not Applicable -BIAS 1 Right Hand -BIAS 2 Left Hand -BIAS 3 Both Hands -BIAS 4 Either Hand - -# List of Physical Descriptor Item Types - -# Syntax: -# PHY item_type item_type_name - -PHY 00 None -PHY 01 Hand -PHY 02 Eyeball -PHY 03 Eyebrow -PHY 04 Eyelid -PHY 05 Ear -PHY 06 Nose -PHY 07 Mouth -PHY 08 Upper Lip -PHY 09 Lower Lip -PHY 0a Jaw -PHY 0b Neck -PHY 0c Upper Arm -PHY 0d Elbow -PHY 0e Forearm -PHY 0f Wrist -PHY 10 Palm -PHY 11 Thumb -PHY 12 Index Finger -PHY 13 Middle Finger -PHY 14 Ring Finger -PHY 15 Little Finger -PHY 16 Head -PHY 17 Shoulder -PHY 18 Hip -PHY 19 Waist -PHY 1a Thigh -PHY 1b Knee -PHY 1c calf -PHY 1d Ankle -PHY 1e Foot -PHY 1f Heel -PHY 20 Ball of Foot -PHY 21 Big Toe -PHY 22 Second Toe -PHY 23 Third Toe -PHY 24 Fourth Toe -PHY 25 Fifth Toe -PHY 26 Brow -PHY 27 Cheek - -# List of HID Usages - -# Syntax: -# HUT hi _usage_page hid_usage_page_name -# hid_usage hid_usage_name - -HUT 00 Undefined -HUT 01 Generic Desktop Controls - 000 Undefined - 001 Pointer - 002 Mouse - 004 Joystick - 005 Gamepad - 006 Keyboard - 007 Keypad - 008 Multi-Axis Controller - 030 Direction-X - 031 Direction-Y - 032 Direction-Z - 033 Rotate-X - 034 Rotate-Y - 035 Rotate-Z - 036 Slider - 037 Dial - 038 Wheel - 039 Hat Switch - 03a Counted Buffer - 03b Byte Count - 03c Motion Wakeup - 03d Start - 03e Select - 040 Vector-X - 041 Vector-Y - 042 Vector-Z - 043 Vector-X relative Body - 044 Vector-Y relative Body - 045 Vector-Z relative Body - 046 Vector - 080 System Control - 081 System Power Down - 082 System Sleep - 083 System Wake Up - 084 System Context Menu - 085 System Main Menu - 086 System App Menu - 087 System Menu Help - 088 System Menu Exit - 089 System Menu Select - 08a System Menu Right - 08b System Menu Left - 08c System Menu Up - 08d System Menu Down - 090 Direction Pad Up - 091 Direction Pad Down - 092 Direction Pad Right - 093 Direction Pad Left -HUT 02 Simulation Controls - 000 Undefined - 001 Flight Simulation Device - 002 Automobile Simulation Device - 003 Tank Simulation Device - 004 Spaceship Simulation Device - 005 Submarine Simulation Device - 006 Sailing Simulation Device - 007 Motorcycle Simulation Device - 008 Sports Simulation Device - 009 Airplane Simualtion Device - 00a Helicopter Simulation Device - 00b Magic Carpet Simulation Device - 00c Bicycle Simulation Device - 020 Flight Control Stick - 021 Flight Stick - 022 Cyclic Control - 023 Cyclic Trim - 024 Flight Yoke - 025 Track Control - 0b0 Aileron - 0b1 Aileron Trim - 0b2 Anti-Torque Control - 0b3 Autopilot Enable - 0b4 Chaff Release - 0b5 Collective Control - 0b6 Dive Break - 0b7 Electronic Countermeasures - 0b8 Elevator - 0b9 Elevator Trim - 0ba Rudder - 0bb Throttle - 0bc Flight COmmunications - 0bd Flare Release - 0be Landing Gear - 0bf Toe Break - 0c0 Trigger - 0c1 Weapon Arm - 0c2 Weapons Select - 0c3 Wing Flaps - 0c4 Accelerator - 0c5 Brake - 0c6 Clutch - 0c7 Shifter - 0c8 Steering - 0c9 Turret Direction - 0ca Barrel Elevation - 0cb Drive Plane - 0cc Ballast - 0cd Bicylce Crank - 0ce Handle Bars - 0cf Front Brake - 0d0 Rear Brake -HUT 03 VR Controls - 000 Unidentified - 001 Belt - 002 Body Suit - 003 Flexor - 004 Glove - 005 Head Tracker - 006 Head Mounted Display - 007 Hand Tracker - 008 Oculometer - 009 Vest - 00a Animatronic Device - 020 Stereo Enable - 021 Display Enable -HUT 04 Sport Controls - 000 Unidentified - 001 Baseball Bat - 002 Golf Club - 003 Rowing Machine - 004 Treadmill - 030 Oar - 031 Slope - 032 Rate - 033 Stick Speed - 034 Stick Face Angle - 035 Stick Heel/Toe - 036 Stick Follow Through - 038 Stick Type - 039 Stick Height - 047 Stick Temp - 050 Putter - 051 1 Iron - 052 2 Iron - 053 3 Iron - 054 4 Iron - 055 5 Iron - 056 6 Iron - 057 7 Iron - 058 8 Iron - 059 9 Iron - 05a 10 Iron - 05b 11 Iron - 05c Sand Wedge - 05d Loft Wedge - 05e Power Wedge - 05f 1 Wood - 060 3 Wood - 061 5 Wood - 062 7 Wood - 063 9 Wood -HUT 05 Game Controls - 000 Undefined - 001 3D Game Controller - 002 Pinball Device - 003 Gun Device - 020 Point Of View - 021 Turn Right/Left - 022 Pitch Right/Left - 023 Roll Forward/Backward - 024 Move Right/Left - 025 Move Forward/Backward - 026 Move Up/Down - 027 Lean Right/Left - 028 Lean Forward/Backward - 029 Height of POV - 02a Flipper - 02b Secondary Flipper - 02c Bump - 02d New Game - 02e Shoot Ball - 02f Player - 030 Gun Bolt - 031 Gun Clip - 032 Gun Selector - 033 Gun Single Shot - 034 Gun Burst - 035 Gun Automatic - 036 Gun Safety - 037 Gamepad Fire/Jump - 038 Gamepad Fun - 039 Gamepad Trigger -HUT 07 Keyboard - 000 No Event - 001 Keyboard ErrorRollOver - 002 Keyboard POSTfail - 003 Keyboard Error Undefined - 004 A - 005 B - 006 C - 007 D - 008 E - 009 F - 00a G - 00b H - 00c I - 00d J - 00e K - 00f L - 010 M - 011 N - 012 O - 013 P - 014 Q - 015 R - 016 S - 017 T - 018 U - 019 V - 01a W - 01b X - 01c Y - 01d Z - 01e 1 and ! (One and Exclamation) - 01f 2 and @ (2 and at) - 020 3 and # (3 and Hash) - 021 4 and $ (4 and Dollar Sign) - 022 5 and % (5 and Percent Sign) - 023 6 and ^ (6 and circumflex) - 024 7 and & (Seven and Ampersand) - 025 8 and * (Eight and asterisk) - 026 9 and ( (Nine and Parenthesis Left) - 027 0 and ) (Zero and Parenthesis Right) - 028 Return (Enter) - 029 Escape - 02a Delete (Backspace) - 02b Tab - 02c Space Bar - 02d - and _ (Minus and underscore) - 02e = and + (Equal and Plus) - 02f [ and { (Bracket and Braces Left) - 030 ] and } (Bracket and Braces Right) - 031 \ and | (Backslash and Bar) - 032 # and ~ (Hash and Tilde, Non-US Keyboard near right shift) - 033 ; and : (Semicolon and Colon) - 034 ´ and " (Accent Acute and Double Quotes) - 035 ` and ~ (Accent Grace and Tilde) - 036 , and < (Comma and Less) - 037 . and > (Period and Greater) - 038 / and ? (Slash and Question Mark) - 039 Caps Lock - 03a F1 - 03b F2 - 03c F3 - 03d F4 - 03e F5 - 03f F6 - 040 F7 - 041 F8 - 042 F9 - 043 F10 - 044 F11 - 045 F12 - 046 Print Screen - 047 Scroll Lock - 048 Pause - 049 Insert - 04a Home - 04b Page Up - 04c Delete Forward (without Changing Position) - 04d End - 04e Page Down - 04f Right Arrow - 050 Left Arrow - 051 Down Arrow - 052 Up Arrow - 053 Num Lock and Clear - 054 Keypad / (Division Sign) - 055 Keypad * (Multiplication Sign) - 056 Keypad - (Subtraction Sign) - 057 Keypad + (Addition Sign) - 058 Keypad Enter - 059 Keypad 1 and END - 05a Keypad 2 and Down Arrow - 05b Keypad 3 and Page Down - 05c Keypad 4 and Left Arrow - 05d Keypad 5 (Tactilei Raised) - 05f Keypad 6 and Right Arrow - 060 Keypad 7 and Home - 061 Keypad 8 and Up Arrow - 062 Keypad 8 and Page Up - 063 Keypad . (decimal delimiter) and Delete - 064 \ and | (Backslash and Bar, UK and Non-US Keyboard near left shift) - 065 Keyboard Application (Windows Key for Win95 or Compose) - 066 Power (not a key) - 067 Keypad = (Equal Sign) - 068 F13 - 069 F14 - 06a F15 - 06b F16 - 06c F17 - 06d F18 - 06e F19 - 06f F20 - 070 F21 - 071 F22 - 072 F23 - 073 F24 - 074 Execute - 075 Help - 076 Menu - 077 Select - 078 Stop - 079 Again - 07a Undo - 07b Cut - 07c Copy - 07d Paste - 07e Find - 07f Mute - 080 Volume Up - 081 Volume Down - 082 Locking Caps Lock - 083 Locking Num Lock - 084 Locking Scroll Lock - 085 Keypad Comma - 086 Keypad Equal Sign (AS/400) - 087 International 1 (PC98) - 088 International 2 (PC98) - 089 International 3 (PC98) - 08a International 4 (PC98) - 08b International 5 (PC98) - 08c International 6 (PC98) - 08d International 7 (Toggle Single/Double Byte Mode) - 08e International 8 - 08f International 9 - 090 LANG 1 (Hangul/English Toggle, Korea) - 091 LANG 2 (Hanja Conversion, Korea) - 092 LANG 3 (Katakana, Japan) - 093 LANG 4 (Hiragana, Japan) - 094 LANG 5 (Zenkaku/Hankaku, Japan) - 095 LANG 6 - 096 LANG 7 - 097 LANG 8 - 098 LANG 9 - 099 Alternate Erase - 09a SysReq/Attention - 09b Cancel - 09c Clear - 09d Prior - 09e Return - 09f Separator - 0a0 Out - 0a1 Open - 0a2 Clear/Again - 0a3 CrSel/Props - 0a4 ExSel - 0e0 Control Left - 0e1 Shift Left - 0e2 Alt Left - 0e3 GUI Left - 0e4 Control Right - 0e5 Shift Right - 0e6 Alt Rigth - 0e7 GUI Right -HUT 08 LEDs - 000 Undefined - 001 NumLock - 002 CapsLock - 003 Scroll Lock - 004 Compose - 005 Kana - 006 Power - 007 Shift - 008 Do not disturb - 009 Mute - 00a Tone Enabke - 00b High Cut Filter - 00c Low Cut Filter - 00d Equalizer Enable - 00e Sound Field ON - 00f Surround On - 010 Repeat - 011 Stereo - 012 Sampling Rate Detect - 013 Spinning - 014 CAV - 015 CLV - 016 Recording Format Detect - 017 Off-Hook - 018 Ring - 019 Message Waiting - 01a Data Mode - 01b Battery Operation - 01c Battery OK - 01d Battery Low - 01e Speaker - 01f Head Set - 020 Hold - 021 Microphone - 022 Coverage - 023 Night Mode - 024 Send Calls - 025 Call Pickup - 026 Conference - 027 Stand-by - 028 Camera On - 029 Camera Off - 02a On-Line - 02b Off-Line - 02c Busy - 02d Ready - 02e Paper-Out - 02f Paper-Jam - 030 Remote - 031 Forward - 032 Reverse - 033 Stop - 034 Rewind - 035 Fast Forward - 036 Play - 037 Pause - 038 Record - 039 Error - 03a Usage Selected Indicator - 03b Usage In Use Indicator - 03c Usage Multi Indicator - 03d Indicator On - 03e Indicator Flash - 03f Indicator Slow Blink - 040 Indicator Fast Blink - 041 Indicator Off - 042 Flash On Time - 043 Slow Blink On Time - 044 Slow Blink Off Time - 045 Fast Blink On Time - 046 Fast Blink Off Time - 047 Usage Color Indicator - 048 Indicator Red - 049 Indicator Green - 04a Indicator Amber - 04b Generic Indicator - 04c System Suspend - 04d External Power Connected -HUT 09 Buttons - 000 No Button Pressed - 001 Button 1 (Primary) - 002 Button 2 (Secondary) - 003 Button 3 (Tertiary) - 004 Button 4 - 005 Button 5 -HUT 0a Ordinal - 001 Instance 1 - 002 Instance 2 - 003 Instance 3 -HUT 0b Telephony - 000 Unassigned - 001 Phone - 002 Answering Machine - 003 Message Controls - 004 Handset - 005 Headset - 006 Telephony Key Pad - 007 Programmable Button - 020 Hook Switch - 021 Flash - 022 Feature - 023 Hold - 024 Redial - 025 Transfer - 026 Drop - 027 Park - 028 Forward Calls - 029 Alternate Function - 02a Line - 02b Speaker Phone - 02c Conference - 02d Ring Enable - 02e Ring Select - 02f Phone Mute - 030 Caller ID - 050 Speed Dial - 051 Store Number - 052 Recall Number - 053 Phone Directory - 070 Voice Mail - 071 Screen Calls - 072 Do Not Disturb - 073 Message - 074 Answer On/Offf - 090 Inside Dial Tone - 091 Outside Dial Tone - 092 Inside Ring Tone - 093 Outside Ring Tone - 094 Priority Ring Tone - 095 Inside Ringback - 096 Priority Ringback - 097 Line Busy Tone - 098 Recorder Tone - 099 Call Waiting Tone - 09a Confirmation Tone 1 - 09b Confirmation Tone 2 - 09c Tones Off - 09d Outside Ringback - 0b0 Key 1 - 0b1 Key 2 - 0b3 Key 3 - 0b4 Key 4 - 0b5 Key 5 - 0b6 Key 6 - 0b7 Key 7 - 0b8 Key 8 - 0b9 Key 9 - 0ba Key Star - 0bb Key Pound - 0bc Key A - 0bd Key B - 0be Key C - 0bf Key D -HUT 0c Consumer - 000 Unassigned - 001 Consumer Control - 002 Numeric Key Pad - 003 Programmable Buttons - 020 +10 - 021 +100 - 022 AM/PM - 030 Power - 031 Reset - 032 Sleep - 033 Sleep After - 034 Sleep Mode - 035 Illumination - 036 Function Buttons - 040 Menu - 041 Menu Pick - 042 Menu Up - 043 Menu Down - 044 Menu Left - 045 Menu Right - 046 Menu Escape - 047 Menu Value Increase - 048 Menu Value Decrease - 060 Data on Screen - 061 Closed Caption - 062 Closed Caption Select - 063 VCR/TV - 064 Broadcast Mode - 065 Snapshot - 066 Still - 080 Selection - 081 Assign Selection - 082 Mode Step - 083 Recall Last - 084 Enter Channel - 085 Order Movie - 086 Channel - 087 Media Selection - 088 Media Select Computer - 089 Media Select TV - 08a Media Select WWW - 08b Media Select DVD - 08c Media Select Telephone - 08d Media Select Program Guide - 08e Media Select Video Phone - 08f Media Select Games - 090 Media Select Messages - 091 Media Select CD - 092 Media Select VCR - 093 Media Select Tuner - 094 Quit - 095 Help - 096 Media Select Tape - 097 Media Select Cable - 098 Media Select Satellite - 099 Media Select Security - 09a Media Select Home - 09b Media Select Call - 09c Channel Increment - 09d Channel Decrement - 09e Media Select SAP - 0a0 VCR Plus - 0a1 Once - 0a2 Daily - 0a3 Weekly - 0a4 Monthly - 0b0 Play - 0b1 Pause - 0b2 Record - 0b3 Fast Forward - 0b4 Rewind - 0b5 Scan Next Track - 0b6 Scan Previous Track - 0b7 Stop - 0b8 Eject - 0b9 Random Play - 0ba Select Disc - 0bb Enter Disc - 0bc Repeat - 0bd Tracking - 0be Track Normal - 0bf Slow Tracking - 0c0 Frame Forward - 0c1 Frame Back - 0c2 Mark - 0c3 Clear Mark - 0c4 Repeat from Mark - 0c5 Return to Mark - 0c6 Search Mark Forward - 0c7 Search Mark Backward - 0c8 Counter Reset - 0c9 Show Counter - 0ca Tracking Increment - 0cb Tracking Decrement - 0cc Stop/Eject - 0cd Play/Pause - 0ce Play/Skip - 0e0 Volume - 0e1 Balance - 0e2 Mute - 0e3 Bass - 0e4 Treble - 0e5 Bass Boost - 0e6 Surround Mode - 0e7 Loudness - 0e8 MPX - 0e9 Volume Increment - 0ea Volume Decrement - 0f0 Speed Select - 0f1 Playback Speed - 0f2 Standard Play - 0f3 Long Play - 0f4 Extended Play - 0f5 Slow - 100 Fan Enable - 101 Fan Speed - 102 Light Enable - 103 Light Illumination Level - 104 Climate Control Enable - 105 Room Temperature - 106 Security Enable - 107 Fire Alarm - 108 Police Alarm - 150 Balance Right - 151 Balance Left - 152 Bass Increment - 153 Bass Decrement - 154 Treble Increment - 155 Treble Decrement - 160 Speaker System - 161 Channel Left - 162 Channel Right - 163 Channel Center - 164 Channel Front - 165 Channel Center Front - 166 Channel Side - 167 Channel Surround - 168 Channel Low Frequency Enhancement - 169 Channel Top - 16a Channel Unknown - 170 Sub-Channel - 171 Sub-Channel Increment - 172 Sub-Channel Decrement - 173 Alternative Audio Increment - 174 Alternative Audio Decrement - 180 Application Launch Buttons - 181 AL Launch Button Configuration Tool - 182 AL Launch Button Configuration - 183 AL Consumer Control Configuration - 184 AL Word Processor - 185 AL Text Editor - 186 AL Spreadsheet - 187 AL Graphics Editor - 188 AL Presentation App - 189 AL Database App - 18a AL Email Reader - 18b AL Newsreader - 18c AL Voicemail - 18d AL Contacts/Address Book - 18e AL Calendar/Schedule - 18f AL Task/Project Manager - 190 AL Log/Jounal/Timecard - 191 AL Checkbook/Finance - 192 AL Calculator - 193 AL A/V Capture/Playback - 194 AL Local Machine Browser - 195 AL LAN/Wan Browser - 196 AL Internet Browser - 197 AL Remote Networking/ISP Connect - 198 AL Network Conference - 199 AL Network Chat - 19a AL Telephony/Dialer - 19b AL Logon - 19c AL Logoff - 19d AL Logon/Logoff - 19e AL Terminal Local/Screensaver - 19f AL Control Panel - 1a0 AL Command Line Processor/Run - 1a1 AL Process/Task Manager - 1a2 AL Select Task/Application - 1a3 AL Next Task/Application - 1a4 AL Previous Task/Application - 1a5 AL Preemptive Halt Task/Application - 200 Generic GUI Application Controls - 201 AC New - 202 AC Open - 203 AC CLose - 204 AC Exit - 205 AC Maximize - 206 AC Minimize - 207 AC Save - 208 AC Print - 209 AC Properties - 21a AC Undo - 21b AC Copy - 21c AC Cut - 21d AC Paste - 21e AC Select All - 21f AC Find - 220 AC Find and Replace - 221 AC Search - 222 AC Go To - 223 AC Home - 224 AC Back - 225 AC Forward - 226 AC Stop - 227 AC Refresh - 228 AC Previous Link - 229 AC Next Link - 22b AC History - 22c AC Subscriptions - 22d AC Zoom In - 22e AC Zoom Out - 22f AC Zoom - 230 AC Full Screen View - 231 AC Normal View - 232 AC View Toggle - 233 AC Scroll Up - 234 AC Scroll Down - 235 AC Scroll - 236 AC Pan Left - 237 AC Pan Right - 238 AC Pan - 239 AC New Window - 23a AC Tile Horizontally - 23b AC Tile Vertically - 23c AC Format -HUT 0d Digitizer - 000 Undefined - 001 Digitizer - 002 Pen - 003 Light Pen - 004 Touch Screen - 005 Touch Pad - 006 White Board - 007 Coordinate Measuring Machine - 008 3D Digitizer - 009 Stereo Plotter - 00a Articulated Arm - 00b Armature - 00c Multiple Point Digitizer - 00d Free Space Wand - 020 Stylus - 021 Puck - 022 Finger - 030 Tip Pressure - 031 Barrel Pressure - 032 In Range - 033 Touch - 034 Untouch - 035 Tap - 036 Quality - 037 Data Valid - 038 Transducer Index - 039 Tablet Function Keys - 03a Program Change Keys - 03b Battery Strength - 03c Invert - 03d X Tilt - 03e Y Tilt - 03f Azimuth - 040 Altitude - 041 Twist - 042 Tip Switch - 043 Secondary Tip Switch - 044 Barrel Switch - 045 Eraser - 046 Tablet Pick - 047 Confidence - 048 Width - 049 Height - 051 Contact ID - 052 Input Mode - 053 Device Index - 054 Contact Count - 055 Maximum Contact Number -HUT 0f PID Page - 000 Undefined - 001 Physical Interface Device - 020 Normal - 021 Set Effect Report - 022 Effect Block Index - 023 Parameter Block Offset - 024 ROM Flag - 025 Effect Type - 026 ET Constant Force - 027 ET Ramp - 028 ET Custom Force Data - 030 ET Square - 031 ET Sine - 032 ET Triangle - 033 ET Sawtooth Up - 034 ET Sawtooth Down - 040 ET Spring - 041 ET Damper - 042 ET Inertia - 043 ET Friction - 050 Duration - 051 Sample Period - 052 Gain - 053 Trigger Button - 054 Trigger Repeat Interval - 055 Axes Enable - 056 Direction Enable - 057 Direction - 058 Type Specific Block Offset - 059 Block Type - 05A Set Envelope Report - 05B Attack Level - 05C Attack Time - 05D Fade Level - 05E Fade Time - 05F Set Condition Report - 060 CP Offset - 061 Positive Coefficient - 062 Negative Coefficient - 063 Positive Saturation - 064 Negative Saturation - 065 Dead Band - 066 Download Force Sample - 067 Isoch Custom Force Enable - 068 Custom Force Data Report - 069 Custom Force Data - 06A Custom Force Vendor Defined Data - 06B Set Custom Force Report - 06C Custom Force Data Offset - 06D Sample Count - 06E Set Periodic Report - 06F Offset - 070 Magnitude - 071 Phase - 072 Period - 073 Set Constant Force Report - 074 Set Ramp Force Report - 075 Ramp Start - 076 Ramp End - 077 Effect Operation Report - 078 Effect Operation - 079 Op Effect Start - 07A Op Effect Start Solo - 07B Op Effect Stop - 07C Loop Count - 07D Device Gain Report - 07E Device Gain - 07F PID Pool Report - 080 RAM Pool Size - 081 ROM Pool Size - 082 ROM Effect Block Count - 083 Simultaneous Effects Max - 084 Pool Alignment - 085 PID Pool Move Report - 086 Move Source - 087 Move Destination - 088 Move Length - 089 PID Block Load Report - 08B Block Load Status - 08C Block Load Success - 08D Block Load Full - 08E Block Load Error - 08F Block Handle - 090 PID Block Free Report - 091 Type Specific Block Handle - 092 PID State Report - 094 Effect Playing - 095 PID Device Control Report - 096 PID Device Control - 097 DC Enable Actuators - 098 DC Disable Actuators - 099 DC Stop All Effects - 09A DC Device Reset - 09B DC Device Pause - 09C DC Device Continue - 09F Device Paused - 0A0 Actuators Enabled - 0A4 Safety Switch - 0A5 Actuator Override Switch - 0A6 Actuator Power - 0A7 Start Delay - 0A8 Parameter Block Size - 0A9 Device Managed Pool - 0AA Shared Parameter Blocks - 0AB Create New Effect Report - 0AC RAM Pool Available -HUT 10 Unicode -HUT 14 Alphanumeric Display - 000 Undefined - 001 Alphanumeric Display - 020 Display Attributes Report - 021 ASCII Character Set - 022 Data Read Back - 023 Font Read Back - 024 Display Control Report - 025 Clear Display - 026 Display Enable - 027 Screen Saver Delay - 028 Screen Saver Enable - 029 Vertical Scroll - 02a Horizontal Scroll - 02b Character Report - 02c Display Data - 02d Display Status - 02e Stat Not Ready - 02f Stat Ready - 030 Err Not a loadable Character - 031 Err Font Data Cannot Be Read - 032 Cursur Position Report - 033 Row - 034 Column - 035 Rows - 036 Columns - 037 Cursor Pixel Positioning - 038 Cursor Mode - 039 Cursor Enable - 03a Cursor Blink - 03b Font Report - 03c Font Data - 03d Character Width - 03e Character Height - 03f Character Spacing Horizontal - 040 Character Spacing Vertical - 041 Unicode Character Set -HUT 80 USB Monitor - 001 Monitor Control - 002 EDID Information - 003 VDIF Information - 004 VESA Version -HUT 81 USB Monitor Enumerated Values -HUT 82 Monitor VESA Virtual Controls - 001 Degauss - 010 Brightness - 012 Contrast - 016 Red Video Gain - 018 Green Video Gain - 01a Blue Video Gain - 01c Focus - 020 Horizontal Position - 022 Horizontal Size - 024 Horizontal Pincushion - 026 Horizontal Pincushion Balance - 028 Horizontal Misconvergence - 02a Horizontal Linearity - 02c Horizontal Linearity Balance - 030 Vertical Position - 032 Vertical Size - 034 Vertical Pincushion - 036 Vertical Pincushion Balance - 038 Vertical Misconvergence - 03a Vertical Linearity - 03c Vertical Linearity Balance - 040 Parallelogram Balance (Key Distortion) - 042 Trapezoidal Distortion (Key) - 044 Tilt (Rotation) - 046 Top Corner Distortion Control - 048 Top Corner Distortion Balance - 04a Bottom Corner Distortion Control - 04c Bottom Corner Distortion Balance - 056 Horizontal Moire - 058 Vertical Moire - 05e Input Level Select - 060 Input Source Select - 06c Red Video Black Level - 06e Green Video Black Level - 070 Blue Video Black Level - 0a2 Auto Size Center - 0a4 Polarity Horizontal Sychronization - 0a6 Polarity Vertical Synchronization - 0aa Screen Orientation - 0ac Horizontal Frequency in Hz - 0ae Vertical Frequency in 0.1 Hz - 0b0 Settings - 0ca On Screen Display (OSD) - 0d4 Stereo Mode -HUT 84 Power Device Page - 000 Undefined - 001 iName - 002 Present Status - 003 Changed Status - 004 UPS - 005 Power Supply - 010 Battery System - 011 Battery System ID - 012 Battery - 013 Battery ID - 014 Charger - 015 Charger ID - 016 Power Converter - 017 Power Converter ID - 018 Outlet System - 019 Outlet System ID - 01a Input - 01b Input ID - 01c Output - 01d Output ID - 01e Flow - 01f Flow ID - 020 Outlet - 021 Outlet ID - 022 Gang - 023 Gang ID - 024 Power Summary - 025 Power Summary ID - 030 Voltage - 031 Current - 032 Frequency - 033 Apparent Power - 034 Active Power - 035 Percent Load - 036 Temperature - 037 Humidity - 038 Bad Count - 040 Config Voltage - 041 Config Current - 042 Config Frequency - 043 Config Apparent Power - 044 Config Active Power - 045 Config Percent Load - 046 Config Temperature - 047 Config Humidity - 050 Switch On Control - 051 Switch Off Control - 052 Toggle Control - 053 Low Voltage Transfer - 054 High Voltage Transfer - 055 Delay Before Reboot - 056 Delay Before Startup - 057 Delay Before Shutdown - 058 Test - 059 Module Reset - 05a Audible Alarm Control - 060 Present - 061 Good - 062 Internal Failure - 063 Voltage out of range - 064 Frequency out of range - 065 Overload - 066 Over Charged - 067 Over Temperature - 068 Shutdown Requested - 069 Shutdown Imminent - 06a Reserved - 06b Switch On/Off - 06c Switchable - 06d Used - 06e Boost - 06f Buck - 070 Initialized - 071 Tested - 072 Awaiting Power - 073 Communication Lost - 0fd iManufacturer - 0fe iProduct - 0ff iSerialNumber -HUT 85 Battery System Page - 000 Undefined - 001 SMB Battery Mode - 002 SMB Battery Status - 003 SMB Alarm Warning - 004 SMB Charger Mode - 005 SMB Charger Status - 006 SMB Charger Spec Info - 007 SMB Selector State - 008 SMB Selector Presets - 009 SMB Selector Info - 010 Optional Mfg. Function 1 - 011 Optional Mfg. Function 2 - 012 Optional Mfg. Function 3 - 013 Optional Mfg. Function 4 - 014 Optional Mfg. Function 5 - 015 Connection to SMBus - 016 Output Connection - 017 Charger Connection - 018 Battery Insertion - 019 Use Next - 01a OK to use - 01b Battery Supported - 01c SelectorRevision - 01d Charging Indicator - 028 Manufacturer Access - 029 Remaining Capacity Limit - 02a Remaining Time Limit - 02b At Rate - 02c Capacity Mode - 02d Broadcast To Charger - 02e Primary Battery - 02f Charge Controller - 040 Terminate Charge - 041 Terminate Discharge - 042 Below Remaining Capacity Limit - 043 Remaining Time Limit Expired - 044 Charging - 045 Discharging - 046 Fully Charged - 047 Fully Discharged - 048 Conditioning Flag - 049 At Rate OK - 04a SMB Error Code - 04b Need Replacement - 060 At Rate Time To Full - 061 At Rate Time To Empty - 062 Average Current - 063 Max Error - 064 Relative State Of Charge - 065 Absolute State Of Charge - 066 Remaining Capacity - 067 Full Charge Capacity - 068 Run Time To Empty - 069 Average Time To Empty - 06a Average Time To Full - 06b Cycle Count - 080 Batt. Pack Model Level - 081 Internal Charge Controller - 082 Primary Battery Support - 083 Design Capacity - 084 Specification Info - 085 Manufacturer Date - 086 Serial Number - 087 iManufacturerName - 088 iDeviceName - 089 iDeviceChemistry - 08a Manufacturer Data - 08b Rechargeable - 08c Warning Capacity Limit - 08d Capacity Granularity 1 - 08e Capacity Granularity 2 - 08f iOEMInformation - 0c0 Inhibit Charge - 0c1 Enable Polling - 0c2 Reset To Zero - 0d0 AC Present - 0d1 Battery Present - 0d2 Power Fail - 0d3 Alarm Inhibited - 0d4 Thermistor Under Range - 0d5 Thermistor Hot - 0d6 Thermistor Cold - 0d7 Thermistor Over Range - 0d8 Voltage Out Of Range - 0d9 Current Out Of Range - 0da Current Not Regulated - 0db Voltage Not Regulated - 0dc Master Mode - 0f0 Charger Selector Support - 0f1 Charger Spec - 0f2 Level 2 - 0f3 Level 3 -HUT 86 Power Pages -HUT 87 Power Pages -HUT 8c Bar Code Scanner Page (POS) -HUT 8d Scale Page (POS) -HUT 90 Camera Control Page -HUT 91 Arcade Control Page -HUT f0 Cash Device - 0f1 Cash Drawer - 0f2 Cash Drawer Number - 0f3 Cash Drawer Set - 0f4 Cash Drawer Status -HUT ff Vendor Specific - -# List of Languages - -# Syntax: -# L language_id language_name -# dialect_id dialect_name - -L 0001 Arabic - 01 Saudi Arabia - 02 Iraq - 03 Egypt - 04 Libya - 05 Algeria - 06 Morocco - 07 Tunesia - 08 Oman - 09 Yemen - 0a Syria - 0b Jordan - 0c Lebanon - 0d Kuwait - 0e U.A.E - 0f Bahrain - 10 Qatar -L 0002 Bulgarian -L 0003 Catalan -L 0004 Chinese - 01 Traditional - 02 Simplified - 03 Hongkong SAR, PRC - 04 Singapore - 05 Macau SAR -L 0005 Czech -L 0006 Danish -L 0007 German - 01 German - 02 Swiss - 03 Austrian - 04 Luxembourg - 05 Liechtenstein -L 0008 Greek -L 0009 English - 01 US - 02 UK - 03 Australian - 04 Canadian - 05 New Zealand - 06 Ireland - 07 South Africa - 08 Jamaica - 09 Carribean - 0a Belize - 0b Trinidad - 0c Zimbabwe - 0d Philippines -L 000a Spanish - 01 Castilian - 02 Mexican - 03 Modern - 04 Guatemala - 05 Costa Rica - 06 Panama - 07 Dominican Republic - 08 Venzuela - 09 Colombia - 0a Peru - 0b Argentina - 0c Ecuador - 0d Chile - 0e Uruguay - 0f Paraguay - 10 Bolivia - 11 El Salvador - 12 Honduras - 13 Nicaragua - 14 Puerto Rico -L 000b Finnish -L 000c French - 01 French - 02 Belgian - 03 Canadian - 04 Swiss - 05 Luxembourg - 06 Monaco -L 000d Hebrew -L 000e Hungarian -L 000f Idelandic -L 0010 Italian - 01 Italian - 02 Swiss -L 0011 Japanese -L 0012 Korean - 01 Korean -L 0013 Dutch - 01 Dutch - 02 Belgian -L 0014 Norwegian - 01 Bokmal - 02 Nynorsk -L 0015 Polish -L 0016 Portuguese - 01 Portuguese - 02 Brazilian -L 0017 forgotten -L 0018 Romanian -L 0019 Russian -L 001a Serbian - 01 Croatian - 02 Latin - 03 Cyrillic -L 001b Slovak -L 001c Albanian -L 001d Swedish - 01 Swedish - 02 Finland -L 001e Thai -L 001f Turkish -L 0020 Urdu - 01 Pakistan - 02 India -L 0021 Indonesian -L 0022 Ukrainian -L 0023 Belarusian -L 0024 Slovenian -L 0025 Estonian -L 0026 Latvian -L 0027 Lithuanian - 01 Lithuanian -L 0028 forgotten -L 0029 Farsi -L 002a Vietnamese -L 002b Armenian -L 002c Azeri - 01 Cyrillic - 02 Latin -L 002d Basque -L 002e forgotten -L 002f Macedonian -L 0036 Afrikaans -L 0037 Georgian -L 0038 Faeroese -L 0039 Hindi -L 003e Malay - 01 Malaysia - 02 Brunei Darassalam -L 003f Kazak -L 0041 Awahili -L 0043 Uzbek - 01 Latin - 02 Cyrillic -L 0044 Tatar -L 0045 Bengali -L 0046 Punjabi -L 0047 Gujarati -L 0048 Oriya -L 0049 Tamil -L 004a Telugu -L 004b Kannada -L 004c Malayalam -L 004d Assamese -L 004e Marathi -L 004f Sanskrit -L 0057 Konkani -L 0058 Manipuri -L 0059 Sindhi -L 0060 Kashmiri - 02 India -L 0061 Nepali - 02 India - -# HID Descriptor bCountryCode -# HID Specification 1.11 (2001-06-27) page 23 -# -# Syntax: -# HCC country_code keymap_type - -HCC 00 Not supported -HCC 01 Arabic -HCC 02 Belgian -HCC 03 Canadian-Bilingual -HCC 04 Canadian-French -HCC 05 Czech Republic -HCC 06 Danish -HCC 07 Finnish -HCC 08 French -HCC 09 German -HCC 10 Greek -HCC 11 Hebrew -HCC 12 Hungary -HCC 13 International (ISO) -HCC 14 Italian -HCC 15 Japan (Katakana) -HCC 16 Korean -HCC 17 Latin American -HCC 18 Netherlands/Dutch -HCC 19 Norwegian -HCC 20 Persian (Farsi) -HCC 21 Poland -HCC 22 Portuguese -HCC 23 Russia -HCC 24 Slovakia -HCC 25 Spanish -HCC 26 Swedish -HCC 27 Swiss/French -HCC 28 Swiss/German -HCC 29 Switzerland -HCC 30 Taiwan -HCC 31 Turkish-Q -HCC 32 UK -HCC 33 US -HCC 34 Yugoslavia -HCC 35 Turkish-F - -# List of Video Class Terminal Types - -# Syntax: -# VT terminal_type terminal_type_name - -VT 0100 USB Vendor Specific -VT 0101 USB Streaming -VT 0200 Input Vendor Specific -VT 0201 Camera Sensor -VT 0202 Sequential Media -VT 0300 Output Vendor Specific -VT 0301 Generic Display -VT 0302 Sequential Media -VT 0400 External Vendor Specific -VT 0401 Composite Video -VT 0402 S-Video -VT 0403 Component Video diff --git a/testing/util-linux/mount-segfault-2.19.1.patch b/testing/util-linux/mount-segfault-2.19.1.patch deleted file mode 100644 index 7bcb3bc05..000000000 --- a/testing/util-linux/mount-segfault-2.19.1.patch +++ /dev/null @@ -1,84 +0,0 @@ -From f53edda83ebcfd7015c3f35196d6cbd7bc2d8369 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Wed, 11 May 2011 16:57:27 +0200 -Subject: [PATCH] mount: -a segfaults when 4th field is omitted (mount - options) - - # echo 'tmpd /tmp/x tmpfs' >> /etc/fstab - # mkdir /tmp/x - # mount -a - segfault - -Reported-by: Mike Frysinger <vapier@gentoo.org> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - mount/mount.c | 8 +++++--- - mount/mount_mntent.c | 5 +++-- - mount/sundries.c | 2 ++ - 3 files changed, 10 insertions(+), 5 deletions(-) - -diff --git a/mount/mount.c b/mount/mount.c -index ba71149..29963c2 100644 ---- a/mount/mount.c -+++ b/mount/mount.c -@@ -1163,7 +1163,9 @@ is_mounted_same_loopfile(const char *node0, const char *loopfile, unsigned long - res = loopfile_used_with((char *) mnt->m.mnt_fsname, - loopfile, offset); - -- else if ((p = strstr(mnt->m.mnt_opts, "loop="))) { -+ else if (mnt->m.mnt_opts && -+ (p = strstr(mnt->m.mnt_opts, "loop="))) -+ { - char *dev = xstrdup(p+5); - if ((p = strchr(dev, ','))) - *p = '\0'; -@@ -2052,8 +2054,8 @@ is_fstab_entry_mounted(struct mntentchn *mc, int verbose) - goto yes; - - /* extra care for loop devices */ -- if ((strstr(mc->m.mnt_opts, "loop=") || -- (stat(mc->m.mnt_fsname, &st) == 0 && S_ISREG(st.st_mode)))) { -+ if ((mc->m.mnt_opts && strstr(mc->m.mnt_opts, "loop=")) || -+ (stat(mc->m.mnt_fsname, &st) == 0 && S_ISREG(st.st_mode))) { - - char *p = get_option_value(mc->m.mnt_opts, "offset="); - uintmax_t offset = 0; -diff --git a/mount/mount_mntent.c b/mount/mount_mntent.c -index d90def3..f42c0ad 100644 ---- a/mount/mount_mntent.c -+++ b/mount/mount_mntent.c -@@ -70,7 +70,7 @@ my_addmntent (mntFILE *mfp, struct my_mntent *mnt) { - m1 = mangle(mnt->mnt_fsname); - m2 = mangle(mnt->mnt_dir); - m3 = mangle(mnt->mnt_type); -- m4 = mangle(mnt->mnt_opts); -+ m4 = mnt->mnt_opts ? mangle(mnt->mnt_opts) : "rw"; - - res = fprintf (mfp->mntent_fp, "%s %s %s %s %d %d\n", - m1, m2, m3, m4, mnt->mnt_freq, mnt->mnt_passno); -@@ -78,7 +78,8 @@ my_addmntent (mntFILE *mfp, struct my_mntent *mnt) { - free(m1); - free(m2); - free(m3); -- free(m4); -+ if (mnt->mnt_opts) -+ free(m4); - return (res < 0) ? 1 : 0; - } - -diff --git a/mount/sundries.c b/mount/sundries.c -index ae4501a..2dec37f 100644 ---- a/mount/sundries.c -+++ b/mount/sundries.c -@@ -217,6 +217,8 @@ matching_opts (const char *options, const char *test_opts) { - - if (test_opts == NULL) - return 1; -+ if (options == NULL) -+ options = ""; - - len = strlen(test_opts); - q = alloca(len+1); --- -1.7.5.1 - diff --git a/testing/util-linux/two-component-linux.patch b/testing/util-linux/two-component-linux.patch deleted file mode 100644 index 1b65ca295..000000000 --- a/testing/util-linux/two-component-linux.patch +++ /dev/null @@ -1,32 +0,0 @@ -From fa7e0d6d442de9f5940f99fd93f4522602439131 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Mon, 6 Jun 2011 12:35:26 +0200 -Subject: [PATCH] lib: [linux_version.c] accommodate two-component linux - version (e.g. 3.0) - -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - lib/linux_version.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/linux_version.c b/lib/linux_version.c -index f9fbd8d..ada566a 100644 ---- a/lib/linux_version.c -+++ b/lib/linux_version.c -@@ -16,10 +16,10 @@ get_linux_version (void) - return kver; - if (uname (&uts)) - kver = 0; -- else if (sscanf (uts.release, "%d.%d.%d", &major, &minor, &teeny) != 3) -- kver = 0; -- else -+ else if (sscanf (uts.release, "%d.%d.%d", &major, &minor, &teeny) == 3) - kver = KERNEL_VERSION (major, minor, teeny); -+ else if (sscanf (uts.release, "%d.%d", &major, &minor) == 2) -+ kver = KERNEL_VERSION (major, minor, 0); - - return kver; - } --- -1.7.6 - diff --git a/testing/vino/PKGBUILD b/testing/vino/PKGBUILD deleted file mode 100644 index ddd37f61e..000000000 --- a/testing/vino/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 134988 2011-08-09 18:47:51Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=vino -pkgver=3.0.3 -pkgrel=2 -pkgdesc="a VNC server for the GNOME desktop" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libgnome-keyring' 'avahi' 'desktop-file-utils') -makedepends=('intltool' 'networkmanager') -groups=('gnome-extra') -url="http://www.gnome.org" -options=(!emptydirs) -install=vino.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('0e58027d3c10649da61445cdd5205e31c4d1aa0b63f4911de3db4e7052d7bbfb') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/vino \ - --localstatedir=/var \ - --enable-gnome-keyring \ - --enable-avahi - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/vino/vino.install b/testing/vino/vino.install deleted file mode 100644 index 469266843..000000000 --- a/testing/vino/vino.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall vino - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD deleted file mode 100644 index c7d6642bf..000000000 --- a/testing/vlc/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 135024 2011-08-09 21:18:13Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> -# Contributor: Martin Sandsmark <martin.sandsmark@kde.org> - -pkgname=vlc -pkgver=1.1.11 -pkgrel=4 -pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" -arch=('i686' 'x86_64') -url="http://www.videolan.org/vlc/" -license=('GPL') -depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio' - 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' - 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' - 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' - 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' - 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') -makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify' - 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' - 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' - 'lirc-utils' 'gnutls' 'libcaca') -optdepends=('avahi: for service discovery using bonjour protocol' - 'libnotify: for notification plugin' - 'ncurses: for ncurses interface support' - 'libdvdcss: for decoding encrypted DVDs' - 'lirc-utils: for lirc plugin' - 'libavc1394: for devices using the 1394ta AV/C' - 'libdc1394: for IEEE 1394 plugin' - 'kdelibs: KDE Solid hardware integration' - 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' - 'libpulse: PulseAudio support') -conflicts=('vlc-plugin') -replaces=('vlc-plugin') -backup=('usr/share/vlc/http/.hosts' - 'usr/share/vlc/http/dialogs/.hosts' - 'usr/share/vlc/lua/http/.hosts' - 'usr/share/vlc/lua/http/dialogs/.hosts') -options=('!libtool') -install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('a64846d6f21ea179ae8e8bfb6f9447fe') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c - - ./configure --prefix=/usr \ - --disable-rpath \ - --enable-faad \ - --enable-v4l \ - --enable-snapshot \ - --enable-dbus-control \ - --enable-nls \ - --enable-lirc \ - --enable-pvr \ - --enable-ncurses \ - --with-live555-tree=/usr/lib/live \ - --enable-upnp \ - --enable-realrtsp - make -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}/" install - - for res in 16 32 48 128; do - install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ - "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" - done -} diff --git a/testing/vlc/vlc.install b/testing/vlc/vlc.install deleted file mode 100644 index 4a1091bc5..000000000 --- a/testing/vlc/vlc.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/vlc/plugins/plugins-*.dat -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} diff --git a/testing/vpnc/PKGBUILD b/testing/vpnc/PKGBUILD deleted file mode 100644 index 04ee61cfc..000000000 --- a/testing/vpnc/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 135374 2011-08-13 09:06:19Z thomas $ -# Maintainer: Thomas Baechler <thomas@archlinux.org> - -pkgname=vpnc -pkgver=0.5.3 -pkgrel=4 -pkgdesc="VPN client for cisco3000 VPN Concentrators" -url="http://www.unix-ag.uni-kl.de/~massar/vpnc/" -license=('GPL') -depends=('libgcrypt' 'openssl' 'iproute2' 'net-tools') -optdepends=('openresolv: Let vpnc manage resolv.conf') -arch=('i686' 'x86_64') -source=("http://www.unix-ag.uni-kl.de/~massar/vpnc/$pkgname-$pkgver.tar.gz" - 'vpnc.conf' - 'vpnc.rc' - fix-iproute-syntax.patch) -backup=('etc/vpnc/default.conf') -md5sums=('4378f9551d5b077e1770bbe09995afb3' - 'a3f4e0cc682f437e310a1c86ae198e45' - 'c5885162ac198eaa36da9a01e7c0c55b' - '193a35773594667a2782701aff372551') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - - # Build hybrid support - sed -i 's|^#OPENSSL|OPENSSL|g' Makefile - - # Fix vpnc-script - sed 's|/sbin/resolvconf|/usr/sbin/resolvconf|g' -i vpnc-script.in - patch -p1 -i "${srcdir}"/fix-iproute-syntax.patch - - make PREFIX=/usr -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" PREFIX=/usr install - - install -D -m644 "${srcdir}"/vpnc.conf "${pkgdir}"/etc/vpnc/default.conf - install -D -m755 "${srcdir}"/vpnc.rc "${pkgdir}"/etc/rc.d/vpnc - rm -f "${pkgdir}"/etc/vpnc/vpnc.conf -} diff --git a/testing/vpnc/fix-iproute-syntax.patch b/testing/vpnc/fix-iproute-syntax.patch deleted file mode 100644 index 9cba4bec3..000000000 --- a/testing/vpnc/fix-iproute-syntax.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a1cac186f66d0f2e8b1dce67e648aae4219c3013 Mon Sep 17 00:00:00 2001 -From: Alessandro Suardi <alessandro.suardi@gmail.com> -Date: Sat, 28 May 2011 23:20:15 +0100 -Subject: [PATCH 1/1] Cope with new kernel/iproute including ipid in route list - -Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> ---- - vpnc-script | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/vpnc-script b/vpnc-script -index cc62997..e0140c5 100755 ---- a/vpnc-script.in -+++ b/vpnc-script.in -@@ -139,7 +139,7 @@ destroy_tun_device() { - - if [ -n "$IPROUTE" ]; then - fix_ip_get_output () { -- sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g' -+ sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g;s/ipid 0x....//g' - } - - set_vpngateway_route() { --- -1.7.3.4 - diff --git a/testing/vpnc/vpnc.conf b/testing/vpnc/vpnc.conf deleted file mode 100644 index 914f827fd..000000000 --- a/testing/vpnc/vpnc.conf +++ /dev/null @@ -1,17 +0,0 @@ -# example vpnc configuration file -# see vpnc --long-help for details - -#Interface name tun0 -#IKE DH Group dh2 -#Perfect Forward Secrecy nopfs - -# You may replace this script with something better -#Script /etc/vpnc/vpnc-script -# Enable this option for NAT traversal -#UDP Encapsulate - -#IPSec gateway my.gateway.com -#IPSec ID someid -#IPSec secret somesecret -#Xauth username myusername -#Xauth password mypassword diff --git a/testing/vpnc/vpnc.rc b/testing/vpnc/vpnc.rc deleted file mode 100644 index 972ed3211..000000000 --- a/testing/vpnc/vpnc.rc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Connecting to VPN" - /usr/sbin/vpnc - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon vpnc - stat_done - fi - ;; - stop) - stat_busy "Disconnecting from VPN" - /usr/sbin/vpnc-disconnect - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon vpnc - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/weechat/PKGBUILD b/testing/weechat/PKGBUILD deleted file mode 100644 index 6e53c7d86..000000000 --- a/testing/weechat/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 135012 2011-08-09 21:04:57Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: lucke <lucke at o2 dot pl> - -pkgname=weechat -pkgver=0.3.5 -pkgrel=3 -pkgdesc="Fast, light and extensible IRC client (curses UI)" -arch=('i686' 'x86_64') -url="http://www.weechat.org/" -license=('GPL') -depends=('gnutls') -makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') -optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') -options=('!libtool') -source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('0d2a089bfbfa550e0c65618a171fb3c4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - mkdir build - cd build - cmake .. -DPREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/build" - - make DESTDIR="${pkgdir}/" install -} diff --git a/testing/wget/PKGBUILD b/testing/wget/PKGBUILD deleted file mode 100644 index affb57a6d..000000000 --- a/testing/wget/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 136669 2011-08-31 12:21:16Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> - -pkgname=wget -pkgver=1.13.3 -pkgrel=1 -pkgdesc="A network utility to retrieve files from the Web" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/wget/wget.html" -license=('GPL3') -groups=('base') -depends=('glibc' 'openssl') -optdepends=('ca-certificates: HTTPS downloads') -backup=('etc/wgetrc') -install=wget.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz) -md5sums=('540cbd50909885fe11bd7bc4f75268d1') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Note : We do not build with --enable-nls, because there is a bug in wget causing - # international domain names to be not properly converted to punycode if - # the current locale is a UTF-8 one - # See : http://lists.gnu.org/archive/html/bug-wget/2011-02/msg00026.html - - ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - cat >> "$pkgdir/etc/wgetrc" <<EOF - -# default root certs location -ca_certificate=/etc/ssl/certs/ca-certificates.crt -EOF - - # remove IRI option from wgetrc as it does not work (see above) - sed -i '118,120d' $pkgdir/etc/wgetrc - -} diff --git a/testing/wget/wget.install b/testing/wget/wget.install deleted file mode 100644 index 8eb6a2c3f..000000000 --- a/testing/wget/wget.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(wget.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/testing/wireshark/PKGBUILD b/testing/wireshark/PKGBUILD deleted file mode 100644 index 66b2f859c..000000000 --- a/testing/wireshark/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 134932 2011-08-09 14:19:48Z guillaume $ -# Maintainer: Guillaume ALAUX <guillaume at alaux dot net> -# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> -pkgname=(wireshark-cli wireshark-gtk) -pkgbase=wireshark -pkgver=1.6.1 -pkgrel=2 -arch=('i686' 'x86_64') -license=('GPL2') -makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'lua') -url="http://www.wireshark.org/" -options=(!libtool) -source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('dc1e8c9800b64130674b120a183e2308') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - export CFLAGS="-fno-unit-at-a-time ${CFLAGS}" - - ./configure \ - --prefix=/usr \ - --with-ssl \ - --with-zlib=yes \ - --with-lua - make all -} - -package_wireshark-cli() { - pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - CLI version" - depends=('krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'glib2' 'lua') - install=wireshark.install - conflicts=(wireshark) - - cd "${srcdir}/${pkgbase}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - #wireshark uid group is 150 - chgrp 150 "${pkgdir}/usr/bin/dumpcap" - chmod 754 "${pkgdir}/usr/bin/dumpcap" - rm "$pkgdir/usr/bin/wireshark" -} - -package_wireshark-gtk() { - pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - GTK frontend" - depends=('gtk2' 'wireshark-cli') - install=wireshark-gtk.install - replaces=(wireshark) - conflicts=(wireshark) - - cd "${srcdir}/${pkgbase}-${pkgver}" - - install -Dm755 .libs/wireshark "$pkgdir/usr/bin/wireshark" - for d in 16 32 48; do - install -Dm644 image/hi${d}-app-wireshark.png ${pkgdir}/usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png - done - install -Dm644 wireshark.desktop ${pkgdir}/usr/share/applications/wireshark.desktop -} diff --git a/testing/wireshark/wireshark-gtk.install b/testing/wireshark/wireshark-gtk.install deleted file mode 100644 index 6b1b64bdd..000000000 --- a/testing/wireshark/wireshark-gtk.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/wireshark/wireshark.install b/testing/wireshark/wireshark.install deleted file mode 100644 index 6585ba272..000000000 --- a/testing/wireshark/wireshark.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - - setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap - echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group" -} - -post_upgrade() { - getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - - setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap -} - -post_remove() { - if getent group wireshark >/dev/null 2>&1; then - groupdel wireshark - fi -} diff --git a/testing/xfce4-mailwatch-plugin/PKGBUILD b/testing/xfce4-mailwatch-plugin/PKGBUILD deleted file mode 100644 index 4a992bd09..000000000 --- a/testing/xfce4-mailwatch-plugin/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 134951 2011-08-09 15:38:12Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -# Contributor: Suzy Williams <suzanne.williams3@verizon.net> - -pkgname=xfce4-mailwatch-plugin -pkgver=1.1.0 -pkgrel=4 -pkgdesc="A mailbox watch/check plugin for the Xfce4 panel" -arch=(i686 x86_64) -license=('GPL2') -url="http://spurint.org/projects/xfce4-mailwatch-plugin/" -groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4' 'gnutls' 'libgcrypt' 'hicolor-icon-theme') -makedepends=('intltool' 'xfce4-dev-tools') -options=('!libtool') -install=${pkgname}.install -source=(http://spuriousinterrupt.org/files/mailwatch/${pkgname}-${pkgver}.tar.bz2 - xfce4-mailwatch-plugin-1.1.0-underlink.patch) -md5sums=('f84dce86be1d7f25f169f262aaacee4e' - '47fe8588e3bb642e1b507a854927e6db') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - # fix for panel4.8 from Fedora - patch -Np1 -i ${srcdir}/xfce4-mailwatch-plugin-1.1.0-underlink.patch - xdt-autogen - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --disable-debug - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch b/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch deleted file mode 100644 index ada0df041..000000000 --- a/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am 2008-08-26 03:42:36.000000000 +0100 -+++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am.new 2011-01-14 17:27:44.116199383 +0000 -@@ -50,6 +50,7 @@ - -I$(top_srcdir)/libmailwatch-core \ - @GTHREAD_CFLAGS@ \ - @LIBXFCE4PANEL_CFLAGS@ \ -+ @LIBXFCEGUI4_CFLAGS@ \ - -DDATADIR=\"$(datadir)\" \ - -DLOCALEDIR=\"$(localedir)\" - -@@ -60,7 +61,9 @@ - $(top_builddir)/libmailwatch-core/libmailwatch-core.la \ - @GTHREAD_LIBS@ \ - @LIBXFCE4PANEL_LIBS@ \ -- @GNUTLS_LIBS@ -+ @LIBXFCEGUI4_LIBS@ \ -+ @GNUTLS_LIBS@ \ -+ -lgcrypt - - if HAVE_CYGWIN - xfce4_mailwatch_plugin_LDFLAGS += \ diff --git a/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install b/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install deleted file mode 100644 index 21b79d2d4..000000000 --- a/testing/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/testing/xmlsec/PKGBUILD b/testing/xmlsec/PKGBUILD deleted file mode 100644 index c15a0ac98..000000000 --- a/testing/xmlsec/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 134954 2011-08-09 15:50:09Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Hussam Al-Tayeb <ht990332@gmail.com> - -pkgname=xmlsec -pkgver=1.2.18 -pkgrel=2 -pkgdesc="XML Security Library is a C library based on LibXML2" -license=('custom') -arch=(i686 x86_64) -url="http://www.aleksey.com/xmlsec/index.html" -depends=('libxslt>=1.1.26' 'openssl>=1.0.0' 'gnutls' 'nss>=3.12.10' 'libtool') -makedepends=('pkgconfig') -options=('!libtool') -source=(http://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz) -md5sums=('8694b4609aab647186607f79e1da7f1a') - -build() { - cd ${srcdir}/${pkgname}1-${pkgver} - ./configure --prefix=/usr --disable-static - make -} - -check() { - cd "$srcdir/${pkgname}1-$pkgver" - make -k check -} - -package() { - cd ${srcdir}/${pkgname}1-${pkgver} - make DESTDIR=${pkgdir} install - install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname} - install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ -} diff --git a/testing/xpdf/PKGBUILD b/testing/xpdf/PKGBUILD deleted file mode 100644 index a14ff1f34..000000000 --- a/testing/xpdf/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 135716 2011-08-18 02:47:24Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> - -pkgname=xpdf -#pkgver=3.03_pl1 -pkgver=3.03 -pkgrel=1 -pkgdesc='Viewer for Portable Document Format (PDF) files' -url='http://www.foolabs.com/xpdf/' -license=('GPL2') -arch=('i686' 'x86_64') -depends=('lesstif' 'gsfonts' 'libxt') -optdepends=('poppler: tools that used to be included in xpdf' - 'desktop-file-utils: for desktop environments') -# "ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}pl1.patch" -source=("ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}.tar.gz" - 'char.patch' - 'desktop') -sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248' - '5c471944685a6b24a2b0c0e000562d1a3263aeeb' - '3b6fe01636253676ffa0efe1b237a75af4721f6d') - -install=install -backup=('etc/xpdfrc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver%_*}" - -# patch -p1 -i "../${pkgname}-${_srcver}pl1.patch" - patch -p1 -i ../char.patch - - sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc - sed -i 's:times-medium-r-normal--16:times-medium-r-normal--14:' xpdf/XPDFViewer.cc # FS#14217 - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --enable-multithreaded \ - --enable-wordlist \ - --with-freetype2-library=/usr/lib \ - --with-freetype2-includes=/usr/include/freetype2 \ - --x-includes=/usr/include \ - --with-Xm-library=/usr/lib \ - --with-Xm-includes=/usr/include \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver%_*}" - - make DESTDIR="${pkgdir}" install - - install -Dm644 ../desktop "${pkgdir}/usr/share/applications/xpdf.desktop" - install -Dm644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm" - - # remove libs and manpages provided by poppler - # pdfdetach should go there too once it is in poppler - for tool in pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext ; do - rm "${pkgdir}/usr/bin/${tool}" - rm "${pkgdir}/usr/share/man/man1/${tool}.1" - done -} diff --git a/testing/xpdf/char.patch b/testing/xpdf/char.patch deleted file mode 100644 index 8e49393a6..000000000 --- a/testing/xpdf/char.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/xpdf/XPDFViewer.cc new/xpdf/XPDFViewer.cc ---- old/xpdf/XPDFViewer.cc 2011-08-15 14:08:53.000000000 -0700 -+++ new/xpdf/XPDFViewer.cc 2011-08-17 11:05:55.739431215 -0700 -@@ -1803,7 +1803,7 @@ - menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n); - for (i = 0; i < nZoomMenuItems; ++i) { - n = 0; -- s = XmStringCreateLocalized(zoomMenuInfo[i].label); -+ s = XmStringCreateLocalized((char *)zoomMenuInfo[i].label); - XtSetArg(args[n], XmNlabelString, s); ++n; - XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n; - sprintf(buf, "zoom%d", i); diff --git a/testing/xpdf/desktop b/testing/xpdf/desktop deleted file mode 100644 index 06830ecda..000000000 --- a/testing/xpdf/desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Xpdf -Comment=Views Adobe PDF (acrobat) files -Exec=xpdf -Terminal=false -Type=Application -Icon=xpdf -Categories=Office; -MimeType=application/pdf; diff --git a/testing/xpdf/install b/testing/xpdf/install deleted file mode 100644 index c6cf149dd..000000000 --- a/testing/xpdf/install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - [[ -x /usr/bin/update-desktop-database ]] && update-desktop-database -q || true -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/zlib/PKGBUILD b/testing/zlib/PKGBUILD deleted file mode 100644 index 49d3001de..000000000 --- a/testing/zlib/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 135477 2011-08-14 09:25:17Z allan $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgname=zlib -pkgver=1.2.5 -pkgrel=4 -pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP' -arch=('i686' 'x86_64') -license=('custom') -url="http://www.zlib.net/" -depends=('glibc') -options=('!makeflags') -source=("http://zlib.net/zlib-${pkgver}.tar.gz" - 'zlib-1.2.5-lfs-decls.patch') -md5sums=('c735eab2d659a96e5a594c9e8541ad63' - '4cb279ea3beab621f3526bf7b7ab99e5') - -build() { - cd ${srcdir}/zlib-$pkgver - # see http://bugs.archlinux.org/task/19280 - patch -p1 -i ${srcdir}/zlib-1.2.5-lfs-decls.patch - # work around gcc bug; see https://bugs.archlinux.org/task/20647 - export CFLAGS="${CFLAGS/-O2/-O3} -fno-tree-vectorize -DUNALIGNED_OK" - ./configure --prefix=/usr - make - - grep -A 24 '^ Copyright' zlib.h > LICENSE -} - -check() { - cd ${srcdir}/zlib-$pkgver - make check -} - -package() { - cd ${srcdir}/zlib-$pkgver - make install DESTDIR=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/zlib/LICENSE -} diff --git a/testing/zlib/zlib-1.2.5-lfs-decls.patch b/testing/zlib/zlib-1.2.5-lfs-decls.patch deleted file mode 100644 index 36e26af03..000000000 --- a/testing/zlib/zlib-1.2.5-lfs-decls.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: zlib-1.2.5/zlib.h -=================================================================== ---- zlib-1.2.5.orig/zlib.h -+++ zlib-1.2.5/zlib.h -@@ -1578,7 +1578,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF( - # define gzoffset gzoffset64 - # define adler32_combine adler32_combine64 - # define crc32_combine crc32_combine64 --# ifdef _LARGEFILE64_SOURCE -+# ifndef _LARGEFILE64_SOURCE - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); - ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); |
