This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via 1bd3de895bd354ef9ec33930b25fd9679814e72d (commit) via cd6c59aac1c89f75995cae71336309c24003871b (commit) via 189cf1270a241e4f4b2d5f0b1732b35fde2433ee (commit) via c74c84bc6c732683d80ee725be6e213b08ecd8db (commit) via 0208b0eb405a303abfacfe2511cb034b9f21bb5d (commit) via b6e4a22dfc232be996ee727ddf3dca4b7861645c (commit) via 3001c4d7c9776dfeecf7d67d58f5fb233b046d69 (commit) via 929b186c7af3974404d0afa928dff0d1f0ddb490 (commit) via be5b660500596f860a6ba3478aac441b86f60626 (commit) via 2d685e1d4c4959ef6a85c285e9f952b713527d50 (commit) via 03caa87399b5143e85a06d908bedc99d1c6b41d4 (commit) via f34844355bf8ce1c5239301fedc98f38ba765d5e (commit) via d48969312e45efcde69c7bbcb5d93710f73f53a6 (commit) via f35740ac44a9423b1bb1320c97987240bd3c7e60 (commit) via a761716f03c7eeb31fe6f53552a4e7b48da76c3c (commit) via 64aac4feb5e50e330da30555a54739cc89d1cd0e (commit) via 55904cd2b463983987f769c8dfd3691ced1d7912 (commit) via 860ad8cb1551ff0ec5b7da3d28bb9e358470382b (commit) via d63e50f936d4d33a29af56ebefc2d1ae197d030f (commit) via d9949d4dd18789f18c21867cc3b7c6bbe3ba2801 (commit) via f64c99631116407320ea362121b3698c60c3a40c (commit) via c6137209a4fa72de7ea13be0c0713bddf57c0f38 (commit) via 8e0d8bfd4d61656bec48a63d7a9263aed8f0da94 (commit) via e122dd636659d9e97dcd0441717955de04a737b6 (commit) via 53f7ba12e8d0ba9f9c72e075b4a9e4e5c4a4ac00 (commit) via 4245fe34792cb67b1fe4b073e3b4d71014c3b277 (commit) via ae666bf128e8660512a6fe0a12eda22c4b126446 (commit) via b31af08582737abd3913809bdf38147b6316973a (commit) via e7c69924fc9f4af89567024ad51b87323c1a6bf3 (commit) via 2b1ff41196a0b9ac6794904427416eb05506f13d (commit) via 2340d265b1a21f036a04d2ad9649bd7637eeda71 (commit) via 527bc5af18b7eefab2aac8f27a1c8be71c379b0f (commit) via 6ffa1bef03b981142217aecb02c6f00d4217a8ee (commit) via 9f6fd73bae357362817de5a50387acb7a0dd5aa0 (commit) via 0ac1ed294cab836e10f3f80f2d57d0e868a198a1 (commit) via dea399178ec1cb67d8235cc476a82dcd6a24080c (commit) via 2aecef3e59f4e63dfb781b4e2493edbd6225268d (commit) via 127b7c43d057173345b261d36ec3384ad159d34c (commit) via af578bab4599d5e9fe57aff7e6636e47ffcd2edd (commit) via 6c00bad302384208e825d0fd7c7ce332d6231219 (commit) via e65fe151a5b7bf7df9525fcae1cb920667818c2a (commit) via 754f508b5bf7ff3f89de369f2148f03bc7ee66c3 (commit) via 82c0cd6ae0ebefb3503c7bc2c8bf2e47b08f5698 (commit) via df05a856cdc5044398284b1a8dc704b22dfca911 (commit) via e4d79ba496c7d5203e04df34bf59b827b79a2e0c (commit) via 7c61607944e12a02366244dc1c03da5df832a8ce (commit) via 87e33a423fa7a85affc2cfd4f066fceb953f7163 (commit) via e157791fe963a98323ac88bec665624525bf809f (commit) via d31127446c9a7749921d05401f0eda97ce76ca3b (commit) via 5ba9e6606e0a9666fb2bf83c68f1979f9dd2fbb2 (commit) via 8b33e596c470e9216bd4c7e61bf2bfc889ea6673 (commit) via e3c1704453af2ec96e9c99f5f3ed8a2e0979d072 (commit) via 8e6a8fd5d3b36919ff427abcdd0e7072fc7f85d9 (commit) via 86228a56efb74663eb3545d4e75ec59c5a2a8b1e (commit) via 3765eb6179d721093c834e3483fdef8232b5b486 (commit) via e726a4716f90f6b19820479967199210bca4bdc8 (commit) via 57aaa16bf209a9b41b03ba598fce8ce999acc624 (commit) via 8ec8462ce3a0ac2cac4bdb70daaaeb98aaea4cbc (commit) via cd4a82251b83ff60540650902925c39550d86e13 (commit) via 6feadd073796fea103de58593b7d8aa7c4533f2c (commit) via b8867fe89a7a51e225f54af380b3e4f4b1815771 (commit) via 9fa2cb9c49e3ae3adfb0052409286c4c5267dc5f (commit) via 0b2e986e3948cc19ab9ed02ce3da11de495bc33f (commit) via 54cdc7dea2b59ff05bf9e1b4d6308214826fc8a1 (commit) via 9ff0db36c130cced27b667ac6b8ef8d423882380 (commit) via 3b5b44904748a923e0555ad929608f642574adb3 (commit) via dab66b75eef0f9d9fe42842ad67e14cb3591c0c9 (commit) via 5b9c1b9ad48f3428420ce4a8f1773c451ccfe2c1 (commit) via 71ce1f7a0e85cd00097acb3d68ff57ac1e5f60ee (commit) via d04fd3c956e262ddc5204645326f23923a353c56 (commit) via 9e49a099091af511fbb07f5b18fb7385bb41969d (commit) via 7a6bb67a6be2c51053d6a1a432926f7231ba23e8 (commit) via d0e3e64b1ec93ec93e62546fd52d37b2ad3232dd (commit) via 2c5bb6037f5eb29bc71580f6937dac570ec6a919 (commit) from cd010e09a321ab562ff45da1b27e521da160c71f (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 1bd3de895bd354ef9ec33930b25fd9679814e72d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Oct 6 18:39:08 2013 +0200
close core73.
commit cd6c59aac1c89f75995cae71336309c24003871b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Oct 6 18:37:15 2013 +0200
wirelessclient.cgi: fix handling of "'" 2nd try.
-----------------------------------------------------------------------
Summary of changes: config/cfgroot/header.pl | 17 +- config/cfgroot/useragents | 2 +- config/rootfiles/common/HTML-Template | 7 + config/rootfiles/common/squid | 201 ++++-- config/rootfiles/core/{70 => 73}/exclude | 0 config/rootfiles/core/{71 => 73}/filelists/GeoIP | 0 config/rootfiles/core/73/filelists/HTML-Template | 1 + .../rootfiles/core/73/filelists/armv5tel/ath-modul | 3 + config/rootfiles/core/73/filelists/files | 13 + config/rootfiles/core/{71 => 73}/filelists/hwdata | 0 config/rootfiles/core/73/filelists/i586/ath-modul | 3 + .../{oldcore/47 => core/73}/filelists/php | 0 config/rootfiles/core/{71 => 73}/filelists/squid | 0 config/rootfiles/core/{70 => 73}/meta | 0 config/rootfiles/core/{72 => 73}/update.sh | 19 +- config/rootfiles/oldcore/68/filelists/files | 1 + config/rootfiles/packages/iptraf-ng | 5 + config/rootfiles/packages/tor | 3 +- config/rootfiles/packages/wavemon | 10 + config/rootfiles/packages/xinetd | 11 + config/xinetd/xinetd.conf | 9 + doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 5 + doc/language_issues.fr | 5 + doc/language_issues.nl | 5 + doc/language_issues.pl | 5 + doc/language_issues.ru | 5 + doc/language_issues.tr | 5 + doc/language_missings | 24 + html/cgi-bin/logs.cgi/proxylog.dat | 3 +- html/cgi-bin/proxy.cgi | 18 +- html/cgi-bin/routing.cgi | 2 +- html/cgi-bin/tor.cgi | 22 +- html/cgi-bin/urlfilter.cgi | 22 + html/cgi-bin/wirelessclient.cgi | 8 +- html/html/redirect-templates/legacy/template.html | 55 ++ html/html/redirect.cgi | 148 ++-- langs/de/cgi-bin/de.pl | 8 +- langs/en/cgi-bin/en.pl | 8 +- lfs/GeoIP | 4 +- lfs/{Locale-Country => HTML-Template} | 7 +- lfs/compat-drivers | 1 + lfs/{sendEmail => iptraf-ng} | 37 +- lfs/php | 9 +- lfs/samba | 6 +- lfs/squid | 97 +-- lfs/tor | 6 +- lfs/transmission | 6 +- lfs/{stress => wavemon} | 16 +- lfs/{bwm-ng => xinetd} | 13 +- make.sh | 19 +- src/hwdata/pci.ids | 792 ++++++++++++++------- src/hwdata/usb.ids | 321 ++++++++- src/initscripts/init.d/dnsmasq | 6 +- src/initscripts/init.d/squid | 16 +- src/initscripts/init.d/tor | 4 + src/paks/fetchmail/install.sh | 4 + src/paks/fetchmail/uninstall.sh | 2 + src/paks/postfix/install.sh | 8 +- src/paks/{nginx => xinetd}/install.sh | 8 +- src/paks/{cacti => xinetd}/uninstall.sh | 0 src/paks/{apcupsd => xinetd}/update.sh | 0 ...drivers-3.8.3-ath_ignore_eeprom_regdomain.patch | 39 + .../iptraf-ng-1.1.4-tcplog_flowrate_msg.patch | 12 + 65 files changed, 1502 insertions(+), 586 deletions(-) create mode 100644 config/rootfiles/common/HTML-Template copy config/rootfiles/core/{70 => 73}/exclude (100%) copy config/rootfiles/core/{71 => 73}/filelists/GeoIP (100%) create mode 120000 config/rootfiles/core/73/filelists/HTML-Template create mode 100644 config/rootfiles/core/73/filelists/armv5tel/ath-modul create mode 100644 config/rootfiles/core/73/filelists/files copy config/rootfiles/core/{71 => 73}/filelists/hwdata (100%) create mode 100644 config/rootfiles/core/73/filelists/i586/ath-modul copy config/rootfiles/{oldcore/47 => core/73}/filelists/php (100%) copy config/rootfiles/core/{71 => 73}/filelists/squid (100%) copy config/rootfiles/core/{70 => 73}/meta (100%) copy config/rootfiles/core/{72 => 73}/update.sh (90%) create mode 100644 config/rootfiles/packages/iptraf-ng create mode 100644 config/rootfiles/packages/wavemon create mode 100644 config/rootfiles/packages/xinetd create mode 100644 config/xinetd/xinetd.conf create mode 100644 html/html/redirect-templates/legacy/template.html copy lfs/{Locale-Country => HTML-Template} (96%) copy lfs/{sendEmail => iptraf-ng} (65%) copy lfs/{stress => wavemon} (86%) copy lfs/{bwm-ng => xinetd} (93%) copy src/paks/{nginx => xinetd}/install.sh (90%) copy src/paks/{cacti => xinetd}/uninstall.sh (100%) copy src/paks/{apcupsd => xinetd}/update.sh (100%) create mode 100644 src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch create mode 100644 src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch
Difference in files: diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index a7f209d..9129c68 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -12,6 +12,7 @@ package Header;
use CGI(); +use HTML::Entities(); use Socket; use Time::Local;
@@ -305,16 +306,16 @@ sub IpInSubnet return (($ip >= $start) && ($ip <= $end)); }
-sub cleanhtml -{ +sub escape($) { + my $s = shift; + return HTML::Entities::encode_entities($s); +} + +sub cleanhtml { my $outstring =$_[0]; $outstring =~ tr/,/ / if not defined $_[1] or $_[1] ne 'y'; - $outstring =~ s/&/&/g; - $outstring =~ s/'/'/g; - $outstring =~ s/"/"/g; #" This is just a workaround for the syntax highlighter - $outstring =~ s/</</g; - $outstring =~ s/>/>/g; - return $outstring; + + return escape($outstring); }
sub connectionstatus diff --git a/config/cfgroot/useragents b/config/cfgroot/useragents index 5fe3446..d5164fd 100644 --- a/config/cfgroot/useragents +++ b/config/cfgroot/useragents @@ -11,7 +11,7 @@ GOZILLA,Go!Zilla,(Go!Zilla) GOOGLE,Google Toolbar,(Google\sToolbar) JAVA,Java,(Java) KONQUEROR,Konqueror,(Konqueror) -LIBWWWPERL,libwww-perl,(libww-perl) +LIBWWWPERL,libwww-perl,(libwww-perl) LYNX,Lynx,(Lynx) MSIE,Internet Explorer,(MSIE.*[)]$) NETSCAPE,Netscape,(^Mozilla/4.[7|8])|(Netscape) diff --git a/config/rootfiles/common/HTML-Template b/config/rootfiles/common/HTML-Template new file mode 100644 index 0000000..4b486d9 --- /dev/null +++ b/config/rootfiles/common/HTML-Template @@ -0,0 +1,7 @@ +usr/lib/perl5/site_perl/5.12.3/HTML/Template +usr/lib/perl5/site_perl/5.12.3/HTML/Template.pm +usr/lib/perl5/site_perl/5.12.3/HTML/Template/FAQ.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/HTML/Template +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/HTML/Template/.packlist +#usr/share/man/man3/HTML::Template.3 +#usr/share/man/man3/HTML::Template::FAQ.3 diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index 671f217..9515dc3 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -14,10 +14,29 @@ etc/squid/squid.conf srv/web/ipfire/cgi-bin/cachemgr.cgi srv/web/ipfire/html/proxy.pac srv/web/ipfire/html/wpad.dat +usr/bin/purge usr/bin/squidclient #usr/lib/squid usr/lib/squid/auth +usr/lib/squid/basic_db_auth +usr/lib/squid/basic_fake_auth +usr/lib/squid/basic_getpwnam_auth +usr/lib/squid/basic_ldap_auth +usr/lib/squid/basic_msnt_auth +usr/lib/squid/basic_msnt_multi_domain_auth +usr/lib/squid/basic_ncsa_auth +usr/lib/squid/basic_nis_auth +usr/lib/squid/basic_pam_auth +usr/lib/squid/basic_pop3_auth +usr/lib/squid/basic_radius_auth +usr/lib/squid/basic_sasl_auth +usr/lib/squid/basic_smb_auth +usr/lib/squid/basic_smb_auth.sh #usr/lib/squid/cachemgr.cgi +usr/lib/squid/cert_tool +usr/lib/squid/digest_edirectory_auth +usr/lib/squid/digest_file_auth +usr/lib/squid/digest_ldap_auth usr/lib/squid/diskd #usr/lib/squid/errors #usr/lib/squid/errors/COPYRIGHT @@ -30,6 +49,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/af/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/af/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/af/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/af/ERR_CONFLICT_HOST #usr/lib/squid/errors/af/ERR_CONNECT_FAIL #usr/lib/squid/errors/af/ERR_DIR_LISTING #usr/lib/squid/errors/af/ERR_DNS_FAIL @@ -88,6 +108,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/ar/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/ar/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/ar/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/ar/ERR_CONFLICT_HOST #usr/lib/squid/errors/ar/ERR_CONNECT_FAIL #usr/lib/squid/errors/ar/ERR_DIR_LISTING #usr/lib/squid/errors/ar/ERR_DNS_FAIL @@ -131,6 +152,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/az/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/az/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/az/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/az/ERR_CONFLICT_HOST #usr/lib/squid/errors/az/ERR_CONNECT_FAIL #usr/lib/squid/errors/az/ERR_DIR_LISTING #usr/lib/squid/errors/az/ERR_DNS_FAIL @@ -174,6 +196,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/bg/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/bg/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/bg/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/bg/ERR_CONFLICT_HOST #usr/lib/squid/errors/bg/ERR_CONNECT_FAIL #usr/lib/squid/errors/bg/ERR_DIR_LISTING #usr/lib/squid/errors/bg/ERR_DNS_FAIL @@ -216,6 +239,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/ca/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/ca/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/ca/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/ca/ERR_CONFLICT_HOST #usr/lib/squid/errors/ca/ERR_CONNECT_FAIL #usr/lib/squid/errors/ca/ERR_DIR_LISTING #usr/lib/squid/errors/ca/ERR_DNS_FAIL @@ -259,6 +283,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/cs/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/cs/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/cs/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/cs/ERR_CONFLICT_HOST #usr/lib/squid/errors/cs/ERR_CONNECT_FAIL #usr/lib/squid/errors/cs/ERR_DIR_LISTING #usr/lib/squid/errors/cs/ERR_DNS_FAIL @@ -302,6 +327,7 @@ usr/lib/squid/diskd #usr/lib/squid/errors/da/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/da/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/da/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/da/ERR_CONFLICT_HOST #usr/lib/squid/errors/da/ERR_CONNECT_FAIL #usr/lib/squid/errors/da/ERR_DIR_LISTING #usr/lib/squid/errors/da/ERR_DNS_FAIL @@ -349,6 +375,7 @@ usr/lib/squid/errors/de/ERR_AGENT_WPAD usr/lib/squid/errors/de/ERR_CACHE_ACCESS_DENIED usr/lib/squid/errors/de/ERR_CACHE_MGR_ACCESS_DENIED usr/lib/squid/errors/de/ERR_CANNOT_FORWARD +usr/lib/squid/errors/de/ERR_CONFLICT_HOST usr/lib/squid/errors/de/ERR_CONNECT_FAIL usr/lib/squid/errors/de/ERR_DIR_LISTING usr/lib/squid/errors/de/ERR_DNS_FAIL @@ -392,6 +419,7 @@ usr/lib/squid/errors/de/error-details.txt #usr/lib/squid/errors/el/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/el/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/el/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/el/ERR_CONFLICT_HOST #usr/lib/squid/errors/el/ERR_CONNECT_FAIL #usr/lib/squid/errors/el/ERR_DIR_LISTING #usr/lib/squid/errors/el/ERR_DNS_FAIL @@ -449,6 +477,7 @@ usr/lib/squid/errors/en/ERR_AGENT_WPAD usr/lib/squid/errors/en/ERR_CACHE_ACCESS_DENIED usr/lib/squid/errors/en/ERR_CACHE_MGR_ACCESS_DENIED usr/lib/squid/errors/en/ERR_CANNOT_FORWARD +usr/lib/squid/errors/en/ERR_CONFLICT_HOST usr/lib/squid/errors/en/ERR_CONNECT_FAIL usr/lib/squid/errors/en/ERR_DIR_LISTING usr/lib/squid/errors/en/ERR_DNS_FAIL @@ -510,6 +539,7 @@ usr/lib/squid/errors/es/ERR_AGENT_WPAD usr/lib/squid/errors/es/ERR_CACHE_ACCESS_DENIED usr/lib/squid/errors/es/ERR_CACHE_MGR_ACCESS_DENIED usr/lib/squid/errors/es/ERR_CANNOT_FORWARD +usr/lib/squid/errors/es/ERR_CONFLICT_HOST usr/lib/squid/errors/es/ERR_CONNECT_FAIL usr/lib/squid/errors/es/ERR_DIR_LISTING usr/lib/squid/errors/es/ERR_DNS_FAIL @@ -553,6 +583,7 @@ usr/lib/squid/errors/es/error-details.txt #usr/lib/squid/errors/et/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/et/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/et/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/et/ERR_CONFLICT_HOST #usr/lib/squid/errors/et/ERR_CONNECT_FAIL #usr/lib/squid/errors/et/ERR_DIR_LISTING #usr/lib/squid/errors/et/ERR_DNS_FAIL @@ -597,6 +628,7 @@ usr/lib/squid/errors/es/error-details.txt #usr/lib/squid/errors/fa/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/fa/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/fa/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/fa/ERR_CONFLICT_HOST #usr/lib/squid/errors/fa/ERR_CONNECT_FAIL #usr/lib/squid/errors/fa/ERR_DIR_LISTING #usr/lib/squid/errors/fa/ERR_DNS_FAIL @@ -640,6 +672,7 @@ usr/lib/squid/errors/es/error-details.txt #usr/lib/squid/errors/fi/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/fi/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/fi/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/fi/ERR_CONFLICT_HOST #usr/lib/squid/errors/fi/ERR_CONNECT_FAIL #usr/lib/squid/errors/fi/ERR_DIR_LISTING #usr/lib/squid/errors/fi/ERR_DNS_FAIL @@ -688,6 +721,7 @@ usr/lib/squid/errors/fr/ERR_AGENT_WPAD usr/lib/squid/errors/fr/ERR_CACHE_ACCESS_DENIED usr/lib/squid/errors/fr/ERR_CACHE_MGR_ACCESS_DENIED usr/lib/squid/errors/fr/ERR_CANNOT_FORWARD +usr/lib/squid/errors/fr/ERR_CONFLICT_HOST usr/lib/squid/errors/fr/ERR_CONNECT_FAIL usr/lib/squid/errors/fr/ERR_DIR_LISTING usr/lib/squid/errors/fr/ERR_DNS_FAIL @@ -731,6 +765,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/he/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/he/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/he/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/he/ERR_CONFLICT_HOST #usr/lib/squid/errors/he/ERR_CONNECT_FAIL #usr/lib/squid/errors/he/ERR_DIR_LISTING #usr/lib/squid/errors/he/ERR_DNS_FAIL @@ -774,6 +809,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/hu/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/hu/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/hu/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/hu/ERR_CONFLICT_HOST #usr/lib/squid/errors/hu/ERR_CONNECT_FAIL #usr/lib/squid/errors/hu/ERR_DIR_LISTING #usr/lib/squid/errors/hu/ERR_DNS_FAIL @@ -818,6 +854,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/hy/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/hy/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/hy/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/hy/ERR_CONFLICT_HOST #usr/lib/squid/errors/hy/ERR_CONNECT_FAIL #usr/lib/squid/errors/hy/ERR_DIR_LISTING #usr/lib/squid/errors/hy/ERR_DNS_FAIL @@ -861,6 +898,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/id/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/id/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/id/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/id/ERR_CONFLICT_HOST #usr/lib/squid/errors/id/ERR_CONNECT_FAIL #usr/lib/squid/errors/id/ERR_DIR_LISTING #usr/lib/squid/errors/id/ERR_DNS_FAIL @@ -905,6 +943,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/it/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/it/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/it/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/it/ERR_CONFLICT_HOST #usr/lib/squid/errors/it/ERR_CONNECT_FAIL #usr/lib/squid/errors/it/ERR_DIR_LISTING #usr/lib/squid/errors/it/ERR_DNS_FAIL @@ -948,6 +987,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/ja/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/ja/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/ja/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/ja/ERR_CONFLICT_HOST #usr/lib/squid/errors/ja/ERR_CONNECT_FAIL #usr/lib/squid/errors/ja/ERR_DIR_LISTING #usr/lib/squid/errors/ja/ERR_DNS_FAIL @@ -992,6 +1032,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/ko/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/ko/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/ko/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/ko/ERR_CONFLICT_HOST #usr/lib/squid/errors/ko/ERR_CONNECT_FAIL #usr/lib/squid/errors/ko/ERR_DIR_LISTING #usr/lib/squid/errors/ko/ERR_DNS_FAIL @@ -1035,6 +1076,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/lt/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/lt/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/lt/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/lt/ERR_CONFLICT_HOST #usr/lib/squid/errors/lt/ERR_CONNECT_FAIL #usr/lib/squid/errors/lt/ERR_DIR_LISTING #usr/lib/squid/errors/lt/ERR_DNS_FAIL @@ -1078,6 +1120,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/lv/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/lv/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/lv/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/lv/ERR_CONFLICT_HOST #usr/lib/squid/errors/lv/ERR_CONNECT_FAIL #usr/lib/squid/errors/lv/ERR_DIR_LISTING #usr/lib/squid/errors/lv/ERR_DNS_FAIL @@ -1121,6 +1164,7 @@ usr/lib/squid/errors/fr/error-details.txt #usr/lib/squid/errors/ms/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/ms/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/ms/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/ms/ERR_CONFLICT_HOST #usr/lib/squid/errors/ms/ERR_CONNECT_FAIL #usr/lib/squid/errors/ms/ERR_DIR_LISTING #usr/lib/squid/errors/ms/ERR_DNS_FAIL @@ -1164,6 +1208,7 @@ usr/lib/squid/errors/nl/ERR_AGENT_WPAD usr/lib/squid/errors/nl/ERR_CACHE_ACCESS_DENIED usr/lib/squid/errors/nl/ERR_CACHE_MGR_ACCESS_DENIED usr/lib/squid/errors/nl/ERR_CANNOT_FORWARD +usr/lib/squid/errors/nl/ERR_CONFLICT_HOST usr/lib/squid/errors/nl/ERR_CONNECT_FAIL usr/lib/squid/errors/nl/ERR_DIR_LISTING usr/lib/squid/errors/nl/ERR_DNS_FAIL @@ -1206,6 +1251,7 @@ usr/lib/squid/errors/nl/error-details.txt #usr/lib/squid/errors/oc/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/oc/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/oc/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/oc/ERR_CONFLICT_HOST #usr/lib/squid/errors/oc/ERR_CONNECT_FAIL #usr/lib/squid/errors/oc/ERR_DIR_LISTING #usr/lib/squid/errors/oc/ERR_DNS_FAIL @@ -1249,6 +1295,7 @@ usr/lib/squid/errors/pl/ERR_AGENT_WPAD usr/lib/squid/errors/pl/ERR_CACHE_ACCESS_DENIED usr/lib/squid/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED usr/lib/squid/errors/pl/ERR_CANNOT_FORWARD +usr/lib/squid/errors/pl/ERR_CONFLICT_HOST usr/lib/squid/errors/pl/ERR_CONNECT_FAIL usr/lib/squid/errors/pl/ERR_DIR_LISTING usr/lib/squid/errors/pl/ERR_DNS_FAIL @@ -1292,6 +1339,7 @@ usr/lib/squid/errors/pl/error-details.txt #usr/lib/squid/errors/pt-br/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/pt-br/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/pt-br/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/pt-br/ERR_CONFLICT_HOST #usr/lib/squid/errors/pt-br/ERR_CONNECT_FAIL #usr/lib/squid/errors/pt-br/ERR_DIR_LISTING #usr/lib/squid/errors/pt-br/ERR_DNS_FAIL @@ -1334,6 +1382,7 @@ usr/lib/squid/errors/pl/error-details.txt #usr/lib/squid/errors/pt/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/pt/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/pt/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/pt/ERR_CONFLICT_HOST #usr/lib/squid/errors/pt/ERR_CONNECT_FAIL #usr/lib/squid/errors/pt/ERR_DIR_LISTING #usr/lib/squid/errors/pt/ERR_DNS_FAIL @@ -1378,6 +1427,7 @@ usr/lib/squid/errors/pl/error-details.txt #usr/lib/squid/errors/ro/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/ro/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/ro/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/ro/ERR_CONFLICT_HOST #usr/lib/squid/errors/ro/ERR_CONNECT_FAIL #usr/lib/squid/errors/ro/ERR_DIR_LISTING #usr/lib/squid/errors/ro/ERR_DNS_FAIL @@ -1421,6 +1471,7 @@ usr/lib/squid/errors/ru/ERR_AGENT_WPAD usr/lib/squid/errors/ru/ERR_CACHE_ACCESS_DENIED usr/lib/squid/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED usr/lib/squid/errors/ru/ERR_CANNOT_FORWARD +usr/lib/squid/errors/ru/ERR_CONFLICT_HOST usr/lib/squid/errors/ru/ERR_CONNECT_FAIL usr/lib/squid/errors/ru/ERR_DIR_LISTING usr/lib/squid/errors/ru/ERR_DNS_FAIL @@ -1464,6 +1515,7 @@ usr/lib/squid/errors/ru/error-details.txt #usr/lib/squid/errors/sk/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/sk/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/sk/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/sk/ERR_CONFLICT_HOST #usr/lib/squid/errors/sk/ERR_CONNECT_FAIL #usr/lib/squid/errors/sk/ERR_DIR_LISTING #usr/lib/squid/errors/sk/ERR_DNS_FAIL @@ -1507,6 +1559,7 @@ usr/lib/squid/errors/ru/error-details.txt #usr/lib/squid/errors/sl/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/sl/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/sl/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/sl/ERR_CONFLICT_HOST #usr/lib/squid/errors/sl/ERR_CONNECT_FAIL #usr/lib/squid/errors/sl/ERR_DIR_LISTING #usr/lib/squid/errors/sl/ERR_DNS_FAIL @@ -1550,6 +1603,7 @@ usr/lib/squid/errors/ru/error-details.txt #usr/lib/squid/errors/sr-cyrl/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/sr-cyrl/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/sr-cyrl/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/sr-cyrl/ERR_CONFLICT_HOST #usr/lib/squid/errors/sr-cyrl/ERR_CONNECT_FAIL #usr/lib/squid/errors/sr-cyrl/ERR_DIR_LISTING #usr/lib/squid/errors/sr-cyrl/ERR_DNS_FAIL @@ -1593,6 +1647,7 @@ usr/lib/squid/errors/ru/error-details.txt #usr/lib/squid/errors/sr-latn/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/sr-latn/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/sr-latn/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/sr-latn/ERR_CONFLICT_HOST #usr/lib/squid/errors/sr-latn/ERR_CONNECT_FAIL #usr/lib/squid/errors/sr-latn/ERR_DIR_LISTING #usr/lib/squid/errors/sr-latn/ERR_DNS_FAIL @@ -1638,6 +1693,7 @@ usr/lib/squid/errors/ru/error-details.txt #usr/lib/squid/errors/sv/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/sv/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/sv/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/sv/ERR_CONFLICT_HOST #usr/lib/squid/errors/sv/ERR_CONNECT_FAIL #usr/lib/squid/errors/sv/ERR_DIR_LISTING #usr/lib/squid/errors/sv/ERR_DNS_FAIL @@ -1680,6 +1736,7 @@ usr/lib/squid/errors/ru/error-details.txt #usr/lib/squid/errors/templates/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/templates/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/templates/ERR_CONFLICT_HOST #usr/lib/squid/errors/templates/ERR_CONNECT_FAIL #usr/lib/squid/errors/templates/ERR_DIR_LISTING #usr/lib/squid/errors/templates/ERR_DNS_FAIL @@ -1723,6 +1780,7 @@ usr/lib/squid/errors/ru/error-details.txt #usr/lib/squid/errors/th/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/th/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/th/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/th/ERR_CONFLICT_HOST #usr/lib/squid/errors/th/ERR_CONNECT_FAIL #usr/lib/squid/errors/th/ERR_DIR_LISTING #usr/lib/squid/errors/th/ERR_DNS_FAIL @@ -1766,6 +1824,7 @@ usr/lib/squid/errors/tr/ERR_AGENT_WPAD usr/lib/squid/errors/tr/ERR_CACHE_ACCESS_DENIED usr/lib/squid/errors/tr/ERR_CACHE_MGR_ACCESS_DENIED usr/lib/squid/errors/tr/ERR_CANNOT_FORWARD +usr/lib/squid/errors/tr/ERR_CONFLICT_HOST usr/lib/squid/errors/tr/ERR_CONNECT_FAIL usr/lib/squid/errors/tr/ERR_DIR_LISTING usr/lib/squid/errors/tr/ERR_DNS_FAIL @@ -1809,6 +1868,7 @@ usr/lib/squid/errors/tr/error-details.txt #usr/lib/squid/errors/uk/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/uk/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/uk/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/uk/ERR_CONFLICT_HOST #usr/lib/squid/errors/uk/ERR_CONNECT_FAIL #usr/lib/squid/errors/uk/ERR_DIR_LISTING #usr/lib/squid/errors/uk/ERR_DNS_FAIL @@ -1851,6 +1911,7 @@ usr/lib/squid/errors/tr/error-details.txt #usr/lib/squid/errors/uz/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/uz/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/uz/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/uz/ERR_CONFLICT_HOST #usr/lib/squid/errors/uz/ERR_CONNECT_FAIL #usr/lib/squid/errors/uz/ERR_DIR_LISTING #usr/lib/squid/errors/uz/ERR_DNS_FAIL @@ -1894,6 +1955,7 @@ usr/lib/squid/errors/tr/error-details.txt #usr/lib/squid/errors/vi/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/vi/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/vi/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/vi/ERR_CONFLICT_HOST #usr/lib/squid/errors/vi/ERR_CONNECT_FAIL #usr/lib/squid/errors/vi/ERR_DIR_LISTING #usr/lib/squid/errors/vi/ERR_DNS_FAIL @@ -1936,6 +1998,7 @@ usr/lib/squid/errors/tr/error-details.txt #usr/lib/squid/errors/zh-cn/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/zh-cn/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/zh-cn/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/zh-cn/ERR_CONFLICT_HOST #usr/lib/squid/errors/zh-cn/ERR_CONNECT_FAIL #usr/lib/squid/errors/zh-cn/ERR_DIR_LISTING #usr/lib/squid/errors/zh-cn/ERR_DNS_FAIL @@ -1981,6 +2044,7 @@ usr/lib/squid/errors/tr/error-details.txt #usr/lib/squid/errors/zh-tw/ERR_CACHE_ACCESS_DENIED #usr/lib/squid/errors/zh-tw/ERR_CACHE_MGR_ACCESS_DENIED #usr/lib/squid/errors/zh-tw/ERR_CANNOT_FORWARD +#usr/lib/squid/errors/zh-tw/ERR_CONFLICT_HOST #usr/lib/squid/errors/zh-tw/ERR_CONNECT_FAIL #usr/lib/squid/errors/zh-tw/ERR_DIR_LISTING #usr/lib/squid/errors/zh-tw/ERR_DNS_FAIL @@ -2015,65 +2079,101 @@ usr/lib/squid/errors/tr/error-details.txt #usr/lib/squid/errors/zh-tw/ERR_WRITE_ERROR #usr/lib/squid/errors/zh-tw/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/zh-tw/error-details.txt -usr/lib/squid/fakeauth_auth +usr/lib/squid/ext_edirectory_userip_acl +usr/lib/squid/ext_file_userip_acl +usr/lib/squid/ext_kerberos_ldap_group_acl +usr/lib/squid/ext_ldap_group_acl +usr/lib/squid/ext_session_acl +usr/lib/squid/ext_sql_session_acl +usr/lib/squid/ext_time_quota_acl +usr/lib/squid/ext_unix_group_acl +usr/lib/squid/ext_wbinfo_group_acl +usr/lib/squid/helper-mux.pl usr/lib/squid/icons -#usr/lib/squid/icons/anthony-binhex.gif -#usr/lib/squid/icons/anthony-bomb.gif -#usr/lib/squid/icons/anthony-box.gif -#usr/lib/squid/icons/anthony-box2.gif -#usr/lib/squid/icons/anthony-c.gif -#usr/lib/squid/icons/anthony-compressed.gif -#usr/lib/squid/icons/anthony-dir.gif -#usr/lib/squid/icons/anthony-dirup.gif -#usr/lib/squid/icons/anthony-dvi.gif -#usr/lib/squid/icons/anthony-f.gif -#usr/lib/squid/icons/anthony-image.gif -#usr/lib/squid/icons/anthony-image2.gif -#usr/lib/squid/icons/anthony-layout.gif -#usr/lib/squid/icons/anthony-link.gif -#usr/lib/squid/icons/anthony-movie.gif -#usr/lib/squid/icons/anthony-pdf.gif -#usr/lib/squid/icons/anthony-portal.gif -#usr/lib/squid/icons/anthony-ps.gif -#usr/lib/squid/icons/anthony-quill.gif -#usr/lib/squid/icons/anthony-script.gif -#usr/lib/squid/icons/anthony-sound.gif -#usr/lib/squid/icons/anthony-tar.gif -#usr/lib/squid/icons/anthony-tex.gif -#usr/lib/squid/icons/anthony-text.gif -#usr/lib/squid/icons/anthony-unknown.gif -#usr/lib/squid/icons/anthony-xbm.gif -#usr/lib/squid/icons/anthony-xpm.gif -usr/lib/squid/ip_user_check +usr/lib/squid/icons/SN.png +usr/lib/squid/icons/silk +usr/lib/squid/icons/silk/application.png +usr/lib/squid/icons/silk/arrow_up.png +usr/lib/squid/icons/silk/bomb.png +usr/lib/squid/icons/silk/box.png +usr/lib/squid/icons/silk/bricks.png +usr/lib/squid/icons/silk/bullet_red.png +usr/lib/squid/icons/silk/cd.png +usr/lib/squid/icons/silk/chart_line.png +usr/lib/squid/icons/silk/compress.png +usr/lib/squid/icons/silk/computer_link.png +usr/lib/squid/icons/silk/css.png +usr/lib/squid/icons/silk/cup.png +usr/lib/squid/icons/silk/database.png +usr/lib/squid/icons/silk/database_table.png +usr/lib/squid/icons/silk/drive_disk.png +usr/lib/squid/icons/silk/film.png +usr/lib/squid/icons/silk/film_key.png +usr/lib/squid/icons/silk/folder.png +usr/lib/squid/icons/silk/folder_table.png +usr/lib/squid/icons/silk/image.png +usr/lib/squid/icons/silk/information.png +usr/lib/squid/icons/silk/layers.png +usr/lib/squid/icons/silk/layout.png +usr/lib/squid/icons/silk/link.png +usr/lib/squid/icons/silk/music.png +usr/lib/squid/icons/silk/package.png +usr/lib/squid/icons/silk/package_go.png +usr/lib/squid/icons/silk/page_code.png +usr/lib/squid/icons/silk/page_excel.png +usr/lib/squid/icons/silk/page_green.png +usr/lib/squid/icons/silk/page_white.png +usr/lib/squid/icons/silk/page_white_acrobat.png +usr/lib/squid/icons/silk/page_white_c.png +usr/lib/squid/icons/silk/page_white_cplusplus.png +usr/lib/squid/icons/silk/page_white_flash.png +usr/lib/squid/icons/silk/page_white_magnify.png +usr/lib/squid/icons/silk/page_white_picture.png +usr/lib/squid/icons/silk/page_white_powerpoint.png +usr/lib/squid/icons/silk/page_white_stack.png +usr/lib/squid/icons/silk/page_white_text.png +usr/lib/squid/icons/silk/page_white_word.png +usr/lib/squid/icons/silk/page_white_zip.png +usr/lib/squid/icons/silk/page_world.png +usr/lib/squid/icons/silk/photo.png +usr/lib/squid/icons/silk/picture.png +usr/lib/squid/icons/silk/plugin.png +usr/lib/squid/icons/silk/plugin_add.png +usr/lib/squid/icons/silk/script.png +usr/lib/squid/icons/silk/script_gear.png +usr/lib/squid/icons/silk/script_palette.png +usr/lib/squid/log_db_daemon +usr/lib/squid/log_file_daemon usr/lib/squid/mib.txt -usr/lib/squid/msnt_auth -usr/lib/squid/ncsa_auth -usr/lib/squid/no_check.pl +usr/lib/squid/negotiate_wrapper_auth +usr/lib/squid/ntlm_fake_auth usr/lib/squid/ntlm_smb_lm_auth -usr/lib/squid/pam_auth -usr/lib/squid/pinger -usr/lib/squid/smb_auth -usr/lib/squid/smb_auth.pl -usr/lib/squid/smb_auth.sh -usr/lib/squid/squid_ldap_auth -usr/lib/squid/squid_ldap_group -usr/lib/squid/squid_radius_auth -usr/lib/squid/squid_session -usr/lib/squid/squid_unix_group usr/lib/squid/unlinkd -usr/lib/squid/wbinfo_group.pl +usr/lib/squid/url_fake_rewrite +usr/lib/squid/url_fake_rewrite.sh usr/sbin/squid usr/sbin/updxlrator #usr/share/man/man1/squidclient.1 +#usr/share/man/man8/basic_db_auth.8 +#usr/share/man/man8/basic_getpwnam_auth.8 +#usr/share/man/man8/basic_ldap_auth.8 +#usr/share/man/man8/basic_ncsa_auth.8 +#usr/share/man/man8/basic_pam_auth.8 +#usr/share/man/man8/basic_radius_auth.8 +#usr/share/man/man8/basic_sasl_auth.8 #usr/share/man/man8/cachemgr.cgi.8 -#usr/share/man/man8/ncsa_auth.8 -#usr/share/man/man8/pam_auth.8 +#usr/share/man/man8/digest_file_auth.8 +#usr/share/man/man8/ext_edirectory_userip_acl.8 +#usr/share/man/man8/ext_file_userip_acl.8 +#usr/share/man/man8/ext_ldap_group_acl.8 +#usr/share/man/man8/ext_session_acl.8 +#usr/share/man/man8/ext_sql_session_acl.8 +#usr/share/man/man8/ext_time_quota_acl.8 +#usr/share/man/man8/ext_unix_group_acl.8 +#usr/share/man/man8/ext_wbinfo_group_acl.8 +#usr/share/man/man8/log_db_daemon.8 #usr/share/man/man8/squid.8 -#usr/share/man/man8/squid_ldap_auth.8 -#usr/share/man/man8/squid_ldap_group.8 -#usr/share/man/man8/squid_radius_auth.8 -#usr/share/man/man8/squid_session.8 -#usr/share/man/man8/squid_unix_group.8 +#var/cache/squid var/ipfire/proxy/errorpage-ipfire.css var/ipfire/proxy/errorpage-squid.css var/ipfire/updatexlrator/autocheck/cron.daily @@ -2090,3 +2190,4 @@ var/log/cache var/log/squid/access.log var/log/updatexlrator #var/logs +#var/run/squid diff --git a/config/rootfiles/core/73/exclude b/config/rootfiles/core/73/exclude new file mode 100644 index 0000000..321a931 --- /dev/null +++ b/config/rootfiles/core/73/exclude @@ -0,0 +1,17 @@ +srv/web/ipfire/html/proxy.pac +boot/config.txt +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/log/cache +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/73/filelists/GeoIP b/config/rootfiles/core/73/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/core/73/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/73/filelists/HTML-Template b/config/rootfiles/core/73/filelists/HTML-Template new file mode 120000 index 0000000..f17c1da --- /dev/null +++ b/config/rootfiles/core/73/filelists/HTML-Template @@ -0,0 +1 @@ +../../../common/HTML-Template \ No newline at end of file diff --git a/config/rootfiles/core/73/filelists/armv5tel/ath-modul b/config/rootfiles/core/73/filelists/armv5tel/ath-modul new file mode 100644 index 0000000..63bcd75 --- /dev/null +++ b/config/rootfiles/core/73/filelists/armv5tel/ath-modul @@ -0,0 +1,3 @@ +lib/modules/3.2.48-ipfire-omap/kernel/drivers/net/wireless/ath/ath.ko +lib/modules/3.2.48-ipfire-kirkwood/kernel/drivers/net/wireless/ath/ath.ko +lib/modules/3.2.48-ipfire-rpi/kernel/drivers/net/wireless/ath/ath.ko diff --git a/config/rootfiles/core/73/filelists/files b/config/rootfiles/core/73/filelists/files new file mode 100644 index 0000000..6df851e --- /dev/null +++ b/config/rootfiles/core/73/filelists/files @@ -0,0 +1,13 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/dnsmasq +etc/rc.d/init.d/squid +srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/routing.cgi +srv/web/ipfire/cgi-bin/wirelessclient.cgi +srv/web/ipfire/html/redirect.cgi +srv/web/ipfire/html/redirect-templates/ +var/ipfire/header.pl +var/ipfire/langs +var/ipfire/proxy/advanced/useragents diff --git a/config/rootfiles/core/73/filelists/hwdata b/config/rootfiles/core/73/filelists/hwdata new file mode 100644 index 0000000..5a9672f --- /dev/null +++ b/config/rootfiles/core/73/filelists/hwdata @@ -0,0 +1,2 @@ +usr/share/hwdata/pci.ids +usr/share/hwdata/usb.ids diff --git a/config/rootfiles/core/73/filelists/i586/ath-modul b/config/rootfiles/core/73/filelists/i586/ath-modul new file mode 100644 index 0000000..6656dae --- /dev/null +++ b/config/rootfiles/core/73/filelists/i586/ath-modul @@ -0,0 +1,3 @@ +lib/modules/2.6.32.61-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko +lib/modules/3.2.48-ipfire/kernel/drivers/net/wireless/ath/ath.ko +lib/modules/3.2.48-ipfire-pae/kernel/drivers/net/wireless/ath/ath.ko diff --git a/config/rootfiles/core/73/filelists/php b/config/rootfiles/core/73/filelists/php new file mode 120000 index 0000000..1ae48d7 --- /dev/null +++ b/config/rootfiles/core/73/filelists/php @@ -0,0 +1 @@ +../../../common/php \ No newline at end of file diff --git a/config/rootfiles/core/73/filelists/squid b/config/rootfiles/core/73/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/73/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/73/meta b/config/rootfiles/core/73/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/73/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/73/update.sh b/config/rootfiles/core/73/update.sh new file mode 100644 index 0000000..1fb3ac6 --- /dev/null +++ b/config/rootfiles/core/73/update.sh @@ -0,0 +1,72 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2013 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=73 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + + +# +#Stop services +/etc/init.d/squid stop + + +# +#Extract files +extract_files + +# Regenerate squid configuration files. +/srv/web/ipfire/cgi-bin/proxy.cgi + +# +#Start services +/etc/init.d/squid start + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Remove invalid fetchmail symlinks when postfix is installed. +if [ ! -e "/etc/rc.d/init.d/fetchmail" ]; then + rm -f /etc/rc.d/rc*.d/*fetchmail +fi + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 + diff --git a/config/rootfiles/oldcore/68/filelists/files b/config/rootfiles/oldcore/68/filelists/files index 30874a5..328375d 100644 --- a/config/rootfiles/oldcore/68/filelists/files +++ b/config/rootfiles/oldcore/68/filelists/files @@ -5,6 +5,7 @@ srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/urlfilter.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/html/themes/ipfire/include/functions.pl srv/web/ipfire/html/themes/ipfire/include/style.css diff --git a/config/rootfiles/packages/iptraf-ng b/config/rootfiles/packages/iptraf-ng new file mode 100644 index 0000000..4ad3c86 --- /dev/null +++ b/config/rootfiles/packages/iptraf-ng @@ -0,0 +1,5 @@ +usr/sbin/iptraf-ng +usr/sbin/rvnamed-ng +var/lib/iptraf-ng +var/lock/iptraf-ng +var/log/iptraf-ng diff --git a/config/rootfiles/packages/tor b/config/rootfiles/packages/tor index 58de7da..f9c657c 100644 --- a/config/rootfiles/packages/tor +++ b/config/rootfiles/packages/tor @@ -5,7 +5,7 @@ etc/rc.d/rc0.d/K40tor etc/rc.d/rc3.d/S60tor etc/rc.d/rc6.d/K40tor #etc/tor -etc/tor/tor-tsocks.conf +#etc/tor/tor-tsocks.conf etc/tor/torrc srv/web/ipfire/cgi-bin/tor.cgi usr/bin/tor @@ -25,6 +25,7 @@ usr/local/bin/torctrl usr/share/tor usr/share/tor/defaults-torrc usr/share/tor/geoip +usr/share/tor/geoip6 var/ipfire/backup/addons/includes/tor var/ipfire/menu.d/EX-tor.menu var/ipfire/tor diff --git a/config/rootfiles/packages/wavemon b/config/rootfiles/packages/wavemon new file mode 100644 index 0000000..4f0fa3c --- /dev/null +++ b/config/rootfiles/packages/wavemon @@ -0,0 +1,10 @@ +usr/bin/wavemon +#usr/share/man/man1/wavemon.1 +#usr/share/man/man5/wavemonrc.5 +#usr/share/wavemon +#usr/share/wavemon/AUTHORS +#usr/share/wavemon/COPYING +#usr/share/wavemon/ChangeLog +#usr/share/wavemon/NEWS +#usr/share/wavemon/README +#usr/share/wavemon/THANKS diff --git a/config/rootfiles/packages/xinetd b/config/rootfiles/packages/xinetd new file mode 100644 index 0000000..4c91ec9 --- /dev/null +++ b/config/rootfiles/packages/xinetd @@ -0,0 +1,11 @@ +etc/rc.d/init.d/xinetd +etc/xinetd.conf +#etc/xinetd.d +#usr/man/man5/xinetd.conf.5 +#usr/man/man8/itox.8 +#usr/man/man8/xconv.pl.8 +#usr/man/man8/xinetd.8 +#usr/man/man8/xinetd.log.8 +#usr/sbin/itox +#usr/sbin/xconv.pl +usr/sbin/xinetd diff --git a/config/xinetd/xinetd.conf b/config/xinetd/xinetd.conf new file mode 100644 index 0000000..b2112a1 --- /dev/null +++ b/config/xinetd/xinetd.conf @@ -0,0 +1,9 @@ +defaults +{ + instances = 10 + log_type = SYSLOG daemon + log_on_success = HOST PID + log_on_failure = HOST + #only_from = <your local networks> +} +includedir /etc/xinetd.d diff --git a/doc/language_issues.de b/doc/language_issues.de index bbe5e1d..07d7c7c 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -406,6 +406,7 @@ WARNING: translation string unused: to email adr WARNING: translation string unused: to install an update WARNING: translation string unused: to warn email bad WARNING: translation string unused: too long 80 char max +WARNING: translation string unused: tor 0 = disabled WARNING: translation string unused: tor accounting period daily WARNING: translation string unused: tor accounting period monthly WARNING: translation string unused: tor accounting period weekly diff --git a/doc/language_issues.en b/doc/language_issues.en index 1248957..7bdf4ca 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -437,6 +437,7 @@ WARNING: translation string unused: to email adr WARNING: translation string unused: to install an update WARNING: translation string unused: to warn email bad WARNING: translation string unused: too long 80 char max +WARNING: translation string unused: tor 0 = disabled WARNING: translation string unused: tor accounting period daily WARNING: translation string unused: tor accounting period monthly WARNING: translation string unused: tor accounting period weekly diff --git a/doc/language_issues.es b/doc/language_issues.es index fe46355..afe7ed6 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -574,7 +574,9 @@ WARNING: untranslated string: fireinfo why descr2 WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id +WARNING: untranslated string: least preferred WARNING: untranslated string: minute +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used @@ -643,8 +645,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name @@ -672,6 +676,7 @@ WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes WARNING: untranslated string: uptime load average +WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: wlan client diff --git a/doc/language_issues.fr b/doc/language_issues.fr index d5a1057..b62d16e 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -574,7 +574,9 @@ WARNING: untranslated string: fireinfo why descr2 WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id +WARNING: untranslated string: least preferred WARNING: untranslated string: minute +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: ntp common settings WARNING: untranslated string: ntp sync @@ -628,8 +630,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name @@ -660,6 +664,7 @@ WARNING: untranslated string: upload new ruleset WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter file ext block WARNING: untranslated string: urlfilter mode block +WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: wlan client diff --git a/doc/language_issues.nl b/doc/language_issues.nl index c8249ff..42fedc5 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -520,6 +520,8 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: least preferred +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: qos enter bandwidths @@ -545,8 +547,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name @@ -574,6 +578,7 @@ WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes WARNING: untranslated string: uptime load average +WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_issues.pl b/doc/language_issues.pl index fe46355..afe7ed6 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -574,7 +574,9 @@ WARNING: untranslated string: fireinfo why descr2 WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id +WARNING: untranslated string: least preferred WARNING: untranslated string: minute +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used @@ -643,8 +645,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name @@ -672,6 +676,7 @@ WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes WARNING: untranslated string: uptime load average +WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: wlan client diff --git a/doc/language_issues.ru b/doc/language_issues.ru index ef7b31c..cc5dd64 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -558,7 +558,9 @@ WARNING: untranslated string: extrahd to WARNING: untranslated string: extrahd to root WARNING: untranslated string: extrahd you cant mount WARNING: untranslated string: incoming traffic in bytes per second +WARNING: untranslated string: least preferred WARNING: untranslated string: minute +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used @@ -608,8 +610,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name @@ -637,6 +641,7 @@ WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes WARNING: untranslated string: uptime load average +WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: wlan client diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 1821fb4..27ca634 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -517,6 +517,8 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: least preferred +WARNING: untranslated string: most preferred WARNING: untranslated string: new WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: route config changed @@ -541,8 +543,10 @@ WARNING: untranslated string: tor configuration WARNING: untranslated string: tor connected relays WARNING: untranslated string: tor contact info WARNING: untranslated string: tor daemon +WARNING: untranslated string: tor directory port WARNING: untranslated string: tor enabled WARNING: untranslated string: tor errmsg invalid accounting limit +WARNING: untranslated string: tor errmsg invalid directory port WARNING: untranslated string: tor errmsg invalid ip or mask WARNING: untranslated string: tor errmsg invalid relay address WARNING: untranslated string: tor errmsg invalid relay name @@ -569,6 +573,7 @@ WARNING: untranslated string: tor traffic limit hard WARNING: untranslated string: tor traffic limit soft WARNING: untranslated string: tor traffic read written WARNING: untranslated string: tor use exit nodes +WARNING: untranslated string: urlfilter redirect template WARNING: untranslated string: wlan client WARNING: untranslated string: wlan client advanced settings WARNING: untranslated string: wlan client and diff --git a/doc/language_missings b/doc/language_missings index 865a42a..fca3f3e 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -84,7 +84,9 @@ < fireinfo why enable < fireinfo why read more < fireinfo your profile id +< least preferred < minute +< most preferred < ntp common settings < ntp sync < openvpn default @@ -117,6 +119,7 @@ < static routes < system information < tor +< tor 0 = disabled < tor accounting < tor accounting bytes < tor accounting bytes left @@ -137,8 +140,10 @@ < tor connected relays < tor contact info < tor daemon +< tor directory port < tor enabled < tor errmsg invalid accounting limit +< tor errmsg invalid directory port < tor errmsg invalid ip or mask < tor errmsg invalid relay address < tor errmsg invalid relay name @@ -173,6 +178,7 @@ < uptime load average < urlfilter file ext block < urlfilter mode block +< urlfilter redirect template < visit us at < vpn keyexchange < wlanap access point @@ -305,7 +311,9 @@ < fireinfo why enable < fireinfo why read more < fireinfo your profile id +< least preferred < minute +< most preferred < openvpn default < openvpn destination port used < openvpn disabled @@ -354,6 +362,7 @@ < static routes < system information < tor +< tor 0 = disabled < tor accounting < tor accounting bytes < tor accounting bytes left @@ -374,8 +383,10 @@ < tor connected relays < tor contact info < tor daemon +< tor directory port < tor enabled < tor errmsg invalid accounting limit +< tor errmsg invalid directory port < tor errmsg invalid ip or mask < tor errmsg invalid relay address < tor errmsg invalid relay name @@ -407,6 +418,7 @@ < updxlrtr standard view < uptime < uptime load average +< urlfilter redirect template < visit us at < vpn keyexchange < wlanap country @@ -510,7 +522,9 @@ < extrahd unable to read < extrahd unable to write < extrahd you cant mount +< least preferred < minute +< most preferred < openvpn default < openvpn destination port used < openvpn disabled @@ -543,6 +557,7 @@ < server restart < static routes < tor +< tor 0 = disabled < tor accounting < tor accounting bytes < tor accounting bytes left @@ -563,8 +578,10 @@ < tor connected relays < tor contact info < tor daemon +< tor directory port < tor enabled < tor errmsg invalid accounting limit +< tor errmsg invalid directory port < tor errmsg invalid ip or mask < tor errmsg invalid relay address < tor errmsg invalid relay name @@ -596,6 +613,7 @@ < updxlrtr standard view < uptime < uptime load average +< urlfilter redirect template < visit us at < vpn keyexchange < wlanap country @@ -706,8 +724,10 @@ < frequency < hour-graph < incoming traffic in bytes per second +< least preferred < minute < month-graph +< most preferred < openvpn default < openvpn destination port used < openvpn disabled @@ -737,6 +757,7 @@ < server restart < static routes < tor +< tor 0 = disabled < tor accounting < tor accounting bytes < tor accounting bytes left @@ -757,8 +778,10 @@ < tor connected relays < tor contact info < tor daemon +< tor directory port < tor enabled < tor errmsg invalid accounting limit +< tor errmsg invalid directory port < tor errmsg invalid ip or mask < tor errmsg invalid relay address < tor errmsg invalid relay name @@ -790,6 +813,7 @@ < updxlrtr standard view < uptime < uptime load average +< urlfilter redirect template < visit us at < vpn keyexchange < week-graph diff --git a/html/cgi-bin/logs.cgi/proxylog.dat b/html/cgi-bin/logs.cgi/proxylog.dat index e529be0..da86f89 100644 --- a/html/cgi-bin/logs.cgi/proxylog.dat +++ b/html/cgi-bin/logs.cgi/proxylog.dat @@ -90,7 +90,7 @@ if ($ENV{'QUERY_STRING'} && $cgiparams{'ACTION'} ne $Lang::tr{'update'}) $cgiparams{'MONTH'} = $temp[1]; $cgiparams{'DAY'} = $temp[2]; $cgiparams{'SOURCE_IP'} = $temp[3]; - $cgiparams{'USERNAME'} = $temp[4]; + $cgiparams{'USERNAME'} = &Header::escape($temp[4]); }
if (!($cgiparams{'MONTH'} =~ /^(0|1|2|3|4|5|6|7|8|9|10|11)$/) || @@ -383,6 +383,7 @@ print <<END END ; foreach my $so (sort keys %users) { + $so = &Header::escape($so); print "<option value='$so' $selected{'USERNAME'}{$so}>$so</option>\n"; } print <<END </select> diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 870042a..bcdc202 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -3144,12 +3144,12 @@ END if ($proxysettings{'LOGGING'} eq 'on') { print FILE <<END -access_log /var/log/squid/access.log +access_log stdio:/var/log/squid/access.log cache_log /var/log/squid/cache.log cache_store_log none END ; - if ($proxysettings{'LOGUSERAGENT'} eq 'on') { print FILE "useragent_log /var/log/squid/user_agent.log\n"; } + if ($proxysettings{'LOGUSERAGENT'} eq 'on') { print FILE "access_log stdio:/var/log/squid/user_agent.log useragent\n"; } if ($proxysettings{'LOGQUERY'} eq 'on') { print FILE "\nstrip_query_terms off\n"; } } else { print FILE <<END @@ -3182,7 +3182,7 @@ END { if ($proxysettings{'AUTH_METHOD'} eq 'ncsa') { - print FILE "auth_param basic program $authdir/ncsa_auth $userdb\n"; + print FILE "auth_param basic program $authdir/basic_ncsa_auth $userdb\n"; print FILE "auth_param basic children $proxysettings{'AUTH_CHILDREN'}\n"; print FILE "auth_param basic realm $authrealm\n"; print FILE "auth_param basic credentialsttl $proxysettings{'AUTH_CACHE_TTL'} minutes\n"; @@ -3192,7 +3192,7 @@ END if ($proxysettings{'AUTH_METHOD'} eq 'ldap') { print FILE "auth_param basic utf8 on\n"; - print FILE "auth_param basic program $authdir/squid_ldap_auth -b "$proxysettings{'LDAP_BASEDN'}""; + print FILE "auth_param basic program $authdir/basic_ldap_auth -b "$proxysettings{'LDAP_BASEDN'}""; if (!($proxysettings{'LDAP_BINDDN_USER'} eq '')) { print FILE " -D "$proxysettings{'LDAP_BINDDN_USER'}""; } if (!($proxysettings{'LDAP_BINDDN_PASS'} eq '')) { print FILE " -w $proxysettings{'LDAP_BINDDN_PASS'}"; } if ($proxysettings{'LDAP_TYPE'} eq 'ADS') @@ -3243,7 +3243,7 @@ END print FILE "auth_param ntlm children $proxysettings{'AUTH_CHILDREN'}\n"; if (!($proxysettings{'AUTH_IPCACHE_TTL'} eq '0')) { print FILE "\nauthenticate_ip_ttl $proxysettings{'AUTH_IPCACHE_TTL'} minutes\n"; } } else { - print FILE "auth_param basic program $authdir/msnt_auth\n"; + print FILE "auth_param basic program $authdir/basic_msnt_auth\n"; print FILE "auth_param basic children $proxysettings{'AUTH_CHILDREN'}\n"; print FILE "auth_param basic realm $authrealm\n"; print FILE "auth_param basic credentialsttl $proxysettings{'AUTH_CACHE_TTL'} minutes\n"; @@ -3269,7 +3269,7 @@ END
if ($proxysettings{'AUTH_METHOD'} eq 'radius') { - print FILE "auth_param basic program $authdir/squid_radius_auth -h $proxysettings{'RADIUS_SERVER'} -p $proxysettings{'RADIUS_PORT'} "; + print FILE "auth_param basic program $authdir/basic_radius_auth -h $proxysettings{'RADIUS_SERVER'} -p $proxysettings{'RADIUS_PORT'} "; if (!($proxysettings{'RADIUS_IDENTIFIER'} eq '')) { print FILE "-i $proxysettings{'RADIUS_IDENTIFIER'} "; } print FILE "-w $proxysettings{'RADIUS_SECRET'}\n"; print FILE "auth_param basic children $proxysettings{'AUTH_CHILDREN'}\n"; @@ -3362,11 +3362,6 @@ END print FILE "acl blocked_mimetypes rep_mime_type "$mimetypes"\n\n"; }
- print FILE <<END -#acl all src all -acl localhost src 127.0.0.1/32 -END -; open (PORTS,"$acl_ports_ssl"); @temp = <PORTS>; close PORTS; @@ -3463,7 +3458,6 @@ END if ($proxysettings{'ENABLE_CLAMAV'} eq 'on') { print FILE "\n#Settings for squidclamav:\n"; print FILE "http_port 127.0.0.1:$proxysettings{'PROXY_PORT'} transparent\n"; - print FILE "acl to_localhost dst 127.0.0.0/8\n"; print FILE "acl purge method PURGE\n"; print FILE "http_access deny to_localhost\n"; print FILE "http_access allow localhost\n"; diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index afcd388..488705f 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -126,7 +126,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { $errormessage = $Lang::tr{'invalid ip'}." / ".$Lang::tr{'invalid netmask'}; }
- if ($settings{'IP'} =~ /0.0.0.0/){ + if ($settings{'IP'} =~ /^0.0.0.0/){ $errormessage = $Lang::tr{'invalid ip'}." - 0.0.0.0"; }
diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index b920724..befd508 100755 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -108,6 +108,7 @@ $settings{'TOR_RELAY_ENABLED'} = 'off'; $settings{'TOR_RELAY_MODE'} = 'exit'; $settings{'TOR_RELAY_ADDRESS'} = ''; $settings{'TOR_RELAY_PORT'} = 9001; +$settings{'TOR_RELAY_DIRPORT'} = 0; $settings{'TOR_RELAY_NICKNAME'} = ''; $settings{'TOR_RELAY_CONTACT_INFO'} = ''; $settings{'TOR_RELAY_BANDWIDTH_RATE'} = 0; @@ -143,6 +144,11 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { if (!&General::validport($settings{'TOR_RELAY_PORT'})) { $errormessage = "$Lang::tr{'tor errmsg invalid relay port'}: $settings{'TOR_RELAY_PORT'}"; } + if ($settings{'TOR_RELAY_DIRPORT'} ne '0') { + if (!&General::validport($settings{'TOR_RELAY_DIRPORT'})) { + $errormessage = "$Lang::tr{'tor errmsg invalid directory port'}: $settings{'TOR_RELAY_DIRPORT'}"; + } + }
if ($settings{'TOR_RELAY_ADDRESS'} ne '') { if ((!&General::validfqdn($settings{'TOR_RELAY_ADDRESS'})) && (!&General::validip($settings{'TOR_RELAY_ADDRESS'}))) { @@ -382,7 +388,7 @@ END </td> <td width='25%' class='base'>$Lang::tr{'tor relay nickname'}: <img src='/blob.gif' alt='*' /></td> <td width='20%'> - <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' /> + <input type='text' name='TOR_RELAY_NICKNAME' value='$settings{'TOR_RELAY_NICKNAME'}' maxlength='19' /> </td> </tr> <tr> @@ -396,6 +402,14 @@ END </td> </tr> <tr> + <td width='25%'> </td> + <td width='30%'> </td> + <td width='25%' class='base'>$Lang::tr{'tor directory port'}:</td> + <td width='20%'> + <input type='text' name='TOR_RELAY_DIRPORT' value='$settings{'TOR_RELAY_DIRPORT'}' size='5' /> $Lang::tr{'tor 0 = disabled'} + </td> + </tr> + <tr> <td width='25%' class='base'>$Lang::tr{'tor contact info'}: <img src='/blob.gif' alt='*' /></td> <td width='75%' colspan='3'> <input type='text' name='TOR_RELAY_CONTACT_INFO' value='$settings{'TOR_RELAY_CONTACT_INFO'}' style='width: 98%;' /> @@ -607,7 +621,7 @@ END END
if (exists($node->{'country_code'})) { - if ($node->{'country_code'} eq '??') { + if (!$node->{'country_code'} or $node->{'country_code'} eq '??') { print "<img src='/images/flags/blank.png' border='0' align='absmiddle'/>"; } else { print "<a href='country.cgi#$node->{'country_code'}'><img src='/images/flags/$node->{'country_code'}.png' border='0' align='absmiddle' alt='$node->{'country_code'}'></a>"; @@ -683,6 +697,10 @@ sub BuildConfiguration() {
print FILE "ORPort $settings{'TOR_RELAY_PORT'}\n";
+ if ($settings{'TOR_RELAY_DIRPORT'} ne '0') { + print FILE "DirPort $settings{'TOR_RELAY_DIRPORT'}\n"; + } + if ($settings{'TOR_RELAY_ADDRESS'} ne '') { print FILE "Address $settings{'TOR_RELAY_ADDRESS'}\n"; } diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi index 1bfc039..1b40a3c 100644 --- a/html/cgi-bin/urlfilter.cgi +++ b/html/cgi-bin/urlfilter.cgi @@ -59,6 +59,7 @@ my $tcfile = "${General::swroot}/urlfilter/timeconst"; my $uqfile = "${General::swroot}/urlfilter/userquota"; my $dbdir = "${General::swroot}/urlfilter/blacklists"; my $editdir = "${General::swroot}/urlfilter/editor"; +my $templatedir = "/srv/web/ipfire/html/redirect-templates"; my $repository = "/var/urlrepo"; my $hintcolour = '#FFFFCC';
@@ -142,6 +143,7 @@ $filtersettings{'ENABLE_LOG'} = 'off'; $filtersettings{'ENABLE_USERNAME_LOG'} = 'off'; $filtersettings{'ENABLE_CATEGORY_LOG'} = 'off'; $filtersettings{'ENABLE_AUTOUPDATE'} = 'off'; +$filtersettings{'REDIRECT_TEMPLATE'} = 'legacy';
$filtersettings{'ACTION'} = ''; $filtersettings{'VALID'} = ''; @@ -1074,6 +1076,8 @@ foreach $category (@filtergroups) { $checked{$category}{$filtersettings{$category}} = "checked='checked'"; }
+$selected{'REDIRECT_TEMPLATE'}{$filtersettings{'REDIRECT_TEMPLATE'}} = "selected='selected'"; + $selected{'DEFINITION'}{$tcsettings{'DEFINITION'}} = "selected='selected'"; $selected{'FROM_HOUR'}{$tcsettings{'FROM_HOUR'}} = "selected='selected'"; $selected{'FROM_MINUTE'}{$tcsettings{'FROM_MINUTE'}} = "selected='selected'"; @@ -1416,6 +1420,24 @@ print <<END <td colspan='4'><b>$Lang::tr{'urlfilter block settings'}</b></td> </tr> <tr> + <td width='25%' class='base'>$Lang::tr{'urlfilter redirect template'}</td> + <td width='75%' colspan='2'> + <select name='REDIRECT_TEMPLATE'> +END +; + + foreach (<$templatedir/*>) { + if ((-d "$_") && (-e "$_/template.html")) { + my $template = substr($_,rindex($_,"/")+1); + print "<option value='$template' $selected{'REDIRECT_TEMPLATE'}{$template}>$template</option>\n"; + } + } + +print <<END + </select> + </td> +</tr> +<tr> <td width='25%' class='base'>$Lang::tr{'urlfilter show category'}:</td> <td width='12%'><input type='checkbox' name='SHOW_CATEGORY' $checked{'SHOW_CATEGORY'}{'on'} /></td> <td width='25%' class='base'>$Lang::tr{'urlfilter redirectpage'}: <img src='/blob.gif' alt='*' /></td> diff --git a/html/cgi-bin/wirelessclient.cgi b/html/cgi-bin/wirelessclient.cgi index 5ff0e2c..3c52803 100644 --- a/html/cgi-bin/wirelessclient.cgi +++ b/html/cgi-bin/wirelessclient.cgi @@ -446,7 +446,7 @@ sub showEditBox() { <table width='100%'> <tr> <td class='base' width='20%'>$Lang::tr{'wlan client ssid'}:</td> - <td width='40%'><input type='text' name='SSID' value='$settings{'SSID'}' size='25'/></td> + <td width='40%'><input type='text' name='SSID' value="$settings{'SSID'}" size='25'/></td> <td class='base' width='10%'>$Lang::tr{'enabled'}</td> <td width='30%'><input type='checkbox' name='ENABLED' $checked{'ENABLED'} /></td> </tr> @@ -464,7 +464,7 @@ sub showEditBox() { </tr> <tr> <td class='base' width='20%'>$Lang::tr{'wlan client psk'}: </td> - <td width='40%'><input type='password' name='PSK' value='$settings{'PSK'}' size='25'/></td> + <td width='40%'><input type='password' name='PSK' value="$settings{'PSK'}" size='25'/></td> <td colspan="2" width='40%'></td> </tr> </table> @@ -499,11 +499,11 @@ sub showEditBox() { </td> <td width='40%'> <select name='PRIO'> - <option value="0" $selected{'PRIO'}{'0'}>0</option> + <option value="0" $selected{'PRIO'}{'0'}>0 ($Lang::tr{'most preferred'})</option> <option value="1" $selected{'PRIO'}{'1'}>1</option> <option value="2" $selected{'PRIO'}{'2'}>2</option> <option value="3" $selected{'PRIO'}{'3'}>3</option> - <option value="4" $selected{'PRIO'}{'4'}>4</option> + <option value="4" $selected{'PRIO'}{'4'}>4 ($Lang::tr{'least preferred'})</option> </select> </td> <td colspan="2" width='40%'></td> diff --git a/html/html/redirect-templates/legacy/template.html b/html/html/redirect-templates/legacy/template.html new file mode 100644 index 0000000..b5fb61e --- /dev/null +++ b/html/html/redirect-templates/legacy/template.html @@ -0,0 +1,55 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <title>ACCESS MESSAGE</title> + </head> + <body> + <table width="100%" height='100%' border="0"> + <tr> + <td colspan='3' width='100%' height='130' align="center" background="<TMPL_VAR NAME="ADDRESS">/images/background.gif"> + <tr> + <td width='10%'> + <td align='center' bgcolor='#CC000000' width='80%'> + <font face="verdana, arial, sans serif" color="#FFFFFF" size="5"> + <b><TMPL_VAR NAME="MSG_TEXT_1"></b> + </font> + <td width='10%'> + + <TMPL_IF NAME="CATEGORY"> + <tr> + <td colspan='3' align='center'> + <font face="verdana, arial, sans serif" color="#CC000000" size="1"> + <b>[<TMPL_VAR NAME="CATEGORY">]</b> + </font> + </TMPL_IF> + + <tr> + <td colspan='3' align="center"> + <font face="verdana, arial, sans serif" color="#000000" size="4"> + <b><TMPL_VAR NAME="MSG_TEXT_2"></b> + </font> + <font face="verdana,arial,sans serif" color="#000000" size="2"> + <TMPL_IF NAME="URL"> + <p>URL: <a href="<TMPL_VAR NAME="URL">"><TMPL_VAR NAME="URL"></a> + </TMPL_IF> + + <TMPL_IF NAME="IP_ADDRESS"> + <p>Client IP address: <i><TMPL_VAR NAME="IP_ADDRESS"></i> + </TMPL_IF> + + <br><p><TMPL_VAR NAME="MSG_TEXT_3"> + </font> + + <tr> + <td colspan='3' height='60%' valign="bottom" align="right"> + <font face="verdana,arial,sans serif" color="#656565" size="1"> + Web Filtering by + </font> + <a href="http://www.ipfire.org" target="_blank"> + <font face="verdana,arial,sans serif" color="#656565" size="1"><b>IPFire</b></font> + </a> + + </table> + </body> +</html> diff --git a/html/html/redirect.cgi b/html/html/redirect.cgi index 93f1ea4..4f9d227 100644 --- a/html/html/redirect.cgi +++ b/html/html/redirect.cgi @@ -19,9 +19,12 @@ # # ###############################################################################
-use CGI qw(param); +use CGI; +use HTML::Entities; +use HTML::Template;
-$swroot="/var/ipfire"; +my $swroot="/var/ipfire"; +my $templateroot = "/srv/web/ipfire/html/redirect-templates";
my %netsettings; my %filtersettings; @@ -29,117 +32,75 @@ my %filtersettings; &readhash("$swroot/ethernet/settings", %netsettings); &readhash("$swroot/urlfilter/settings", %filtersettings);
-$category=param("category"); -$url=param("url"); -$ip=param("ip"); +# Read the template file. +my $template = $filtersettings{'REDIRECT_TEMPLATE'}; +if (($template eq '') || (! -e "$templateroot/$template")) { + $template = "legacy"; +} +my $tmpl = HTML::Template->new( + filename => "$templateroot/$template/template.html", + die_on_bad_params => 0 +); + +# Address where to load more resources from. +$tmpl->param(ADDRESS => "http://$netsettings%7B%27GREEN_ADDRESS%27%7D:81");
-if ($filtersettings{'MSG_TEXT_1'} eq '') { +# Message text 1 +my $msgtext1 = $filtersettings{'MSG_TEXT_1'}; +if ($msgtext1 eq '') { $msgtext1 = "A C C E S S D E N I E D"; -} else { $msgtext1 = $filtersettings{'MSG_TEXT_1'}; } -if ($filtersettings{'MSG_TEXT_2'} eq '') { +} +$tmpl->param(MSG_TEXT_1 => $msgtext1); + +# Message text 2 +my $msgtext2 = $filtersettings{'MSG_TEXT_2'}; +if ($msgtext2 eq '') { $msgtext2 = "Access to the requested page has been denied"; -} else { $msgtext2 = $filtersettings{'MSG_TEXT_2'}; } -if ($filtersettings{'MSG_TEXT_3'} eq '') { +} +$tmpl->param(MSG_TEXT_2 => $msgtext2); + +# Message text 3 +my $msgtext3 = $filtersettings{'MSG_TEXT_3'}; +if ($msgtext3 eq '') { $msgtext3 = "Please contact the Network Administrator if you think there has been an error"; -} else { $msgtext3 = $filtersettings{'MSG_TEXT_3'}; } +} +$tmpl->param(MSG_TEXT_3 => $msgtext3); + +# Category +my $category = CGI::param("category"); +$tmpl->param(CATEGORY => &escape($category)); + +# URL +my $url = CGI::param("url"); +$tmpl->param(URL => &escape($url));
-if ($category eq '') { $category = ' '; } else { $category = '['.$category.']'; } +# IP address +my $ip_address = CGI::param("ip"); +$tmpl->param(IP_ADDRESS => &escape($ip_address));
+# Print header print "Pragma: no-cache\n"; print "Cache-control: no-cache\n"; print "Connection: close\n"; print "Content-type: text/html\n\n"; +print $tmpl->output;
-print <<END - -<html> -<head> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<title>ACCESS MESSAGE</title> -</head> - -<body> -<table width="100%" height='100%' border="0"> -<tr> - <td colspan='3' width='100%' height='130' align="center" background="http://$netsettings{'GREEN_ADDRESS'}:81/images/background.gif"> -<tr> <td width='10%'><td align='center' bgcolor='#CC000000' width='80%'><font face="verdana, arial, sans serif" color="#FFFFFF" size="5"> - <b>$msgtext1</b> - </font> - <td width='10%'> -END -; - -if (!($category eq "")) -{ - print <<END - <tr> <td colspan='3' align='center'> - <font face="verdana, arial, sans serif" color="#CC000000" size="1"> - <b>$category</b> - </font> -END -; +sub escape($) { + my $s = shift; + return HTML::Entities::encode_entities($s); } -print <<END -<tr> - <td colspan='3' align="center"> - <font face="verdana, arial, sans serif" color="#000000" size="4"> - <b>$msgtext2</b> - </font> - <font face="verdana,arial,sans serif" color="#000000" size="2"> -END -; - -if (!($url eq "")) -{ -print <<END - <p>URL: <a href="$url">$url</a> -END -; -} - -if (!($ip eq "")) -{ -print <<END - <p>Client IP address: <i>$ip</i> -END -; -} - -print <<END - <br><p>$msgtext3 - </font>
-<tr> - <td colspan='3' height='60%' valign="bottom" align="right"> - <font face="verdana,arial,sans serif" color="#656565" size="1">Web Filtering by - </font> - <a href="http://www.ipfire.org" target="_blank"><b> - <font face="verdana,arial,sans serif" color="#656565" size="1">IPFire</b></a> - </font> - -</table> -</body> - -</html> -END -; - -sub readhash -{ +sub readhash { my $filename = $_[0]; my $hash = $_[1]; my ($var, $val);
- if (-e $filename) - { + if (-e $filename) { open(FILE, $filename) or die "Unable to read file $filename"; - while (<FILE>) - { + while (<FILE>) { chop; ($var, $val) = split /=/, $_, 2; - if ($var) - { + if ($var) { $val =~ s/^'//g; $val =~ s/'$//g; @@ -149,6 +110,7 @@ sub readhash $hash->{$var} = $val; } } + close FILE; } } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b55179f..58dc88e 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1107,6 +1107,7 @@ 'last activity' => 'Letzte Aktivität', 'lateprompting' => 'Late prompting', 'lease expires' => 'Zuordnung verfällt', +'least preferred' => 'weniger präferiert', 'legend' => 'Legende', 'length' => 'Länge', 'line' => 'Leitung', @@ -1245,6 +1246,7 @@ 'monthly volume start day short' => 'Erste Tag', 'months' => 'Monate', 'more' => 'weitere', +'most preferred' => 'präferiert', 'mount' => 'Einbinden', 'mounted on' => 'Mounted auf', 'mpfire' => 'Media Player für IPFire', @@ -1798,6 +1800,7 @@ 'tone dial' => 'Tonwahl:', 'too long 80 char max' => ' ist zu lang, es sind maximal 80 Zeichen erlaubt', 'tor' => 'Tor', +'tor 0 = disabled' => '0 = deaktiviert', 'tor accounting' => 'Accounting', 'tor accounting bytes' => 'Traffic (empfangen/gesendet)', 'tor accounting bytes left' => 'übrig', @@ -1818,11 +1821,13 @@ 'tor connected relays' => 'Verbundene Relays', 'tor contact info' => 'Kontaktinformationen', 'tor daemon' => 'Daemon', +'tor directory port' => 'Directory-Port', 'tor enabled' => 'Tor einschalten', 'tor errmsg invalid accounting limit' => 'Ungültiges Accounting-Limit', +'tor errmsg invalid directory port' => 'Ungültiger Directory-Port', 'tor errmsg invalid ip or mask' => 'Ungültiges IP-Subnetz', 'tor errmsg invalid relay address' => 'Ungültige Relay-Adresse', -'tor errmsg invalid relay name' => 'Ungültiger Relay-Nickname.', +'tor errmsg invalid relay name' => 'Ungültiger Relay-Nickname', 'tor errmsg invalid relay port' => 'Ungültiger Relay-Port', 'tor errmsg invalid socks port' => 'Ungültiger SOCKS-Port', 'tor exit country' => 'Exit-Land', @@ -2118,6 +2123,7 @@ 'urlfilter quota restart message' => 'Hinweis: Beim Neustart des URL-Filters werden die Zähler für alle Benutzer zurückgesetzt', 'urlfilter quota time error' => 'Ungültiger Wert für Zeitkontingent', 'urlfilter quota user error' => 'Mindestens ein Benutzername erforderlich', +'urlfilter redirect template' => 'Sperrseitenvorlage', 'urlfilter redirectpage' => 'Leite zu dieser URL um', 'urlfilter remove file' => 'Datei aus der Ablage entfernen', 'urlfilter renewal' => 'Erneuerung', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 7035bed..94eb828 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -897,7 +897,7 @@ 'firewall log' => 'Firewall log', 'firewall log viewer' => 'Firewall Log Viewer', 'firewall logs' => 'Firewall Logs', -'firewall logs ip' => 'Fw-Logdgraphs (IP)', +'firewall logs ip' => 'Fw-Loggraphs (IP)', 'firewall logs port' => 'Fw-Loggraphs (Port)', 'firewallhits' => 'firewallhits', 'firmware' => 'Firmware', @@ -1135,6 +1135,7 @@ 'last activity' => 'Last Activity', 'lateprompting' => 'Lateprompting', 'lease expires' => 'Lease expires', +'least preferred' => 'least preferred', 'legend' => 'Legend', 'length' => 'Length', 'line' => 'Line', @@ -1273,6 +1274,7 @@ 'monthly volume start day short' => 'First day', 'months' => 'months', 'more' => 'more', +'most preferred' => 'most preferred', 'mount' => 'Mount', 'mounted on' => 'Mounted on', 'mpfire' => 'Media Player for IPFire', @@ -1832,6 +1834,7 @@ 'tone dial' => 'Tone dial:', 'too long 80 char max' => ' is too long, maximum allowed is 80 characters', 'tor' => 'Tor', +'tor 0 = disabled' => '0 = disabled', 'tor accounting' => 'Accounting', 'tor accounting bytes' => 'Traffic (read/written)', 'tor accounting bytes left' => 'left', @@ -1853,8 +1856,10 @@ 'tor connected relays' => 'Connected relays', 'tor contact info' => 'Contact Info', 'tor daemon' => 'Daemon', +'tor directory port' => 'Directory port', 'tor enabled' => 'Enable Tor', 'tor errmsg invalid accounting limit' => 'Invalid accounting limit', +'tor errmsg invalid directory port' => 'Invalid directory port', 'tor errmsg invalid ip or mask' => 'Invalid IP subnet', 'tor errmsg invalid node id' => 'Invalid node ID', 'tor errmsg invalid relay address' => 'Invalid relay address', @@ -2156,6 +2161,7 @@ 'urlfilter quota restart message' => 'Note: The counters will be reset for all users when restarting the URL filter', 'urlfilter quota time error' => 'Invalid value for time quota', 'urlfilter quota user error' => 'At least one username is required', +'urlfilter redirect template' => 'Redirect page template', 'urlfilter redirectpage' => 'Redirect to this URL', 'urlfilter remove file' => 'Remove file from repository', 'urlfilter renewal' => 'Renewal', diff --git a/lfs/GeoIP b/lfs/GeoIP index 295598c..88e147c 100644 --- a/lfs/GeoIP +++ b/lfs/GeoIP @@ -25,7 +25,7 @@ include Config
VER = 1.17 -DATVER = 02072013 +DATVER = 01102013
THISAPP = Geo-IP-PurePerl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
$(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de -GeoIP.dat-$(DATVER).gz_MD5 = 25d59395b43d676fcbab05e7610a7b58 +GeoIP.dat-$(DATVER).gz_MD5 = 4aecef560aa6dacfe7e59dad8a12914b
install : $(TARGET)
diff --git a/lfs/HTML-Template b/lfs/HTML-Template new file mode 100644 index 0000000..fb837ba --- /dev/null +++ b/lfs/HTML-Template @@ -0,0 +1,78 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.94 + +THISAPP = HTML-Template-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 7b7683c3672d55fb922734ea1e9ba7e8 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) + diff --git a/lfs/compat-drivers b/lfs/compat-drivers index 53f6518..57a9b16 100644 --- a/lfs/compat-drivers +++ b/lfs/compat-drivers @@ -81,6 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8-1-u-kref_get_unless_zero.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch
# kfifo has no license info and taints kernel cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch diff --git a/lfs/iptraf-ng b/lfs/iptraf-ng new file mode 100644 index 0000000..e962b2c --- /dev/null +++ b/lfs/iptraf-ng @@ -0,0 +1,88 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.1.4 + +THISAPP = iptraf-ng-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = iptraf-ng +PAK_VER = 2 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = de27cfeeede96e2acfb0edc8439b034a + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch + cd $(DIR_APP) && ./configure \ + --prefix=/usr + + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + + # Binary install + cd $(DIR_APP) && install -v -m750 -D iptraf-ng /usr/sbin/iptraf-ng + cd $(DIR_APP) && install -v -m750 -D rvnamed-ng /usr/sbin/rvnamed-ng + + # Directory install + -mkdir -vp /var/log/iptraf-ng + chmod 750 /var/log/iptraf-ng + chown root.root /var/log/iptraf-ng + -mkdir -vp /var/lib/iptraf-ng + chmod 750 /var/lib/iptraf-ng + chown root.root /var/lib/iptraf-ng + -mkdir -vp /var/lock/iptraf-ng + chmod 755 /var/lock/iptraf-ng + chown root.root /var/lock/iptraf-ng + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/php b/lfs/php index 58f442c..8139e21 100644 --- a/lfs/php +++ b/lfs/php @@ -24,7 +24,7 @@
include Config
-VER = 5.3.16 +VER = 5.3.27
THISAPP = php-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -46,7 +46,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz
-$(DL_FILE)_MD5 = 99cfd78531643027f60c900e792d21be +$(DL_FILE)_MD5 = 25ae23a5b9615fe8d33de5b63e1bb788 idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1 Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513
@@ -114,11 +114,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-mysql-sock=/var/run/mysql \ --with-ncurses \ --with-pdo-mysql \ - --without-pdo-sqlite \ + --with-pdo-sqlite \ --with-readline \ --enable-sockets \ --with-xsl \ - --with-iconv + --with-iconv \ + --enable-zip cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && install -v -m644 $(DIR_SRC)/config/php/php.ini /etc/php.ini diff --git a/lfs/samba b/lfs/samba index b598008..0171627 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@
include Config
-VER = 3.6.17 +VER = 3.6.18
THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 51 +PAK_VER = 52
DEPS = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c67c3330545c8f1f7ee26e017c28439b +$(DL_FILE)_MD5 = c7eec3e83fe4c4750240a8a0a214bbd4
install : $(TARGET)
diff --git a/lfs/squid b/lfs/squid index 81118c2..4a71b4d 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,10 +24,10 @@
include Config
-VER = 3.1.23 +VER = 3.3.8
THISAPP = squid-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e15fdb8c615cf1f9525be0a2b75c60a7 +$(DL_FILE)_MD5 = 6a8fa0075f2fbdd899ac4c9d95fe67cb
install : $(TARGET)
@@ -69,47 +69,56 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE) - - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.1-10486.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.1-10487.patch - - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \ - --datadir=/usr/lib/squid \ - --mandir=/usr/share/man --libexecdir=/usr/lib/squid \ - --localstatedir=/var --sysconfdir=/etc/squid \ - --enable-poll --enable-icmp --disable-wccp \ - --enable-ident-lookups \ - --enable-storeio="aufs,diskd,ufs" --enable-ssl \ - --enable-underscores --enable-ntlm-fail-open --enable-arp-acl \ - --enable-http-violations --enable-auth=basic,ntlm \ - --enable-removal-policies="heap,lru" \ - --enable-delay-pools --enable-linux-netfilter \ - --enable-basic-auth-helpers="NCSA,SMB,MSNT,LDAP,multi-domain-NTLM,PAM,squid_radius_auth" \ - --enable-useragent-log \ - --enable-referer-log \ - --enable-snmp \ - --with-pthreads --with-dl \ - --with-maxfd="65536" \ - --with-filedescriptors=65536 \ - --with-large-files \ - --with-aio \ - --enable-async-io=8 \ - --enable-unlinkd \ - --enable-ntln-fail-open \ - --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \ - --enable-internal-dns \ - --enable-epoll \ - --disable-kqueue \ - --enable-select \ - --enable-cache-digests \ - --enable-forw-via-db \ - --enable-htcp \ - --enable-ipf-transparent \ - --enable-kill-parent-hack \ - --disable-wccpv2 \ - --enable-icap-client \ - --disable-esi + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/squid \ + --datadir=/usr/lib/squid \ + --mandir=/usr/share/man \ + --libexecdir=/usr/lib/squid \ + --localstatedir=/var \ + --disable-ipv6 \ + --enable-poll \ + --disable-icmp \ + --disable-wccp \ + --enable-ident-lookups \ + --enable-storeio="aufs,diskd,ufs" \ + --enable-ssl \ + --enable-underscores \ + --enable-http-violations \ + --enable-removal-policies="heap,lru" \ + --enable-delay-pools \ + --enable-linux-netfilter \ + --enable-snmp \ + --enable-auth \ + --enable-auth-basic \ + --enable-auth-digest \ + --enable-auth-negotiate \ + --enable-auth-ntlm \ + --enable-log-daemon-helpers \ + --enable-url-rewrite-helpers \ + --enable-build-info \ + --enable-eui \ + --with-pthreads \ + --with-dl \ + --with-maxfd="65536" \ + --with-filedescriptors=65536 \ + --with-large-files \ + --with-aio \ + --enable-async-io=8 \ + --enable-unlinkd \ + --enable-internal-dns \ + --enable-epoll \ + --disable-kqueue \ + --enable-select \ + --enable-cache-digests \ + --enable-forw-via-db \ + --enable-htcp \ + --enable-ipf-transparent \ + --enable-kill-parent-hack \ + --disable-wccpv2 \ + --enable-icap-client \ + --disable-esi
cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/tor b/lfs/tor index 6161a56..795f7c3 100644 --- a/lfs/tor +++ b/lfs/tor @@ -24,7 +24,7 @@
include Config
-VER = 0.2.3.25 +VER = 0.2.4.17-rc
THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 3 +PAK_VER = 4
DEPS = "libevent2"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a1c364189a9a66ed9daa8e6436489daf +$(DL_FILE)_MD5 = 2cdfb8dcc3306a43cf465a858bf97b2d
install : $(TARGET)
diff --git a/lfs/transmission b/lfs/transmission index 9d5dfa5..3c1368d 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -24,7 +24,7 @@
include Config
-VER = 2.81 +VER = 2.82
THISAPP = transmission-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = transmission -PAK_VER = 8 +PAK_VER = 9
DEPS = "libevent2"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = db1ad10ecff07150486dab2365ccb3a8 +$(DL_FILE)_MD5 = a5ef870c0410b12d10449c2d36fa4661
install : $(TARGET)
diff --git a/lfs/wavemon b/lfs/wavemon new file mode 100644 index 0000000..a3df36e --- /dev/null +++ b/lfs/wavemon @@ -0,0 +1,71 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.7.5 + +THISAPP = wavemon-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = wavemon +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 77d4a0f099ca98cf98a915adc70694ba + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/xinetd b/lfs/xinetd new file mode 100644 index 0000000..62f34ea --- /dev/null +++ b/lfs/xinetd @@ -0,0 +1,85 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.3.15 + +THISAPP = xinetd-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = xinetd +PAK_VER = 1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 77358478fd58efa6366accae99b8b04c + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + -mkdir -pv /etc/xinetd.d + cp -f $(DIR_SRC)/config/xinetd/xinetd.conf /etc/xinetd.conf + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index eb9421c..ef98d6f 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.13" # Version number -CORE="72" # Core Level (Filename) -PAKFIRE_CORE="72" # Core Level (PAKFIRE) +CORE="73" # Core Level (Filename) +PAKFIRE_CORE="73" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -179,11 +179,12 @@ prepareenv() { set +h LC_ALL=POSIX if [ -z $MAKETUNING ]; then - if [ "${MACHINE:0:3}" = "arm" ]; then - MAKETUNING="-j2" - else - MAKETUNING="-j6" - fi + CPU_COUNT="$(getconf _NPROCESSORS_ONLN 2>/dev/null)" + if [ -z "${CPU_COUNT}" ]; then + CPU_COUNT=1 + fi + + MAKETUNING="-j$(( ${CPU_COUNT} * 2 + 1 ))" fi export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD @@ -529,6 +530,7 @@ buildipfire() { ipfiremake URI ipfiremake HTML-Tagset ipfiremake HTML-Parser + ipfiremake HTML-Template ipfiremake Compress-Zlib ipfiremake Digest ipfiremake Digest-SHA1 @@ -752,6 +754,7 @@ buildipfire() { ipfiremake acpid ipfiremake fping ipfiremake telnet + ipfiremake xinetd ipfiremake libgpg-error ipfiremake libassuan ipfiremake gpgme @@ -782,6 +785,8 @@ buildipfire() { ipfiremake swatch ipfiremake tor ipfiremake arm + ipfiremake wavemon + ipfiremake iptraf-ng echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild diff --git a/src/hwdata/pci.ids b/src/hwdata/pci.ids index 277a2ba..d856c90 100644 --- a/src/hwdata/pci.ids +++ b/src/hwdata/pci.ids @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2013.07.14 -# Date: 2013-07-14 03:15:01 +# Version: 2013.10.06 +# Date: 2013-10-06 03:15:01 # # Maintained by Martin Mares mj@ucw.cz and other volunteers from the # PCI ID Project at http://pci-ids.ucw.cz/. @@ -475,6 +475,8 @@ 0095 SAS3108 PCI-Express Fusion-MPT SAS-3 0096 SAS3004 PCI-Express Fusion-MPT SAS-3 0097 SAS3008 PCI-Express Fusion-MPT SAS-3 + 1028 1f45 12GB/s HBA internal + 1028 1f46 12GB/s HBA external 0407 MegaRAID 1000 0530 MegaRAID 530 SCSI 320-0X RAID Controller 1000 0531 MegaRAID 531 SCSI 320-4X RAID Controller @@ -636,7 +638,7 @@ 4154 RV350 GL [FireGL T2] 4155 RV350 [Radeon 9600] 4157 RV350 GL [FireGL T2] - 4158 68800AX [Mach32] + 4158 68800AX [Graphics Ultra Pro PCI] 4164 R300 [Radeon 9500 PRO] (Secondary) 4165 R300 [Radeon 9700 PRO] (Secondary) 4166 R300 [Radeon 9700 PRO] (Secondary) @@ -691,36 +693,36 @@ 105b 0c81 Realtek ALC 653 107b 0300 MX6421 1462 0131 MS-1013 Notebook - 4371 IXP SB400 PCI-PCI Bridge + 4371 IXP SB4x0 PCI-PCI Bridge 103c 308b MX6125 1462 7217 Aspire L250 - 4372 IXP SB400 SMBus Controller + 4372 IXP SB4x0 SMBus Controller 1025 0080 Aspire 5024WLMMi 103c 2a20 Pavilion t3030.de Desktop PC 103c 308b MX6125 1462 0131 MS-1013 Notebook 1462 7217 Aspire L250 - 4373 IXP SB400 USB2 Host Controller + 4373 IXP SB4x0 USB2 Host Controller 1025 0080 Aspire 5024WLMMi 103c 2a20 Pavilion t3030.de Desktop PC 103c 308b MX6125 1462 7217 Aspire L250 - 4374 IXP SB400 USB Host Controller + 4374 IXP SB4x0 USB Host Controller 103c 2a20 Pavilion t3030.de Desktop PC 103c 308b MX6125 1462 7217 Aspire L250 - 4375 IXP SB400 USB Host Controller + 4375 IXP SB4x0 USB Host Controller 1025 0080 Aspire 5024WLMMi 103c 2a20 Pavilion t3030.de Desktop PC 103c 308b MX6125 1462 7217 Aspire L250 - 4376 IXP SB400 IDE Controller + 4376 IXP SB4x0 IDE Controller 1025 0080 Aspire 5024WLMMi 103c 2a20 Pavilion t3030.de Desktop PC 103c 308b MX6125 1462 0131 MS-1013 Notebook 1462 7217 Aspire L250 - 4377 IXP SB400 PCI-ISA Bridge + 4377 IXP SB4x0 PCI-ISA Bridge 1025 0080 Aspire 5024WLMi 103c 2a20 Pavilion t3030.de Desktop PC 103c 308b MX6125 @@ -729,7 +731,7 @@ 1025 0080 Aspire 5024WLMMi 103c 308b MX6125 1462 0131 MS-1013 Notebook - 4379 IXP SB400 Serial ATA Controller + 4379 IXP SB4x0 Serial ATA Controller 1462 7141 Aspire L250 437a IXP SB400 Serial ATA Controller 1002 4379 4379 Serial ATA Controller @@ -747,7 +749,7 @@ 1458 b005 Gigabyte GA-MA69G-S3H Motherboard 1462 7327 K9AG Neo2 17f2 5999 KI690-AM2 Motherboard - 4381 SB400 SATA Controller (RAID 5 mode) + 4381 SB600 SATA Controller (RAID 5 mode) 4382 SB600 AC97 Audio 4383 SBx00 Azalia (Intel HDA) 1019 2120 A785GM-M @@ -931,7 +933,7 @@ 4753 Rage XC 1002 4753 Rage XC 4754 3D Rage II/II+ PCI [Mach64 GT] - 4755 3D Rage II+ PCI [Mach64 GTB] + 4755 Mach64 GTB [3D Rage II+ DVD] 4756 3D Rage IIC PCI [Mach64 GT IIC] 1002 4756 Rage IIC 4757 3D Rage IIC AGP @@ -1338,15 +1340,14 @@ 15d9 a811 H8DGU 5a20 RD890S PCI Express bridge for GPP2 port 1 5a23 RD990 I/O Memory Management Unit (IOMMU) - 5a33 Radeon Xpress 200 Host Bridge - 5a34 RS480 PCI-X Root Port -# Comes in pair with 5a3f - 5a36 RS480 PCI Bridge - 5a37 RS480 PCI Bridge - 5a38 RS480 PCI Bridge -# Comes in pair with 5a38 - 5a39 RS480 PCI Bridge - 5a3f RS480 PCI Bridge + 5a31 RC410 Host Bridge + 5a33 RS400 Host Bridge + 5a34 RS4xx PCI Express Port [ext gfx] + 5a36 RC4xx/RS4xx PCI Express Port 1 + 5a37 RC4xx/RS4xx PCI Express Port 2 + 5a38 RC4xx/RS4xx PCI Express Port 3 + 5a39 RC4xx/RS4xx PCI Express Port 4 + 5a3f RC4xx/RS4xx PCI Bridge [int gfx] 1462 7217 Aspire L250 5a41 RS400 [Radeon Xpress 200] 5a42 RS400M [Radeon Xpress 200M] @@ -1416,25 +1417,27 @@ 5e6d RV410 [Radeon X700] (Secondary) 148c 2117 Bravo X700 (Secondary) 5f57 R423 [Radeon X800 XT] - 6600 Mars [Radeon HD 8670A/8750M] + 6600 Mars [Radeon HD 8670A/8670M/8750M] 6601 Mars [Radeon HD 8730M] 6602 Mars 6603 Mars + 6604 Mars [Radeon R7 M265] + 6605 Mars [Radeon R7 M260] 6606 Mars XTX [Radeon HD 8790M] 6607 Mars LE [Radeon HD 8530M] - 6610 Oland [Radeon HD 8600 Series] + 6610 Oland XT [Radeon HD 8670/R7 250] 6611 Oland [Radeon HD 8570] - 6613 Oland [Radeon HD 8500 Series] + 6613 Oland PRO [Radeon R7 240] 6620 Mars 6621 Mars PRO 6623 Mars 6631 Oland - 6640 Saturn [Radeon HD 8950] - 6641 Saturn PRO + 6640 Saturn XT [Radeon HD 8950M] + 6641 Saturn PRO [Radeon HD 8930M] 6649 Bonaire 6650 Bonaire 6651 Bonaire - 6658 Bonaire + 6658 Bonaire XTX [Radeon R7 260X] 665c Bonaire XT [Radeon HD 7790/8770] 1043 0452 Radeon HD 7790 DirectCU II OC # R7790-1GD5/OC @@ -1446,12 +1449,12 @@ 174b e253 Radeon HD 7790 Dual-X OC 1787 2329 Radeon HD 7790 TurboDuo 665d Bonaire - 6660 Sun XT [Radeon HD 8670A] - 6663 Sun PRO [Radeon HD 8500M Series] - 6664 Sun [Radeon R5 M200 Series] - 6665 Sun [Radeon R5 M200 Series] - 6667 Sun [Radeon R5 M200 Series] - 666f Sun [Radeon HD 8500M] + 6660 Sun XT [Radeon HD 8670A/8670M/8690M] + 6663 Sun PRO [Radeon HD 8570M] + 6664 Jet XT [Radeon R5 M200 Series] + 6665 Jet PRO [Radeon R5 M200 Series] + 6667 Jet ULT [Radeon R5 M200 Series] + 666f Sun LE [Radeon HD 8550M] 6670 Hainan 6704 Cayman PRO GL [FirePro V7900] 6707 Cayman LE GL [FirePro V5900] @@ -1926,13 +1929,17 @@ 678a Tahiti PRO GL [FirePro Series] 1002 030c FirePro W8000 1002 0310 FirePro S9000 + 1002 0420 Radeon Sky 700 + 1002 0422 Radeon Sky 900 + 1002 0b0e FirePro S10000 Passive 1002 0b2a FirePro S10000 1028 030c FirePro W8000 6790 Tahiti 6791 Tahiti 6792 Tahiti - 6798 Tahiti XT [Radeon HD 7970] + 6798 Tahiti XT [Radeon HD 7970/R9 280X] 1002 3000 Tahiti XT2 [Radeon HD 7970 GHz Edition] + 1002 3001 Tahiti XTL [Radeon R9 280X] 1002 4000 Radeon HD 8970 OEM 1043 041c HD 7970 DirectCU II 1043 0420 HD 7970 DirectCU II TOP @@ -1940,6 +1947,8 @@ 1043 0448 HD 7970 DirectCU II TOP 1043 044a Tahiti XT2 [Matrix HD 7970] 1043 044c Tahiti XT2 [Matrix HD 7970 Platinum] + 1043 3001 Tahiti XTL [ROG Matrix R9 280X] + 1043 3006 Tahiti XTL [Radeon R9 280X DirectCU II TOP] 1043 9999 ARES II 1092 3000 Tahiti XT2 [Radeon HD 7970 GHz Edition] 1458 2261 Tahiti XT2 [Radeon HD 7970 GHz Edition OC] @@ -1960,13 +1969,14 @@ 1002 0b28 Radeon HD 8990 OEM 1002 0b2a Radeon HD 7990 1462 8036 Radeon HD 8990 OEM + 148c 8990 Radeon HD 8990 OEM 679e Tahiti LE [Radeon HD 7870 XT] 679f Tahiti 67a0 Hawaii XT GL 67a1 Hawaii GL 67a2 Hawaii GL - 67b0 Hawaii XT [Radeon HD 8970] - 67b1 Hawaii PRO + 67b0 Hawaii XT [Radeon R9 290X] + 67b1 Hawaii PRO [Radeon R9 290] 67b9 Vesuvius 67be Hawaii LE 6800 Wimbledon XT [Radeon HD 7970M] @@ -1981,9 +1991,10 @@ 6806 Neptune 6808 Pitcairn XT GL [FirePro W7000] 1002 0310 FirePro S7000 + 1002 0420 Radeon Sky 500 6809 Pitcairn LE GL [FirePro W5000] - 6810 Pitcairn - 6811 Pitcairn + 6810 Curacao XT [Radeon R9 270X] + 6811 Curacao PRO [Radeon R9 270] 6816 Pitcairn 6817 Pitcairn 6818 Pitcairn XT [Radeon HD 7870 GHz Edition] @@ -1991,11 +2002,12 @@ 174b 8b04 Radeon HD 8860 6819 Pitcairn PRO [Radeon HD 7850] 174b e221 Radeon HD 7850 2GB GDDR5 DVI-I/DVI-D/HDMI/DP - 6820 Venus XTX [Radeon HD 8800M Series] + 6820 Venus XTX [Radeon HD 8890M] 103c 1851 Radeon HD 7750M - 6821 Venus XT [Radeon HD 8800M Series] + 6821 Venus XT [Radeon HD 8870M] + 1002 031e FirePro SX4000 6822 Venus PRO - 6823 Venus PRO [Radeon HD 8800M Series] + 6823 Venus PRO [Radeon HD 8850M] 6825 Heathrow XT [Radeon HD 7870M] 8086 2111 Chelsea PRO 6826 Chelsea LP [Radeon HD 7700M Series] @@ -2003,14 +2015,17 @@ 6828 Cape Verde PRO [FirePro W600] 6829 Cape Verde 682a Venus PRO - 682b Venus LE [Radeon HD 8800M Series] + 682b Venus LE [Radeon HD 8830M] 682d Chelsea XT GL [FirePro M4000] 682f Chelsea LP [Radeon HD 7730M] 103c 1851 Radeon HD 7750M 6830 Cape Verde [Radeon HD 7800M Series] 6831 Cape Verde [AMD Radeon HD 7700M Series] - 6835 Cape Verde PRX - 6837 Cape Verde LE [Radeon HD 7730] + 6835 Cape Verde PRX [Radeon R7 260] + 6837 Cape Verde LE [Radeon HD 7730/8730] + 1462 2796 Radeon HD 8730 + 1462 8092 Radeon HD 8730 + 148c 8730 Radeon HD 8730 1787 3000 Radeon HD 6570 6838 Cape Verde 6839 Cape Verde @@ -2101,7 +2116,7 @@ 17aa 5101 Radeon HD 7670M 17aa 5102 Radeon HD 7670M 17aa 5103 Radeon HD 7670M - 6841 Thames [Radeon 7550M/7570M/7650M] + 6841 Thames [Radeon HD 7550M/7570M/7650M] 1028 0561 Radeon HD 7650M 1028 056c Radeon HD 7650M 1028 057f Radeon HD 7570M @@ -2774,7 +2789,7 @@ 9488 RV730/M96-XT [Mobility Radeon HD 4670] 9489 RV730/M96 GL [Mobility FireGL V5725] 9490 RV730 XT [Radeon HD 4670] - 174b e880 Radeon HD 4670 512MB DDR3 + 174b e880 Radeon HD 4670 512MB GDDR3 Dual DVI-I/TVO 9491 RV730/M96-CSP [Radeon E4690] 9495 RV730 [Radeon HD 4600 AGP Series] 1002 0028 Radeon HD 4650/4670 AGP @@ -3441,7 +3456,13 @@ 1014 035d PCIe3 1.8GB Cache RAID SAS Adapter Quad-port 6GB (57C8) 1014 035e PCIe2 3.6GB Cache 6Gb SAS RAID Adapter Quad-port (57CE) 1014 03fb PCIe3 28GB Cache RAID SAS Enclosure 6Gb x 16 (57D5) - 04aa Flash Adapter 900GB Full Height + 1014 03fe PCIe3 x8 Cache SAS RAID Internal Adapter 6Gb (57D8) + 1014 03ff PCIe3 x8 SAS RAID Internal Adapter 6Gb (57D7) + 1014 0474 PCIe3 x16 Cache SAS RAID Internal Adapter 6Gb (57EB) + 1014 0475 PCIe3 x16 SAS RAID Internal Adapter 6Gb (57EC) + 1014 0499 PCIe3 x16 Cache SAS RAID Internal Adapter 6Gb (57ED) + 1014 049a PCIe3 x16 SAS RAID Internal Adapter 6Gb (57EE) + 04aa Flash Adapter 90 (PCIe2 0.9TB) 3022 QLA3022 Network Adapter 4022 QLA3022 Network Adapter ffff MPIC-2 interrupt controller @@ -4814,7 +4835,7 @@ 104c 8023 TSB43AB22/A IEEE-1394a-2000 Controller (PHY/Link) 8023 TSB43AB22A IEEE-1394a-2000 Controller (PHY/Link) [iOHCI-Lynx] 103c 088c NC8000 laptop - 1043 808b K8N4-E Mainboard + 1043 808b K8N4/A8N Series Mainboard 1043 815b P5W DH Deluxe Motherboard 1443 8023 FireCard400 8086 5044 Desktop Board DP35DP @@ -5834,6 +5855,7 @@ 1095 6112 SiI 3112 SATARaid Controller 9005 0250 SATAConnect 1205SA Host Controller 3114 SiI 3114 [SATALink/SATARaid] Serial ATA Controller + 1043 8167 A8N-SLI Deluxe/Premium Mainboard 1095 3114 SiI 3114 SATALink Controller 1095 6114 SiI 3114 SATARaid Controller 3124 SiI 3124 PCI-X Serial ATA Controller @@ -6511,7 +6533,7 @@ 1681 M1681 P4 Northbridge [AGP8X,HyperTransport and SDR/DDR] 1687 M1687 K8 Northbridge [AGP8X and HyperTransport] 1689 M1689 K8 Northbridge [Super K8 Single Chip] - 1695 M1695 K8 Northbridge [PCI Express and HyperTransport] + 1695 M1695 Host Bridge 1697 M1697 HTT Host Bridge 3141 M3141 3143 M3143 @@ -6842,7 +6864,7 @@ 0048 NV40 [GeForce 6800 XT] 004e NV40GL [Quadro FX 4000] 0050 CK804 ISA Bridge - 1043 815a K8N4-E or A8N-E Mainboard + 1043 815a K8N4/A8N Series Mainboard 10f1 2865 Tomcat K8E (S2865) 1458 0c11 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond @@ -6853,7 +6875,7 @@ 1028 0225 PowerEdge T105 ISA Bridge 0052 CK804 SMBus 1028 0225 PowerEdge T105 SMBus - 1043 815a K8N4-E or A8N-E Mainboard + 1043 815a K8N4/A8N Series Mainboard 10f1 2865 Tomcat K8E (S2865) 1458 0c11 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond @@ -6861,7 +6883,7 @@ 147b 1c1a KN8-Ultra Mainboard 1565 3402 NF4 AM2L Mainboard 0053 CK804 IDE - 1043 815a K8N4-E or A8N-E Mainboard + 1043 815a K8N4/A8N Series Mainboard 10f1 2865 Tomcat K8E (S2865) 1458 5002 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond @@ -6870,7 +6892,7 @@ 1565 3402 NF4 AM2L Mainboard 0054 CK804 Serial ATA Controller 1028 0225 PowerEdge T105 Serial ATA - 1043 815a A8N-E Mainboard + 1043 815a A8N Series Mainboard 10f1 2865 Tomcat K8E (S2865) 1458 b003 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond @@ -6879,7 +6901,7 @@ 1565 5401 NF4 AM2L Mainboard 0055 CK804 Serial ATA Controller 1028 0225 PowerEdge T105 Serial ATA - 1043 815a K8N4-E or A8N-E Mainboard + 1043 815a K8N4/A8N Series Mainboard 10f1 2865 Tomcat K8E (S2865) 1458 b003 GA-K8N Ultra-9 Mainboard 1462 7125 K8N Neo4-F mainboard @@ -6887,7 +6909,7 @@ 1565 5401 NF4 AM2L Mainboard 0056 CK804 Ethernet Controller 0057 CK804 Ethernet Controller - 1043 8141 K8N4-E or A8N-E Mainboard + 1043 8141 K8N4/A8N Series Mainboard 10de cb84 NF4 Lanparty 10f1 2865 Tomcat K8E (S2865) 1458 e000 GA-K8N Ultra-9 Mainboard @@ -6897,14 +6919,14 @@ 1565 2501 NF4 AM2L Mainboard 0058 CK804 AC'97 Modem 0059 CK804 AC'97 Audio Controller - 1043 812a K8N4-E or A8N-E Mainboard + 1043 812a K8N4/A8N Series Mainboard 10f1 2865 Tomcat K8E (S2865) 1462 7585 K8N Neo4-F mainboard 147b 1c1a KN8-Ultra Mainboard 1565 8211 NF4 AM2L Mainboard 005a CK804 USB Controller 1028 0225 PowerEdge T105 onboard USB - 1043 815a K8N4-E or A8N-E Mainboard + 1043 815a K8N4/A8N Series Mainboard 10f1 2865 Tomcat K8E (S2865) 1458 5004 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond @@ -6913,7 +6935,7 @@ 1565 3402 NF4 AM2L Mainboard 005b CK804 USB Controller 1028 0225 PowerEdge T105 onboard USB - 1043 815a K8N4-E or A8N-E Mainboard + 1043 815a K8N4/A8N Series Mainboard 10f1 2865 Tomcat K8E (S2865) 1458 5004 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond @@ -6924,7 +6946,7 @@ 005d CK804 PCIE Bridge 005e CK804 Memory Controller 1028 0225 PowerEdge T105 Memory Controller - 1043 815a A8N-E Mainboard + 1043 815a A8N Series Mainboard 10de 005e ECS Elitegroup NFORCE3-A939 motherboard. 10f1 2865 Tomcat K8E (S2865) 10f1 2891 Thunder K8SRE Mainboard @@ -7644,6 +7666,7 @@ 0390 G73 [GeForce 7650 GS] 0391 G73 [GeForce 7600 GT] 1458 3427 GV-NX76T128D-RH + 1462 0452 NX7600GT-VT2D256E 0392 G73 [GeForce 7600 GS] 1462 0622 NX7600GS-T2D256EH 0393 G73 [GeForce 7300 GT] @@ -8329,6 +8352,45 @@ 0a76 GT218 [ION 2] 0a78 GT218GL [Quadro FX 380 LP] 0a7a GT218M [GeForce 315M] + 104d 907e GeForce 315M + 1179 fc50 GeForce 315M + 1179 fc61 GeForce 315M + 1179 fc71 GeForce 315M + 1179 fc90 GeForce 315M + 1179 fcc0 GeForce 315M + 1179 fcd0 GeForce 315M + 1179 fce2 GeForce 315M + 1179 fcf2 GeForce 315M + 1179 fd16 GeForce 315M + 1179 fd40 GeForce 315M + 1179 fd50 GeForce 315M + 1179 fd52 GeForce 315M + 1179 fd61 GeForce 315M + 1179 fd71 GeForce 315M + 1179 fd92 GeForce 315M + 1179 fd96 GeForce 315M + 1179 fdd0 GeForce 315M + 1179 fdd2 GeForce 315M + 1179 fdfe GeForce 315M + 144d c0a2 GeForce 315M + 144d c0b2 GeForce 315M + 144d c581 GeForce 315M + 144d c587 GeForce 315M + 144d c588 GeForce 315M + 144d c597 GeForce 315M + 144d c606 GeForce 315M + 1462 aa51 GeForce 405 + 1462 aa58 GeForce 405 + 1462 ac71 GeForce 405 + 1462 ac81 GeForce 315M + 1462 ac82 GeForce 405 + 1462 ae33 GeForce 405 + 17aa 3950 GeForce 405M + 17aa 397d GeForce 405M + 1b0a 2091 GeForce 315M + 1bfd 0003 GeForce 405 + 1bfd 8006 GeForce 405 + 1bfd 8007 GeForce 315M 0a7b GT218 [GeForce 505] 0a7c GT218GLM [Quadro FX 380M] 0a80 MCP79 Host Bridge @@ -8531,6 +8593,7 @@ 0fc2 GK107 [GeForce GT 630 OEM] 0fc6 GK107 [GeForce GTX 650] 1043 8428 GTX650-DC-1GD5 + 0fcd GK107M [GeForce GT 755M] 0fd1 GK107M [GeForce GT 650M] 1043 1597 GeForce GT 650M 1043 15a7 GeForce GT 650M @@ -8548,20 +8611,25 @@ 0fd8 GK107M [GeForce GT 640M Mac Edition] 0fd9 GK107M [GeForce GT 645M] 0fdf GK107M [GeForce GT 740M] - 0fe0 GK107M [GeForce GTX 660M OEM] + 0fe0 GK107M [GeForce GTX 660M Mac Edition] 0fe1 GK107M [GeForce GT 730M] 0fe3 GK107M [GeForce GT 745M] + 17aa 3675 GeForce GT 745A 0fe4 GK107M [GeForce GT 750M] 0fe5 GK107 [GeForce K340 USM] - 0fe6 GK107 [NVS K1 USM] - 0fe7 GRID K1 vGPU + 0fe6 GK107 [GRID K1 NVS USM] +# GRID K1 USM + 0fe7 GK107GL [GRID K100 vGPU] 10de 101e GRID K100 0fef GK107GL [GRID K340] 0ff1 GK107 [NVS 1000] 0ff2 GK107GL [GRID K1] - 0ff5 GK107GL [Tesla K1 USM] - 0ff7 GK107GL [Quadro K1 USM] + 0ff5 GK107GL [GRID K1 Tesla USM] + 0ff6 GK107GLM [Quadro K1100M] +# GRID K1 Quadro USM + 0ff7 GK107GL [GRID K140Q vGPU] 10de 1037 GRID K140Q + 0ff8 GK107GLM [Quadro K500M] 0ff9 GK107GL [Quadro K2000D] 0ffa GK107GL [Quadro K600] 0ffb GK107GLM [Quadro K2000M] @@ -8591,6 +8659,7 @@ 1022 GK110GL [Tesla K20c] 1026 GK110GL [Tesla K20s] 1028 GK110GL [Tesla K20m] + 103a GK110GL [Quadro K6000] 1040 GF119 [GeForce GT 520] 1042 GF119 [GeForce 510] 1048 GF119 [GeForce 605] @@ -8677,8 +8746,15 @@ 1025 077f GeForce 710M 1025 0781 GeForce GT 720M 1025 0798 GeForce GT 720M + 1025 0799 GeForce GT 720M 1025 079b GeForce GT 720M + 1025 079c GeForce GT 720M + 1025 0807 GeForce GT 720M 1025 0821 GeForce GT 720M + 1025 0823 GeForce GT 720M + 1025 0830 GeForce GT 720M + 1025 0837 GeForce GT 720M + 1025 0841 GeForce 710M 1028 054d GeForce GT 630M 1028 054e GeForce GT 630M 1028 0554 GeForce GT 620M @@ -8694,6 +8770,7 @@ 1028 05b3 GeForce GT 625M 1028 05da GeForce GT 630M 1028 05e8 GeForce GT 630M + 1028 05f4 GeForce GT 720M 103c 18ef GeForce GT 630M 103c 18f9 GeForce GT 630M 103c 18fb GeForce GT 630M @@ -8715,6 +8792,10 @@ 1043 21fa GeForce GT 720M 1043 220a GeForce GT 720M 1043 221a GeForce GT 720M + 1043 223a GeForce GT 710M + 1043 224a GeForce GT 710M + 1043 8595 GeForce GT 720M + 10cf 17f5 GeForce GT 720M 1179 fa01 GeForce 710M 1179 fa02 GeForce 710M 1179 fa03 GeForce 710M @@ -8739,6 +8820,7 @@ 1179 fa59 GeForce 710M 1179 fa88 GeForce 710M 1179 fa89 GeForce 710M + 144d b092 GeForce GT 620M 144d c0d5 GeForce GT 630M 144d c0d7 GeForce GT 620M 144d c0e2 NVS 5200M @@ -8749,16 +8831,21 @@ 144d c711 GeForce 710M 1462 10b8 GeForce GT 710M 1462 10e9 GeForce GT 720M + 1462 aa33 GeForce 720M + 1462 aaa2 GeForce GT 720M + 1462 ae71 GeForce GT 720M 152d 0926 GeForce 620M 152d 0982 GeForce GT 630M 152d 0983 GeForce GT 630M 152d 1030 GeForce GT 630M + 152d 1055 GeForce 710M 17aa 2200 NVS 5200M 17aa 3656 GeForce GT 620M 17aa 3800 GeForce GT 720M 17aa 3801 GeForce GT 720M 17aa 3802 GeForce GT 720M 17aa 3803 GeForce GT 720M + 17aa 3804 GeForce GT 720M 17aa 3901 GeForce 610M / GT 620M 17aa 3902 GeForce 710M 17aa 3903 GeForce 610M/710M @@ -8769,14 +8856,20 @@ 17aa 3977 GeForce GT 720M 17aa 3983 GeForce 610M 17aa 5003 GeForce GT 720M + 17aa 5005 GeForce 705M 17aa 500d GeForce GT 620M 17aa 5014 GeForce 710M 17aa 5017 GeForce 710M 17aa 5019 GeForce 710M 17aa 501a GeForce 710M 17aa 501f GeForce GT 720M + 17aa 5025 GeForce 710M 17aa 5027 GeForce 710M 17aa 502a GeForce 710M + 17aa 502b GeForce GT 720M + 17aa 502d GeForce 710M + 17aa 502e GeForce GT 720M + 17aa 502f GeForce GT 720M 1854 0177 GeForce 710M 1854 0180 GeForce 710M 1b0a 20dd GeForce GT 620M @@ -8787,16 +8880,22 @@ 1183 GK104 [GeForce GTX 660 Ti] 1184 GK104 [GeForce GTX 770] 1185 GK104 [GeForce GTX 660 OEM] + 10de 106f GK104 [GeForce GTX 760 OEM] 1187 GK104 [GeForce GTX 760] 1188 GK104 [GeForce GTX 690] 1189 GK104 [GeForce GTX 670] + 10de 1074 GK104 [GeForce GTX 760 Ti OEM] 118a GK104GL [GRID K520] - 118b GK104 [GeForce K2 USM] - 118c GK104 [NVS K2 USM] - 118d GRID K2 vGPU + 118b GK104GL [GRID K2 GeForce USM] + 118c GK104 [GRID K2 NVS USM] +# GRID K2 USM + 118d GK104GL [GRID K200 vGPU] 10de 101d GRID K200 + 118e GK104 [GeForce GTX 760 OEM] 118f GK104GL [Tesla K10] + 1193 GK104 [GeForce GTX 760 Ti OEM] 119d GK104M [GeForce GTX 775M] + 119e GK104M [GeForce GTX 780M] 119f GK104M [GeForce GTX 780M] 11a0 GK104M [GeForce GTX 680M] 11a1 GK104M [GeForce GTX 670MX] @@ -8804,10 +8903,14 @@ 11a3 GK104M [GeForce GTX 680MX] 106b 010d iMac 13,2 11a7 GK104M [GeForce GTX 675MX] - 11b0 GK104GL [Quadro K2 USM] +# GRID K2 Quadro USM + 11b0 GK104GL [GRID K240Q\K260Q vGPU] 10de 101a GRID K240Q 10de 101b GRID K260Q - 11b1 GK104GL [Tesla K2 USM] + 11b1 GK104GL [GRID K2 Tesla USM] + 11b6 GK104GLM [Quadro K3100M] + 11b7 GK104GLM [Quadro K4100M] + 11b8 GK104GLM [Quadro K5100M] 11ba GK104GL [Quadro K5000] 11bb GK104GL [Quadro 4100] 11bc GK104GLM [Quadro K5000M] @@ -8826,11 +8929,14 @@ 10de 1030 GeForce GTX 650 Ti OEM 11c4 GK106 [GeForce GTX 645 OEM] 11c6 GK106 [GeForce GTX 650 Ti] + 11c7 GK106 [GeForce GTX 750 Ti] + 11c8 GK106 [GeForce GTX 650 OEM] 11e0 GK106M [GeForce GTX 770M] 11e1 GK106M [GeForce GTX 765M] 11e2 GK106M [GeForce GTX 765M] 11e3 GK106M [GeForce GTX 760M] 11fa GK106GL [Quadro K4000] + 11fc GK106GLM [Quadro K2100M] 1200 GF114 [GeForce GTX 560 Ti] 1201 GF114 [GeForce GTX 560] 1202 GF114 [GeForce GTX 560 Ti OEM] @@ -8855,10 +8961,25 @@ 1043 212a GeForce GT 635M 1043 212b GeForce GT 635M 1043 212c GeForce GT 635M - 1248 GF116M [GeForce GT 555M] + 152d 0930 GeForce GT 635M + 1248 GF116M [GeForce GT 555M/635M] + 152d 0930 GeForce GT 635M + 17c0 10e7 GeForce GT 555M + 17c0 10e8 GeForce GT 555M + 17c0 10ea GeForce GT 555M + 1854 0890 GeForce GT 555M + 1854 0891 GeForce GT 555M + 1854 1795 GeForce GT 555M + 1854 1796 GeForce GT 555M + 1854 3005 GeForce GT 555M 1249 GF116 [GeForce GTS 450 Rev. 3] 124b GF116 [GeForce GT 640 OEM] 124d GF116M [GeForce GT 555M/635M] + 1028 0491 GeForce GT 555M + 1028 0570 GeForce GT 555M + 1028 0571 GeForce GT 555M + 1462 108d GeForce GT 555M + 1462 10cc GeForce GT 635M 1251 GF116M [GeForce GT 560M] 1280 GK208 [GeForce GT 635] 1282 GK208 [GeForce GT 640 Rev. 2] @@ -8870,9 +8991,15 @@ 1043 13cd GeForce GT 730M 1291 GK208M [GeForce GT 735M] 1292 GK208M [GeForce GT 740M] + 17aa 3675 GeForce GT 740A + 17aa 3684 GeForce GT 740A 1293 GK208M [GeForce GT 730M] 1294 GK208M [GeForce GT 740M] + 1295 GK208M [GeForce 710M] + 1298 GK208M [GeForce GT 720M] 12a0 GK208 + 12b9 GK208GLM [Quadro K610M] + 12ba GK208GLM [Quadro K510M] 10df Emulex Corporation 0720 OneConnect NIC (Skyhawk) 0722 OneConnect iSCSI Initiator (Skyhawk) @@ -9019,6 +9146,7 @@ 0892 Realtek 892 High Definition Audio 5209 RTS5209 PCI Express Card Reader 5229 RTS5229 PCI Express Card Reader + 1025 0813 Aspire R7-571 5288 Barossa PCI Express Card Reader 8029 RTL-8029(AS) 10b8 2011 EZ-Card (SMC1208) @@ -9029,7 +9157,7 @@ 1af4 1100 Qemu virtual machine 8129 RTL-8129 10ec 8129 RT8129 Fast Ethernet Adapter - 11ec 8129 RT8129 Fast Ethernet Adapter + 11ec 8129 RTL8111/8168 PCIe Gigabit Ethernet (misconfigured) 8136 RTL8101E/RTL8102E PCI Express Fast Ethernet controller 103c 2ab1 Pavillion p6774 103c 30cc Pavilion dv6700 @@ -10497,6 +10625,9 @@ 1137 0048 VIC M81KR Mezzanine FCoE HBA 1137 004f VIC 1280 Mezzanine FCoE HBA 004e VIC 82 PCIe Upstream Port + 0071 VIC SR-IOV VF + 0084 VIC 1240 MLOM FCoE HBA + 0085 VIC 1225 PCIe FCOE HBA 00cf VIC Userspace NIC 1138 Ziatech Corporation 8905 8905 [STD 32 Bridge] @@ -10885,6 +11016,7 @@ 0617 ToPIC100 PCI to Cardbus Bridge with ZV Support 0618 CPU to PCI and PCI to ISA bridge 0701 FIR Port Type-O + 0803 TC6371AF SD Host Controller 0804 TC6371AF SmartMedia Controller 0805 SD TypA Controller 0d01 FIR Port Type-DO @@ -10926,6 +11058,7 @@ 14ef 0220 PCD-RP-220S 17aa 201c ThinkPad X60s 17aa 20c4 ThinkPad T61 + 17aa 20c6 ThinkPad R61 0477 RL5c477 0478 RL5c478 1014 0184 ThinkPad A30p @@ -10989,6 +11122,7 @@ 103c 30c1 Compaq 6910p 103c 30cc Pavilion dv6700 103c 30cf Pavilion dv9668eg Laptop + 17aa 20c7 ThinkPad R61 0841 R5C841 CardBus/SD/SDIO/MMC/MS/MSPro/xD/IEEE1394 0843 R5C843 MMC Host Controller 1025 0121 Aspire 5920G @@ -11172,7 +11306,10 @@ 2a2b 88W8687 [TopDog] 802.11b/g Wireless 2a30 88W8687 [TopDog] 802.11b/g Wireless 2a40 88W8366 [TopDog] 802.11n Wireless + 2a41 88W8366 [TopDog] 802.11n Wireless + 2a42 88W8366 [TopDog] 802.11n Wireless 2a43 88W8366 [TopDog] 802.11n Wireless + 2b36 88W8764 [Avastar] 802.11n Wireless 4101 OLPC Cafe Controller Secure Digital Controller 4320 88E8001 Gigabit Ethernet Controller 1019 0f38 Marvell 88E8001 Gigabit Ethernet Controller (ECS) @@ -11915,9 +12052,15 @@ 0002 EasyConnect 8/64 0003 EasyIO 123e Simutech, Inc. -123f C-Cube Microsystems +# nee C-Cube Microsystems / acquired by Magnum Semiconductor +123f LSI Logic 00e4 MPEG - 8120 E4? + 8120 DVxplore Codec + 10de 01e1 NVTV PAL + 10de 01e2 NVTV NTSC + 10de 01e3 NVTV PAL + 10de 0248 NVTV NTSC + 10de 0249 NVTV PAL 11bd 0006 DV500 E4 11bd 000a DV500 E4 11bd 000f DV500 E4 @@ -12110,6 +12253,7 @@ 0510 SM501 VoyagerGX Rev. B 0710 SM710 LynxEM 0712 SM712 LynxEM+ + 0718 SM718 LynxSE+ 0720 SM720 Lynx3DM 0730 SM731 Cougar3DR 0810 SM810 LynxE @@ -12625,6 +12769,7 @@ 122d 1002 AU8820 Vortex Digital Audio Processor 12eb 0001 AU8820 Vortex Digital Audio Processor 5053 3355 Montego + 50b2 1111 XLerate 0002 Vortex 2 104d 8049 AU8830 Vortex 3D Digital Audio Processor 104d 807b AU8830 Vortex 3D Digital Audio Processor @@ -13666,6 +13811,7 @@ 4085 T420-4085 SFP+ Unified Wire Ethernet Controller 4086 T440-4086 10Gbase-T Unified Wire Ethernet Controller 4087 T440T-4087 Unified Wire Ethernet Controller + 4088 T440-4088 Unified Wire Ethernet Controller 4401 T420-CR Unified Wire Ethernet Controller 4402 T422-CR Unified Wire Ethernet Controller 4403 T440-CR Unified Wire Ethernet Controller @@ -13689,6 +13835,7 @@ 4485 T420-4085 SFP+ Unified Wire Ethernet Controller 4486 T440-4086 10Gbase-T Unified Wire Ethernet Controller 4487 T440T-4087 Unified Wire Ethernet Controller + 4488 T440-4088 Unified Wire Ethernet Controller 4501 T420-CR Unified Wire Storage Controller 4502 T422-CR Unified Wire Storage Controller 4503 T440-CR Unified Wire Storage Controller @@ -13712,6 +13859,7 @@ 4585 T420-4085 SFP+ Unified Wire Storage Controller 4586 T440-4086 10Gbase-T Unified Wire Storage Controller 4587 T440T-4087 Unified Wire Storage Controller + 4588 T440-4088 Unified Wire Storage Controller 4601 T420-CR Unified Wire Storage Controller 4602 T422-CR Unified Wire Storage Controller 4603 T440-CR Unified Wire Storage Controller @@ -13735,6 +13883,7 @@ 4685 T420-4085 SFP+ Unified Wire Storage Controller 4686 T440-4086 10Gbase-T Unified Wire Storage Controller 4687 T440T-4087 Unified Wire Storage Controller + 4688 T440-4088 Unified Wire Storage Controller 4701 T420-CR Unified Wire Ethernet Controller 4702 T422-CR Unified Wire Ethernet Controller 4703 T440-CR Unified Wire Ethernet Controller @@ -13758,6 +13907,7 @@ 4785 T420-4085 SFP+ Unified Wire Ethernet Controller 4786 T440-4086 10Gbase-T Unified Wire Ethernet Controller 4787 T440T-4087 Unified Wire Ethernet Controller + 4788 T440-4088 Unified Wire Ethernet Controller 4801 T420-CR Unified Wire Ethernet Controller 4802 T422-CR Unified Wire Ethernet Controller 4803 T440-CR Unified Wire Ethernet Controller @@ -13781,6 +13931,7 @@ 4885 T420-4085 SFP+ Unified Wire Ethernet Controller 4886 T440-4086 10Gbase-T Unified Wire Ethernet Controller 4887 T440T-4087 Unified Wire Ethernet Controller + 4888 T440-4088 Unified Wire Ethernet Controller 5001 T520-CR Unified Wire Ethernet Controller 5002 T522-CR Unified Wire Ethernet Controller 5003 T540-CR Unified Wire Ethernet Controller @@ -13800,6 +13951,9 @@ 5011 T520-LL-CR Unified Wire Ethernet Controller 5012 T560-CR Unified Wire Ethernet Controller 5013 T580-CR Unified Wire Ethernet Controller + 5014 T580-LP-SO-CR Unified Wire Ethernet Controller + 5080 T540-5080 Unified Wire Ethernet Controller + 5081 T540-5081 Unified Wire Ethernet Controller 5401 T520-CR Unified Wire Ethernet Controller 5402 T522-CR Unified Wire Ethernet Controller 5403 T540-CR Unified Wire Ethernet Controller @@ -13819,6 +13973,9 @@ 5411 T520-LL-CR Unified Wire Ethernet Controller 5412 T560-CR Unified Wire Ethernet Controller 5413 T580-CR Unified Wire Ethernet Controller + 5414 T580-LP-SO-CR Unified Wire Ethernet Controller + 5480 T540-5080 Unified Wire Ethernet Controller + 5481 T540-5081 Unified Wire Ethernet Controller 5501 T520-CR Unified Wire Storage Controller 5502 T522-CR Unified Wire Storage Controller 5503 T540-CR Unified Wire Storage Controller @@ -13838,6 +13995,9 @@ 5511 T520-LL-CR Unified Wire Storage Controller 5512 T560-CR Unified Wire Storage Controller 5513 T580-CR Unified Wire Storage Controller + 5514 T580-LP-SO-CR Unified Wire Storage Controller + 5580 T540-5080 Unified Wire Storage Controller + 5581 T540-5081 Unified Wire Storage Controller 5601 T520-CR Unified Wire Storage Controller 5602 T522-CR Unified Wire Storage Controller 5603 T540-CR Unified Wire Storage Controller @@ -13857,6 +14017,9 @@ 5611 T520-LL-CR Unified Wire Storage Controller 5612 T560-CR Unified Wire Storage Controller 5613 T580-CR Unified Wire Storage Controller + 5614 T580-LP-SO-CR Unified Wire Storage Controller + 5680 T540-5080 Unified Wire Storage Controller + 5681 T540-5081 Unified Wire Storage Controller 5701 T520-CR Unified Wire Ethernet Controller 5702 T522-CR Unified Wire Ethernet Controller 5703 T540-CR Unified Wire Ethernet Controller @@ -13876,6 +14039,9 @@ 5711 T520-LL-CR Unified Wire Ethernet Controller 5712 T560-CR Unified Wire Ethernet Controller 5713 T580-CR Unified Wire Ethernet Controller + 5714 T580-LP-SO-CR Unified Wire Ethernet Controller + 5780 T540-5080 Unified Wire Ethernet Controller + 5781 T540-5081 Unified Wire Ethernet Controller 5801 T520-CR Unified Wire Ethernet Controller 5802 T522-CR Unified Wire Ethernet Controller 5803 T540-CR Unified Wire Ethernet Controller @@ -13895,6 +14061,9 @@ 5811 T520-LL-CR Unified Wire Ethernet Controller 5812 T560-CR Unified Wire Ethernet Controller 5813 T580-CR Unified Wire Ethernet Controller + 5814 T580-LP-SO-CR Unified Wire Ethernet Controller + 5880 T540-5080 Unified Wire Ethernet Controller + 5881 T540-5081 Unified Wire Ethernet Controller a000 PE10K Unified Wire Ethernet Controller 1426 Storage Technology Corp. 1427 Better On-Line Solutions @@ -14519,6 +14688,7 @@ 16af NetXtreme II BCM57810 10 Gigabit Ethernet Virtual Function 16b0 NetXtreme BCM57761 Gigabit Ethernet PCIe 16b1 NetLink BCM57781 Gigabit Ethernet PCIe + 1849 96b1 Z77 Extreme4 motherboard 16b2 NetLink BCM57791 Gigabit Ethernet PCIe 16b3 NetXtreme BCM57786 Gigabit Ethernet PCIe 16b4 NetXtreme BCM57765 Gigabit Ethernet PCIe @@ -14764,7 +14934,7 @@ 4712 BCM47xx V.92 56k modem 4713 Sentry5 Ethernet Controller 4714 BCM47xx Sentry5 External Interface - 4715 Sentry5 USB Controller + 4715 BCM47xx Sentry5 USB / Ethernet Controller 4716 BCM47xx Sentry5 USB Host Controller 4717 BCM47xx Sentry5 USB Device Controller 4718 Sentry5 Crypto Accelerator @@ -14862,6 +15032,7 @@ 1054 HCF 56k Data/Fax/Voice Modem (Worldwide) 1055 HCF 56k Data/Fax/Voice/Spkp (w/Handset) Modem (Worldwide) 1056 HCF 56k Data/Fax/Voice/Spkp Modem (Worldwide) + 122d 4035 MDP3900V-W 1057 HCF 56k Data/Fax/Voice/Spkp Modem (Worldwide) 1059 HCF 56k Data/Fax/Voice Modem (Worldwide) 1063 HCF 56k Data/Fax Modem @@ -15270,7 +15441,9 @@ 1553 CHICONY Electronics Co Ltd 1554 PROLINK Microsystems Corp 1555 GESYTEC GmBH -1556 PLD APPLICATIONS +1556 PLDA + 1100 PCI Express Core Reference Design + 110f PCI Express Core Reference Design Virtual Function 1557 MEDIASTAR Co Ltd 1558 CLEVO/KAPOK Computer 1559 SI LOGIC Ltd @@ -15437,6 +15610,8 @@ 1014 MT27621 Family 1015 MT27630 Family 1016 MT27631 Family + 1017 MT27640 Family + 1018 MT27641 Family 5274 MT21108 InfiniBridge 5a44 MT23108 InfiniHost 5a45 MT23108 [Infinihost HCA Flash Recovery] @@ -15612,10 +15787,14 @@ 0620 FarSync T2U (2 port X.21/V.35/V.24) 0640 FarSync T4U (4 port X.21/V.35/V.24) 1610 FarSync TE1 (T1,E1) + 1612 FarSync TE1 PCI Express (T1,E1) 2610 FarSync DSL-S1 (SHDSL) 3640 FarSync T4E (4-port X.21/V.35/V.24) 4620 FarSync T2Ue PCI Express (2-port X.21/V.35/V.24) 4640 FarSync T4Ue PCI Express (4-port X.21/V.35/V.24) + 5621 FarSync T2Ee PCI Express (2 port X.21/V.35/V.24) + 5641 FarSync T4Ee PCI Express (4 port X.21/V.35/V.24) + 6620 FarSync T2U-PMC PCI Express (2 port X.21/V.35/V.24) 161f Rioworks 1626 TDK Semiconductor Corp. 8410 RTL81xx Fast Ethernet @@ -15645,16 +15824,20 @@ 103c 1743 HP 81B 8Gbps single port FC HBA 1657 0014 415/815 4Gbps/8Gbps single port PCIe FC HBA 0021 804 8Gbps FC HBA for HP Bladesystem c-class - 0022 1867/1860: 16Gbps/10Gbps Fabric Adapter +# AnyIO Adapter + 0022 1860 16Gbps/10Gbps Fabric Adapter 1657 0022 10Gbps CNA - FCOE 1657 0023 10Gbps CNA - LL 1657 0024 16Gbps FC HBA +# Mezz card for IBM + 0023 1867/1869 16Gbps FC HBA # Same Device_ID used for 410 (1port) and 420 (2 port) HBAs. 0646 400 4Gbps PCIe FC HBA 165a Epix Inc c100 PIXCI(R) CL1 Camera Link Video Capture Board [custom QL5232] d200 PIXCI(R) D2X Digital Video Capture Board [custom QL5232] d300 PIXCI(R) D3X Digital Video Capture Board [custom QL5232] + eb01 PIXCI(R) EB1 PCI Camera Link Video Capture Board 165d Hsing Tech. Enterprise Co., Ltd. 165f Linux Media Labs, LLC 1020 LMLM4 MPEG-4 encoder @@ -16067,6 +16250,8 @@ 175c AudioScience Inc 175e Sanera Systems, Inc. 1760 TEDIA spol. s r. o. + 0101 PCD-7004 Digital Bi-Directional Ports PCI Card + 0102 PCD-7104 Digital Input & Output PCI Card 1771 InnoVISION Multimedia Ltd. # nee SBS Technologies 1775 GE Intelligent Platforms @@ -16429,6 +16614,7 @@ 18d8 Dialogue Technology Corp. 18dd Artimi Inc 4c6f Artimi RTMI-100 UWB adapter +18df LeWiz Communications 18e6 MPL AG 0001 OSCI [Octal Serial Communication Interface] 18eb Advance Multimedia Internet Technology, Inc. @@ -16551,6 +16737,8 @@ 0025 SuperFSCC/4-LVDS Serial PCI Adapter [Fastcom] # RS-644 Only, Software UARTs 0026 SuperFSCC-LVDS Serial PCI Adapter [Fastcom] +# Software UARTs + 0027 FSCC/4 Serial PCIe Adapter [Fastcom] 18fb Resilience Corporation 1904 Hangzhou Silan Microelectronics Co., Ltd. 2031 SC92031 PCI Fast Ethernet Adapter @@ -16638,6 +16826,9 @@ 1924 6904 SFN5111T-R4 10GBASE-T Server Adapter 1924 7104 SFN5161T-R4 10GBASE-T Server Adapter 1924 7904 SFN5151T-R4 10GBASE-T Server Adapter + 0903 SFC9120 + 1924 8002 SFN7122F-R1 SFP+ Server Adapter + 1924 8006 SFN7022F-R1 SFP+ Server Adapter 1803 SFC9020 Virtual Function [Solarstorm] 1813 SFL9021 Virtual Function [Solarstorm] 6703 SFC4000 rev A iSCSI/Onload [Solarstorm] @@ -16938,6 +17129,7 @@ 1000 MCOR Power Supply Controller 1010 AMC EVR - Stockholm Timing Board 2000 PGPCard - 4 Lane + 2001 PGPCard - 8 Lane Plus EVR 2010 PCI-Express EVR 1a51 Hectronic AB 1a55 Rohde & Schwarz DVS GmbH @@ -17054,8 +17246,11 @@ 1b21 ASMedia Technology Inc. 0611 ASM1061 SATA IDE Controller 0612 ASM1062 Serial ATA Controller + 1849 0612 Motherboard 1042 ASM1042 SuperSpeed USB Host Controller + 1849 1042 Motherboard 1080 ASM1083/1085 PCIe to PCI Bridge + 1849 1080 Motherboard 1b2c Opal-RT Technologies Inc. 1b36 Red Hat, Inc. 1b37 Signal Processing Devices Sweden AB @@ -17082,10 +17277,11 @@ 9172 88SE9172 SATA 6Gb/s Controller 917a 88SE9172 SATA III 6Gb/s RAID Controller 9192 88SE9172 SATA III 6Gb/s RAID Controller - 91a0 88SE91A0 SATA 6Gb/s Controller + 91a0 88SE912x SATA 6Gb/s Controller [IDE mode] 91a4 88SE912x IDE Controller 9230 88SE9230 PCIe SATA 6Gb/s Controller 9480 88SE9480 SAS/SATA 6Gb/s RAID controller + 9485 88SE9485 SAS/SATA 6Gb/s controller 1b55 NetUP Inc. 2a2c Dual DVB-S2-CI card e2e4 Dual DVB-T/C-CI RF card @@ -17129,6 +17325,7 @@ 0003 MAX3 0004 MAX4 1bf4 VTI Instruments Corporation +1bfd EeeTOP 1c1c Symphony 0001 82C101 1c2c Fiberblaze @@ -17145,6 +17342,11 @@ 1c8a TSF5 Corporation 0001 Hunter PCI Express 1cb1 Collion UG & Co.KG +1cc5 Embedded Intelligence, Inc. + 0100 CAN-PCIe-02 +1ce4 Exablaze + 0001 ExaNIC X4 + 0002 ExaNIC X2 1d44 DPT a400 PM2x24/PM3224 1d5c Fantasia Trading LLC @@ -17525,7 +17727,6 @@ 5053 Voyetra Technologies 2010 Daytona Audio Adapter 50b2 TerraTec Electronic GmbH - 1111 Terratec XLerate 5136 S S Technologies 5143 Qualcomm Inc 5145 Ensoniq (Old) @@ -17728,6 +17929,10 @@ 1025 16 photo couple 16 relay Card 4000 WatchDog Card 6688 Zycoo Co., Ltd + 1200 CooVOX TDM Analog Module + 1400 CooVOX TDM GSM Module + 1600 CooVOX TDM E1/T1 Module + 1800 CooVOX TDM BRI Module # nee Qumranet 6900 Red Hat, Inc. 7063 pcHDTV @@ -17848,6 +18053,7 @@ 1028 04cc Vostro 3350 0150 Xeon E3-1200 v2/3rd Gen Core processor DRAM Controller 1043 84ca P8H77-I Motherboard + 1849 0150 Motherboard 0151 Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port 1043 1477 N56VZ 1043 84ca P8H77-I Motherboard @@ -17856,6 +18062,7 @@ 0153 3rd Gen Core Processor Thermal Subsystem 1043 1517 Zenbook Prime UX31A 0154 3rd Gen Core processor DRAM Controller + 1025 0813 Aspire R7-571 103c 17f6 ProBook 4540s 1043 1477 N56VZ 1043 1517 Zenbook Prime UX31A @@ -17868,6 +18075,7 @@ 015d Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port 015e Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller 0162 Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller + 1849 0162 Motherboard 0166 3rd Gen Core processor Graphics Controller 1043 1517 Zenbook Prime UX31A 1043 2103 N56VZ @@ -18204,122 +18412,137 @@ 0d16 Crystal Well Integrated Graphics Controller 0d26 Crystal Well Integrated Graphics Controller 0d36 Crystal Well Integrated Graphics Controller - 0e00 Ivytown DMI2 - 0e01 Ivytown PCI Express Root Port in DMI2 Mode - 0e02 Ivytown PCI Express Root Port 1a - 0e03 Ivytown PCI Express Root Port 1b - 0e04 Ivytown PCI Express Root Port 2a - 0e05 Ivytown PCI Express Root Port 2b - 0e06 Ivytown PCI Express Root Port 2c - 0e07 Ivytown PCI Express Root Port 2d - 0e08 Ivytown PCI Express Root Port 3a - 0e09 Ivytown PCI Express Root Port 3b - 0e0a Ivytown PCI Express Root Port 3c - 0e0b Ivytown PCI Express Root Port 3d - 0e1c Ivytown Debug and Error Injection Related Registers - 0e1d Ivytown R2PCIe - 0e1e Ivytown Semaphore and Scratchpad Configuration Registers - 0e1f Ivytown Semaphore and Scratchpad Configuration Registers - 0e20 Ivytown Crystal Beach DMA Channel 0 - 0e21 Ivytown Crystal Beach DMA Channel 1 - 0e22 Ivytown Crystal Beach DMA Channel 2 - 0e23 Ivytown Crystal Beach DMA Channel 3 - 0e24 Ivytown Crystal Beach DMA Channel 4 - 0e25 Ivytown Crystal Beach DMA Channel 5 - 0e26 Ivytown Crystal Beach DMA Channel 6 - 0e27 Ivytown Crystal Beach DMA Channel 7 - 0e28 Ivytown VTd/Memory Map/Misc - 0e29 Ivytown Memory Hotplug - 0e2a Ivytown IIO RAS - 0e2c Ivytown IOAPIC - 0e2e Ivytown CBDMA - 0e2f Ivytown CBDMA - 0e30 Ivytown Home Agent 0 - 0e32 Ivytown QPI Link 0 - 0e33 Ivytown QPI Link 1 - 0e34 Ivytown PCI Express Ring Performance Monitoring - 0e36 Ivytown QPI Ring Performance Ring Monitoring - 0e37 Ivytown QPI Ring Performance Ring Monitoring - 0e38 Ivytown Home Agent 1 - 0e3a Ivytown QPI Link 2 - 0e3e Ivytown QPI Ring Performance Ring Monitoring - 0e3f Ivytown QPI Ring Performance Ring Monitoring - 0e40 Ivytown QPI Link 2 - 0e41 Ivytown QPI Ring Registers - 0e43 Ivytown QPI Link Reut 2 - 0e44 Ivytown QPI Link Reut 2 - 0e60 Ivytown Home Agent 1 - 0e68 Ivytown Integrated Memory Controller 1 Target Address/Thermal Registers - 0e6a Ivytown Integrated Memory Controller 1 Channel Target Address Decoder Registers - 0e6b Ivytown Integrated Memory Controller 1 Channel Target Address Decoder Registers - 0e6c Ivytown Integrated Memory Controller 1 Channel Target Address Decoder Registers - 0e6d Ivytown Integrated Memory Controller 1 Channel Target Address Decoder Registers - 0e71 Ivytown Integrated Memory Controller 0 RAS Registers - 0e79 Ivytown Integrated Memory Controller 1 RAS Registers - 0e80 Ivytown QPI Link 0 - 0e81 Ivytown QPI Ring Registers - 0e83 Ivytown QPI Link Reut 0 - 0e84 Ivytown QPI Link Reut 0 - 0e90 Ivytown QPI Link 1 - 0e93 Ivytown QPI Link 1 - 0e94 Ivytown QPI Link Reut 1 - 0ea0 Ivytown Home Agent 0 - 0ea8 Ivytown Integrated Memory Controller 0 Target Address/Thermal Registers - 0eaa Ivytown Integrated Memory Controller 0 Channel Target Address Decoder Registers - 0eab Ivytown Integrated Memory Controller 0 Channel Target Address Decoder Registers - 0eac Ivytown Integrated Memory Controller 0 Channel Target Address Decoder Registers - 0ead Ivytown Integrated Memory Controller 0 Channel Target Address Decoder Registers - 0eb0 Ivytown Integrated Memory Controller 1 Channel 0-3 Thermal Control 0 - 0eb1 Ivytown Integrated Memory Controller 1 Channel 0-3 Thermal Control 1 - 0eb2 Ivytown Integrated Memory Controller 1 Channel 0-3 ERROR Registers 0 - 0eb3 Ivytown Integrated Memory Controller 1 Channel 0-3 ERROR Registers 1 - 0eb4 Ivytown Integrated Memory Controller 1 Channel 0-3 Thermal Control 2 - 0eb5 Ivytown Integrated Memory Controller 1 Channel 0-3 Thermal Control 3 - 0eb6 Ivytown Integrated Memory Controller 1 Channel 0-3 ERROR Registers 2 - 0eb7 Ivytown Integrated Memory Controller 1 Channel 0-3 ERROR Registers 3 - 0ec0 Ivytown Power Control Unit 0 - 0ec1 Ivytown Power Control Unit 1 - 0ec2 Ivytown Power Control Unit 2 - 0ec3 Ivytown Power Control Unit 3 - 0ec4 Ivytown Power Control Unit 4 - 0ec8 Ivytown System Address Decoder - 0ec9 Ivytown Broadcast Registers - 0eca Ivytown Broadcast Registers - 0ed8 Ivytown DDRIO - 0ed9 Ivytown DDRIO - 0edc Ivytown DDRIO - 0edd Ivytown DDRIO - 0ede Ivytown DDRIO - 0edf Ivytown DDRIO - 0ee0 Ivytown Unicast Registers - 0ee1 Ivytown Unicast Registers - 0ee2 Ivytown Unicast Registers - 0ee3 Ivytown Unicast Registers - 0ee4 Ivytown Unicast Registers - 0ee5 Ivytown Unicast Registers - 0ee6 Ivytown Unicast Registers - 0ee7 Ivytown Unicast Registers - 0ee8 Ivytown Unicast Registers - 0ee9 Ivytown Unicast Registers - 0eea Ivytown Unicast Registers - 0eeb Ivytown Unicast Registers - 0eec Ivytown Unicast Registers - 0eed Ivytown Unicast Registers - 0eee Ivytown Unicast Registers - 0ef0 Ivytown Integrated Memory Controller 0 Channel 0-3 Thermal Control 0 - 0ef1 Ivytown Integrated Memory Controller 0 Channel 0-3 Thermal Control 1 - 0ef2 Ivytown Integrated Memory Controller 0 Channel 0-3 ERROR Registers 0 - 0ef3 Ivytown Integrated Memory Controller 0 Channel 0-3 ERROR Registers 1 - 0ef4 Ivytown Integrated Memory Controller 0 Channel 0-3 Thermal Control 2 - 0ef5 Ivytown Integrated Memory Controller 0 Channel 0-3 Thermal Control 3 - 0ef6 Ivytown Integrated Memory Controller 0 Channel 0-3 ERROR Registers 2 - 0ef7 Ivytown Integrated Memory Controller 0 Channel 0-3 ERROR Registers 3 - 0ef8 Ivytown DDRIO - 0ef9 Ivytown DDRIO - 0efa Ivytown DDRIO - 0efb Ivytown DDRIO - 0efc Ivytown DDRIO - 0efd Ivytown DDRIO + 0e00 Xeon E5 v2/Core i7 DMI2 + 0e01 Xeon E5 v2/Core i7 PCI Express Root Port in DMI2 Mode + 0e02 Xeon E5 v2/Core i7 PCI Express Root Port 1a + 0e03 Xeon E5 v2/Core i7 PCI Express Root Port 1b + 0e04 Xeon E5 v2/Core i7 PCI Express Root Port 2a + 0e05 Xeon E5 v2/Core i7 PCI Express Root Port 2b + 0e06 Xeon E5 v2/Core i7 PCI Express Root Port 2c + 0e07 Xeon E5 v2/Core i7 PCI Express Root Port 2d + 0e08 Xeon E5 v2/Core i7 PCI Express Root Port 3a + 0e09 Xeon E5 v2/Core i7 PCI Express Root Port 3b + 0e0a Xeon E5 v2/Core i7 PCI Express Root Port 3c + 0e0b Xeon E5 v2/Core i7 PCI Express Root Port 3d + 0e10 Xeon E5 v2/Core i7 IIO Configuration Registers + 0e13 Xeon E5 v2/Core i7 IIO Configuration Registers + 0e17 Xeon E5 v2/Core i7 IIO Configuration Registers + 0e18 Xeon E5 v2/Core i7 IIO Configuration Registers + 0e1c Xeon E5 v2/Core i7 IIO Configuration Registers + 0e1d Xeon E5 v2/Core i7 R2PCIe + 0e1e Xeon E5 v2/Core i7 UBOX Registers + 0e1f Xeon E5 v2/Core i7 UBOX Registers + 0e20 Xeon E5 v2/Core i7 Crystal Beach DMA Channel 0 + 0e21 Xeon E5 v2/Core i7 Crystal Beach DMA Channel 1 + 0e22 Xeon E5 v2/Core i7 Crystal Beach DMA Channel 2 + 0e23 Xeon E5 v2/Core i7 Crystal Beach DMA Channel 3 + 0e24 Xeon E5 v2/Core i7 Crystal Beach DMA Channel 4 + 0e25 Xeon E5 v2/Core i7 Crystal Beach DMA Channel 5 + 0e26 Xeon E5 v2/Core i7 Crystal Beach DMA Channel 6 + 0e27 Xeon E5 v2/Core i7 Crystal Beach DMA Channel 7 + 0e28 Xeon E5 v2/Core i7 VTd/Memory Map/Misc + 0e29 Xeon E5 v2/Core i7 Memory Hotplug + 0e2a Xeon E5 v2/Core i7 IIO RAS + 0e2c Xeon E5 v2/Core i7 IOAPIC + 0e2e Xeon E5 v2/Core i7 CBDMA + 0e2f Xeon E5 v2/Core i7 CBDMA + 0e30 Xeon E5 v2/Core i7 Home Agent 0 + 0e32 Xeon E5 v2/Core i7 QPI Link 0 + 0e33 Xeon E5 v2/Core i7 QPI Link 1 + 0e34 Xeon E5 v2/Core i7 R2PCIe + 0e36 Xeon E5 v2/Core i7 QPI Ring Performance Ring Monitoring + 0e37 Xeon E5 v2/Core i7 QPI Ring Performance Ring Monitoring + 0e38 Xeon E5 v2/Core i7 Home Agent 1 + 0e3a Xeon E5 v2/Core i7 QPI Link 2 + 0e3e Xeon E5 v2/Core i7 QPI Ring Performance Ring Monitoring + 0e3f Xeon E5 v2/Core i7 QPI Ring Performance Ring Monitoring + 0e40 Xeon E5 v2/Core i7 QPI Link 2 + 0e41 Xeon E5 v2/Core i7 QPI Ring Registers + 0e43 Xeon E5 v2/Core i7 QPI Link Reut 2 + 0e44 Xeon E5 v2/Core i7 QPI Link Reut 2 + 0e60 Xeon E5 v2/Core i7 Home Agent 1 + 0e68 Xeon E5 v2/Core i7 Integrated Memory Controller 1 Target Address/Thermal Registers + 0e6a Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder Registers + 0e6b Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder Registers + 0e6c Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder Registers + 0e6d Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel Target Address Decoder Registers + 0e71 Xeon E5 v2/Core i7 Integrated Memory Controller 0 RAS Registers + 0e74 Xeon E5 v2/Core i7 R2PCIe + 0e75 Xeon E5 v2/Core i7 R2PCIe + 0e77 Xeon E5 v2/Core i7 QPI Ring Registers + 0e79 Xeon E5 v2/Core i7 Integrated Memory Controller 1 RAS Registers + 0e7d Xeon E5 v2/Core i7 UBOX Registers + 0e7f Xeon E5 v2/Core i7 QPI Ring Registers + 0e80 Xeon E5 v2/Core i7 QPI Link 0 + 0e81 Xeon E5 v2/Core i7 QPI Ring Registers + 0e83 Xeon E5 v2/Core i7 QPI Link Reut 0 + 0e84 Xeon E5 v2/Core i7 QPI Link Reut 0 + 0e87 Xeon E5 v2/Core i7 QPI Registers + 0e90 Xeon E5 v2/Core i7 QPI Link 1 + 0e93 Xeon E5 v2/Core i7 QPI Link 1 + 0e94 Xeon E5 v2/Core i7 QPI Link Reut 1 + 0ea0 Xeon E5 v2/Core i7 Home Agent 0 + 0ea8 Xeon E5 v2/Core i7 Integrated Memory Controller 0 Target Address/Thermal Registers + 0eaa Xeon E5 v2/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder Registers + 0eab Xeon E5 v2/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder Registers + 0eac Xeon E5 v2/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder Registers + 0ead Xeon E5 v2/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder Registers + 0eae Xeon E5 v2/Core i7 DDRIO Registers + 0eaf Xeon E5 v2/Core i7 DDRIO Registers + 0eb0 Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel 0-3 Thermal Control 0 + 0eb1 Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel 0-3 Thermal Control 1 + 0eb2 Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel 0-3 ERROR Registers 0 + 0eb3 Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel 0-3 ERROR Registers 1 + 0eb4 Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel 0-3 Thermal Control 2 + 0eb5 Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel 0-3 Thermal Control 3 + 0eb6 Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel 0-3 ERROR Registers 2 + 0eb7 Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel 0-3 ERROR Registers 3 + 0ebc Xeon E5 v2/Core i7 DDRIO Registers + 0ebe Xeon E5 v2/Core i7 DDRIO Registers + 0ebf Xeon E5 v2/Core i7 DDRIO Registers + 0ec0 Xeon E5 v2/Core i7 Power Control Unit 0 + 0ec1 Xeon E5 v2/Core i7 Power Control Unit 1 + 0ec2 Xeon E5 v2/Core i7 Power Control Unit 2 + 0ec3 Xeon E5 v2/Core i7 Power Control Unit 3 + 0ec4 Xeon E5 v2/Core i7 Power Control Unit 4 + 0ec8 Xeon E5 v2/Core i7 System Address Decoder + 0ec9 Xeon E5 v2/Core i7 Broadcast Registers + 0eca Xeon E5 v2/Core i7 Broadcast Registers + 0ed8 Xeon E5 v2/Core i7 DDRIO + 0ed9 Xeon E5 v2/Core i7 DDRIO + 0edc Xeon E5 v2/Core i7 DDRIO + 0edd Xeon E5 v2/Core i7 DDRIO + 0ede Xeon E5 v2/Core i7 DDRIO + 0edf Xeon E5 v2/Core i7 DDRIO + 0ee0 Xeon E5 v2/Core i7 Unicast Registers + 0ee1 Xeon E5 v2/Core i7 Unicast Registers + 0ee2 Xeon E5 v2/Core i7 Unicast Registers + 0ee3 Xeon E5 v2/Core i7 Unicast Registers + 0ee4 Xeon E5 v2/Core i7 Unicast Registers + 0ee5 Xeon E5 v2/Core i7 Unicast Registers + 0ee6 Xeon E5 v2/Core i7 Unicast Registers + 0ee7 Xeon E5 v2/Core i7 Unicast Registers + 0ee8 Xeon E5 v2/Core i7 Unicast Registers + 0ee9 Xeon E5 v2/Core i7 Unicast Registers + 0eea Xeon E5 v2/Core i7 Unicast Registers + 0eeb Xeon E5 v2/Core i7 Unicast Registers + 0eec Xeon E5 v2/Core i7 Unicast Registers + 0eed Xeon E5 v2/Core i7 Unicast Registers + 0eee Xeon E5 v2/Core i7 Unicast Registers + 0ef0 Xeon E5 v2/Core i7 Integrated Memory Controller 0 Channel 0-3 Thermal Control 0 + 0ef1 Xeon E5 v2/Core i7 Integrated Memory Controller 0 Channel 0-3 Thermal Control 1 + 0ef2 Xeon E5 v2/Core i7 Integrated Memory Controller 0 Channel 0-3 ERROR Registers 0 + 0ef3 Xeon E5 v2/Core i7 Integrated Memory Controller 0 Channel 0-3 ERROR Registers 1 + 0ef4 Xeon E5 v2/Core i7 Integrated Memory Controller 0 Channel 0-3 Thermal Control 2 + 0ef5 Xeon E5 v2/Core i7 Integrated Memory Controller 0 Channel 0-3 Thermal Control 3 + 0ef6 Xeon E5 v2/Core i7 Integrated Memory Controller 0 Channel 0-3 ERROR Registers 2 + 0ef7 Xeon E5 v2/Core i7 Integrated Memory Controller 0 Channel 0-3 ERROR Registers 3 + 0ef8 Xeon E5 v2/Core i7 DDRIO + 0ef9 Xeon E5 v2/Core i7 DDRIO + 0efa Xeon E5 v2/Core i7 DDRIO + 0efb Xeon E5 v2/Core i7 DDRIO + 0efc Xeon E5 v2/Core i7 DDRIO + 0efd Xeon E5 v2/Core i7 DDRIO 0f00 ValleyView SSA-CUnit 0f01 ValleyView SSA-CUnit 0f02 ValleyView SSA-CUnit @@ -18596,6 +18819,7 @@ 103c 704e Dual Port 1000Base-T (PCIe) [AD337A] 1775 1100 CR11/VR11 Single Board Computer 1775 6003 Telum GE-QT + 18df 1214 2x 1GbE, PCIe x1, dual Intel 82571EB chips 8086 005e PRO/1000 PT Dual Port Server Connection 8086 105e PRO/1000 PT Dual Port Network Connection 8086 10d5 82571PT Gigabit PT Quad Port Server ExpressModule @@ -18844,7 +19068,7 @@ 103c 18d0 Ethernet 10Gb 2-port 560FLB Adapter 8086 000c Ethernet X520 10GbE Dual Port KX4-KR Mezz 10f9 82599 10 Gigabit Dual Port Network Connection - 10fb 82599EB 10-Gigabit SFI/SFP+ Network Connection + 10fb 82599ES 10-Gigabit SFI/SFP+ Network Connection 1028 1f72 Ethernet 10G 4P X520/I350 rNDC 103c 17d0 Ethernet 10Gb 2-port 560FLR-SFP+ Adapter 103c 17d2 Ethernet 10Gb 2-port 560M Adapter @@ -19191,13 +19415,17 @@ 8086 7b11 10GbE 2P X520 Adapter 1557 82599 10 Gigabit Network Connection 8086 0001 Ethernet OCP Server Adapter X520-1 + 1558 Ethernet Converged Network Adapter X520-Q1 + 8086 011a Ethernet Converged Network Adapter X520-Q1 + 8086 011b Ethernet Converged Network Adapter X520-Q1 1559 Ethernet Connection I218-V 155a Ethernet Connection I218-LM 155c Ethernet Server Bypass Adapter 8086 0001 Ethernet Server Bypass Adapter X540-T2 155d Ethernet Server Bypass Adapter 8086 0001 Ethernet Server Bypass Adapter X520-SR2 - 1560 Ethernet Controller X540-AT1 + 8086 0002 Ethernet Server Bypass Adapter X520-LR2 + 1560 Ethernet Controller X540 157b I210 Gigabit Network Connection 15a0 Ethernet Connection (2) I218-LM 15a1 Ethernet Connection (2) I218-V @@ -19433,6 +19661,7 @@ 1e01 7 Series Chipset Family 4-port SATA Controller [IDE mode] 1e02 7 Series/C210 Series Chipset Family 6-port SATA Controller [AHCI mode] 1043 84ca P8H77-I Motherboard + 1849 1e02 Motherboard 1e03 7 Series Chipset Family 6-port SATA Controller [AHCI mode] 1043 1477 N56VZ 1043 1517 Zenbook Prime UX31A @@ -19447,25 +19676,32 @@ 1043 1477 N56VZ 1043 1517 Zenbook Prime UX31A 1043 84ca P8H77-I Motherboard + 1849 1e10 Motherboard 1e12 7 Series/C210 Series Chipset Family PCI Express Root Port 2 1043 1477 N56VZ 1043 1517 Zenbook Prime UX31A 1e14 7 Series/C210 Series Chipset Family PCI Express Root Port 3 1e16 7 Series/C210 Series Chipset Family PCI Express Root Port 4 1043 1477 N56VZ + 1849 1618 Z77 Extreme4 motherboard 1e18 7 Series/C210 Series Chipset Family PCI Express Root Port 5 1043 84ca P8H77-I Motherboard + 1849 1e18 Motherboard 1e1a 7 Series/C210 Series Chipset Family PCI Express Root Port 6 + 1849 1e1a Motherboard 1e1c 7 Series/C210 Series Chipset Family PCI Express Root Port 7 1e1e 7 Series/C210 Series Chipset Family PCI Express Root Port 8 + 1849 1e1e Motherboard 1e20 7 Series/C210 Series Chipset Family High Definition Audio Controller 1043 1477 N56VZ 1043 1517 Zenbook Prime UX31A 1043 8415 P8H77-I Motherboard + 1849 1898 Z77 Extreme4 motherboard 1e22 7 Series/C210 Series Chipset Family SMBus Controller 1043 1477 N56VZ 1043 1517 Zenbook Prime UX31A 1043 84ca P8H77-I Motherboard + 1849 1e22 Motherboard 1e24 7 Series/C210 Series Chipset Family Thermal Management Controller 1043 1517 Zenbook Prime UX31A 1e25 7 Series/C210 Series Chipset Family DMI to PCI Bridge @@ -19473,19 +19709,23 @@ 1043 1477 N56VZ 1043 1517 Zenbook Prime UX31A 1043 84ca P8H77-I Motherboard + 1849 1e26 Motherboard 1e2d 7 Series/C210 Series Chipset Family USB Enhanced Host Controller #2 1043 1477 N56VZ 1043 1517 Zenbook Prime UX31A 1043 84ca P8H77-I Motherboard + 1849 1e2d Motherboard 1e31 7 Series/C210 Series Chipset Family USB xHCI Host Controller 1043 1477 N56VZ 1043 1517 Zenbook Prime UX31A 1043 84ca P8H77-I Motherboard + 1849 1e31 Motherboard 1e33 7 Series/C210 Series Chipset Family LAN Controller 1e3a 7 Series/C210 Series Chipset Family MEI Controller #1 1043 1477 N56VZ 1043 1517 Zenbook Prime UX31A 1043 84ca P8H77-I Motherboard + 1849 1e3a Motherboard 1e3b 7 Series/C210 Series Chipset Family MEI Controller #2 1e3c 7 Series/C210 Series Chipset Family IDE-r Controller 1e3d 7 Series/C210 Series Chipset Family KT Controller @@ -19493,6 +19733,7 @@ 1e42 7 Series Chipset Family LPC Controller 1e43 7 Series Chipset Family LPC Controller 1e44 Z77 Express Chipset LPC Controller + 1849 1e44 Motherboard 1e45 7 Series Chipset Family LPC Controller 1e46 Z75 Express Chipset LPC Controller 1e47 Q77 Express Chipset LPC Controller @@ -19523,64 +19764,63 @@ 1e5d HM75 Express Chipset LPC Controller 1e5e 7 Series Chipset Family LPC Controller 1e5f 7 Series Chipset Family LPC Controller - 1f00 Avoton SSA-Cunit - 1f01 Avoton SSA-Cunit - 1f02 Avoton SSA-Cunit - 1f03 Avoton SSA-Cunit - 1f04 Avoton SSA-Cunit - 1f05 Avoton SSA-Cunit - 1f06 Avoton SSA-Cunit - 1f07 Avoton SSA-Cunit - 1f08 Avoton SSA-Cunit - 1f09 Avoton SSA-Cunit - 1f0a Avoton SSA-Cunit - 1f0b Avoton SSA-Cunit - 1f0c Avoton SSA-Cunit - 1f0d Avoton SSA-Cunit - 1f0e Avoton SSA-Cunit - 1f0f Avoton SSA-Cunit - 1f10 Avoton PCIe Root Port 1 - 1f11 Avoton PCIe Root Port 2 - 1f12 Avoton PCIe Root Port 3 - 1f13 Avoton PCIe Root Port 4 - 1f14 Avoton RAS - 1f15 Avoton SMBus 2.0 - 1f16 Avoton RCEC - 1f18 Avoton nCPM - 1f19 Avoton nCPM - 1f20 Avoton 4-Port IDE SATA2 Controller - 1f21 Avoton 4-Port IDE SATA2 Controller - 1f22 Avoton AHCI SATA2 Controller - 1f23 Avoton AHCI SATA2 Controller - 1f24 Avoton RAID SATA2 Controller - 1f25 Avoton RAID SATA2 Controller - 1f26 Avoton RAID SATA2 Controller - 1f27 Avoton RAID SATA2 Controller - 1f2c Avoton USB Enhanced Host Controller - 1f2e Avoton RAID SATA2 Controller - 1f2f Avoton RAID SATA2 Controller - 1f30 Avoton 2-Port IDE SATA3 Controller - 1f31 Avoton 2-Port IDE SATA3 Controller - 1f32 Avoton AHCI SATA3 Controller - 1f33 Avoton AHCI SATA3 Controller - 1f34 Avoton RAID SATA3 Controller - 1f35 Avoton RAID SATA3 Controller - 1f36 Avoton RAID SATA3 Controller - 1f37 Avoton RAID SATA3 Controller - 1f38 Avoton PCU - 1f39 Avoton PCU - 1f3a Avoton PCU - 1f3b Avoton PCU - 1f3c Avoton PCU SMBus - 1f3d Avoton PCU SMBus - 1f3e Avoton RAID SATA3 Controller - 1f3f Avoton RAID SATA3 Controller - 1f40 Avoton GbE x4 1000base-KX - 1f41 Avoton GbE x4 SGMII - 1f42 Avoton GbE - 1f43 Avoton GbE EEPROM-less - 1f44 Avoton GbE Virtual Function - 1f45 Avoton GbE 2500base-KX + 1f00 Atom processor C2000 SoC Transaction Router + 1f01 Atom processor C2000 SoC Transaction Router + 1f02 Atom processor C2000 SoC Transaction Router + 1f03 Atom processor C2000 SoC Transaction Router + 1f04 Atom processor C2000 SoC Transaction Router + 1f05 Atom processor C2000 SoC Transaction Router + 1f06 Atom processor C2000 SoC Transaction Router + 1f07 Atom processor C2000 SoC Transaction Router + 1f08 Atom processor C2000 SoC Transaction Router + 1f09 Atom processor C2000 SoC Transaction Router + 1f0a Atom processor C2000 SoC Transaction Router + 1f0b Atom processor C2000 SoC Transaction Router + 1f0c Atom processor C2000 SoC Transaction Router + 1f0d Atom processor C2000 SoC Transaction Router + 1f0e Atom processor C2000 SoC Transaction Router + 1f0f Atom processor C2000 SoC Transaction Router + 1f10 Atom processor C2000 PCIe Root Port 1 + 1f11 Atom processor C2000 PCIe Root Port 2 + 1f12 Atom processor C2000 PCIe Root Port 3 + 1f13 Atom processor C2000 PCIe Root Port 4 + 1f14 Atom processor C2000 RAS + 1f15 Atom processor C2000 SMBus 2.0 + 1f16 Atom processor C2000 RCEC + 1f18 Atom processor C2000 nCPM + 1f19 Atom processor C2000 nCPM + 1f20 Atom processor C2000 4-Port IDE SATA2 Controller + 1f21 Atom processor C2000 4-Port IDE SATA2 Controller + 1f22 Atom processor C2000 AHCI SATA2 Controller + 1f23 Atom processor C2000 AHCI SATA2 Controller + 1f24 Atom processor C2000 RAID SATA2 Controller + 1f25 Atom processor C2000 RAID SATA2 Controller + 1f26 Atom processor C2000 RAID SATA2 Controller + 1f27 Atom processor C2000 RAID SATA2 Controller + 1f2c Atom processor C2000 USB Enhanced Host Controller + 1f2e Atom processor C2000 RAID SATA2 Controller + 1f2f Atom processor C2000 RAID SATA2 Controller + 1f30 Atom processor C2000 2-Port IDE SATA3 Controller + 1f31 Atom processor C2000 2-Port IDE SATA3 Controller + 1f32 Atom processor C2000 AHCI SATA3 Controller + 1f33 Atom processor C2000 AHCI SATA3 Controller + 1f34 Atom processor C2000 RAID SATA3 Controller + 1f35 Atom processor C2000 RAID SATA3 Controller + 1f36 Atom processor C2000 RAID SATA3 Controller + 1f37 Atom processor C2000 RAID SATA3 Controller + 1f38 Atom processor C2000 PCU + 1f39 Atom processor C2000 PCU + 1f3a Atom processor C2000 PCU + 1f3b Atom processor C2000 PCU + 1f3c Atom processor C2000 PCU SMBus + 1f3e Atom processor C2000 RAID SATA3 Controller + 1f3f Atom processor C2000 RAID SATA3 Controller + 1f40 Ethernet Connection I354 1.0 GbE Backplane + 1028 10f1 Ethernet Connection I354 1.0 GbE Backplane + 1f41 Ethernet Connection I354 + 1f42 Atom processor C2000 GbE + 1f44 Atom processor C2000 GbE Virtual Function + 1f45 Ethernet Connection I354 2.5 GbE Backplane 2250 Xeon Phi coprocessor 5100 series 225c Xeon Phi coprocessor SE10/7120 series 225d Xeon Phi coprocessor 3120 series @@ -19712,7 +19952,7 @@ 144d c072 Notebook N150P 1458 5000 GA-D525TUD 1734 1055 Amilo M1420 - 17aa 20ae ThinkPad T61 + 17aa 20ae ThinkPad T61/R61 8086 544b Desktop Board D425KT e4bf cc47 CCG-RUMBA 2449 82801BA/BAM/CA/CAM Ethernet Controller @@ -20998,7 +21238,7 @@ 1043 81ec P5B 2811 82801HEM (ICH8M-E) LPC Interface Controller 103c 30c1 Compaq 6910p - 17aa 20b6 T61 + 17aa 20b6 ThinkPad T61/R61 e4bf cc47 CCG-RUMBA 2812 82801HH (ICH8DH) LPC Interface Controller 2814 82801HO (ICH8DO) LPC Interface Controller @@ -21036,7 +21276,7 @@ 103c 30d9 Presario C700 104d 9005 Vaio VGN-FZ260E 104d 902d VAIO VGN-NR120E - 17aa 20a7 ThinkPad T61 + 17aa 20a7 ThinkPad T61/R61 e4bf cc47 CCG-RUMBA 282a 82801 Mobile SATA Controller [RAID mode] 1028 040b Latitude E6510 @@ -21053,7 +21293,7 @@ 104d 9005 Vaio VGN-FZ260E 104d 902d VAIO VGN-NR120E 1462 7235 P965 Neo MS-7235 mainboard - 17aa 20aa ThinkPad T61 + 17aa 20aa ThinkPad T61/R61 e4bf cc47 CCG-RUMBA 2831 82801H (ICH8 Family) USB UHCI Controller #2 1025 0121 Aspire 5920G @@ -21067,7 +21307,7 @@ 104d 9005 Vaio VGN-FZ260E 104d 902d VAIO VGN-NR120E 1462 7235 P965 Neo MS-7235 mainboard - 17aa 20aa ThinkPad T61 + 17aa 20aa ThinkPad T61/R61 e4bf cc47 CCG-RUMBA 2832 82801H (ICH8 Family) USB UHCI Controller #3 1025 0121 Aspire 5920G @@ -21080,7 +21320,7 @@ 1043 81ec P5B 104d 9005 Vaio VGN-FZ260E 104d 902d VAIO VGN-NR120E - 17aa 20aa ThinkPad T61 + 17aa 20aa ThinkPad T61/R61 e4bf cc47 CCG-RUMBA 2833 82801H (ICH8 Family) USB UHCI Controller #4 1043 81ec P5B @@ -21095,7 +21335,7 @@ 104d 9005 Vaio VGN-FZ260E 104d 902d VAIO VGN-NR120E 1462 7235 P965 Neo MS-7235 mainboard - 17aa 20aa ThinkPad T61 + 17aa 20aa ThinkPad T61/R61 e4bf cc47 CCG-RUMBA 2835 82801H (ICH8 Family) USB UHCI Controller #5 1025 0121 Acer Aspire 5920G @@ -21107,7 +21347,7 @@ 1043 81ec P5B 104d 9005 Vaio VGN-FZ260E 104d 902d VAIO VGN-NR120E - 17aa 20aa ThinkPad T60 + 17aa 20aa Thinkpad T61/R61 e4bf cc47 CCG-RUMBA 2836 82801H (ICH8 Family) USB2 EHCI Controller #1 1025 0121 Aspire 5920G @@ -21121,7 +21361,7 @@ 104d 9005 Vaio VGN-FZ260E 104d 902d VAIO VGN-NR120E 1462 7235 P965 Neo MS-7235 mainboard - 17aa 20ab ThinkPad T61 + 17aa 20ab ThinkPad T61/R61 e4bf cc47 CCG-RUMBA 283a 82801H (ICH8 Family) USB2 EHCI Controller #2 1025 0121 Acer Aspire 5920G @@ -21133,7 +21373,7 @@ 1043 81ec P5B 104d 9005 Vaio VGN-FZ260E 104d 902d VAIO VGN-NR120E - 17aa 20ab ThinkPad T61 + 17aa 20ab ThinkPad T61/R61 e4bf cc47 CCG-RUMBA 283e 82801H (ICH8 Family) SMBus Controller 1025 0121 Aspire 5920G @@ -21145,26 +21385,26 @@ 104d 9008 Vaio VGN-SZ79SN_C 104d 902d VAIO VGN-NR120E 1462 7235 P965 Neo MS-7235 mainboard - 17aa 20a9 ThinkPad T61 + 17aa 20a9 ThinkPad T61/R61 e4bf cc47 CCG-RUMBA 283f 82801H (ICH8 Family) PCI Express Port 1 1028 01da OptiPlex 745 103c 30c1 Compaq 6910p 104d 902d VAIO VGN-NR120E - 17aa 20ad ThinkPad T61 + 17aa 20ad ThinkPad T61/R61 2841 82801H (ICH8 Family) PCI Express Port 2 103c 30c1 Compaq 6910p 104d 902d VAIO VGN-NR120E - 17aa 20ad ThinkPad T61 + 17aa 20ad ThinkPad T61/R61 2843 82801H (ICH8 Family) PCI Express Port 3 104d 902d VAIO VGN-NR120E - 17aa 20ad ThinkPad T61 + 17aa 20ad ThinkPad T61/R61 2845 82801H (ICH8 Family) PCI Express Port 4 - 17aa 20ad ThinkPad T61 + 17aa 20ad ThinkPad T61/R61 2847 82801H (ICH8 Family) PCI Express Port 5 1028 01da OptiPlex 745 103c 30c1 Compaq 6910p - 17aa 20ad ThinkPad T61 + 17aa 20ad ThinkPad T61/R61 2849 82801H (ICH8 Family) PCI Express Port 6 284b 82801H (ICH8 Family) HD Audio Controller 1025 011f Realtek ALC268 audio codec @@ -21186,7 +21426,7 @@ 104d 9016 Sony VAIO VGN-AR51M 104d 902d VAIO VGN-NR120E 14f1 5051 Presario C700 - 17aa 20ac ThinkPad T61 + 17aa 20ac ThinkPad T61/R61 8384 7616 Dell Vostro 1400 e4bf cc47 CCG-RUMBA 284f 82801H (ICH8 Family) Thermal Reporting Device @@ -21199,7 +21439,7 @@ 103c 30d9 Presario C700 104d 9005 Vaio VGN-FZ260E 104d 902d VAIO VGN-NR120E - 17aa 20a6 ThinkPad T61 + 17aa 20a6 ThinkPad T61/R61 e4bf cc47 CCG-RUMBA 2912 82801IH (ICH9DH) LPC Interface Controller 2914 82801IO (ICH9DO) LPC Interface Controller @@ -22275,7 +22515,7 @@ 1028 028d PowerEdge T410 USB EHCI Controller 103c 330b ProLiant G6 series 1043 82d4 P5Q Deluxe Motherboard - 1458 5006 GA-EP45-DS5 Motherboard + 1458 5006 Motherboard 3a3e 82801JI (ICH10 Family) HD Audio Controller 1043 8311 P5Q Deluxe Motherboard 1458 a002 GA-EP45-UD3R Motherboard @@ -22980,7 +23220,7 @@ 8d66 Wellsburg sSATA Controller [RAID mode] 8d68 Wellsburg sSATA Controller [IDE mode] 8d6e Wellsburg sSATA Controller [RAID mode] - 8d7c Wellsburg EPSS + 8d7c Wellsburg SPSR 8d7d Wellsburg MS SMBus 0 8d7e Wellsburg MS SMBus 1 8d7f Wellsburg MS SMBus 2 @@ -23307,7 +23547,7 @@ 1028 0287 PowerEdge Expandable RAID Controller 320/DC 1028 0291 CERC SATA RAID 2 PCI SATA 6ch (DellCorsair) 103c 3227 AAR-2610SA - 108e 0286 STK RAID INT + 108e 0286 Sun StorageTek SAS RAID HBA, Internal 108e 0287 STK RAID EXT 108e 7aac STK RAID REM 108e 7aae STK RAID EX diff --git a/src/hwdata/usb.ids b/src/hwdata/usb.ids index 3cd0163..7462851 100644 --- a/src/hwdata/usb.ids +++ b/src/hwdata/usb.ids @@ -9,8 +9,8 @@ # The latest version can be obtained from # http://www.linux-usb.org/usb.ids # -# Version: 2013.05.24 -# Date: 2013-05-24 20:34:03 +# Version: 2013.08.21 +# Date: 2013-08-21 20:34:03 #
# Vendors, devices and interfaces. Please keep sorted. @@ -108,6 +108,8 @@ 2122 XMEGA-A1 Explained evaluation kit 2310 EVK11xx evaluation board 2fe4 ATxmega32A4U DFU bootloader + 2ff0 atmega32u2 DFU bootloader + 2ffa at90usb162 DFU bootloader 2ffb at90usb AVR DFU bootloader 2ffd at89c5130/c5131 DFU bootloader 2fff at89c5132/c51snd1c DFU bootloader @@ -219,6 +221,7 @@ 0912 Printing Support 0917 LaserJet 3330 0924 Modular Smartcard Keyboard + 094a Optical Mouse [672662-001] 0a01 ScanJet 2400c 0a17 color LaserJet 3700 0b01 ScanJet 82x0C @@ -689,6 +692,7 @@ 8028 Dev board JTAG (FT232H based) 8040 4 Port Hub 8070 7 Port Hub + 8210 MGTimer - MGCC (Vic) Timing System 8370 7 Port Hub 8371 PS/2 Keyboard And Mouse 8372 FT8U100AX Serial Port @@ -994,7 +998,9 @@ 05d4 EasyShare C180 Digital Camera 1001 EasyShare SV811 Digital Picture Frame 4000 InkJet Color Printer + 4021 Photo Printer 6800 4022 1400 Digital Photo Printer + 4034 805 Photo Printer 4056 ESP 7200 Series AiO 4109 EasyShare Printer Dock Series 3 410d EasyShare G600 Printer Dock @@ -1450,7 +1456,7 @@ 4060 Ultra Fast Media Reader 4064 Ultra Fast Media Reader 7500 LAN7500 Ethernet 10/100/1000 Adapter - 9512 LAN9500 Ethernet 10/100 Adapter / SMSC9512/9514 Hub + 9512 SMC9512/9514 USB Hub a700 2 Port Hub ec00 SMSC9512/9514 Fast Ethernet Adapter 0425 Motorola Semiconductors HK, Ltd @@ -1645,6 +1651,7 @@ 010d 3500-4500 series 010f 6500 series 0142 X3650 (Printer, Scanner, Copier) + 01fa S310 series 4303 Xerox WorkCentre Pro 412 043e LG Electronics USA, Inc. 3001 AN-WF100 802.11abgn Wireless Adapter [Broadcom BCM4323] @@ -1652,6 +1659,7 @@ 4a4d Flatron 915FT Plus Monitor 7001 MF-PD100 Soul Digital MP3 Player 7013 MP3 Player + 70f5 External HDD 8484 LPC-U30 Webcam II 8585 LPC-UC35 Webcam 8888 Electronics VCS Camera II(LPC-U20) @@ -1738,10 +1746,11 @@ 625f TUSB6250 ATA Bridge 8042 Hub dbc0 Device Bay Controller - e001 GraphLink + e001 GraphLink [SilverLink] e003 TI-84 Plus Calculator e004 TI-89 Titanium Calculator e008 TI-84 Plus Silver Calculator + e012 TI-Nspire Calculator f430 MSP-FET430UIF JTAG Tool f432 eZ430 Development Tool ffff Bluetooth Device @@ -1984,10 +1993,12 @@ 029d Xbox360 HD-DVD Drive 029e Xbox360 HD-DVD Memory Unit 02a0 Xbox360 Big Button IR + 02a1 Xbox 360 Wireless Receiver for Windows 02a8 Xbox360 Wireless N Networking Adapter [Atheros AR7010+AR9280] 02ad Xbox NUI Audio 02ae Xbox NUI Camera 02b0 Xbox NUI Motor + 02b6 Xbox 360 / Bluetooth Wireless Headset 0400 Windows Powered Pocket PC 2002 0401 Windows Powered Pocket PC 2002 0402 Windows Powered Pocket PC 2002 @@ -2143,6 +2154,7 @@ 0772 LifeCam Studio 0779 LifeCam HD-3000 930a ISOUSB.SYS Intel 82930 Isochronous IO Test Board + ffca Catalina fff8 Keyboard ffff Windows CE Mass Storage 0460 Ace Cad Enterprise Co., Ltd @@ -2228,6 +2240,7 @@ 002a Wireless Mouse & Keyboard 002d SmartTerminal XX44 003e SmartTerminal ST-2xxx + 0041 G86 6240 Keyboard 0080 eHealth Terminal ST 1503 0081 eHealth Keyboard G87 1504 0106 R-300 Wireless Mouse Receiver @@ -2367,6 +2380,7 @@ 0a13 Z-5 Speakers 0a17 G330 Headset 0a1f G930 + 0a29 H600 [Wireless Headset] 0b02 C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode) 8801 Video Camera b305 BT Mini-Receiver @@ -2430,6 +2444,7 @@ c061 RX1500 Laser Mouse c062 M-UAS144 [LS1 Laser Mouse] c063 DELL Laser Mouse + c066 G9x Laser Mouse c068 G500 Laser Mouse c069 M500 Laser Mouse c06a USB Optical Mouse @@ -2441,9 +2456,10 @@ c112 Harmony 890 Remote c11f Harmony 900/1100 Remote c121 Harmony One Remote - c122 Harmony 700 Remote + c122 Harmony 650/700 Remote c124 Harmony 300 Remote c125 Harmony 200 Remote + c126 Harmony Link c201 WingMan Extreme Joystick with Throttle c202 WingMan Formula c207 WingMan Extreme Digital 3D @@ -2550,12 +2566,14 @@ c526 Nano Receiver c529 Logitech Keyboard + Mice c52b Unifying Receiver + c52e MK260 Wireless Combo Receiver c52f Unifying Receiver c532 Unifying Receiver c623 3Dconnexion Space Traveller 3D Mouse c625 3Dconnexion Space Pilot 3D Mouse c626 3Dconnexion Space Navigator 3D Mouse c627 3Dconnexion Space Explorer 3D Mouse + c629 3Dconnexion SpacePilot Pro 3D Mouse c702 Cordless Presenter c703 Elite Keyboard Y-RP20 + Mouse MX900 (Bluetooth) c704 diNovo Wireless Desktop @@ -2694,6 +2712,7 @@ 20b6 GoGear Vibe 20d0 SPZ2000 Webcam [PixArt PAC7332] 20e3 GoGear Raga + 20e4 GoGear ViBE 8GB 262c SPC230NC Webcam 485d Senselock SenseIV v2.x df55 LPCXpresso LPC-Link @@ -2827,15 +2846,18 @@ 4254 BUA-100 Bluetooth Adapter ac01 Savi 7xx ad01 GameCom 777 5.1 Headset + c00e Blackwire C310 headset 0480 Toshiba America Info. Systems, Inc. 0001 InTouch Module 0004 InTouch Module 0011 InTouch Module 0014 InTouch Module + a006 External Disk 1.5TB a007 External Disk USB 3.0 0481 Zenith Data Systems 0482 Kyocera Corp. 000e FS-1020D Printer + 000f FS-1920 Mono Printer 0100 Finecam S3x 0101 Finecam S4 0103 Finecam S5 @@ -3253,12 +3275,14 @@ 171b MP960 1721 MP210 ser 1723 MP470 ser + 1724 PIXMA MP520 series 1725 MP610 ser 1726 MP970 ser 1727 MX300 ser 1728 MX310 ser 1729 MX700 ser 172b MP140 ser + 173b PIXMA MP270 All-In-One Printer 173e MP560 173f Pixma MP640 Multifunction device 1748 Pixma MG5150 @@ -3500,34 +3524,65 @@ 3100 PowerShot TX1 310b SELPHY CP600 310e Digital IXUS 50 (PTP mode) + 310f PowerShot A420 3110 EOS Digital Rebel XTi + 3115 PowerShot SD900 / Digital IXUS 900 Ti / IXY DIGITAL 1000 3116 Digital IXUS 750 / PowerShot SD550 (PTP mode) 3117 PowerShot A700 3119 PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS + 311a PowerShot S3 IS 311b PowerShot A540 + 311c PowerShot SD600 DIGITAL ELPH / DIGITAL IXUS 60 / IXY DIGITAL 70 + 3125 PowerShot G7 + 3126 PowerShot A530 3127 SELPHY CP710 3128 SELPHY CP510 312d Elura 100 + 3136 PowerShot SD800 IS / Digital IXUS 850 IS / IXY DIGITAL 900 IS + 3137 PowerShot SD40 / Digital IXUS i7 IXY / DIGITAL L4 3138 PowerShot A710 IS + 3139 PowerShot A640 + 313a PowerShot A630 3141 SELPHY ES1 3142 SELPHY CP730 3143 SELPHY CP720 3145 EOS 450D + 3146 EOS 40D 3147 EOS 1Ds Mark III - 314f Powershot SD1000 + 3148 PowerShot S5 IS + 3149 PowerShot A460 + 314b PowerShot SD850 IS DIGITAL ELPH / Digital IXUS 950 IS / IXY DIGITAL 810 IS + 314c PowerShot A570 IS + 314d PowerShot A560 + 314e PowerShot SD750 DIGITAL ELPH / DIGITAL IXUS 75 / IXY DIGITAL 90 + 314f PowerShot SD1000 DIGITAL ELPH / DIGITAL IXUS 70 / IXY DIGITAL 10 + 3150 PowerShot A550 3155 PowerShot A450 315a PowerShot G9 + 315b PowerShot A650 IS 315d PowerShot A720 + 315e PowerShot SX100 IS + 315f PowerShot SD950 IS DIGITAL ELPH / DIGITAL IXUS 960 IS / IXY DIGITAL 2000 IS 3160 Digital IXUS 860 IS 3170 SELPHY CP750 3171 SELPHY CP740 + 3173 PowerShot SD890 IS DIGITAL ELPH / Digital IXUS 970 IS / IXY DIGITAL 820 IS + 3174 PowerShot SD790 IS DIGITAL ELPH / Digital IXUS 90 IS / IXY DIGITAL 95 IS 3175 IXY Digital 25 IS 3176 PowerShot A590 + 3177 PowerShot A580 317a PC1267 [Powershot A470] 3184 Digital IXUS 80 IS (PTP mode) 3185 SELPHY ES2 3186 SELPHY ES20 + 318d PowerShot SX100 IS + 318e PowerShot A1000 IS + 318f PowerShot G10 + 3191 PowerShot A2000 IS 3192 PowerShot SX110 IS + 3193 PowerShot SD990 IS DIGITAL ELPH / Digital IXUS 980 IS / IXY DIGITAL 3000 IS + 3195 PowerShot SX1 IS + 3196 PowerShot SD880 IS DIGITAL ELPH / Digital IXUS 870 IS / IXY DIGITAL 920 IS 319a EOS 7D 31aa SELPHY CP770 31ab SELPHY CP760 @@ -3536,12 +3591,26 @@ 31b0 SELPHY ES30 31b1 SELPHY CP530 31bc PowerShot D10 + 31bd PowerShot SD960 IS DIGITAL ELPH / Digital IXUS 110 IS / IXY DIGITAL 510 IS + 31be PowerShot A2100 IS 31bf PowerShot A480 31c0 PowerShot SX200 IS + 31c1 PowerShot SD970 IS DIGITAL ELPH / Digital IXUS 990 IS / IXY DIGITAL 830 IS + 31c2 PowerShot SD780 IS DIGITAL ELPH / Digital IXUS 100 IS / IXY DIGITAL 210 IS + 31c3 PowerShot A1100 IS + 31c4 PowerShot SD1200 IS DIGITAL ELPH / Digital IXUS 95 IS / IXY DIGITAL 110 IS + 31cf EOS Rebel T1i / EOS 500D / EOS Kiss X3 31dd SELPHY CP780 + 31df PowerShot G11 + 31e0 PowerShot SX120 IS + 31e1 PowerShot S90 + 31e4 PowerShot SX20 IS 31e5 Digital IXUS 200 IS + 31e6 PowerShot SD940 IS DIGITAL ELPH / Digital IXUS 120 IS / IXY DIGITAL 220 IS + 31ea EOS Rebel T2i / EOS 550D / EOS Kiss X4 31ee SELPHY ES40 31ef PowerShot A495 + 31f0 PowerShot A490 31f1 PowerShot A3100 IS / PowerShot A3150 IS 31f2 PowerShot A3000 IS 31f3 PowerShot Digital ELPH SD1400 IS @@ -3552,6 +3621,7 @@ 31f8 Powershot SD4500 IS / IXUS 1000 HS / IXY 50S 31ff Digital IXUS 55 3209 Vixia HF S21 A + 320f PowerShot G12 3210 Powershot SX30 IS 3211 PowerShot SX130 IS 3212 Powershot S95 @@ -3559,11 +3629,14 @@ 3218 EOS 600D / Rebel T3i (ptp) 3223 PowerShot A3300 IS 3224 PowerShot A3200 IS + 3225 PowerShot ELPH 500 HS / IXUS 310 HS 3226 PowerShow A800 + 3227 PowerShot ELPH 100 HS / IXUS 115 HS 3228 PowerShot SX230 HS 3229 PowerShot ELPH 300 HS / IXUS 220 HS 322a PowerShot A2200 322b Powershot A1200 + 322c PowerShot SX220 HS 3233 PowerShot G1 X 3234 PowerShot SX150 IS 3236 PowerShot S100 @@ -3574,6 +3647,7 @@ 323f PowerShot A810 3240 PowerShot ELPH 320 HS / IXUS 240 HS 3241 PowerShot ELPH 110 HS / IXUS 125 HS + 3242 PowerShot D20 3243 PowerShot A4000 IS 3244 PowerShot SX260 HS 3245 PowerShot SX240 HS @@ -3588,6 +3662,10 @@ 325a PowerShot SX160 IS 325b PowerShot S110 325c PowerShot SX500 IS + 325f PowerShot SX280 HS + 3260 PowerShot SX270 HS + 3264 PowerShot A1400 + 3268 PowerShot ELPH 330 HS / IXUS 255 HS 04aa DaeWoo Telecom, Ltd 04ab Chromatic Research 04ac Micro Audiometrics Corp. @@ -3658,8 +3736,10 @@ 0413 D40 (mass storage mode) 041e D60 digital camera (mass storage mode) 0422 D700 (ptp) + 0423 D5000 0424 D3000 0425 D300S + 0428 D7000 042a D800 (ptp) 0f03 PD-10 Wireless Printer Adapter 4000 Coolscan LS 40 ED @@ -3700,6 +3780,7 @@ 0001 Mouse 0002 CY7C63x0x Thermometer 0033 Mouse + 0060 Wireless optical mouse 0100 Cino FuzzyScan F760-B 0101 Keyboard/Hub 0102 Keyboard with APM @@ -4018,6 +4099,7 @@ 1041 fi-4120c Scanner 1042 fi-4220c Scanner 105b AH-F401U Air H device + 1084 PalmSecure Sensor V2 1096 fi-5110EOX 1097 fi-5110C 10ae fi-4120C2 @@ -4041,6 +4123,7 @@ 072d Revio KD410Z 04ca Lite-On Technology Corp. 1766 HID Monitor Controls + 2004 Bluetooth 4.0 [Broadcom BCM20702A0] 9304 Hub f01c TT1280DA DVB-T TV Tuner 04cb Fuji Photo Film Co., Ltd @@ -4186,6 +4269,7 @@ 8001 ICD2 in-circuit debugger 8101 PIC24F Starter Kit 8107 Microstick II + 9004 Microchip REAL ICE 900a PICkit3 c001 PicoLCD 20x4 f8da Hughski Ltd. ColorHug @@ -4207,6 +4291,7 @@ 2013 Keyboard [Das Keyboard] 2221 Keyboard 2323 Keyboard + 2519 Shenzhen LogoTech 2.4GHz receiver 2832 1channel Telephone line recorder a055 Keyboard 04da Panasonic (Matsushita) @@ -4300,6 +4385,7 @@ 04e1 Iiyama North America, Inc. 0201 Monitor Hub 04e2 Exar Corp. + 1410 XR21V1410 USB-UART IC 04e3 Zilog, Inc. 04e4 ACC Microelectronics 04e5 Promise Technology @@ -4385,7 +4471,7 @@ 0100 Kingston Flash Drive (128MB) 0110 Connect3D Flash Drive 0111 Connect3D Flash Drive - 0300 E2530 Phone (Mass storage mode) + 0300 E2530 / GT-C3350 Phones (Mass storage mode) 1003 MP3 Player and Recorder 1006 SDC-200Z 130c NX100 @@ -4522,8 +4608,10 @@ 5f04 NEXiO Sync 5f05 STORY Station 1TB 6032 G2 Portable hard drive + 6034 G2 Portable hard drive 60b3 M2 Portable Hard Drive 60c4 M2 Portable Hard Drive USB 3.0 + 61b6 M3 Portable Hard Drive 1TB 6601 Mobile Phone 6602 Galaxy 6603 Galaxy @@ -4563,7 +4651,7 @@ 685b GT-I9100 Phone [Galaxy S II] (mass storage mode) 685c GT-I9250 Phone [Galaxy Nexus] 685d GT-I9100 Phone [Galaxy S II] (Download mode) - 685e GT-I9100 Phone [Galaxy S II] (USB Debugging mode) + 685e GT-I9100 / GT-C3350 Phones (USB Debugging mode) 6860 GT-I9100 Phone [Galaxy S II], GT-I9300 Phone [Galaxy S III], GT-P7500 [Galaxy Tab 10.1] 6865 GT-I9300 Phone [Galaxy S III] (PTP mode) 6866 GT-I9300 Phone [Galaxy S III] (debugging mode) @@ -4656,6 +4744,7 @@ b057 integrated USB webcam b059 CKF7037 HP webcam b071 2.0M UVC Webcam / CNF7129 + b083 CKF7063 Webcam (HP) b091 Webcam b104 CNF7069 Webcam b107 CNF7070 Webcam @@ -4667,6 +4756,7 @@ b1b9 Asus Integrated Webcam b1cf Lenovo Integrated Camera b1d6 CNF9055 Toshiba Webcam + b1e4 Toshiba Integrated Webcam b213 Fujitsu Integrated Camera b217 Lenovo Integrated Camera (0.3MP) b221 integrated camera @@ -4678,6 +4768,7 @@ b2b9 Lenovo Integrated Camera UVC b2ea Integrated Camera [ThinkPad] b330 Asus 720p CMOS webcam + b354 UVC 1.00 device HD UVC WebCam 04f3 Elan Microelectronics Corp. 0103 ActiveJet K-2024 Multimedia Keyboard 01a4 Wireless Keyboard @@ -4894,6 +4985,7 @@ 201a PT-18R P-touch label printer 201b QL-650TD P-Touch Label Printer 2027 QL-560 P-Touch Label Printer + 202b PT-7600 P-Touch Label Printer 2100 Card Reader Writer 04fa Dallas Semiconductor 2490 DS1490F 2-in-1 Fob, 1-Wire adapter @@ -4945,6 +5037,7 @@ 16e3 n30 Handheld Sync 3202 Liquid 3203 Liquid (Debug mode) + 3230 BeTouch E120 3317 Liquid 3325 Iconia tablet A500 3341 Iconia tablet A500 @@ -5015,6 +5108,7 @@ 0304 FSU304 USB 2.0 - 4 Ports Hub 0307 USB 2.0 - 7 ports Hub [FSU307] 0409 F5U409 Serial + 0416 Staples 12416 7 port desktop hub 0551 F6C550-AVR UPS 0706 2-N-1 7-Port Hub (Lower half) 0802 Nostromo n40 Gamepad @@ -5117,7 +5211,7 @@ 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 + a4a5 Pocketbook Pro 903 a4a6 Linux-USB Serial Gadget a4a7 Linux-USB Serial Gadget (CDC ACM mode) a4a8 Linux-USB Printer Gadget @@ -5180,6 +5274,7 @@ 0539 Shyh Shiun Terminals Co., Ltd 053a PrehKeyTec GmbH 0b00 Hub + 0b01 Preh MCI 3100 053b Global Village Communication 053c Institut of Microelectronic & Mechatronic Systems 053d Silicon Architect @@ -5247,6 +5342,7 @@ 2727 Xircom PGUNET USB-USB Bridge 2750 EZ-Link (EZLNKUSB.SYS) 2810 Cypress ATAPI Bridge + 4d90 AmScope MD1900 camera 7777 Bluetooth Device 9999 AN2131 uninitialized (?) 0548 Tyan Computer Corp. @@ -5360,6 +5456,7 @@ 01d0 DVD+RW External Drive DRU-700A 01d5 IC RECORDER 01de VRD-VC10 [Video Capture] + 01e8 UP-DR150 Photo Printer 01e9 Net MD 01ea Hi-MD WALKMAN 01ee IC RECORDER @@ -5472,6 +5569,7 @@ 4000 DSB-650 10Mbps Ethernet [klsi] 7000 Hub 7820 UC-2322 2xSerial Ports [mos7820] + 8021 CS1764A [CubiQ DVI KVMP Switch] 0558 Truevision, Inc. 1009 GW Instek GDS-1000 Oscilloscope 100a GW Instek GDS-1000A Oscilloscope @@ -5654,6 +5752,7 @@ 00d6 Bamboo Pen & Touch (CTH-460) 00db Bamboo Fun (CTH-661SE-NL) 00dd Bamboo Pen (CTL-470) + 00de CTH-470 [Bamboo Fun Pen & Touch] 00f6 Cintiq 24HD touch (DTH-2400) touchscreen 00f8 Cintiq 24HD touch (DTH-2400) tablet 0400 PenPartner 4x5 @@ -6248,6 +6347,7 @@ 0323 LaCie d2 Drive USB2 0421 Big Disk G465 0641 Mobile Hard Drive + 100c Rugged Triple Interface Mobile Hard Drive 1010 Desktop Hard Drive 1019 Desktop Hard Drive 1021 Little Disk @@ -6269,6 +6369,8 @@ 9722 Keyboard 9731 MCK-600W/MCK-800USB Keyboard 9783 Wireless Keypad + 9837 Targus Number Keypad + 9862 Targus Number Keypad (Composite Device) 9881 IR receiver [VRC-1100 Vista MCE Remote Control] 05a5 Sampo Technology Corp. 05a6 Cisco Systems, Inc. @@ -6385,6 +6487,7 @@ 1101 Speakers 1105 Audio in LED Cinema Display 1107 Thunderbolt Display Audio + 1112 FaceTime HD Camera (Display) 1201 3G iPod 1202 iPod 2G 1203 iPod 4.Gen Grayscale 40G @@ -6454,6 +6557,7 @@ 8240 Built-in IR Receiver 8241 Built-in IR Receiver 8242 Built-in IR Receiver + 8281 Bluetooth Host Controller 8286 Bluetooth Host Controller 8300 Built-in iSight (no firmware loaded) 8403 Internal Memory Card Reader @@ -6910,6 +7014,7 @@ 0723 GL827L SD/MMC/MS Flash Card Reader 0726 SD Card Reader 0727 microSD Reader/Writer + 0731 GL3310 SATA 3Gb/s Bridge Controller 0736 microSD Reader/Writer 0760 USB 2.0 Card Reader/Writer 0761 Genesys Mass Storage Device @@ -6961,7 +7066,9 @@ 05f7 RFC Distribution(s) PTE, Ltd 05f9 PSC Scanning, Inc. 1104 Magellan 2200VS + 2202 Point of Sale Handheld Scanner 2206 Datalogic Gryphon GFS4170 + 2601 Datalogin Magellan 1000i Barcode Scanner 2602 Datalogic Magellan 1100i Barcode Scanner 5204 Datalogic Gryphon GFS4170 (config mode) 05fa Siemens Telecommunications Systems, Ltd @@ -7065,6 +7172,9 @@ 0622 Iotech, Inc. 0623 Littelfuse, Inc. 0624 Avocent Corp. + 0248 Virtual Hub + 0249 Virtual Keyboard/Mouse + 0251 Virtual Mass Storage 0294 Dell 03R874 KVM dongle 0402 Cisco Virtual Keyboard and Mouse 0403 Cisco Virtual Mass Storage @@ -7124,6 +7234,7 @@ 1000 CD-ROM Drive 800d TASCAM Portastudio DP-01FX 800e TASCAM US-122L + 801d DR-100 8021 TASCAM US-122mkII d001 CD-R/RW Unit d002 CD-R/RW Unit @@ -7156,6 +7267,7 @@ a219 1.3M WebCam (notebook emachines E730, Acer sub-brand) c107 HP webcam [dv6-1190en] d101 Acer CrystalEye Webcam + d217 HP TrueVision HD e201 Lenovo Integrated Webcam e203 Lenovo Integrated Webcam e258 HP TrueVision HD Integrated Webcam @@ -7183,7 +7295,7 @@ 0658 Sigma Designs, Inc. 0659 Aethra 065a Optoelectronics Co., Ltd - 0001 Barcode scanner / NLV-1001 (keyboard mode) + 0001 Opticon OPR-2001 / NLV-1001 (keyboard mode) 0009 NLV-1001 (serial mode) / OPN-2001 [Opticon] 065b Tracewell Systems 065e Silicon Graphics @@ -7377,6 +7489,7 @@ 2517 Flash Disk Mass Storage Device 2528 Storage device (8gB thumb drive) 25a1 PL25A1 Host-Host Bridge + 2773 PL2773 SATAII bridge controller 3400 Hi-Speed Flash Disk with TruePrint AES3400 3500 Hi-Speed Flash Disk with TruePrint AES3500 3507 PL3507 ATAPI6 Bridge @@ -7641,6 +7754,11 @@ 06bc Oki Data Corp. 000b Okipage 14ex Printer 0027 Okipage 14e + 00f7 OKI B4600 Mono Printer + 015e OKIPOS 411/412 POS Printer + 01c9 OKI B430 Mono Printer + 020b OKI ES4140 Mono Printer + 02bb OKI PT390 POS Printer 0a91 B2500MFP (printer+scanner) 3801 B6100 Laser Printer 06bd AGFA-Gevaert NV @@ -7761,6 +7879,7 @@ 0622 LapLink Gold USB-USB Bridge [net1080] 06d1 Daewoo Electronics Co., Ltd 06d3 Mitsubishi Electric Corp. + 0284 FX-USB-AW/-BD RS482 Converters 0380 CP8000D Port 0381 CP770D Port 0385 CP900D Port @@ -7800,10 +7919,12 @@ 0014 Prolink Winscan Pro 2448U 06de Heisei Electronics Co., Ltd 06e0 Multi-Tech Systems, Inc. + 0319 MT9234ZBA-USB MultiModem ZBA f101 MT5634ZBA-USB MultiModemUSB (old firmware) f103 MT5634MU MultiMobileUSB f104 MT5634ZBA-USB MultiModemUSB (new firmware) f107 MT5634ZBA-USB-V92 MultiModemUSB + f120 MT9234ZBA-USB-CDC-ACM-XR MultiModem ZBA CDC-ACM-XR 06e1 ADS Technologies, Inc. 0008 UBS-10BT Ethernet [klsi] 0009 UBS-10BT Ethernet @@ -8405,15 +8526,21 @@ 8911 ScanHex SX-35c 0798 Optelec 0001 Braille Voyager + 0640 BC640 + 0680 BC680 0799 Altera 7651 Programming Unit 079b Sagem + 0024 MSO300/MSO301 Fingerprint Sensor + 0026 MSO350/MSO351 Fingerprint Sensor & SmartCard Reader 0027 USB-Serial Controller 002f Mobile 0030 Mobile Communication Device 0042 Mobile + 0047 CBM/MSO1300 Fingerprint Sensor 004a XG-760A 802.11bg 004b Wi-Fi 11g adapter + 0052 MSO1350 Fingerprint Sensor & SmartCard Reader 0056 Agfa AP1100 Photo Printer 005d Mobile Mass Storage 0062 XG-76NA 802.11bg @@ -8538,12 +8665,17 @@ 0114 C-350Z Camera 0118 Mju Mini Digital/Mju Digital 500 Camera / Stylus 850 SW 0184 P-S100 port + 0202 Foot Switch RS-26 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 + 020b Digital Voice Recorder DS-4000 020d Digital Voice Recorder VN-240PC + 0211 Digital Voice Recorder DS-2300 + 0218 Foot Switch RS-28 0244 Digital Voice Recorder VN-8500PC + 024f Digital Voice Recorder DS-7000 0280 m:robe 100 07b5 Mega World International, Ltd 0017 Joystick @@ -8575,6 +8707,7 @@ 420a UF200 Ethernet 5301 GW-US54ZGL 802.11bg 6001 802.11bg + 8188 AboCom Systems Inc [WN2001 Prolink Wireless-N Nano Adapter] a001 WUG2200 802.11g Wireless Adapter [Envara WiND512] abc1 DU-E10 Ethernet [pegasus] b000 BWU613 @@ -9044,6 +9177,7 @@ 1002 Ethernet 1020 FA101 Fast Ethernet USB 1.1 1040 FA120 Fast Ethernet USB 2.0 [Asix AX88172 / AX8817x] + 1100 Managed Switch M4100 series, M5300 series, M7100 series 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] @@ -9335,7 +9469,7 @@ 0301 RNIS 08e4 Pioneer Corp. 08e5 Litronic -08e6 Gemplus +08e6 Gemalto (was Gemplus) 0001 GemPC-Touch 430 0430 GemPC430 SmartCard Reader 0432 GemPC432 SmartCard Reader @@ -9349,6 +9483,7 @@ 34ec Compact Smart Card Reader Writer 4433 GemPC433-Swap 5501 GemProx-PU Contactless Smart Card Reader + 5503 Prox-DU Contactless Interface ace0 UA HYBRID TOKEN 08e7 Pan-International Wire & Cable 08e8 Integrated Memory Logic @@ -9654,6 +9789,7 @@ 0a07 WLM-10U1 802.11abgn Wireless Adapter [Ralink RT3572] 0b05 PX1220E-1G25 External hard drive 0b09 PX1396E-3T01 External hard drive + 0b1a STOR.E ALU 2S 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 @@ -9716,6 +9852,7 @@ 0933 Quantum Corp. 0934 Spirent Communications 0936 NuTesla + 000c Rhythmedics 6 BioData Integrator 0030 Composite Device, Mass Storage Device (Flash Drive) amd HID 003c Rhythmedics HID Bootloader 0939 Lumberg, Inc. @@ -9732,6 +9869,7 @@ 2471 SoC PC-Camera 2500 USB Optical Mouse 2510 Optical Mouse + 2521 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 @@ -9812,6 +9950,7 @@ 0955 NVidia Corp. 7030 Tegra 3 (recovery mode) 7100 Notion Ink Adam + 7820 Tegra 2 AC100 developer mode b400 SHIELD (debug) b401 SHIELD 0956 BSquare Corp. @@ -9850,6 +9989,7 @@ 0977 Lightsurf Technologies 0978 Beckhoff GmbH 0979 Jeilin Technology Corp., Ltd + 0222 Keychain Display 0224 JL2005A Toy Camera 0226 JL2005A Toy Camera 0227 JL2005B/C/D Toy Camera @@ -9961,7 +10101,8 @@ 032b Wireless Mouse (Battery Free) 8090 X-718BK Oscar Optical Gaming Mouse 9033 X-718BK Optical Mouse - 9090 XL-750BK Laser Mouse + 9066 F3 V-Track Gaming Mouse + 9090 XL-730K / XL-750BK / XL-755BK Mice 09db Measurement Computing Corp. 0075 MiniLab 1008 0076 PMD-1024 @@ -10231,6 +10372,7 @@ 0009 LP2844 Printer 0081 GK420t Label Printer 008b HC100 wristbands Printer + 00d1 Zebra GC420d Label Printer 930a Printer 0a62 MPMan 0010 MPMan MP-F40 MP3 Player @@ -10408,6 +10550,7 @@ c303 Saturn USB 2.0 Camera c326 Namuga 1.3M Webcam c33f Webcam + c429 Lenovo ThinkCentre Web Camera 0ac9 Micro Solutions, Inc. 0000 Backpack CD-ReWriter 0001 BACKPACK 2 Cable @@ -10423,6 +10566,7 @@ 0300 IDT1221U RS-232 Adapter 0401 Spectrum III Hybrid Smartcard Reader 0630 Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC + 0810 SecurePIN (IDPA-506100Y) PIN Pad 0ace ZyDAS 1201 ZD1201 802.11b 1211 ZD1211 802.11g @@ -10557,8 +10701,10 @@ 0b0d ProjectLab 0000 CenturyCD 0b0e GN Netcom + 0420 Jabra SPEAK 510 1022 Jabra PRO 9450, Type 9400BS (DECT Headset) 620c Jabra BT620s + 9330 Jabra GN9330 Headset 0b0f AVID Technology 0b10 Pcally 0b11 I Tech Solutions Co., Ltd @@ -10660,6 +10806,10 @@ 0b63 ADLink Technology, Inc. 0b64 Wonderful Wire Cable Co., Ltd 0b65 Expert Magnetics Corp. +0b66 Cybiko Inc. + 0041 Xtreme +0b67 Fairbanks Scales + 555e SCB-R9000 0b69 CacheVision 0b6a Maxim Integrated Products a132 WUP-005 [Nintendo Wii U Pro Controller] @@ -10829,7 +10979,7 @@ 0a4d PocketPC Sync 0a4e PocketPC Sync 0a4f PocketPC Sync - 0a50 HTC SmartPhone Sync + 0a50 SmartPhone (MTP) 0a51 SPV C400 / T-Mobile SDA GSM/GPRS Pocket PC 0a52 SmartPhone Sync 0a53 SmartPhone Sync @@ -10952,9 +11102,11 @@ 0502 ST3300601CB-RK 300 GB External Hard Drive 0503 ST3250824A [Barracuda 7200.9] 2000 Storage Adapter V3 (TPP) + 2100 FreeAgent Go 2200 FreeAgent Go FW 2300 Expansion Portable 2320 USB 3.0 bridge [Portable Expansion Drive] + 3008 FreeAgent Desk 1TB 3320 SRD00F2 [Expansion Desktop Drive] 3332 Expansion 5021 FreeAgent GoFlex USB 2.0 @@ -10964,6 +11116,8 @@ 5121 FreeAgent GoFlex 5161 FreeAgent GoFlex dock a003 Backup Plus + a0a1 Backup Plus Desktop + a0a4 Backup Plus Desktop Drive 0bc3 IPWireless, Inc. 0001 UMTS-TDD (TD-CDMA) modem 0bc4 Microcube Corp. @@ -11032,6 +11186,7 @@ 8174 RTL8192SU 802.11n WLAN Adapter 8176 RTL8188CUS 802.11n WLAN Adapter 8178 RTL8192CU 802.11n WLAN Adapter + 8179 RTL8188EUS 802.11n Wireless Network Adapter 817f RTL8188RU 802.11n WLAN Adapter 8187 RTL8187 Wireless Adapter 8189 RTL8187B Wireless 802.11g 54Mbps Network Adapter @@ -11084,6 +11239,7 @@ 1009 Connect2Air E-5400 D1700 802.11g Wireless Adapter [Intersil ISL3887] 100c Keyboard FSC KBPC PX 100f miniCard D2301 802.11bg Wireless Module [SiS 163U] + 1017 Keyboard KB SCR 0bfd Kvaser AB 0004 USBcan II 000b Leaf Light HS @@ -11160,7 +11316,7 @@ 3bfa pcProx Card Reader 0c2e Metrologic Instruments 0007 Metrologic MS7120 Barcode Scanner (IBM SurePOS mode) - 0200 Metrologic Scanner + 0200 MS7120 Barcode Scanner 0204 Metrologic MS7120 Barcode Scanner (keyboard mode) 0206 Metrologic MS4980 Barcode Scanner 0700 Metrologic MS7120 Barcode Scanner (uni-directional serial mode) @@ -11303,12 +11459,14 @@ 62c0 Sonix USB 2.0 Camera 62e0 MSI Starcam Racer 6310 Sonix USB 2.0 Camera + 6341 Defender G-Lens 2577 HD720p Camera 63e0 Sonix Integrated Webcam 63f1 Integrated Webcam 63f8 Sonix Integrated Webcam 6409 Webcam 6413 Integrated Webcam 6417 Integrated Webcam + 6419 Integrated Webcam 641d 1.3 MPixel Integrated Webcam 6480 Sonix 1.3 MP Laptop Integrated Webcam 648b Integrated Webcam @@ -11540,6 +11698,7 @@ 00a5 Cinergy Hybrid Stick 00a9 RTL2838 DVB-T COFDM Demodulator [TerraTec Cinergy T Stick Black] 00b3 NOXON DAB/DAB+ Stick + 00e0 NOXON DAB/DAB+ Stick V2 10a7 TerraTec G3 0cd4 Bang Olufsen 0101 BeolinkPC2 @@ -11591,7 +11750,7 @@ 0005 AR5523 0006 AR5523 (no firmware) 1001 Thomson TG121N [Atheros AR9001U-(2)NG] - 1002 TP-Link TL-WN821N v2 802.11n [Atheros AR9170] + 1002 TP-Link TL-WN821N v2 / TL-WN822N v1 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 AR7010 (no firmware) @@ -11599,7 +11758,7 @@ 3002 AR3011 Bluetooth 3005 AR3011 Bluetooth 3008 Bluetooth (AR3011) - 7015 TP-Link TL-WN821N v3 802.11n [Atheros AR7010+AR9287] + 7015 TP-Link TL-WN821N v3 / TL-WN822N v2 802.11n [Atheros AR7010+AR9287] 9170 AR9170 802.11n 9271 AR9271 802.11n b002 Ubiquiti WiFiStation 802.11n [Atheros AR9271] @@ -11697,6 +11856,7 @@ 0d4f EADS Airbus France 0d50 Cleware GmbH 0011 USB-Temp2 Thermometer + 0040 F4 foot switch 0d51 Volex (Asia) Pte., Ltd 0d53 HMI Co., Ltd 0d54 Holon Corp. @@ -12215,6 +12375,7 @@ 1332 5 IMT 1416 32 IT 1417 A43 IT + 14ad 97 Titanium HD 150e 80 G9 0e7b On-Tech Industry Co., Ltd 0e7e Gmate, Inc. @@ -12400,6 +12561,7 @@ 0f52 Wing Key Electrical Co., Ltd 0f53 Dongguan White Horse Cable Factory, Ltd 0f54 Kawai Musical Instruments Mfg. Co., Ltd + 0101 MP6 Stage Piano 0f55 AmbiCom, Inc. 0f5c Prairiecomm, Inc. 0f5d NewAge International, LLC @@ -12498,6 +12660,7 @@ 0112 W995 Walkman Phone 015a Xperia Pro [Media Transfer Protocol] 0166 Xperia Mini Pro + 0167 ST15i (Xperia mini) 0169 Xperia S 0172 Xperia P 0177 Xperia Ion [Mass Storage] @@ -12513,9 +12676,12 @@ 3138 Xperia X10 mini pro 3149 Xperia X8 5177 Xperia Ion [Debug Mode] + 518c C1605 [Xperia E dual] MTD mode 614f Xperia X12 (debug mode) 6166 Xperia Mini Pro + 618c C1605 [Xperia E dual] MSC mode 715a Xperia Pro [Tethering] + 7166 Xperia Mini Pro (Tethering mode) 7177 Xperia Ion [Tethering] 8004 9000 Phone [Mass Storage] adde Boot loader @@ -12570,6 +12736,8 @@ 1008 Mini stick Suunto 0fd0 Tulip Computers B.V. 0fd1 Giant Electronics Ltd. +0fd2 Seac Banche + 0001 RDS 6000 0fd4 Tenovis GmbH & Co., KG 0fd5 Direct Access Technology, Inc. 0fd9 Elgato Systems GmbH @@ -12626,7 +12794,14 @@ 618f Ally/Optimus One 61c6 Vortex (msc) 61cc Optimus S + 61f1 Optimus Android Phone [LG Software mode] + 61f9 V909 G-Slate 61fc Optimus 3 + 61fe Optimus Android Phone [USB tethering mode] + 6300 Optimus Android Phone + 631c Optimus Android Phone [MTP mode] + 631e Optimus Android Phone [Camera/PTP mode] + 6356 Optimus Android Phone [Virtual CD mode] 6800 CDMA Modem 7000 LG LDP-7024D(LD)USB a400 Renoir (KC910) @@ -12698,6 +12873,7 @@ 0068 3,5'' HDD case MD-231 1038 Ideazon, Inc. 0100 Zboard + 1361 Sensei 1039 devolo AG 0824 1866 802.11bg [Texas Instruments TNETW1450] 2140 dsl+ 1100 duo @@ -12747,6 +12923,9 @@ 0009 RE-BL PlayStation 3 IR-to-Bluetooth converter 1050 Yubico.com 0010 Yubikey + 0110 Yubikey NEO OTP + 0111 Yubikey NEO OTP+CCID + 0211 Gnubby 1053 Immanuel Electronics Co., Ltd 1054 BMS International Beheer N.V. 5004 DSL 7420 Loader @@ -12761,7 +12940,8 @@ 0702 Passport External HDD 0704 Passport External HDD 070a My Passport Essential SE - 071a My Passport 1TB + 071a My Passport + 0730 My Passport 0740 My Passport 0742 My Passport Essential SE 0748 My Passport 1TB USB 3.0 @@ -12880,6 +13060,7 @@ 107f KidzMouse, Inc. 1082 Shin-Etsukaken Co., Ltd 1083 Canon Electronics, Inc. + 161b DR-2010C Scanner 162c P-150 Scanner 1084 Pantech Co., Ltd 108a Chloride Power Protection @@ -12951,6 +13132,7 @@ 8789 C8051F34x Extender & EDID MGR [EMX-DVI] 87be C8051F34x HDMI Audio Extractor [EMX-HD-AUD] 8863 C8051F34x Bootloader + 8897 C8051F38x HDMI Splitter [UHBX] ea60 CP210x UART Bridge / myAVR mySmartUSB light ea61 CP210x UART Bridge ea70 CP210x UART Bridge @@ -12963,6 +13145,7 @@ 1101 MP3 Player 10cd Kycon, Inc. 10ce Silicon Labs + 000e Shinko/Sinfonia CHC-S2145 ea6a MobiData EDGE USB Modem 10cf Velleman Components, Inc. 2011 R-Engine MPEG2 encoder/decoder @@ -12976,6 +13159,7 @@ 0301 CP42 - Communication Processor 10d4 Man Boon Manufactory, Ltd 10d5 Uni Class Technology Co., Ltd + 0004 PS/2 Converter 5552 KVM Human Interface Composite Device (Keyboard/Mouse ports) 55a2 2Port KVMSwitcher 10d6 Actions Semiconductor Co., Ltd @@ -13215,11 +13399,15 @@ 524e RoadMate 1475T 5260 Triton Handheld GPS Receiver (300/400/500/1500/2000) 1210 DigiTech + 0016 RP500 Guitar Multi-Effects Processor 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. +1228 Datapaq Limited + 0012 Q18 Data Logger + 0015 TPaq21/MPaq21 Datalogger 1230 Chipidea-Microelectronica, S.A. 1233 Denver Electronics 5677 FUSB200 mp3 player @@ -13368,17 +13556,20 @@ 14c3 K5005 Vodafone LTE/UMTS/GSM Modem/Networkcard 14c8 K5005 Vodafone LTE/UMTS/GSM MOdem/Networkcard 14c9 K3770 3G Modem + 14cf K3772 14d1 K3770 3G Modem (Mass Storage Mode) 14f1 Gobi 3000 HSPA+ Modem 1501 Pulse 1505 E398 LTE/UMTS/GSM Modem/Networkcard - 1506 E398 LTE/UMTS/GSM Modem/Networkcard + 1506 Modem/Networkcard 150a E398 LTE/UMTS/GSM Modem/Networkcard 1520 K3765 HSPA 1521 K4505 HSPA+ + 155a R205 Mobile WiFi (CD-ROM mode) 1805 AT&T Go Phone U2800A phone 1c05 E173s 3G broadband stick (modem on) 1c0b E173s 3G broadband stick (modem off) + 1c20 R205 Mobile WiFi (Charging) 1d50 ET302s TD-SCDMA/TD-HSDPA Mobile Broadband 380b WiMAX USB modem(s) 12d2 LINE TECH INDUSTRIAL CO., LTD. @@ -13514,6 +13705,7 @@ 0011 VFS5011 Fingerprint Reader 0018 Fingerprint scanner 003c VFS471 Fingerprint Reader + 003d VFS491 138e Jungo LTD 9000 Raisonance S.A. STM32 ARM evaluation board 1390 TOMTOM B.V. @@ -13661,6 +13853,9 @@ 1402 Bowe Bell & Howell 1403 Sitronix 0001 Digital Photo Frame +1409 IDS Imaging Development Systems GmbH + 1000 generic (firmware not loaded yet) + 1485 uEye UI1485 140e Telechips, Inc. b011 TCC780X-based player (USB Boot mode) b021 TCC77X-based players (USB Boot mode) @@ -13712,6 +13907,7 @@ 0007 Development board JTAG 1446 X.J.GROUP 6a73 Stamps.com Model 510 5LB Scale + 6a78 DYMO Endicia 75lb Digital Scale 1453 Radio Shack 4026 26-183 Serial Cable 1456 Extending Wire & Cable Co., Ltd. @@ -13750,6 +13946,7 @@ e02c Infrared Receiver e03a eHome Infrared Receiver e03c eHome Infrared Receiver + e03d 2 Channel Audio e03e Infrared Receiver [IR605A/Q] 147e Upek 1000 Biometric Touchchip/Touchstrip Fingerprint Sensor @@ -13844,6 +14041,8 @@ 14d8 JAMER INDUSTRIES CO., LTD. 14dd Raritan Computer, Inc. 1007 D2CIM-VUSB KVM connector +14e0 WiNRADiO Communications + 0501 WR-G528e 'CHEETAH' 14e1 Dialogue Technology Corp. 5000 PenMount 5000 Touch Controller 14e5 SAIN Information & Communications Co., Ltd. @@ -13886,6 +14085,7 @@ 152a Thesycon Systemsoftware & Consulting GmbH 152d JMicron Technology Corp. / JMicron USA Technology Corp. 0539 JMS539 SuperSpeed SATA II 3.0G Bridge + 0770 Alienware Integrated Webcam 2329 JM20329 SATA Bridge 2335 ATA/ATAPI Bridge 2336 Hard Disk Drive @@ -13906,6 +14106,7 @@ 0017 RZ01-0035 Laser Gaming Mouse [Imperator] 001c RZ01-0036 Optical Gaming Mouse [Abyssus] 0024 Razer Mamba + 002e RZ01-0058 Gaming Mouse [Naga] 0036 RZ01-0075, Gaming Mouse [Naga Hex] 0101 Copperhead Mouse 0102 Tarantula Keyboard @@ -13960,6 +14161,7 @@ 0820 SmartPocket Class Device 1598 Kunshan Guoji Electronics Co., Ltd. 15a2 Freescale Semiconductor, Inc. + 0038 9S08JS Bootloader 003b USB2CAN Application for ColdFire DEMOJM board 0042 OSBDM - Debug Port 004f i.MX28 SystemOnChip in RecoveryMode @@ -14035,6 +14237,7 @@ 2007 RSA SecurID (R) Authenticator 15e4 Numark 0024 Mixtrack + 0140 ION VCR 2 PC / Video 2 PC 15e8 SohoWare 9100 NUB100 Ethernet [pegasus] 9110 10/100 USB Ethernet @@ -14368,9 +14571,11 @@ 0504 RETRO Innovations ZoomFloppy 054b GrauTec ReelBox OLED Display (external) 05be EasyLogic Board + 06f9 Gabotronics Xminilab 0753 Digistump DigiSpark 075c AB-1.x UAC1 [Audio Widget] 075d AB-1.x UAC2 [Audio Widget] + 080a S2E1 Interface 16d3 Frontline Test Equipment, Inc. 16d5 AnyDATA Corporation 6202 CDMA/UMTS/GPRS modem @@ -14476,6 +14681,8 @@ aa11 Web Cam 1753 GERTEC Telecomunicacoes Ltda. c901 PPC900 Pinpad Terminal +1756 ENENSYS Technologies + 0006 DiviPitch 1759 LucidPort Technology, Inc. 1761 ASUSTek Computer, Inc. (wrong ID) 0b05 802.11n Network Adapter (wrong ID - swapped vendor and device) @@ -14519,8 +14726,11 @@ 0101 UB1 boundary microphone 0200 StudioDock monitors (internal hub) 0201 StudioDock monitors (audio) + 0210 StudioGT monitors 0301 Q2U handheld microphone with XLR 0302 GoMic compact condenser microphone + 0304 Q2U handheld mic with XLR + 0305 GoMic compact condenser mic 0310 Meteor condenser microphone 17a4 Concept2 0001 Performance Monitor 3 @@ -14532,6 +14742,8 @@ 0005 M-Bus Master MultiPort 250D 17b3 Grey Innovation 0004 Linux-USB Midi Gadget +17b5 Lunatone + 0010 MFT Sensor 17ba SAURIS GmbH 0001 SAU510-USB [no firmware] 0510 SAU510-USB and SAU510-USB plus JTAG Emulators @@ -14559,6 +14771,7 @@ 17d3 Korea Techtron Co., Ltd. 17e9 DisplayLink 0051 USB VGA Adaptor + 030b HP T100 0377 Plugable UD-160-A (M) 0378 Plugable UGA-2K-A 0379 Plugable UGA-125 @@ -14567,10 +14780,12 @@ 037c Plugable DC-125 037d Plugable USB2-HDMI-165 430a HP Port Replicator (Composite Device) + 4312 S2340T 17eb Cornice, Inc. 17ef Lenovo 1003 Integrated Smart Card Reader 1004 Integrated Webcam + 1008 Hub 100a ThinkPad Mini Dock Plus Series 3 3815 ChipsBnk 2GB USB Stick 4802 Lenovo Vc0323+MI1310_SOC Camera @@ -14585,8 +14800,10 @@ 4813 Integrated Webcam [R5U877] 4814 Integrated Webcam [R5U877] 4815 Integrated Webcam [R5U877] + 4816 Integrated Webcam 481c Integrated Webcam 481d Integrated Webcam + 6004 ISD-V4 Tablet Pen 6007 Smartcard Keyboard 6009 ThinkPad Keyboard with TrackPoint 6014 Mini Wireless Keyboard N5901 @@ -14632,6 +14849,7 @@ 1873 Navilock ee93 EasyLogger 187c Alienware Corporation + 0511 AlienFX Mobile lighting 0600 Dual Compatible Game Pad 187f Siano Mobile Silicon 0010 Stallar Board @@ -14657,7 +14875,7 @@ 0227 Pocket Hard Drive 022b Portable Hard Drive (Store'n'Go) 0237 Portable Harddrive (500 GB) - 0302 32GB Flash Drive + 0302 Flash Drive 18b1 Petalynx 0037 Maxter Remote Control 18b4 e3C Technologies @@ -14686,15 +14904,17 @@ 4e22 Nexus S (debug) 4e24 Nexus S (tether) 4e40 Nexus 7 (fastboot) - 4e41 ASUS Nexus 7 (MTP modus) + 4e41 Nexus 7 (MTP) 4e42 Nexus 7 (debug) - 4e43 ASUS Nexus 7 (PTP modus) - 4ee1 Nexus 4 + 4e43 Nexus 7 (PTP) + 4ee1 Nexus 4 / 10 4ee2 Nexus 4 (debug) 4ee3 Nexus 4 (tether) 4ee4 Nexus 4 (debug + tether) 7102 Toshiba Thrive tablet b004 Pandigital / B&N Novel 9" tablet + d109 LG G2x MTP + d10a LG G2x MTP (debug) 18d5 Starline International Group Limited 18d9 Kaba 01a0 B-Net 91 07 @@ -14725,10 +14945,13 @@ 190d Motorola GSG 1914 Alco Digital Devices Limited 1915 Nordic Semiconductor ASA + 000c Wireless Desktop nRF24L01 CX-1766 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] +1923 FitLinxx + 0002 Personal SyncPoint 1926 NextWindow 0003 1900 HID Touchscreen 0006 1950 HID Touchscreen @@ -14758,6 +14981,7 @@ 0085 1950 HID Touchscreen 0086 1950 HID Touchscreen 0087 1950 HID Touchscreen + 0dc2 HID Touchscreen 192f Avago Technologies, Pte. 0000 Mouse 0416 ADNS-5700 Optical Mouse Controller (3-button) @@ -14789,6 +15013,7 @@ 0301 AudioBox 1951 Hyperstone AG 1953 Ironkey Inc. + 0202 S200 2GB Rev. 1 1954 Radiient Technologies 195d Itron Technology iONE 7002 Libra-Q11 IR remote @@ -14868,6 +15093,8 @@ 2000 MF627/MF628/MF628+/MF636+ HSDPA/HSUPA fff2 Gobi Wireless Modem (QDL mode) fff3 Gobi Wireless Modem +19db KFI Printers + 02f1 NAUT324C 19e1 WeiDuan Electronic Accessory (S.Z.) Co., Ltd. 19e8 Industrial Technology Research Institute 19ef Pak Heng Technology (Shenzhen) Co., Ltd. @@ -14878,6 +15105,7 @@ 19ff Dynex 0102 1.3MP Webcam 0201 Rocketfish Wireless 2.4G Laser Mouse + 0238 DX-WRM1401 Mouse 1a08 Bellwood International, Inc. 1a0a USB-IF non-workshop badd USB OTG Compliance test device @@ -14895,7 +15123,7 @@ 0802 Gamepad 1a36 Biwin Technology Ltd. 1a40 Terminus Technology Inc. - 0101 4-Port HUB + 0101 Hub 0201 FE 2.1 7-port Hub 1a41 Action Electronics Co., Ltd. 1a44 VASCO Data Security International @@ -14912,6 +15140,8 @@ 1a72 Physik Instrumente 1008 E-861 PiezoWalk NEXACT Controller 1a79 Bayer Health Care LLC + 6002 Contour + 7410 Contour Next 1a7b Lumberg Connect GmbH & Co. KG 1a7c Evoluent 0068 VerticalMouse 3 @@ -14944,6 +15174,8 @@ 1ab1 Rigol Technologies 0588 DS1000 SERIES 1acb Salcomp Plc +1acc Midiplus Co, Ltd. + 0103 AudioLink plus 4x4 2.9.28 1ad1 Desay Wire Co., Ltd. 1ad4 APS 0002 KM290-HRS @@ -15086,6 +15318,29 @@ 1b47 Energizer Holdings, Inc. 0001 CHUSB Duo Charger (NiMH AA/AAA USB smart charger) 1b48 Plastron Precision Co., Ltd. +1b52 ARH Inc. + 2101 FXMC Neural Network Controller + 2102 FXMC Neural Network Controller V2 + 2103 FXMC Neural Network Controller V3 + 4101 Passport Reader CLR device + 4201 Passport Reader PRM device + 4202 Passport Reader PRM extension device + 4203 Passport Reader PRM DSP device + 4204 Passport Reader PRMC device + 4205 Passport Reader CSHR device + 4206 Passport Reader PRMC V2 device + 4301 Passport Reader MRZ device + 4302 Passport Reader MRZ DSP device + 4303 Passport Reader CSLR device + 4401 Card Reader + 4501 Passport Reader RFID device + 4502 Passport Reader RFID AIG device + 6101 Neural Network Controller + 6202 Fingerprint Reader device + 6203 Fingerprint Scanner device + 8101 Camera V1 + 8102 Recovery / Camera V2 + 8103 Camera V3 1b59 K.S. Terminals Inc. 1b5a Chao Zhou Kai Yuan Electric Co., Ltd. 1b65 The Hong Kong Standards and Testing Centre Ltd. @@ -15137,16 +15392,21 @@ 1bae Vuzix Corporation 0002 VR920 Immersive Eyewear 1bbb T & A Mobile Phones + 011e Alcatel One Touch L100V / Telekom Speedstick LTE II + f017 Alcatel One Touch L100V / Telekom Speedstick LTE II 1bc4 Ford Motor Co. 1bc5 AVIXE Technology (China) Ltd. -1bc7 Telit +1bc7 Telit Wireless Solutions 0020 HE863 0021 HE910 + 0023 HE910-D ECM 1003 UC864-E 1004 UC864-G 1005 CC864-DUAL 1006 CC864-SINGLE 1010 DE910-DUAL + 1011 CE910-DUAL + 1200 LE920 1bce Contac Cable Industrial Limited 1bcf Sunplus Innovation Technology Inc. 0007 Optical Mouse @@ -15156,6 +15416,7 @@ 0c31 SPIF30x Serial-ATA bridge 2885 ASUS Webcam 2888 HP Universal Camera + 2b83 Laptop Integrated Webcam FHD 1bd0 Hangzhou Riyue Electronic Co., Ltd. 1bd5 BG Systems, Inc. 1bde P-TWO INDUSTRIES, INC. @@ -15241,6 +15502,7 @@ 1cbe Luminary Micro Inc. 00fd In-Circuit Debug Interface 00ff Stellaris ROM DFU Bootloader + 0166 CANAL USB2CAN 1cbf FORTAT SKYMARK INDUSTRIAL COMPANY 1cc0 PlantSense 1cca NextWave Broadband Inc. @@ -15296,6 +15558,8 @@ 000a Dream Cheeky Mailbox Friends Alert 000d Dream Cheeky Big Red Button 0013 Dream Cheeky LED Message Board +1d45 Touch + 1d45 Foxlink Optical touch sensor 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 @@ -15303,6 +15567,7 @@ 1d50 OpenMoko, Inc. 5119 GTA01/GTA02 U-Boot Bootloader 602b FPGALink + 6053 Darkgame Controller 1d57 Xenta 0005 Wireless Receiver (Keyboard and Mouse) 0006 Wireless Receiver (RC Laser Pointer) @@ -15325,6 +15590,8 @@ 0104 Multifunction Composite Gadget 0105 FunctionFS Gadget 0200 Qemu Audio Device +1d90 Citizen + 201e PPU-700 1de1 Actions Microelectronics Co. 1101 Generic Display Device (Mass storage mode) c101 Generic Display Device @@ -15368,6 +15635,7 @@ 2030 2030 USB Keyboard 1e68 TrekStor GmbH & Co. KG 001b DataStation maxi g.u + 0050 DataStation maxi light 1e71 NZXT 0001 Avatar Optical Mouse 1e74 Coby Electronics Corporation @@ -15396,12 +15664,17 @@ 1ee8 ONDA COMMUNICATION S.p.a. 0014 MT833UP 1ef6 EADS Deutschland GmbH + 2233 Cassidian NH90 STTE 5064 FDR Interface + 5523 Cassidian SSDC Adapter II + 5545 Cassidian SSDC Adapter III 5648 RIU CSMU/BSD 564a Cassidian RIU CSMU/BSD Simulator 1f28 Cal-Comp 0020 CDMA USB Modem A600 0021 CD INSTALLER USB Device +1f3a Onda (unverified) + efe8 V972 tablet in flashing mode 1f44 The Neat Company 0001 NM-1000 scanner 1f48 H-TRONIC GmbH diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq index a02097e..34eee0c 100644 --- a/src/initscripts/init.d/dnsmasq +++ b/src/initscripts/init.d/dnsmasq @@ -50,8 +50,8 @@ case "${1}" in boot_mesg "Starting Domain Name Service Proxy..." eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) - ARGS= - [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN" + ARGS="$CUSTOM_ARGS" + [ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="$ARGS -s $DOMAIN_NAME_GREEN" echo > /var/ipfire/red/resolv.conf # Clear it if [ -e "/var/ipfire/red/dns1" ]; then @@ -73,8 +73,6 @@ case "${1}" in # Add custom forward dns zones. ARGS="${ARGS} $(dns_forward_args /var/ipfire/dnsforward/config)"
- ARGS="$ARGS $CUSTOM_ARGS" - loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid index 08a3029..62d5bea 100644 --- a/src/initscripts/init.d/squid +++ b/src/initscripts/init.d/squid @@ -62,13 +62,25 @@ case "$1" in eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
if [ -e /var/ipfire/proxy/enable -o -e /var/ipfire/proxy/enable_blue ]; then - # Add Address to errorpage stylesheet sed "s|XXXhostXXX|$GREEN_ADDRESS|g" /var/ipfire/proxy/errorpage-$ERR_DESIGN.css > \ /etc/squid/errorpage.css
+ boot_mesg "Creating Squid swap directories..." + /usr/sbin/squid -z >/dev/null 2>&1 + evaluate_retval + + # Make sure, that the process above has finished. + counter=5 + while [ ${counter} -gt 0 ]; do + if pidofproc -s /usr/sbin/squid; then + sleep 1 + else + break + fi + done + boot_mesg "Starting Squid Proxy Server..." - loadproc /usr/sbin/squid -z >/dev/null 2>&1 loadproc /usr/sbin/squid fi
diff --git a/src/initscripts/init.d/tor b/src/initscripts/init.d/tor index d631e86..9c1dfc7 100644 --- a/src/initscripts/init.d/tor +++ b/src/initscripts/init.d/tor @@ -22,6 +22,10 @@ function setup_firewall() { if [ "${TOR_RELAY_ENABLED}" = "on" -a -n "${TOR_RELAY_PORT}" ]; then iptables -A TOR_INPUT -p tcp --dport "${TOR_RELAY_PORT}" -j ACCEPT fi + + if [ "${TOR_RELAY_ENABLED}" = "on" -a -n "${TOR_RELAY_DIRPORT}" ] && [ "${TOR_RELAY_DIRPORT}" -ne 0 ]; then + iptables -A TOR_INPUT -p tcp --dport "${TOR_RELAY_DIRPORT}" -j ACCEPT + fi }
function flush_firewall() { diff --git a/src/paks/fetchmail/install.sh b/src/paks/fetchmail/install.sh index 31c5fec..b379c0c 100644 --- a/src/paks/fetchmail/install.sh +++ b/src/paks/fetchmail/install.sh @@ -25,3 +25,7 @@ extract_files restore_backup ${NAME} start_service --background ${NAME} + +ln -sf ../init.d/fetchmail /etc/rc.d/rc0.d/K25fetchmail +ln -sf ../init.d/fetchmail /etc/rc.d/rc3.d/S35fetchmail +ln -sf ../init.d/fetchmail /etc/rc.d/rc6.d/K25fetchmail diff --git a/src/paks/fetchmail/uninstall.sh b/src/paks/fetchmail/uninstall.sh index a7b8a53..2d2606f 100644 --- a/src/paks/fetchmail/uninstall.sh +++ b/src/paks/fetchmail/uninstall.sh @@ -25,3 +25,5 @@ stop_service ${NAME} make_backup ${NAME} remove_files + +rm -f /etc/rc.d/rc*.d/*fetchmail diff --git a/src/paks/postfix/install.sh b/src/paks/postfix/install.sh index b8b1809..56c23e2 100644 --- a/src/paks/postfix/install.sh +++ b/src/paks/postfix/install.sh @@ -27,6 +27,8 @@ postalias /etc/aliases # Set postfix's hostname postconf -e "myhostname=$(hostname -f)" /etc/init.d/postfix start -ln -sf ../init.d/fetchmail /etc/rc.d/rc0.d/K25fetchmail -ln -sf ../init.d/fetchmail /etc/rc.d/rc3.d/S35fetchmail -ln -sf ../init.d/fetchmail /etc/rc.d/rc6.d/K25fetchmail + +# Enable autostart for postfix +ln -sf ../init.d/postfix /etc/rc.d/rc0.d/K25postfix +ln -sf ../init.d/postfix /etc/rc.d/rc3.d/S35postfix +ln -sf ../init.d/postfix /etc/rc.d/rc6.d/K25postfix diff --git a/src/paks/xinetd/install.sh b/src/paks/xinetd/install.sh new file mode 100644 index 0000000..347fd36 --- /dev/null +++ b/src/paks/xinetd/install.sh @@ -0,0 +1,34 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can 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 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} + +mkdir /etc/xinetd.d + +start_service --background ${NAME} + +ln -sf ../init.d/${NAME} /etc/rc.d/rc0.d/K30xinetd +ln -sf ../init.d/${NAME} /etc/rc.d/rc3.d/S30xinetd +ln -sf ../init.d/${NAME} /etc/rc.d/rc6.d/K30xinetd diff --git a/src/paks/xinetd/uninstall.sh b/src/paks/xinetd/uninstall.sh new file mode 100644 index 0000000..a7b8a53 --- /dev/null +++ b/src/paks/xinetd/uninstall.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can 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 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +make_backup ${NAME} +remove_files diff --git a/src/paks/xinetd/update.sh b/src/paks/xinetd/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/xinetd/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can 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 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh diff --git a/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch b/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch new file mode 100644 index 0000000..acfb12f --- /dev/null +++ b/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch @@ -0,0 +1,39 @@ +diff -Naur compat-drivers-3.8.3-2-snpu.org/drivers/net/wireless/ath/regd.c compat-drivers-3.8.3-2-snpu/drivers/net/wireless/ath/regd.c +--- compat-drivers-3.8.3-2-snpu.org/drivers/net/wireless/ath/regd.c 2013-03-15 22:55:09.000000000 +0100 ++++ compat-drivers-3.8.3-2-snpu/drivers/net/wireless/ath/regd.c 2013-08-22 11:51:36.793297656 +0200 +@@ -200,6 +200,8 @@ + u32 bandwidth = 0; + int r; + ++ return; ++ + for (band = 0; band < IEEE80211_NUM_BANDS; band++) { + + if (!wiphy->bands[band]) +@@ -259,6 +261,8 @@ + u32 bandwidth = 0; + int r; + ++ return; ++ + sband = wiphy->bands[IEEE80211_BAND_2GHZ]; + if (!sband) + return; +@@ -308,6 +312,8 @@ + struct ieee80211_channel *ch; + unsigned int i; + ++ return; ++ + if (!wiphy->bands[IEEE80211_BAND_5GHZ]) + return; + +@@ -514,6 +520,8 @@ + { + const struct ieee80211_regdomain *regd; + ++ return 0; ++ + wiphy->reg_notifier = reg_notifier; + wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY; + diff --git a/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch b/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch new file mode 100644 index 0000000..24a6ce4 --- /dev/null +++ b/src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch @@ -0,0 +1,12 @@ +diff -Nur iptraf-ng-1.1.4-orig/src/tcptable.c iptraf-ng-1.1.4/src/tcptable.c +--- iptraf-ng-1.1.4-orig/src/tcptable.c 2013-07-23 15:06:11.000000000 +0200 ++++ iptraf-ng-1.1.4/src/tcptable.c 2013-08-28 19:10:33.000000000 +0200 +@@ -444,6 +444,8 @@ + size_t bufsize) + { + time_t interval = time(NULL) - entry->conn_starttime; ++ if (interval < 1) ++ interval = 1; + + char rbuf[64]; + rate_print(entry->bcount / interval, rbuf, sizeof(rbuf));
hooks/post-receive -- IPFire 2.x development tree