IPFire-SCM September 2012

ipfire-scm@lists.ipfire.org

1 participants
51 discussions

[git.ipfire.org] IPFire 2.x development tree branch, core62, created. 9b4bd0e29e8f8f743884a327b0a90d2124a7ff97
by git＠ipfire.org 06 Sep '12

06 Sep '12

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, core62 has been created at 9b4bd0e29e8f8f743884a327b0a90d2124a7ff97 (commit) - Log ----------------------------------------------------------------- commit 9b4bd0e29e8f8f743884a327b0a90d2124a7ff97 Merge: 5122daf 83aefc1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 6 11:22:44 2012 +0200 Merge branch 'master' into core62 ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 83aefc12ddcc59470f151f833df0474ed1617108
by git＠ipfire.org 06 Sep '12

06 Sep '12

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 83aefc12ddcc59470f151f833df0474ed1617108 (commit) via d99f086a5b32d9e433d7964b7e385b43ac5122ac (commit) via 4c92799d546822f43228d0b32c7812fe4ddac1c0 (commit) via 7f02975965c00b67e117c1f6a80e3e8c3baa1eab (commit) via 9c5ef64e0a6e9d7daeb1fa338a021a81d00327e8 (commit) via dcd949d8210ac2fea473ea48a3c042e7ae260d83 (commit) via ec9d4240f0631a0d25ca873941770d9db05ab660 (commit) via f5dc4b2b2fca9d6a192664e276e0680e7386d946 (commit) via 0ba7cc35a71aa47a3ff30f9638978a70e24664ac (commit) via 2f062ab1af0b5bf56eff06856c78f1e21b6a6c59 (commit) via 422bad80dfa29a08c7dc3f5f306ff80b5cfe8271 (commit) via 472e738988c18957261e0dc3f8a343bd4f2ffd71 (commit) via b651586493b8075b24a4cf2c4da05c3a1a76341b (commit) via d378829f3eb1e845eb72c22af49f191fa768ed54 (commit) via 6bea011ac961ea1bf1c52961e63f7997888d9194 (commit) via d23fc9122091aea3581571e1367d4696d834cd1c (commit) via 3eeb913b052a2debec285c5fa9ce9d108855931d (commit) via 9d0acf61e017f010df9f77107da45825a7f3f3dc (commit) via a53c3c2621a67674d105f0afa40f6dfd15cbbd78 (commit) via 890f0b12f7f5de0581a5a23e69bb0ea2bcfeada4 (commit) via 4e2bce180421f90ab45ed71d00d2bbf902c407ee (commit) via e967320c35488b13cf6dd77b0745fc8c6f083d68 (commit) via 3bdc0102722bdbccd4429f0b38c4fb6a21f3f1c8 (commit) via 946a2afee8ac9b5a97ba3347ae4eb4db10dd66bf (commit) via 45fba4eaff00c74564fb4a07fe8f62b11e723f92 (commit) via 78a14abf81e61ea4fc62d313dfd6779cda9421ae (commit) via c9e01c8cb87ff79a6fbb3a98e552757072c251ef (commit) via a1efb5dcc41a32a83644005d150420cb71e07f69 (commit) via 466a93593959397ed860711a00119041c5ffb038 (commit) via e3cb5d8b8e966f78ac5e11f61220d28b990f9e48 (commit) from 5ac2ed47781a5f70a24b9ecf3339010bb06d470c (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 83aefc12ddcc59470f151f833df0474ed1617108 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 6 11:19:51 2012 +0200 finished core62. commit d99f086a5b32d9e433d7964b7e385b43ac5122ac Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 6 10:49:56 2012 +0200 core62: add hwdata updates to core. commit 4c92799d546822f43228d0b32c7812fe4ddac1c0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 6 10:45:41 2012 +0200 hwdata: update usb id database to 30072012. commit 7f02975965c00b67e117c1f6a80e3e8c3baa1eab Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 6 10:44:45 2012 +0200 hwdata: update pci id database 06092012. commit 9c5ef64e0a6e9d7daeb1fa338a021a81d00327e8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 6 10:39:05 2012 +0200 GeoIP: update database to 05092012. commit dcd949d8210ac2fea473ea48a3c042e7ae260d83 Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Date: Mon Sep 3 09:58:28 2012 +0200 usb_modeswitch_data: update to 20120815. commit ec9d4240f0631a0d25ca873941770d9db05ab660 Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Date: Mon Sep 3 09:55:58 2012 +0200 usb_modeswitch: update to 1.2.4. commit f5dc4b2b2fca9d6a192664e276e0680e7386d946 Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Date: Mon Sep 3 09:02:26 2012 +0200 configroot: fix rootfile again. commit 0ba7cc35a71aa47a3ff30f9638978a70e24664ac Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Date: Sun Sep 2 17:34:08 2012 +0200 php: update to 5.3.16. commit 2f062ab1af0b5bf56eff06856c78f1e21b6a6c59 Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Date: Sun Sep 2 17:32:28 2012 +0200 configroot: update rootfile. commit 422bad80dfa29a08c7dc3f5f306ff80b5cfe8271 Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Date: Sun Sep 2 17:30:35 2012 +0200 apcupsd: rootfile update. commit 472e738988c18957261e0dc3f8a343bd4f2ffd71 Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Date: Sun Sep 2 17:26:29 2012 +0200 nmap: rootfile update. commit b651586493b8075b24a4cf2c4da05c3a1a76341b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 24 16:14:16 2012 +0200 apcupsd: Bump package release number. commit d378829f3eb1e845eb72c22af49f191fa768ed54 Author: Przemek Zdroik <zdroyer(a)gmail.com> Date: Thu Aug 23 14:54:48 2012 +0200 apcupsd: including multimon.cgi in the package (in order to allow monitoring more than one ups) commit 6bea011ac961ea1bf1c52961e63f7997888d9194 Author: Przemek Zdroik <zdroyer(a)gmail.com> Date: Thu Aug 23 17:00:43 2012 +0200 apcupsd: updated to version 3.14.10 (directly from sf.net) commit d23fc9122091aea3581571e1367d4696d834cd1c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 24 15:58:38 2012 +0200 Add a script to create VLAN interfaces (on console). commit 3eeb913b052a2debec285c5fa9ce9d108855931d Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Fri Aug 24 15:47:01 2012 +0200 nmap: Update to 6.01. commit 9d0acf61e017f010df9f77107da45825a7f3f3dc Author: Erik Kapfer <erik.kapfer(a)ipfire.org> Date: Fri Aug 24 15:44:11 2012 +0200 fping: New package. commit a53c3c2621a67674d105f0afa40f6dfd15cbbd78 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 24 15:37:36 2012 +0200 minidlna: Add initscript and all the other fancy install stuff. commit 890f0b12f7f5de0581a5a23e69bb0ea2bcfeada4 Merge: e967320 4e2bce1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 24 15:29:29 2012 +0200 Merge branch 'outgoingfw' into next commit 4e2bce180421f90ab45ed71d00d2bbf902c407ee Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 12 20:45:21 2012 +0200 outgoingfw: Remove unused variable in generator script. commit 78a14abf81e61ea4fc62d313dfd6779cda9421ae Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Aug 7 16:37:29 2012 +0200 outgoingfw: mode=1: Change policy ACCEPT -> RETURN. Because of the early acceptance of packets, that pass the outgoing firewall, it was possible to circumvent the MAC address filter on blue. The RETURN target forces the packets to go on. Other packets, that do not pass the outgoing firewall will be dropped immediately. ----------------------------------------------------------------------- Summary of changes: config/cfgroot/ethernet-vlans | 9 + config/minidlna/minidlna.conf | 67 ++ config/outgoingfw/outgoingfw.pl | 17 +- config/rootfiles/common/armv5tel/initscripts | 3 + config/rootfiles/common/configroot | 3 +- config/rootfiles/common/i586/initscripts | 3 + config/rootfiles/common/nasm | 4 +- config/rootfiles/common/usb_modeswitch_data | 13 + config/rootfiles/core/{55 => 62}/exclude | 0 config/rootfiles/core/{54 => 62}/filelists/GeoIP | 0 config/rootfiles/core/62/filelists/files | 8 + config/rootfiles/core/{58 => 62}/filelists/hwdata | 0 config/rootfiles/core/{57 => 62}/filelists/php | 0 .../core/{53 => 62}/filelists/usb_modeswitch | 0 .../core/{53 => 62}/filelists/usb_modeswitch_data | 0 config/rootfiles/core/{52 => 62}/meta | 0 config/rootfiles/core/{60 => 62}/update.sh | 7 +- config/rootfiles/packages/apcupsd | 7 +- config/rootfiles/packages/flac | 314 ++++++ config/rootfiles/packages/fping | 2 + config/rootfiles/packages/libexif | 64 ++ config/rootfiles/packages/minidlna | 3 + config/rootfiles/packages/nmap | 216 ++++- html/cgi-bin/connections.cgi | 89 ++- lfs/GeoIP | 4 +- lfs/apcupsd | 6 +- lfs/configroot | 1 + lfs/{mediatomb => flac} | 30 +- lfs/{joe => fping} | 8 +- lfs/icecc | 7 +- lfs/initscripts | 1 + lfs/{libdvbpsi => libexif} | 12 +- lfs/{libmad => minidlna} | 18 +- lfs/nasm | 9 +- lfs/nmap | 6 +- lfs/php | 4 +- lfs/usb_modeswitch | 4 +- lfs/usb_modeswitch_data | 4 +- make.sh | 8 +- src/hwdata/pci.ids | 1158 +++++++++++++++----- src/hwdata/usb.ids | 451 ++++++-- src/initscripts/init.d/minidlna | 48 + src/initscripts/init.d/network-vlans | 101 ++ src/paks/{gnump3d => minidlna}/install.sh | 9 +- src/paks/{default => minidlna}/uninstall.sh | 2 +- src/paks/{asterisk => minidlna}/update.sh | 1 - src/patches/flac-1.2.1-asm.patch | 73 ++ src/patches/flac-1.2.1-bitreader.patch | 558 ++++++++++ src/patches/flac-1.2.1-cflags.patch | 45 + src/patches/flac-1.2.1-gcc43.patch | 11 + src/patches/flac-1.2.1-hidesyms.patch | 39 + src/patches/flac-1.2.1-tests.patch | 41 + src/patches/icecream-0.9.7-platform-arm.patch | 22 + 53 files changed, 3049 insertions(+), 461 deletions(-) create mode 100644 config/cfgroot/ethernet-vlans create mode 100644 config/minidlna/minidlna.conf copy config/rootfiles/core/{55 => 62}/exclude (100%) copy config/rootfiles/core/{54 => 62}/filelists/GeoIP (100%) create mode 100644 config/rootfiles/core/62/filelists/files copy config/rootfiles/core/{58 => 62}/filelists/hwdata (100%) copy config/rootfiles/core/{57 => 62}/filelists/php (100%) copy config/rootfiles/core/{53 => 62}/filelists/usb_modeswitch (100%) copy config/rootfiles/core/{53 => 62}/filelists/usb_modeswitch_data (100%) copy config/rootfiles/core/{52 => 62}/meta (100%) copy config/rootfiles/core/{60 => 62}/update.sh (96%) create mode 100644 config/rootfiles/packages/flac create mode 100644 config/rootfiles/packages/fping create mode 100644 config/rootfiles/packages/libexif create mode 100644 config/rootfiles/packages/minidlna copy lfs/{mediatomb => flac} (79%) copy lfs/{joe => fping} (96%) copy lfs/{libdvbpsi => libexif} (92%) copy lfs/{libmad => minidlna} (88%) create mode 100755 src/initscripts/init.d/minidlna create mode 100755 src/initscripts/init.d/network-vlans copy src/paks/{gnump3d => minidlna}/install.sh (90%) copy src/paks/{default => minidlna}/uninstall.sh (98%) copy src/paks/{asterisk => minidlna}/update.sh (98%) create mode 100644 src/patches/flac-1.2.1-asm.patch create mode 100644 src/patches/flac-1.2.1-bitreader.patch create mode 100644 src/patches/flac-1.2.1-cflags.patch create mode 100644 src/patches/flac-1.2.1-gcc43.patch create mode 100644 src/patches/flac-1.2.1-hidesyms.patch create mode 100644 src/patches/flac-1.2.1-tests.patch create mode 100644 src/patches/icecream-0.9.7-platform-arm.patch Difference in files: diff --git a/config/cfgroot/ethernet-vlans b/config/cfgroot/ethernet-vlans new file mode 100644 index 0000000..08cb36a --- /dev/null +++ b/config/cfgroot/ethernet-vlans @@ -0,0 +1,9 @@ +#GREEN_PARENT_DEV="eth0" +#GREEN_VLAN_ID=20 +#GREEN_MAC_ADDRESS="00:11:22:33:44:55" +#BLUE_PARENT_DEV="green0" +#BLUE_VLAN_ID=30 +#BLUE_MAC_ADDRESS="00:22:33:44:55:66" +#ORANGE_PARENT_DEV="green0" +#ORANGE_VLAN_ID=40 +#ORANGE_MAC_ADDRESS="00:33:44:55:66:77" diff --git a/config/minidlna/minidlna.conf b/config/minidlna/minidlna.conf new file mode 100644 index 0000000..0a1813c --- /dev/null +++ b/config/minidlna/minidlna.conf @@ -0,0 +1,67 @@ +# port for HTTP (descriptions, SOAP, media transfer) traffic +port=8200 + +# network interfaces to serve, comma delimited +network_interface=green0,blue0 + +# set this to the directory you want scanned. +# * if have multiple directories, you can have multiple media_dir= lines +# * if you want to restrict a media_dir to a specific content type, you +# can prepend the type, followed by a comma, to the directory: +# + "A" for audio (eg. media_dir=A,/home/jmaggard/Music) +# + "V" for video (eg. media_dir=V,/home/jmaggard/Videos) +# + "P" for images (eg. media_dir=P,/home/jmaggard/Pictures) +media_dir=/var/mp3 + +# set this if you want to customize the name that shows up on your clients +#friendly_name=My DLNA Server + +# set this if you would like to specify the directory where you want MiniDLNA to store its database and album art cache +db_dir=/var/cache/minidlna + +# set this if you would like to specify the directory where you want MiniDLNA to store its log file +#log_dir=/var/log + +# set this to change the verbosity of the information that is logged +# each section can use a different level: off, fatal, error, warn, info, or debug +#log_level=general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn + +# this should be a list of file names to check for when searching for album art +# note: names should be delimited with a forward slash ("/") +album_art_names=Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg/AlbumArt.jpg/albumart.jpg/Album.jpg/album.jpg/Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg + +# set this to no to disable inotify monitoring to automatically discover new files +# note: the default is yes +inotify=yes + +# set this to yes to enable support for streaming .jpg and .mp3 files to a TiVo supporting HMO +enable_tivo=no + +# set this to strictly adhere to DLNA standards. +# * This will allow server-side downscaling of very large JPEG images, +# which may hurt JPEG serving performance on (at least) Sony DLNA products. +strict_dlna=no + +# default presentation url is http address on port 80 +#presentation_url=http://www.mylan/index.php + +# notify interval in seconds. default is 895 seconds. +notify_interval=900 + +# serial and model number the daemon will report to clients +# in its XML description +serial=12345678 +model_number=1 + +# specify the path to the MiniSSDPd socket +#minissdpdsocket=/var/run/minissdpd.sock + +# use different container as root of the tree +# possible values: +# + "." - use standard container (this is the default) +# + "B" - "Browse Directory" +# + "M" - "Music" +# + "V" - "Video" +# + "P" - "Pictures" +# if you specify "B" and client device is audio-only then "Music/Folders" will be used as root +#root_container=. diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl index 1d7dd93..8bb49e0 100644 --- a/config/outgoingfw/outgoingfw.pl +++ b/config/outgoingfw/outgoingfw.pl @@ -73,7 +73,6 @@ my $PROTO = ""; my $DPORT = ""; my $DEV = ""; my $MAC = ""; -my $POLICY = ""; my $DO = ""; my $DAY = ""; @@ -90,11 +89,9 @@ close FILE; if ( $outfwsettings{'POLICY'} eq 'MODE1' ) { $outfwsettings{'STATE'} = "ALLOW"; - $POLICY = "DROP"; - $DO = "ACCEPT"; + $DO = "RETURN"; } elsif ( $outfwsettings{'POLICY'} eq 'MODE2' ) { $outfwsettings{'STATE'} = "DENY"; - $POLICY = "ACCEPT"; $DO = "DROP -m comment --comment 'DROP_OUTGOINGFW '"; } @@ -112,13 +109,13 @@ if ( $outfwsettings{'POLICY'} eq 'MODE0' ) { } if ( $outfwsettings{'POLICY'} eq 'MODE1' ) { - $CMD = "/sbin/iptables -A OUTGOINGFW -m state --state ESTABLISHED,RELATED -j ACCEPT"; + $CMD = "/sbin/iptables -A OUTGOINGFW -m state --state ESTABLISHED,RELATED -j RETURN"; if ($DEBUG) { print "$CMD\n"; } else { system("$CMD"); } - $CMD = "/sbin/iptables -A OUTGOINGFWMAC -m state --state ESTABLISHED,RELATED -j ACCEPT"; + $CMD = "/sbin/iptables -A OUTGOINGFWMAC -m state --state ESTABLISHED,RELATED -j RETURN"; if ($DEBUG) { print "$CMD\n"; } else { system("$CMD"); } - $CMD = "/sbin/iptables -A OUTGOINGFW -p icmp -j ACCEPT"; + $CMD = "/sbin/iptables -A OUTGOINGFW -p icmp -j RETURN"; if ($DEBUG) { print "$CMD\n"; } else { system("$CMD"); } - $CMD = "/sbin/iptables -A OUTGOINGFWMAC -p icmp -j ACCEPT"; + $CMD = "/sbin/iptables -A OUTGOINGFWMAC -p icmp -j RETURN"; if ($DEBUG) { print "$CMD\n"; } else { system("$CMD"); } } @@ -260,7 +257,7 @@ foreach $p2pentry (sort @p2ps) $P2PSTRING = "$P2PSTRING --$p2pline[1]"; } } else { - $DO = "ACCEPT"; + $DO = "RETURN"; if ("$p2pline[2]" eq "on") { $P2PSTRING = "$P2PSTRING --$p2pline[1]"; } @@ -290,4 +287,4 @@ if ( $outfwsettings{'POLICY'} eq 'MODE1' ) { } else { system("$CMD"); } -} \ No newline at end of file +} diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index eaa6352..ccb7bfb 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -47,6 +47,7 @@ etc/rc.d/init.d/mISDN #etc/rc.d/init.d/mediatomb #etc/rc.d/init.d/messagebus #etc/rc.d/init.d/miau +#etc/rc.d/init.d/minidlna #etc/rc.d/init.d/miniupnpd #etc/rc.d/init.d/mldonkey etc/rc.d/init.d/modules @@ -57,6 +58,7 @@ etc/rc.d/init.d/mountkernfs #etc/rc.d/init.d/mysql #etc/rc.d/init.d/netsnmpd etc/rc.d/init.d/network +etc/rc.d/init.d/network-vlans #etc/rc.d/init.d/networking etc/rc.d/init.d/networking/any etc/rc.d/init.d/networking/blue @@ -212,6 +214,7 @@ etc/rc.d/rcsysinit.d/S70console etc/rc.d/rcsysinit.d/S75firstsetup etc/rc.d/rcsysinit.d/S80localnet etc/rc.d/rcsysinit.d/S90sysctl +etc/rc.d/rcsysinit.d/S91network-vlans etc/rc.d/rc3.d/S15fireinfo #etc/sysconfig etc/sysconfig/createfiles diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 8fdd7ac..e14f7e0 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -35,6 +35,7 @@ var/ipfire/ethernet #var/ipfire/ethernet/known_nics #var/ipfire/ethernet/scanned_nics #var/ipfire/ethernet/settings +#var/ipfire/ethernet/vlans #var/ipfire/extrahd #var/ipfire/extrahd/bin var/ipfire/extrahd/bin/extrahd.pl @@ -57,9 +58,9 @@ var/ipfire/langs #var/ipfire/langs/en.pl #var/ipfire/langs/es.pl #var/ipfire/langs/fr.pl +#var/ipfire/langs/list #var/ipfire/langs/pl.pl #var/ipfire/langs/ru.pl -#var/ipfire/langs/list var/ipfire/logging #var/ipfire/logging/settings var/ipfire/mac diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 882628a..653060f 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -48,6 +48,7 @@ etc/rc.d/init.d/mISDN #etc/rc.d/init.d/mediatomb #etc/rc.d/init.d/messagebus #etc/rc.d/init.d/miau +#etc/rc.d/init.d/minidlna #etc/rc.d/init.d/miniupnpd #etc/rc.d/init.d/mldonkey etc/rc.d/init.d/modules @@ -58,6 +59,7 @@ etc/rc.d/init.d/mountkernfs #etc/rc.d/init.d/mysql #etc/rc.d/init.d/netsnmpd etc/rc.d/init.d/network +etc/rc.d/init.d/network-vlans #etc/rc.d/init.d/networking etc/rc.d/init.d/networking/any etc/rc.d/init.d/networking/blue @@ -215,6 +217,7 @@ etc/rc.d/rcsysinit.d/S70console etc/rc.d/rcsysinit.d/S75firstsetup etc/rc.d/rcsysinit.d/S80localnet etc/rc.d/rcsysinit.d/S90sysctl +etc/rc.d/rcsysinit.d/S91network-vlans etc/rc.d/rc3.d/S15fireinfo #etc/sysconfig etc/sysconfig/createfiles diff --git a/config/rootfiles/common/nasm b/config/rootfiles/common/nasm index 8f20850..9d3e196 100644 --- a/config/rootfiles/common/nasm +++ b/config/rootfiles/common/nasm @@ -1,4 +1,4 @@ #usr/bin/nasm #usr/bin/ndisasm -#usr/man/man1/nasm.1 -#usr/man/man1/ndisasm.1 +#usr/share/man/man1/nasm.1 +#usr/share/man/man1/ndisasm.1 diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data index 3d6af6d..448a19e 100644 --- a/config/rootfiles/common/usb_modeswitch_data +++ b/config/rootfiles/common/usb_modeswitch_data @@ -5,6 +5,7 @@ usr/share/usb_modeswitch/03f0:002a usr/share/usb_modeswitch/0408:f000 usr/share/usb_modeswitch/0421:060c usr/share/usb_modeswitch/0421:0610 +usr/share/usb_modeswitch/0421:061d usr/share/usb_modeswitch/0421:0622 usr/share/usb_modeswitch/0421:0627 usr/share/usb_modeswitch/0421:062c @@ -35,6 +36,7 @@ usr/share/usb_modeswitch/05c7:1000 usr/share/usb_modeswitch/072f:100d usr/share/usb_modeswitch/07d1:a800 usr/share/usb_modeswitch/07d1:a804 +usr/share/usb_modeswitch/0922:1001 usr/share/usb_modeswitch/0930:0d46 usr/share/usb_modeswitch/0ace:2011 usr/share/usb_modeswitch/0ace:20ff @@ -77,6 +79,7 @@ usr/share/usb_modeswitch/0af0:8302 usr/share/usb_modeswitch/0af0:8304 usr/share/usb_modeswitch/0af0:8400 usr/share/usb_modeswitch/0af0:8600 +usr/share/usb_modeswitch/0af0:8700 usr/share/usb_modeswitch/0af0:8800 usr/share/usb_modeswitch/0af0:8900 usr/share/usb_modeswitch/0af0:9000 @@ -163,6 +166,7 @@ usr/share/usb_modeswitch/1410:5041 usr/share/usb_modeswitch/1410:5059 usr/share/usb_modeswitch/148e:a000 usr/share/usb_modeswitch/148f:2578 +usr/share/usb_modeswitch/15eb:7153 usr/share/usb_modeswitch/16d8:6281 usr/share/usb_modeswitch/16d8:6803 usr/share/usb_modeswitch/16d8:6804 @@ -184,12 +188,15 @@ usr/share/usb_modeswitch/19d2:0110 usr/share/usb_modeswitch/19d2:0115 usr/share/usb_modeswitch/19d2:0146 usr/share/usb_modeswitch/19d2:0149 +usr/share/usb_modeswitch/19d2:0154 usr/share/usb_modeswitch/19d2:0166 usr/share/usb_modeswitch/19d2:0169 +usr/share/usb_modeswitch/19d2:0325 usr/share/usb_modeswitch/19d2:1001 usr/share/usb_modeswitch/19d2:1007 usr/share/usb_modeswitch/19d2:1009 usr/share/usb_modeswitch/19d2:1013 +usr/share/usb_modeswitch/19d2:1017 usr/share/usb_modeswitch/19d2:1171 usr/share/usb_modeswitch/19d2:1175 usr/share/usb_modeswitch/19d2:1179 @@ -209,7 +216,9 @@ usr/share/usb_modeswitch/1a8d:1000 usr/share/usb_modeswitch/1a8d:2000 usr/share/usb_modeswitch/1ab7:5700 usr/share/usb_modeswitch/1b7d:0700 +usr/share/usb_modeswitch/1bbb:00ca usr/share/usb_modeswitch/1bbb:f000 +usr/share/usb_modeswitch/1bbb:f017 usr/share/usb_modeswitch/1bbb:f052 usr/share/usb_modeswitch/1c9e:1001 usr/share/usb_modeswitch/1c9e:6061 @@ -227,6 +236,7 @@ usr/share/usb_modeswitch/1edf:6003 usr/share/usb_modeswitch/1ee8:0009 usr/share/usb_modeswitch/1ee8:0013 usr/share/usb_modeswitch/1ee8:0040 +usr/share/usb_modeswitch/1ee8:004a usr/share/usb_modeswitch/1ee8:0060 usr/share/usb_modeswitch/1f28:0021 usr/share/usb_modeswitch/1fac:0032 @@ -237,7 +247,10 @@ usr/share/usb_modeswitch/201e:2009 usr/share/usb_modeswitch/2020:f00e usr/share/usb_modeswitch/2077:f000 usr/share/usb_modeswitch/21f5:1000 +usr/share/usb_modeswitch/22de:6803 usr/share/usb_modeswitch/22f4:0021 usr/share/usb_modeswitch/230d:0001 usr/share/usb_modeswitch/230d:0007 +usr/share/usb_modeswitch/230d:0101 +usr/share/usb_modeswitch/2357:0200 usr/share/usb_modeswitch/8888:6500 diff --git a/config/rootfiles/core/62/exclude b/config/rootfiles/core/62/exclude new file mode 100644 index 0000000..7360266 --- /dev/null +++ b/config/rootfiles/core/62/exclude @@ -0,0 +1,12 @@ +srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf diff --git a/config/rootfiles/core/62/filelists/GeoIP b/config/rootfiles/core/62/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/core/62/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/62/filelists/files b/config/rootfiles/core/62/filelists/files new file mode 100644 index 0000000..34f0d16 --- /dev/null +++ b/config/rootfiles/core/62/filelists/files @@ -0,0 +1,8 @@ +etc/system-release +etc/issue +etc/rc.d/init.d/network-vlans +etc/rc.d/rcsysinit.d/S91network-vlans +srv/web/ipfire/cgi-bin/connections.cgi +usr/lib/gconv +var/ipfire/ethernet/vlans +var/ipfire/outgoing/bin/outgoingfw.pl diff --git a/config/rootfiles/core/62/filelists/hwdata b/config/rootfiles/core/62/filelists/hwdata new file mode 100644 index 0000000..5a9672f --- /dev/null +++ b/config/rootfiles/core/62/filelists/hwdata @@ -0,0 +1,2 @@ +usr/share/hwdata/pci.ids +usr/share/hwdata/usb.ids diff --git a/config/rootfiles/core/62/filelists/php b/config/rootfiles/core/62/filelists/php new file mode 120000 index 0000000..1ae48d7 --- /dev/null +++ b/config/rootfiles/core/62/filelists/php @@ -0,0 +1 @@ +../../../common/php \ No newline at end of file diff --git a/config/rootfiles/core/62/filelists/usb_modeswitch b/config/rootfiles/core/62/filelists/usb_modeswitch new file mode 120000 index 0000000..acbab6f --- /dev/null +++ b/config/rootfiles/core/62/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/62/filelists/usb_modeswitch_data b/config/rootfiles/core/62/filelists/usb_modeswitch_data new file mode 120000 index 0000000..4cbce46 --- /dev/null +++ b/config/rootfiles/core/62/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/core/62/meta b/config/rootfiles/core/62/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/62/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/62/update.sh b/config/rootfiles/core/62/update.sh new file mode 100644 index 0000000..0c37b83 --- /dev/null +++ b/config/rootfiles/core/62/update.sh @@ -0,0 +1,80 @@ +#!/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) 2012 IPFire-Team <info(a)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=62 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#arch=`uname -m` +#if [ ${arch::3} == "arm" ]; then +# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 +#else +# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 +#fi + + +#Rebuild initrd's because some compat-wireless modules are inside +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire +#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae +#fi +#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen +#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/packages/apcupsd b/config/rootfiles/packages/apcupsd index 7a5df79..b58ed2b 100644 --- a/config/rootfiles/packages/apcupsd +++ b/config/rootfiles/packages/apcupsd @@ -12,11 +12,12 @@ etc/apcupsd/onbattery etc/rc.d/rc0.d/K35apcupsd etc/rc.d/rc3.d/S65apcupsd etc/rc.d/rc6.d/K35apcupsd +#root/.lesshst sbin/apcaccess sbin/apctest sbin/apcupsd sbin/smtp -#srv/web/ipfire/cgi-bin/multimon.cgi +srv/web/ipfire/cgi-bin/multimon.cgi srv/web/ipfire/cgi-bin/upsfstats.cgi srv/web/ipfire/cgi-bin/upsimage.cgi srv/web/ipfire/cgi-bin/upsstats.cgi @@ -25,6 +26,10 @@ srv/web/ipfire/cgi-bin/upsstats.cgi #usr/share/hal/fdi/policy #usr/share/hal/fdi/policy/20thirdparty #usr/share/hal/fdi/policy/20thirdparty/80-apcupsd-ups-policy.fdi +#usr/share/man/man5/apcupsd.conf.5 +#usr/share/man/man8/apcaccess.8 +#usr/share/man/man8/apccontrol.8 +#usr/share/man/man8/apctest.8 #usr/share/man/man8/apcupsd.8 etc/rc.d/init.d/apcupsd var/ipfire/menu.d/EX-apcupsd.menu diff --git a/config/rootfiles/packages/flac b/config/rootfiles/packages/flac new file mode 100644 index 0000000..d5ca870 --- /dev/null +++ b/config/rootfiles/packages/flac @@ -0,0 +1,314 @@ +usr/bin/flac +usr/bin/metaflac +#usr/include/FLAC +#usr/include/FLAC++ +#usr/include/FLAC++/all.h +#usr/include/FLAC++/decoder.h +#usr/include/FLAC++/encoder.h +#usr/include/FLAC++/export.h +#usr/include/FLAC++/metadata.h +#usr/include/FLAC/all.h +#usr/include/FLAC/assert.h +#usr/include/FLAC/callback.h +#usr/include/FLAC/export.h +#usr/include/FLAC/format.h +#usr/include/FLAC/metadata.h +#usr/include/FLAC/ordinals.h +#usr/include/FLAC/stream_decoder.h +#usr/include/FLAC/stream_encoder.h +#usr/lib/libFLAC++.a +#usr/lib/libFLAC++.la +#usr/lib/libFLAC++.so +usr/lib/libFLAC++.so.6 +usr/lib/libFLAC++.so.6.2.0 +#usr/lib/libFLAC.a +#usr/lib/libFLAC.la +#usr/lib/libFLAC.so +usr/lib/libFLAC.so.8 +usr/lib/libFLAC.so.8.2.0 +#usr/lib/pkgconfig/flac++.pc +#usr/lib/pkgconfig/flac.pc +#usr/man/man1/flac.1 +#usr/man/man1/metaflac.1 +#usr/share/aclocal/libFLAC++.m4 +#usr/share/aclocal/libFLAC.m4 +#usr/share/doc/flac-1.2.1 +#usr/share/doc/flac-1.2.1/FLAC.tag +#usr/share/doc/flac-1.2.1/html +#usr/share/doc/flac-1.2.1/html/api +#usr/share/doc/flac-1.2.1/html/api/+_2all_8h-source.html +#usr/share/doc/flac-1.2.1/html/api/+_2export_8h-source.html +#usr/share/doc/flac-1.2.1/html/api/+_2export_8h.html +#usr/share/doc/flac-1.2.1/html/api/+_2metadata_8h-source.html +#usr/share/doc/flac-1.2.1/html/api/+_2metadata_8h.html +#usr/share/doc/flac-1.2.1/html/api/all_8h-source.html +#usr/share/doc/flac-1.2.1/html/api/annotated.html +#usr/share/doc/flac-1.2.1/html/api/assert_8h-source.html +#usr/share/doc/flac-1.2.1/html/api/callback_8h-source.html +#usr/share/doc/flac-1.2.1/html/api/callback_8h.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1File-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1File.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1File.png +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1Stream-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1Stream.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1Stream.png +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1File-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1File.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1File.png +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1Stream-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1Stream.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1Stream.png +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Application-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Application.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Application.png +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Chain-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Chain.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1CueSheet.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1CueSheet.png +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Iterator.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Padding-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Padding.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Padding.png +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Picture-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Picture.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Picture.png +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Prototype.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Prototype.png +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SeekTable.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SeekTable.png +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1StreamInfo.png +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Unknown.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Unknown.png +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1VorbisComment.png +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html +#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html +#usr/share/doc/flac-1.2.1/html/api/classes.html +#usr/share/doc/flac-1.2.1/html/api/decoder_8h-source.html +#usr/share/doc/flac-1.2.1/html/api/decoder_8h.html +#usr/share/doc/flac-1.2.1/html/api/dir_000000.html +#usr/share/doc/flac-1.2.1/html/api/dir_000001.html +#usr/share/doc/flac-1.2.1/html/api/dir_000002.html +#usr/share/doc/flac-1.2.1/html/api/dirs.html +#usr/share/doc/flac-1.2.1/html/api/doxygen.css +#usr/share/doc/flac-1.2.1/html/api/doxygen.png +#usr/share/doc/flac-1.2.1/html/api/encoder_8h-source.html +#usr/share/doc/flac-1.2.1/html/api/encoder_8h.html +#usr/share/doc/flac-1.2.1/html/api/export_8h-source.html +#usr/share/doc/flac-1.2.1/html/api/export_8h.html +#usr/share/doc/flac-1.2.1/html/api/files.html +#usr/share/doc/flac-1.2.1/html/api/format_8h-source.html +#usr/share/doc/flac-1.2.1/html/api/format_8h.html +#usr/share/doc/flac-1.2.1/html/api/functions.html +#usr/share/doc/flac-1.2.1/html/api/functions_func.html +#usr/share/doc/flac-1.2.1/html/api/functions_vars.html +#usr/share/doc/flac-1.2.1/html/api/globals.html +#usr/share/doc/flac-1.2.1/html/api/globals_0x66.html +#usr/share/doc/flac-1.2.1/html/api/globals_0x67.html +#usr/share/doc/flac-1.2.1/html/api/globals_defs.html +#usr/share/doc/flac-1.2.1/html/api/globals_enum.html +#usr/share/doc/flac-1.2.1/html/api/globals_eval.html +#usr/share/doc/flac-1.2.1/html/api/globals_func.html +#usr/share/doc/flac-1.2.1/html/api/globals_type.html +#usr/share/doc/flac-1.2.1/html/api/globals_vars.html +#usr/share/doc/flac-1.2.1/html/api/group__flac.html +#usr/share/doc/flac-1.2.1/html/api/group__flac__callbacks.html +#usr/share/doc/flac-1.2.1/html/api/group__flac__decoder.html +#usr/share/doc/flac-1.2.1/html/api/group__flac__encoder.html +#usr/share/doc/flac-1.2.1/html/api/group__flac__export.html +#usr/share/doc/flac-1.2.1/html/api/group__flac__format.html +#usr/share/doc/flac-1.2.1/html/api/group__flac__metadata.html +#usr/share/doc/flac-1.2.1/html/api/group__flac__metadata__level0.html +#usr/share/doc/flac-1.2.1/html/api/group__flac__metadata__level1.html +#usr/share/doc/flac-1.2.1/html/api/group__flac__metadata__level2.html +#usr/share/doc/flac-1.2.1/html/api/group__flac__metadata__object.html +#usr/share/doc/flac-1.2.1/html/api/group__flac__stream__decoder.html +#usr/share/doc/flac-1.2.1/html/api/group__flac__stream__encoder.html +#usr/share/doc/flac-1.2.1/html/api/group__flacpp.html +#usr/share/doc/flac-1.2.1/html/api/group__flacpp__decoder.html +#usr/share/doc/flac-1.2.1/html/api/group__flacpp__encoder.html +#usr/share/doc/flac-1.2.1/html/api/group__flacpp__export.html +#usr/share/doc/flac-1.2.1/html/api/group__flacpp__metadata.html +#usr/share/doc/flac-1.2.1/html/api/group__flacpp__metadata__level0.html +#usr/share/doc/flac-1.2.1/html/api/group__flacpp__metadata__level1.html +#usr/share/doc/flac-1.2.1/html/api/group__flacpp__metadata__level2.html +#usr/share/doc/flac-1.2.1/html/api/group__flacpp__metadata__object.html +#usr/share/doc/flac-1.2.1/html/api/group__porting.html +#usr/share/doc/flac-1.2.1/html/api/group__porting__1__1__2__to__1__1__3.html +#usr/share/doc/flac-1.2.1/html/api/group__porting__1__1__3__to__1__1__4.html +#usr/share/doc/flac-1.2.1/html/api/group__porting__1__1__4__to__1__2__0.html +#usr/share/doc/flac-1.2.1/html/api/hierarchy.html +#usr/share/doc/flac-1.2.1/html/api/index.html +#usr/share/doc/flac-1.2.1/html/api/metadata_8h-source.html +#usr/share/doc/flac-1.2.1/html/api/metadata_8h.html +#usr/share/doc/flac-1.2.1/html/api/modules.html +#usr/share/doc/flac-1.2.1/html/api/ordinals_8h-source.html +#usr/share/doc/flac-1.2.1/html/api/stream__decoder_8h-source.html +#usr/share/doc/flac-1.2.1/html/api/stream__decoder_8h.html +#usr/share/doc/flac-1.2.1/html/api/stream__encoder_8h-source.html +#usr/share/doc/flac-1.2.1/html/api/stream__encoder_8h.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____Frame-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____Frame.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____FrameFooter-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____FrameFooter.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____FrameHeader-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____FrameHeader.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____IOCallbacks-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____IOCallbacks.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamDecoder-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamDecoder.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamEncoder-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamEncoder.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Application-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Application.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet__Index-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet__Index.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet__Track-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet__Track.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Padding-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Padding.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Picture-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Picture.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__SeekPoint-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__SeekPoint.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__SeekTable-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__SeekTable.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__StreamInfo-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__StreamInfo.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Unknown-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Unknown.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__VorbisComment-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__VorbisComment.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__VorbisComment__Entry.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Constant-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Constant.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Fixed-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Fixed.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__LPC-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__LPC.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Verbatim-members.html +#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Verbatim.html +#usr/share/doc/flac-1.2.1/html/changelog.html +#usr/share/doc/flac-1.2.1/html/comparison.html +#usr/share/doc/flac-1.2.1/html/comparison__chopin_prelude_24.html +#usr/share/doc/flac-1.2.1/html/comparison__dream_theater_600.html +#usr/share/doc/flac-1.2.1/html/comparison__eddie_warner_titus.html +#usr/share/doc/flac-1.2.1/html/comparison__fanfare_de_l_eventail_de_jeanne.html +#usr/share/doc/flac-1.2.1/html/comparison__gloria_estefan_conga.html +#usr/share/doc/flac-1.2.1/html/comparison__hand_in_my_pocket.html +#usr/share/doc/flac-1.2.1/html/comparison__l_sub_raga_sivapriya.html +#usr/share/doc/flac-1.2.1/html/comparison__laetatus_sum.html +#usr/share/doc/flac-1.2.1/html/comparison__mummified_in_barbed_wire.html +#usr/share/doc/flac-1.2.1/html/comparison__prokofiev_pcon3_3.html +#usr/share/doc/flac-1.2.1/html/comparison__ravel_sq4_4.html +#usr/share/doc/flac-1.2.1/html/comparison__scarlatti_k42.html +#usr/share/doc/flac-1.2.1/html/comparison__tool_forty_six_and_2.html +#usr/share/doc/flac-1.2.1/html/comparison__white_room.html +#usr/share/doc/flac-1.2.1/html/comparison_all_cpudectime.html +#usr/share/doc/flac-1.2.1/html/comparison_all_cpuenctime.html +#usr/share/doc/flac-1.2.1/html/comparison_all_procdectime.html +#usr/share/doc/flac-1.2.1/html/comparison_all_procenctime.html +#usr/share/doc/flac-1.2.1/html/comparison_all_ratio.html +#usr/share/doc/flac-1.2.1/html/developers.html +#usr/share/doc/flac-1.2.1/html/documentation.html +#usr/share/doc/flac-1.2.1/html/documentation_bugs.html +#usr/share/doc/flac-1.2.1/html/documentation_example_code.html +#usr/share/doc/flac-1.2.1/html/documentation_format_overview.html +#usr/share/doc/flac-1.2.1/html/documentation_tasks.html +#usr/share/doc/flac-1.2.1/html/documentation_tools.html +#usr/share/doc/flac-1.2.1/html/documentation_tools_flac.html +#usr/share/doc/flac-1.2.1/html/documentation_tools_metaflac.html +#usr/share/doc/flac-1.2.1/html/documentation_tools_plugins.html +#usr/share/doc/flac-1.2.1/html/download.html +#usr/share/doc/flac-1.2.1/html/faq.html +#usr/share/doc/flac-1.2.1/html/favicon.ico +#usr/share/doc/flac-1.2.1/html/features.html +#usr/share/doc/flac-1.2.1/html/flac.css +#usr/share/doc/flac-1.2.1/html/format.html +#usr/share/doc/flac-1.2.1/html/id.html +#usr/share/doc/flac-1.2.1/html/images +#usr/share/doc/flac-1.2.1/html/images/1x1.gif +#usr/share/doc/flac-1.2.1/html/images/cafebug.gif +#usr/share/doc/flac-1.2.1/html/images/hw +#usr/share/doc/flac-1.2.1/html/images/hw/Blackbird_Front_low3_325x87.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/MS300frontsmall_270x108.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/MediaBox_Frt_170x325.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/SB_Hero_Black_325x182.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/Sooloos-ControlOne_325x328.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/Z500_front_325x94.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/a2_01_325x252.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/arcus_325x135.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/bmp-1430_325x241.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/cs505_front_lrg_325x113.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/enus_3-4lft-hires_product_eva8000_325x127.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/escient_ProductLine_325x163.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/hifidelio_bl_front_Z_RGB_325x163.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/i-station-mini-dx_325x237.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/iwod-g10_325x257.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/knc_hr-2800_325x209.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/mediaready_prodmain_MRMCa_325x232.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/meizu_m6_325x206.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/musica_artwork_325x90.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/neodigits_x5000_325x124.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/onda-vx737_325x240.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/request_n_front_325x103.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/rio_karma_279x254.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/sonos_family_RGB_325x200.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/teclast-tl29_325x244.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/transporter_hero_grey_325x208.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/tvix-4000_325x204.jpg +#usr/share/doc/flac-1.2.1/html/images/hw/vibez_nofm_combi_black_b_325x220.jpg +#usr/share/doc/flac-1.2.1/html/images/logo100.gif +#usr/share/doc/flac-1.2.1/html/images/logo130.gif +#usr/share/doc/flac-1.2.1/html/index.html +#usr/share/doc/flac-1.2.1/html/itunes.html +#usr/share/doc/flac-1.2.1/html/license.html +#usr/share/doc/flac-1.2.1/html/links.html +#usr/share/doc/flac-1.2.1/html/news.html +#usr/share/doc/flac-1.2.1/html/ogg_mapping.html +#usr/share/doc/flac-1.2.1/html/ru +#usr/share/doc/flac-1.2.1/html/ru/authors.html +#usr/share/doc/flac-1.2.1/html/ru/comparison.html +#usr/share/doc/flac-1.2.1/html/ru/developers.html +#usr/share/doc/flac-1.2.1/html/ru/documentation.html +#usr/share/doc/flac-1.2.1/html/ru/download.html +#usr/share/doc/flac-1.2.1/html/ru/features.html +#usr/share/doc/flac-1.2.1/html/ru/format.html +#usr/share/doc/flac-1.2.1/html/ru/goals.html +#usr/share/doc/flac-1.2.1/html/ru/id.html +#usr/share/doc/flac-1.2.1/html/ru/index.html +#usr/share/doc/flac-1.2.1/html/ru/links.html +#usr/share/doc/flac-1.2.1/html/ru/news.html diff --git a/config/rootfiles/packages/fping b/config/rootfiles/packages/fping new file mode 100644 index 0000000..ccc16e9 --- /dev/null +++ b/config/rootfiles/packages/fping @@ -0,0 +1,2 @@ +usr/sbin/fping +#usr/share/man/man8/fping.8 diff --git a/config/rootfiles/packages/libexif b/config/rootfiles/packages/libexif new file mode 100644 index 0000000..9efbc1f --- /dev/null +++ b/config/rootfiles/packages/libexif @@ -0,0 +1,64 @@ +#usr/include/libexif +#usr/include/libexif/_stdint.h +#usr/include/libexif/exif-byte-order.h +#usr/include/libexif/exif-content.h +#usr/include/libexif/exif-data-type.h +#usr/include/libexif/exif-data.h +#usr/include/libexif/exif-entry.h +#usr/include/libexif/exif-format.h +#usr/include/libexif/exif-ifd.h +#usr/include/libexif/exif-loader.h +#usr/include/libexif/exif-log.h +#usr/include/libexif/exif-mem.h +#usr/include/libexif/exif-mnote-data.h +#usr/include/libexif/exif-tag.h +#usr/include/libexif/exif-utils.h +#usr/lib/libexif.la +#usr/lib/libexif.so +usr/lib/libexif.so.12 +usr/lib/libexif.so.12.3.3 +usr/lib/pkgconfig/libexif.pc +#usr/share/doc/libexif +#usr/share/doc/libexif/ABOUT-NLS +#usr/share/doc/libexif/AUTHORS +#usr/share/doc/libexif/COPYING +#usr/share/doc/libexif/ChangeLog +#usr/share/doc/libexif/NEWS +#usr/share/doc/libexif/README +#usr/share/locale/be/LC_MESSAGES/libexif-12.mo +#usr/share/locale/bs +#usr/share/locale/bs/LC_MESSAGES +#usr/share/locale/bs/LC_MESSAGES/libexif-12.mo +#usr/share/locale/cs/LC_MESSAGES/libexif-12.mo +#usr/share/locale/da/LC_MESSAGES/libexif-12.mo +#usr/share/locale/de/LC_MESSAGES/libexif-12.mo +#usr/share/locale/en_AU +#usr/share/locale/en_AU/LC_MESSAGES +#usr/share/locale/en_AU/LC_MESSAGES/libexif-12.mo +#usr/share/locale/en_CA +#usr/share/locale/en_CA/LC_MESSAGES +#usr/share/locale/en_CA/LC_MESSAGES/libexif-12.mo +#usr/share/locale/en_GB/LC_MESSAGES/libexif-12.mo +#usr/share/locale/es/LC_MESSAGES/libexif-12.mo +#usr/share/locale/fr/LC_MESSAGES/libexif-12.mo +#usr/share/locale/it/LC_MESSAGES/libexif-12.mo +#usr/share/locale/ja/LC_MESSAGES/libexif-12.mo +#usr/share/locale/nl/LC_MESSAGES/libexif-12.mo +#usr/share/locale/pl/LC_MESSAGES/libexif-12.mo +#usr/share/locale/pt +#usr/share/locale/pt/LC_MESSAGES +#usr/share/locale/pt/LC_MESSAGES/libexif-12.mo +#usr/share/locale/pt_BR/LC_MESSAGES/libexif-12.mo +#usr/share/locale/ru/LC_MESSAGES/libexif-12.mo +#usr/share/locale/sk/LC_MESSAGES/libexif-12.mo +#usr/share/locale/sq +#usr/share/locale/sq/LC_MESSAGES +#usr/share/locale/sq/LC_MESSAGES/libexif-12.mo +#usr/share/locale/sr +#usr/share/locale/sr/LC_MESSAGES +#usr/share/locale/sr/LC_MESSAGES/libexif-12.mo +#usr/share/locale/sv/LC_MESSAGES/libexif-12.mo +#usr/share/locale/tr/LC_MESSAGES/libexif-12.mo +#usr/share/locale/uk/LC_MESSAGES/libexif-12.mo +#usr/share/locale/vi/LC_MESSAGES/libexif-12.mo +#usr/share/locale/zh_CN/LC_MESSAGES/libexif-12.mo diff --git a/config/rootfiles/packages/minidlna b/config/rootfiles/packages/minidlna new file mode 100644 index 0000000..c30e30b --- /dev/null +++ b/config/rootfiles/packages/minidlna @@ -0,0 +1,3 @@ +etc/rc.d/init.d/minidlna +etc/minidlna.conf +usr/sbin/minidlna diff --git a/config/rootfiles/packages/nmap b/config/rootfiles/packages/nmap index ab15654..8f39897 100644 --- a/config/rootfiles/packages/nmap +++ b/config/rootfiles/packages/nmap @@ -55,16 +55,25 @@ usr/share/nmap/nmap.xsl usr/share/nmap/nse_main.lua #usr/share/nmap/nselib usr/share/nmap/nselib/afp.lua +usr/share/nmap/nselib/amqp.lua usr/share/nmap/nselib/asn1.lua usr/share/nmap/nselib/base64.lua +usr/share/nmap/nselib/bitcoin.lua +usr/share/nmap/nselib/bittorrent.lua usr/share/nmap/nselib/brute.lua usr/share/nmap/nselib/citrixxml.lua usr/share/nmap/nselib/comm.lua +usr/share/nmap/nselib/creds.lua +usr/share/nmap/nselib/cvs.lua #usr/share/nmap/nselib/data usr/share/nmap/nselib/data/favicon-db +usr/share/nmap/nselib/data/http-default-accounts-fingerprints.lua usr/share/nmap/nselib/data/http-fingerprints.lua usr/share/nmap/nselib/data/http-folders.txt +usr/share/nmap/nselib/data/mysql-cis.audit +usr/share/nmap/nselib/data/oracle-default-accounts.lst usr/share/nmap/nselib/data/oracle-sids +usr/share/nmap/nselib/data/packetdecoders.lua usr/share/nmap/nselib/data/passwords.lst #usr/share/nmap/nselib/data/psexec usr/share/nmap/nselib/data/psexec/README @@ -77,15 +86,26 @@ usr/share/nmap/nselib/data/psexec/network.lua usr/share/nmap/nselib/data/psexec/nmap_service.c usr/share/nmap/nselib/data/psexec/nmap_service.vcproj usr/share/nmap/nselib/data/psexec/pwdump.lua +usr/share/nmap/nselib/data/rtsp-urls.txt +usr/share/nmap/nselib/data/snmpcommunities.lst +usr/share/nmap/nselib/data/ssl-ciphers +usr/share/nmap/nselib/data/ssl-fingerprints +usr/share/nmap/nselib/data/tftplist.txt usr/share/nmap/nselib/data/usernames.lst +usr/share/nmap/nselib/data/wp-plugins.lst usr/share/nmap/nselib/datafiles.lua usr/share/nmap/nselib/dhcp.lua +usr/share/nmap/nselib/dhcp6.lua usr/share/nmap/nselib/dns.lua +usr/share/nmap/nselib/dnsbl.lua usr/share/nmap/nselib/dnssd.lua usr/share/nmap/nselib/drda.lua +usr/share/nmap/nselib/eap.lua usr/share/nmap/nselib/ftp.lua usr/share/nmap/nselib/giop.lua usr/share/nmap/nselib/http.lua +usr/share/nmap/nselib/httpspider.lua +usr/share/nmap/nselib/iax2.lua usr/share/nmap/nselib/imap.lua usr/share/nmap/nselib/informix.lua usr/share/nmap/nselib/ipOps.lua @@ -94,52 +114,105 @@ usr/share/nmap/nselib/json.lua usr/share/nmap/nselib/ldap.lua usr/share/nmap/nselib/listop.lua usr/share/nmap/nselib/match.lua +usr/share/nmap/nselib/membase.lua usr/share/nmap/nselib/mongodb.lua usr/share/nmap/nselib/msrpc.lua usr/share/nmap/nselib/msrpcperformance.lua usr/share/nmap/nselib/msrpctypes.lua usr/share/nmap/nselib/mssql.lua usr/share/nmap/nselib/mysql.lua +usr/share/nmap/nselib/natpmp.lua +usr/share/nmap/nselib/ncp.lua +usr/share/nmap/nselib/ndmp.lua usr/share/nmap/nselib/netbios.lua usr/share/nmap/nselib/nrpc.lua usr/share/nmap/nselib/nsedebug.lua +usr/share/nmap/nselib/omp2.lua usr/share/nmap/nselib/packet.lua usr/share/nmap/nselib/pgsql.lua usr/share/nmap/nselib/pop3.lua +usr/share/nmap/nselib/pppoe.lua usr/share/nmap/nselib/proxy.lua +usr/share/nmap/nselib/redis.lua usr/share/nmap/nselib/rmi.lua usr/share/nmap/nselib/rpc.lua +usr/share/nmap/nselib/rpcap.lua +usr/share/nmap/nselib/rsync.lua +usr/share/nmap/nselib/rtsp.lua +usr/share/nmap/nselib/sasl.lua usr/share/nmap/nselib/shortport.lua +usr/share/nmap/nselib/sip.lua usr/share/nmap/nselib/smb.lua usr/share/nmap/nselib/smbauth.lua +usr/share/nmap/nselib/smtp.lua usr/share/nmap/nselib/snmp.lua +usr/share/nmap/nselib/socks.lua +usr/share/nmap/nselib/srvloc.lua usr/share/nmap/nselib/ssh1.lua usr/share/nmap/nselib/ssh2.lua +usr/share/nmap/nselib/sslcert.lua usr/share/nmap/nselib/stdnse.lua usr/share/nmap/nselib/strbuf.lua usr/share/nmap/nselib/strict.lua +usr/share/nmap/nselib/stun.lua usr/share/nmap/nselib/tab.lua usr/share/nmap/nselib/target.lua +usr/share/nmap/nselib/tftp.lua usr/share/nmap/nselib/tns.lua usr/share/nmap/nselib/unpwdb.lua usr/share/nmap/nselib/upnp.lua usr/share/nmap/nselib/url.lua +usr/share/nmap/nselib/versant.lua usr/share/nmap/nselib/vnc.lua +usr/share/nmap/nselib/vulns.lua +usr/share/nmap/nselib/vuzedht.lua usr/share/nmap/nselib/wsdd.lua +usr/share/nmap/nselib/xdmcp.lua +usr/share/nmap/nselib/xmpp.lua #usr/share/nmap/scripts +usr/share/nmap/scripts/acarsd-info.nse +usr/share/nmap/scripts/address-info.nse usr/share/nmap/scripts/afp-brute.nse +usr/share/nmap/scripts/afp-ls.nse usr/share/nmap/scripts/afp-path-vuln.nse usr/share/nmap/scripts/afp-serverinfo.nse usr/share/nmap/scripts/afp-showmount.nse +usr/share/nmap/scripts/amqp-info.nse usr/share/nmap/scripts/asn-query.nse usr/share/nmap/scripts/auth-owners.nse usr/share/nmap/scripts/auth-spoof.nse +usr/share/nmap/scripts/backorifice-brute.nse +usr/share/nmap/scripts/backorifice-info.nse usr/share/nmap/scripts/banner.nse +usr/share/nmap/scripts/bitcoin-getaddr.nse +usr/share/nmap/scripts/bitcoin-info.nse +usr/share/nmap/scripts/bitcoinrpc-info.nse +usr/share/nmap/scripts/bittorrent-discovery.nse +usr/share/nmap/scripts/broadcast-avahi-dos.nse +usr/share/nmap/scripts/broadcast-db2-discover.nse +usr/share/nmap/scripts/broadcast-dhcp-discover.nse +usr/share/nmap/scripts/broadcast-dhcp6-discover.nse usr/share/nmap/scripts/broadcast-dns-service-discovery.nse usr/share/nmap/scripts/broadcast-dropbox-listener.nse +usr/share/nmap/scripts/broadcast-listener.nse usr/share/nmap/scripts/broadcast-ms-sql-discover.nse +usr/share/nmap/scripts/broadcast-netbios-master-browser.nse +usr/share/nmap/scripts/broadcast-networker-discover.nse +usr/share/nmap/scripts/broadcast-novell-locate.nse +usr/share/nmap/scripts/broadcast-pc-anywhere.nse +usr/share/nmap/scripts/broadcast-pc-duo.nse +usr/share/nmap/scripts/broadcast-ping.nse +usr/share/nmap/scripts/broadcast-pppoe-discover.nse +usr/share/nmap/scripts/broadcast-rip-discover.nse +usr/share/nmap/scripts/broadcast-ripng-discover.nse +usr/share/nmap/scripts/broadcast-sybase-asa-discover.nse usr/share/nmap/scripts/broadcast-upnp-info.nse +usr/share/nmap/scripts/broadcast-versant-locate.nse +usr/share/nmap/scripts/broadcast-wake-on-lan.nse +usr/share/nmap/scripts/broadcast-wpad-discover.nse usr/share/nmap/scripts/broadcast-wsdd-discover.nse +usr/share/nmap/scripts/broadcast-xdmcp-discover.nse +usr/share/nmap/scripts/cccam-version.nse usr/share/nmap/scripts/citrix-brute-xml.nse usr/share/nmap/scripts/citrix-enum-apps-xml.nse usr/share/nmap/scripts/citrix-enum-apps.nse @@ -147,24 +220,38 @@ usr/share/nmap/scripts/citrix-enum-servers-xml.nse usr/share/nmap/scripts/citrix-enum-servers.nse usr/share/nmap/scripts/couchdb-databases.nse usr/share/nmap/scripts/couchdb-stats.nse +usr/share/nmap/scripts/creds-summary.nse +usr/share/nmap/scripts/cvs-brute-repository.nse +usr/share/nmap/scripts/cvs-brute.nse usr/share/nmap/scripts/daap-get-library.nse usr/share/nmap/scripts/daytime.nse usr/share/nmap/scripts/db2-das-info.nse usr/share/nmap/scripts/db2-discover.nse usr/share/nmap/scripts/dhcp-discover.nse +usr/share/nmap/scripts/dns-blacklist.nse +usr/share/nmap/scripts/dns-brute.nse usr/share/nmap/scripts/dns-cache-snoop.nse +usr/share/nmap/scripts/dns-client-subnet-scan.nse usr/share/nmap/scripts/dns-fuzz.nse +usr/share/nmap/scripts/dns-nsec-enum.nse +usr/share/nmap/scripts/dns-nsid.nse usr/share/nmap/scripts/dns-random-srcport.nse usr/share/nmap/scripts/dns-random-txid.nse usr/share/nmap/scripts/dns-recursion.nse usr/share/nmap/scripts/dns-service-discovery.nse +usr/share/nmap/scripts/dns-srv-enum.nse usr/share/nmap/scripts/dns-update.nse +usr/share/nmap/scripts/dns-zeustracker.nse usr/share/nmap/scripts/dns-zone-transfer.nse usr/share/nmap/scripts/domcon-brute.nse usr/share/nmap/scripts/domcon-cmd.nse usr/share/nmap/scripts/domino-enum-users.nse +usr/share/nmap/scripts/dpap-brute.nse usr/share/nmap/scripts/drda-brute.nse usr/share/nmap/scripts/drda-info.nse +usr/share/nmap/scripts/duplicates.nse +usr/share/nmap/scripts/eap-info.nse +usr/share/nmap/scripts/epmd-info.nse usr/share/nmap/scripts/finger.nse usr/share/nmap/scripts/firewalk.nse usr/share/nmap/scripts/ftp-anon.nse @@ -172,56 +259,121 @@ usr/share/nmap/scripts/ftp-bounce.nse usr/share/nmap/scripts/ftp-brute.nse usr/share/nmap/scripts/ftp-libopie.nse usr/share/nmap/scripts/ftp-proftpd-backdoor.nse +usr/share/nmap/scripts/ftp-vsftpd-backdoor.nse +usr/share/nmap/scripts/ftp-vuln-cve2010-4221.nse +usr/share/nmap/scripts/ganglia-info.nse usr/share/nmap/scripts/giop-info.nse usr/share/nmap/scripts/gopher-ls.nse +usr/share/nmap/scripts/hadoop-datanode-info.nse +usr/share/nmap/scripts/hadoop-jobtracker-info.nse +usr/share/nmap/scripts/hadoop-namenode-info.nse +usr/share/nmap/scripts/hadoop-secondary-namenode-info.nse +usr/share/nmap/scripts/hadoop-tasktracker-info.nse +usr/share/nmap/scripts/hbase-master-info.nse +usr/share/nmap/scripts/hbase-region-info.nse usr/share/nmap/scripts/hddtemp-info.nse -usr/share/nmap/scripts/hostmap.nse +usr/share/nmap/scripts/hostmap-bfk.nse +usr/share/nmap/scripts/http-affiliate-id.nse +usr/share/nmap/scripts/http-apache-negotiation.nse +usr/share/nmap/scripts/http-auth-finder.nse usr/share/nmap/scripts/http-auth.nse +usr/share/nmap/scripts/http-awstatstotals-exec.nse +usr/share/nmap/scripts/http-axis2-dir-traversal.nse +usr/share/nmap/scripts/http-backup-finder.nse +usr/share/nmap/scripts/http-barracuda-dir-traversal.nse usr/share/nmap/scripts/http-brute.nse +usr/share/nmap/scripts/http-cakephp-version.nse +usr/share/nmap/scripts/http-chrono.nse +usr/share/nmap/scripts/http-config-backup.nse +usr/share/nmap/scripts/http-cors.nse usr/share/nmap/scripts/http-date.nse +usr/share/nmap/scripts/http-default-accounts.nse usr/share/nmap/scripts/http-domino-enum-passwords.nse +usr/share/nmap/scripts/http-email-harvest.nse usr/share/nmap/scripts/http-enum.nse usr/share/nmap/scripts/http-favicon.nse usr/share/nmap/scripts/http-form-brute.nse +usr/share/nmap/scripts/http-generator.nse +usr/share/nmap/scripts/http-google-malware.nse +usr/share/nmap/scripts/http-grep.nse usr/share/nmap/scripts/http-headers.nse usr/share/nmap/scripts/http-iis-webdav-vuln.nse +usr/share/nmap/scripts/http-joomla-brute.nse +usr/share/nmap/scripts/http-litespeed-sourcecode-download.nse +usr/share/nmap/scripts/http-majordomo2-dir-traversal.nse usr/share/nmap/scripts/http-malware-host.nse +usr/share/nmap/scripts/http-method-tamper.nse usr/share/nmap/scripts/http-methods.nse usr/share/nmap/scripts/http-open-proxy.nse +usr/share/nmap/scripts/http-open-redirect.nse usr/share/nmap/scripts/http-passwd.nse usr/share/nmap/scripts/http-php-version.nse +usr/share/nmap/scripts/http-proxy-brute.nse +usr/share/nmap/scripts/http-put.nse +usr/share/nmap/scripts/http-qnap-nas-info.nse usr/share/nmap/scripts/http-robots.txt.nse +usr/share/nmap/scripts/http-robtex-reverse-ip.nse usr/share/nmap/scripts/http-title.nse usr/share/nmap/scripts/http-trace.nse +usr/share/nmap/scripts/http-unsafe-output-escaping.nse usr/share/nmap/scripts/http-userdir-enum.nse usr/share/nmap/scripts/http-vhosts.nse usr/share/nmap/scripts/http-vmware-path-vuln.nse +usr/share/nmap/scripts/http-vuln-cve2009-3960.nse +usr/share/nmap/scripts/http-vuln-cve2010-2861.nse +usr/share/nmap/scripts/http-vuln-cve2011-3192.nse +usr/share/nmap/scripts/http-vuln-cve2011-3368.nse +usr/share/nmap/scripts/http-vuln-cve2012-1823.nse +usr/share/nmap/scripts/http-waf-detect.nse +usr/share/nmap/scripts/http-wordpress-brute.nse +usr/share/nmap/scripts/http-wordpress-enum.nse +usr/share/nmap/scripts/http-wordpress-plugins.nse +usr/share/nmap/scripts/iax2-brute.nse usr/share/nmap/scripts/iax2-version.nse +usr/share/nmap/scripts/imap-brute.nse usr/share/nmap/scripts/imap-capabilities.nse usr/share/nmap/scripts/informix-brute.nse usr/share/nmap/scripts/informix-query.nse usr/share/nmap/scripts/informix-tables.nse +usr/share/nmap/scripts/ip-geolocation-geobytes.nse +usr/share/nmap/scripts/ip-geolocation-geoplugin.nse +usr/share/nmap/scripts/ip-geolocation-ipinfodb.nse +usr/share/nmap/scripts/ip-geolocation-maxmind.nse usr/share/nmap/scripts/ipidseq.nse +usr/share/nmap/scripts/ipv6-node-info.nse +usr/share/nmap/scripts/irc-botnet-channels.nse +usr/share/nmap/scripts/irc-brute.nse usr/share/nmap/scripts/irc-info.nse usr/share/nmap/scripts/irc-unrealircd-backdoor.nse usr/share/nmap/scripts/iscsi-brute.nse usr/share/nmap/scripts/iscsi-info.nse usr/share/nmap/scripts/jdwp-version.nse +usr/share/nmap/scripts/krb5-enum-users.nse usr/share/nmap/scripts/ldap-brute.nse +usr/share/nmap/scripts/ldap-novell-getpass.nse usr/share/nmap/scripts/ldap-rootdse.nse usr/share/nmap/scripts/ldap-search.nse usr/share/nmap/scripts/lexmark-config.nse +usr/share/nmap/scripts/lltd-discovery.nse +usr/share/nmap/scripts/maxdb-info.nse +usr/share/nmap/scripts/membase-brute.nse +usr/share/nmap/scripts/membase-http-info.nse +usr/share/nmap/scripts/memcached-info.nse +usr/share/nmap/scripts/metasploit-xmlrpc-brute.nse usr/share/nmap/scripts/modbus-discover.nse +usr/share/nmap/scripts/mongodb-brute.nse usr/share/nmap/scripts/mongodb-databases.nse usr/share/nmap/scripts/mongodb-info.nse usr/share/nmap/scripts/ms-sql-brute.nse usr/share/nmap/scripts/ms-sql-config.nse +usr/share/nmap/scripts/ms-sql-dump-hashes.nse usr/share/nmap/scripts/ms-sql-empty-password.nse usr/share/nmap/scripts/ms-sql-hasdbaccess.nse usr/share/nmap/scripts/ms-sql-info.nse usr/share/nmap/scripts/ms-sql-query.nse usr/share/nmap/scripts/ms-sql-tables.nse usr/share/nmap/scripts/ms-sql-xp-cmdshell.nse +usr/share/nmap/scripts/mysql-audit.nse usr/share/nmap/scripts/mysql-brute.nse usr/share/nmap/scripts/mysql-databases.nse usr/share/nmap/scripts/mysql-empty-password.nse @@ -229,20 +381,34 @@ usr/share/nmap/scripts/mysql-info.nse usr/share/nmap/scripts/mysql-users.nse usr/share/nmap/scripts/mysql-variables.nse usr/share/nmap/scripts/nat-pmp-info.nse +usr/share/nmap/scripts/nat-pmp-mapport.nse usr/share/nmap/scripts/nbstat.nse +usr/share/nmap/scripts/ncp-enum-users.nse +usr/share/nmap/scripts/ncp-serverinfo.nse +usr/share/nmap/scripts/ndmp-fs-info.nse +usr/share/nmap/scripts/ndmp-version.nse +usr/share/nmap/scripts/nessus-brute.nse +usr/share/nmap/scripts/nessus-xmlrpc-brute.nse usr/share/nmap/scripts/netbus-auth-bypass.nse usr/share/nmap/scripts/netbus-brute.nse usr/share/nmap/scripts/netbus-info.nse usr/share/nmap/scripts/netbus-version.nse +usr/share/nmap/scripts/nexpose-brute.nse usr/share/nmap/scripts/nfs-ls.nse usr/share/nmap/scripts/nfs-showmount.nse usr/share/nmap/scripts/nfs-statfs.nse +usr/share/nmap/scripts/nping-brute.nse usr/share/nmap/scripts/nrpe-enum.nse usr/share/nmap/scripts/ntp-info.nse usr/share/nmap/scripts/ntp-monlist.nse +usr/share/nmap/scripts/omp2-brute.nse +usr/share/nmap/scripts/omp2-enum-targets.nse +usr/share/nmap/scripts/openlookup-info.nse +usr/share/nmap/scripts/openvas-otp-brute.nse usr/share/nmap/scripts/oracle-brute.nse usr/share/nmap/scripts/oracle-enum-users.nse usr/share/nmap/scripts/oracle-sid-brute.nse +usr/share/nmap/scripts/ovs-agent-version.nse usr/share/nmap/scripts/p2p-conficker.nse usr/share/nmap/scripts/path-mtu.nse usr/share/nmap/scripts/pgsql-brute.nse @@ -251,11 +417,30 @@ usr/share/nmap/scripts/pop3-brute.nse usr/share/nmap/scripts/pop3-capabilities.nse usr/share/nmap/scripts/pptp-version.nse usr/share/nmap/scripts/qscan.nse +usr/share/nmap/scripts/quake3-info.nse +usr/share/nmap/scripts/quake3-master-getservers.nse +usr/share/nmap/scripts/rdp-vuln-ms12-020.nse usr/share/nmap/scripts/realvnc-auth-bypass.nse +usr/share/nmap/scripts/redis-brute.nse +usr/share/nmap/scripts/redis-info.nse usr/share/nmap/scripts/resolveall.nse +usr/share/nmap/scripts/reverse-index.nse +usr/share/nmap/scripts/rexec-brute.nse +usr/share/nmap/scripts/riak-http-info.nse +usr/share/nmap/scripts/rlogin-brute.nse usr/share/nmap/scripts/rmi-dumpregistry.nse +usr/share/nmap/scripts/rpcap-brute.nse +usr/share/nmap/scripts/rpcap-info.nse usr/share/nmap/scripts/rpcinfo.nse +usr/share/nmap/scripts/rsync-brute.nse +usr/share/nmap/scripts/rsync-list-modules.nse +usr/share/nmap/scripts/rtsp-methods.nse +usr/share/nmap/scripts/rtsp-url-brute.nse +usr/share/nmap/scripts/samba-vuln-cve-2012-1182.nse usr/share/nmap/scripts/script.db +usr/share/nmap/scripts/servicetags.nse +usr/share/nmap/scripts/sip-brute.nse +usr/share/nmap/scripts/sip-enum-users.nse usr/share/nmap/scripts/skypev2-version.nse usr/share/nmap/scripts/smb-brute.nse usr/share/nmap/scripts/smb-check-vulns.nse @@ -266,19 +451,25 @@ usr/share/nmap/scripts/smb-enum-sessions.nse usr/share/nmap/scripts/smb-enum-shares.nse usr/share/nmap/scripts/smb-enum-users.nse usr/share/nmap/scripts/smb-flood.nse +usr/share/nmap/scripts/smb-mbenum.nse usr/share/nmap/scripts/smb-os-discovery.nse usr/share/nmap/scripts/smb-psexec.nse usr/share/nmap/scripts/smb-security-mode.nse usr/share/nmap/scripts/smb-server-stats.nse usr/share/nmap/scripts/smb-system-info.nse usr/share/nmap/scripts/smbv2-enabled.nse +usr/share/nmap/scripts/smtp-brute.nse usr/share/nmap/scripts/smtp-commands.nse usr/share/nmap/scripts/smtp-enum-users.nse usr/share/nmap/scripts/smtp-open-relay.nse usr/share/nmap/scripts/smtp-strangeport.nse +usr/share/nmap/scripts/smtp-vuln-cve2010-4344.nse +usr/share/nmap/scripts/smtp-vuln-cve2011-1720.nse +usr/share/nmap/scripts/smtp-vuln-cve2011-1764.nse usr/share/nmap/scripts/sniffer-detect.nse usr/share/nmap/scripts/snmp-brute.nse usr/share/nmap/scripts/snmp-interfaces.nse +usr/share/nmap/scripts/snmp-ios-config.nse usr/share/nmap/scripts/snmp-netstat.nse usr/share/nmap/scripts/snmp-processes.nse usr/share/nmap/scripts/snmp-sysdescr.nse @@ -286,6 +477,8 @@ usr/share/nmap/scripts/snmp-win32-services.nse usr/share/nmap/scripts/snmp-win32-shares.nse usr/share/nmap/scripts/snmp-win32-software.nse usr/share/nmap/scripts/snmp-win32-users.nse +usr/share/nmap/scripts/socks-auth-info.nse +usr/share/nmap/scripts/socks-brute.nse usr/share/nmap/scripts/socks-open-proxy.nse usr/share/nmap/scripts/sql-injection.nse usr/share/nmap/scripts/ssh-hostkey.nse @@ -293,15 +486,36 @@ usr/share/nmap/scripts/ssh2-enum-algos.nse usr/share/nmap/scripts/sshv1.nse usr/share/nmap/scripts/ssl-cert.nse usr/share/nmap/scripts/ssl-enum-ciphers.nse +usr/share/nmap/scripts/ssl-google-cert-catalog.nse +usr/share/nmap/scripts/ssl-known-key.nse usr/share/nmap/scripts/sslv2.nse +usr/share/nmap/scripts/stun-info.nse +usr/share/nmap/scripts/stun-version.nse usr/share/nmap/scripts/stuxnet-detect.nse usr/share/nmap/scripts/svn-brute.nse +usr/share/nmap/scripts/targets-asn.nse +usr/share/nmap/scripts/targets-ipv6-multicast-echo.nse +usr/share/nmap/scripts/targets-ipv6-multicast-invalid-dst.nse +usr/share/nmap/scripts/targets-ipv6-multicast-mld.nse +usr/share/nmap/scripts/targets-ipv6-multicast-slaac.nse +usr/share/nmap/scripts/targets-sniffer.nse usr/share/nmap/scripts/targets-traceroute.nse usr/share/nmap/scripts/telnet-brute.nse +usr/share/nmap/scripts/telnet-encryption.nse +usr/share/nmap/scripts/tftp-enum.nse +usr/share/nmap/scripts/unusual-port.nse usr/share/nmap/scripts/upnp-info.nse +usr/share/nmap/scripts/url-snarf.nse +usr/share/nmap/scripts/versant-info.nse +usr/share/nmap/scripts/vmauthd-brute.nse usr/share/nmap/scripts/vnc-brute.nse usr/share/nmap/scripts/vnc-info.nse +usr/share/nmap/scripts/voldemort-info.nse +usr/share/nmap/scripts/vuze-dht-info.nse usr/share/nmap/scripts/wdb-version.nse usr/share/nmap/scripts/whois.nse usr/share/nmap/scripts/wsdd-discover.nse usr/share/nmap/scripts/x11-access.nse +usr/share/nmap/scripts/xdmcp-discover.nse +usr/share/nmap/scripts/xmpp-brute.nse +usr/share/nmap/scripts/xmpp-info.nse diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index 973a7d2..1edf3e5 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -331,9 +331,13 @@ foreach my $line (@conntrack) { # Source and destination. my $sip; + my $sip_ret; my $dip; + my $dip_ret; my $sport; + my $sport_ret; my $dport; + my $dport_ret; my @packets; my @bytes; @@ -349,16 +353,32 @@ foreach my $line (@conntrack) { switch ($key) { case "src" { - $sip = $val; + if ($sip == "") { + $sip = $val; + } else { + $dip_ret = $val; + } } case "dst" { - $dip = $val; + if ($dip == "") { + $dip = $val; + } else { + $sip_ret = $val; + } } case "sport" { - $sport = $val; + if ($sport == "") { + $sport = $val; + } else { + $dport_ret = $val; + } } case "dport" { - $dport = $val; + if ($dport == "") { + $dport = $val; + } else { + $sport_ret = $val; + } } case "packets" { push(@packets, $val); @@ -375,17 +395,11 @@ foreach my $line (@conntrack) { my $sserv = ''; if ($sport < 1024) { $sserv = uc(getservbyport($sport, lc($l4proto))); - if ($sserv ne '') { - $sserv = " ($sserv)"; - } } my $dserv = ''; if ($dport < 1024) { $dserv = uc(getservbyport($dport, lc($l4proto))); - if ($dserv ne '') { - $dserv = " ($dserv)"; - } } my $bytes_in = format_bytes($bytes[0]); @@ -394,6 +408,49 @@ foreach my $line (@conntrack) { # Format TTL $ttl = format_time($ttl); + my $sip_extra; + if ($sip ne $sip_ret) { + $sip_extra = "> "; + $sip_extra .= "<a href='/cgi-bin/ipinfo.cgi?ip=$sip_ret'>"; + $sip_extra .= " $sip_ret"; + $sip_extra .= "</a>"; + } + + my $dip_extra; + if ($dip ne $dip_ret) { + $dip_extra = "> "; + $dip_extra .= "<a href='/cgi-bin/ipinfo.cgi?ip=$dip_ret'>"; + $dip_extra .= " $dip_ret"; + $dip_extra .= "</a>"; + } + + + my $sport_extra; + if ($sport ne $sport_ret) { + my $sserv_ret = ''; + if ($sport_ret < 1024) { + $sserv_ret = uc(getservbyport($sport_ret, lc($l4proto))); + } + + $sport_extra = "> "; + $sport_extra .= "<a href='http://isc.sans.org/port_details.php?port=$sport_ret' target='top' title='$sserv_ret'>"; + $sport_extra .= " $sport_ret"; + $sport_extra .= "</a>"; + } + + my $dport_extra; + if ($dport ne $dport_ret) { + my $dserv_ret = ''; + if ($dport_ret < 1024) { + $dserv_ret = uc(getservbyport($dport_ret, lc($l4proto))); + } + + $dport_extra = "> "; + $dport_extra .= "<a href='http://isc.sans.org/port_details.php?port=$dport_ret' target='top' title='$dserv_ret'>"; + $dport_extra .= " $dport_ret"; + $dport_extra .= "</a>"; + } + print <<END; <tr> <td align='center'>$l4proto</td> @@ -401,21 +458,25 @@ foreach my $line (@conntrack) { <a href='/cgi-bin/ipinfo.cgi?ip=$sip'> $sip </a> + $sip_extra </td> <td align='center' bgcolor='$sip_colour'> - <a href='http://isc.sans.org/port_details.php?port=$sport' target='top'> - $sport$sserv + <a href='http://isc.sans.org/port_details.php?port=$sport' target='top' title='$sserv'> + $sport </a> + $sport_extra </td> <td align='center' bgcolor='$dip_colour'> <a href='/cgi-bin/ipinfo.cgi?ip=$dip'> $dip </a> + $dip_extra </td> <td align='center' bgcolor='$dip_colour'> - <a href='http://isc.sans.org/port_details.php?port=$dport' target='top'> - $dport$dserv + <a href='http://isc.sans.org/port_details.php?port=$dport' target='top' title='$dserv'> + $dport </a> + $dport_extra </td> <td align='center'> $bytes_in / $bytes_out diff --git a/lfs/GeoIP b/lfs/GeoIP index aeb358d..41a82e9 100644 --- a/lfs/GeoIP +++ b/lfs/GeoIP @@ -25,7 +25,7 @@ include Config VER = 1.17 -DATVER = 04072012 +DATVER = 05092012 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 = 1395bec12f8a5f0b1e889581271ed5ce +GeoIP.dat-$(DATVER).gz_MD5 = c053f11cb8383fb8f4826591b0cbae3d install : $(TARGET) diff --git a/lfs/apcupsd b/lfs/apcupsd index 5638cab..db14e14 100644 --- a/lfs/apcupsd +++ b/lfs/apcupsd @@ -24,7 +24,7 @@ include Config -VER = 3.14.4 +VER = 3.14.10 THISAPP = apcupsd-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = apcupsd -PAK_VER = 4 +PAK_VER = 5 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 78811129db1a882b9a2b9afd540470b3 +$(DL_FILE)_MD5 = 5928822d855c5cf7ac29655e3e0b8c23 install : $(TARGET) diff --git a/lfs/configroot b/lfs/configroot index f353614..90f5afa 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -100,6 +100,7 @@ $(TARGET) : cp $(DIR_SRC)/config/cfgroot/time-settings $(CONFIG_ROOT)/time/settings cp $(DIR_SRC)/config/cfgroot/logging-settings $(CONFIG_ROOT)/logging/settings cp $(DIR_SRC)/config/cfgroot/useragents $(CONFIG_ROOT)/proxy/advanced + cp $(DIR_SRC)/config/cfgroot/ethernet-vlans $(CONFIG_ROOT)/ethernet/vlans cp $(DIR_SRC)/langs/list $(CONFIG_ROOT)/langs/ # Oneliner configfiles diff --git a/lfs/flac b/lfs/flac new file mode 100644 index 0000000..2143d36 --- /dev/null +++ b/lfs/flac @@ -0,0 +1,95 @@ +############################################################################### +# # +# 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 = 1.2.1 + +THISAPP = flac-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = flac +PAK_VER = 1 + +DEPS = "libogg" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 153c8b15a54da428d1f0fadc756c22c7 + +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) && patch -Np1 < $(DIR_SRC)/src/patches/flac-1.2.1-asm.patch + cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/flac-1.2.1-bitreader.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/flac-1.2.1-cflags.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/flac-1.2.1-gcc43.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/flac-1.2.1-hidesyms.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/flac-1.2.1-tests.patch + cd $(DIR_APP) && ./autogen.sh -V + cd $(DIR_APP) && \ + ./configure \ + --prefix=/usr \ + --disable-xmms-plugin \ + --disable-thorough-tests + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/fping b/lfs/fping new file mode 100644 index 0000000..3b7b97c --- /dev/null +++ b/lfs/fping @@ -0,0 +1,84 @@ +############################################################################### +# # +# 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 = 3.1 + +THISAPP = fping-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = fping +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = a2bbf3316da8c7b47a1a0ffe959d5d9e + +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 + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/icecc b/lfs/icecc index d661b19..9c9651c 100644 --- a/lfs/icecc +++ b/lfs/icecc @@ -24,7 +24,7 @@ include Config -VER = 0.9.6 +VER = 0.9.7 THISAPP = icecc-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = icecc -PAK_VER = 2 +PAK_VER = 3 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c6dacb3f28eade45f603a99245cde4fd +$(DL_FILE)_MD5 = c06900c2f4011428d0d48826a04f74fb install : $(TARGET) @@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/icecream-rename-scheduler.patch + cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/icecream-0.9.7-platform-arm.patch cd $(DIR_APP) && ./configure \ --prefix=/opt/icecream cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) diff --git a/lfs/initscripts b/lfs/initscripts index 03cec80..7210c0d 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -170,6 +170,7 @@ $(TARGET) : ln -sf ../init.d/firstsetup /etc/rc.d/rcsysinit.d/S75firstsetup ln -sf ../init.d/localnet /etc/rc.d/rcsysinit.d/S80localnet ln -sf ../init.d/sysctl /etc/rc.d/rcsysinit.d/S90sysctl + ln -sf ../init.d/network-vlans /etc/rc.d/rcsysinit.d/S91network-vlans ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq ln -sf ../../firewall /etc/rc.d/init.d/networking/red.up/20-RL-firewall diff --git a/lfs/libexif b/lfs/libexif new file mode 100644 index 0000000..e39508d --- /dev/null +++ b/lfs/libexif @@ -0,0 +1,84 @@ +############################################################################### +# # +# 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 = 0.6.21 + +THISAPP = libexif-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libexif +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 27339b89850f28c8f1c237f233e05b27 + +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 --disable-static + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/minidlna b/lfs/minidlna new file mode 100644 index 0000000..d93a5c2 --- /dev/null +++ b/lfs/minidlna @@ -0,0 +1,86 @@ +############################################################################### +# # +# 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 = 1.0.25 + +THISAPP = minidlna-$(VER) +DL_FILE = minidlna_$(VER)_src.tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = minidlna +PAK_VER = 1 + +DEPS = "ffmpeg flac libexif libid3tag libogg" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = d966256baf2f9b068b9de871ab5dade5 + +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) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + + # Install configuration. + install -m 644 $(DIR_SRC)/config/minidlna/minidlna.conf /etc + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/nasm b/lfs/nasm index 9d5ad08..f6aeac7 100644 --- a/lfs/nasm +++ b/lfs/nasm @@ -24,10 +24,10 @@ include Config -VER = 0.98.39 +VER = 2.10.03 THISAPP = nasm-$(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 = 2032ad44c7359f7a9a166a40a633e772 +$(DL_FILE)_MD5 = a5d0ed070476a7c5b4f0893dc4a4ea4b install : $(TARGET) @@ -69,8 +69,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-security_fix-1.patch + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/nmap b/lfs/nmap index 5ff3221..38b6da9 100644 --- a/lfs/nmap +++ b/lfs/nmap @@ -24,7 +24,7 @@ include Config -VER = 5.51 +VER = 6.01 THISAPP = nmap-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nmap -PAK_VER = 5 +PAK_VER = 6 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0b80d2cb92ace5ebba8095a4c2850275 +$(DL_FILE)_MD5 = a1a71940f238abb835dbf3ee7412bcea install : $(TARGET) diff --git a/lfs/php b/lfs/php index 3fcac17..503ddcc 100644 --- a/lfs/php +++ b/lfs/php @@ -24,7 +24,7 @@ include Config -VER = 5.3.14 +VER = 5.3.16 THISAPP = php-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -42,7 +42,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 = 7caac4f71e2f21426c11ac153e538392 +$(DL_FILE)_MD5 = 99cfd78531643027f60c900e792d21be idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1 Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513 diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch index 09a0b68..f8aea5f 100644 --- a/lfs/usb_modeswitch +++ b/lfs/usb_modeswitch @@ -24,7 +24,7 @@ include Config -VER = 1.2.3 +VER = 1.2.4 THISAPP = usb-modeswitch-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9b29e8b0d93d7604a9e5efc4696d37a3 +$(DL_FILE)_MD5 = dbd4ce7966d7b4a5a0604a8280f7164d install : $(TARGET) diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data index 46c7c0d..5beecda 100644 --- a/lfs/usb_modeswitch_data +++ b/lfs/usb_modeswitch_data @@ -24,7 +24,7 @@ include Config -VER = 20120531 +VER = 20120815 THISAPP = usb-modeswitch-data-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4a948331d5b9fccba4a89d3e62040cc3 +$(DL_FILE)_MD5 = 12d7de3210e45ad6f48791d12bbdbf61 install : $(TARGET) diff --git a/make.sh b/make.sh index 265677b..cf36f63 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.11" # Version number -CORE="61" # Core Level (Filename) -PAKFIRE_CORE="61" # Core Level (PAKFIRE) +CORE="62" # Core Level (Filename) +PAKFIRE_CORE="62" # 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 @@ -487,6 +487,7 @@ buildipfire() { ipfiremake libnl ipfiremake libidn ipfiremake libjpeg + ipfiremake libexif ipfiremake libpng ipfiremake libtiff ipfiremake libart @@ -632,6 +633,7 @@ buildipfire() { ipfiremake libogg ipfiremake libvorbis ipfiremake libdvbpsi + ipfiremake flac ipfiremake lame ipfiremake sox ipfiremake libshout @@ -767,6 +769,8 @@ buildipfire() { ipfiremake lcd4linux ipfiremake mtr ipfiremake tcpick + ipfiremake minidlna + ipfiremake fping 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 27618a6..1beb52d 100644 --- a/src/hwdata/pci.ids +++ b/src/hwdata/pci.ids @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2012.04.04 -# Date: 2012-04-04 03:15:01 +# Version: 2012.09.06 +# Date: 2012-09-06 03:15:02 # # Maintained by Martin Mares <mj(a)ucw.cz> and other volunteers from the # PCI ID Project at http://pci-ids.ucw.cz/. @@ -88,7 +88,6 @@ 04b3 IBM Corp. 4001 Remote System Administration device [RSA2] 050d Belkin -058f Alcor Micro Corporation 05a9 OmniVision 8519 OV519 series 05e3 CyberDoor @@ -122,8 +121,8 @@ 08e6 Gemalto NV 08ff AuthenTec afe4 [Anchor] AF-S2 FingerLoc Sensor Module -0925 First International Computer, Inc. - 1234 VA-502 Mainboard +0925 VIA Technologies, Inc. (Wrong ID) + 1234 VT82C686/A/B USB Controller 093a PixArt Imaging Inc. 010e Innovage Mini Digital Camera 010f SDC-300 Webcam @@ -202,6 +201,7 @@ 7020 USB Controller a0ec Fibre Channel Host Controller a0f0 Advanced System Management Controller + 0e11 b0f3 ProLiant DL360 a0f3 Triflex PCI to ISA Bridge a0f7 PCI Hotplug Controller 8086 002a PCI Hotplug Controller A @@ -325,6 +325,8 @@ 4c53 1080 CT8 mainboard 4c53 1300 P017 mezzanine (32-bit PMC) 4c53 1310 P017 mezzanine (64-bit PMC) + 002f MegaRAID SAS 2208 IOV [Thunderbolt] + 1028 1f3e SPERC 8 0030 53c1030 PCI-X Fusion-MPT Dual Ultra320 SCSI 0e11 00da ProLiant ML 350 1028 0123 LSI Logic 1020/1030 @@ -375,6 +377,11 @@ 0059 MegaRAID SAS 8208ELP/8208ELP 005a SAS1066E PCI-Express Fusion-MPT SAS 005b MegaRAID SAS 2208 [Thunderbolt] + 1000 9265 MegaRAID SAS 9265-8i + 1000 9266 MegaRAID SAS 9266-8i + 1000 9268 MegaRAID SAS 9265CV-8i / 9270CV-8i + 1014 040b ServeRAID M5110 SAS/SATA Controller + 1014 0412 ServeRAID M5110e SAS/SATA Controller 1028 1f2d PERC H810 Adapter 1028 1f30 PERC H710 Embedded 1028 1f31 PERC H710P Adapter @@ -383,10 +390,11 @@ 1028 1f35 PERC H710 Adapter 1028 1f37 PERC H710 Mini (for blades) 1028 1f38 PERC H710 Mini (for monolithics) - 8086 3513 RMS25PB080 RAID Controller + 8086 3513 RMS25CB080 RAID Controller 005c SAS1064A PCI-X Fusion-MPT SAS 005d MegaRAID SAS-3 3108 [Invader] 005e SAS1066 PCI-X Fusion-MPT SAS + 005f MegaRAID SAS-3 3008 [Fury] 0060 MegaRAID SAS 1078 1000 1006 MegaRAID SAS 8888ELP 1000 100a MegaRAID SAS 8708ELP @@ -436,6 +444,7 @@ 0073 MegaRAID SAS 2008 [Falcon] 1000 9240 MegaRAID SAS 9240-8i 1000 9241 MegaRAID SAS 9240-4i + 1000 92a0 MegaRAID SAS 9220-8i 1014 03b1 ServeRAID M1015 SAS/SATA Controller 1028 1f4e PERC H310 Adapter 1028 1f4f PERC H310 Integrated @@ -608,7 +617,9 @@ # nee ATI Technologies Inc. 1002 Advanced Micro Devices [AMD] nee ATI 1314 Wrestler HDMI Audio [Radeon HD 6250/6310] + 174b 1001 Sapphire PURE Fusion Mini 1714 BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series] + 103c 168b ProBook 4535s 3150 M24 1P [Radeon Mobility X600] 103c 0934 nx8220 3151 M24 [FireMV 2400] @@ -788,6 +799,8 @@ 1179 ff50 Satellite P305D-S8995E 1458 4385 GA-MA770-DS3rev2.0 Motherboard 1462 7368 K9AG Neo2 + 15d9 a811 H8DGU + 174b 1001 Sapphire PURE Fusion Mini 17f2 5000 KI690-AM2 Motherboard 4386 SB600 USB Controller (EHCI) 103c 280a DC5750 Microtower @@ -840,6 +853,7 @@ 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO + 174b 1001 Sapphire PURE Fusion Mini 4392 SB7x0/SB8x0/SB9x0 SATA Controller [Non-RAID5 mode] 4393 SB7x0/SB8x0/SB9x0 SATA Controller [RAID5 mode] 4394 SB7x0/SB8x0/SB9x0 SATA Controller [AHCI mode] @@ -848,21 +862,28 @@ 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO + 15d9 a811 H8DGU + 174b 1001 Sapphire PURE Fusion Mini 4397 SB7x0/SB8x0/SB9x0 USB OHCI0 Controller 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO + 15d9 a811 H8DGU + 174b 1001 Sapphire PURE Fusion Mini 4398 SB7x0 USB OHCI1 Controller 1043 82ef M3A78-EH Motherboard + 15d9 a811 H8DGU 4399 SB7x0/SB8x0/SB9x0 USB OHCI2 Controller 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO + 174b 1001 Sapphire PURE Fusion Mini 439c SB7x0/SB8x0/SB9x0 IDE Controller 1043 82ef M3A78-EH Motherboard 439d SB7x0/SB8x0/SB9x0 LPC host controller 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO + 174b 1001 Sapphire PURE Fusion Mini 43a0 SB700/SB800/SB900 PCI to PCI bridge (PCIE port 0) 43a1 SB700/SB800/SB900 PCI to PCI bridge (PCIE port 1) 43a2 SB900 PCI to PCI bridge (PCIE port 2) @@ -1394,12 +1415,14 @@ 5a10 RD890 Northbridge only dual slot (2x16) PCI-e GFX Hydra part 5a11 RD890 Northbridge only single slot PCI-e GFX Hydra part 5a12 RD890 Northbridge only dual slot (2x8) PCI-e GFX Hydra part + 15d9 a811 H8DGU 5a13 RD890 PCI to PCI bridge (external gfx0 port A) 5a14 RD890 PCI to PCI bridge (external gfx0 port B) 5a15 RD890 PCI to PCI bridge (PCI express gpp port A) 5a16 RD890 PCI to PCI bridge (PCI express gpp port B) 5a17 RD890 PCI to PCI bridge (PCI express gpp port C) 5a18 RD890 PCI to PCI bridge (PCI express gpp port D) + 15d9 a811 H8DGU 5a19 RD890 PCI to PCI bridge (PCI express gpp port E) 5a1a RD890 PCI to PCI bridge (PCI express gpp port F) 5a1b RD890 PCI to PCI bridge (PCI express gpp port G) @@ -1407,6 +1430,7 @@ 5a1d RD890 PCI to PCI bridge (external gfx1 port A) 5a1e RD890 PCI to PCI bridge (external gfx1 port B) 5a1f RD890 PCI to PCI bridge (NB-SB link) + 15d9 a811 H8DGU 5a23 RD990 I/O Memory Management Unit (IOMMU) 5a33 Radeon Xpress 200 Host Bridge 5a34 RS480 PCI-X Root Port @@ -1488,26 +1512,30 @@ 5e6d RV410 [Radeon X700 (PCIE)] (Secondary) 148c 2117 PowerColor Bravo X700 5f57 R423 [Radeon X800XT (PCIE)] + 6704 Cayman PRO GL [FirePro V7900] 6707 Cayman LE GL [FirePro V5900] 6718 Cayman XT [Radeon HD 6970] 6719 Cayman PRO [Radeon HD 6950] 671d Antilles [AMD Radeon HD 6990] 671f Cayman [Radeon HD 6900 Series] 6720 Blackcomb [Radeon HD 6900M series] - 6738 Barts XT [ATI Radeon HD 6800 Series] - 6739 Barts PRO [ATI Radeon HD 6800 Series] + 6738 Barts XT [Radeon HD 6800 Series] + 6739 Barts PRO [Radeon HD 6800 Series] + 1043 03b4 EAH6850 [Radeon HD 6850] 673e Barts LE [AMD Radeon HD 6700 Series] 6740 Whistler XT [AMD Radeon HD 6700M Series] 6741 Whistler [AMD Radeon HD 6600M Series] + 106b 00e2 MacBookPro8,2 [Core i7, 15", Late 2011] 6742 Whistler LE [AMD Radeon HD 6625M Graphics] 6743 Whistler [Radeon E6760] 6749 Turks [FirePro V4900] + 674a Turks [AMD FirePro V3900] 6750 Turks [AMD Radeon HD 6570] 6751 Turks [Radeon HD 7600A Series] 6758 Turks [Radeon HD 6670] 6759 Turks [Radeon HD 6570] 675d Turks [Radeon HD 7500 Series] - 6760 Seymour [Radeon HD 6400M Series] + 6760 Caicos [Radeon HD 6400M/7400M Series] 1028 04cc Vostro 3350 6761 Seymour LP [Radeon HD 6430M] 6763 Seymour [Radeon E6460] @@ -1523,6 +1551,9 @@ 6800 WIMBLEDON XT [Radeon HD 7970M] 6818 PITCAIRN [Radeon HD 7800] 6819 PITCAIRN PRO [Radeon HD 7800 Series] + 682f Cape Verde [Radeon HD 7700M Series] + 683d Cape Verde [Radeon HD 7700 Series] + 683f Cape Verde PRO [Radeon HD 7700 Series] 6840 Thames XT/GL [Radeon HD 7600M Series] 6841 Thames [Radeon 7500M/7600M Series] 6843 Thames [Radeon HD 7670M] @@ -1533,7 +1564,8 @@ 688d Cypress [AMD FireStream 9350] 6898 Cypress XT [Radeon HD 5870] 1462 8032 R5870 PM2D1G - 6899 Cypress [Radeon HD 5800 Series] + 6899 Cypress PRO [Radeon HD 5800 Series] + 1043 0330 EAH5850 [Radeon HD5850] 689b Cypress [Radeon HD 6800 Series] 689c Hemlock [Radeon HD 5900 Series] 689e Cypress LE [Radeon HD 5800 Series] @@ -1543,6 +1575,7 @@ 68a8 Broadway [ATI Mobility Radeon HD 6800 Series] 68a9 Juniper XT [FirePro 3D V5800] 68b8 Juniper [Radeon HD 5700 Series] + 106b 00cf MacPro5,1 [Mac Pro 2.8GHz DDR3] 68b9 Juniper [Radeon HD 5600/5700] 68ba Juniper XT [AMD Radeon HD 6000 Series] 68be Juniper [Radeon HD 5700 Series] @@ -1565,7 +1598,7 @@ 68e5 Robson LE [AMD Radeon HD 6300M Series] 68f1 Cedar [FirePro 2460] 68f2 Cedar [FirePro 2270] - 68f9 Cedar PRO [Radeon HD 5450] + 68f9 Cedar PRO [Radeon HD 5450/6350] 1028 010e XPS 8300 68fa EG Cedar [Radeon HD 7300 Series] 700f PCI Bridge [IGP 320M] @@ -1821,6 +1854,7 @@ 95c4 RV620 [Mobility Radeon HD 3400 Series] 1002 95c4 Mobility Radeon HD 3400 95c5 RV620 LE [Radeon HD 3450] + 1028 0342 OptiPlex 980 95c6 RV620 LE AGP [Radeon HD 3450] 95c7 RV620 CE [Radeon HD 3430] 95c9 RV620 PCI [Radeon HD 3450] @@ -1839,6 +1873,7 @@ 9616 RS780L [Radeon HD 3000] 9640 BeaverCreek [Radeon HD 6550D] 9641 BeaverCreek [Mobility Radeon HD 6620G] + 9647 BeaverCreek [Radeon HD 6520G] 964a BeaverCreek [Radeon HD 6530D] 970f RS880 HDMI Audio [Radeon HD 4200 Series] 1043 83a2 M4A785TD Motherboard @@ -1852,6 +1887,7 @@ 1043 843e M5A88-V EVO # Radeon HD 6250 too? 9802 Wrestler [Radeon HD 6310] + 174b 1001 Sapphire PURE Fusion Mini 9804 Wrestler [Radeon HD 6250] 9806 Wrestler [Radeon HD 6320] 9807 Wrestler [Radeon HD 6290] @@ -1878,8 +1914,7 @@ 1028 aa68 XPS 8300 aa80 Cayman/Antilles HDMI Audio [Radeon HD 6900 Series] aa88 Barts HDMI Audio [Radeon HD 6800 Series] -# 6500, 6600 and mobile 6700 series - aa90 Turks HDMI Audio [Radeon HD 6000 Series] + aa90 Turks/Whistler HDMI Audio [Radeon HD 6000 Series] aa98 Caicos HDMI Audio [Radeon HD 6400 Series] 174b aa98 Sapphire HD 6450 1GB DDR3 aaa0 Tahiti XT HDMI Audio [Radeon HD 7970 Series] @@ -1919,8 +1954,11 @@ 1004 0306 QSound ThunderBird PCI Audio Support Registers 122d 1208 DSP368 Audio Support Registers 1483 5022 XWave Thunder 3D Audio Support Registers - 0307 Thunderbird - 0308 Thunderbird + 0307 SAA7785 ThunderBird PCI Audio + 1004 0703 Philips Rhythmic Edge PSC703 + 1004 0705 Philips Seismic Edge PSC705 + 1004 0706 Philips Acoustic Edge PSC706 + 0308 SAA7785 ThunderBird PCI Audio Gameport 0702 VAS96011 [Golden Gate II] 0703 Tollgate 1005 Avance Logic Inc. [ALI] @@ -2386,7 +2424,9 @@ 1418 Family 15h (Models 10h-1fh) Processor Root Port 1419 Family 15h (Models 10h-1fh) I/O Memory Management Unit 1510 Family 14h Processor Root Complex + 174b 1001 Sapphire PURE Fusion Mini 1512 Family 14h Processor Root Port + 174b 1001 Sapphire PURE Fusion Mini 1513 Family 14h Processor Root Port 1514 Family 14h Processor Root Port 1515 Family 14h Processor Root Port @@ -2522,6 +2562,7 @@ 780b Hudson SMBus Controller 780c Hudson IDE Controller 780d Hudson Azalia Controller + 103c 168b Integrated Device Technology, Inc. [IDT] 92HD87B1/3 Audio Processor 780e Hudson LPC Bridge 780f Hudson PCI Bridge 7812 Hudson USB XHCI Controller @@ -2868,6 +2909,7 @@ 1028 028d PowerEdge T410 MGA G200eW WPCM450 1028 029c PowerEdge M710 MGA G200eW WPCM450 1028 02a4 PowerEdge T310 MGA G200eW WPCM450 + 15d9 a811 H8DGU 0533 MGA G200EH 103c 3381 iLO4 0534 G200eR2 @@ -2897,11 +2939,10 @@ 102b ff05 MGA-G100 Productiva AGP Multi-Monitor 110a 001e MGA-G100 AGP 2007 MGA Mistral - 2527 MGA G550 AGP + 2527 Millennium G550 102b 0f83 Millennium G550 102b 0f84 Millennium G550 Dual Head DDR 32Mb 102b 1e41 Millennium G550 -# Clearly the device name should not say AGP anymore... 102b 2300 Millennium G550 LP PCIE 2537 Millenium P650/P750 102b 1820 Millennium P750 64MB @@ -3112,6 +3153,7 @@ 013a Dual Tuner/MPEG Encoder 0194 uPD720200 USB 3.0 Host Controller 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 1043 8413 P8P67 Deluxe Motherboard 1b96 0001 USB 3.0 PCIe Card 01e7 uPD72873 [Firewarden] IEEE1394a OHCI 1.1 Link/2-port PHY Controller @@ -3124,12 +3166,12 @@ 1038 AMP, Inc 1039 Silicon Integrated Systems [SiS] 0001 AGP Port (virtual PCI-to-PCI bridge) - 0002 SG86C202 + 0002 AGP Port (virtual PCI-to-PCI bridge) 0003 AGP Port (virtual PCI-to-PCI bridge) 0004 PCI-to-PCI bridge 0006 85C501/2/3 0008 SiS85C503/5513 (LPC Bridge) - 0009 ACPI + 0009 5595 Power Management Controller 000a PCI-to-PCI bridge 0016 SiS961/2/3 SMBus controller 0018 SiS85C503/5513 (LPC Bridge) @@ -3367,6 +3409,8 @@ 1361 BCM4312 802.11a/b/g WLAN Controller 1371 Broadcom Corporation BCM4312 802.11a/b/g (rev 02) 1717 Intel 82571EB dual 1 Gb Ethernet controller + 179b EliteBook 8470p Notebook + 179d EliteBook 8470p Notebook 2910 E2910A PCIBus Exerciser 2925 E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer 3080 Pavilion ze2028ea @@ -3433,6 +3477,7 @@ 4037 PCIe Local Bus Adapter 403b PCIe Root Port 60e8 NetRAID-2M : ZX1/M (OEM AMI MegaRAID 493) + 780d Hudson Azalia Controller (rev 01) - Soundcard 103e Solliday Engineering 103f Synopsys/Logic Modeling Group 1040 Accelgraphics Inc. @@ -3472,6 +3517,8 @@ 82e8 M3N72-D 8383 P7P55D Series Motherboard 83a4 Motherboard M2N68-AM SE2 +# Onboard audio for M4A89 series motherboards. + 8410 SBx00 [Azalia] 843e M5A88-V EVO # wrong vendor ID (should have been AMD) 9602 RS880 PCI to PCI bridge (int gfx) @@ -3539,6 +3586,7 @@ c825 82C825 [Firebridge 2] c832 82C832 c861 82C861 + c881 82C881 [FireLink] 1394 OHCI Link Controller c895 82C895 c935 EV1935 ECTIVA MachOne PCIAudio d568 82C825 [Firebridge 2] @@ -3654,7 +3702,7 @@ 8024 TSB43AB23 IEEE-1394a-2000 Controller (PHY/Link) 107d 6620 Winfast DV2000 FireWire Controller 1443 8024 FireBoard Blue - 1458 1000 GA-EP45-DS5 Motherboard + 1458 1000 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 8025 TSB82AA2 IEEE-1394b Link Layer Controller 1043 813c P5P series mainboard 1443 8025 FireBoard800 @@ -4344,6 +4392,7 @@ 103c 12dd 4Gb Fibre Channel [AB429A] 2432 ISP2432-based 4Gb Fibre Channel to PCI Express HBA 2532 ISP2532-based 8Gb Fibre Channel to PCI Express HBA + 1077 0167 QME2572 Dual Port FC8 HBA Mezzanine 3022 ISP4022-based Ethernet NIC 3032 ISP4032-based Ethernet IPv6 NIC 4010 ISP4010-based iSCSI TOE HBA @@ -4391,9 +4440,7 @@ 107c LG Electronics [Lucky Goldstar Co. Ltd] 107d LeadTek Research Inc. 0000 P86C850 - 204d [GeForce 7800 GTX] Winfast PX7800 GTX TDH 2134 WinFast 3D S320 II - 2971 [GeForce FX 5900] WinFast A350 TDH MyViVo 6609 Winfast TV 2000 XP RM 6654 Conexant CX23883 [WinFast DTV1800 H] 6f22 WinFast PxTV1200 @@ -4465,7 +4512,6 @@ 1001 Happy Meal 10/100 Ethernet [hme] 1100 RIO EBUS 108e 1100 RIO EBUS on Blade 100 motherboard -# Correction 1101 RIO 10/100 Ethernet [eri] 108e 1101 RIO GEM on Blade 100 motherboard 1102 RIO 1394 @@ -5268,7 +5314,8 @@ 1001 FDC 37C922 a011 83C170QF b106 SMC34C90 -10b9 ALi Corporation +# Split off ALi Corporation in 2003 +10b9 ULi Electronics Inc. 0101 CMI8338/C3DX PCI Audio Device 0111 C-Media CMI8738/C3DX Audio Device (OEM) 10b9 0111 C-Media CMI8738/C3DX Audio Device (OEM) @@ -5485,6 +5532,7 @@ 1623 PCEA4 PCI-Express Dual Port ESCON Adapter 2001 mb86605 200c MB86613L IEEE1394 OHCI 1.0 Controller + 2010 MB86613S IEEE1394 OHCI 1.1 Controller 2019 MB86295S [CORAL P] 201e MB86296S [CORAL PA] 202b MB86297A [Carmine Graphics Controller] @@ -5520,7 +5568,6 @@ 10de NVIDIA Corporation 0008 NV1 [EDGE 3D] 0009 NV1 [EDGE 3D] - 0010 NV2 [Mutara V08] 0020 NV4 [RIVA TNT] 1043 0200 V3400 TNT 1048 0c18 Erazor II SGRAM @@ -5638,6 +5685,7 @@ 10f1 2865 Tomcat K8E (S2865) 1458 0c11 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond + 1462 7125 K8N Neo4-F mainboard 147b 1c1a KN8-Ultra Mainboard 1565 3402 NF4 AM2L Mainboard 0051 CK804 ISA Bridge @@ -5648,6 +5696,7 @@ 10f1 2865 Tomcat K8E (S2865) 1458 0c11 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond + 1462 7125 K8N Neo4-F mainboard 147b 1c1a KN8-Ultra Mainboard 1565 3402 NF4 AM2L Mainboard 0053 CK804 IDE @@ -5655,6 +5704,7 @@ 10f1 2865 Tomcat K8E (S2865) 1458 5002 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond + 1462 7125 K8N Neo4-F mainboard 147b 1c1a KN8-Ultra Mainboard 1565 3402 NF4 AM2L Mainboard 0054 CK804 Serial ATA Controller @@ -5663,6 +5713,7 @@ 10f1 2865 Tomcat K8E (S2865) 1458 b003 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond + 1462 7125 K8N Neo4-F mainboard 147b 1c1a KN8-Ultra Mainboard 1565 5401 NF4 AM2L Mainboard 0055 CK804 Serial ATA Controller @@ -5670,6 +5721,7 @@ 1043 815a K8N4-E or A8N-E Mainboard 10f1 2865 Tomcat K8E (S2865) 1458 b003 GA-K8N Ultra-9 Mainboard + 1462 7125 K8N Neo4-F mainboard 147b 1c1a KN8-Ultra Mainboard 1565 5401 NF4 AM2L Mainboard 0056 CK804 Ethernet Controller @@ -5679,12 +5731,14 @@ 10f1 2865 Tomcat K8E (S2865) 1458 e000 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond + 1462 7125 K8N Neo4-F mainboard 147b 1c1a KN8-Ultra Mainboard 1565 2501 NF4 AM2L Mainboard 0058 CK804 AC'97 Modem 0059 CK804 AC'97 Audio Controller 1043 812a K8N4-E or A8N-E 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 @@ -5693,6 +5747,7 @@ 10f1 2865 Tomcat K8E (S2865) 1458 5004 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond + 1462 7125 K8N Neo4-F mainboard 147b 1c1a KN8-Ultra Mainboard 1565 3402 NF4 AM2L Mainboard 005b CK804 USB Controller @@ -5701,6 +5756,7 @@ 10f1 2865 Tomcat K8E (S2865) 1458 5004 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond + 1462 7125 K8N Neo4-F mainboard 147b 1c1a KN8-Ultra Mainboard 1565 3402 NF4 AM2L Mainboard 005c CK804 PCI Bridge @@ -5712,7 +5768,8 @@ 10f1 2865 Tomcat K8E (S2865) 10f1 2891 Thunder K8SRE Mainboard 1458 5000 GA-K8N Ultra-9 Mainboard - 1462 7100 MSI K8N Diamond + 1462 7100 K8N Diamond Mainboard + 1462 7125 K8N Neo4-F Mainboard 147b 1c1a KN8-Ultra Mainboard 1565 3402 NF4 AM2L Mainboard 005f CK804 Memory Controller @@ -6112,6 +6169,7 @@ 0259 NV25GL [Quadro4 750 XGL] 025b NV25GL [Quadro4 700 XGL] 0260 MCP51 LPC Bridge + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81bc A8N-VM CSM Mainboard 1458 5001 GA-M55plus-S3G @@ -6121,25 +6179,30 @@ 0262 MCP51 LPC Bridge 0263 MCP51 LPC Bridge 0264 MCP51 SMBus + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81bc A8N-VM CSM Mainboard 105b 0cad Winfast 6100K8MB 1462 7207 K8NGM2 series 0265 MCP51 IDE + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81bc A8N-VM CSM Mainboard 1462 7207 K8NGM2 series # Foxconn has used a wrong vendor ID for this one f05b 0cad Winfast 6100K8MB 0266 MCP51 Serial ATA Controller + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81bc A8N-VM CSM Mainboard 1462 7207 K8NGM2 series 0267 MCP51 Serial ATA Controller + 103c 2a34 Pavilion a1677c 1043 81bc A8N-VM CSM Mainboard 1462 7207 K8NGM2 series 0268 MCP51 Ethernet Controller 0269 MCP51 Ethernet Controller + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 8141 A8N-VM CSM Mainboard 1462 7207 K8NGM2 series @@ -6147,16 +6210,19 @@ 026b MCP51 AC97 Audio Controller 105b 0cad Winfast 6100K8MB 026c MCP51 High Definition Audio + 103c 2a34 Pavilion a1677c 103c 30b5 Presario V3242AU 103c 30b7 Presario V6133CL 10de cb84 ASUSTeK Computer Inc. A8N-VM CSM Mainboard 1462 7207 K8NGM2 series 026d MCP51 USB Controller + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81bc A8N-VM CSM Mainboard 105b 0cad Winfast 6100K8MB 1462 7207 K8NGM2 series 026e MCP51 USB Controller + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81bc A8N-VM CSM Mainboard 105b 0cad Winfast 6100K8MB @@ -6164,6 +6230,7 @@ 026f MCP51 PCI Bridge 103c 30b7 Presario V6133CL 0270 MCP51 Host Bridge + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81bc A8N-VM CSM Mainboard 105b 0cad Winfast 6100K8MB @@ -6173,13 +6240,16 @@ 103c 30b5 Presario V3242AU 103c 30b7 Presario V6133CL 0272 MCP51 Memory Controller 0 + 103c 2a34 Pavilion a1677c 105b 0cad Winfast 6100K8MB 027e C51 Memory Controller 2 + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81cd A8N-VM CSM Mainboard 1458 5000 GA-M55plus-S3G 1462 7207 K8NGM2 series 027f C51 Memory Controller 3 + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81cd A8N-VM CSM Mainboard 1458 5000 GA-M55plus-S3G @@ -6224,6 +6294,7 @@ 02e4 G71 [GeForce 7950 GT] 1682 2271 PV-T71A-YDF7 (512MB) 02f0 C51 Host Bridge + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81cd A8N-VM CSM Mainboard 1462 7207 K8NGM2 series @@ -6236,6 +6307,7 @@ 02f6 C51 Host Bridge 02f7 C51 Host Bridge 02f8 C51 Memory Controller 5 + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81cd A8N-VM CSM Mainboard 1458 5000 GA-M55plus-S3G @@ -6246,6 +6318,7 @@ 1458 5000 GA-M55plus-S3G 1462 7207 K8NGM2 series 02fa C51 Memory Controller 0 + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81cd A8N-VM CSM Mainboard 1458 5000 GA-M55plus-S3G @@ -6256,11 +6329,13 @@ 02fd C51 PCI Express Bridge 103c 30b7 Presario V6133CL 02fe C51 Memory Controller 1 + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81cd A8N-VM CSM Mainboard 1458 5000 GA-M55plus-S3G 1462 7207 K8NGM2 series 02ff C51 Host Bridge + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81cd A8N-VM CSM Mainboard 1458 5000 GA-M55plus-S3G @@ -6588,7 +6663,6 @@ 1849 054c ALiveNF7G-HDready, MCP67 Gigabit Ethernet 054d MCP67 Ethernet 054e MCP67 Ethernet -# forcedeth source code from Nvidi 054f MCP67 Ethernet 0550 MCP67 AHCI Controller 1043 8308 M2N68-AM Motherboard @@ -6610,10 +6684,12 @@ 1849 0562 ALiveNF7G-HDready 0563 MCP67 PCI Express Bridge 0568 MCP78S [GeForce 8200] Memory Controller + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 0568 K10N78FullHD-hSLI R3.0 Memory Controller 0569 MCP78S [GeForce 8200] PCI Express Bridge + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 0569 K10N78FullHD-hSLI R3.0 PCI Express Bridge @@ -6733,9 +6809,9 @@ 06cd GF100 [GeForce GTX 470] 06d1 GF100 [Tesla C2050 / C2070] 06d2 GF100 [Tesla M2070] - 06d8 GF100 [Quadro 6000] - 06d9 GF100 [Quadro 5000] - 06dd GF100 [Quadro 4000] + 06d8 GF100GL [Quadro 6000] + 06d9 GF100GL [Quadro 5000] + 06dd GF100GL [Quadro 4000] 06de GF100 [Tesla S2050] 06df GF100 [Tesla M2070Q] 06e0 G98 [GeForce 9300 GE] @@ -6762,18 +6838,22 @@ 06fd G98 [Quadro NVS 295] 06ff G98 [HICx16 + Graphics] 0751 MCP78S [GeForce 8200] Memory Controller + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 0751 K10N78FullHD-hSLI R3.0 Memory Controller 0752 MCP78S [GeForce 8200] SMBus + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 0752 K10N78FullHD-hSLI R3.0 SMBus 0753 MCP78S [GeForce 8200] Co-Processor + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 0753 K10N78FullHD-hSLI R3.0 Co-Processor 0754 MCP78S [GeForce 8200] Memory Controller + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 0754 K10N78FullHD-hSLI R3.0 Memory Controller @@ -6782,18 +6862,22 @@ 1462 7508 K9N2GM-FIH 1849 0759 K10N78FullHD-hSLI R3.0 IDE 075a MCP78S [GeForce 8200] PCI Bridge + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1849 075a K10N78FullHD-hSLI R3.0 PCI Bridge 075b MCP78S [GeForce 8200] PCI Express Bridge + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 075b K10N78FullHD-hSLI R3.0 PCI Express Bridge 075c MCP78S [GeForce 8200] LPC Bridge + 103c 2a9e Pavilion p6310f 1462 7508 K9N2GM-FIH 1849 075c K10N78FullHD-hSLI R3.0 LPC Bridge 075d MCP78S [GeForce 8200] LPC Bridge 1043 82e8 M3N72-D 0760 MCP77 Ethernet + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 0760 K10N78FullHD-hSLI R3.0 Ethernet @@ -6801,31 +6885,38 @@ 0762 MCP77 Ethernet 0763 MCP77 Ethernet 0774 MCP72XE/MCP72P/MCP78U/MCP78S High Definition Audio + 103c 2a9e Pavilion p6310f # has a Realtek ALC1200 HDAudio Codec 1043 82fe M3N72-D 1462 7508 K9N2GM-FIH 1849 3662 K10N78FullHD-hSLI R3.0 High Definition Audio 0778 MCP78S [GeForce 8200] PCI Express Bridge + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 0778 K10N78FullHD-hSLI R3.0 PCI Express Bridge 077a MCP78S [GeForce 8200] PCI Bridge + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 077a K10N78FullHD-hSLI R3.0 PCI Bridge 077b MCP78S [GeForce 8200] OHCI USB 1.1 Controller + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 077b K10N78FullHD-hSLI R3.0 OHCI USB 1.1 Controller 077c MCP78S [GeForce 8200] EHCI USB 2.0 Controller + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 077c K10N78FullHD-hSLI R3.0 EHCI USB 2.0 Controller 077d MCP78S [GeForce 8200] OHCI USB 1.1 Controller + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 077d K10N78FullHD-hSLI R3.0 OHCI USB 1.1 Controller 077e MCP78S [GeForce 8200] EHCI USB 2.0 Controller + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 077e K10N78FullHD-hSLI R3.0 EHCI USB 2.0 Controller @@ -6901,6 +6992,7 @@ 0845 C77 [GeForce 8200M G] 0846 C77 [GeForce 9200] 0847 C78 [GeForce 9100] + 103c 2a9e Pavilion p6310f 0848 C77 [GeForce 8300] 0849 C77 [GeForce 8200] 1462 7508 K9N2GM-FIH @@ -6972,6 +7064,7 @@ 0a73 GT218 [GeForce 305M] 0a74 GT218 [GeForce G210M] 0a75 GT218 [GeForce 310M] + 0a76 GT218 [ION 2] 0a78 GT218GL [Quadro FX 380 LP] 0a7c GT218 [Quadro FX 380M] 0a80 MCP79 Host Bridge @@ -7038,6 +7131,7 @@ 1462 7508 K9N2GM-FIH 1849 0ad0 K10N78FullHD-hSLI R3.0 IDE 0ad4 MCP78S [GeForce 8200] AHCI Controller + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1849 0ad4 K10N78FullHD-hSLI R3.0 AHCI Controller 0ad8 MCP78S [GeForce 8200] SATA Controller (RAID mode) @@ -7090,55 +7184,82 @@ 1558 8687 CLEVO/KAPOK W860CU 0dd2 GF106 [GeForce GT 445M] 0dd8 GF106GL [Quadro 2000] - 0dda GF106 [Quadro 2000M] +# NVIDIA calls it GF106GML + 0dda GF106GLM [Quadro 2000M] 0de0 GF108 [GeForce GT 440] 0de1 GF108 [GeForce GT 430] 3842 1430 GeForce GT 430 0de2 GF108 [GeForce GT 420] + 0de9 GeForce GT 630M # Not fully sure that it's GF108, might also be GF106. 0deb GF108 [GeForce GT 555M] 0dee GF108 [GeForce GT 415M] + 0def GF108 [Quadro NVS 5400M] 0df0 GF108 [GeForce GT 425M] 0df2 GF108 [GeForce GT 435M] 0df4 GF108 [GeForce GT 540M] 0df5 GF108 [GeForce GT 540M] 0df7 GF108 [GeForce GT 520M] - 0df8 GF108 [Quadro 600] - 0dfa GF108 [Quadro 1000M] - 0e08 HDMI Audio stub +# NVIDIA calls it GL + 0df8 GF108GL [Quadro 600] +# NVIDIA calls it GLM + 0df9 GF108GLM [Quadro 500M] +# NVIDIA calls it GLM + 0dfa GF108GLM [Quadro 1000M] + 0e08 GF119 HDMI Audio Controller 0e09 GF110 High Definition Audio Controller - 0e0a GK104 [Geforce GTX680] - 0e0c GF110 High Definition Audio Controller + 0e0a GK104 HDMI Audio Controller + 0e0c GF114 HDMI Audio Controller 0e22 GF104 [GeForce GTX 460] 1462 2322 N460GTX Cyclone 1GD5/OC 0e3a GF104 [Quadro 3000M] 0e3b GF104 [Quadro 4000M] + 0fd1 GK107 [GeForce GT 650M] 0fd2 GK107 [GeForce GT 640M] + 0ffb GK107 [Quadro K2000M] + 0ffc GK107 [Quadro K1000M] 1040 GF119 [GeForce GT 520] 1050 GF119 [GeForce GT 520M] 1051 GF119 [GeForce GT 520MX] 1056 GF119 [Quadro NVS 4200M] 1057 GF119 [Quadro NVS 4200M] + 105a GF119 [GeForce 610M] 1080 GF110 [GeForce GTX 580] 1081 GF110 [GeForce GTX 570] 10de 087e Leadtek WinFast GTX 570 - 1082 GF114 [GeForce GTX 560 Ti] + 1082 GF110 [GeForce GTX 560 Ti] 1086 GF110 [GeForce GTX 570 HD] + 1087 GF110 [GeForce GTX 560 Ti 448 Cores] 1091 Tesla M2090 1094 Tesla M2075 Dual-Slot Computing Processor Module 1096 Tesla C2075 + 109b GF100GL [Quadro 7000] 10c3 GT218 [GeForce 8400 GS] 10de 066d G98 [GeForce 8400GS] - 10c5 Dell M116N [GeForce 405] - 10d8 GT218 [NVS 300] + 10c5 GT218 [GeForce 405] + 10d8 GT218 [Quadro NVS 300] 1180 GK104 [GeForce GTX 680] - 1200 GF110 [GeForce GTX 560 Ti] + 1183 GK104 [GeForce GTX 660 Ti] + 1188 GK104 [GeForce GTX 690] + 1189 GK104 [GeForce GTX 670] + 11bc GK104 [Quadro K5000M] + 11bd GK104 [Quadro K4000M] + 11be GK104 [Quadro K3000M] + 1200 GF114 [GeForce GTX 560 Ti] 1201 GF114 [GeForce GTX 560] 1205 GF114 [GeForce GTX 460 v2] 1244 GF116 [GeForce GTX 550 Ti] 1245 GF116 [GeForce GTS 450] 1247 GF106 [GeForce GT 555M] 10df Emulex Corporation + 0720 OneConnect NIC (Skyhawk) + 0722 OneConnect iSCSI Initiator (Skyhawk) + 0723 OneConnect iSCSI Initiator + Target (Skyhawk) + 0724 OneConnect FCoE Initiator (Skyhawk) + 0728 OneConnect NIC (Skyhawk-VF) + 072a OneConnect iSCSI Initiator (Skyhawk-VF) + 072b OneConnect iSCSI Initiator + Target (Skyhawk-VF) + 072c OneConnect FCoE Initiator (Skyhawk-VF) 1ae5 LP6000 Fibre Channel Host Adapter e100 Proteus-X: LightPulse IOV Fibre Channel Host Adapter e131 LightPulse 8Gb/s PCIe Shared I/O Fibre Channel Adapter @@ -7284,6 +7405,7 @@ 0885 Realtek 885 High Definition Audio 0888 Realtek 888 High Definition Audio 1028 020d Inspiron 530 + 0892 Realtek 892 High Definition Audio 5209 RTS5209 PCI Express Card Reader 5229 RTS5229 PCI Express Card Reader 5288 Barossa PCI Express Card Reader @@ -7358,6 +7480,7 @@ 8168 RTL8111/8168B PCI Express Gigabit Ethernet controller 1019 8168 MCP73PVT-SM 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 103c 1611 Pavilion DM1Z-3000 1043 11f5 A6J-Q008 1043 16d5 U6V/U31J laptop @@ -7366,14 +7489,14 @@ 1043 83a3 M4A785TD Motherboard 1043 8432 P8P67 and other motherboards 10ec 8168 TEG-ECTX Gigabit PCI-E Adapter [Trendnet] - 1458 e000 GA-EP45-DS5 Motherboard + 1458 e000 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 1462 238c Onboard RTL8111b on MSI P965 Platinum Mainboard 1462 368c K9AG Neo2 1462 7522 X58 Pro-E 1775 11cc CC11/CL11 1849 8168 Motherboard (one of many) 8086 d615 Desktop Board D510MO - 8169 RTL-8169 Gigabit Ethernet + 8169 RTL8169 PCI Gigabit Ethernet Controller 1025 0079 Aspire 5024WLMi 10bd 3202 EP-320G-TX1 32-bit PCI Gigabit Ethernet Adapter 10ec 8169 RTL8169/8110 Family PCI Gigabit Ethernet NIC @@ -7403,6 +7526,7 @@ 8190 RTL8190 802.11n Wireless LAN 8191 RTL8188CE 802.11b/g/n WiFi Adapter 8192 RTL8192E/RTL8192SE Wireless LAN Controller + 8193 RTL8192DE Wireless LAN Controller 8197 SmartLAN56 56K Modem 8199 RTL8187SE Wireless LAN Controller 1462 6894 MN54G2 / MS-6894 Wireless Mini PCIe Card @@ -7566,6 +7690,9 @@ 0007 HPT371/371N 0008 HPT374 0009 HPT372N + 0620 RocketRAID 620 2 Port SATA-III Controller + 0622 RocketRAID 622 2 Port SATA-III Controller + 0640 RocketRAID 640 4 Port SATA-III Controller 1720 RocketRAID 1720 (2x SATA II RAID Controller) 1740 RocketRAID 1740 1742 RocketRAID 1742 @@ -7586,6 +7713,7 @@ 3120 RocketRAID 3120 3220 RocketRAID 3220 3320 RocketRAID 3320 + 4310 RocketRaid 4310 1104 RasterOps Corp. 1105 Sigma Designs, Inc. 1105 REALmagic Xcard MPEG 1/2/3/4 DVD Decoder @@ -7638,6 +7766,7 @@ 1043 836c P7H55 1043 83c7 P5KPL-AM EPU 0409 VX855/VX875 Host Bridge: Host Control + 0410 VX900 Host Bridge: Host Control 0415 VT6415 PATA IDE Host Controller 1043 838f M5A88-V EVO 0501 VT8501 [Apollo MVP4] @@ -7723,6 +7852,7 @@ 1353 VX800/VX820 Error Reporting 1364 CN896/VN896/P4M900 Host Bridge 1409 VX855/VX875 Error Reporting + 1410 VX900 Error Reporting 1571 VT82C576M/VT82C586 1595 VT82C595/97 [Apollo VP2/97] 1732 VT1732 [Envy24 II] PCI Multi-Channel Audio Controller @@ -7747,6 +7877,7 @@ 2353 VX800/VX820 Host Bus Control 2364 CN896/VN896/P4M900 Host Bridge 2409 VX855/VX875 Host Bus Control + 2410 VX900 CPU Bus Controller 287a VT8251 PCI to PCI Bridge 287b VT8251 Host Bridge 287c VT8251 PCIE Root Port @@ -7772,6 +7903,7 @@ 147b 1407 KV8-MAX3 motherboard 182d 201d CN-029 USB2.0 4 port PCI Card 1849 3038 K7VT6 + 19da a179 ZBOX nano VD01 3040 VT82C586B ACPI 3043 VT86C100A [Rhine] 10bd 0000 VT86C100A Fast Ethernet Adapter @@ -7781,6 +7913,7 @@ 0010 0001 IEEE 1394 4port DCST 1394-3+1B 1025 005a TravelMate 290 103c 2a20 Pavilion t3030.de Desktop PC + 103c 2a3b Media Center PC m7590n 1043 808a A8V/A8N/P4P800 series motherboard 1043 81fe M4A series motherboard 1458 1000 GA-7VT600-1394 Motherboard @@ -7884,6 +8017,7 @@ 147b 1407 KV8-MAX3 motherboard 182d 201d CN-029 USB 2.0 4 port PCI Card 1849 3104 K7VT6 motherboard + 19da a179 ZBOX nano VD01 3106 VT6105/VT6106S [Rhine-III] 1106 0105 VT6106S [Rhine-III] 1186 1403 DFE-530TX rev C @@ -7966,6 +8100,7 @@ 3282 K8T800Pro Host Bridge 3287 VT8251 PCI to ISA Bridge 3288 VT8237A/VT8251 HDA Controller + 19da a179 ZBOX VD01 3290 K8M890 Host Bridge 3296 P4M800 Host Bridge 3324 CX700/VX700 Host Bridge @@ -7987,6 +8122,8 @@ 1043 8374 M5A88-V EVO 1043 8384 P8P67 Deluxe Motherboard 3409 VX855/VX875 DRAM Bus Control + 3410 VX900 DRAM Bus Control + 19da a179 ZBOX nano VD01 4149 VIA VT6420 (ATA133) Controller 4204 K8M800 Host Bridge 4208 PT890 Host Bridge @@ -8009,6 +8146,8 @@ 4364 CN896/VN896/P4M900 Host Bridge 4397 VT1708B/1702S/1708S HD audio codec 4409 VX855/VX875 Power Management Control + 4410 VX900 Power Management and Chip Testing Control + 19da a179 ZBOX nano VD01 4428 VT1718S HD Audio Codec 5030 VT82C596 ACPI [Apollo PRO] 5122 VX855/VX875 Chrome 9 HCM Integrated Graphics @@ -8026,12 +8165,15 @@ 5364 CN896/VN896/P4M900 I/O APIC Interrupt Controller 5372 VT8237/8251 Serial ATA Controller 5409 VX855/VX875 APIC and Central Traffic Control + 5410 VX900 APIC and Central Traffic Control 6100 VT85C100A [Rhine II] 6287 SATA RAID Controller 6327 P4M890 Security Device 6353 VX800/VX820 Scratch Registers 6364 CN896/VN896/P4M900 Security Device 6409 VX855/VX875 Scratch Registers + 6410 VX900 Scratch Registers + 19da a179 ZBOX nano VD01 7122 VX900 Graphics [Chrome9 HD] 7204 K8M800 Host Bridge 7205 KM400/KN400/P4M800 [S3 UniChrome] @@ -8056,6 +8198,8 @@ 7353 VX800/VX820 North-South Module Interface Control 7364 CN896/VN896/P4M900 Host Bridge 7409 VX855/VX875 North-South Module Interface Control + 7410 VX900 North-South Module Interface Control + 19da a179 ZBOX nano VD01 8231 VT8231 [PCI-to-ISA Bridge] 8235 VT8235 ACPI 8305 VT8363/8365 [KT133/KM133 AGP] @@ -8064,6 +8208,8 @@ 8391 VT8371 [KX133 AGP] 8400 MVP4 8409 VX855/VX875 Bus Control and Power Management + 8410 VX900 Bus Control and Power Management + 19da a179 ZBOX VD01 8500 KLE133/PLE133/PLE133T 8501 VT8501 [Apollo MVP4 AGP] 8596 VT82C596 [Apollo PRO AGP] @@ -8078,6 +8224,7 @@ 8a26 KL133/KL133A/KM133/KM133A [S3 ProSavage] 8d01 PN133/PN133T [S3 Twister] 8d04 KM266/P4M266/P4M266A/P4N266 [S3 ProSavageDDR] + 9001 VX900 Serial ATA Controller 9530 Secure Digital Memory Card Controller 95d0 SDIO Host Controller a208 PT890 PCI to PCI Bridge Controller @@ -8099,7 +8246,7 @@ 147b 1407 KV8-MAX3 motherboard b198 VT8237/VX700 PCI Bridge b213 VPX/VPX2 I/O APIC Interrupt Controller - b353 VX855/VX875 PCI to PCI Bridge + b353 VX855/VX875/VX900 PCI to PCI Bridge b999 [K8T890 North / VT8237 South] PCI Bridge c208 PT890 PCI to PCI Bridge Controller c238 K8T890 PCI to PCI Bridge Controller @@ -8428,7 +8575,6 @@ 0000 5071 Behold TV 507 RDS 0000 507b Behold TV 507 RDS 0000 5201 Behold TV Columbus -# Deleting vendor name after rereading submit instructions 0070 6701 WinTV HVR-1110 1019 4cb5 Elitegroup ECS TVP3XP FM1236 Tuner Card (NTSC,FM) 1043 0210 FlyTV mini Asus Digimatrix @@ -8440,6 +8586,7 @@ 1131 2001 Proteus Pro [philips reference design] 1131 2018 Tiger reference design 1131 4ee9 MonsterTV Mobile + 1131 7133 Pinnacle PCTV 301i 11bd 002b PCTV Stereo 11bd 002e PCTV 110i (saa7133) 12ab 0800 PURPLE TV @@ -8691,6 +8838,8 @@ 1134 Mercury Computer Systems 0001 Raceway Bridge 0002 Dual PCI to RapidIO Bridge + 000b POET Serial RapidIO Bridge + 000d POET PSDMS Device 1135 Fuji Xerox Co Ltd 0001 Printer controller 1136 Momentum Data Systems @@ -8705,10 +8854,14 @@ 1137 0047 VIC P81E PCIe Ethernet NIC 1137 0048 VIC M81KR Mezzanine Ethernet NIC 1137 004f VIC 1280 Mezzanine Ethernet NIC + 1137 0084 VIC 1240 MLOM Ethernet NIC + 1137 0085 VIC 1225 PCIe Ethernet NIC 0044 VIC Ethernet NIC Dynamic 1137 0047 VIC P81E PCIe Ethernet NIC Dynamic 1137 0048 VIC M81KR Mezzanine Ethernet NIC Dynamic 1137 004f VIC 1280 Mezzanine Ethernet NIC Dynamic + 1137 0084 VIC 1240 MLOM Ethernet NIC Dynamic + 1137 0085 VIC 1225 PCIe Ethernet NIC Dynamic 0045 VIC FCoE HBA 1137 0047 VIC P81E PCIe FCoE HBA 1137 0048 VIC M81KR Mezzanine FCoE HBA @@ -9107,7 +9260,7 @@ 1179 0001 FIR Port Type-DO 117a A-Trend Technology 117b L G Electronics, Inc. -117c Atto Technology +117c ATTO Technology, Inc. 002c SAS RAID Adapter 0030 Ultra320 SCSI Host Adapter 117c 8013 ExpressPCI UL4D @@ -9206,6 +9359,7 @@ 1028 01d7 XPS M1210 1028 01f3 Inspiron 1420 1028 01f5 Dell Inspiron 1501 + 1028 024f Dell Latitude e6500 103c 03b5 Presario V3242AU 103c 30b7 Presario V6133CL 1183 0843 Alienware Aurora m9700 @@ -9218,10 +9372,16 @@ 1043 1967 V6800V 1180 0852 Pavilion 2410us 1324 10cf P7120 - e230 Memory Stick Host Controller + e230 R5U2xx (R5U230 / R5U231 / R5U241) [Memory Stick Host Controller] + e476 CardBus bridge + 1028 040a Latitude E6410 + 1028 040b Latitude E6510 e822 MMC/SD Host Controller + 1028 040a Latitude E6410 1028 040b Latitude E6510 + e823 PCIe SDXC/MMC Host Controller e832 R5C832 PCIe IEEE 1394 Controller + 1028 040a Latitude E6410 1028 040b Latitude E6510 e852 PCIe xD-Picture Card Controller 1181 Telmatics International @@ -9263,6 +9423,8 @@ 4000 DL2000-based Gigabit Ethernet 4001 DGE-550SX PCI-X Gigabit Ethernet Adapter 4300 DGE-528T Gigabit Ethernet Adapter +# rev. B1; RealTek RTL8168E. + 1186 4b10 DGE-560T PCI Express (x1) Gigabit Ethernet Adapter 4302 DGE-530T Gigabit Ethernet Adapter (rev.C1) [Realtek RTL8169] # There are at least 3 revisions of this adapter; 4800 is board revision A1 as far as I can tell, revision B1 is 4c00. 4800 DGE-530T Gigabit Ethernet Adapter (rev 11) @@ -9376,6 +9538,7 @@ 2a01 88W8335 [Libertas] 802.11b/g Wireless 2a02 88W8361 [TopDog] 802.11n Wireless 07d1 3b02 DIR-615 rev. A1 Mini PCI Wireless Module + 1385 7c01 WN511T RangeMax Next 300 Mbps Wireless Notebook Adapter 1385 7e00 WN311T RangeMax Next 300 Mbps Wireless PCI Adapter 1799 801b F5D8011 v2 802.11n N1 Wireless Notebook Card 2a08 88W8362e [TopDog] 802.11a/b/g/n Wireless @@ -9547,7 +9710,7 @@ 6081 MV88SX6081 8-port SATA II PCI-X Controller 6101 88SE6101/6102 single-port PATA133 interface 6111 88SE6111 1-port PATA133(IDE) and 1-port SATA II Controllers - 6121 88SE6121 SATA II Controller + 6121 88SE6121 SATA II / PATA Controller 6141 88SE614x SATA II PCI-E controller 6145 88SE6145 SATA II PCI-E controller 6180 88F6180 [Kirkwood] ARM SoC @@ -9735,14 +9898,17 @@ 5801 USB 5802 USS-312 USB Controller 5803 USS-344S USB Controller - 5811 FW322/323 + 5811 FW322/323 [TrueFire] 1394a Controller + 103c 2a34 Pavilion a1677c + 103c 2a9e Pavilion p6310f 1043 8294 IEEE 1394a Firewire Controller 8086 524c D865PERL mainboard dead 0800 FireWire Host Bus Adapter - 5901 FW643 PCI Express 1394b Controller (PHY/Link) + 5901 FW643 [TrueFire] PCIe 1394b Controller + 11c1 5900 FW643 [TrueFire] PCIe 1394b Controller 1443 0643 FireBoard800-e V.2 - 1546 0643 FWB-PCIE1X20 - 5903 FW533 PCI Express 1394a Controller (PHY/Link) + 1546 0643 FWB-PCIE1X2x + 5903 FW533 [TrueFire] PCIe 1394a Controller 8110 T8110 H.100/H.110 TDM switch 12d9 000c E1/T1 PMXc cPCI carrier card ab10 WL60010 Wireless LAN MAC @@ -10559,6 +10725,7 @@ 8212 IT8212 Dual channel ATA RAID controller 1283 0001 IT/ITE8212 Dual channel ATA RAID controller 8213 IT8213 IDE Controller + 1458 b000 GA-EG45M-DS2H Mainboard 8330 IT8330G 8872 IT8874F PCI Dual Serial Port Controller 8888 IT8888F/G PCI to ISA Bridge with SMB [Golden Gate] @@ -10952,8 +11119,10 @@ 0067 PCI-DAS6070 0068 PCI-DAS6071 006f PCI-DAS6036 + 0070 PCI-DAC6702 0078 PCI-DAS6013 0079 PCI-DAS6014 + 0115 PCIe-DAS1602/16 1308 Jato Technologies Inc. 0001 NetCelerator Adapter 1308 0001 NetCelerator Adapter @@ -11078,6 +11247,13 @@ 1343 Phylon Communications Inc # nee Crucial Technology 1344 Micron Technology Inc + 5150 RealSSD P320h + 5151 RealSSD P320m + 5152 RealSSD P320s + 5153 RealSSD P325m + 5160 RealSSD P420h + 5161 RealSSD P420m + 5163 RealSSD P425m 1345 Arescom Inc 1347 Odetics 1349 Sumitomo Electric Industries, Ltd. @@ -11281,6 +11457,7 @@ 1389 Applicom International 0001 PCI1500PFB [Intelligent fieldbus adaptor] 138a Fusion Micromedia Corp + 003d VFS491 Validity Sensor 138b Tokimec Inc 138c Silicon Reality 138d Future Techno Designs pte Ltd @@ -11538,6 +11715,9 @@ 153b 1144 Aureon 5.1 153b 1170 Aureon 7.1 1681 a000 Gamesurround MUSE XL + 17ab 0604 PSC604 Dynamic Edge + 17ab 0605 PSC605 Sonic Edge + 17ab 7777 PSC605 Sonic Edge 270f 1103 CT-7NJS Ultra motherboard 270f f462 7NJL1 motherboard 584d 3731 Digital X-Mystique @@ -11571,6 +11751,9 @@ 7284 9761 CLARO 7284 9781 CLARO halo 7284 9783 eCLARO + 8828 CM8828 [Oxygen Express] + 8888 CM8888 [Oxygen Express] + 1043 84d5 ROG Xonar Phoebus 9880 CM9880 13f7 Wildfire Communications 13f8 Ad Lib Multimedia Inc @@ -11812,6 +11995,7 @@ 9513 OX16PCI954 (Quad 16950 UART) function 1 (parallel port) 9521 OX16PCI952 (Dual 16950 UART) 9523 OX16PCI952 Integrated Parallel Port + c158 OXPCIe952 Dual 16C950 UART c308 EX-44016 16-port serial 1416 Multiwave Innovation pte Ltd 1417 Convergenet Technologies Inc @@ -12192,7 +12376,7 @@ 8002 VScom 020L 2 port parallel adaptor 8010 VScom 100L 1 port serial adaptor 8011 VScom 110L 1 port serial and 1 port parallel adaptor - 8020 VScom 200L 1 port serial adaptor + 8020 VScom 200L 1 or 2 port serial adaptor 8021 VScom 210L 2 port serial and 1 port parallel adaptor 8028 VScom 200I/200I-SI 2-port serial adapter 8040 VScom 400L 4 port serial adaptor @@ -12281,6 +12465,9 @@ 1028 028d PowerEdge T410 BCM5716 Gigabit Ethernet 1028 02f1 PowerEdge R510 BCM5716 Gigabit Ethernet 163c NetXtreme II BCM5716S Gigabit Ethernet + 163d NetXtreme II BCM57811 10-Gigabit Ethernet + 163e NetXtreme II BCM57811 10 Gigabit Ethernet Multi Function + 163f NetXtreme II BCM57811 10-Gigabit Ethernet Virtual Function 1644 NetXtreme BCM5700 Gigabit Ethernet 1014 0277 Broadcom Vigil B5700 1000Base-T 1028 00d1 Broadcom BCM5700 @@ -12497,6 +12684,9 @@ 1462 590c KT6 Delta-FIS2R (MS-6590) 169d NetLink BCM5789 Gigabit Ethernet PCI Express 16a0 NetLink BCM5785 Fast Ethernet + 16a1 BCM57840 NetXtreme II 10 Gigabit Ethernet + 16a2 BCM57840 NetXtreme II 10/20-Gigabit Ethernet + 16a4 BCM57840 NetXtreme II Ethernet Multi Function # The Broadcom 57800 device has two 1Gig ports and two 10Gig ports. The subsystem information can be used to differentiate. 16a5 NetXtreme II BCM57800 1/10 Gigabit Ethernet Multi Function 1028 1f5c NetXtreme II BCM57800 10-Gigabit Ethernet Multi Function @@ -12715,11 +12905,13 @@ 1737 0066 WPC600N v1 802.11a/b/g/n Wireless-N CardBus Adapter 1737 0068 WEC600N v1 802.11a/b/g/n Wireless-N ExpressCard 4329 BCM4321 802.11b/g/n + 1385 7b00 WN511B RangeMax NEXT Wireless Notebook Adapter 1385 7d00 WN311B RangeMax Next 270 Mbps Wireless PCI Adapter 1737 0058 WPC300N v1 Wireless-N Notebook Adapter 432a BCM4321 802.11an Wireless Network Controller 432b BCM4322 802.11a/b/g/n Wireless LAN Controller 1028 000d Wireless 1510 Wireless-N WLAN Mini-Card + 106b 008e AirPort Extreme 432c BCM4322 802.11b/g/n 1799 d311 Dynex DX-NNBX 802.11n WLAN Cardbus Card 432d BCM4322 802.11an Wireless Network Controller @@ -12734,6 +12926,9 @@ 4358 BCM43227 802.11b/g/n 4359 BCM43228 802.11a/b/g/n 1028 0011 Wireless 1530 Half-size Mini PCIe Card + 103c 182c BCM943228HM4L 802.11a/b/g/n 2x2 Wi-Fi Adapter + 4365 BCM43142 802.11b/g/n + 1028 0016 Wireless 1704 802.11n + BT 4.0 4401 BCM4401 100Base-T 1025 0035 TravelMate 660 103c 08b0 tc1100 tablet @@ -13399,6 +13594,7 @@ 07c0 PVSCSI SCSI Controller 0801 Virtual Machine Interface 15ad 0800 Hypervisor ROM Interface + 1977 HD Audio Controller 15ae Amersham Pharmacia Biotech 15b0 Zoltrix International Ltd 15b1 Source Technology Inc @@ -13627,7 +13823,7 @@ 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 1860 16Gbps FC HBA and/or 10Gbps CNA + 0022 1867/1860: 16Gbps/10Gbps Fabric Adapter 1657 0022 10Gbps CNA - FCOE 1657 0023 10Gbps CNA - LL 1657 0024 16Gbps FC HBA @@ -13828,11 +14024,13 @@ 0777 4005 SR71-15 802.11an Mini PCI Adapter 1186 3a7a DWA-552 802.11n Xtreme N Desktop Adapter (rev A2) 002a AR928X Wireless Network Adapter (PCI-Express) + 0777 4f05 SR71-X 802.11abgn Wireless ExpressCard Adapter [AR9280] 103c 3041 AR5BHB92-H 802.11abgn Wireless Half-size Mini PCIe Card [AR9280] 105b e006 T77H053.00 802.11bgn Wireless Mini PCIe Card [AR9281] 105b e01f T77H047.31 802.11bgn Wireless Half-size Mini PCIe Card [AR9283] 11ad 6600 WN6600A 802.11bgn Wireless Mini PCIe Card [AR9281] 144f 7141 WLL6080 802.11bgn Wireless Mini PCIe Card [AR9281] + 168c 0203 DW1525 802.11abgn WLAN PCIe Card [AR9280] 1a32 0303 EM303 802.11bgn Wireless Mini PCIe Card [AR9281] 1a32 0306 EM306 802.11bgn Wireless Half-size Mini PCIe Card [AR9283] 1a3b 1067 AW-NE771 802.11bgn Wireless Mini PCIe Card [AR9281] @@ -13854,10 +14052,11 @@ 002d AR9227 Wireless Network Adapter 002e AR9287 Wireless Network Adapter (PCI-Express) 0030 AR9300 Wireless LAN adaptor - 103c 1627 HB112AGN 802.11abgn 3x3 Wi-Fi Adapter + 103c 1627 AR9380/HB112 802.11abgn 3×3 Wi-Fi Adapter 1a56 2000 Killer Wireless-N 1102 Half-size Mini PCIe Card [AR9382] 1a56 2001 Killer Wireless-N 1103 Half-size Mini PCIe Card [AR9380] 0032 AR9485 Wireless Network Adapter + 103c 1838 AR9485/HB125 802.11bgn 1×1 Wi-Fi Adapter 0033 AR9580 Wireless Network Adapter 0034 AR9462 Wireless Network Adapter 0207 AR5210 Wireless Network Adapter [AR5000 802.11a] @@ -13894,7 +14093,19 @@ 16c9 EONIC B.V. The Netherlands 16ca CENATEK Inc 0001 Rocket Drive DL -16cd Densitron Technologies +# nee Innocore Gaming Ltd., nee Densitron Gaming Ltd., a division of Densitron Technologies +16cd Advantech Co. Ltd + 0101 DirectPCI SRAM for DPX-11x series + 0102 DirectPCI SRAM for DPX-S/C/E-series + 0103 DirectPCI ROM for DPX-11x series + 0104 DirectPCI ROM for DPX-S/C/E-series + 0105 DirectPCI I/O for DPX-114/DPX-115 + 0106 DirectPCI I/O for DPX-116 + 0107 DirectPCI I/O for DPX-116U + 0108 DirectPCI I/O for DPX-117 + 0109 DirectPCI I/O for DPX-112 + 010a DirectPCI I/O for DPX-C/E-series + 010b DirectPCI I/O for DPX-S series 16ce Roland Corp. 16d5 Acromag, Inc. 0504 PMC-DX504 Reconfigurable FPGA with LVDS I/O @@ -14077,7 +14288,6 @@ 8083 GL880 USB 1.1 UHCI controller 8084 GL880 USB 2.0 EHCI controller 17aa Lenovo - 20b1 ThinkPad T61p 17ab Phillips Components 17af Hightech Information System Ltd. 17b3 Hawking Technologies @@ -14116,6 +14326,7 @@ 17d3 1221 ARC-1221 8-Port PCI-Express to SATA RAID Controller 1300 ARC-1300ix-16 16-Port PCI-Express to SAS Non-RAID Host Adapter 1680 ARC-1680 8 port PCIe/PCI-X to SAS/SATA II RAID Controller + 17d3 1212 ARC-1212 4-Port PCIe to SAS/SATA II RAID Controller 1880 ARC-1880 8/12 port PCIe/PCI-X to SAS/SATA II RAID Controller # nee Neterion Inc., previously S2io Inc. 17d5 Exar Corp. @@ -14159,6 +14370,7 @@ 0011 EN2010 [c.Link] MoCA Network Controller (Coax, MPEG interface) 0021 EN2210 [c.Link] MoCA Network Controller (Coax) 0025 EN2510 [c.Link] MoCA Network Controller (Coax, PCIe interface) + 0027 EN2710 [c.Link] MoCA 2.0 Network Controller (Coax, PCIe interface) 17ee Connect Components Ltd 17f2 Albatron Corp. 17f3 RDC Semiconductor, Inc. @@ -14210,7 +14422,7 @@ 1814 2560 RT2500 Wireless 802.11bg 182d 9073 WL-115 Wireless Network PCI Adapter 185f 22a0 CN-WF513 Wireless Cardbus Adapter - 18eb 5312 Tornado 122 IEEE 802.11g PCI Card-EU + 18eb 5312 WL531P IEEE 802.11g PCI Card-EU 1948 3c00 C54RC v1 Wireless 11g CardBus Adapter 1948 3c01 C54Ri v1 Wireless 11g PCI Adapter 0300 Wireless Adapter Canyon CN-WF511 @@ -14224,7 +14436,7 @@ 1799 700e F5D7000 v6000 Wireless G Desktop Card 1799 701e F5D7010 v6000 Wireless G Notebook Card 17f9 0012 AWLC3026T 802.11g Wireless CardBus Adapter - 1814 2561 EW-7108PCg + 1814 2561 EW-7108PCg/EW-7128g 0302 RT2561/RT61 rev B 802.11g 1186 3a71 DWA-510 Wireless G Desktop Adapter 1186 3c08 AirPlus G DWL-G630 Wireless Cardbus Adapter (rev.E2) @@ -14251,7 +14463,10 @@ 13bd 1057 GN-WS32L-RH Half-size Mini PCIe Card 3091 RT3091 Wireless 802.11n 1T/2R PCIe 3092 RT3092 Wireless 802.11n 2T/2R PCIe - 5360 RT5360 + 3592 RT3592 Wireless 802.11an 2T/2R PCIe + 5360 RT5360 Wireless 802.11n 1T/1R + 1186 3c05 DWA-525 Wireless N 150 Desktop Adapter (rev.A2) + 20f4 703a TEW-703PI N150 Wireless PCI Adapter 5390 RT5390 Wireless 802.11n 1T/1R PCIe 103c 1636 U98Z077.00 Half-size Mini PCIe Card 539f RT5390 [802.11 b/g/n 1T1R G-band PCI Express Single Chip] @@ -14277,6 +14492,7 @@ 08a8 MVC101 SDI 08a9 MVC102 DVI+Audio 08b0 MVC200-DC +1846 Alcatel-Lucent 1849 ASRock Incorporation 184a Thales Computers 1100 MAX II cPLD @@ -14352,7 +14568,6 @@ 18ca XGI Technology Inc. (eXtreme Graphics Innovation) 0020 Z7/Z9 (XG20 core) 0021 Z9s/Z9m (XG21 core) -# duh! Device name, not my name :) 0027 Z11/Z11M 0040 Volari V3XT/V5/V8 0047 Volari 8300 (chip: XP10, codename: XG47) @@ -14419,7 +14634,7 @@ 18f1 Spectrum GmbH 18f4 Napatech A/S 0031 NT20X Network Adapter - 0051 NT20-X Capture Card + 0051 NT20X Capture Card 0061 NT20E Capture Card 0064 NT20E Inline Card 0071 NT4E Capture Card @@ -14428,7 +14643,9 @@ 0091 NT20X Capture Card [New Rev] 00a1 NT4E-STD Capture Card 00a4 NT4E-STD Inline Card - 00c5 NT20E2 Network Adapter + 00c5 NT20E2 Network Adapter 2x10Gb + 00d5 NT40E2-4 Network Adapter 4x10Gb + 00e5 NT40E2-1 Network Adapter 1x40Gb 18f6 NextIO 1000 [Nexsis] Switch Virtual P2P PCIe Bridge 1050 [Nexsis] Switch Virtual P2P PCI Bridge @@ -14443,7 +14660,6 @@ 000b Fastcom 232/8-PCI-335 Async 8-Port RS-232 Serial PCI Adapter 000f Fastcom FSCC 0010 Fastcom GSCC -# Dual Serocco 0011 Fastcom QSSB 0014 SuperFSCC 0015 SuperFSCC-104 @@ -14547,6 +14763,7 @@ 1924 0304 SFE4003-A4 1924 0500 SFE4005-A0 c101 EF1-21022T [EtherFabric] +192a BiTMICRO Networks Inc. 192e TransDimension 1931 Option N.V. 000c Qualcomm MSM6275 UMTS chip @@ -14558,6 +14775,7 @@ 0363 AHA363-PCIe 0364 AHA364-PCIe 0367 AHA367-PCIe + 0370 AHA370-PCIe 1942 ClearSpeed Technology plc e511 Advance X620 accelerator card e521 Advance e620 accelerator card @@ -14629,6 +14847,7 @@ 010b P1012 0110 P1022E 0111 P1022 + 1c7f 5200 EB5200 0118 P1013E 0119 P1013 0128 P1010 @@ -14735,6 +14954,7 @@ 890a Virtual HBA Device 199f Auvitek 8501 AU85X1 PCI REV1.1 + 8521 AU8521 TV card # nee ServerEngines Corp. 19a2 Emulex Corporation 0200 BladeEngine 10Gb PCI-E iSCSI adapter @@ -14840,7 +15060,8 @@ 1a78 0037 FlashMAX PCIe SSD [rev 3D] 1a78 0038 FlashMAX PCIe SSD [rev 4] 1a78 0039 FlashMAX PCIe SSD [rev 4D] - 1a78 0040 FlashMAX PCIe SSD [LP Z1] + 0040 Virident FlashMAX Drive V2 + 1a78 0040 PCIe SSD [LP Z1] 1a84 Commex Technologies 0001 Vulcan SP HT6210 10-Gigabit Ethernet (rev 02) 1a88 MEN Mikro Elektronik @@ -14855,6 +15076,11 @@ 1aae Global Velocity, Inc. 1ab6 CalDigit, Inc. 6201 RAID Card +# Parallels VM virtual devices +1ab8 Parallels, Inc. + 4000 Virtual Machine Communication Interface + 4005 Accelerated Virtual Video Adapter + 4006 Memory Ballooning Controller 1ab9 Espia Srl 1acc Point of View B.V 1ad7 Spectracom Corporation @@ -14863,6 +15089,8 @@ 1ade Spin Master Ltd. 1501 Swipetech barcode scanner 1ae0 Google, Inc. +1ae7 First Wise Media GmbH + 0520 HFC-S PCI A [X-TENSIONS XC-520] 1ae8 Silicon Software GmbH 0a40 microEnable IV-BASE x1 0a41 microEnable IV-FULL x1 @@ -14894,6 +15122,7 @@ 1afa J & W Electronics Co., Ltd. 1b03 Magnum Semiconductor, Inc, 6100 DXT/DXTPro Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder +1b08 MSC Vertriebs GmbH 1b13 Jaton Corp 1b1a K&F Computing Research Co. 0e70 GRAPE @@ -14917,6 +15146,7 @@ 0601 NumaChip N601 0602 NumaChip N602 1b4b Marvell Technology Group Ltd. + 0640 88SE9128 SATA III 6Gb/s RAID Controller 9120 88SE9120 SATA 6Gb/s Controller 9123 88SE9123 PCIe SATA 6.0 Gb/s controller 9125 88SE9125 PCIe SATA 6.0 Gb/s controller @@ -14924,16 +15154,29 @@ 9130 88SE9128 PCIe SATA 6 Gb/s RAID controller with HyperDuo 1043 8438 P8P67 Deluxe Motherboard 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 - 91a4 88SE91A4 SATA 6Gb/s Controller + 91a4 88SE9128 IDE Controller 9480 88SE9480 SAS/SATA 6Gb/s RAID controller 1b55 NetUP Inc. 2a2c Dual DVB-S2-CI card e2e4 Dual DVB-T/C-CI RF card +# 2xHDMI and 2xHD-SDI inputs + e5f4 MPEG2 and H264 Encoder-Transcoder + f1c4 Dual ASI-RX/TX-CI card 1b6f Etron Technology, Inc. 7023 EJ168 USB 3.0 Host Controller 1b73 Fresco Logic 1000 FL1000G USB 3.0 Host Controller + 1d5c 1000 Anker USB 3.0 Express Card +1b74 OpenVox Communication Co. Ltd. + 0115 D115P/D115E Single-port E1/T1 card + d130 D130P/D130E Single-port E1/T1 card (3rd GEN) + d210 D210P/D210E Dual-port E1/T1 card(2nd generation) + d230 D230 Dual-port E1/T1 card (2nd generation) + d410 D410/430 Quad-port E1/T1 card + d430 D410/430 Quad-port E1/T1 card 1b85 OCZ Technology Group, Inc. 1041 RevoDrive 3 X2 PCI-Express SSD 240 GB (Marvell Controller) 1b96 Western Digital @@ -14958,10 +15201,16 @@ 1c2c Fiberblaze # Used on V120 VME Crate Controller 1c32 Highland Technology, Inc. +1c3b Accensus, LLC + 0200 Telas2 1c44 Enmotus Inc 8000 8000 Storage IO Controller +1c7f Elektrobit Austria GmbH + 5100 EB5100 +1c8a TSF5 Corporation 1d44 DPT a400 PM2x24/PM3224 +1d5c Fantasia Trading LLC 1de1 Tekram Technology Co.,Ltd. 0391 TRM-S1040 2020 DC-390 @@ -15010,6 +15259,7 @@ 2003 Smart Link Ltd. 8800 LM-I56N 2004 Smart Link Ltd. +20f4 TRENDnet 2116 ZyDAS Technology Corp. 21c3 21st Century Computer Corp. # (Probably only the Mobile Phone Division) @@ -15489,8 +15739,6 @@ 1092 5a55 Viper II Z200 1092 5a57 Viper II Z200 ca00 SonicVibes -53c1 SC1-ALLEGRO - 0cd1 CD1-OPERA 5431 AuzenTech, Inc. 544c Teralogic Inc 0350 TL880-based HDTV/ATSC tuner @@ -15631,10 +15879,14 @@ 1043 844d P8P67 Deluxe Motherboard 0101 Xeon E3-1200/2nd Generation Core Processor Family PCI Express Root Port 1028 04b2 Vostro 3350 + 106b 00dc MacBookPro8,2 [Core i7, 15", 2011] 0102 2nd Generation Core Processor Family Integrated Graphics Controller 0104 2nd Generation Core Processor Family DRAM Controller 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 + 106b 00dc MacBookPro8,2 [Core i7, 15", 2011] 0105 Xeon E3-1200/2nd Generation Core Processor Family PCI Express Root Port + 106b 00dc MacBookPro8,2 [Core i7, 15", 2011] 0106 2nd Generation Core Processor Family Integrated Graphics Controller 0108 Xeon E3-1200 Processor Family DRAM Controller 0109 Xeon E3-1200/2nd Generation Core Processor Family PCI Express Root Port @@ -15645,26 +15897,27 @@ 010e Xeon E3-1200/2nd Generation Core Processor Family Integrated Graphics Controller 0112 2nd Generation Core Processor Family Integrated Graphics Controller 0116 2nd Generation Core Processor Family Integrated Graphics Controller + 1028 04da Vostro 3750 0122 2nd Generation Core Processor Family Integrated Graphics Controller 0126 2nd Generation Core Processor Family Integrated Graphics Controller 1028 04cc Vostro 3350 - 0150 Ivy Bridge DRAM Controller - 0151 Ivy Bridge PCI Express Root Port - 0152 Ivy Bridge Graphics Controller - 0154 Ivy Bridge DRAM Controller - 0155 Ivy Bridge PCI Express Root Port - 0156 Ivy Bridge Graphics Controller - 0158 Ivy Bridge DRAM Controller - 0159 Ivy Bridge PCI Express Root Port - 015a Ivy Bridge Graphics Controller - 015c Ivy Bridge DRAM Controller - 015d Ivy Bridge PCI Express Root Port - 015e Ivy Bridge Graphics Controller - 0162 Ivy Bridge Graphics Controller - 0166 Ivy Bridge Graphics Controller - 016a Ivy Bridge Graphics Controller - 0172 Ivy Bridge Graphics Controller - 0176 Ivy Bridge Graphics Controller + 0150 Xeon E3-1200 v2/3rd Gen Core processor DRAM Controller + 0151 Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port + 0152 Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller + 0154 3rd Gen Core processor DRAM Controller + 0155 Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port + 0156 3rd Gen Core processor Graphics Controller + 0158 Xeon E3-1200 v2/Ivy Bridge DRAM Controller + 0159 Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port + 015a Xeon E3-1200 v2/Ivy Bridge Graphics Controller + 015c Xeon E3-1200 v2/3rd Gen Core processor DRAM Controller + 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 + 0166 3rd Gen Core processor Graphics Controller + 016a Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller + 0172 Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller + 0176 3rd Gen Core processor Graphics Controller 0309 80303 I/O Processor PCI-to-PCI Bridge 030d 80312 I/O Companion Chip PCI-to-PCI Bridge 0326 6700/6702PXH I/OxAPIC Interrupt Controller A @@ -15688,12 +15941,12 @@ 0372 80333 Segment-B PCI Express-to-PCI Express Bridge 0373 80333 B-Bus IOAPIC 0374 80333 Address Translation Unit - 0402 Haswell Integrated Graphics Controller - 0406 Haswell Integrated Graphics Controller - 040a Haswell Integrated Graphics Controller - 0412 Haswell Integrated Graphics Controller - 0416 Haswell Integrated Graphics Controller - 041a Haswell Integrated Graphics Controller + 0402 Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller + 0406 4th Gen Core Processor Integrated Graphics Controller + 040a Xeon E3-1200 v3 Processor Integrated Graphics Controller + 0412 Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller + 0416 4th Gen Core Processor Integrated Graphics Controller + 041a Xeon E3-1200 v3 Processor Integrated Graphics Controller 0436 DH89xxCC Gigabit SGMII Connection 0438 DH8900CC Series Gigabit Network Connection 043a DH8900CC Series Gigabit Fiber Network Connection @@ -15817,6 +16070,12 @@ 0960 80960RP (i960RP) Microprocessor/Bridge 0962 80960RM (i960RM) Bridge 0964 80960RP (i960RP) Microprocessor/Bridge + 0a04 Haswell-ULT DRAM Controller + 0a06 Haswell-ULT Integrated Graphics Controller + 0a16 Haswell-ULT Integrated Graphics Controller + 0a22 Haswell-ULT Integrated Graphics Controller + 0a26 Haswell-ULT Integrated Graphics Controller + 0a2a Haswell-ULT Integrated Graphics Controller 0be0 Atom Processor D2xxx/N2xxx Integrated Graphics Controller 0be1 Atom Processor D2xxx/N2xxx Integrated Graphics Controller 0be2 Atom Processor D2xxx/N2xxx Integrated Graphics Controller @@ -15841,13 +16100,13 @@ 0bf5 Atom Processor D2xxx/N2xxx DRAM Controller 0bf6 Atom Processor D2xxx/N2xxx DRAM Controller 0bf7 Atom Processor D2xxx/N2xxx DRAM Controller - 0c00 Haswell DRAM Controller - 0c01 Haswell PCI Express x16 Controller - 0c04 Haswell DRAM Controller - 0c05 Haswell PCI Express x8 Controller - 0c08 Haswell DRAM Controller - 0c09 Haswell PCI Express x4 Controller - 0c0c Haswell HD Audio Controller + 0c00 4th Gen Core Processor DRAM Controller + 0c01 Xeon E3-1200 v3/4th Gen Core Processor PCI Express x16 Controller + 0c04 Xeon E3-1200 v3/4th Gen Core Processor DRAM Controller + 0c05 Xeon E3-1200 v3/4th Gen Core Processor PCI Express x8 Controller + 0c08 Xeon E3-1200 v3 Processor DRAM Controller + 0c09 Xeon E3-1200 v3/4th Gen Core Processor PCI Express x4 Controller + 0c0c Xeon E3-1200 v3/4th Gen Core Processor HD Audio Controller 0c46 Centerton PCI Express Root Port 1 0c47 Centerton PCI Express Root Port 2 0c48 Centerton PCI Express Root Port 3 @@ -15874,6 +16133,197 @@ 0c7d Centerton Internal Fabric 0c7e Centerton Internal Fabric 0c7f Centerton Internal Fabric + 0e00 Ivytown DMI2 + 0e01 Ivytown PCI Express Root Port in DMI2 Mode + 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 + 0eb7 Ivytown Integrated Memory Controller 1 Channel 0-3 ERROR Registers 2 + 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 2 + 0ef4 Ivytown Integrated Memory Controller 0 Channel 0-3 Thermal Control 2 + 0ef5 Ivytown Integrated Memory Controller 0 Channel 0-3 Thermal Control 3 + 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 + 0f00 ValleyView SSA-CUnit + 0f01 ValleyView SSA-CUnit + 0f02 ValleyView SSA-CUnit + 0f03 ValleyView SSA-CUnit + 0f04 ValleyView High Definition Audio Controller + 0f05 ValleyView High Definition Audio Controller + 0f06 ValleyView LPIO1 DMA Controller + 0f07 ValleyView LPIO1 DMA Controller + 0f08 ValleyView LPIO1 PWM Controller + 0f09 ValleyView LPIO1 PWM Controller + 0f0a ValleyView LPIO1 HSUART Controller #1 + 0f0b ValleyView LPIO1 HSUART Controller #1 + 0f0c ValleyView LPIO1 HSUART Controller #2 + 0f0d ValleyView LPIO1 HSUART Controller #2 + 0f0e ValleyView LPIO1 SPI Controller + 0f0f ValleyView LPIO1 SPI Controller + 0f10 ValleyView LPIO1 Controller + 0f11 ValleyView LPIO1 Controller + 0f12 ValleyView SMBus Controller + 0f13 ValleyView SMBus Controller + 0f14 ValleyView SDIO Controller + 0f15 ValleyView SDIO Controller + 0f16 ValleyView SDIO Controller + 0f17 ValleyView SDIO Controller + 0f18 ValleyView SEC + 0f19 ValleyView SEC + 0f1a ValleyView SEC + 0f1b ValleyView SEC + 0f1c ValleyView Power Control Unit + 0f1d ValleyView Power Control Unit + 0f1e ValleyView Power Control Unit + 0f1f ValleyView Power Control Unit + 0f20 ValleyView 4-Port SATA Storage Controller + 0f21 ValleyView 4-Port SATA Storage Controller + 0f22 ValleyView 6-Port SATA AHCI Controller + 0f23 ValleyView 6-Port SATA AHCI Controller + 0f24 ValleyView SATA RAID Storage Controller + 0f25 ValleyView SATA RAID Storage Controller + 0f26 ValleyView 2-Port SATA Storage Controller + 0f27 ValleyView 2-Port SATA Storage Controller + 0f28 ValleyView LPE Audio Controller + 0f29 ValleyView LPE Audio Controller + 0f2a ValleyView LPE Audio Controller + 0f2b ValleyView LPE Audio Controller + 0f2e ValleyView SATA RAID Storage Controller + 0f2f ValleyView SATA RAID Storage Controller + 0f30 ValleyView Gen7 + 0f31 ValleyView Gen7 + 0f32 ValleyView Gen7 + 0f33 ValleyView Gen7 + 0f34 ValleyView USB Enhanced Host Controller + 0f35 ValleyView USB xHCI Host Controller + 0f36 ValleyView USB xHCI Host Controller + 0f37 ValleyView OTG + 0f38 ValleyView ISP + 0f39 ValleyView ISP + 0f3a ValleyView ISP + 0f3b ValleyView ISP + 0f3c ValleyView ISP + 0f3d ValleyView ISP + 0f3e ValleyView ISP + 0f3f ValleyView ISP + 0f40 ValleyView LPIO2 DMA Controller + 0f41 ValleyView LPIO2 I2C Controller #1 + 0f42 ValleyView LPIO2 I2C Controller #2 + 0f43 ValleyView LPIO2 I2C Controller #3 + 0f44 ValleyView LPIO2 I2C Controller #4 + 0f45 ValleyView LPIO2 I2C Controller #5 + 0f46 ValleyView LPIO2 I2C Controller #6 + 0f47 ValleyView LPIO2 I2C Controller #7 + 0f48 ValleyView PCI Express Root Port + 0f49 ValleyView PCI Express Root Port + 0f4a ValleyView PCI Express Root Port + 0f4b ValleyView PCI Express Root Port + 0f4c ValleyView PCI Express Root Port + 0f4d ValleyView PCI Express Root Port + 0f4e ValleyView PCI Express Root Port + 0f4f ValleyView PCI Express Root Port + 0f50 ValleyView MIPI-HSI Controller 1000 82542 Gigabit Ethernet Controller (Fiber) 0e11 b0df NC6132 Gigabit Ethernet Adapter (1000-SX) 0e11 b0e0 NC6133 Gigabit Ethernet Adapter (1000-LX) @@ -16244,6 +16694,7 @@ 103c 323f NC362i Integrated Dual port Gigabit Server Adapter 10a9 8028 UV-BaseIO dual-port GbE 13a3 0037 DS4100 Secure Multi-Gigabit Server Adapter with Compression + 15d9 a811 H8DGU 8086 a01c Gigabit ET Dual Port Server Adapter 8086 a03c Gigabit ET Dual Port Server Adapter 8086 a04c Gigabit ET Dual Port Server Adapter @@ -16288,6 +16739,7 @@ 8086 a02b Gigabit ET Quad Port Server Adapter 8086 a02c Gigabit ET Quad Port Server Adapter 10ea 82577LM Gigabit Network Connection + 1028 040a Latitude E6410 1028 040b Latitude E6510 e4bf 50c1 PC1-GROOVE 10eb 82577LC Gigabit Network Connection @@ -16296,6 +16748,7 @@ 8086 a11f 10-Gigabit CX4 Dual Port Server Adapter 10ed 82599 Ethernet Controller Virtual Function 10ef 82578DM Gigabit Network Connection + 1028 02da OptiPlex 980 10f0 82578DC Gigabit Network Connection 10f1 82598EB 10-Gigabit AF Dual Port Network Connection 8086 a20f 10-Gigabit AF DA Dual Port Server Adapter @@ -16618,8 +17071,10 @@ 8086 0001 Ethernet Server Adapter I340-F4 8086 0002 Ethernet Server Adapter I340-F4 1528 Ethernet Controller 10-Gigabit X540-AT2 + 103c 192d 561FLR-T 2-port 10Gb Ethernet Adapter 108e 7b14 Sun Dual Port 10 GbE PCIe 2.0 ExpressModule, Base-T 108e 7b15 Sun Dual Port 10 GbE PCIe 2.0 Low Profile Adapter, Base-T + 1137 00bf Ethernet Converged Network Adapter X540-T2 8086 0001 Ethernet Converged Network Adapter X540-T2 8086 0002 Ethernet Converged Network Adapter X540-T1 8086 001a Ethernet Converged Network Adapter X540-T2 @@ -16628,6 +17083,10 @@ 8086 5003 Ethernet 10G 2P X540-t Adapter 1529 82599 10 Gigabit Dual Port Backplane Connection with FCoE 152a 82599 10 Gigabit Dual port Network Connection with FCoE + 153a Ethernet Connection I217-LM + 153b Ethernet Connection I217-V + 1547 DSL3510 Thunderbolt Port [Cactus Ridge] + 1549 DSL3510 Thunderbolt Controller [Cactus Ridge] 154a Ethernet Server Adapter X520-4 8086 011a Ethernet Converged Network Adapter X520-4 8086 011b Ethernet Converged Network Adapter X520-4 @@ -16684,45 +17143,66 @@ 1043 844d P8P67 Deluxe Motherboard 1c03 6 Series/C200 Series Chipset Family 6 port SATA AHCI Controller 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c04 6 Series/C200 Series Chipset Family SATA RAID Controller 1c05 6 Series/C200 Series Chipset Family SATA RAID Controller 1c08 6 Series/C200 Series Chipset Family 2 port SATA IDE Controller 1c09 6 Series/C200 Series Chipset Family 2 port SATA IDE Controller 1c10 6 Series/C200 Series Chipset Family PCI Express Root Port 1 + 1028 04da Vostro 3750 + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c12 6 Series/C200 Series Chipset Family PCI Express Root Port 2 + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c14 6 Series/C200 Series Chipset Family PCI Express Root Port 3 + 1028 04da Vostro 3750 + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c16 6 Series/C200 Series Chipset Family PCI Express Root Port 4 1c18 6 Series/C200 Series Chipset Family PCI Express Root Port 5 + 1028 04da Vostro 3750 1c1a 6 Series/C200 Series Chipset Family PCI Express Root Port 6 + 1028 04da Vostro 3750 1c1c 6 Series/C200 Series Chipset Family PCI Express Root Port 7 1c1e 6 Series/C200 Series Chipset Family PCI Express Root Port 8 1c20 6 Series/C200 Series Chipset Family High Definition Audio Controller 1028 0490 Alienware M17x R3 1028 04aa XPS 8300 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 1043 8418 P8P67 Deluxe Motherboard + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c22 6 Series/C200 Series Chipset Family SMBus Controller 1028 04aa XPS 8300 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 1043 844d P8P67 Deluxe Motherboard + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c24 6 Series/C200 Series Chipset Family Thermal Management Controller 1c25 6 Series/C200 Series Chipset Family DMI to PCI Bridge 1c26 6 Series/C200 Series Chipset Family USB Enhanced Host Controller #1 1028 04aa XPS 8300 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 1043 844d P8P67 Deluxe Motherboard + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c27 6 Series/C200 Series Chipset Family USB Universal Host Controller #1 + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c2c 6 Series/C200 Series Chipset Family USB Universal Host Controller #5 + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c2d 6 Series/C200 Series Chipset Family USB Enhanced Host Controller #2 1028 04aa XPS 8300 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 1043 844d P8P67 Deluxe Motherboard + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c33 6 Series/C200 Series Chipset Family LAN Controller 1c35 6 Series/C200 Series Chipset Family VECI Controller 1c3a 6 Series/C200 Series Chipset Family MEI Controller #1 1028 04aa XPS 8300 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 1043 844d P8P67 Deluxe Motherboard + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c3b 6 Series/C200 Series Chipset Family MEI Controller #2 1c3c 6 Series/C200 Series Chipset Family IDE-r Controller 1c3d 6 Series/C200 Series Chipset Family KT Controller @@ -16737,10 +17217,12 @@ 1c47 UM67 Express Chipset Family LPC Controller 1c48 6 Series/C200 Series Chipset Family LPC Controller 1c49 HM65 Express Chipset Family LPC Controller + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c4a H67 Express Chipset Family LPC Controller 1028 04aa XPS 8300 1c4b HM67 Express Chipset Family LPC Controller 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 1c4c Q65 Express Chipset Family LPC Controller 1c4d QS67 Express Chipset Family LPC Controller 1c4e Q67 Express Chipset Family LPC Controller @@ -16825,69 +17307,68 @@ 1d72 C608 chipset SMBus Controller 2 1d74 C608/C606/X79 series chipset PCI Express Upstream Port 1d76 C600/X79 series chipset Multi-Function Glue - 1e00 Panther Point 4 port SATA Controller [IDE mode] - 1e01 Panther Point 4 port SATA Controller [IDE mode] - 1e02 Panther Point 6 port SATA Controller [AHCI mode] - 1e03 Panther Point 6 port SATA Controller [AHCI mode] - 1e04 Panther Point SATA Controller [RAID mode] - 1e05 Panther Point SATA Controller [RAID mode] - 1e06 Panther Point SATA Controller [Premium RAID mode] - 1e07 Panther Point SATA Controller [Premium RAID mode] - 1e08 Panther Point 2 port SATA Controller [IDE mode] - 1e09 Panther Point 2 port SATA Controller [IDE mode] - 1e0e Panther Point SATA Controller [RAID mode] - 1e10 Panther Point PCI Express Root Port 1 - 1e12 Panther Point PCI Express Root Port 2 - 1e14 Panther Point PCI Express Root Port 3 - 1e16 Panther Point PCI Express Root Port 4 - 1e18 Panther Point PCI Express Root Port 5 - 1e1a Panther Point PCI Express Root Port 6 - 1e1c Panther Point PCI Express Root Port 7 - 1e1e Panther Point PCI Express Root Port 8 - 1e20 Panther Point High Definition Audio Controller - 1e22 Panther Point SMBus Controller - 1e24 Panther Point Thermal Management Controller - 1e25 Panther Point DMI to PCI Bridge - 1e26 Panther Point USB Enhanced Host Controller #1 - 1e2d Panther Point USB Enhanced Host Controller #2 - 1e31 Panther Point USB xHCI Host Controller - 1e33 Panther Point LAN Controller - 1e3a Panther Point MEI Controller #1 - 1e3b Panther Point MEI Controller #2 - 1e3c Panther Point IDE-r Controller - 1e3d Panther Point KT Controller - 1e40 Panther Point LPC Controller - 1e41 Panther Point LPC Controller - 1e42 Panther Point LPC Controller - 1e43 Panther Point LPC Controller - 1e44 Panther Point LPC Controller - 1e45 Panther Point LPC Controller - 1e46 Panther Point LPC Controller - 1e47 Panther Point LPC Controller - 1e48 Panther Point LPC Controller - 1e49 Panther Point LPC Controller - 1e4a Panther Point LPC Controller - 1e4b Panther Point LPC Controller - 1e4c Panther Point LPC Controller - 1e4d Panther Point LPC Controller - 1e4e Panther Point LPC Controller - 1e4f Panther Point LPC Controller - 1e50 Panther Point LPC Controller - 1e51 Panther Point LPC Controller - 1e52 Panther Point LPC Controller - 1e53 Panther Point LPC Controller - 1e54 Panther Point LPC Controller - 1e55 Panther Point LPC Controller - 1e56 Panther Point LPC Controller - 1e57 Panther Point LPC Controller - 1e58 Panther Point LPC Controller - 1e59 Panther Point LPC Controller - 1e5a Panther Point LPC Controller - 1e5b Panther Point LPC Controller - 1e5c Panther Point LPC Controller - 1e5d Panther Point LPC Controller - 1e5e Panther Point LPC Controller - 1e5f Panther Point LPC Controller + 1e00 7 Series/C210 Series Chipset Family 4-port SATA Controller [IDE mode] + 1e01 7 Series Chipset Family 4-port SATA Controller [IDE mode] + 1e02 7 Series/C210 Series Chipset Family 6-port SATA Controller [AHCI mode] + 1e03 7 Series Chipset Family 6-port SATA Controller [AHCI mode] + 1e04 7 Series/C210 Series Chipset Family SATA Controller [RAID mode] + 1e05 7 Series Chipset SATA Controller [RAID mode] + 1e06 7 Series/C210 Series Chipset Family SATA Controller [RAID mode] + 1e07 7 Series Chipset Family SATA Controller [RAID mode] + 1e08 7 Series/C210 Series Chipset Family 2-port SATA Controller [IDE mode] + 1e09 7 Series Chipset Family 2-port SATA Controller [IDE mode] + 1e0e 7 Series/C210 Series Chipset Family SATA Controller [RAID mode] + 1e10 7 Series/C210 Series Chipset Family PCI Express Root Port 1 + 1e12 7 Series/C210 Series Chipset Family PCI Express Root Port 2 + 1e14 7 Series/C210 Series Chipset Family PCI Express Root Port 3 + 1e16 7 Series/C210 Series Chipset Family PCI Express Root Port 4 + 1e18 7 Series/C210 Series Chipset Family PCI Express Root Port 5 + 1e1a 7 Series/C210 Series Chipset Family PCI Express Root Port 6 + 1e1c 7 Series/C210 Series Chipset Family PCI Express Root Port 7 + 1e1e 7 Series/C210 Series Chipset Family PCI Express Root Port 8 + 1e20 7 Series/C210 Series Chipset Family High Definition Audio Controller + 1e22 7 Series/C210 Series Chipset Family SMBus Controller + 1e24 7 Series/C210 Series Chipset Family Thermal Management Controller + 1e25 7 Series/C210 Series Chipset Family DMI to PCI Bridge + 1e26 7 Series/C210 Series Chipset Family USB Enhanced Host Controller #1 + 1e2d 7 Series/C210 Series Chipset Family USB Enhanced Host Controller #2 + 1e31 7 Series/C210 Series Chipset Family USB xHCI Host Controller + 1e33 7 Series/C210 Series Chipset Family LAN Controller + 1e3a 7 Series/C210 Series Chipset Family MEI Controller #1 + 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 + 1e41 7 Series Chipset Family LPC Controller + 1e42 7 Series Chipset Family LPC Controller + 1e43 7 Series Chipset Family LPC Controller + 1e44 Z77 Express Chipset LPC Controller + 1e45 7 Series Chipset Family LPC Controller + 1e46 Z75 Express Chipset LPC Controller + 1e47 Q77 Express Chipset LPC Controller + 1e48 Q75 Express Chipset LPC Controller + 1e49 B75 Express Chipset LPC Controller + 1e4a H77 Express Chipset LPC Controller + 1e4b 7 Series Chipset Family LPC Controller + 1e4c 7 Series Chipset Family LPC Controller + 1e4d 7 Series Chipset Family LPC Controller + 1e4e 7 Series Chipset Family LPC Controller + 1e4f 7 Series Chipset Family LPC Controller + 1e50 7 Series Chipset Family LPC Controller + 1e51 7 Series Chipset Family LPC Controller + 1e52 7 Series Chipset Family LPC Controller + 1e53 C216 Series Chipset LPC Controller + 1e54 7 Series Chipset Family LPC Controller + 1e55 QM77 Express Chipset LPC Controller + 1e56 QS77 Express Chipset LPC Controller + 1e57 HM77 Express Chipset LPC Controller + 1e58 UM77 Express Chipset LPC Controller + 1e59 HM76 Express Chipset LPC Controller + 1e5a 7 Series Chipset Family LPC Controller + 1e5b UM77 Express Chipset LPC Controller + 1e5c 7 Series Chipset Family LPC Controller + 1e5d HM75 Express Chipset LPC Controller + 1e5e 7 Series Chipset Family LPC Controller + 1e5f 7 Series Chipset Family LPC Controller 2310 DH89xxCC LPC Controller 2323 DH89xxCC 4 Port SATA AHCI Controller 2330 DH89xxCC SMBus Controller @@ -16984,7 +17465,7 @@ 1025 1016 Travelmate 612 TX 104d 80df Vaio PCG-FX403 2448 82801 Mobile PCI Bridge -# (rev d3) (prog-if (rev d3) (prog-if 01 [Subtractive decode]) + 1028 040b Latitude E6510 103c 0934 HP Compaq nw8240 Mobile Workstation 103c 099c NX6110/NC6120 103c 309f Compaq nx9420 Notebook @@ -17046,7 +17527,9 @@ 1014 0267 NetVista A30p 1028 020d Inspiron 530 1028 0211 Optiplex 755 + 1028 02da OptiPlex 980 103c 2a3b Pavilion A1512X + 103c 330b ProLiant ML150 G6 Server 1458 5000 GA-EP45-DS5 Motherboard 1775 11cc CC11/CL11 2450 82801E ISA Bridge (LPC) @@ -18248,7 +18731,6 @@ 1028 01da OptiPlex 745 1028 01f3 Inspiron 1420 103c 30c0 Compaq 6710b -# Name mistyped on previous submission 103c 30c1 Compaq 6910p 103c 30cc Pavilion dv6700 103c 30d9 Presario C700 @@ -18432,7 +18914,6 @@ 292c 82801IEM (ICH9M-E) SATA Controller [RAID mode] 292d 82801IBM/IEM (ICH9M/ICH9M-E) 2 port SATA Controller [IDE mode] e4bf cc4d CCM-BOOGIE - 292e ICH9M SATA IDE Controller 2930 82801I (ICH9 Family) SMBus Controller 1028 020d Inspiron 530 1028 0211 Optiplex 755 @@ -18883,11 +19364,15 @@ 2e16 4 Series Chipset PT IDER Controller 2e17 4 Series Chipset Serial KT Controller 2e20 4 Series Chipset DRAM Controller - 1458 5000 GA-EP45-DS5 Motherboard + 1043 82d3 P5Q Deluxe Motherboard + 1458 5000 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 2e21 4 Series Chipset PCI Express Root Port + 1043 82d3 P5Q Deluxe Motherboard 1458 5000 GA-EP45-DS5 Motherboard 2e22 4 Series Chipset Integrated Graphics Controller + 1458 d000 GA-EG45M-DS2H Mainboard 2e23 4 Series Chipset Integrated Graphics Controller + 1458 d000 GA-EG45M-DS2H Mainboard 2e24 4 Series Chipset HECI Controller 2e25 4 Series Chipset HECI Controller 2e26 4 Series Chipset PT IDER Controller @@ -18971,42 +19456,50 @@ 1028 0287 PowerEdge M610 I/O Hub to ESI Port 1028 028c PowerEdge R410 I/O Hub to ESI Port 1028 028d PowerEdge T410 I/O Hub to ESI Port + 103c 330b ProLiant ML150 G6 Server 3404 5520/5500/X58 I/O Hub to ESI Port 3405 5520/5500/X58 I/O Hub to ESI Port 3406 5520 I/O Hub to ESI Port + 103c 330b ProLiant G6 series 3407 5520/5500/X58 I/O Hub to ESI Port 3408 5520/5500/X58 I/O Hub PCI Express Root Port 1 + 103c 330b ProLiant G6 series 3409 5520/5500/X58 I/O Hub PCI Express Root Port 2 340a 5520/5500/X58 I/O Hub PCI Express Root Port 3 + 103c 330b ProLiant ML150 G6 Server 340b 5520/X58 I/O Hub PCI Express Root Port 4 340c 5520/X58 I/O Hub PCI Express Root Port 5 340d 5520/X58 I/O Hub PCI Express Root Port 6 340e 5520/5500/X58 I/O Hub PCI Express Root Port 7 + 103c 330b ProLiant ML150 G6 Server 340f 5520/5500/X58 I/O Hub PCI Express Root Port 8 - 3410 5520/5500/X58 I/O Hub PCI Express Root Port 9 - 3411 5520/5500/X58 I/O Hub PCI Express Root Port 10 - 3418 5520/5500/X58 Physical Layer Port 0 - 3419 5520/5500 Physical Layer Port 1 - 3420 5500 Non-Legacy I/O Hub PCI Express Root Port 0 - 3421 5520 Non-Legacy I/O Hub PCI Express Root Port 0 - 3422 5520/5500/X58 I/O Hub GPIO and Scratch Pad Registers - 3423 5520/5500/X58 I/O Hub Control Status and RAS Registers - 3425 5520/5500/X58 Physical and Link Layer Registers Port 0 - 3426 5520/5500/X58 Routing and Protocol Layer Registers Port 0 - 3427 5520/5500 Physical and Link Layer Registers Port 1 - 3428 5520/5500 Routing & Protocol Layer Register Port 1 + 3410 7500/5520/5500/X58 I/O Hub PCI Express Root Port 9 + 3411 7500/5520/5500/X58 I/O Hub PCI Express Root Port 10 + 3418 7500/5520/5500/X58 Physical Layer Port 0 + 3419 7500/5520/5500 Physical Layer Port 1 + 3420 7500/5520/5500/X58 I/O Hub PCI Express Root Port 0 + 3421 7500/5520/5500/X58 I/O Hub PCI Express Root Port 0 + 3422 7500/5520/5500/X58 I/O Hub GPIO and Scratch Pad Registers + 103c 330b ProLiant G6 series + 3423 7500/5520/5500/X58 I/O Hub Control Status and RAS Registers + 103c 330b ProLiant G6 series + 3425 7500/5520/5500/X58 Physical and Link Layer Registers Port 0 + 3426 7500/5520/5500/X58 Routing and Protocol Layer Registers Port 0 + 3427 7500/5520/5500 Physical and Link Layer Registers Port 1 + 3428 7500/5520/5500 Routing & Protocol Layer Register Port 1 3429 5520/5500/X58 Chipset QuickData Technology Device 342a 5520/5500/X58 Chipset QuickData Technology Device 342b 5520/5500/X58 Chipset QuickData Technology Device 342c 5520/5500/X58 Chipset QuickData Technology Device - 342d 5520/5500/X58 I/O Hub I/OxAPIC Interrupt Controller - 342e 5520/5500/X58 I/O Hub System Management Registers - 342f 5520/5500/X58 Trusted Execution Technology Registers + 342d 7500/5520/5500/X58 I/O Hub I/OxAPIC Interrupt Controller + 342e 7500/5520/5500/X58 I/O Hub System Management Registers + 103c 330b ProLiant G6 series + 342f 7500/5520/5500/X58 Trusted Execution Technology Registers 3430 5520/5500/X58 Chipset QuickData Technology Device 3431 5520/5500/X58 Chipset QuickData Technology Device 3432 5520/5500/X58 Chipset QuickData Technology Device 3433 5520/5500/X58 Chipset QuickData Technology Device - 3438 5520/5500/X58 I/O Hub Throttle Registers + 3438 7500/5520/5500/X58 I/O Hub Throttle Registers 3500 6311ESB/6321ESB PCI Express Upstream Port 3501 6310ESB PCI Express Upstream Port 3504 6311ESB/6321ESB I/OxAPIC Interrupt Controller @@ -19192,6 +19685,8 @@ 3a16 82801JIR (ICH10R) LPC Interface Controller 1028 028c PowerEdge R410 LPC Interface Controller 1028 028d PowerEdge T410 LPC Interface Controller + 103c 330b ProLiant G6 series + 1043 82d4 P5Q Deluxe Motherboard 1458 5001 GA-EP45-DS5 Motherboard 3a18 82801JIB (ICH10) LPC Interface Controller 3a1a 82801JD (ICH10D) LPC Interface Controller @@ -19199,8 +19694,9 @@ 1028 028c PowerEdge R410 SATA IDE Controller 1028 028d PowerEdge T410 SATA IDE Controller 3a22 82801JI (ICH10 Family) SATA AHCI Controller + 103c 330b ProLiant G6 series 1043 82d4 P5Q Deluxe Motherboard - 1458 b005 GA-EP45-DS5 Motherboard + 1458 b005 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 3a25 82801JIR (ICH10R) SATA RAID Controller 1028 028c PERC S100 Controller (PE R410) 1028 028d PERC S100 Controller (PE T410) @@ -19209,48 +19705,68 @@ 1028 028c PowerEdge R410 SATA IDE Controller 1028 028d PowerEdge T410 SATA IDE Controller 3a30 82801JI (ICH10 Family) SMBus Controller - 1458 5001 GA-EP45-DS5 Motherboard + 1043 82d4 P5Q Deluxe Motherboard + 1458 5001 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 3a32 82801JI (ICH10 Family) Thermal Subsystem 3a34 82801JI (ICH10 Family) USB UHCI Controller #1 1028 028c PowerEdge R410 USB UHCI Controller 1028 028d PowerEdge T410 USB UHCI Controller + 103c 330b ProLiant G6 series + 1043 82d4 P5Q Deluxe Motherboard 1458 5004 GA-EP45-DS5 Motherboard 3a35 82801JI (ICH10 Family) USB UHCI Controller #2 1028 028c PowerEdge R410 USB UHCI Controller 1028 028d PowerEdge T410 USB UHCI Controller + 103c 330b ProLiant G6 series + 1043 82d4 P5Q Deluxe Motherboard 1458 5004 GA-EP45-DS5 Motherboard 3a36 82801JI (ICH10 Family) USB UHCI Controller #3 1028 028c PowerEdge R410 USB UHCI Controller 1028 028d PowerEdge T410 USB UHCI Controller + 103c 330b ProLiant G6 series + 1043 82d4 P5Q Deluxe Motherboard 1458 5004 GA-EP45-DS5 Motherboard 3a37 82801JI (ICH10 Family) USB UHCI Controller #4 1028 028c PowerEdge R410 USB UHCI Controller 1028 028d PowerEdge T410 USB UHCI Controller - 1458 5004 GA-EP45-DS5 Motherboard + 103c 330b ProLiant G6 series + 1043 82d4 P5Q Deluxe Motherboard + 1458 5004 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 3a38 82801JI (ICH10 Family) USB UHCI Controller #5 1028 028c PowerEdge R410 USB UHCI Controller 1028 028d PowerEdge T410 USB UHCI Controller - 1458 5004 GA-EP45-DS5 Motherboard + 103c 330b ProLiant ML150 G6 Server + 1043 82d4 P5Q Deluxe Motherboard + 1458 5004 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 3a39 82801JI (ICH10 Family) USB UHCI Controller #6 1028 028c PowerEdge R410 USB UHCI Controller 1028 028d PowerEdge T410 USB UHCI Controller - 1458 5004 GA-EP45-DS5 Motherboard + 103c 330b ProLiant ML150 G6 Server + 1043 82d4 P5Q Deluxe Motherboard + 1458 5004 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 3a3a 82801JI (ICH10 Family) USB2 EHCI Controller #1 1028 028c PowerEdge R410 USB EHCI Controller 1028 028d PowerEdge T410 USB EHCI Controller + 103c 330b ProLiant G6 series + 1043 82d4 P5Q Deluxe Motherboard 1458 5006 GA-EP45-DS5 Motherboard 3a3c 82801JI (ICH10 Family) USB2 EHCI Controller #2 1028 028c PowerEdge R410 USB EHCI Controller 1028 028d PowerEdge T410 USB EHCI Controller + 103c 330b ProLiant G6 series + 1043 82d4 P5Q Deluxe Motherboard 1458 5006 GA-EP45-DS5 Motherboard 3a3e 82801JI (ICH10 Family) HD Audio Controller + 1043 8311 P5Q Deluxe Motherboard 1458 a002 GA-EP45-UD3R Motherboard - 1458 a102 GA-EP45-DS5 Motherboard + 1458 a102 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 3a40 82801JI (ICH10 Family) PCI Express Root Port 1 1028 028c PowerEdge R410 PCI Express Port 1 1028 028d PowerEdge T410 PCI Express Port 1 + 103c 330b ProLiant ML150 G6 Server + 1043 82d4 P5Q Deluxe Motherboard 1043 82ea P6T DeLuxe Motherboard - 1458 5001 GA-EP45-DS5 Motherboard + 1458 5001 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 3a42 82801JI (ICH10 Family) PCI Express Port 2 3a44 82801JI (ICH10 Family) PCI Express Root Port 3 1043 82ea P6T DeLuxe Motherboard @@ -19258,11 +19774,14 @@ 1043 82ea P6T DeLuxe Motherboard 1458 5001 GA-EP45-DS5 Motherboard 3a48 82801JI (ICH10 Family) PCI Express Root Port 5 + 103c 330b ProLiant ML150 G6 Server 1043 82ea P6T Deluxe Motherboard 1458 5001 GA-EP45-DS5 Motherboard 3a4a 82801JI (ICH10 Family) PCI Express Root Port 6 + 103c 330b ProLiant ML150 G6 Server + 1043 82d4 P5Q Deluxe Motherboard 1043 82ea P6T DeLuxe Motherboard - 1458 5001 GA-EP45-DS5 Motherboard + 1458 5001 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 3a4c 82801JI (ICH10 Family) Gigabit Ethernet Controller 3a51 82801JDO (ICH10DO) VECI Controller 3a55 82801JD/DO (ICH10 Family) Virtual SATA Controller @@ -19298,6 +19817,7 @@ 3b09 Mobile 5 Series Chipset LPC Interface Controller 1025 0347 Aspire 7740G 3b0a 5 Series Chipset LPC Interface Controller + 1028 02da OptiPlex 980 3b0b Mobile 5 Series Chipset LPC Interface Controller 3b0c 5 Series Chipset LPC Interface Controller 3b0d 5 Series/3400 Series Chipset LPC Interface Controller @@ -19322,6 +19842,7 @@ 3b20 5 Series/3400 Series Chipset 4 port SATA IDE Controller 3b21 5 Series/3400 Series Chipset 2 port SATA IDE Controller 3b22 5 Series/3400 Series Chipset 6 port SATA AHCI Controller + 1028 02da OptiPlex 980 3b23 5 Series/3400 Series Chipset 4 port SATA AHCI Controller 3b25 5 Series/3400 Series Chipset SATA RAID Controller 3b26 5 Series/3400 Series Chipset 2 port SATA IDE Controller @@ -19334,15 +19855,18 @@ 3b2e 5 Series/3400 Series Chipset 4 port SATA IDE Controller e4bf 50c1 PC1-GROOVE 3b2f 5 Series/3400 Series Chipset 6 port SATA AHCI Controller + 1028 040b Latitude E6510 e4bf 50c1 PC1-GROOVE 3b30 5 Series/3400 Series Chipset SMBus Controller 1025 0347 Aspire 7740G + 1028 02da OptiPlex 980 1028 040b Latitude E6510 e4bf 50c1 PC1-GROOVE 3b32 5 Series/3400 Series Chipset Thermal Subsystem 1025 0347 Aspire 7740G 3b34 5 Series/3400 Series Chipset USB2 Enhanced Host Controller 1025 0347 Aspire 7740G + 1028 02da OptiPlex 980 1028 040b Latitude E6510 e4bf 50c1 PC1-GROOVE 3b36 5 Series/3400 Series Chipset USB Universal Host Controller @@ -19353,6 +19877,7 @@ 3b3b 5 Series/3400 Series Chipset USB Universal Host Controller 3b3c 5 Series/3400 Series Chipset USB2 Enhanced Host Controller 1025 0347 Aspire 7740G + 1028 02da OptiPlex 980 1028 040b Latitude E6510 e4bf 50c1 PC1-GROOVE 3b3e 5 Series/3400 Series Chipset USB Universal Host Controller @@ -19360,16 +19885,23 @@ 3b40 5 Series/3400 Series Chipset USB Universal Host Controller 3b41 5 Series/3400 Series Chipset LAN Controller 3b42 5 Series/3400 Series Chipset PCI Express Root Port 1 + 1028 02da OptiPlex 980 + 1028 040b Latitude E6510 3b44 5 Series/3400 Series Chipset PCI Express Root Port 2 + 1028 040b Latitude E6510 3b46 5 Series/3400 Series Chipset PCI Express Root Port 3 + 1028 040b Latitude E6510 3b48 5 Series/3400 Series Chipset PCI Express Root Port 4 + 1028 040b Latitude E6510 3b4a 5 Series/3400 Series Chipset PCI Express Root Port 5 + 1028 02da OptiPlex 980 3b4c 5 Series/3400 Series Chipset PCI Express Root Port 6 3b4e 5 Series/3400 Series Chipset PCI Express Root Port 7 3b50 5 Series/3400 Series Chipset PCI Express Root Port 8 3b53 5 Series/3400 Series Chipset VECI Controller 3b56 5 Series/3400 Series Chipset High Definition Audio 1025 0347 Aspire 7740G + 1028 02da OptiPlex 980 1028 040b Latitude E6510 e4bf 50c1 PC1-GROOVE 3b57 5 Series/3400 Series Chipset High Definition Audio @@ -19796,80 +20328,80 @@ 8817 Platform Controller Hub EG20T I2C Controller 8818 Platform Controller Hub EG20T Controller Area Network (CAN) Controller 8819 Platform Controller Hub EG20T IEEE 1588 Hardware Assist - 8c00 Lynx Point 4-Port SATA IDE Controller - 8c01 Lynx Point 4-Port SATA IDE Controller - 8c02 Lynx Point 6-Port SATA AHCI Controller - 8c03 Lynx Point 6-Port SATA AHCI Controller - 8c04 Lynx Point SATA RAID Controller - 8c05 Lynx Point SATA RAID Controller - 8c06 Lynx Point SATA RAID Controller - 8c07 Lynx Point SATA RAID Controller - 8c08 Lynx Point 2-Port SATA IDE Controller - 8c09 Lynx Point 2-Port SATA IDE Controller - 8c0e Lynx Point SATA RAID Controller - 8c0f Lynx Point SATA RAID Controller - 8c10 Lynx Point PCI Express Root Port 1 - 8c11 Lynx Point PCI Express Root Port 1 - 8c12 Lynx Point PCI Express Root Port 2 - 8c13 Lynx Point PCI Express Root Port 2 - 8c14 Lynx Point PCI Express Root Port 3 - 8c15 Lynx Point PCI Express Root Port 3 - 8c16 Lynx Point PCI Express Root Port 4 - 8c17 Lynx Point PCI Express Root Port 4 - 8c18 Lynx Point PCI Express Root Port 5 - 8c19 Lynx Point PCI Express Root Port 5 - 8c1a Lynx Point PCI Express Root Port 6 - 8c1b Lynx Point PCI Express Root Port 6 - 8c1c Lynx Point PCI Express Root Port 7 - 8c1d Lynx Point PCI Express Root Port 7 - 8c1e Lynx Point PCI Express Root Port 8 - 8c1f Lynx Point PCI Express Root Port 8 - 8c20 Lynx Point HD Audio Controller - 8c21 Lynx Point HD Audio Controller - 8c22 Lynx Point SMBus Controller - 8c23 Lynx Point CHAP Counter - 8c24 Lynx Point Thermal Management Controller - 8c26 Lynx Point USB Enhanced Host Controller #1 - 8c2d Lynx Point USB Enhanced Host Controller #2 - 8c31 Lynx Point USB xHCI Host Controller - 8c33 Lynx Point LAN Controller - 8c34 Lynx Point NAND Controller - 8c3a Lynx Point MEI Controller #1 - 8c3b Lynx Point MEI Controller #2 - 8c3c Lynx Point IDE-r Controller - 8c3d Lynx Point KT Controller - 8c40 Lynx Point LPC Controller - 8c41 Lynx Point LPC Controller - 8c42 Lynx Point LPC Controller - 8c43 Lynx Point LPC Controller - 8c44 Lynx Point LPC Controller - 8c45 Lynx Point LPC Controller - 8c46 Lynx Point LPC Controller - 8c47 Lynx Point LPC Controller - 8c48 Lynx Point LPC Controller - 8c49 Lynx Point LPC Controller - 8c4a Lynx Point LPC Controller - 8c4b Lynx Point LPC Controller - 8c4c Lynx Point LPC Controller - 8c4d Lynx Point LPC Controller - 8c4e Lynx Point LPC Controller - 8c4f Lynx Point LPC Controller - 8c50 Lynx Point LPC Controller - 8c51 Lynx Point LPC Controller - 8c52 Lynx Point LPC Controller - 8c53 Lynx Point LPC Controller - 8c54 Lynx Point LPC Controller - 8c55 Lynx Point LPC Controller - 8c56 Lynx Point LPC Controller - 8c57 Lynx Point LPC Controller - 8c58 Lynx Point LPC Controller - 8c59 Lynx Point LPC Controller - 8c5a Lynx Point LPC Controller - 8c5b Lynx Point LPC Controller - 8c5c Lynx Point LPC Controller - 8c5d Lynx Point LPC Controller - 8c5e Lynx Point LPC Controller - 8c5f Lynx Point LPC Controller + 8c00 8 Series/C220 Series Chipset Family 4-port SATA Controller 1 [IDE mode] + 8c01 8 Series Chipset Family 4-port SATA Controller 1 [IDE mode] + 8c02 8 Series/C220 Series Chipset Family 6-port SATA Controller 1 [AHCI mode] + 8c03 8 Series/C220 Series Chipset Family 6-port SATA Controller 1 [AHCI mode] + 8c04 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c05 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c06 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c07 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c08 8 Series/C220 Series Chipset Family 2-port SATA Controller 2 [IDE mode] + 8c09 8 Series/C220 Series Chipset Family 2-port SATA Controller 2 [IDE mode] + 8c0e 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c0f 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c10 8 Series/C220 Series Chipset Family PCI Express Root Port #1 + 8c11 8 Series/C220 Series Chipset Family PCI Express Root Port #1 + 8c12 8 Series/C220 Series Chipset Family PCI Express Root Port #2 + 8c13 8 Series/C220 Series Chipset Family PCI Express Root Port #2 + 8c14 8 Series/C220 Series Chipset Family PCI Express Root Port #3 + 8c15 8 Series/C220 Series Chipset Family PCI Express Root Port #3 + 8c16 8 Series/C220 Series Chipset Family PCI Express Root Port #4 + 8c17 8 Series/C220 Series Chipset Family PCI Express Root Port #4 + 8c18 8 Series/C220 Series Chipset Family PCI Express Root Port #5 + 8c19 8 Series/C220 Series Chipset Family PCI Express Root Port #5 + 8c1a 8 Series/C220 Series Chipset Family PCI Express Root Port #6 + 8c1b 8 Series/C220 Series Chipset Family PCI Express Root Port #6 + 8c1c 8 Series/C220 Series Chipset Family PCI Express Root Port #7 + 8c1d 8 Series/C220 Series Chipset Family PCI Express Root Port #7 + 8c1e 8 Series/C220 Series Chipset Family PCI Express Root Port #8 + 8c1f 8 Series/C220 Series Chipset Family PCI Express Root Port #8 + 8c20 8 Series/C220 Series Chipset High Definition Audio Controller + 8c21 8 Series/C220 Series Chipset High Definition Audio Controller + 8c22 8 Series/C220 Series Chipset Family SMBus Controller + 8c23 8 Series Chipset Family CHAP Counters + 8c24 8 Series Chipset Family Thermal Management Controller + 8c26 8 Series/C220 Series Chipset Family USB EHCI #1 + 8c2d 8 Series/C220 Series Chipset Family USB EHCI #2 + 8c31 8 Series/C220 Series Chipset Family USB xHCI + 8c33 8 Series/C220 Series Chipset Family LAN Controller + 8c34 8 Series/C220 Series Chipset Family NAND Controller + 8c3a 8 Series/C220 Series Chipset Family MEI Controller #1 + 8c3b 8 Series/C220 Series Chipset Family MEI Controller #2 + 8c3c 8 Series/C220 Series Chipset Family IDE-r Controller + 8c3d 8 Series/C220 Series Chipset Family KT Controller + 8c40 8 Series/C220 Series Chipset Family LPC Controller + 8c41 8 Series Chipset Family Mobile Super SKU LPC Controller + 8c42 8 Series/C220 Series Chipset Family Desktop Super SKU LPC Controller + 8c43 8 Series/C220 Series Chipset Family LPC Controller + 8c44 Z87 Express Chipset LPC Controller + 8c45 8 Series/C220 Series Chipset Family LPC Controller + 8c46 Z85 Express Chipset LPC Controller + 8c47 8 Series/C220 Series Chipset Family LPC Controller + 8c48 8 Series/C220 Series Chipset Family LPC Controller + 8c49 HM86 Express Chipset LPC Controller + 8c4a H87 Express Chipset LPC Controller + 8c4b HM87 Express Chipset LPC Controller + 8c4c Q85 Express Chipset LPC Controller + 8c4d 8 Series/C220 Series Chipset Family LPC Controller + 8c4e Q87 Express Chipset LPC Controller + 8c4f QM87 Express Chipset LPC Controller + 8c50 B85 Express Chipset LPC Controller + 8c51 8 Series/C220 Series Chipset Family LPC Controller + 8c52 C222 Series Chipset Family Server Essential SKU LPC Controller + 8c53 8 Series/C220 Series Chipset Family LPC Controller + 8c54 C224 Series Chipset Family Server Standard SKU LPC Controller + 8c55 8 Series/C220 Series Chipset Family LPC Controller + 8c56 C226 Series Chipset Family Server Advanced SKU LPC Controller + 8c57 8 Series/C220 Series Chipset Family LPC Controller + 8c58 8 Series/C220 Series Chipset Family WS SKU LPC Controller + 8c59 8 Series/C220 Series Chipset Family LPC Controller + 8c5a 8 Series/C220 Series Chipset Family LPC Controller + 8c5b 8 Series/C220 Series Chipset Family LPC Controller + 8c5c H81 Express Chipset/C220 Series Chipset Family LPC Controller + 8c5d 8 Series/C220 Series Chipset Family LPC Controller + 8c5e 8 Series/C220 Series Chipset Family LPC Controller + 8c5f 8 Series/C220 Series Chipset Family LPC Controller 9000 IXP2000 Family Network Processor 9001 IXP2400 Network Processor 9002 IXP2300 Network Processor @@ -19878,16 +20410,72 @@ 9622 Integrated RAID 9641 Integrated RAID 96a1 Integrated RAID - a000 N10 Family DMI Bridge + 9c00 Lynx Point-LP SATA Controller 1 [IDE mode] + 9c01 Lynx Point-LP SATA Controller 1 [IDE mode] + 9c02 Lynx Point-LP SATA Controller 1 [AHCI mode] + 9c03 Lynx Point-LP SATA Controller 1 [AHCI mode] + 9c04 Lynx Point-LP SATA Controller 1 [RAID mode] + 9c05 Lynx Point-LP SATA Controller 1 [RAID mode] + 9c06 Lynx Point-LP SATA Controller 1 [RAID mode] + 9c07 Lynx Point-LP SATA Controller 1 [RAID mode] + 9c08 Lynx Point-LP SATA Controller 2 [IDE mode] + 9c09 Lynx Point-LP SATA Controller 2 [IDE mode] + 9c0a LynxPoint-LP SATA Controller [Reserved] + 9c0b LynxPoint-LP SATA Controller [Reserved] + 9c0c LynxPoint-LP SATA Controller [Reserved] + 9c0d LynxPoint-LP SATA Controller [Reserved] + 9c0e Lynx Point-LP SATA Controller 1 [RAID mode] + 9c0f Lynx Point-LP SATA Controller 1 [RAID mode] + 9c10 Lynx Point-LP PCI Express Root Port 1 + 9c11 Lynx Point-LP PCI Express Root Port 1 + 9c12 Lynx Point-LP PCI Express Root Port 2 + 9c13 Lynx Point-LP PCI Express Root Port 2 + 9c14 Lynx Point-LP PCI Express Root Port 3 + 9c15 Lynx Point-LP PCI Express Root Port 3 + 9c16 Lynx Point-LP PCI Express Root Port 4 + 9c17 Lynx Point-LP PCI Express Root Port 4 + 9c18 Lynx Point-LP PCI Express Root Port 5 + 9c19 Lynx Point-LP PCI Express Root Port 5 + 9c1a Lynx Point-LP PCI Express Root Port 6 + 9c1b Lynx Point-LP PCI Express Root Port 6 + 9c20 Lynx Point-LP HD Audio Controller + 9c21 Lynx Point-LP HD Audio Controller + 9c22 Lynx Point-LP SMBus Controller + 9c23 Lynx Point-LP CHAP Counters + 9c24 Lynx Point-LP Thermal + 9c26 Lynx Point-LP USB EHCI #1 + 9c31 Lynx Point-LP USB xHCI HC + 9c35 Lynx Point-LP SDIO Controller + 9c36 Lynx Point-LP Audio DSP Controller + 9c3a Lynx Point-LP HECI #0 + 9c3b Lynx Point-LP HECI #1 + 9c3c Lynx Point-LP HECI IDER + 9c3d Lynx Point-LP HECI KT + 9c40 Lynx Point-LP LPC Controller + 9c41 Lynx Point-LP LPC Controller + 9c42 Lynx Point-LP LPC Controller + 9c43 Lynx Point-LP LPC Controller + 9c44 Lynx Point-LP LPC Controller + 9c45 Lynx Point-LP LPC Controller + 9c46 Lynx Point-LP LPC Controller + 9c47 Lynx Point-LP LPC Controller + 9c60 Lynx Point-LP Low Power Sub-System DMA + 9c61 Lynx Point-LP I2C Controller #0 + 9c62 Lynx Point-LP I2C Controller #1 + 9c63 Lynx Point-LP UART Controller #0 + 9c64 Lynx Point-LP UART Controller #1 + 9c65 Lynx Point-LP SPI Controller #0 + 9c66 Lynx Point-LP SPI Controller #1 + a000 Atom Processor D4xx/D5xx/N4xx/N5xx DMI Bridge 8086 4f4d DeskTop Board D510MO - a001 N10 Family Integrated Graphics Controller + a001 Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller 8086 4f4d DeskTop Board D510MO - a002 N10 Family Integrated Graphics Controller - a003 N10 Family CHAPS counter - a010 N10 Family DMI Bridge - a011 N10 Family Integrated Graphics Controller - a012 N10 Family Integrated Graphics Controller - a013 N10 Family CHAPS counter + a002 Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller + a003 Atom Processor D4xx/D5xx/N4xx/N5xx CHAPS counter + a010 Atom Processor D4xx/D5xx/N4xx/N5xx DMI Bridge + a011 Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller + a012 Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller + a013 Atom Processor D4xx/D5xx/N4xx/N5xx CHAPS counter a620 6400/6402 Advanced Memory Buffer (AMB) b152 21152 PCI-to-PCI Bridge 8086 b152 21152 PCI-to-PCI Bridge @@ -19902,6 +20490,7 @@ e4bf 1000 CC8-1-BLUES d130 Core Processor DMI d131 Core Processor DMI + 1028 02da OptiPlex 980 d132 Core Processor DMI 1028 040b Latitude E6510 d133 Core Processor DMI @@ -19910,6 +20499,8 @@ d136 Core Processor DMI d137 Core Processor DMI d138 Core Processor PCI Express Root Port 1 + 1028 02da OptiPlex 980 + 1028 040b Latitude E6510 d139 Core Processor PCI Express Root Port 2 d13a Core Processor PCI Express Root Port 3 d13b Core Processor PCI Express Root Port 4 @@ -20230,6 +20821,31 @@ 9005 02b3 2400 9005 02b4 ICP ICP5045AL 9005 0800 Callisto + 028b Series 6 - 6G SAS/PCIe 2 + 9005 0200 Series 6 Entry Level - ASR-6405E - 4 internal 6G SAS ports + 9005 0201 Series 6 Entry Level - ASR-6805E - 8 internal 6G SAS ports + 9005 0300 Series 6 - ASR-6405 - 4 internal 6G SAS ports + 9005 0301 Series 6 - ASR-6805 - 8 internal 6G SAS ports + 9005 0302 Series 6 - ASR-6445 - 4 internal and 4 external 6G SAS ports + 9005 0310 Series 6 Connectors on Top - ASR-6405T - 4 internal 6G SAS ports + 9005 0311 Series 6 Connectors on Top - ASR-6805T - 8 internal 6G SAS + 9005 0400 Series 6 - ASR-61205 - 12 internal 6G SAS ports + 9005 0401 Series 6 - ASR-61605 - 16 internal 6G SAS ports + 9005 0403 Series 6 - ASR-62405 - 24 internal 6G SAS ports + 028c Series 7 6G SAS/PCIe 3 + 9005 0500 Series 7 - ASR-7805 - 8 internal 6G SAS Port/PCIe 3.0 + 9005 0501 Series 7 - ASR-71605 - 16 internal 6G SAS Port/PCIe 3.0 + 9005 0502 Series 7 - ASR-71685 - 16 internal 8 external 6G SAS Port/PCIe 3.0 + 9005 0503 Series 7 - ASR-72405 - 24 internal 0 external 6G SAS Port/PCIe 3.0 + 9005 0504 Series 7 - ASR-7885 - 8 internal 8 external 6G SAS Port/PCIe 3.0 + 9005 0505 Series 7 Entry Level - ASR-71685E - 16 internal 8 external 6G SAS Port/PCIe 3.0 + 9005 0506 Series 7 Entry Level - ASR-72405E - 24 internal 0 external 6G SAS Port/PCIe 3.0 + 028d Series 8 12G SAS/PCIe 3 + 9005 0550 Series 8 - ASR-82405 - 24 internal 0 external 12G SAS Port/PCIe 3.0 + 9005 0551 Series 8 - ASR-81605 - 16 internal 0 external 12G SAS Port/PCIe 3.0 + 9005 0552 Series 8 - ASR-8805 - 8 internal 0 external 12G SAS Port/PCIe 3.0 + 9005 0553 Series 8 - ASR-8085 - 0 internal 8 external 12G SAS Port/PCIe 3.0 + 9005 0554 Series 8 - ASR-8885 - 8 internal 8 external 12G SAS Port/PCIe 3.0 0410 AIC-9410W SAS (Razor HBA RAID) 9005 0410 ASC-48300(Spirit RAID) 9005 0411 ASC-58300 (Oakmont RAID) @@ -20325,6 +20941,8 @@ 9865 PCI 9865 Multi-I/O Controller 9901 PCIe 9901 Multi-I/O Controller 9904 4-Port PCIe Serial Adapter +# 2-port Serial 1-port Parallel Adaptor + 9912 PCIe 9912 Multi-I/O Controller 9922 PCIe 9922 Multi-I/O Controller 9990 MCS9990 PCIe to 4‐Port USB 2.0 Host Controller 9902 Stargen Inc. diff --git a/src/hwdata/usb.ids b/src/hwdata/usb.ids index c21fff1..1b8f2c6 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: 2012.02.08 -# Date: 2012-02-08 20:34:02 +# Version: 2012.07.30 +# Date: 2012-07-30 20:34:03 # # Vendors, devices and interfaces. Please keep sorted. @@ -22,6 +22,7 @@ 0001 Fry's Electronics 142b Arbiter Systems, Inc. + 7778 Counterfeit flash drive [Kingston] 0002 Ingram 0003 Club Mac 0004 Nebraska Furniture Mart @@ -98,6 +99,7 @@ 2105 AVRONE! 2106 STK600 development board 2107 AVR Dragon + 2109 STK541 ZigBee Development Board 210d XPLAIN evaluation kit (CDC ACM) 2122 XMEGA-A1 Explained evaluation kit 2310 EVK11xx evaluation board @@ -109,7 +111,11 @@ 4102 AirVast W-Buddie WN210 5601 at76c510 Prism-II 802.11b Access Point 5603 Cisco 7920 WiFi IP Phone + 6119 AT91SAM CDC Demo Application 6124 at91sam SAMBA bootloader + 6127 AT91SAM HID Keyboard Demo Application + 6129 AT91SAM Mass Storage Demo Application + 6200 AT91SAM HID Mouse Demo Application 7603 D-Link DWL-120 802.11b Wireless Adapter [Atmel at76c503a] 7604 at76c503a 802.11b Adapter 7605 at76c503a 802.11b Adapter @@ -248,6 +254,7 @@ 1311 OfficeJet V30 1312 DeskJet 460 1317 LaserJet 1005 + 1327 iLO Virtual Hub 1405 ScanJet 3670 1411 PSC 750 1424 f2105 Monitor Hub @@ -323,6 +330,7 @@ 2311 OfficeJet d series 2312 OfficeJet Pro L7700 2317 LaserJet 4350 + 231d 4 GB Flash Drive 2402 PhotoSmart 7700 series 2404 Deskjet F2280 series 2405 ScanJet 4070 PhotoSmart @@ -356,6 +364,7 @@ 2c12 Officejet J4680 2c17 LaserJet 1022 2c24 Logitech M-UAL-96 Mouse + 2d05 Scanjet 7000 2d11 OfficeJet 6110 2d17 Printing Support 2e11 PSC 1000 @@ -598,7 +607,7 @@ 03f1 Genoa Technology 03f2 Oak Technology, Inc. 03f3 Adaptec, Inc. - 0020 AWN-8020 WLAN + 0020 AWN-8020 WLAN [Intersil PRISM 2.5] 0080 AVC-1100 Audio Capture 0083 AVC-2200 Device 0087 AVC-2210 Loader @@ -617,7 +626,7 @@ 03f5 Siemens Electromechanical 03f8 Epson Imaging Technology Center 03f9 KeyTronic Corp. - 0100 Keyboard + 0100 KT-2001 Keyboard 0101 Keyboard 0102 Keyboard Mouse 03fb OPTi, Inc. @@ -657,19 +666,38 @@ 0232 Serial Converter 1060 JTAG adapter 6001 FT232 USB-Serial (UART) IC + 6002 Lumel PD12 6007 Serial Converter 6008 Serial Converter 6009 Serial Converter 6010 FT2232C Dual USB-UART/FIFO IC 6011 FT4232H Quad HS USB-UART/FIFO IC 6014 FT232H Single HS USB-UART/FIFO IC + 6015 Bridge(I2C/SPI/UART/FIFO) 8040 4 Port Hub 8070 7 Port Hub 8370 7 Port Hub 8371 PS/2 Keyboard And Mouse 8372 FT8U100AX Serial Port + 8a28 Rainforest Automation ZigBee Controller + 9e90 Marvell OpenRD Base/Client + 9f80 Ewert Energy Systems CANdapter + a6d0 Texas Instruments XDS100v2 JTAG / BeagleBone A3 + a951 HCP HIT GSM/GPRS modem [Cinterion MC55i] + abb8 Lego Mindstorms NXTCam + b810 US Interface Navigator (CAT and 2nd PTT lines) + b811 US Interface Navigator (WKEY and FSK lines) + b812 US Interface Navigator (RS232 and CONFIG lines) + baf8 Amontec JTAGkey - Open On-Chip Debugger bcd8 Stellaris Development Board bcd9 Stellaris Evaluation Board + bcda Stellaris ICDI Board + bdc8 Egnite GmbH - JTAG/RS-232 adapter + bfd8 OpenDCC + bfd9 OpenDCC (Sniffer) + bfda OpenDCC (Throttle) + bfdb OpenDCC (Gateway) + bfdc OpenDCC (GBM) c630 lcd2usb interface c631 i2c-tiny-usb interface c632 xu1541 c64 floppy drive interface @@ -683,20 +711,25 @@ c8bc Alpermann+Velte Rubidium S1 c8bd Alpermann+Velte Rubidium T1 c8be Alpermann+Velte Rubidium D1 - cc48 product FTDI TACTRIX_OPENPORT_13M 0xcc48 OpenPort 1.3 Mitsubishi - cc49 product FTDI TACTRIX_OPENPORT_13S 0xcc49 OpenPort 1.3 Subaru - cc4a product FTDI TACTRIX_OPENPORT_13U 0xcc4a OpenPort 1.3 Universal + cc48 Tactrix OpenPort 1.3 Mitsubishi + cc49 Tactrix OpenPort 1.3 Subaru + cc4a Tactrix OpenPort 1.3 Universal + cff8 Distortec JTAG-lock-pick d010 SCS PTC-IIusb d011 SCS Position-Tracker/TNC d012 SCS DRAGON 1 d013 SCS DRAGON 1 + d578 Accesio USB-COM-4SM d6f8 UNI Black BOX + d738 Propox JTAGcable II + d739 Propox ISPcable III d9a9 Actisense USG-1 NMEA Serial Gateway d9aa Actisense NGT-1 NMEA2000 PC Interface e0d0 Total Phase Aardvark I2C/SPI Host Adapter e521 EVER Sinline XL Series UPS e6c8 PYRAMID Computer GmbH LCD e700 Elster Unicom III Optical Probe + e729 Segway Robotic Mobility Platforms 200 e888 Expert ISDN Control USB e889 USB-RS232 OptoBridge e88a Expert mouseCLOCK USB II @@ -712,8 +745,11 @@ f1a0 Asix PRESTO Programmer f208 Papenmeier Braille-Display f3c0 4N-GALAXY Serial Converter + f608 CTI USB-485-Mini + f60b CTI USB-Nano-485 f680 Suunto Sports Instrument f758 GW Instek GDS-8x0 Oscilloscope + f7c0 ZeitControl Cardsystems TagTracer MIFARE f850 USB-UIRT (Universal Infrared Receiver+Transmitter) f918 Ant8 Logic Probe fa00 Matrix Orbital USB Serial @@ -730,12 +766,12 @@ fd48 ShipModul MiniPlex-4xUSB NMEA Multiplexer fd49 ShipModul MiniPlex-4xUSB-AIS NMEA Multiplexer ff08 ToolHouse LoopBack Adapter - ff18 Logbook Bus + ff18 ScienceScope Logbook ML ff19 Logbook Bus ff1a Logbook Bus ff1b Logbook Bus - ff1c Logbook Bus - ff1d Logbook Bus + ff1c ScienceScope Logbook LS + ff1d ScienceScope Logbook HS ff1e Logbook Bus ff1f Logbook Bus 0404 NCR Corp. @@ -783,6 +819,8 @@ 0059 HighSpeed Hub 005a HighSpeed Hub 006a Conceptronic USB Harddisk Box + 007d MINICUBE2 + 007e PG-FP5 Flash Memory Programmer 0081 SuperScript 1400 Series 0082 SuperScript 1400 Series 0094 Japanese Keyboard with One-touch start buttons @@ -804,6 +842,8 @@ 0249 Aterm WL300NU-G 02b4 Aterm WL300NU-AG 02b6 Aterm WL300NU-GS 802.11n Wireless Adapter + 0300 LifeTouch Note + 0301 LifeTouch Note (debug mode) 55aa Hub 55ab Hub [iMac/iTouch kbd] 8010 Intellibase Hub @@ -949,6 +989,7 @@ 6510 Weltrend Bar Code Reader 6520 XBOX Xploder 6533 Speed-Link Competition Pro + 6543 Manhattan Magnetic Card Strip Reader 040c VTech Computers, Ltd 040d VIA Technologies, Inc. 3184 VNT VT6656 USB-802.11 Wireless LAN Adapter @@ -978,7 +1019,8 @@ 0065 Python2 WDM Encoder 0066 WLI-U2-KG54 WLAN 0067 WLI-U2-KG54-AI WLAN - 0089 Buffalo RUF-C/U2 Flash Drive + 006e LUA-U2-GT 10/100/1000 Ethernet Adapter + 0089 RUF-C/U2 Flash Drive 008b Nintendo Wi-Fi 0091 WLI-U2-KAMG54 Wireless LAN Adapter 0092 WLI-U2-KAMG54 Bootloader @@ -1006,6 +1048,7 @@ 01a1 MiniStation Metro 01a2 WLI-UC-GNM Wireless LAN Adapter [Ralink RT8070] 01ee WLI-UC-GNM2 Wireless LAN Adapter [Ralink RT3070] + 01fd WLI-UC-G450 Wireless LAN Adapter 0412 Award Software International 0413 Leadtek Research, Inc. 1310 WinFast TV - NTSC + FM @@ -1270,6 +1313,8 @@ 02e3 5230 (PC-Suite mode) 02e4 5230 (Imaging mode) 03a4 C5 (Storage mode) + 03c0 C7-00 + 03d1 N950 0400 7600 Phone Parent 0401 6650 GSM Phone 0402 6255 Phone Parent @@ -1331,6 +1376,7 @@ 04f9 6300 (PC Suite mode) 0508 E65 (PC Suite mode) 0509 E65 (Storage mode) + 0518 N9 Phone 0600 Digital Pen SU-1B 0610 CS-15 (Internet Stick 3G modem) 0800 Connectivity Cable DKU-5 @@ -1362,6 +1408,7 @@ 2503 USB 2.0 Hub 2504 USB 2.0 Hub 2512 USB 2.0 Hub + 2513 2.0 Hub 2514 USB 2.0 Hub 2517 Hub 2524 USB MultiSwitch Hub @@ -1789,6 +1836,7 @@ 5220 Rio Nitrus MP3 Player 5221 Rio Eigen 045b Hitachi, Ltd + 0053 RX610 RX-Stick 045d Nortel Networks, Ltd 045e Microsoft Corp. 0007 SideWinder Game Pad @@ -2052,6 +2100,7 @@ 0006 LCD Tablet (12x9) 0008 Tablet (3x2.25) 0461 Primax Electronics, Ltd + 0010 HP Keyboard 0300 G2-300 Scanner 0301 G2E-300 Scanner 0302 G2-300 #2 Scanner @@ -2096,6 +2145,7 @@ 4d03 Kensington Mouse-in-a-box 4d04 Mouse 4d06 Balless Mouse (HID) + 4d0f HP Optical Mouse 4d15 Dell Optical Mouse 4d17 Optical Mouse 4d20 HP Optical Mouse @@ -2317,6 +2367,7 @@ c050 RX 250 Optical Mouse c051 G3 (MX518) Optical Mouse c053 Laser Mouse + c054 Bluetooth mini-receiver c058 M115 Mouse c05a Optical Mouse M90 c05b M-U0004 810-001317 [B110 Optical USB Mouse] @@ -2366,6 +2417,7 @@ c22b Gaming Keyboard G110 G-keys c22d G510 Gaming Keyboard c22e G510 Gaming Keyboard onboard audio + c246 Gaming Mouse G300 c281 WingMan Force c283 WingMan Force 3D c285 WingMan Strike Force 3D @@ -2575,6 +2627,7 @@ 2076 GoGear Aria 2079 GoGear Opus 2088 MCE IR Receiver with ALS- Spinel plus for ASUS + 209e PTA01 Wireless Adapter 20b6 GoGear Vibe 20e3 GoGear Raga 262c SPC230NC Webcam @@ -2737,6 +2790,7 @@ 2018 BioSimKey 2302 Portable Flash Device (PFD) 3744 STLINK Pseudo disk + 3747 ST Micro Connect Lite 3748 ST-LINK/V2 4810 ISDN adapter 481d BT Digital Access adapter @@ -2761,12 +2815,15 @@ d00e Rollei Compactline (Video Mode) e000 T-Com TC 300 e003 Pirelli DP-L10 + e00d Broadcom Bluetooth 2.1 Device e00f Foxconn T77H114 BCM2070 [Single-Chip Bluetooth 2.1 + EDR Adapter] e016 Ubee PXU1900 WiMAX Adapter [Beceem BCSM250] e02c Atheros AR5BBU12 Bluetooth Device 048a S-MOS Systems, Inc. 048c Alps Electric Ireland, Ltd 048d Integrated Technology Express, Inc. + 1336 SD/MMC Cardreader + 1345 Multi Cardreader 9009 Zolid HD DVD Maker 9135 Zolid Mini DVB-T Stick 048f Eicon Tech. @@ -3257,6 +3314,7 @@ 26b0 MF4600 series 26b4 MF4010 series 26b5 MF4200 series + 2737 MF4410 3041 PowerShot S10 3042 CanoScan FS4000US Film Scanner 3043 PowerShot S20 @@ -3326,7 +3384,7 @@ 309a PowerShot A80 309b Digital IXUS (ptp) 309c PowerShot S1 IS - 309d Camera + 309d Powershot Pro 1 309f Camera 30a0 Camera 30a1 Camera @@ -3358,18 +3416,23 @@ 30ef EOS 350D (ptp) 30f0 PowerShot S2 IS (PTP mode) 30f2 Digital IXUS 700 (normal mode) / Digital IXUS 700 (PTP mode) / IXY Digital 600 (normal mode) / PowerShot SD500 (normal mode) / PowerShot SD500 (PTP mode) + 30f4 PowerShot SD30 / Ixus iZoom / IXY DIGITAL L3 30f6 SELPHY CP400 30f8 Powershot A430 30f9 PowerShot A410 (PTP mode) + 30fa PowerShot S80 30fc PowerShot A620 (PTP mode) 30fd PowerShot A610 (normal mode)/PowerShot A610 (PTP mode) 30fe Digital IXUS 65 (PTP mode)/PowerShot SD630 (PTP mode) 30ff Digital IXUS 55 (PTP mode)/PowerShot SD450 (PTP mode) + 3100 PowerShot TX1 310b SELPHY CP600 310e Digital IXUS 50 (PTP mode) 3110 EOS Digital Rebel XTi - 3116 Digital IXUS 750 (PTP mode) + 3116 Digital IXUS 750 / PowerShot SD550 (PTP mode) 3117 PowerShot A700 + 3119 PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS + 311b PowerShot A540 312d Elura 100 3138 PowerShot A710 IS 3147 EOS 1Ds Mark III @@ -3384,17 +3447,39 @@ 3184 Digital IXUS 80 IS (PTP mode) 3192 PowerShot SX110 IS 319a EOS 7D + 31ad PowerShot E1 31bc PowerShot D10 31bf PowerShot A480 31c0 PowerShot SX200 IS 31e5 Digital IXUS 200 IS 31ee SELPHY ES40 31ef PowerShot A495 + 31f1 PowerShot A3100 IS / PowerShot A3150 IS + 31f2 PowerShot A3000 IS 31f3 PowerShot Digital ELPH SD1400 IS + 31f4 PowerShot SD1300 IS / IXUS 105 + 31f5 Powershot SD3500 IS / IXUS 210 IS + 31f6 PowerShot SX210 IS + 31f7 Powershot SD4000 IS / IXUS 300 HS / IXY 30S + 31f8 Powershot SD4500 IS / IXUS 1000 HS / IXY 50S 31ff Digital IXUS 55 3210 Powershot SX30 IS + 3211 PowerShot SX130 IS + 3212 Powershot S95 3214 SELPHY CP800 + 3218 EOS 600D / Rebel T3i (ptp) + 3223 PowerShot A3300 IS + 3224 PowerShot A3200 IS + 3226 PowerShow A800 + 3228 PowerShot SX230 HS 3229 IXUS 220 HS + 322a PowerShot A2200 + 322b Powershot A1200 + 3238 PowerShot SX40 HS + 323f PowerShot A810 + 3243 PowerShot A4000 IS + 3244 PowerShot SX260 HS + 3245 PowerShot SX240 HS 04aa DaeWoo Telecom, Ltd 04ab Chromatic Research 04ac Micro Audiometrics Corp. @@ -3463,8 +3548,10 @@ 040f D200 (mass storage mode) 0410 D200 (ptp) 0413 D40 (mass storage mode) + 041e D60 digital camera (mass storage mode) 0422 D700 (ptp) 0425 D300S + 042a D800 (ptp) 0f03 PD-10 Wireless Printer Adapter 4000 Coolscan LS 40 ED 4001 LS 50 ED/Coolscan V ED @@ -3551,46 +3638,56 @@ 0005 Printer 0006 Printer 0007 Printer - 0101 Perfection 636 + 0101 GT-7000U [Perfection 636] 0102 GT-2200 - 0103 Perfection 610 - 0104 Perfection 1200 - 0105 StylusScan 2000 + 0103 GT-6600U [Perfection 610] + 0104 GT-7600UF [Perfection 1200U/1200U Photo] + 0105 Stylus Scan 2000 0106 Stylus Scan 2500 - 0107 Expression 1600U - 0109 Expression 1640 XL - 010a Perfection 1640SU - 010b Perfection 1240 - 010c Perfection 640 - 010e Perfection 1680 - 010f Perfection 1250 - 0110 Perfection 1650 - 0112 Perfection 2450 + 0107 ES-2000 [Expression 1600U] + 0108 CC-700 + 0109 ES-8500 [Expression 1640 XL] + 010a GT-8700/GT-8700F [Perfection 1640SU/1640SU PHOTO] + 010b GT-7700U [Perfection 1240U] + 010c GT-6700U [Perfection 640] + 010d CC-500L + 010e ES-2200 [Perfection 1680] + 010f GT-7200U [Perfection 1250/1250 PHOTO] + 0110 GT-8200U/GT-8200UF [Perfection 1650/1650 PHOTO] + 0112 GT-9700F [Perfection 2450 PHOTO] 0114 Perfection 660 - 0116 Perfection 3170 (GT-9400) - 0118 Perfection 4180 (GF-F600) - 0119 Perfection 4490 Photo - 011a 1000 ICS - 011b Perfection 2400 Photo - 011c Perfection 3200 - 011d Perfection 1260 Photo - 011e Perfection 1660 Photo - 011f Perfection 1670 - 0120 Perfection 1270 scanner - 0121 Perfection 2480/2580 Photo [GT-F500] - 0122 Perfection 3590 scanner - 0126 GT-15000 (ES-7000) - 0128 Perfection 4870 (GT-X700) - 0129 Expression 10000XL (ES-10000G) - 012a Perfection 4990 Photo scanner - 012b GT-2500 (ES-H300) - 012c Perfection V700 Photo (GT-X900) - 012d Perfection V10/V100 (GT-S600/F650) - 012f Perfection V350 (GT-F700) - 0130 Perfection V500 (GT-X770) - 0131 Perfection V300 - 0136 GT-S80 (ES-D400) - 0137 GT-S50 (ES-D200) + 0116 GT-9400UF [Perfection 3170] + 0118 GT-F600 [Perfection 4180] + 0119 GT-X750 [Perfection 4490 Photo] + 011a CC-550L [1000 ICS] + 011b GT-9300UF [Perfection 2400 PHOTO] + 011c GT-9800F [Perfection 3200] + 011d GT-7300U [Perfection 1260/1260 PHOTO] + 011e GT-8300UF [Perfection 1660 PHOTO] + 011f GT-8400UF [Perfection 1670/1670 PHOTO] + 0120 GT-7400U [Perfection 1270] + 0121 GT-F500/GT-F550 [Perfection 2480/2580 PHOTO] + 0122 GT-F520/GT-F570 [Perfection 3590 PHOTO] + 0126 ES-7000H [GT-15000] + 0128 GT-X700 [Perfection 4870] + 0129 ES-10000G [Expression 10000XL] + 012a GT-X800 [Perfection 4990 PHOTO] + 012b ES-H300 [GT-2500] + 012c GT-X900 [Perfection V700/V750 Photo] + 012d GT-F650 [GT-S600/Perfection V10/V100] + 012e GT-F670 [Perfection V200 Photo] + 012f GT-F700 [Perfection V350] + 0130 GT-X770 [Perfection V500] + 0131 GT-F720 [GT-S620/Perfection V30/V300 Photo] + 0133 GT-1500 [GT-D1000] + 0135 GT-X970 + 0136 ES-D400 [GT-S80] + 0137 ES-D200 [GT-S50] + 0138 ES-H7200 [GT-20000] + 013a GT-X820 [Perfection V600 Photo] + 0142 GT-F730 [GT-S630/Perfection V33/V330 Photo] + 0143 GT-S55 + 0144 GT-S85 0202 Receipt Printer M129C 0401 CP 800 Digital Camera 0402 PhotoPC 850z @@ -3598,38 +3695,38 @@ 0509 JVC PIX-MC10 0601 Stylus Photo 875DC Card Reader 0602 Stylus Photo 895 Card Reader - 0801 Stylus CX5200/CX5400/CX6600 - 0802 Stylus CX3200 + 0801 CC-600PX [Stylus CX5200/CX5400/CX6600] + 0802 CC-570L [Stylus CX3100/CX3200] 0803 Printer (Composite Device) 0804 Storage Device - 0805 Stylus CX6400 - 0806 Stylus Photo RX600/610 + 0805 Stylus CX6300/CX6400 + 0806 PM-A850 [Stylus Photo RX600/610] 0807 Stylus Photo RX500/510 - 0808 Stylus CX5200 + 0808 Stylus CX5200/CX5300/CX5400 0809 Storage Device - 080a Storage Device - 080c ME100 + 080a F-3200 + 080c ME100 [Stylus CX1500] 080d Stylus CX4500/4600 - 080e CX-3500/3600/3650 MFP - 080f Stylus Photo RX425 scanner - 0810 Stylus Photo RX700 (PM-A900) - 0811 Stylus Photo RX620 all-in-one + 080e PX-A550 [CX-3500/3600/3650 MFP] + 080f Stylus Photo RX420/RX425/RX430 + 0810 PM-A900 [Stylus Photo RX700] + 0811 PM-A870 [Stylus Photo RX620/RX630] 0812 MFP Composite Device 0813 Stylus CX6500/6600 - 0814 (PM-A700) - 0815 AcuLaser CX11 (LP-A500) + 0814 PM-A700 + 0815 LP-A500 [AcuLaser CX1] 0816 Printer (Composite Device) - 0817 (LP-M5500) + 0817 LP-M5500/LP-M5500F 0818 Stylus CX3700/CX3800/DX3800 - 0819 Stylus CX4700/CX4800/DX4800 (PX-A750) - 081a Stylus Photo RX520/RX530 (PM-A750) + 0819 PX-A650 [Stylus CX4700/CX4800/DX4800/DX4850] + 081a PM-A750 [Stylus Photo RX520/RX530] 081b MFP Composite Device - 081c Stylus Photo RX640/RX650 (PM-A890) - 081d (PM-A950) + 081c PM-A890 [Stylus Photo RX640/RX650] + 081d PM-A950 081e MFP Composite Device 081f Stylus CX7700/7800 - 0820 CX4200 MP scanner - 0821 MFP Composite Device + 0820 Stylus CX4100/CX4200/DX4200 + 0821 Stylus CX5700F/CX5800F 0822 Storage Device 0823 MFP Composite Device 0824 Storage Device @@ -3665,6 +3762,7 @@ 0851 Stylus SX410 0856 Stylus SX515W 085c Stylus SX125 + 087b Stylus Photo PX730WD (Printer, Scanner, Copier) 04b9 Rainbow Technologies, Inc. 0300 SafeNet USB SuperPro/UltraPro 1000 iKey 1000 Token @@ -4248,7 +4346,9 @@ 5f02 NEXiO Sync 5f03 NEXiO Sync 5f04 NEXiO Sync + 5f05 STORY Station 1TB 6032 G2 Portable hard drive + 60b3 M2 Portable Hard Drive 60c4 M2 Portable Hard Drive USB 3.0 6601 Mobile Phone 6602 Galaxy @@ -4286,7 +4386,9 @@ 684e Wave (GT-S8500) 685b GT-I9100 Phone [Galaxy S II] (mass storage mode) 685e GT-I9100 Phone [Galaxy S II] (USB Debugging mode) - 6860 GT-I9100 Phone [Galaxy S II] + 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) 6875 GT-B3710 Standalone LTE device (Commercial) 6876 GT-B3710 LTE Modem 6877 Galaxy S @@ -4380,12 +4482,15 @@ b175 4-Port Hub b1aa Webcam-101 b1b4 Lenovo Integrated Camera + b1b9 Asus Integrated Webcam b1cf Lenovo Integrated Camera b217 Lenovo Integrated Camera (0.3MP) b221 integrated camera b230 Integrated HP HD Webcam + b257 Lenovo Integrated Camera b26b Sony Visual Communication Camera b272 Lenovo EasyCamera + b2b9 Lenovo Integrated Camera UVC 04f3 Elan Microelectronics Corp. 01a4 Wireless Keyboard 0210 AM-400 Hama Optical Mouse @@ -4588,6 +4693,7 @@ 01ea DCP-7030 01eb MFC-7320 01f4 MFC-5890CN + 0223 DCP-365CN 1000 Printer 1002 Printer 2002 PTUSB Printing @@ -4724,7 +4830,9 @@ 0815 Nostromo n52 HID SpeedPad Mouse Wheel 0826 ErgoFit Wireless Optical Mouse (HID) 0980 HID UPS Battery + 1004 F9L1004 802.11n Surf N300 XR Wireless Adapter [Realtek RTL8192CU] 1102 F7D1102 N150/Surf Micro Wireless Adapter v1000 [Realtek RTL8188CUS] + 1103 F9L1103 N750 DB 802.11abgn 2x3:3 [Ralink RT3573] 1202 F5U120-PC Parallel Printer Port 1203 F5U120-PC Serial Port 2103 F7D2102 802.11n N300 Micro Wireless Adapter v3000 [Realtek RTL8192CU] @@ -4733,6 +4841,7 @@ 3201 F1DF102U/F1DG102U Flip KVM 4050 ZD1211B 5055 F5D5055 Gigabit Network Adapter [AX88xxx] + 6050 F6D6050 802.11abgn Wireless Adapter [Broadcom BCM4323] 6051 F5D6051 802.11b Wireless Network Adapter [ZyDAS ZD1201] 615a F7D4101 / F9L1101 802.11abgn Wireless Adapter [Broadcom BCM4323] 7050 F5D7050 Wireless G Adapter v1000/v2000 [Intersil ISL3887] @@ -4748,7 +4857,7 @@ 815c F5D8053 N Wireless USB Adapter v3000 [Ralink RT2870] 815f F5D8053 N Wireless USB Adapter v6000 [Realtek RTL8192SU] 825a F5D8055 N+ Wireless Adapter v1000 [Ralink RT2870] - 825b F5D8055 N+ Wireless Adapter v2000 [Ralink RT3070] + 825b F5D8055 N+ Wireless Adapter v2000 [Ralink RT3072] 845a F7D2101 802.11n Surf & Share Wireless Adapter v1000 [Realtek RTL8192SU] 905b F5D9050 Wireless G+ MIMO Network Adapter v3000 [Ralink RT2573] 905c F5D9050 Wireless G+ MIMO Network Adapter v4000 [Ralink RT2573] @@ -4756,6 +4865,7 @@ 935b F6D4050 N150 Enhanced Wireless Network Adapter v2000 [Ralink RT3070] 945a F7D1101 v1 Basic Wireless Adapter [Realtek RTL8188SU] 945b F7D1101 v2 Basic Wireless Adapter [Ralink RT3370] + d321 Dynex DX-NUSB 802.11bgn Wireless Adapter 050e Neon Technology, Inc. 050f KC Technology, Inc. 0001 Hub @@ -5108,6 +5218,7 @@ 035c NWZ-A726/A728/A729 0382 Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1) 0385 Walkman NWZ-E436F + 0387 Sony IC Recorder (P) 03bc Webbie HD - MHS-CM1 03d3 DR-BT100CX 03d5 PlayStation Move motion controller @@ -5349,6 +5460,7 @@ 0003 Device Bay Controller 056e Elecom Co., Ltd 0002 29UO Mouse + 0072 Mouse 200c LD-USB/TX 4002 Laneed 100Mbps Ethernet LD-USB/TX [pegasus] 4005 LD-USBL/TX @@ -5375,8 +5487,10 @@ 1253 Zoom V.92 Faxmodem 1300 SoftK56 Data Fax Voice CARP 1301 Modem Enumerator + 1328 TrendNet TFM-561 modem 2000 SoftGate 802.11 Adapter 2002 SoftGate 802.11 Adapter + 262a tm5600 Video & Audio Grabber Capture 8390 WinFast PalmTop/Novo TV Video 8392 WinFast PalmTop/Novo TV Video cafe AccessRunner ADSL Modem @@ -5487,7 +5601,7 @@ 62ff AVM Fritz!WLAN USB (in CD-ROM-mode) 8401 Fritz!WLAN N [Atheros AR9001U] 8402 Fritz!WLAN N 2.4 [Atheros AR9001U] - 8403 Fritz!WLAN N v2 [Atheros AR7010] + 8403 Fritz!WLAN N v2 [Atheros AR9271] 84ff AVM Fritz!WLAN USB N (in CD-ROM-mode) 057d Shark Multimedia, Inc. 057e Nintendo Co., Ltd @@ -5659,6 +5773,7 @@ 0008 Fujifilm MemoryCard ReaderWriter 0220 U2SCX SCSI Converter b000 REX-USB60 + b020 REX-USB60F 0585 FlashPoint Technology, Inc. 0001 Digital Camera 0002 Digital Camera @@ -5688,9 +5803,12 @@ 3400 ZyAIR B-220 IEEE 802.11b Adapter 3401 ZyAIR G-220 802.11bg 3402 ZyAIR G-220F 802.11bg + 3403 AG-200 802.11abg Wireless Adapter [Atheros AR5523] 3407 G-200 v2 802.11bg + 3408 G-260 802.11bg 3409 AG-225H 802.11bg 340a M-202 802.11bg + 340c G-270S 802.11bg Wireless Adapter [Atheros AR5523] 340f G-220 v2 802.11bg 3410 ZyAIR G-202 802.11bg 3412 802.11bg @@ -5699,9 +5817,11 @@ 3416 NWD-210N 802.11b/g/n-draft wireless adapter 3417 NWD271N 802.11n Wireless Adapter [Atheros AR9001U-(2)NG] 3418 NWD211AN 802.11abgn Wireless Adapter [Ralink RT2870] + 3419 G-220 v3 802.11bg Wireless Adapter [ZyDAS ZD1211B] 341a NWD-270N Wireless N-lite USB Adapter 341e NWD2105 802.11bgn Wireless Adapter [Ralink RT3070] 341f NWD2205 802.11n Wireless N Adapter [Realtek RTL8192CU] + 343e N220 802.11bgn Wireless Adapter 0587 America Kotobuki Electronics Industries, Inc. 0588 Sapien Design 0589 Victron @@ -5742,11 +5862,11 @@ 6360 Multimedia Card Reader 6361 Multimedia Card Reader 6362 Flash Card Reader/Writer - 6364 AU6476 Card Reader Controller + 6364 AU6477 Card Reader Controller 6366 Multi Flash Reader 6377 Multimedia Card Reader 6386 Memory Card - 6387 Transcend JetFlash Flash Drive + 6387 Flash Drive 6390 USB 2.0-IDE bridge 9213 MacAlly Kbd Hub 9215 AU9814 Hub @@ -6014,11 +6134,13 @@ 129e iPod Touch 4.Gen 129f iPad 2 12a0 iPhone 4S + 12a2 iPad 2 (3G; 64GB) 1300 iPod Shuffle 1301 iPod Shuffle 2.Gen 1302 iPod Shuffle 3.Gen 1303 iPod Shuffle 4.Gen 1401 Modem + 1402 Ethernet Adapter [A1277] 8202 HCF V.90 Data/Fax Modem 8203 Bluetooth HCI 8204 Bluetooth HCI [Bluetooth 2.0 + EDR, built-in] @@ -6042,9 +6164,15 @@ 8509 FaceTime HD Camera 911c Hub in A1082 [Cinema HD Display 23"] 912f Hub in 30" Cinema Display + 9215 Studio Display 15" + 9217 Studio Display 17" + 9218 Cinema Display 23" + 9219 Cinema Display 20" 921c A1082 [Cinema HD Display 23"] + 921e Cinema Display 24" 9221 30" Cinema Display 9227 Thunderbolt Display + 9232 Cinema HD Display 30" ffff Bluetooth in DFU mode - Driver 05ad Y.C. Cable U.S.A., Inc. 05ae Synopsys, Inc. @@ -6143,6 +6271,7 @@ 1810 Pavilion Webcam [R5U870] 1812 Pavilion Webcam 1814 HD Webcam + 1820 Integrated Webcam 1830 Visual Communication Camera VGP-VCC2 [R5U870] 1832 Visual Communication Camera VGP-VCC3 [R5U870] 1833 Visual Communication Camera VGP-VCC2 [R5U870] @@ -6160,6 +6289,7 @@ 18b0 Sony Vaio Integrated Webcam 18b1 Sony Vaio Integrated Webcam 18b3 Sony Vaio Integrated Webcam + 18b5 Sony Vaio Integrated Webcam 2201 RDC-7 Camera 2202 Caplio RR30 2203 Caplio 300G @@ -6467,6 +6597,7 @@ 0716 USB 2.0 Multislot Card Reader/Writer 0717 All-in-1 Card Reader 0718 IDE/SATA Adapter + 0719 SATA adapter 0723 GL827L SD/MMC/MS Flash Card Reader 0726 SD Card Reader 0727 microSD Reader/Writer @@ -6571,6 +6702,7 @@ 1006 Japanese Keyboard - 260U 2101 Keyboard 2231 KSK-6001 UELX Keyboard + 2270 Gigabyte K8100 Aivia Gaming Keyboard 5811 ACK-571U Wireless Keyboard 5903 Japanese Keyboard - 595U 6001 SolidTek USB 2p HUB @@ -6607,6 +6739,7 @@ 061b Promptus Communications, Inc. 061c Act Labs, Ltd 061d Quatech, Inc. + c020 SSU-100 061e Nissei Electric Co. 0001 nissei 128DE-USB - 0010 nissei 128DE-PNA - @@ -7236,17 +7369,17 @@ 0009 Monitor Control 06ca Newer Technology, Inc. 06cb Synaptics, Inc. - 0001 HID Device - 0002 HID Device - 0003 HID Device + 0001 TouchPad + 0002 Integrated TouchPad + 0003 cPad 0005 Touchpad/FPS - 0006 HID Device - 0007 HID Device - 0008 HID Device + 0006 TouchScreen + 0007 USB Styk + 0008 WheelPad 0009 Composite TouchPad and TrackPoint 000e HID Device - 0010 Composite Human Interface Device - 0013 Human Interface Device + 0010 Wireless TouchPad + 0013 DisplayPad 06cc Terayon Communication Systems 0101 Cable Modem 0102 Cable Modem @@ -7288,6 +7421,8 @@ 012a USA-49Wlc serial adapter 0201 UIA-10 Digital Media Remote [Cypress AN2131SC] 0202 UIA-11 Digital Media Remote +06ce Contec + 8311 COM-1(USB)H 06cf SpheronVR AG 1010 PanoCam 10 1012 PanoCam 12/12X @@ -7349,6 +7484,7 @@ a191 Instant VideoXpress a337 Mini DigitalTV a701 DVD Xpress + a708 saa7114H video input card (Instant VideoMPX) b337 Mini DigitalTV b701 DVD Xpress B 06e4 Alcatel Microelectronics @@ -7714,6 +7850,7 @@ 0005 Cyber Power UPS 0501 CP1500 AVR UPS 0765 X-Rite, Inc. + 5001 Huey PRO Colorimeter d094 X-Rite DTP94 [Quato Silver Haze Pro] 0766 Jess-Link Products Co., Ltd 0204 TopSpeed Cyberlink Remote Control @@ -7891,11 +8028,13 @@ 00b3 DVD Multi-plus unit LDR-H443U2 0105 LAN-TX/U1H2 10/100 Ethernet Adapter [pegasus II] 010c Realtek RTL8187 Wireless 802.11g 54Mbps Network Adapter + 0160 LAN-GTJ/U2A 0162 LAN-WN22/U2 Wireless LAN Adapter 0163 LAN-WN12/U2 Wireless LAN Adapter 0164 LAN-W150/U2M Wireless LAN Adapter 0166 LAN-W300N/U2 Wireless LAN Adapter 0168 LAN-W150N/U2 Wireless LAN Adapter + 0170 LAN-W300AN/U2 Wireless LAN Adapter 078b Happ Controls, Inc. 0010 Driving UGCI 0020 Flying UGCI @@ -7963,7 +8102,9 @@ 0018 Wireless LAN USB-11 mini 2 001a ULUSB-11 Key 001c CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887] + 002e CG-WLUSB2GPX [Ralink RT2571W] 002f CG-WLUSB2GNL + 0031 CG-WLUSB2GS 802.11bg [Atheros AR5523] 003c CG-WLUSB2GNL 003f CG-WLUSB300AGN 0041 CG-WLUSB300GNS @@ -8124,6 +8265,8 @@ 07bd Webgear, Inc. 07be Veridicom 07c0 Code Mercenaries Hard- und Software GmbH + 1113 JoyWarrior24F8 + 1116 JoyWarrior24F14 1121 The Claw 1500 IO-Warrior 40 1501 IO-Warrior 24 @@ -8303,11 +8446,12 @@ 3a0f DWA-130 802.11n Wireless N Adapter(rev.D) [Atheros AR9170+AR9102] 3a10 DWA-126 802.11n Wireless Adapter [Atheros AR9271] 3b01 AirPlus G DWL-G122 Wireless Adapter(rev.D) [Marvell 88W8338+88W8010] - 3b10 RangeBooster N Adapter + 3b10 DWA-142 RangeBooster N Adapter [Marvell 88W8362+88W8060] 3b11 DWA-130 802.11n Wireless N Adapter(rev.A1) [Marvell 88W8362+88W8060] 3c03 AirPlus G DWL-G122 Wireless Adapter(rev.C1) [Ralink RT2571W] 3c04 WUA-1340 3c05 EH103 Wireless G Adapter + 3c06 DWA-111 802.11bg Wireless Adapter [Ralink RT2571W] 3c07 DWA-110 Wireless G Adapter(rev.A1) [Ralink RT2571W] 3c09 DWA-140 RangeBooster N Adapter(rev.B1) [Ralink RT2870] 3c0a DWA-140 RangeBooster N Adapter(rev.B2) [Ralink RT3072] @@ -8379,7 +8523,8 @@ 0802 Mako Technologies, LLC 0803 Zoom Telephonics, Inc. 1300 V92 Faxmodem - 4310 Wireless-G + 4310 4410a Wireless-G Adapter [Intersil ISL3887] + 4410 4410b Wireless-G Adapter [ZyDAS ZD1211B] 5241 Cable Modem 5551 DSL Modem 9700 2986L FaxModem @@ -8525,7 +8670,7 @@ b522 SMCWUSBS-N2 EZ Connect N Wireless Adapter [Ralink RT2870] bb01 BlueExpert Bluetooth Device c003 802.11b Wireless Adapter - c501 Zoom Wireless-G + c501 Zoom 4410 Wireless-G [Intersil ISL3887] c561 802.11a/g Wireless Adapter d522 Speedport W 102 Stick IEEE 802.11n USB 2.0 Adapter e501 ZD1211B @@ -8563,6 +8708,7 @@ 9001 WN111(v2) RangeMax Next Wireless [Atheros AR9170+AR9101] 9010 WNDA3100v1 802.11abgn [Atheros AR9170+AR9104] 9011 WNDA3100v2 802.11abgn [Broadcom BCM4323] + 9012 WNDA4100 802.11abgn 3x3:3 [Ralink RT3573] 9018 WNDA3200 802.11abgn Wireless Adapter [Atheros AR7010+AR9280] 9020 WNA3100(v1) Wireless-N 300 [Broadcom BCM43231] 9030 WNA1100 Wireless-N 150 [Atheros AR9271] @@ -9275,6 +9421,7 @@ 1624 DataTraveler G2 4GB Pen Drive 1625 DataTraveler 101 II 162a DataTraveler 112 4GB Pen Drive + 1642 DT101 G2 1643 DataTraveler G3 4GB 1653 Data Traveler 100 G2 8 GiB 0954 RPM Systems Corp. @@ -9284,6 +9431,8 @@ 0957 Agilent Technologies, Inc. 0200 E-Video DC-350 Camera 0202 E-Video DC-350 Camera + 0518 82357B GPIB Interface + 1745 Test and Measurement Device (IVI) 0958 CompuLink Research, Inc. 0959 Cologne Chip AG 2bd0 Intelligent ISDN (Ver. 3.60.04) @@ -9318,6 +9467,8 @@ 097b Knudsen Engineering, Ltd 097c Marunix Co., Ltd 097d Rosun Technologies, Inc. +097e Biopac Systems Inc. + 0035 MP35 v1.0 097f Barun Electronics Co., Ltd 0981 Oak Technology, Ltd 0984 Apricorn @@ -9408,6 +9559,7 @@ 09da A4 Tech Co., Ltd 0006 Optical Mouse WOP-35 / Trust 450L Optical Mouse 000a Optical Mouse Opto 510D + 000e X-F710F Optical Mouse 3xFire Gaming Mouse 0018 Trust Human Interface Device 001a Wireless Mouse & RXM-15 Receiver 002a Wireless Optical Mouse NB-30 @@ -9859,8 +10011,9 @@ 1060 OPEN NT1 Plus II 0acc Koga Electronics Co. 0acd ID Tech - 0401 ID TECH Spectrum III Hybrid Smartcard Reader - 0630 ID TECH Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC + 0300 IDT1221U RS-232 Adapter + 0401 Spectrum III Hybrid Smartcard Reader + 0630 Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC 0ace ZyDAS 1201 ZD1201 802.11b 1211 ZD1211 802.11g @@ -9967,10 +10120,14 @@ 1774 Gobi Wireless Modem (QDL mode) 1776 Gobi Wireless Modem 1779 My Cinema U3100 Mini Plus [AF9035A] - 1784 USB-N13 802.11n Network Adapter [Ralink RT3072] + 1784 USB-N13 802.11n Network Adapter (rev. A1) [Ralink RT3072] 1786 USB-N10 802.11n Network Adapter [Realtek RTL8188SU] 1791 WL-167G v3 802.11n Adapter [Realtek RTL8188SU] 179d USB-N53 802.11abgn Network Adapter [Ralink RT3572] + 179e Eee Note EA800 (network mode) + 179f Eee Note EA800 (tablet mode) + 17a1 Eee Note EA800 (mass storage mode) + 17ab USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU] 6101 Cable Modem 620a Remote NDIS Device b700 Broadcom Bluetooth 2.1 @@ -10022,7 +10179,7 @@ 1602 ZyXEL ZyAIR B200 802.11b Adapter 1612 AIR.Mate 2@net 802.11b Adapter 1613 802.11b Wireless LAN Adapter - 1620 Allnet USB 2.0 Wireless Network Adapter + 1620 Allnet Wireless Network Adapter [Envara WiND512] 1630 QuickWLAN 802.11bg 5630 802.11bg 6630 ZD1211 @@ -10035,6 +10192,7 @@ 0011 Crossam2+USB IR commander 0b43 Play.com, Inc. 0003 PS2 Controller Converter + 0005 GameCube Adaptor 0b47 Sportbug.com, Inc. 0b48 TechnoTrend AG 1003 Technotrend/Hauppauge USB-Nova @@ -10170,7 +10328,7 @@ 0302 U10H010 802.11b Wireless Adapter [Intersil PRISM 3] 6098 USB Cable Modem 0bb3 Ofuji Technology -0bb4 High Tech Computer Corp. +0bb4 HTC (High Tech Computer Corp.) 00ce mmO2 XDA GSM/GPRS Pocket PC 00cf SPV C500 Smart Phone 0a01 PocketPC Sync @@ -10346,6 +10504,7 @@ 0c13 Diamond 0c1f Sony Ericsson XPERIA X1 0c5f Snap + 0c86 Sensation 0c87 Desire (debug) 0c8d EVO 4G (debug) 0c91 Vision @@ -10374,8 +10533,10 @@ 2000 Storage Adapter V3 (TPP) 2200 FreeAgent Go FW 2300 Expansion Portable + 3332 Expansion 5021 FreeAgent GoFlex USB 2.0 5031 FreeAgent GoFlex USB 3.0 + 50a5 FreeAgent GoFlex Desk USB 3.0 0bc3 IPWireless, Inc. 0001 UMTS-TDD (TD-CDMA) modem 0bc4 Microcube Corp. @@ -10445,6 +10606,7 @@ 8187 RTL8187 Wireless Adapter 8189 RTL8187B Wireless 802.11g 54Mbps Network Adapter 8192 RTL8192U 802.11n Wireless Adapter + 8193 RTL8192DU 802.11an WLAN Adapter 8197 RTL8187B Wireless Adapter 8198 RTL8187B Wireless Adapter 0bdb Ericsson Business Mobile Networks BV @@ -10468,6 +10630,7 @@ 0be6 Dong Guan Humen Wonderful Wire Cable Factory 0bed Silicon Labs 1100 MEI (TM) Cashflow-SC Bill/Voucher Acceptor + 1101 Series 2000 Combo Acceptor 0bee LTK Industries, Ltd 0bef Way2Call Communications 0bf0 Pace Micro Technology PLC @@ -10714,6 +10877,7 @@ 641d 1.3 MPixel Integrated Webcam 6480 Sonix 1.3 MP Laptop Integrated Webcam 64bd Sony Visual Communication Camera + 7402 TEMPerHUM Temperature & Humidity Sensor 8000 DC31VC 8006 Dual Mode Camera (8006 VGA) 800a Vivitar Vivicam3350B @@ -10728,7 +10892,57 @@ 0c4c Needham's Electronics 0021 EMP-21 Universal Programmer 0c52 Sealevel Systems, Inc. - 2101 Serial Converter + 2101 SeaLINK+232 + 2102 SeaLINK+485 + 2103 SeaLINK+232I + 2104 SeaLINK+485I + 2211 SeaPORT+2/232 (Port 1) + 2212 SeaPORT+2/485 (Port 1) + 2213 SeaPORT+2 (Port 1) + 2221 SeaPORT+2/232 (Port 2) + 2222 SeaPORT+2/485 (Port 2) + 2223 SeaPORT+2 (Port 2) + 2411 SeaPORT+4/232 (Port 1) + 2412 SeaPORT+4/485 (Port 1) + 2413 SeaPORT+4 (Port 1) + 2421 SeaPORT+4/232 (Port 2) + 2422 SeaPORT+4/485 (Port 2) + 2423 SeaPORT+4 (Port 2) + 2431 SeaPORT+4/232 (Port 3) + 2432 SeaPORT+4/485 (Port 3) + 2433 SeaPORT+4 (Port 3) + 2441 SeaPORT+4/232 (Port 4) + 2442 SeaPORT+4/485 (Port 4) + 2443 SeaPORT+4 (Port 4) + 2811 SeaLINK+8/232 (Port 1) + 2812 SeaLINK+8/485 (Port 1) + 2813 SeaLINK+8 (Port 1) + 2821 SeaLINK+8/232 (Port 2) + 2822 SeaLINK+8/485 (Port 2) + 2823 SeaLINK+8 (Port 2) + 2831 SeaLINK+8/232 (Port 3) + 2832 SeaLINK+8/485 (Port 3) + 2833 SeaLINK+8 (Port 3) + 2841 SeaLINK+8/232 (Port 4) + 2842 SeaLINK+8/485 (Port 4) + 2843 SeaLINK+8 (Port 4) + 2851 SeaLINK+8/232 (Port 5) + 2852 SeaLINK+8/485 (Port 5) + 2853 SeaLINK+8 (Port 5) + 2861 SeaLINK+8/232 (Port 6) + 2862 SeaLINK+8/485 (Port 6) + 2863 SeaLINK+8 (Port 6) + 2871 SeaLINK+8/232 (Port 7) + 2872 SeaLINK+8/485 (Port 7) + 2873 SeaLINK+8 (Port 7) + 2881 SeaLINK+8/232 (Port 8) + 2882 SeaLINK+8/485 (Port 8) + 2883 SeaLINK+8 (Port 8) + 9020 SeaLINK+422 + a02a SeaLINK+8 (Port 1+2) + a02b SeaLINK+8 (Port 3+4) + a02c SeaLINK+8 (Port 5+6) + a02d SeaLINK+8 (Port 7+8) 0c53 ViewPLUS, Inc. 0c54 Glory, Ltd 0c55 Spectrum Digital, Inc. @@ -10749,10 +10963,13 @@ 0c65 Eminence Enterprise Co., Ltd 0c66 Rexon Electronics Corp. 0c67 Concept Telecom, Ltd +0c6c JETI Technische Instrumente GmbH + 04b2 Specbos 1201 0c70 MCT Elektronikladen 0000 USB08 Development board 0c72 PEAK System 000c PCAN-USB + 000d PCAN Pro 0c74 Optronic Laboratories Inc. 0002 OL 700-30 Goniometer 0c76 JMTek, LLC. @@ -10875,6 +11092,7 @@ 0077 Aureon Dual USB 0078 Cinergy T XXS 0086 Cinergy Hybrid XE + 008e Cinergy HTC XS 0097 Cinergy T RC MKII 0099 AfaTech 9015 [Cinergy T Stick Dual] 00a5 Cinergy Hybrid Stick @@ -11046,7 +11264,7 @@ 0d61 Meilu Electronics (Shenzhen) Co., Ltd 0d62 Darfon Electronics Corp. 0003 Smartcard Reader - 0004 Filter Driver + 0004 Keyboard 001c Benq X120 Internet Keyboard Pro 0306 M530 Mouse 0800 Magic Wheel @@ -11377,11 +11595,15 @@ 0045 WL-353 Wireless USB Adapter 150N Nano 0047 WL-352v1 Wireless USB Adapter 300N 002 0048 WL-349v1 Wireless Adapter 150N 002 [Ralink RT3070] + 0049 WL-356 Wireless Adapter 300N 004a WL-358v1 Wireless Micro USB Adapter 300N X3 002 004b WL-349v3 Wireless Micro Adapter 150N X1 [Realtek RTL8192SU] 004c WL-352 802.11n Adapter [Realtek RTL8191SU] 0050 WL-349v4 Wireless Micro Adapter 150N X1 [Ralink RT3370] + 0056 LN-031 10/100/1000 Ethernet Adapter 005d WLA-2000 v1.001 WLAN [RTL8191SU] + 0060 WLA-4000 802.11bgn [Ralink RT3072] + 0062 WLA-5000 802.11abgn [Ralink RT3572] 061c LN-028 Network USB 2.0 Adapter 21f4 44 St Bluetooth Device 2200 Sitecom bluetooth2.0 class 2 dongle CN-512 @@ -11470,6 +11692,7 @@ 0e3b Mansella, Ltd 0e41 Line6, Inc. 4147 TonePort GX + 4156 POD HD Desktop 4250 BassPODxt 4252 BassPODxt Pro 4642 BassPODxt Live @@ -11486,6 +11709,8 @@ 1097 Gamester Controller 2390 Games Jtech Controller 7288 funkey reader +0e50 TechnoData Interware + 0002 Matrixlock Dongle (HID) 0e55 Speed Dragon Multimedia, Ltd 110a Tanic S110-SG1 + ISSC IS1002N [Slow Infra-Red (SIR) & Bluetooth 1.2 (Class 2) Adapter] 110b MS3303H USB-to-Serial Bridge @@ -11506,6 +11731,7 @@ 0009 HWUN2 Hi-Gain Wireless-150N Adapter w/ Upgradable Antenna [Ralink RT2770] 000b HWDN2 Hi-Gain Wireless-150N Dish Adapter [Ralink RT2770] 0013 HWUN3 Hi-Gain Wireless-N Adapter [Ralink RT3070] + 0015 HWDN2 Rev. E Hi-Gain Wireless-150N Dish Adapter [Realtek RTL8191SU] 0017 HAWNU1 Hi-Gain Wireless-150N Network Adapter with Range Amplifier [Ralink RT3070] 0018 Wireless-N Network Adapter [Ralink RT2870] 400b UF100 10/100 Network Adapter @@ -11800,6 +12026,7 @@ 00d4 C902 [MTP] 00d9 C702 Phone 0112 W995 Walkman Phone + 0166 Xperia Mini Pro 1010 WMC Modem 10af V640i Phone [PictBridge] 10d4 C902 Phone [PictBridge] @@ -11849,7 +12076,11 @@ e12e X10i Phone e133 Vivaz e14f Xperia Arc/X12 + e161 Xperia Ray 0fcf Dynastream Innovations, Inc. + 1003 ANT Development Board + 1004 ANT2USB + 1006 ANT Development Board 0fd0 Tulip Computers B.V. 0fd1 Giant Electronics Ltd. 0fd4 Tenovis GmbH & Co., KG @@ -11978,6 +12209,7 @@ 1038 Ideazon, Inc. 0100 Zboard 1039 devolo AG + 0824 1866 802.11bg [Texas Instruments TNETW1450] 2140 dsl+ 1100 duo 103d Stanton 0100 ScratchAmp @@ -12047,6 +12279,7 @@ 0903 My Book Premium Edition 0910 MyBook Essential External HDD 1001 External Hard Disk [Elements] + 1003 Elements 1000 GB 1010 Elements External HDD 1021 Elements 2TB 1023 Elements SE @@ -12105,6 +12338,7 @@ 3701 Broadband Wireless modem 3702 Pantech PX-500 3714 PANTECH USB MODEM [UM175] + 3716 UMW190 Modem 3eb4 Packet Service Diagnostic Serial Port (WDM) 4101 Packet Service Diagnostic Serial Port (WDM) 4102 Packet Service @@ -12208,11 +12442,20 @@ 80a9 CP210x to UART Bridge Controller 80ca ATM2400 Sensor Device 813f tams EasyControl + 8149 West Mountain Radio Computerized Battery Analyzer + 814a West Mountain Radio RIGblaster P&P + 814b West Mountain Radio RIGtalk 818a Silicon Labs FM Radio Reference Design + 81e8 Zephyr BioHarness 8460 Sangoma Wanpipe VoiceTime 8461 Sangoma U100 + 8477 Balluff RFID Reader 86bc C8051F34x AudioDelay [AD-340] - ea60 CP210x Composite Device + 8789 C8051F34x Extender & EDID MGR [EMX-DVI] + ea60 CP210x UART Bridge / myAVR mySmartUSB light + ea61 CP210x UART Bridge + ea70 CP210x UART Bridge + ea80 CP210x UART Bridge 10c5 Sanei Electric, Inc. 819a FM Radio 10c6 Intec, Inc. @@ -12472,7 +12715,8 @@ 1230 Chipidea-Microelectronica, S.A. 1233 Denver Electronics 5677 FUSB200 mp3 player -1234 Unknown +1234 Brain Actuated Technologies + 0000 Neural Impulse Actuator Prototype 1.0 [NIA] ed02 Emotiv EPOC Developer Headset Wireless Dongle 1235 Novation EMS 0001 ReMOTE Audio/XStation @@ -12490,6 +12734,8 @@ 124a AirVast 168b PRISM3 WLAN Adapter 4017 PC-Chips 802.11b Adapter + 4023 WM168g 802.11bg Wireless Adapter [Intersil ISL3886] + 4025 IOGear GWU513 v2 802.11bg Wireless Adapter [Intersil ISL3887] 124b Nyko (Honey Bee) 4d01 Airflo EX Joystick 124c MXI - Memory Experts International, Inc. @@ -12587,6 +12833,7 @@ 12d1 Huawei Technologies Co., Ltd. 1001 E169/E620/E800 HSDPA Modem 1003 E220 HSDPA Modem / E230/E270/E870 HSDPA/HSUPA Modem + 1004 E220 (bis) 1009 U120 1010 ETS2252+ CDMA Fixed Wireless Terminal 1035 U8120 @@ -12596,6 +12843,8 @@ 1406 E1750 140b EC1260 Wireless Data Modem HSD USB Card 1446 E1552/E1800/E173 (HSPA modem) + 14c9 K3770 3G Modem + 14d1 K3770 3G Modem (Mass Storage Mode) 14f1 Gobi 3000 HSPA+ Modem 1501 Pulse 1505 E398 LTE/UMTS/GSM Modem/Networkcard @@ -12688,7 +12937,7 @@ 0401 G2CCD-S with Sony ICX285 CCD 0402 G2CCD2 0403 G2/G3CCD-I KAI CCD - 0404 G2/G3CCD-F KAF CCD + 0404 G2/G3/G4 CCD-F KAF CCD 0410 G1-0400 CCD 0411 G1-0800 CCD 0412 G1-0300 CCD @@ -12738,7 +12987,7 @@ 138e Jungo LTD 9000 Raisonance S.A. STM32 ARM evaluation board 1390 TOMTOM B.V. - 0001 GO 520 T/ONE XL (v9) + 0001 GO 520 T/GO 630/ONE XL (v9) 1391 IdealTEK, Inc. 1000 URTC-1000 1395 Sennheiser Communications @@ -14745,6 +14994,14 @@ 2650 Electronics For Imaging, Inc. [hex] 2659 Sundtek 1101 TNT DVB-T/DAB/DAB+/FM + 1201 FM Transmitter/Receiver + 1202 MediaTV Analog/FM/DVB-T + 1203 MediaTV Analog/FM/DVB-T MiniPCIe + 1204 MediaTV Analog/FM/ATSC + 1205 SkyTV Ultimate V + 1206 MediaTV DVB-T MiniPCIe + 1207 Sundtek HD Capture + 1208 Sundtek SkyTV Ultimate III 2730 Citizen 200f CT-S310 Label printer 2735 DigitalWay diff --git a/src/initscripts/init.d/minidlna b/src/initscripts/init.d/minidlna new file mode 100755 index 0000000..6823067 --- /dev/null +++ b/src/initscripts/init.d/minidlna @@ -0,0 +1,48 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/minidlna +# +# Description : minidlna - UPNP/DLNA streaming server +# +# Authors : Michael Tremer <michael.tremer(a)ipfire.org> +# +# Version : 01.00 +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +case "${1}" in + start) + boot_mesg "Starting minidlna..." + loadproc /usr/sbin/minidlna + ;; + + stop) + boot_mesg "Stopping minidlna..." + killproc /usr/sbin/minidlna + ;; + + reload) + boot_mesg "Reloading minidlna..." + reloadproc /usr/sbin/minidlna + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc /usr/sbin/minidlna + ;; + + *) + echo "Usage: ${0} {start|stop|reload|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/minidlna diff --git a/src/initscripts/init.d/network-vlans b/src/initscripts/init.d/network-vlans new file mode 100755 index 0000000..88733e6 --- /dev/null +++ b/src/initscripts/init.d/network-vlans @@ -0,0 +1,101 @@ +#!/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) 2012 IPFire Team <info(a)ipfire.org> # +# # +############################################################################ + +CONFIG_FILE="/var/ipfire/ethernet/vlans" + +# Skip immediately if no configuration file has been found. +[ -e "${CONFIG_FILE}" ] || exit 0 + +eval $(readhash ${CONFIG_FILE}) + +# This is start or stop. +action=${1} + +for interface in green0 blue0 orange0; do + case "${interface}" in + green*) + PARENT_DEV=${GREEN_PARENT_DEV} + VLAN_ID=${GREEN_VLAN_ID} + MAC_ADDRESS=${GREEN_MAC_ADDRESS} + ;; + blue*) + PARENT_DEV=${BLUE_PARENT_DEV} + VLAN_ID=${BLUE_VLAN_ID} + MAC_ADDRESS=${BLUE_MAC_ADDRESS} + ;; + orange*) + PARENT_DEV=${ORANGE_PARENT_DEV} + VLAN_ID=${ORANGE_VLAN_ID} + MAC_ADDRESS=${ORANGE_MAC_ADDRESS} + ;; + esac + + case "${action}" in + start) + # Check if the interface does already exists. + # If so, we skip creating it. + if [ -d "/sys/class/net/${interface}" ]; then + echo "Interface ${interface} already exists." + continue + fi + + # Check if the parent interface exists. + if [ -z "${PARENT_DEV}" ] || [ ! -d "/sys/class/net/${PARENT_DEV}" ]; then + echo "${interface}: Parent device is not set or does not exist: ${PARENT_DEV}" + continue + fi + + if [ -z "${VLAN_ID}" ]; then + echo "${interface}: You did not set the VLAN ID." + continue + fi + + echo "Creating VLAN interface ${interface}..." + vconfig add ${PARENT_DEV} ${VLAN_ID} + ip link set ${PARENT_DEV}.${VLAN_ID} name ${interface} + + if [ -n "${MAC_ADDRESS}" ]; then + ip link set ${interface} address ${MAC_ADDRESS} + fi + + # Bring up the parent device. + ip link set ${PARENT_DEV} up + ;; + + stop) + if [ ! -e "/proc/net/vlan/${interface}" ]; then + echo "${interface} is not a VLAN interface. Skipping." + continue + fi + + echo "Removing VLAN interface ${interface}..." + ip link set ${interface} down + vconfig rem ${interface} + ;; + + *) + echo "Invalid action: ${action}" + exit 1 + ;; + esac +done diff --git a/src/paks/minidlna/install.sh b/src/paks/minidlna/install.sh new file mode 100644 index 0000000..5080157 --- /dev/null +++ b/src/paks/minidlna/install.sh @@ -0,0 +1,32 @@ +#!/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(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +[ -d /var/mp3 ] || ( mkdir /var/mp3 && chown nobody.nobody /var/mp3 ) + +start_service ${NAME} + +ln -svf ../init.d/minidlna /etc/rc.d/rc0.d/K00minidlna +ln -svf ../init.d/minidlna /etc/rc.d/rc3.d/S99minidlna +ln -svf ../init.d/minidlna /etc/rc.d/rc6.d/K00minidlna diff --git a/src/paks/minidlna/uninstall.sh b/src/paks/minidlna/uninstall.sh new file mode 100644 index 0000000..bc59838 --- /dev/null +++ b/src/paks/minidlna/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(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +remove_files +rm -rf /etc/rc.d/rc*.d/*minidlna diff --git a/src/paks/minidlna/update.sh b/src/paks/minidlna/update.sh new file mode 100644 index 0000000..d5e6116 --- /dev/null +++ b/src/paks/minidlna/update.sh @@ -0,0 +1,25 @@ +#!/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(a)ipfire.org>. # +# # +############################################################################ +# +./uninstall.sh +./install.sh diff --git a/src/patches/flac-1.2.1-asm.patch b/src/patches/flac-1.2.1-asm.patch new file mode 100644 index 0000000..932a761 --- /dev/null +++ b/src/patches/flac-1.2.1-asm.patch @@ -0,0 +1,73 @@ +diff -up flac-1.2.1/src/libFLAC/stream_decoder.c.asm flac-1.2.1/src/libFLAC/stream_decoder.c +--- flac-1.2.1/src/libFLAC/stream_decoder.c.asm 2007-09-13 17:38:05.000000000 +0200 ++++ flac-1.2.1/src/libFLAC/stream_decoder.c 2008-01-29 10:32:17.000000000 +0100 +@@ -421,7 +421,7 @@ static FLAC__StreamDecoderInitStatus ini + #ifdef FLAC__CPU_IA32 + FLAC__ASSERT(decoder->private_->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32); + #ifdef FLAC__HAS_NASM +-#if 1 /*@@@@@@ OPT: not clearly faster, needs more testing */ ++#if 0 /*@@@@@@ OPT: not clearly faster, needs more testing */ + if(decoder->private_->cpuinfo.data.ia32.bswap) + decoder->private_->local_bitreader_read_rice_signed_block = FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap; + #endif +diff -up flac-1.2.1/src/libFLAC/ia32/lpc_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/lpc_asm.nasm +--- flac-1.2.1/src/libFLAC/ia32/lpc_asm.nasm.asm 2007-03-22 05:13:05.000000000 +0100 ++++ flac-1.2.1/src/libFLAC/ia32/lpc_asm.nasm 2008-01-29 10:34:09.000000000 +0100 +@@ -1507,5 +1507,5 @@ cident FLAC__lpc_restore_signal_asm_ia32 + end + + %ifdef OBJ_FORMAT_elf +- section .note.GNU-stack noalloc ++ section .note.GNU-stack progbits noalloc noexec nowrite align=1 + %endif +diff -up flac-1.2.1/src/libFLAC/ia32/Makefile.am.asm flac-1.2.1/src/libFLAC/ia32/Makefile.am +--- flac-1.2.1/src/libFLAC/ia32/Makefile.am.asm 2007-04-04 02:01:13.000000000 +0200 ++++ flac-1.2.1/src/libFLAC/ia32/Makefile.am 2008-03-17 14:04:37.000000000 +0100 +@@ -37,7 +37,6 @@ STRIP_NON_ASM = sh $(top_srcdir)/strip_n + + noinst_LTLIBRARIES = libFLAC-asm.la + libFLAC_asm_la_SOURCES = \ +- bitreader_asm.nasm \ + cpu_asm.nasm \ + fixed_asm.nasm \ + lpc_asm.nasm \ +diff -up flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm +--- flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm.asm 2007-03-30 02:54:53.000000000 +0200 ++++ flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm 2008-01-29 10:32:57.000000000 +0100 +@@ -564,5 +564,5 @@ cident FLAC__bitreader_read_rice_signed_ + end + + %ifdef OBJ_FORMAT_elf +- section .note.GNU-stack noalloc ++ section .note.GNU-stack progbits noalloc noexec nowrite align=1 + %endif +diff -up flac-1.2.1/src/libFLAC/ia32/fixed_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/fixed_asm.nasm +--- flac-1.2.1/src/libFLAC/ia32/fixed_asm.nasm.asm 2007-03-22 05:13:05.000000000 +0100 ++++ flac-1.2.1/src/libFLAC/ia32/fixed_asm.nasm 2008-01-29 10:33:52.000000000 +0100 +@@ -308,5 +308,5 @@ cident FLAC__fixed_compute_best_predicto + end + + %ifdef OBJ_FORMAT_elf +- section .note.GNU-stack noalloc ++ section .note.GNU-stack progbits noalloc noexec nowrite align=1 + %endif +diff -up flac-1.2.1/src/libFLAC/ia32/cpu_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/cpu_asm.nasm +--- flac-1.2.1/src/libFLAC/ia32/cpu_asm.nasm.asm 2007-03-22 05:13:05.000000000 +0100 ++++ flac-1.2.1/src/libFLAC/ia32/cpu_asm.nasm 2008-01-29 10:33:24.000000000 +0100 +@@ -117,5 +117,5 @@ cident FLAC__cpu_info_extended_amd_asm_i + end + + %ifdef OBJ_FORMAT_elf +- section .note.GNU-stack noalloc ++ section .note.GNU-stack progbits noalloc noexec nowrite align=1 + %endif +diff -up flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm +--- flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm.asm 2007-06-19 22:01:27.000000000 +0200 ++++ flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm 2008-01-29 10:34:40.000000000 +0100 +@@ -155,5 +155,5 @@ cident precompute_partition_info_sums_32 + end + + %ifdef OBJ_FORMAT_elf +- section .note.GNU-stack noalloc ++ section .note.GNU-stack progbits noalloc noexec nowrite align=1 + %endif diff --git a/src/patches/flac-1.2.1-bitreader.patch b/src/patches/flac-1.2.1-bitreader.patch new file mode 100644 index 0000000..9d47af3 --- /dev/null +++ b/src/patches/flac-1.2.1-bitreader.patch @@ -0,0 +1,558 @@ +Index: src/libFLAC/bitreader.c +=================================================================== +RCS file: /cvsroot/flac/flac/src/libFLAC/bitreader.c,v +retrieving revision 1.15 +diff -u -r1.15 bitreader.c +--- src/libFLAC/bitreader.c 28 Feb 2008 05:34:26 -0000 1.15 ++++ src/libFLAC/bitreader.c 14 Mar 2008 11:07:07 -0000 +@@ -69,13 +69,12 @@ + #endif + /* counts the # of zero MSBs in a word */ + #define COUNT_ZERO_MSBS(word) ( \ +- (word) <= 0xffff ? \ +- ( (word) <= 0xff? byte_to_unary_table[word] + 24 : byte_to_unary_table[(word) >> 8] + 16 ) : \ +- ( (word) <= 0xffffff? byte_to_unary_table[word >> 16] + 8 : byte_to_unary_table[(word) >> 24] ) \ ++ word > 0xffffff ? byte_to_unary_table[(word) >> 24] : \ ++ !word ? 32 : \ ++ word > 0xffff ? byte_to_unary_table[word >> 16] + 8 : \ ++ word > 0xff ? byte_to_unary_table[(word) >> 8] + 16 : \ ++ byte_to_unary_table[word] + 24 \ + ) +-/* this alternate might be slightly faster on some systems/compilers: */ +-#define COUNT_ZERO_MSBS2(word) ( (word) <= 0xff ? byte_to_unary_table[word] + 24 : ((word) <= 0xffff ? byte_to_unary_table[(word) >> 8] + 16 : ((word) <= 0xffffff ? byte_to_unary_table[(word) >> 16] + 8 : byte_to_unary_table[(word) >> 24])) ) +- + + /* + * This should be at least twice as large as the largest number of words +Index: src/libFLAC/bitreader.c +=================================================================== +RCS file: /cvsroot/flac/flac/src/libFLAC/bitreader.c,v +retrieving revision 1.15 +diff -u -r1.15 bitreader.c +--- src/libFLAC/bitreader.c 28 Feb 2008 05:34:26 -0000 1.15 ++++ src/libFLAC/bitreader.c 14 Mar 2008 13:19:46 -0000 +@@ -149,6 +148,7 @@ + FLAC__CPUInfo cpu_info; + }; + ++#if FLAC__BYTES_PER_WORD == 4 && FLAC__CPU_IA32 + #ifdef _MSC_VER + /* OPT: an MSVC built-in would be better */ + static _inline FLAC__uint32 local_swap32_(FLAC__uint32 x) +@@ -173,6 +173,15 @@ + done1: + } + } ++#elif __GNUC__ ++static void local_swap32_block_(FLAC__uint32 *start, FLAC__uint32 len) ++{ ++ FLAC__uint32 *end; ++ ++ for(end = start + len; start < end; start++) ++ asm ("bswap %0" : "=r"(*start) : "0"(*start)); ++} ++#endif + #endif + + static FLaC__INLINE void crc16_update_word_(FLAC__BitReader *br, brword word) +@@ -263,7 +272,7 @@ + #if WORDS_BIGENDIAN + #else + end = (br->words*FLAC__BYTES_PER_WORD + br->bytes + bytes + (FLAC__BYTES_PER_WORD-1)) / FLAC__BYTES_PER_WORD; +-# if defined(_MSC_VER) && (FLAC__BYTES_PER_WORD == 4) ++# if FLAC__CPU_IA32 && (__GNUC__ || defined(_MSC_VER)) && FLAC__BYTES_PER_WORD == 4 + if(br->cpu_info.type == FLAC__CPUINFO_TYPE_IA32 && br->cpu_info.data.ia32.bswap) { + start = br->words; + local_swap32_block_(br->buffer + start, end - start); +Index: src/libFLAC/bitreader.c +=================================================================== +RCS file: /cvsroot/flac/flac/src/libFLAC/bitreader.c,v +retrieving revision 1.15 +diff -u -r1.15 bitreader.c +--- src/libFLAC/bitreader.c 28 Feb 2008 05:34:26 -0000 1.15 ++++ src/libFLAC/bitreader.c 17 Mar 2008 15:42:57 -0000 +@@ -803,379 +812,144 @@ + } + + /* this is by far the most heavily used reader call. it ain't pretty but it's fast */ +-/* a lot of the logic is copied, then adapted, from FLAC__bitreader_read_unary_unsigned() and FLAC__bitreader_read_raw_uint32() */ + FLAC__bool FLAC__bitreader_read_rice_signed_block(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter) +-/* OPT: possibly faster version for use with MSVC */ +-#ifdef _MSC_VER + { +- unsigned i; +- unsigned uval = 0; +- unsigned bits; /* the # of binary LSBs left to read to finish a rice codeword */ +- + /* try and get br->consumed_words and br->consumed_bits into register; + * must remember to flush them back to *br before calling other +- * bitwriter functions that use them, and before returning */ +- register unsigned cwords; +- register unsigned cbits; ++ * bitreader functions that use them, and before returning */ ++ unsigned cwords, words, lsbs, msbs, x, y; ++ unsigned ucbits; /* keep track of the number of unconsumed bits in word */ ++ brword b; ++ int *val, *end; + + FLAC__ASSERT(0 != br); + FLAC__ASSERT(0 != br->buffer); + /* WATCHOUT: code does not work with <32bit words; we can make things much faster with this assertion */ + FLAC__ASSERT(FLAC__BITS_PER_WORD >= 32); + FLAC__ASSERT(parameter < 32); +- /* the above two asserts also guarantee that the binary part never straddles more that 2 words, so we don't have to loop to read it */ +- +- if(nvals == 0) +- return true; +- +- cbits = br->consumed_bits; +- cwords = br->consumed_words; ++ /* the above two asserts also guarantee that the binary part never straddles more than 2 words, so we don't have to loop to read it */ + +- while(1) { ++ val = vals; ++ end = vals + nvals; + +- /* read unary part */ +- while(1) { +- while(cwords < br->words) { /* if we've not consumed up to a partial tail word... */ +- brword b = br->buffer[cwords] << cbits; +- if(b) { +-#if 0 /* slower, probably due to bad register allocation... */ && defined FLAC__CPU_IA32 && !defined FLAC__NO_ASM && FLAC__BITS_PER_WORD == 32 +- __asm { +- bsr eax, b +- not eax +- and eax, 31 +- mov i, eax +- } +-#else +- i = COUNT_ZERO_MSBS(b); +-#endif +- uval += i; +- bits = parameter; +- i++; +- cbits += i; +- if(cbits == FLAC__BITS_PER_WORD) { +- crc16_update_word_(br, br->buffer[cwords]); +- cwords++; +- cbits = 0; +- } +- goto break1; +- } +- else { +- uval += FLAC__BITS_PER_WORD - cbits; +- crc16_update_word_(br, br->buffer[cwords]); +- cwords++; +- cbits = 0; +- /* didn't find stop bit yet, have to keep going... */ +- } +- } +- /* at this point we've eaten up all the whole words; have to try +- * reading through any tail bytes before calling the read callback. +- * this is a repeat of the above logic adjusted for the fact we +- * don't have a whole word. note though if the client is feeding +- * us data a byte at a time (unlikely), br->consumed_bits may not +- * be zero. +- */ +- if(br->bytes) { +- const unsigned end = br->bytes * 8; +- brword b = (br->buffer[cwords] & (FLAC__WORD_ALL_ONES << (FLAC__BITS_PER_WORD-end))) << cbits; +- if(b) { +- i = COUNT_ZERO_MSBS(b); +- uval += i; +- bits = parameter; +- i++; +- cbits += i; +- FLAC__ASSERT(cbits < FLAC__BITS_PER_WORD); +- goto break1; +- } +- else { +- uval += end - cbits; +- cbits += end; +- FLAC__ASSERT(cbits < FLAC__BITS_PER_WORD); +- /* didn't find stop bit yet, have to keep going... */ +- } +- } +- /* flush registers and read; bitreader_read_from_client_() does +- * not touch br->consumed_bits at all but we still need to set +- * it in case it fails and we have to return false. +- */ +- br->consumed_bits = cbits; +- br->consumed_words = cwords; +- if(!bitreader_read_from_client_(br)) ++ if(parameter == 0) { ++ while(val < end) { ++ /* read the unary MSBs and end bit */ ++ if(!FLAC__bitreader_read_unary_unsigned(br, &msbs)) + return false; +- cwords = br->consumed_words; +- } +-break1: +- /* read binary part */ +- FLAC__ASSERT(cwords <= br->words); +- +- if(bits) { +- while((br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits < bits) { +- /* flush registers and read; bitreader_read_from_client_() does +- * not touch br->consumed_bits at all but we still need to set +- * it in case it fails and we have to return false. +- */ +- br->consumed_bits = cbits; +- br->consumed_words = cwords; +- if(!bitreader_read_from_client_(br)) +- return false; +- cwords = br->consumed_words; +- } +- if(cwords < br->words) { /* if we've not consumed up to a partial tail word... */ +- if(cbits) { +- /* this also works when consumed_bits==0, it's just a little slower than necessary for that case */ +- const unsigned n = FLAC__BITS_PER_WORD - cbits; +- const brword word = br->buffer[cwords]; +- if(bits < n) { +- uval <<= bits; +- uval |= (word & (FLAC__WORD_ALL_ONES >> cbits)) >> (n-bits); +- cbits += bits; +- goto break2; +- } +- uval <<= n; +- uval |= word & (FLAC__WORD_ALL_ONES >> cbits); +- bits -= n; +- crc16_update_word_(br, word); +- cwords++; +- cbits = 0; +- if(bits) { /* if there are still bits left to read, there have to be less than 32 so they will all be in the next word */ +- uval <<= bits; +- uval |= (br->buffer[cwords] >> (FLAC__BITS_PER_WORD-bits)); +- cbits = bits; +- } +- goto break2; +- } +- else { +- FLAC__ASSERT(bits < FLAC__BITS_PER_WORD); +- uval <<= bits; +- uval |= br->buffer[cwords] >> (FLAC__BITS_PER_WORD-bits); +- cbits = bits; +- goto break2; +- } +- } +- else { +- /* in this case we're starting our read at a partial tail word; +- * the reader has guaranteed that we have at least 'bits' bits +- * available to read, which makes this case simpler. +- */ +- uval <<= bits; +- if(cbits) { +- /* this also works when consumed_bits==0, it's just a little slower than necessary for that case */ +- FLAC__ASSERT(cbits + bits <= br->bytes*8); +- uval |= (br->buffer[cwords] & (FLAC__WORD_ALL_ONES >> cbits)) >> (FLAC__BITS_PER_WORD-cbits-bits); +- cbits += bits; +- goto break2; +- } +- else { +- uval |= br->buffer[cwords] >> (FLAC__BITS_PER_WORD-bits); +- cbits += bits; +- goto break2; +- } +- } +- } +-break2: +- /* compose the value */ +- *vals = (int)(uval >> 1 ^ -(int)(uval & 1)); + +- /* are we done? */ +- --nvals; +- if(nvals == 0) { +- br->consumed_bits = cbits; +- br->consumed_words = cwords; +- return true; ++ *val++ = (int)(msbs >> 1) ^ -(int)(msbs & 1); + } + +- uval = 0; +- ++vals; +- ++ return true; + } +-} +-#else +-{ +- unsigned i; +- unsigned uval = 0; + +- /* try and get br->consumed_words and br->consumed_bits into register; +- * must remember to flush them back to *br before calling other +- * bitwriter functions that use them, and before returning */ +- register unsigned cwords; +- register unsigned cbits; +- unsigned ucbits; /* keep track of the number of unconsumed bits in the buffer */ ++ FLAC__ASSERT(parameter > 0); + +- FLAC__ASSERT(0 != br); +- FLAC__ASSERT(0 != br->buffer); +- /* WATCHOUT: code does not work with <32bit words; we can make things much faster with this assertion */ +- FLAC__ASSERT(FLAC__BITS_PER_WORD >= 32); +- FLAC__ASSERT(parameter < 32); +- /* the above two asserts also guarantee that the binary part never straddles more than 2 words, so we don't have to loop to read it */ ++ cwords = br->consumed_words; ++ words = br->words; + +- if(nvals == 0) +- return true; ++ /* if we've not consumed up to a partial tail word... */ ++ if(cwords >= words) { ++ x = 0; ++ goto process_tail; ++ } ++ ++ ucbits = FLAC__BITS_PER_WORD - br->consumed_bits; ++ b = br->buffer[cwords] << br->consumed_bits; /* keep unconsumed bits aligned to left */ ++ ++ while(val < end) { ++ /* read the unary MSBs and end bit */ ++ x = y = COUNT_ZERO_MSBS(b); ++ if(x == FLAC__BITS_PER_WORD) { ++ x = ucbits; ++ do { ++ /* didn't find stop bit yet, have to keep going... */ ++ crc16_update_word_(br, br->buffer[cwords++]); ++ if (cwords >= words) ++ goto incomplete_msbs; ++ b = br->buffer[cwords]; ++ y = COUNT_ZERO_MSBS(b); ++ x += y; ++ } while(y == FLAC__BITS_PER_WORD); ++ } ++ b <<= y; ++ b <<= 1; /* account for stop bit */ ++ ucbits = (ucbits - x - 1) % FLAC__BITS_PER_WORD; ++ msbs = x; ++ ++ /* read the binary LSBs */ ++ x = b >> (FLAC__BITS_PER_WORD - parameter); ++ if(parameter <= ucbits) { ++ ucbits -= parameter; ++ b <<= parameter; ++ } else { ++ /* there are still bits left to read, they will all be in the next word */ ++ crc16_update_word_(br, br->buffer[cwords++]); ++ if (cwords >= words) ++ goto incomplete_lsbs; ++ b = br->buffer[cwords]; ++ ucbits += FLAC__BITS_PER_WORD - parameter; ++ x |= b >> ucbits; ++ b <<= FLAC__BITS_PER_WORD - ucbits; ++ } ++ lsbs = x; + +- cbits = br->consumed_bits; +- cwords = br->consumed_words; +- ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits; ++ /* compose the value */ ++ x = (msbs << parameter) | lsbs; ++ *val++ = (int)(x >> 1) ^ -(int)(x & 1); + +- while(1) { ++ continue; + +- /* read unary part */ +- while(1) { +- while(cwords < br->words) { /* if we've not consumed up to a partial tail word... */ +- brword b = br->buffer[cwords] << cbits; +- if(b) { +-#if 0 /* is not discernably faster... */ && defined FLAC__CPU_IA32 && !defined FLAC__NO_ASM && FLAC__BITS_PER_WORD == 32 && defined __GNUC__ +- asm volatile ( +- "bsrl %1, %0;" +- "notl %0;" +- "andl $31, %0;" +- : "=r"(i) +- : "r"(b) +- ); +-#else +- i = COUNT_ZERO_MSBS(b); +-#endif +- uval += i; +- cbits += i; +- cbits++; /* skip over stop bit */ +- if(cbits >= FLAC__BITS_PER_WORD) { /* faster way of testing if(cbits == FLAC__BITS_PER_WORD) */ +- crc16_update_word_(br, br->buffer[cwords]); +- cwords++; +- cbits = 0; +- } +- goto break1; +- } +- else { +- uval += FLAC__BITS_PER_WORD - cbits; +- crc16_update_word_(br, br->buffer[cwords]); +- cwords++; +- cbits = 0; +- /* didn't find stop bit yet, have to keep going... */ +- } +- } +- /* at this point we've eaten up all the whole words; have to try +- * reading through any tail bytes before calling the read callback. +- * this is a repeat of the above logic adjusted for the fact we +- * don't have a whole word. note though if the client is feeding +- * us data a byte at a time (unlikely), br->consumed_bits may not +- * be zero. +- */ +- if(br->bytes) { +- const unsigned end = br->bytes * 8; +- brword b = (br->buffer[cwords] & ~(FLAC__WORD_ALL_ONES >> end)) << cbits; +- if(b) { +- i = COUNT_ZERO_MSBS(b); +- uval += i; +- cbits += i; +- cbits++; /* skip over stop bit */ +- FLAC__ASSERT(cbits < FLAC__BITS_PER_WORD); +- goto break1; +- } +- else { +- uval += end - cbits; +- cbits += end; +- FLAC__ASSERT(cbits < FLAC__BITS_PER_WORD); +- /* didn't find stop bit yet, have to keep going... */ +- } ++ /* at this point we've eaten up all the whole words */ ++process_tail: ++ do { ++ if(0) { ++incomplete_msbs: ++ br->consumed_bits = 0; ++ br->consumed_words = cwords; + } +- /* flush registers and read; bitreader_read_from_client_() does +- * not touch br->consumed_bits at all but we still need to set +- * it in case it fails and we have to return false. +- */ +- br->consumed_bits = cbits; +- br->consumed_words = cwords; +- if(!bitreader_read_from_client_(br)) ++ ++ /* read the unary MSBs and end bit */ ++ if(!FLAC__bitreader_read_unary_unsigned(br, &msbs)) + return false; +- cwords = br->consumed_words; +- ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits + uval; +- /* + uval to offset our count by the # of unary bits already +- * consumed before the read, because we will add these back +- * in all at once at break1 +- */ +- } +-break1: +- ucbits -= uval; +- ucbits--; /* account for stop bit */ +- +- /* read binary part */ +- FLAC__ASSERT(cwords <= br->words); +- +- if(parameter) { +- while(ucbits < parameter) { +- /* flush registers and read; bitreader_read_from_client_() does +- * not touch br->consumed_bits at all but we still need to set +- * it in case it fails and we have to return false. +- */ +- br->consumed_bits = cbits; ++ msbs += x; ++ x = ucbits = 0; ++ ++ if(0) { ++incomplete_lsbs: ++ br->consumed_bits = 0; + br->consumed_words = cwords; +- if(!bitreader_read_from_client_(br)) +- return false; +- cwords = br->consumed_words; +- ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits; +- } +- if(cwords < br->words) { /* if we've not consumed up to a partial tail word... */ +- if(cbits) { +- /* this also works when consumed_bits==0, it's just slower than necessary for that case */ +- const unsigned n = FLAC__BITS_PER_WORD - cbits; +- const brword word = br->buffer[cwords]; +- if(parameter < n) { +- uval <<= parameter; +- uval |= (word & (FLAC__WORD_ALL_ONES >> cbits)) >> (n-parameter); +- cbits += parameter; +- } +- else { +- uval <<= n; +- uval |= word & (FLAC__WORD_ALL_ONES >> cbits); +- crc16_update_word_(br, word); +- cwords++; +- cbits = parameter - n; +- if(cbits) { /* parameter > n, i.e. if there are still bits left to read, there have to be less than 32 so they will all be in the next word */ +- uval <<= cbits; +- uval |= (br->buffer[cwords] >> (FLAC__BITS_PER_WORD-cbits)); +- } +- } +- } +- else { +- cbits = parameter; +- uval <<= parameter; +- uval |= br->buffer[cwords] >> (FLAC__BITS_PER_WORD-cbits); +- } + } +- else { +- /* in this case we're starting our read at a partial tail word; +- * the reader has guaranteed that we have at least 'parameter' +- * bits available to read, which makes this case simpler. +- */ +- uval <<= parameter; +- if(cbits) { +- /* this also works when consumed_bits==0, it's just a little slower than necessary for that case */ +- FLAC__ASSERT(cbits + parameter <= br->bytes*8); +- uval |= (br->buffer[cwords] & (FLAC__WORD_ALL_ONES >> cbits)) >> (FLAC__BITS_PER_WORD-cbits-parameter); +- cbits += parameter; +- } +- else { +- cbits = parameter; +- uval |= br->buffer[cwords] >> (FLAC__BITS_PER_WORD-cbits); +- } +- } +- } + +- ucbits -= parameter; +- +- /* compose the value */ +- *vals = (int)(uval >> 1 ^ -(int)(uval & 1)); ++ /* read the binary LSBs */ ++ if(!FLAC__bitreader_read_raw_uint32(br, &lsbs, parameter - ucbits)) ++ return false; ++ lsbs = x | lsbs; + +- /* are we done? */ +- --nvals; +- if(nvals == 0) { +- br->consumed_bits = cbits; +- br->consumed_words = cwords; +- return true; +- } ++ /* compose the value */ ++ x = (msbs << parameter) | lsbs; ++ *val++ = (int)(x >> 1) ^ -(int)(x & 1); ++ x = 0; + +- uval = 0; +- ++vals; ++ cwords = br->consumed_words; ++ words = br->words; ++ ucbits = FLAC__BITS_PER_WORD - br->consumed_bits; ++ b = br->buffer[cwords] << br->consumed_bits; ++ } while(cwords >= words && val < end); ++ } + ++ if(ucbits == 0 && cwords < words) { ++ /* don't leave the head word with no unconsumed bits */ ++ crc16_update_word_(br, br->buffer[cwords++]); ++ ucbits = FLAC__BITS_PER_WORD; + } ++ ++ br->consumed_bits = FLAC__BITS_PER_WORD - ucbits; ++ br->consumed_words = cwords; ++ ++ return true; + } +-#endif + + #if 0 /* UNUSED */ + FLAC__bool FLAC__bitreader_read_golomb_signed(FLAC__BitReader *br, int *val, unsigned parameter) diff --git a/src/patches/flac-1.2.1-cflags.patch b/src/patches/flac-1.2.1-cflags.patch new file mode 100644 index 0000000..032fa5e --- /dev/null +++ b/src/patches/flac-1.2.1-cflags.patch @@ -0,0 +1,45 @@ +diff -up flac-1.2.1/src/libFLAC/Makefile.am.cflags flac-1.2.1/src/libFLAC/Makefile.am +--- flac-1.2.1/src/libFLAC/Makefile.am.cflags 2007-09-14 23:06:17.000000000 +0200 ++++ flac-1.2.1/src/libFLAC/Makefile.am 2008-03-17 14:19:29.000000000 +0100 +@@ -41,7 +41,7 @@ CPUCFLAGS = -faltivec -force_cpusubtype_ + else + # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific + #@@@ PPC optimizations temporarily disabled +-CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM ++CPUCFLAGS = -DFLAC__NO_ASM + endif + endif + +@@ -69,7 +69,7 @@ endif + endif + endif + +-libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@ ++libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@ libFLAC_extracflags.la + + SUBDIRS = $(ARCH_SUBDIRS) include . + +@@ -112,7 +112,10 @@ libFLAC_la_SOURCES = \ + metadata_iterators.c \ + metadata_object.c \ + stream_decoder.c \ +- stream_encoder.c \ + stream_encoder_framing.c \ + window.c \ + $(extra_ogg_sources) ++ ++noinst_LTLIBRARIES = libFLAC_extracflags.la ++libFLAC_extracflags_la_SOURCES = stream_encoder.c ++libFLAC_extracflags_la_CFLAGS = $(AM_CFLAGS) -funroll-loops +diff -up flac-1.2.1/configure.in.cflags flac-1.2.1/configure.in +--- flac-1.2.1/configure.in.cflags 2007-09-13 17:48:42.000000000 +0200 ++++ flac-1.2.1/configure.in 2008-03-17 14:17:08.000000000 +0100 +@@ -301,7 +301,7 @@ else + CPPFLAGS="-DNDEBUG $CPPFLAGS" + if test "x$GCC" = xyes; then + CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS" +- CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS" ++ CFLAGS="-Wall -W -Winline $CFLAGS" + fi + fi + diff --git a/src/patches/flac-1.2.1-gcc43.patch b/src/patches/flac-1.2.1-gcc43.patch new file mode 100644 index 0000000..7fdbf80 --- /dev/null +++ b/src/patches/flac-1.2.1-gcc43.patch @@ -0,0 +1,11 @@ +diff -up flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43 flac-1.2.1/examples/cpp/encode/file/main.cpp +--- flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43 2007-09-13 17:58:03.000000000 +0200 ++++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2008-01-08 10:27:39.000000000 +0100 +@@ -29,6 +29,7 @@ + #endif + + #include <stdio.h> ++#include <string.h> + #include <stdlib.h> + #include "FLAC++/metadata.h" + #include "FLAC++/encoder.h" diff --git a/src/patches/flac-1.2.1-hidesyms.patch b/src/patches/flac-1.2.1-hidesyms.patch new file mode 100644 index 0000000..0f4c104 --- /dev/null +++ b/src/patches/flac-1.2.1-hidesyms.patch @@ -0,0 +1,39 @@ +diff -up flac-1.2.1/src/libFLAC/include/private/ogg_helper.h.hidesyms flac-1.2.1/src/libFLAC/include/private/ogg_helper.h +--- flac-1.2.1/src/libFLAC/include/private/ogg_helper.h.hidesyms 2007-02-02 07:22:40.000000000 +0100 ++++ flac-1.2.1/src/libFLAC/include/private/ogg_helper.h 2008-01-29 15:27:13.000000000 +0100 +@@ -35,9 +35,13 @@ + #include <ogg/ogg.h> + #include "FLAC/stream_encoder.h" /* for FLAC__StreamEncoder */ + ++__attribute__((__visibility__("hidden"))) + void simple_ogg_page__init(ogg_page *page); ++__attribute__((__visibility__("hidden"))) + void simple_ogg_page__clear(ogg_page *page); ++__attribute__((__visibility__("hidden"))) + FLAC__bool simple_ogg_page__get_at(FLAC__StreamEncoder *encoder, FLAC__uint64 position, ogg_page *page, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderReadCallback read_callback, void *client_data); ++__attribute__((__visibility__("hidden"))) + FLAC__bool simple_ogg_page__set_at(FLAC__StreamEncoder *encoder, FLAC__uint64 position, ogg_page *page, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderWriteCallback write_callback, void *client_data); + + #endif +diff -up flac-1.2.1/src/libFLAC/include/private/bitreader.h.hidesyms flac-1.2.1/src/libFLAC/include/private/bitreader.h +--- flac-1.2.1/src/libFLAC/include/private/bitreader.h.hidesyms 2007-07-10 22:22:19.000000000 +0200 ++++ flac-1.2.1/src/libFLAC/include/private/bitreader.h 2008-01-29 15:27:13.000000000 +0100 +@@ -95,5 +95,6 @@ FLAC__bool FLAC__bitreader_read_golomb_u + FLAC__bool FLAC__bitreader_read_utf8_uint32(FLAC__BitReader *br, FLAC__uint32 *val, FLAC__byte *raw, unsigned *rawlen); + FLAC__bool FLAC__bitreader_read_utf8_uint64(FLAC__BitReader *br, FLAC__uint64 *val, FLAC__byte *raw, unsigned *rawlen); + ++__attribute__((__visibility__("hidden"))) + FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br); + #endif +diff -up flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm.hidesyms flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm +--- flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm.hidesyms 2008-01-29 15:27:13.000000000 +0100 ++++ flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm 2008-01-29 15:28:32.000000000 +0100 +@@ -34,7 +34,7 @@ + + data_section + +-cglobal precompute_partition_info_sums_32bit_asm_ia32_ ++cglobal precompute_partition_info_sums_32bit_asm_ia32_:function hidden + + code_section + diff --git a/src/patches/flac-1.2.1-tests.patch b/src/patches/flac-1.2.1-tests.patch new file mode 100644 index 0000000..89c5921 --- /dev/null +++ b/src/patches/flac-1.2.1-tests.patch @@ -0,0 +1,41 @@ +diff -up flac-1.2.1/test/test_seeking.sh.tests flac-1.2.1/test/test_seeking.sh +--- flac-1.2.1/test/test_seeking.sh.tests 2007-09-11 09:33:04.000000000 +0200 ++++ flac-1.2.1/test/test_seeking.sh 2008-01-29 13:52:03.000000000 +0100 +@@ -103,7 +103,7 @@ tiny_seek_count=100 + if [ "$FLAC__TEST_LEVEL" -gt 1 ] ; then + small_seek_count=10000 + else +- small_seek_count=100000 ++ small_seek_count=100 + fi + + for suffix in '' '-s' ; do +diff -up flac-1.2.1/test/test_streams.sh.tests flac-1.2.1/test/test_streams.sh +--- flac-1.2.1/test/test_streams.sh.tests 2007-06-16 21:58:39.000000000 +0200 ++++ flac-1.2.1/test/test_streams.sh 2008-03-17 13:57:39.000000000 +0100 +@@ -39,6 +39,10 @@ if [ x"$FLAC__TEST_LEVEL" = x ] ; then + FLAC__TEST_LEVEL=1 + fi + ++if [ "$FLAC__TEST_LEVEL" -eq 0 ] ; then ++ exit 0 ++fi ++ + flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" + + run_flac () +diff -up flac-1.2.1/src/test_streams/main.c.tests flac-1.2.1/src/test_streams/main.c +--- flac-1.2.1/src/test_streams/main.c.tests 2007-08-31 07:54:49.000000000 +0200 ++++ flac-1.2.1/src/test_streams/main.c 2008-01-29 13:53:46.000000000 +0100 +@@ -898,9 +898,9 @@ int main(int argc, char *argv[]) + if(!generate_noise("noise.raw", 65536 * 8 * 3)) return 1; + if(!generate_noise("noise8m32.raw", 32)) return 1; + if(!generate_wackywavs()) return 1; +- for(channels = 1; channels <= 8; channels++) { ++ for(channels = 1; channels <= 2; channels++) { + unsigned bits_per_sample; +- for(bits_per_sample = 4; bits_per_sample <= 24; bits_per_sample++) { ++ for(bits_per_sample = 8; bits_per_sample <= 24; bits_per_sample += 8) { + static const unsigned nsamples[] = { 1, 111, 4777 } ; + unsigned samples; + for(samples = 0; samples < sizeof(nsamples)/sizeof(nsamples[0]); samples++) { diff --git a/src/patches/icecream-0.9.7-platform-arm.patch b/src/patches/icecream-0.9.7-platform-arm.patch new file mode 100644 index 0000000..53402f0 --- /dev/null +++ b/src/patches/icecream-0.9.7-platform-arm.patch @@ -0,0 +1,22 @@ +Index: services/scheduler.cpp +=================================================================== +--- services/scheduler.cpp (revision 1310078) ++++ services/scheduler.cpp (working copy) +@@ -52,7 +52,7 @@ + #include "config.h" + #include "bench.h" + +-#define DEBUG_SCHEDULER 0 ++#define DEBUG_SCHEDULER 1 + + /* TODO: + * leak check +@@ -613,6 +613,8 @@ + + platform_map.insert( make_pair( string( "ppc" ), string( "ppc64" ) ) ); + platform_map.insert( make_pair( string( "s390" ), string( "s390x" ) ) ); ++ ++ platform_map.insert( make_pair( string( "armv5tel"), string( "armv7l" ) ) ); + } + + multimap<string, string>::const_iterator end = platform_map.upper_bound( target ); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 83aefc12ddcc59470f151f833df0474ed1617108
by git＠ipfire.org 06 Sep '12

06 Sep '12

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d99f086a5b32d9e433d7964b7e385b43ac5122ac
by git＠ipfire.org 06 Sep '12

06 Sep '12

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, next has been updated via d99f086a5b32d9e433d7964b7e385b43ac5122ac (commit) via 4c92799d546822f43228d0b32c7812fe4ddac1c0 (commit) via 7f02975965c00b67e117c1f6a80e3e8c3baa1eab (commit) via 9c5ef64e0a6e9d7daeb1fa338a021a81d00327e8 (commit) from dcd949d8210ac2fea473ea48a3c042e7ae260d83 (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 d99f086a5b32d9e433d7964b7e385b43ac5122ac Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 6 10:49:56 2012 +0200 core62: add hwdata updates to core. commit 4c92799d546822f43228d0b32c7812fe4ddac1c0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 6 10:45:41 2012 +0200 hwdata: update usb id database to 30072012. commit 7f02975965c00b67e117c1f6a80e3e8c3baa1eab Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 6 10:44:45 2012 +0200 hwdata: update pci id database 06092012. commit 9c5ef64e0a6e9d7daeb1fa338a021a81d00327e8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 6 10:39:05 2012 +0200 GeoIP: update database to 05092012. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{54 => 62}/filelists/GeoIP | 0 config/rootfiles/core/{58 => 62}/filelists/hwdata | 0 lfs/GeoIP | 4 +- src/hwdata/pci.ids | 1158 ++++++++++++++++----- src/hwdata/usb.ids | 451 +++++++-- 5 files changed, 1244 insertions(+), 369 deletions(-) copy config/rootfiles/core/{54 => 62}/filelists/GeoIP (100%) copy config/rootfiles/core/{58 => 62}/filelists/hwdata (100%) Difference in files: diff --git a/config/rootfiles/core/62/filelists/GeoIP b/config/rootfiles/core/62/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/core/62/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/62/filelists/hwdata b/config/rootfiles/core/62/filelists/hwdata new file mode 100644 index 0000000..5a9672f --- /dev/null +++ b/config/rootfiles/core/62/filelists/hwdata @@ -0,0 +1,2 @@ +usr/share/hwdata/pci.ids +usr/share/hwdata/usb.ids diff --git a/lfs/GeoIP b/lfs/GeoIP index aeb358d..41a82e9 100644 --- a/lfs/GeoIP +++ b/lfs/GeoIP @@ -25,7 +25,7 @@ include Config VER = 1.17 -DATVER = 04072012 +DATVER = 05092012 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 = 1395bec12f8a5f0b1e889581271ed5ce +GeoIP.dat-$(DATVER).gz_MD5 = c053f11cb8383fb8f4826591b0cbae3d install : $(TARGET) diff --git a/src/hwdata/pci.ids b/src/hwdata/pci.ids index 27618a6..1beb52d 100644 --- a/src/hwdata/pci.ids +++ b/src/hwdata/pci.ids @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2012.04.04 -# Date: 2012-04-04 03:15:01 +# Version: 2012.09.06 +# Date: 2012-09-06 03:15:02 # # Maintained by Martin Mares <mj(a)ucw.cz> and other volunteers from the # PCI ID Project at http://pci-ids.ucw.cz/. @@ -88,7 +88,6 @@ 04b3 IBM Corp. 4001 Remote System Administration device [RSA2] 050d Belkin -058f Alcor Micro Corporation 05a9 OmniVision 8519 OV519 series 05e3 CyberDoor @@ -122,8 +121,8 @@ 08e6 Gemalto NV 08ff AuthenTec afe4 [Anchor] AF-S2 FingerLoc Sensor Module -0925 First International Computer, Inc. - 1234 VA-502 Mainboard +0925 VIA Technologies, Inc. (Wrong ID) + 1234 VT82C686/A/B USB Controller 093a PixArt Imaging Inc. 010e Innovage Mini Digital Camera 010f SDC-300 Webcam @@ -202,6 +201,7 @@ 7020 USB Controller a0ec Fibre Channel Host Controller a0f0 Advanced System Management Controller + 0e11 b0f3 ProLiant DL360 a0f3 Triflex PCI to ISA Bridge a0f7 PCI Hotplug Controller 8086 002a PCI Hotplug Controller A @@ -325,6 +325,8 @@ 4c53 1080 CT8 mainboard 4c53 1300 P017 mezzanine (32-bit PMC) 4c53 1310 P017 mezzanine (64-bit PMC) + 002f MegaRAID SAS 2208 IOV [Thunderbolt] + 1028 1f3e SPERC 8 0030 53c1030 PCI-X Fusion-MPT Dual Ultra320 SCSI 0e11 00da ProLiant ML 350 1028 0123 LSI Logic 1020/1030 @@ -375,6 +377,11 @@ 0059 MegaRAID SAS 8208ELP/8208ELP 005a SAS1066E PCI-Express Fusion-MPT SAS 005b MegaRAID SAS 2208 [Thunderbolt] + 1000 9265 MegaRAID SAS 9265-8i + 1000 9266 MegaRAID SAS 9266-8i + 1000 9268 MegaRAID SAS 9265CV-8i / 9270CV-8i + 1014 040b ServeRAID M5110 SAS/SATA Controller + 1014 0412 ServeRAID M5110e SAS/SATA Controller 1028 1f2d PERC H810 Adapter 1028 1f30 PERC H710 Embedded 1028 1f31 PERC H710P Adapter @@ -383,10 +390,11 @@ 1028 1f35 PERC H710 Adapter 1028 1f37 PERC H710 Mini (for blades) 1028 1f38 PERC H710 Mini (for monolithics) - 8086 3513 RMS25PB080 RAID Controller + 8086 3513 RMS25CB080 RAID Controller 005c SAS1064A PCI-X Fusion-MPT SAS 005d MegaRAID SAS-3 3108 [Invader] 005e SAS1066 PCI-X Fusion-MPT SAS + 005f MegaRAID SAS-3 3008 [Fury] 0060 MegaRAID SAS 1078 1000 1006 MegaRAID SAS 8888ELP 1000 100a MegaRAID SAS 8708ELP @@ -436,6 +444,7 @@ 0073 MegaRAID SAS 2008 [Falcon] 1000 9240 MegaRAID SAS 9240-8i 1000 9241 MegaRAID SAS 9240-4i + 1000 92a0 MegaRAID SAS 9220-8i 1014 03b1 ServeRAID M1015 SAS/SATA Controller 1028 1f4e PERC H310 Adapter 1028 1f4f PERC H310 Integrated @@ -608,7 +617,9 @@ # nee ATI Technologies Inc. 1002 Advanced Micro Devices [AMD] nee ATI 1314 Wrestler HDMI Audio [Radeon HD 6250/6310] + 174b 1001 Sapphire PURE Fusion Mini 1714 BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series] + 103c 168b ProBook 4535s 3150 M24 1P [Radeon Mobility X600] 103c 0934 nx8220 3151 M24 [FireMV 2400] @@ -788,6 +799,8 @@ 1179 ff50 Satellite P305D-S8995E 1458 4385 GA-MA770-DS3rev2.0 Motherboard 1462 7368 K9AG Neo2 + 15d9 a811 H8DGU + 174b 1001 Sapphire PURE Fusion Mini 17f2 5000 KI690-AM2 Motherboard 4386 SB600 USB Controller (EHCI) 103c 280a DC5750 Microtower @@ -840,6 +853,7 @@ 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO + 174b 1001 Sapphire PURE Fusion Mini 4392 SB7x0/SB8x0/SB9x0 SATA Controller [Non-RAID5 mode] 4393 SB7x0/SB8x0/SB9x0 SATA Controller [RAID5 mode] 4394 SB7x0/SB8x0/SB9x0 SATA Controller [AHCI mode] @@ -848,21 +862,28 @@ 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO + 15d9 a811 H8DGU + 174b 1001 Sapphire PURE Fusion Mini 4397 SB7x0/SB8x0/SB9x0 USB OHCI0 Controller 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO + 15d9 a811 H8DGU + 174b 1001 Sapphire PURE Fusion Mini 4398 SB7x0 USB OHCI1 Controller 1043 82ef M3A78-EH Motherboard + 15d9 a811 H8DGU 4399 SB7x0/SB8x0/SB9x0 USB OHCI2 Controller 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO + 174b 1001 Sapphire PURE Fusion Mini 439c SB7x0/SB8x0/SB9x0 IDE Controller 1043 82ef M3A78-EH Motherboard 439d SB7x0/SB8x0/SB9x0 LPC host controller 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO + 174b 1001 Sapphire PURE Fusion Mini 43a0 SB700/SB800/SB900 PCI to PCI bridge (PCIE port 0) 43a1 SB700/SB800/SB900 PCI to PCI bridge (PCIE port 1) 43a2 SB900 PCI to PCI bridge (PCIE port 2) @@ -1394,12 +1415,14 @@ 5a10 RD890 Northbridge only dual slot (2x16) PCI-e GFX Hydra part 5a11 RD890 Northbridge only single slot PCI-e GFX Hydra part 5a12 RD890 Northbridge only dual slot (2x8) PCI-e GFX Hydra part + 15d9 a811 H8DGU 5a13 RD890 PCI to PCI bridge (external gfx0 port A) 5a14 RD890 PCI to PCI bridge (external gfx0 port B) 5a15 RD890 PCI to PCI bridge (PCI express gpp port A) 5a16 RD890 PCI to PCI bridge (PCI express gpp port B) 5a17 RD890 PCI to PCI bridge (PCI express gpp port C) 5a18 RD890 PCI to PCI bridge (PCI express gpp port D) + 15d9 a811 H8DGU 5a19 RD890 PCI to PCI bridge (PCI express gpp port E) 5a1a RD890 PCI to PCI bridge (PCI express gpp port F) 5a1b RD890 PCI to PCI bridge (PCI express gpp port G) @@ -1407,6 +1430,7 @@ 5a1d RD890 PCI to PCI bridge (external gfx1 port A) 5a1e RD890 PCI to PCI bridge (external gfx1 port B) 5a1f RD890 PCI to PCI bridge (NB-SB link) + 15d9 a811 H8DGU 5a23 RD990 I/O Memory Management Unit (IOMMU) 5a33 Radeon Xpress 200 Host Bridge 5a34 RS480 PCI-X Root Port @@ -1488,26 +1512,30 @@ 5e6d RV410 [Radeon X700 (PCIE)] (Secondary) 148c 2117 PowerColor Bravo X700 5f57 R423 [Radeon X800XT (PCIE)] + 6704 Cayman PRO GL [FirePro V7900] 6707 Cayman LE GL [FirePro V5900] 6718 Cayman XT [Radeon HD 6970] 6719 Cayman PRO [Radeon HD 6950] 671d Antilles [AMD Radeon HD 6990] 671f Cayman [Radeon HD 6900 Series] 6720 Blackcomb [Radeon HD 6900M series] - 6738 Barts XT [ATI Radeon HD 6800 Series] - 6739 Barts PRO [ATI Radeon HD 6800 Series] + 6738 Barts XT [Radeon HD 6800 Series] + 6739 Barts PRO [Radeon HD 6800 Series] + 1043 03b4 EAH6850 [Radeon HD 6850] 673e Barts LE [AMD Radeon HD 6700 Series] 6740 Whistler XT [AMD Radeon HD 6700M Series] 6741 Whistler [AMD Radeon HD 6600M Series] + 106b 00e2 MacBookPro8,2 [Core i7, 15", Late 2011] 6742 Whistler LE [AMD Radeon HD 6625M Graphics] 6743 Whistler [Radeon E6760] 6749 Turks [FirePro V4900] + 674a Turks [AMD FirePro V3900] 6750 Turks [AMD Radeon HD 6570] 6751 Turks [Radeon HD 7600A Series] 6758 Turks [Radeon HD 6670] 6759 Turks [Radeon HD 6570] 675d Turks [Radeon HD 7500 Series] - 6760 Seymour [Radeon HD 6400M Series] + 6760 Caicos [Radeon HD 6400M/7400M Series] 1028 04cc Vostro 3350 6761 Seymour LP [Radeon HD 6430M] 6763 Seymour [Radeon E6460] @@ -1523,6 +1551,9 @@ 6800 WIMBLEDON XT [Radeon HD 7970M] 6818 PITCAIRN [Radeon HD 7800] 6819 PITCAIRN PRO [Radeon HD 7800 Series] + 682f Cape Verde [Radeon HD 7700M Series] + 683d Cape Verde [Radeon HD 7700 Series] + 683f Cape Verde PRO [Radeon HD 7700 Series] 6840 Thames XT/GL [Radeon HD 7600M Series] 6841 Thames [Radeon 7500M/7600M Series] 6843 Thames [Radeon HD 7670M] @@ -1533,7 +1564,8 @@ 688d Cypress [AMD FireStream 9350] 6898 Cypress XT [Radeon HD 5870] 1462 8032 R5870 PM2D1G - 6899 Cypress [Radeon HD 5800 Series] + 6899 Cypress PRO [Radeon HD 5800 Series] + 1043 0330 EAH5850 [Radeon HD5850] 689b Cypress [Radeon HD 6800 Series] 689c Hemlock [Radeon HD 5900 Series] 689e Cypress LE [Radeon HD 5800 Series] @@ -1543,6 +1575,7 @@ 68a8 Broadway [ATI Mobility Radeon HD 6800 Series] 68a9 Juniper XT [FirePro 3D V5800] 68b8 Juniper [Radeon HD 5700 Series] + 106b 00cf MacPro5,1 [Mac Pro 2.8GHz DDR3] 68b9 Juniper [Radeon HD 5600/5700] 68ba Juniper XT [AMD Radeon HD 6000 Series] 68be Juniper [Radeon HD 5700 Series] @@ -1565,7 +1598,7 @@ 68e5 Robson LE [AMD Radeon HD 6300M Series] 68f1 Cedar [FirePro 2460] 68f2 Cedar [FirePro 2270] - 68f9 Cedar PRO [Radeon HD 5450] + 68f9 Cedar PRO [Radeon HD 5450/6350] 1028 010e XPS 8300 68fa EG Cedar [Radeon HD 7300 Series] 700f PCI Bridge [IGP 320M] @@ -1821,6 +1854,7 @@ 95c4 RV620 [Mobility Radeon HD 3400 Series] 1002 95c4 Mobility Radeon HD 3400 95c5 RV620 LE [Radeon HD 3450] + 1028 0342 OptiPlex 980 95c6 RV620 LE AGP [Radeon HD 3450] 95c7 RV620 CE [Radeon HD 3430] 95c9 RV620 PCI [Radeon HD 3450] @@ -1839,6 +1873,7 @@ 9616 RS780L [Radeon HD 3000] 9640 BeaverCreek [Radeon HD 6550D] 9641 BeaverCreek [Mobility Radeon HD 6620G] + 9647 BeaverCreek [Radeon HD 6520G] 964a BeaverCreek [Radeon HD 6530D] 970f RS880 HDMI Audio [Radeon HD 4200 Series] 1043 83a2 M4A785TD Motherboard @@ -1852,6 +1887,7 @@ 1043 843e M5A88-V EVO # Radeon HD 6250 too? 9802 Wrestler [Radeon HD 6310] + 174b 1001 Sapphire PURE Fusion Mini 9804 Wrestler [Radeon HD 6250] 9806 Wrestler [Radeon HD 6320] 9807 Wrestler [Radeon HD 6290] @@ -1878,8 +1914,7 @@ 1028 aa68 XPS 8300 aa80 Cayman/Antilles HDMI Audio [Radeon HD 6900 Series] aa88 Barts HDMI Audio [Radeon HD 6800 Series] -# 6500, 6600 and mobile 6700 series - aa90 Turks HDMI Audio [Radeon HD 6000 Series] + aa90 Turks/Whistler HDMI Audio [Radeon HD 6000 Series] aa98 Caicos HDMI Audio [Radeon HD 6400 Series] 174b aa98 Sapphire HD 6450 1GB DDR3 aaa0 Tahiti XT HDMI Audio [Radeon HD 7970 Series] @@ -1919,8 +1954,11 @@ 1004 0306 QSound ThunderBird PCI Audio Support Registers 122d 1208 DSP368 Audio Support Registers 1483 5022 XWave Thunder 3D Audio Support Registers - 0307 Thunderbird - 0308 Thunderbird + 0307 SAA7785 ThunderBird PCI Audio + 1004 0703 Philips Rhythmic Edge PSC703 + 1004 0705 Philips Seismic Edge PSC705 + 1004 0706 Philips Acoustic Edge PSC706 + 0308 SAA7785 ThunderBird PCI Audio Gameport 0702 VAS96011 [Golden Gate II] 0703 Tollgate 1005 Avance Logic Inc. [ALI] @@ -2386,7 +2424,9 @@ 1418 Family 15h (Models 10h-1fh) Processor Root Port 1419 Family 15h (Models 10h-1fh) I/O Memory Management Unit 1510 Family 14h Processor Root Complex + 174b 1001 Sapphire PURE Fusion Mini 1512 Family 14h Processor Root Port + 174b 1001 Sapphire PURE Fusion Mini 1513 Family 14h Processor Root Port 1514 Family 14h Processor Root Port 1515 Family 14h Processor Root Port @@ -2522,6 +2562,7 @@ 780b Hudson SMBus Controller 780c Hudson IDE Controller 780d Hudson Azalia Controller + 103c 168b Integrated Device Technology, Inc. [IDT] 92HD87B1/3 Audio Processor 780e Hudson LPC Bridge 780f Hudson PCI Bridge 7812 Hudson USB XHCI Controller @@ -2868,6 +2909,7 @@ 1028 028d PowerEdge T410 MGA G200eW WPCM450 1028 029c PowerEdge M710 MGA G200eW WPCM450 1028 02a4 PowerEdge T310 MGA G200eW WPCM450 + 15d9 a811 H8DGU 0533 MGA G200EH 103c 3381 iLO4 0534 G200eR2 @@ -2897,11 +2939,10 @@ 102b ff05 MGA-G100 Productiva AGP Multi-Monitor 110a 001e MGA-G100 AGP 2007 MGA Mistral - 2527 MGA G550 AGP + 2527 Millennium G550 102b 0f83 Millennium G550 102b 0f84 Millennium G550 Dual Head DDR 32Mb 102b 1e41 Millennium G550 -# Clearly the device name should not say AGP anymore... 102b 2300 Millennium G550 LP PCIE 2537 Millenium P650/P750 102b 1820 Millennium P750 64MB @@ -3112,6 +3153,7 @@ 013a Dual Tuner/MPEG Encoder 0194 uPD720200 USB 3.0 Host Controller 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 1043 8413 P8P67 Deluxe Motherboard 1b96 0001 USB 3.0 PCIe Card 01e7 uPD72873 [Firewarden] IEEE1394a OHCI 1.1 Link/2-port PHY Controller @@ -3124,12 +3166,12 @@ 1038 AMP, Inc 1039 Silicon Integrated Systems [SiS] 0001 AGP Port (virtual PCI-to-PCI bridge) - 0002 SG86C202 + 0002 AGP Port (virtual PCI-to-PCI bridge) 0003 AGP Port (virtual PCI-to-PCI bridge) 0004 PCI-to-PCI bridge 0006 85C501/2/3 0008 SiS85C503/5513 (LPC Bridge) - 0009 ACPI + 0009 5595 Power Management Controller 000a PCI-to-PCI bridge 0016 SiS961/2/3 SMBus controller 0018 SiS85C503/5513 (LPC Bridge) @@ -3367,6 +3409,8 @@ 1361 BCM4312 802.11a/b/g WLAN Controller 1371 Broadcom Corporation BCM4312 802.11a/b/g (rev 02) 1717 Intel 82571EB dual 1 Gb Ethernet controller + 179b EliteBook 8470p Notebook + 179d EliteBook 8470p Notebook 2910 E2910A PCIBus Exerciser 2925 E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer 3080 Pavilion ze2028ea @@ -3433,6 +3477,7 @@ 4037 PCIe Local Bus Adapter 403b PCIe Root Port 60e8 NetRAID-2M : ZX1/M (OEM AMI MegaRAID 493) + 780d Hudson Azalia Controller (rev 01) - Soundcard 103e Solliday Engineering 103f Synopsys/Logic Modeling Group 1040 Accelgraphics Inc. @@ -3472,6 +3517,8 @@ 82e8 M3N72-D 8383 P7P55D Series Motherboard 83a4 Motherboard M2N68-AM SE2 +# Onboard audio for M4A89 series motherboards. + 8410 SBx00 [Azalia] 843e M5A88-V EVO # wrong vendor ID (should have been AMD) 9602 RS880 PCI to PCI bridge (int gfx) @@ -3539,6 +3586,7 @@ c825 82C825 [Firebridge 2] c832 82C832 c861 82C861 + c881 82C881 [FireLink] 1394 OHCI Link Controller c895 82C895 c935 EV1935 ECTIVA MachOne PCIAudio d568 82C825 [Firebridge 2] @@ -3654,7 +3702,7 @@ 8024 TSB43AB23 IEEE-1394a-2000 Controller (PHY/Link) 107d 6620 Winfast DV2000 FireWire Controller 1443 8024 FireBoard Blue - 1458 1000 GA-EP45-DS5 Motherboard + 1458 1000 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 8025 TSB82AA2 IEEE-1394b Link Layer Controller 1043 813c P5P series mainboard 1443 8025 FireBoard800 @@ -4344,6 +4392,7 @@ 103c 12dd 4Gb Fibre Channel [AB429A] 2432 ISP2432-based 4Gb Fibre Channel to PCI Express HBA 2532 ISP2532-based 8Gb Fibre Channel to PCI Express HBA + 1077 0167 QME2572 Dual Port FC8 HBA Mezzanine 3022 ISP4022-based Ethernet NIC 3032 ISP4032-based Ethernet IPv6 NIC 4010 ISP4010-based iSCSI TOE HBA @@ -4391,9 +4440,7 @@ 107c LG Electronics [Lucky Goldstar Co. Ltd] 107d LeadTek Research Inc. 0000 P86C850 - 204d [GeForce 7800 GTX] Winfast PX7800 GTX TDH 2134 WinFast 3D S320 II - 2971 [GeForce FX 5900] WinFast A350 TDH MyViVo 6609 Winfast TV 2000 XP RM 6654 Conexant CX23883 [WinFast DTV1800 H] 6f22 WinFast PxTV1200 @@ -4465,7 +4512,6 @@ 1001 Happy Meal 10/100 Ethernet [hme] 1100 RIO EBUS 108e 1100 RIO EBUS on Blade 100 motherboard -# Correction 1101 RIO 10/100 Ethernet [eri] 108e 1101 RIO GEM on Blade 100 motherboard 1102 RIO 1394 @@ -5268,7 +5314,8 @@ 1001 FDC 37C922 a011 83C170QF b106 SMC34C90 -10b9 ALi Corporation +# Split off ALi Corporation in 2003 +10b9 ULi Electronics Inc. 0101 CMI8338/C3DX PCI Audio Device 0111 C-Media CMI8738/C3DX Audio Device (OEM) 10b9 0111 C-Media CMI8738/C3DX Audio Device (OEM) @@ -5485,6 +5532,7 @@ 1623 PCEA4 PCI-Express Dual Port ESCON Adapter 2001 mb86605 200c MB86613L IEEE1394 OHCI 1.0 Controller + 2010 MB86613S IEEE1394 OHCI 1.1 Controller 2019 MB86295S [CORAL P] 201e MB86296S [CORAL PA] 202b MB86297A [Carmine Graphics Controller] @@ -5520,7 +5568,6 @@ 10de NVIDIA Corporation 0008 NV1 [EDGE 3D] 0009 NV1 [EDGE 3D] - 0010 NV2 [Mutara V08] 0020 NV4 [RIVA TNT] 1043 0200 V3400 TNT 1048 0c18 Erazor II SGRAM @@ -5638,6 +5685,7 @@ 10f1 2865 Tomcat K8E (S2865) 1458 0c11 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond + 1462 7125 K8N Neo4-F mainboard 147b 1c1a KN8-Ultra Mainboard 1565 3402 NF4 AM2L Mainboard 0051 CK804 ISA Bridge @@ -5648,6 +5696,7 @@ 10f1 2865 Tomcat K8E (S2865) 1458 0c11 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond + 1462 7125 K8N Neo4-F mainboard 147b 1c1a KN8-Ultra Mainboard 1565 3402 NF4 AM2L Mainboard 0053 CK804 IDE @@ -5655,6 +5704,7 @@ 10f1 2865 Tomcat K8E (S2865) 1458 5002 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond + 1462 7125 K8N Neo4-F mainboard 147b 1c1a KN8-Ultra Mainboard 1565 3402 NF4 AM2L Mainboard 0054 CK804 Serial ATA Controller @@ -5663,6 +5713,7 @@ 10f1 2865 Tomcat K8E (S2865) 1458 b003 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond + 1462 7125 K8N Neo4-F mainboard 147b 1c1a KN8-Ultra Mainboard 1565 5401 NF4 AM2L Mainboard 0055 CK804 Serial ATA Controller @@ -5670,6 +5721,7 @@ 1043 815a K8N4-E or A8N-E Mainboard 10f1 2865 Tomcat K8E (S2865) 1458 b003 GA-K8N Ultra-9 Mainboard + 1462 7125 K8N Neo4-F mainboard 147b 1c1a KN8-Ultra Mainboard 1565 5401 NF4 AM2L Mainboard 0056 CK804 Ethernet Controller @@ -5679,12 +5731,14 @@ 10f1 2865 Tomcat K8E (S2865) 1458 e000 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond + 1462 7125 K8N Neo4-F mainboard 147b 1c1a KN8-Ultra Mainboard 1565 2501 NF4 AM2L Mainboard 0058 CK804 AC'97 Modem 0059 CK804 AC'97 Audio Controller 1043 812a K8N4-E or A8N-E 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 @@ -5693,6 +5747,7 @@ 10f1 2865 Tomcat K8E (S2865) 1458 5004 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond + 1462 7125 K8N Neo4-F mainboard 147b 1c1a KN8-Ultra Mainboard 1565 3402 NF4 AM2L Mainboard 005b CK804 USB Controller @@ -5701,6 +5756,7 @@ 10f1 2865 Tomcat K8E (S2865) 1458 5004 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond + 1462 7125 K8N Neo4-F mainboard 147b 1c1a KN8-Ultra Mainboard 1565 3402 NF4 AM2L Mainboard 005c CK804 PCI Bridge @@ -5712,7 +5768,8 @@ 10f1 2865 Tomcat K8E (S2865) 10f1 2891 Thunder K8SRE Mainboard 1458 5000 GA-K8N Ultra-9 Mainboard - 1462 7100 MSI K8N Diamond + 1462 7100 K8N Diamond Mainboard + 1462 7125 K8N Neo4-F Mainboard 147b 1c1a KN8-Ultra Mainboard 1565 3402 NF4 AM2L Mainboard 005f CK804 Memory Controller @@ -6112,6 +6169,7 @@ 0259 NV25GL [Quadro4 750 XGL] 025b NV25GL [Quadro4 700 XGL] 0260 MCP51 LPC Bridge + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81bc A8N-VM CSM Mainboard 1458 5001 GA-M55plus-S3G @@ -6121,25 +6179,30 @@ 0262 MCP51 LPC Bridge 0263 MCP51 LPC Bridge 0264 MCP51 SMBus + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81bc A8N-VM CSM Mainboard 105b 0cad Winfast 6100K8MB 1462 7207 K8NGM2 series 0265 MCP51 IDE + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81bc A8N-VM CSM Mainboard 1462 7207 K8NGM2 series # Foxconn has used a wrong vendor ID for this one f05b 0cad Winfast 6100K8MB 0266 MCP51 Serial ATA Controller + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81bc A8N-VM CSM Mainboard 1462 7207 K8NGM2 series 0267 MCP51 Serial ATA Controller + 103c 2a34 Pavilion a1677c 1043 81bc A8N-VM CSM Mainboard 1462 7207 K8NGM2 series 0268 MCP51 Ethernet Controller 0269 MCP51 Ethernet Controller + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 8141 A8N-VM CSM Mainboard 1462 7207 K8NGM2 series @@ -6147,16 +6210,19 @@ 026b MCP51 AC97 Audio Controller 105b 0cad Winfast 6100K8MB 026c MCP51 High Definition Audio + 103c 2a34 Pavilion a1677c 103c 30b5 Presario V3242AU 103c 30b7 Presario V6133CL 10de cb84 ASUSTeK Computer Inc. A8N-VM CSM Mainboard 1462 7207 K8NGM2 series 026d MCP51 USB Controller + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81bc A8N-VM CSM Mainboard 105b 0cad Winfast 6100K8MB 1462 7207 K8NGM2 series 026e MCP51 USB Controller + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81bc A8N-VM CSM Mainboard 105b 0cad Winfast 6100K8MB @@ -6164,6 +6230,7 @@ 026f MCP51 PCI Bridge 103c 30b7 Presario V6133CL 0270 MCP51 Host Bridge + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81bc A8N-VM CSM Mainboard 105b 0cad Winfast 6100K8MB @@ -6173,13 +6240,16 @@ 103c 30b5 Presario V3242AU 103c 30b7 Presario V6133CL 0272 MCP51 Memory Controller 0 + 103c 2a34 Pavilion a1677c 105b 0cad Winfast 6100K8MB 027e C51 Memory Controller 2 + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81cd A8N-VM CSM Mainboard 1458 5000 GA-M55plus-S3G 1462 7207 K8NGM2 series 027f C51 Memory Controller 3 + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81cd A8N-VM CSM Mainboard 1458 5000 GA-M55plus-S3G @@ -6224,6 +6294,7 @@ 02e4 G71 [GeForce 7950 GT] 1682 2271 PV-T71A-YDF7 (512MB) 02f0 C51 Host Bridge + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81cd A8N-VM CSM Mainboard 1462 7207 K8NGM2 series @@ -6236,6 +6307,7 @@ 02f6 C51 Host Bridge 02f7 C51 Host Bridge 02f8 C51 Memory Controller 5 + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81cd A8N-VM CSM Mainboard 1458 5000 GA-M55plus-S3G @@ -6246,6 +6318,7 @@ 1458 5000 GA-M55plus-S3G 1462 7207 K8NGM2 series 02fa C51 Memory Controller 0 + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81cd A8N-VM CSM Mainboard 1458 5000 GA-M55plus-S3G @@ -6256,11 +6329,13 @@ 02fd C51 PCI Express Bridge 103c 30b7 Presario V6133CL 02fe C51 Memory Controller 1 + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81cd A8N-VM CSM Mainboard 1458 5000 GA-M55plus-S3G 1462 7207 K8NGM2 series 02ff C51 Host Bridge + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81cd A8N-VM CSM Mainboard 1458 5000 GA-M55plus-S3G @@ -6588,7 +6663,6 @@ 1849 054c ALiveNF7G-HDready, MCP67 Gigabit Ethernet 054d MCP67 Ethernet 054e MCP67 Ethernet -# forcedeth source code from Nvidi 054f MCP67 Ethernet 0550 MCP67 AHCI Controller 1043 8308 M2N68-AM Motherboard @@ -6610,10 +6684,12 @@ 1849 0562 ALiveNF7G-HDready 0563 MCP67 PCI Express Bridge 0568 MCP78S [GeForce 8200] Memory Controller + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 0568 K10N78FullHD-hSLI R3.0 Memory Controller 0569 MCP78S [GeForce 8200] PCI Express Bridge + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 0569 K10N78FullHD-hSLI R3.0 PCI Express Bridge @@ -6733,9 +6809,9 @@ 06cd GF100 [GeForce GTX 470] 06d1 GF100 [Tesla C2050 / C2070] 06d2 GF100 [Tesla M2070] - 06d8 GF100 [Quadro 6000] - 06d9 GF100 [Quadro 5000] - 06dd GF100 [Quadro 4000] + 06d8 GF100GL [Quadro 6000] + 06d9 GF100GL [Quadro 5000] + 06dd GF100GL [Quadro 4000] 06de GF100 [Tesla S2050] 06df GF100 [Tesla M2070Q] 06e0 G98 [GeForce 9300 GE] @@ -6762,18 +6838,22 @@ 06fd G98 [Quadro NVS 295] 06ff G98 [HICx16 + Graphics] 0751 MCP78S [GeForce 8200] Memory Controller + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 0751 K10N78FullHD-hSLI R3.0 Memory Controller 0752 MCP78S [GeForce 8200] SMBus + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 0752 K10N78FullHD-hSLI R3.0 SMBus 0753 MCP78S [GeForce 8200] Co-Processor + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 0753 K10N78FullHD-hSLI R3.0 Co-Processor 0754 MCP78S [GeForce 8200] Memory Controller + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 0754 K10N78FullHD-hSLI R3.0 Memory Controller @@ -6782,18 +6862,22 @@ 1462 7508 K9N2GM-FIH 1849 0759 K10N78FullHD-hSLI R3.0 IDE 075a MCP78S [GeForce 8200] PCI Bridge + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1849 075a K10N78FullHD-hSLI R3.0 PCI Bridge 075b MCP78S [GeForce 8200] PCI Express Bridge + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 075b K10N78FullHD-hSLI R3.0 PCI Express Bridge 075c MCP78S [GeForce 8200] LPC Bridge + 103c 2a9e Pavilion p6310f 1462 7508 K9N2GM-FIH 1849 075c K10N78FullHD-hSLI R3.0 LPC Bridge 075d MCP78S [GeForce 8200] LPC Bridge 1043 82e8 M3N72-D 0760 MCP77 Ethernet + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 0760 K10N78FullHD-hSLI R3.0 Ethernet @@ -6801,31 +6885,38 @@ 0762 MCP77 Ethernet 0763 MCP77 Ethernet 0774 MCP72XE/MCP72P/MCP78U/MCP78S High Definition Audio + 103c 2a9e Pavilion p6310f # has a Realtek ALC1200 HDAudio Codec 1043 82fe M3N72-D 1462 7508 K9N2GM-FIH 1849 3662 K10N78FullHD-hSLI R3.0 High Definition Audio 0778 MCP78S [GeForce 8200] PCI Express Bridge + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 0778 K10N78FullHD-hSLI R3.0 PCI Express Bridge 077a MCP78S [GeForce 8200] PCI Bridge + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 077a K10N78FullHD-hSLI R3.0 PCI Bridge 077b MCP78S [GeForce 8200] OHCI USB 1.1 Controller + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 077b K10N78FullHD-hSLI R3.0 OHCI USB 1.1 Controller 077c MCP78S [GeForce 8200] EHCI USB 2.0 Controller + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 077c K10N78FullHD-hSLI R3.0 EHCI USB 2.0 Controller 077d MCP78S [GeForce 8200] OHCI USB 1.1 Controller + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 077d K10N78FullHD-hSLI R3.0 OHCI USB 1.1 Controller 077e MCP78S [GeForce 8200] EHCI USB 2.0 Controller + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1462 7508 K9N2GM-FIH 1849 077e K10N78FullHD-hSLI R3.0 EHCI USB 2.0 Controller @@ -6901,6 +6992,7 @@ 0845 C77 [GeForce 8200M G] 0846 C77 [GeForce 9200] 0847 C78 [GeForce 9100] + 103c 2a9e Pavilion p6310f 0848 C77 [GeForce 8300] 0849 C77 [GeForce 8200] 1462 7508 K9N2GM-FIH @@ -6972,6 +7064,7 @@ 0a73 GT218 [GeForce 305M] 0a74 GT218 [GeForce G210M] 0a75 GT218 [GeForce 310M] + 0a76 GT218 [ION 2] 0a78 GT218GL [Quadro FX 380 LP] 0a7c GT218 [Quadro FX 380M] 0a80 MCP79 Host Bridge @@ -7038,6 +7131,7 @@ 1462 7508 K9N2GM-FIH 1849 0ad0 K10N78FullHD-hSLI R3.0 IDE 0ad4 MCP78S [GeForce 8200] AHCI Controller + 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D 1849 0ad4 K10N78FullHD-hSLI R3.0 AHCI Controller 0ad8 MCP78S [GeForce 8200] SATA Controller (RAID mode) @@ -7090,55 +7184,82 @@ 1558 8687 CLEVO/KAPOK W860CU 0dd2 GF106 [GeForce GT 445M] 0dd8 GF106GL [Quadro 2000] - 0dda GF106 [Quadro 2000M] +# NVIDIA calls it GF106GML + 0dda GF106GLM [Quadro 2000M] 0de0 GF108 [GeForce GT 440] 0de1 GF108 [GeForce GT 430] 3842 1430 GeForce GT 430 0de2 GF108 [GeForce GT 420] + 0de9 GeForce GT 630M # Not fully sure that it's GF108, might also be GF106. 0deb GF108 [GeForce GT 555M] 0dee GF108 [GeForce GT 415M] + 0def GF108 [Quadro NVS 5400M] 0df0 GF108 [GeForce GT 425M] 0df2 GF108 [GeForce GT 435M] 0df4 GF108 [GeForce GT 540M] 0df5 GF108 [GeForce GT 540M] 0df7 GF108 [GeForce GT 520M] - 0df8 GF108 [Quadro 600] - 0dfa GF108 [Quadro 1000M] - 0e08 HDMI Audio stub +# NVIDIA calls it GL + 0df8 GF108GL [Quadro 600] +# NVIDIA calls it GLM + 0df9 GF108GLM [Quadro 500M] +# NVIDIA calls it GLM + 0dfa GF108GLM [Quadro 1000M] + 0e08 GF119 HDMI Audio Controller 0e09 GF110 High Definition Audio Controller - 0e0a GK104 [Geforce GTX680] - 0e0c GF110 High Definition Audio Controller + 0e0a GK104 HDMI Audio Controller + 0e0c GF114 HDMI Audio Controller 0e22 GF104 [GeForce GTX 460] 1462 2322 N460GTX Cyclone 1GD5/OC 0e3a GF104 [Quadro 3000M] 0e3b GF104 [Quadro 4000M] + 0fd1 GK107 [GeForce GT 650M] 0fd2 GK107 [GeForce GT 640M] + 0ffb GK107 [Quadro K2000M] + 0ffc GK107 [Quadro K1000M] 1040 GF119 [GeForce GT 520] 1050 GF119 [GeForce GT 520M] 1051 GF119 [GeForce GT 520MX] 1056 GF119 [Quadro NVS 4200M] 1057 GF119 [Quadro NVS 4200M] + 105a GF119 [GeForce 610M] 1080 GF110 [GeForce GTX 580] 1081 GF110 [GeForce GTX 570] 10de 087e Leadtek WinFast GTX 570 - 1082 GF114 [GeForce GTX 560 Ti] + 1082 GF110 [GeForce GTX 560 Ti] 1086 GF110 [GeForce GTX 570 HD] + 1087 GF110 [GeForce GTX 560 Ti 448 Cores] 1091 Tesla M2090 1094 Tesla M2075 Dual-Slot Computing Processor Module 1096 Tesla C2075 + 109b GF100GL [Quadro 7000] 10c3 GT218 [GeForce 8400 GS] 10de 066d G98 [GeForce 8400GS] - 10c5 Dell M116N [GeForce 405] - 10d8 GT218 [NVS 300] + 10c5 GT218 [GeForce 405] + 10d8 GT218 [Quadro NVS 300] 1180 GK104 [GeForce GTX 680] - 1200 GF110 [GeForce GTX 560 Ti] + 1183 GK104 [GeForce GTX 660 Ti] + 1188 GK104 [GeForce GTX 690] + 1189 GK104 [GeForce GTX 670] + 11bc GK104 [Quadro K5000M] + 11bd GK104 [Quadro K4000M] + 11be GK104 [Quadro K3000M] + 1200 GF114 [GeForce GTX 560 Ti] 1201 GF114 [GeForce GTX 560] 1205 GF114 [GeForce GTX 460 v2] 1244 GF116 [GeForce GTX 550 Ti] 1245 GF116 [GeForce GTS 450] 1247 GF106 [GeForce GT 555M] 10df Emulex Corporation + 0720 OneConnect NIC (Skyhawk) + 0722 OneConnect iSCSI Initiator (Skyhawk) + 0723 OneConnect iSCSI Initiator + Target (Skyhawk) + 0724 OneConnect FCoE Initiator (Skyhawk) + 0728 OneConnect NIC (Skyhawk-VF) + 072a OneConnect iSCSI Initiator (Skyhawk-VF) + 072b OneConnect iSCSI Initiator + Target (Skyhawk-VF) + 072c OneConnect FCoE Initiator (Skyhawk-VF) 1ae5 LP6000 Fibre Channel Host Adapter e100 Proteus-X: LightPulse IOV Fibre Channel Host Adapter e131 LightPulse 8Gb/s PCIe Shared I/O Fibre Channel Adapter @@ -7284,6 +7405,7 @@ 0885 Realtek 885 High Definition Audio 0888 Realtek 888 High Definition Audio 1028 020d Inspiron 530 + 0892 Realtek 892 High Definition Audio 5209 RTS5209 PCI Express Card Reader 5229 RTS5229 PCI Express Card Reader 5288 Barossa PCI Express Card Reader @@ -7358,6 +7480,7 @@ 8168 RTL8111/8168B PCI Express Gigabit Ethernet controller 1019 8168 MCP73PVT-SM 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 103c 1611 Pavilion DM1Z-3000 1043 11f5 A6J-Q008 1043 16d5 U6V/U31J laptop @@ -7366,14 +7489,14 @@ 1043 83a3 M4A785TD Motherboard 1043 8432 P8P67 and other motherboards 10ec 8168 TEG-ECTX Gigabit PCI-E Adapter [Trendnet] - 1458 e000 GA-EP45-DS5 Motherboard + 1458 e000 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 1462 238c Onboard RTL8111b on MSI P965 Platinum Mainboard 1462 368c K9AG Neo2 1462 7522 X58 Pro-E 1775 11cc CC11/CL11 1849 8168 Motherboard (one of many) 8086 d615 Desktop Board D510MO - 8169 RTL-8169 Gigabit Ethernet + 8169 RTL8169 PCI Gigabit Ethernet Controller 1025 0079 Aspire 5024WLMi 10bd 3202 EP-320G-TX1 32-bit PCI Gigabit Ethernet Adapter 10ec 8169 RTL8169/8110 Family PCI Gigabit Ethernet NIC @@ -7403,6 +7526,7 @@ 8190 RTL8190 802.11n Wireless LAN 8191 RTL8188CE 802.11b/g/n WiFi Adapter 8192 RTL8192E/RTL8192SE Wireless LAN Controller + 8193 RTL8192DE Wireless LAN Controller 8197 SmartLAN56 56K Modem 8199 RTL8187SE Wireless LAN Controller 1462 6894 MN54G2 / MS-6894 Wireless Mini PCIe Card @@ -7566,6 +7690,9 @@ 0007 HPT371/371N 0008 HPT374 0009 HPT372N + 0620 RocketRAID 620 2 Port SATA-III Controller + 0622 RocketRAID 622 2 Port SATA-III Controller + 0640 RocketRAID 640 4 Port SATA-III Controller 1720 RocketRAID 1720 (2x SATA II RAID Controller) 1740 RocketRAID 1740 1742 RocketRAID 1742 @@ -7586,6 +7713,7 @@ 3120 RocketRAID 3120 3220 RocketRAID 3220 3320 RocketRAID 3320 + 4310 RocketRaid 4310 1104 RasterOps Corp. 1105 Sigma Designs, Inc. 1105 REALmagic Xcard MPEG 1/2/3/4 DVD Decoder @@ -7638,6 +7766,7 @@ 1043 836c P7H55 1043 83c7 P5KPL-AM EPU 0409 VX855/VX875 Host Bridge: Host Control + 0410 VX900 Host Bridge: Host Control 0415 VT6415 PATA IDE Host Controller 1043 838f M5A88-V EVO 0501 VT8501 [Apollo MVP4] @@ -7723,6 +7852,7 @@ 1353 VX800/VX820 Error Reporting 1364 CN896/VN896/P4M900 Host Bridge 1409 VX855/VX875 Error Reporting + 1410 VX900 Error Reporting 1571 VT82C576M/VT82C586 1595 VT82C595/97 [Apollo VP2/97] 1732 VT1732 [Envy24 II] PCI Multi-Channel Audio Controller @@ -7747,6 +7877,7 @@ 2353 VX800/VX820 Host Bus Control 2364 CN896/VN896/P4M900 Host Bridge 2409 VX855/VX875 Host Bus Control + 2410 VX900 CPU Bus Controller 287a VT8251 PCI to PCI Bridge 287b VT8251 Host Bridge 287c VT8251 PCIE Root Port @@ -7772,6 +7903,7 @@ 147b 1407 KV8-MAX3 motherboard 182d 201d CN-029 USB2.0 4 port PCI Card 1849 3038 K7VT6 + 19da a179 ZBOX nano VD01 3040 VT82C586B ACPI 3043 VT86C100A [Rhine] 10bd 0000 VT86C100A Fast Ethernet Adapter @@ -7781,6 +7913,7 @@ 0010 0001 IEEE 1394 4port DCST 1394-3+1B 1025 005a TravelMate 290 103c 2a20 Pavilion t3030.de Desktop PC + 103c 2a3b Media Center PC m7590n 1043 808a A8V/A8N/P4P800 series motherboard 1043 81fe M4A series motherboard 1458 1000 GA-7VT600-1394 Motherboard @@ -7884,6 +8017,7 @@ 147b 1407 KV8-MAX3 motherboard 182d 201d CN-029 USB 2.0 4 port PCI Card 1849 3104 K7VT6 motherboard + 19da a179 ZBOX nano VD01 3106 VT6105/VT6106S [Rhine-III] 1106 0105 VT6106S [Rhine-III] 1186 1403 DFE-530TX rev C @@ -7966,6 +8100,7 @@ 3282 K8T800Pro Host Bridge 3287 VT8251 PCI to ISA Bridge 3288 VT8237A/VT8251 HDA Controller + 19da a179 ZBOX VD01 3290 K8M890 Host Bridge 3296 P4M800 Host Bridge 3324 CX700/VX700 Host Bridge @@ -7987,6 +8122,8 @@ 1043 8374 M5A88-V EVO 1043 8384 P8P67 Deluxe Motherboard 3409 VX855/VX875 DRAM Bus Control + 3410 VX900 DRAM Bus Control + 19da a179 ZBOX nano VD01 4149 VIA VT6420 (ATA133) Controller 4204 K8M800 Host Bridge 4208 PT890 Host Bridge @@ -8009,6 +8146,8 @@ 4364 CN896/VN896/P4M900 Host Bridge 4397 VT1708B/1702S/1708S HD audio codec 4409 VX855/VX875 Power Management Control + 4410 VX900 Power Management and Chip Testing Control + 19da a179 ZBOX nano VD01 4428 VT1718S HD Audio Codec 5030 VT82C596 ACPI [Apollo PRO] 5122 VX855/VX875 Chrome 9 HCM Integrated Graphics @@ -8026,12 +8165,15 @@ 5364 CN896/VN896/P4M900 I/O APIC Interrupt Controller 5372 VT8237/8251 Serial ATA Controller 5409 VX855/VX875 APIC and Central Traffic Control + 5410 VX900 APIC and Central Traffic Control 6100 VT85C100A [Rhine II] 6287 SATA RAID Controller 6327 P4M890 Security Device 6353 VX800/VX820 Scratch Registers 6364 CN896/VN896/P4M900 Security Device 6409 VX855/VX875 Scratch Registers + 6410 VX900 Scratch Registers + 19da a179 ZBOX nano VD01 7122 VX900 Graphics [Chrome9 HD] 7204 K8M800 Host Bridge 7205 KM400/KN400/P4M800 [S3 UniChrome] @@ -8056,6 +8198,8 @@ 7353 VX800/VX820 North-South Module Interface Control 7364 CN896/VN896/P4M900 Host Bridge 7409 VX855/VX875 North-South Module Interface Control + 7410 VX900 North-South Module Interface Control + 19da a179 ZBOX nano VD01 8231 VT8231 [PCI-to-ISA Bridge] 8235 VT8235 ACPI 8305 VT8363/8365 [KT133/KM133 AGP] @@ -8064,6 +8208,8 @@ 8391 VT8371 [KX133 AGP] 8400 MVP4 8409 VX855/VX875 Bus Control and Power Management + 8410 VX900 Bus Control and Power Management + 19da a179 ZBOX VD01 8500 KLE133/PLE133/PLE133T 8501 VT8501 [Apollo MVP4 AGP] 8596 VT82C596 [Apollo PRO AGP] @@ -8078,6 +8224,7 @@ 8a26 KL133/KL133A/KM133/KM133A [S3 ProSavage] 8d01 PN133/PN133T [S3 Twister] 8d04 KM266/P4M266/P4M266A/P4N266 [S3 ProSavageDDR] + 9001 VX900 Serial ATA Controller 9530 Secure Digital Memory Card Controller 95d0 SDIO Host Controller a208 PT890 PCI to PCI Bridge Controller @@ -8099,7 +8246,7 @@ 147b 1407 KV8-MAX3 motherboard b198 VT8237/VX700 PCI Bridge b213 VPX/VPX2 I/O APIC Interrupt Controller - b353 VX855/VX875 PCI to PCI Bridge + b353 VX855/VX875/VX900 PCI to PCI Bridge b999 [K8T890 North / VT8237 South] PCI Bridge c208 PT890 PCI to PCI Bridge Controller c238 K8T890 PCI to PCI Bridge Controller @@ -8428,7 +8575,6 @@ 0000 5071 Behold TV 507 RDS 0000 507b Behold TV 507 RDS 0000 5201 Behold TV Columbus -# Deleting vendor name after rereading submit instructions 0070 6701 WinTV HVR-1110 1019 4cb5 Elitegroup ECS TVP3XP FM1236 Tuner Card (NTSC,FM) 1043 0210 FlyTV mini Asus Digimatrix @@ -8440,6 +8586,7 @@ 1131 2001 Proteus Pro [philips reference design] 1131 2018 Tiger reference design 1131 4ee9 MonsterTV Mobile + 1131 7133 Pinnacle PCTV 301i 11bd 002b PCTV Stereo 11bd 002e PCTV 110i (saa7133) 12ab 0800 PURPLE TV @@ -8691,6 +8838,8 @@ 1134 Mercury Computer Systems 0001 Raceway Bridge 0002 Dual PCI to RapidIO Bridge + 000b POET Serial RapidIO Bridge + 000d POET PSDMS Device 1135 Fuji Xerox Co Ltd 0001 Printer controller 1136 Momentum Data Systems @@ -8705,10 +8854,14 @@ 1137 0047 VIC P81E PCIe Ethernet NIC 1137 0048 VIC M81KR Mezzanine Ethernet NIC 1137 004f VIC 1280 Mezzanine Ethernet NIC + 1137 0084 VIC 1240 MLOM Ethernet NIC + 1137 0085 VIC 1225 PCIe Ethernet NIC 0044 VIC Ethernet NIC Dynamic 1137 0047 VIC P81E PCIe Ethernet NIC Dynamic 1137 0048 VIC M81KR Mezzanine Ethernet NIC Dynamic 1137 004f VIC 1280 Mezzanine Ethernet NIC Dynamic + 1137 0084 VIC 1240 MLOM Ethernet NIC Dynamic + 1137 0085 VIC 1225 PCIe Ethernet NIC Dynamic 0045 VIC FCoE HBA 1137 0047 VIC P81E PCIe FCoE HBA 1137 0048 VIC M81KR Mezzanine FCoE HBA @@ -9107,7 +9260,7 @@ 1179 0001 FIR Port Type-DO 117a A-Trend Technology 117b L G Electronics, Inc. -117c Atto Technology +117c ATTO Technology, Inc. 002c SAS RAID Adapter 0030 Ultra320 SCSI Host Adapter 117c 8013 ExpressPCI UL4D @@ -9206,6 +9359,7 @@ 1028 01d7 XPS M1210 1028 01f3 Inspiron 1420 1028 01f5 Dell Inspiron 1501 + 1028 024f Dell Latitude e6500 103c 03b5 Presario V3242AU 103c 30b7 Presario V6133CL 1183 0843 Alienware Aurora m9700 @@ -9218,10 +9372,16 @@ 1043 1967 V6800V 1180 0852 Pavilion 2410us 1324 10cf P7120 - e230 Memory Stick Host Controller + e230 R5U2xx (R5U230 / R5U231 / R5U241) [Memory Stick Host Controller] + e476 CardBus bridge + 1028 040a Latitude E6410 + 1028 040b Latitude E6510 e822 MMC/SD Host Controller + 1028 040a Latitude E6410 1028 040b Latitude E6510 + e823 PCIe SDXC/MMC Host Controller e832 R5C832 PCIe IEEE 1394 Controller + 1028 040a Latitude E6410 1028 040b Latitude E6510 e852 PCIe xD-Picture Card Controller 1181 Telmatics International @@ -9263,6 +9423,8 @@ 4000 DL2000-based Gigabit Ethernet 4001 DGE-550SX PCI-X Gigabit Ethernet Adapter 4300 DGE-528T Gigabit Ethernet Adapter +# rev. B1; RealTek RTL8168E. + 1186 4b10 DGE-560T PCI Express (x1) Gigabit Ethernet Adapter 4302 DGE-530T Gigabit Ethernet Adapter (rev.C1) [Realtek RTL8169] # There are at least 3 revisions of this adapter; 4800 is board revision A1 as far as I can tell, revision B1 is 4c00. 4800 DGE-530T Gigabit Ethernet Adapter (rev 11) @@ -9376,6 +9538,7 @@ 2a01 88W8335 [Libertas] 802.11b/g Wireless 2a02 88W8361 [TopDog] 802.11n Wireless 07d1 3b02 DIR-615 rev. A1 Mini PCI Wireless Module + 1385 7c01 WN511T RangeMax Next 300 Mbps Wireless Notebook Adapter 1385 7e00 WN311T RangeMax Next 300 Mbps Wireless PCI Adapter 1799 801b F5D8011 v2 802.11n N1 Wireless Notebook Card 2a08 88W8362e [TopDog] 802.11a/b/g/n Wireless @@ -9547,7 +9710,7 @@ 6081 MV88SX6081 8-port SATA II PCI-X Controller 6101 88SE6101/6102 single-port PATA133 interface 6111 88SE6111 1-port PATA133(IDE) and 1-port SATA II Controllers - 6121 88SE6121 SATA II Controller + 6121 88SE6121 SATA II / PATA Controller 6141 88SE614x SATA II PCI-E controller 6145 88SE6145 SATA II PCI-E controller 6180 88F6180 [Kirkwood] ARM SoC @@ -9735,14 +9898,17 @@ 5801 USB 5802 USS-312 USB Controller 5803 USS-344S USB Controller - 5811 FW322/323 + 5811 FW322/323 [TrueFire] 1394a Controller + 103c 2a34 Pavilion a1677c + 103c 2a9e Pavilion p6310f 1043 8294 IEEE 1394a Firewire Controller 8086 524c D865PERL mainboard dead 0800 FireWire Host Bus Adapter - 5901 FW643 PCI Express 1394b Controller (PHY/Link) + 5901 FW643 [TrueFire] PCIe 1394b Controller + 11c1 5900 FW643 [TrueFire] PCIe 1394b Controller 1443 0643 FireBoard800-e V.2 - 1546 0643 FWB-PCIE1X20 - 5903 FW533 PCI Express 1394a Controller (PHY/Link) + 1546 0643 FWB-PCIE1X2x + 5903 FW533 [TrueFire] PCIe 1394a Controller 8110 T8110 H.100/H.110 TDM switch 12d9 000c E1/T1 PMXc cPCI carrier card ab10 WL60010 Wireless LAN MAC @@ -10559,6 +10725,7 @@ 8212 IT8212 Dual channel ATA RAID controller 1283 0001 IT/ITE8212 Dual channel ATA RAID controller 8213 IT8213 IDE Controller + 1458 b000 GA-EG45M-DS2H Mainboard 8330 IT8330G 8872 IT8874F PCI Dual Serial Port Controller 8888 IT8888F/G PCI to ISA Bridge with SMB [Golden Gate] @@ -10952,8 +11119,10 @@ 0067 PCI-DAS6070 0068 PCI-DAS6071 006f PCI-DAS6036 + 0070 PCI-DAC6702 0078 PCI-DAS6013 0079 PCI-DAS6014 + 0115 PCIe-DAS1602/16 1308 Jato Technologies Inc. 0001 NetCelerator Adapter 1308 0001 NetCelerator Adapter @@ -11078,6 +11247,13 @@ 1343 Phylon Communications Inc # nee Crucial Technology 1344 Micron Technology Inc + 5150 RealSSD P320h + 5151 RealSSD P320m + 5152 RealSSD P320s + 5153 RealSSD P325m + 5160 RealSSD P420h + 5161 RealSSD P420m + 5163 RealSSD P425m 1345 Arescom Inc 1347 Odetics 1349 Sumitomo Electric Industries, Ltd. @@ -11281,6 +11457,7 @@ 1389 Applicom International 0001 PCI1500PFB [Intelligent fieldbus adaptor] 138a Fusion Micromedia Corp + 003d VFS491 Validity Sensor 138b Tokimec Inc 138c Silicon Reality 138d Future Techno Designs pte Ltd @@ -11538,6 +11715,9 @@ 153b 1144 Aureon 5.1 153b 1170 Aureon 7.1 1681 a000 Gamesurround MUSE XL + 17ab 0604 PSC604 Dynamic Edge + 17ab 0605 PSC605 Sonic Edge + 17ab 7777 PSC605 Sonic Edge 270f 1103 CT-7NJS Ultra motherboard 270f f462 7NJL1 motherboard 584d 3731 Digital X-Mystique @@ -11571,6 +11751,9 @@ 7284 9761 CLARO 7284 9781 CLARO halo 7284 9783 eCLARO + 8828 CM8828 [Oxygen Express] + 8888 CM8888 [Oxygen Express] + 1043 84d5 ROG Xonar Phoebus 9880 CM9880 13f7 Wildfire Communications 13f8 Ad Lib Multimedia Inc @@ -11812,6 +11995,7 @@ 9513 OX16PCI954 (Quad 16950 UART) function 1 (parallel port) 9521 OX16PCI952 (Dual 16950 UART) 9523 OX16PCI952 Integrated Parallel Port + c158 OXPCIe952 Dual 16C950 UART c308 EX-44016 16-port serial 1416 Multiwave Innovation pte Ltd 1417 Convergenet Technologies Inc @@ -12192,7 +12376,7 @@ 8002 VScom 020L 2 port parallel adaptor 8010 VScom 100L 1 port serial adaptor 8011 VScom 110L 1 port serial and 1 port parallel adaptor - 8020 VScom 200L 1 port serial adaptor + 8020 VScom 200L 1 or 2 port serial adaptor 8021 VScom 210L 2 port serial and 1 port parallel adaptor 8028 VScom 200I/200I-SI 2-port serial adapter 8040 VScom 400L 4 port serial adaptor @@ -12281,6 +12465,9 @@ 1028 028d PowerEdge T410 BCM5716 Gigabit Ethernet 1028 02f1 PowerEdge R510 BCM5716 Gigabit Ethernet 163c NetXtreme II BCM5716S Gigabit Ethernet + 163d NetXtreme II BCM57811 10-Gigabit Ethernet + 163e NetXtreme II BCM57811 10 Gigabit Ethernet Multi Function + 163f NetXtreme II BCM57811 10-Gigabit Ethernet Virtual Function 1644 NetXtreme BCM5700 Gigabit Ethernet 1014 0277 Broadcom Vigil B5700 1000Base-T 1028 00d1 Broadcom BCM5700 @@ -12497,6 +12684,9 @@ 1462 590c KT6 Delta-FIS2R (MS-6590) 169d NetLink BCM5789 Gigabit Ethernet PCI Express 16a0 NetLink BCM5785 Fast Ethernet + 16a1 BCM57840 NetXtreme II 10 Gigabit Ethernet + 16a2 BCM57840 NetXtreme II 10/20-Gigabit Ethernet + 16a4 BCM57840 NetXtreme II Ethernet Multi Function # The Broadcom 57800 device has two 1Gig ports and two 10Gig ports. The subsystem information can be used to differentiate. 16a5 NetXtreme II BCM57800 1/10 Gigabit Ethernet Multi Function 1028 1f5c NetXtreme II BCM57800 10-Gigabit Ethernet Multi Function @@ -12715,11 +12905,13 @@ 1737 0066 WPC600N v1 802.11a/b/g/n Wireless-N CardBus Adapter 1737 0068 WEC600N v1 802.11a/b/g/n Wireless-N ExpressCard 4329 BCM4321 802.11b/g/n + 1385 7b00 WN511B RangeMax NEXT Wireless Notebook Adapter 1385 7d00 WN311B RangeMax Next 270 Mbps Wireless PCI Adapter 1737 0058 WPC300N v1 Wireless-N Notebook Adapter 432a BCM4321 802.11an Wireless Network Controller 432b BCM4322 802.11a/b/g/n Wireless LAN Controller 1028 000d Wireless 1510 Wireless-N WLAN Mini-Card + 106b 008e AirPort Extreme 432c BCM4322 802.11b/g/n 1799 d311 Dynex DX-NNBX 802.11n WLAN Cardbus Card 432d BCM4322 802.11an Wireless Network Controller @@ -12734,6 +12926,9 @@ 4358 BCM43227 802.11b/g/n 4359 BCM43228 802.11a/b/g/n 1028 0011 Wireless 1530 Half-size Mini PCIe Card + 103c 182c BCM943228HM4L 802.11a/b/g/n 2x2 Wi-Fi Adapter + 4365 BCM43142 802.11b/g/n + 1028 0016 Wireless 1704 802.11n + BT 4.0 4401 BCM4401 100Base-T 1025 0035 TravelMate 660 103c 08b0 tc1100 tablet @@ -13399,6 +13594,7 @@ 07c0 PVSCSI SCSI Controller 0801 Virtual Machine Interface 15ad 0800 Hypervisor ROM Interface + 1977 HD Audio Controller 15ae Amersham Pharmacia Biotech 15b0 Zoltrix International Ltd 15b1 Source Technology Inc @@ -13627,7 +13823,7 @@ 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 1860 16Gbps FC HBA and/or 10Gbps CNA + 0022 1867/1860: 16Gbps/10Gbps Fabric Adapter 1657 0022 10Gbps CNA - FCOE 1657 0023 10Gbps CNA - LL 1657 0024 16Gbps FC HBA @@ -13828,11 +14024,13 @@ 0777 4005 SR71-15 802.11an Mini PCI Adapter 1186 3a7a DWA-552 802.11n Xtreme N Desktop Adapter (rev A2) 002a AR928X Wireless Network Adapter (PCI-Express) + 0777 4f05 SR71-X 802.11abgn Wireless ExpressCard Adapter [AR9280] 103c 3041 AR5BHB92-H 802.11abgn Wireless Half-size Mini PCIe Card [AR9280] 105b e006 T77H053.00 802.11bgn Wireless Mini PCIe Card [AR9281] 105b e01f T77H047.31 802.11bgn Wireless Half-size Mini PCIe Card [AR9283] 11ad 6600 WN6600A 802.11bgn Wireless Mini PCIe Card [AR9281] 144f 7141 WLL6080 802.11bgn Wireless Mini PCIe Card [AR9281] + 168c 0203 DW1525 802.11abgn WLAN PCIe Card [AR9280] 1a32 0303 EM303 802.11bgn Wireless Mini PCIe Card [AR9281] 1a32 0306 EM306 802.11bgn Wireless Half-size Mini PCIe Card [AR9283] 1a3b 1067 AW-NE771 802.11bgn Wireless Mini PCIe Card [AR9281] @@ -13854,10 +14052,11 @@ 002d AR9227 Wireless Network Adapter 002e AR9287 Wireless Network Adapter (PCI-Express) 0030 AR9300 Wireless LAN adaptor - 103c 1627 HB112AGN 802.11abgn 3x3 Wi-Fi Adapter + 103c 1627 AR9380/HB112 802.11abgn 3×3 Wi-Fi Adapter 1a56 2000 Killer Wireless-N 1102 Half-size Mini PCIe Card [AR9382] 1a56 2001 Killer Wireless-N 1103 Half-size Mini PCIe Card [AR9380] 0032 AR9485 Wireless Network Adapter + 103c 1838 AR9485/HB125 802.11bgn 1×1 Wi-Fi Adapter 0033 AR9580 Wireless Network Adapter 0034 AR9462 Wireless Network Adapter 0207 AR5210 Wireless Network Adapter [AR5000 802.11a] @@ -13894,7 +14093,19 @@ 16c9 EONIC B.V. The Netherlands 16ca CENATEK Inc 0001 Rocket Drive DL -16cd Densitron Technologies +# nee Innocore Gaming Ltd., nee Densitron Gaming Ltd., a division of Densitron Technologies +16cd Advantech Co. Ltd + 0101 DirectPCI SRAM for DPX-11x series + 0102 DirectPCI SRAM for DPX-S/C/E-series + 0103 DirectPCI ROM for DPX-11x series + 0104 DirectPCI ROM for DPX-S/C/E-series + 0105 DirectPCI I/O for DPX-114/DPX-115 + 0106 DirectPCI I/O for DPX-116 + 0107 DirectPCI I/O for DPX-116U + 0108 DirectPCI I/O for DPX-117 + 0109 DirectPCI I/O for DPX-112 + 010a DirectPCI I/O for DPX-C/E-series + 010b DirectPCI I/O for DPX-S series 16ce Roland Corp. 16d5 Acromag, Inc. 0504 PMC-DX504 Reconfigurable FPGA with LVDS I/O @@ -14077,7 +14288,6 @@ 8083 GL880 USB 1.1 UHCI controller 8084 GL880 USB 2.0 EHCI controller 17aa Lenovo - 20b1 ThinkPad T61p 17ab Phillips Components 17af Hightech Information System Ltd. 17b3 Hawking Technologies @@ -14116,6 +14326,7 @@ 17d3 1221 ARC-1221 8-Port PCI-Express to SATA RAID Controller 1300 ARC-1300ix-16 16-Port PCI-Express to SAS Non-RAID Host Adapter 1680 ARC-1680 8 port PCIe/PCI-X to SAS/SATA II RAID Controller + 17d3 1212 ARC-1212 4-Port PCIe to SAS/SATA II RAID Controller 1880 ARC-1880 8/12 port PCIe/PCI-X to SAS/SATA II RAID Controller # nee Neterion Inc., previously S2io Inc. 17d5 Exar Corp. @@ -14159,6 +14370,7 @@ 0011 EN2010 [c.Link] MoCA Network Controller (Coax, MPEG interface) 0021 EN2210 [c.Link] MoCA Network Controller (Coax) 0025 EN2510 [c.Link] MoCA Network Controller (Coax, PCIe interface) + 0027 EN2710 [c.Link] MoCA 2.0 Network Controller (Coax, PCIe interface) 17ee Connect Components Ltd 17f2 Albatron Corp. 17f3 RDC Semiconductor, Inc. @@ -14210,7 +14422,7 @@ 1814 2560 RT2500 Wireless 802.11bg 182d 9073 WL-115 Wireless Network PCI Adapter 185f 22a0 CN-WF513 Wireless Cardbus Adapter - 18eb 5312 Tornado 122 IEEE 802.11g PCI Card-EU + 18eb 5312 WL531P IEEE 802.11g PCI Card-EU 1948 3c00 C54RC v1 Wireless 11g CardBus Adapter 1948 3c01 C54Ri v1 Wireless 11g PCI Adapter 0300 Wireless Adapter Canyon CN-WF511 @@ -14224,7 +14436,7 @@ 1799 700e F5D7000 v6000 Wireless G Desktop Card 1799 701e F5D7010 v6000 Wireless G Notebook Card 17f9 0012 AWLC3026T 802.11g Wireless CardBus Adapter - 1814 2561 EW-7108PCg + 1814 2561 EW-7108PCg/EW-7128g 0302 RT2561/RT61 rev B 802.11g 1186 3a71 DWA-510 Wireless G Desktop Adapter 1186 3c08 AirPlus G DWL-G630 Wireless Cardbus Adapter (rev.E2) @@ -14251,7 +14463,10 @@ 13bd 1057 GN-WS32L-RH Half-size Mini PCIe Card 3091 RT3091 Wireless 802.11n 1T/2R PCIe 3092 RT3092 Wireless 802.11n 2T/2R PCIe - 5360 RT5360 + 3592 RT3592 Wireless 802.11an 2T/2R PCIe + 5360 RT5360 Wireless 802.11n 1T/1R + 1186 3c05 DWA-525 Wireless N 150 Desktop Adapter (rev.A2) + 20f4 703a TEW-703PI N150 Wireless PCI Adapter 5390 RT5390 Wireless 802.11n 1T/1R PCIe 103c 1636 U98Z077.00 Half-size Mini PCIe Card 539f RT5390 [802.11 b/g/n 1T1R G-band PCI Express Single Chip] @@ -14277,6 +14492,7 @@ 08a8 MVC101 SDI 08a9 MVC102 DVI+Audio 08b0 MVC200-DC +1846 Alcatel-Lucent 1849 ASRock Incorporation 184a Thales Computers 1100 MAX II cPLD @@ -14352,7 +14568,6 @@ 18ca XGI Technology Inc. (eXtreme Graphics Innovation) 0020 Z7/Z9 (XG20 core) 0021 Z9s/Z9m (XG21 core) -# duh! Device name, not my name :) 0027 Z11/Z11M 0040 Volari V3XT/V5/V8 0047 Volari 8300 (chip: XP10, codename: XG47) @@ -14419,7 +14634,7 @@ 18f1 Spectrum GmbH 18f4 Napatech A/S 0031 NT20X Network Adapter - 0051 NT20-X Capture Card + 0051 NT20X Capture Card 0061 NT20E Capture Card 0064 NT20E Inline Card 0071 NT4E Capture Card @@ -14428,7 +14643,9 @@ 0091 NT20X Capture Card [New Rev] 00a1 NT4E-STD Capture Card 00a4 NT4E-STD Inline Card - 00c5 NT20E2 Network Adapter + 00c5 NT20E2 Network Adapter 2x10Gb + 00d5 NT40E2-4 Network Adapter 4x10Gb + 00e5 NT40E2-1 Network Adapter 1x40Gb 18f6 NextIO 1000 [Nexsis] Switch Virtual P2P PCIe Bridge 1050 [Nexsis] Switch Virtual P2P PCI Bridge @@ -14443,7 +14660,6 @@ 000b Fastcom 232/8-PCI-335 Async 8-Port RS-232 Serial PCI Adapter 000f Fastcom FSCC 0010 Fastcom GSCC -# Dual Serocco 0011 Fastcom QSSB 0014 SuperFSCC 0015 SuperFSCC-104 @@ -14547,6 +14763,7 @@ 1924 0304 SFE4003-A4 1924 0500 SFE4005-A0 c101 EF1-21022T [EtherFabric] +192a BiTMICRO Networks Inc. 192e TransDimension 1931 Option N.V. 000c Qualcomm MSM6275 UMTS chip @@ -14558,6 +14775,7 @@ 0363 AHA363-PCIe 0364 AHA364-PCIe 0367 AHA367-PCIe + 0370 AHA370-PCIe 1942 ClearSpeed Technology plc e511 Advance X620 accelerator card e521 Advance e620 accelerator card @@ -14629,6 +14847,7 @@ 010b P1012 0110 P1022E 0111 P1022 + 1c7f 5200 EB5200 0118 P1013E 0119 P1013 0128 P1010 @@ -14735,6 +14954,7 @@ 890a Virtual HBA Device 199f Auvitek 8501 AU85X1 PCI REV1.1 + 8521 AU8521 TV card # nee ServerEngines Corp. 19a2 Emulex Corporation 0200 BladeEngine 10Gb PCI-E iSCSI adapter @@ -14840,7 +15060,8 @@ 1a78 0037 FlashMAX PCIe SSD [rev 3D] 1a78 0038 FlashMAX PCIe SSD [rev 4] 1a78 0039 FlashMAX PCIe SSD [rev 4D] - 1a78 0040 FlashMAX PCIe SSD [LP Z1] + 0040 Virident FlashMAX Drive V2 + 1a78 0040 PCIe SSD [LP Z1] 1a84 Commex Technologies 0001 Vulcan SP HT6210 10-Gigabit Ethernet (rev 02) 1a88 MEN Mikro Elektronik @@ -14855,6 +15076,11 @@ 1aae Global Velocity, Inc. 1ab6 CalDigit, Inc. 6201 RAID Card +# Parallels VM virtual devices +1ab8 Parallels, Inc. + 4000 Virtual Machine Communication Interface + 4005 Accelerated Virtual Video Adapter + 4006 Memory Ballooning Controller 1ab9 Espia Srl 1acc Point of View B.V 1ad7 Spectracom Corporation @@ -14863,6 +15089,8 @@ 1ade Spin Master Ltd. 1501 Swipetech barcode scanner 1ae0 Google, Inc. +1ae7 First Wise Media GmbH + 0520 HFC-S PCI A [X-TENSIONS XC-520] 1ae8 Silicon Software GmbH 0a40 microEnable IV-BASE x1 0a41 microEnable IV-FULL x1 @@ -14894,6 +15122,7 @@ 1afa J & W Electronics Co., Ltd. 1b03 Magnum Semiconductor, Inc, 6100 DXT/DXTPro Multiformat Broadcast HD/SD Encoder/Decoder/Transcoder +1b08 MSC Vertriebs GmbH 1b13 Jaton Corp 1b1a K&F Computing Research Co. 0e70 GRAPE @@ -14917,6 +15146,7 @@ 0601 NumaChip N601 0602 NumaChip N602 1b4b Marvell Technology Group Ltd. + 0640 88SE9128 SATA III 6Gb/s RAID Controller 9120 88SE9120 SATA 6Gb/s Controller 9123 88SE9123 PCIe SATA 6.0 Gb/s controller 9125 88SE9125 PCIe SATA 6.0 Gb/s controller @@ -14924,16 +15154,29 @@ 9130 88SE9128 PCIe SATA 6 Gb/s RAID controller with HyperDuo 1043 8438 P8P67 Deluxe Motherboard 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 - 91a4 88SE91A4 SATA 6Gb/s Controller + 91a4 88SE9128 IDE Controller 9480 88SE9480 SAS/SATA 6Gb/s RAID controller 1b55 NetUP Inc. 2a2c Dual DVB-S2-CI card e2e4 Dual DVB-T/C-CI RF card +# 2xHDMI and 2xHD-SDI inputs + e5f4 MPEG2 and H264 Encoder-Transcoder + f1c4 Dual ASI-RX/TX-CI card 1b6f Etron Technology, Inc. 7023 EJ168 USB 3.0 Host Controller 1b73 Fresco Logic 1000 FL1000G USB 3.0 Host Controller + 1d5c 1000 Anker USB 3.0 Express Card +1b74 OpenVox Communication Co. Ltd. + 0115 D115P/D115E Single-port E1/T1 card + d130 D130P/D130E Single-port E1/T1 card (3rd GEN) + d210 D210P/D210E Dual-port E1/T1 card(2nd generation) + d230 D230 Dual-port E1/T1 card (2nd generation) + d410 D410/430 Quad-port E1/T1 card + d430 D410/430 Quad-port E1/T1 card 1b85 OCZ Technology Group, Inc. 1041 RevoDrive 3 X2 PCI-Express SSD 240 GB (Marvell Controller) 1b96 Western Digital @@ -14958,10 +15201,16 @@ 1c2c Fiberblaze # Used on V120 VME Crate Controller 1c32 Highland Technology, Inc. +1c3b Accensus, LLC + 0200 Telas2 1c44 Enmotus Inc 8000 8000 Storage IO Controller +1c7f Elektrobit Austria GmbH + 5100 EB5100 +1c8a TSF5 Corporation 1d44 DPT a400 PM2x24/PM3224 +1d5c Fantasia Trading LLC 1de1 Tekram Technology Co.,Ltd. 0391 TRM-S1040 2020 DC-390 @@ -15010,6 +15259,7 @@ 2003 Smart Link Ltd. 8800 LM-I56N 2004 Smart Link Ltd. +20f4 TRENDnet 2116 ZyDAS Technology Corp. 21c3 21st Century Computer Corp. # (Probably only the Mobile Phone Division) @@ -15489,8 +15739,6 @@ 1092 5a55 Viper II Z200 1092 5a57 Viper II Z200 ca00 SonicVibes -53c1 SC1-ALLEGRO - 0cd1 CD1-OPERA 5431 AuzenTech, Inc. 544c Teralogic Inc 0350 TL880-based HDTV/ATSC tuner @@ -15631,10 +15879,14 @@ 1043 844d P8P67 Deluxe Motherboard 0101 Xeon E3-1200/2nd Generation Core Processor Family PCI Express Root Port 1028 04b2 Vostro 3350 + 106b 00dc MacBookPro8,2 [Core i7, 15", 2011] 0102 2nd Generation Core Processor Family Integrated Graphics Controller 0104 2nd Generation Core Processor Family DRAM Controller 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 + 106b 00dc MacBookPro8,2 [Core i7, 15", 2011] 0105 Xeon E3-1200/2nd Generation Core Processor Family PCI Express Root Port + 106b 00dc MacBookPro8,2 [Core i7, 15", 2011] 0106 2nd Generation Core Processor Family Integrated Graphics Controller 0108 Xeon E3-1200 Processor Family DRAM Controller 0109 Xeon E3-1200/2nd Generation Core Processor Family PCI Express Root Port @@ -15645,26 +15897,27 @@ 010e Xeon E3-1200/2nd Generation Core Processor Family Integrated Graphics Controller 0112 2nd Generation Core Processor Family Integrated Graphics Controller 0116 2nd Generation Core Processor Family Integrated Graphics Controller + 1028 04da Vostro 3750 0122 2nd Generation Core Processor Family Integrated Graphics Controller 0126 2nd Generation Core Processor Family Integrated Graphics Controller 1028 04cc Vostro 3350 - 0150 Ivy Bridge DRAM Controller - 0151 Ivy Bridge PCI Express Root Port - 0152 Ivy Bridge Graphics Controller - 0154 Ivy Bridge DRAM Controller - 0155 Ivy Bridge PCI Express Root Port - 0156 Ivy Bridge Graphics Controller - 0158 Ivy Bridge DRAM Controller - 0159 Ivy Bridge PCI Express Root Port - 015a Ivy Bridge Graphics Controller - 015c Ivy Bridge DRAM Controller - 015d Ivy Bridge PCI Express Root Port - 015e Ivy Bridge Graphics Controller - 0162 Ivy Bridge Graphics Controller - 0166 Ivy Bridge Graphics Controller - 016a Ivy Bridge Graphics Controller - 0172 Ivy Bridge Graphics Controller - 0176 Ivy Bridge Graphics Controller + 0150 Xeon E3-1200 v2/3rd Gen Core processor DRAM Controller + 0151 Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port + 0152 Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller + 0154 3rd Gen Core processor DRAM Controller + 0155 Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port + 0156 3rd Gen Core processor Graphics Controller + 0158 Xeon E3-1200 v2/Ivy Bridge DRAM Controller + 0159 Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port + 015a Xeon E3-1200 v2/Ivy Bridge Graphics Controller + 015c Xeon E3-1200 v2/3rd Gen Core processor DRAM Controller + 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 + 0166 3rd Gen Core processor Graphics Controller + 016a Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller + 0172 Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller + 0176 3rd Gen Core processor Graphics Controller 0309 80303 I/O Processor PCI-to-PCI Bridge 030d 80312 I/O Companion Chip PCI-to-PCI Bridge 0326 6700/6702PXH I/OxAPIC Interrupt Controller A @@ -15688,12 +15941,12 @@ 0372 80333 Segment-B PCI Express-to-PCI Express Bridge 0373 80333 B-Bus IOAPIC 0374 80333 Address Translation Unit - 0402 Haswell Integrated Graphics Controller - 0406 Haswell Integrated Graphics Controller - 040a Haswell Integrated Graphics Controller - 0412 Haswell Integrated Graphics Controller - 0416 Haswell Integrated Graphics Controller - 041a Haswell Integrated Graphics Controller + 0402 Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller + 0406 4th Gen Core Processor Integrated Graphics Controller + 040a Xeon E3-1200 v3 Processor Integrated Graphics Controller + 0412 Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller + 0416 4th Gen Core Processor Integrated Graphics Controller + 041a Xeon E3-1200 v3 Processor Integrated Graphics Controller 0436 DH89xxCC Gigabit SGMII Connection 0438 DH8900CC Series Gigabit Network Connection 043a DH8900CC Series Gigabit Fiber Network Connection @@ -15817,6 +16070,12 @@ 0960 80960RP (i960RP) Microprocessor/Bridge 0962 80960RM (i960RM) Bridge 0964 80960RP (i960RP) Microprocessor/Bridge + 0a04 Haswell-ULT DRAM Controller + 0a06 Haswell-ULT Integrated Graphics Controller + 0a16 Haswell-ULT Integrated Graphics Controller + 0a22 Haswell-ULT Integrated Graphics Controller + 0a26 Haswell-ULT Integrated Graphics Controller + 0a2a Haswell-ULT Integrated Graphics Controller 0be0 Atom Processor D2xxx/N2xxx Integrated Graphics Controller 0be1 Atom Processor D2xxx/N2xxx Integrated Graphics Controller 0be2 Atom Processor D2xxx/N2xxx Integrated Graphics Controller @@ -15841,13 +16100,13 @@ 0bf5 Atom Processor D2xxx/N2xxx DRAM Controller 0bf6 Atom Processor D2xxx/N2xxx DRAM Controller 0bf7 Atom Processor D2xxx/N2xxx DRAM Controller - 0c00 Haswell DRAM Controller - 0c01 Haswell PCI Express x16 Controller - 0c04 Haswell DRAM Controller - 0c05 Haswell PCI Express x8 Controller - 0c08 Haswell DRAM Controller - 0c09 Haswell PCI Express x4 Controller - 0c0c Haswell HD Audio Controller + 0c00 4th Gen Core Processor DRAM Controller + 0c01 Xeon E3-1200 v3/4th Gen Core Processor PCI Express x16 Controller + 0c04 Xeon E3-1200 v3/4th Gen Core Processor DRAM Controller + 0c05 Xeon E3-1200 v3/4th Gen Core Processor PCI Express x8 Controller + 0c08 Xeon E3-1200 v3 Processor DRAM Controller + 0c09 Xeon E3-1200 v3/4th Gen Core Processor PCI Express x4 Controller + 0c0c Xeon E3-1200 v3/4th Gen Core Processor HD Audio Controller 0c46 Centerton PCI Express Root Port 1 0c47 Centerton PCI Express Root Port 2 0c48 Centerton PCI Express Root Port 3 @@ -15874,6 +16133,197 @@ 0c7d Centerton Internal Fabric 0c7e Centerton Internal Fabric 0c7f Centerton Internal Fabric + 0e00 Ivytown DMI2 + 0e01 Ivytown PCI Express Root Port in DMI2 Mode + 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 + 0eb7 Ivytown Integrated Memory Controller 1 Channel 0-3 ERROR Registers 2 + 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 2 + 0ef4 Ivytown Integrated Memory Controller 0 Channel 0-3 Thermal Control 2 + 0ef5 Ivytown Integrated Memory Controller 0 Channel 0-3 Thermal Control 3 + 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 + 0f00 ValleyView SSA-CUnit + 0f01 ValleyView SSA-CUnit + 0f02 ValleyView SSA-CUnit + 0f03 ValleyView SSA-CUnit + 0f04 ValleyView High Definition Audio Controller + 0f05 ValleyView High Definition Audio Controller + 0f06 ValleyView LPIO1 DMA Controller + 0f07 ValleyView LPIO1 DMA Controller + 0f08 ValleyView LPIO1 PWM Controller + 0f09 ValleyView LPIO1 PWM Controller + 0f0a ValleyView LPIO1 HSUART Controller #1 + 0f0b ValleyView LPIO1 HSUART Controller #1 + 0f0c ValleyView LPIO1 HSUART Controller #2 + 0f0d ValleyView LPIO1 HSUART Controller #2 + 0f0e ValleyView LPIO1 SPI Controller + 0f0f ValleyView LPIO1 SPI Controller + 0f10 ValleyView LPIO1 Controller + 0f11 ValleyView LPIO1 Controller + 0f12 ValleyView SMBus Controller + 0f13 ValleyView SMBus Controller + 0f14 ValleyView SDIO Controller + 0f15 ValleyView SDIO Controller + 0f16 ValleyView SDIO Controller + 0f17 ValleyView SDIO Controller + 0f18 ValleyView SEC + 0f19 ValleyView SEC + 0f1a ValleyView SEC + 0f1b ValleyView SEC + 0f1c ValleyView Power Control Unit + 0f1d ValleyView Power Control Unit + 0f1e ValleyView Power Control Unit + 0f1f ValleyView Power Control Unit + 0f20 ValleyView 4-Port SATA Storage Controller + 0f21 ValleyView 4-Port SATA Storage Controller + 0f22 ValleyView 6-Port SATA AHCI Controller + 0f23 ValleyView 6-Port SATA AHCI Controller + 0f24 ValleyView SATA RAID Storage Controller + 0f25 ValleyView SATA RAID Storage Controller + 0f26 ValleyView 2-Port SATA Storage Controller + 0f27 ValleyView 2-Port SATA Storage Controller + 0f28 ValleyView LPE Audio Controller + 0f29 ValleyView LPE Audio Controller + 0f2a ValleyView LPE Audio Controller + 0f2b ValleyView LPE Audio Controller + 0f2e ValleyView SATA RAID Storage Controller + 0f2f ValleyView SATA RAID Storage Controller + 0f30 ValleyView Gen7 + 0f31 ValleyView Gen7 + 0f32 ValleyView Gen7 + 0f33 ValleyView Gen7 + 0f34 ValleyView USB Enhanced Host Controller + 0f35 ValleyView USB xHCI Host Controller + 0f36 ValleyView USB xHCI Host Controller + 0f37 ValleyView OTG + 0f38 ValleyView ISP + 0f39 ValleyView ISP + 0f3a ValleyView ISP + 0f3b ValleyView ISP + 0f3c ValleyView ISP + 0f3d ValleyView ISP + 0f3e ValleyView ISP + 0f3f ValleyView ISP + 0f40 ValleyView LPIO2 DMA Controller + 0f41 ValleyView LPIO2 I2C Controller #1 + 0f42 ValleyView LPIO2 I2C Controller #2 + 0f43 ValleyView LPIO2 I2C Controller #3 + 0f44 ValleyView LPIO2 I2C Controller #4 + 0f45 ValleyView LPIO2 I2C Controller #5 + 0f46 ValleyView LPIO2 I2C Controller #6 + 0f47 ValleyView LPIO2 I2C Controller #7 + 0f48 ValleyView PCI Express Root Port + 0f49 ValleyView PCI Express Root Port + 0f4a ValleyView PCI Express Root Port + 0f4b ValleyView PCI Express Root Port + 0f4c ValleyView PCI Express Root Port + 0f4d ValleyView PCI Express Root Port + 0f4e ValleyView PCI Express Root Port + 0f4f ValleyView PCI Express Root Port + 0f50 ValleyView MIPI-HSI Controller 1000 82542 Gigabit Ethernet Controller (Fiber) 0e11 b0df NC6132 Gigabit Ethernet Adapter (1000-SX) 0e11 b0e0 NC6133 Gigabit Ethernet Adapter (1000-LX) @@ -16244,6 +16694,7 @@ 103c 323f NC362i Integrated Dual port Gigabit Server Adapter 10a9 8028 UV-BaseIO dual-port GbE 13a3 0037 DS4100 Secure Multi-Gigabit Server Adapter with Compression + 15d9 a811 H8DGU 8086 a01c Gigabit ET Dual Port Server Adapter 8086 a03c Gigabit ET Dual Port Server Adapter 8086 a04c Gigabit ET Dual Port Server Adapter @@ -16288,6 +16739,7 @@ 8086 a02b Gigabit ET Quad Port Server Adapter 8086 a02c Gigabit ET Quad Port Server Adapter 10ea 82577LM Gigabit Network Connection + 1028 040a Latitude E6410 1028 040b Latitude E6510 e4bf 50c1 PC1-GROOVE 10eb 82577LC Gigabit Network Connection @@ -16296,6 +16748,7 @@ 8086 a11f 10-Gigabit CX4 Dual Port Server Adapter 10ed 82599 Ethernet Controller Virtual Function 10ef 82578DM Gigabit Network Connection + 1028 02da OptiPlex 980 10f0 82578DC Gigabit Network Connection 10f1 82598EB 10-Gigabit AF Dual Port Network Connection 8086 a20f 10-Gigabit AF DA Dual Port Server Adapter @@ -16618,8 +17071,10 @@ 8086 0001 Ethernet Server Adapter I340-F4 8086 0002 Ethernet Server Adapter I340-F4 1528 Ethernet Controller 10-Gigabit X540-AT2 + 103c 192d 561FLR-T 2-port 10Gb Ethernet Adapter 108e 7b14 Sun Dual Port 10 GbE PCIe 2.0 ExpressModule, Base-T 108e 7b15 Sun Dual Port 10 GbE PCIe 2.0 Low Profile Adapter, Base-T + 1137 00bf Ethernet Converged Network Adapter X540-T2 8086 0001 Ethernet Converged Network Adapter X540-T2 8086 0002 Ethernet Converged Network Adapter X540-T1 8086 001a Ethernet Converged Network Adapter X540-T2 @@ -16628,6 +17083,10 @@ 8086 5003 Ethernet 10G 2P X540-t Adapter 1529 82599 10 Gigabit Dual Port Backplane Connection with FCoE 152a 82599 10 Gigabit Dual port Network Connection with FCoE + 153a Ethernet Connection I217-LM + 153b Ethernet Connection I217-V + 1547 DSL3510 Thunderbolt Port [Cactus Ridge] + 1549 DSL3510 Thunderbolt Controller [Cactus Ridge] 154a Ethernet Server Adapter X520-4 8086 011a Ethernet Converged Network Adapter X520-4 8086 011b Ethernet Converged Network Adapter X520-4 @@ -16684,45 +17143,66 @@ 1043 844d P8P67 Deluxe Motherboard 1c03 6 Series/C200 Series Chipset Family 6 port SATA AHCI Controller 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c04 6 Series/C200 Series Chipset Family SATA RAID Controller 1c05 6 Series/C200 Series Chipset Family SATA RAID Controller 1c08 6 Series/C200 Series Chipset Family 2 port SATA IDE Controller 1c09 6 Series/C200 Series Chipset Family 2 port SATA IDE Controller 1c10 6 Series/C200 Series Chipset Family PCI Express Root Port 1 + 1028 04da Vostro 3750 + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c12 6 Series/C200 Series Chipset Family PCI Express Root Port 2 + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c14 6 Series/C200 Series Chipset Family PCI Express Root Port 3 + 1028 04da Vostro 3750 + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c16 6 Series/C200 Series Chipset Family PCI Express Root Port 4 1c18 6 Series/C200 Series Chipset Family PCI Express Root Port 5 + 1028 04da Vostro 3750 1c1a 6 Series/C200 Series Chipset Family PCI Express Root Port 6 + 1028 04da Vostro 3750 1c1c 6 Series/C200 Series Chipset Family PCI Express Root Port 7 1c1e 6 Series/C200 Series Chipset Family PCI Express Root Port 8 1c20 6 Series/C200 Series Chipset Family High Definition Audio Controller 1028 0490 Alienware M17x R3 1028 04aa XPS 8300 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 1043 8418 P8P67 Deluxe Motherboard + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c22 6 Series/C200 Series Chipset Family SMBus Controller 1028 04aa XPS 8300 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 1043 844d P8P67 Deluxe Motherboard + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c24 6 Series/C200 Series Chipset Family Thermal Management Controller 1c25 6 Series/C200 Series Chipset Family DMI to PCI Bridge 1c26 6 Series/C200 Series Chipset Family USB Enhanced Host Controller #1 1028 04aa XPS 8300 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 1043 844d P8P67 Deluxe Motherboard + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c27 6 Series/C200 Series Chipset Family USB Universal Host Controller #1 + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c2c 6 Series/C200 Series Chipset Family USB Universal Host Controller #5 + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c2d 6 Series/C200 Series Chipset Family USB Enhanced Host Controller #2 1028 04aa XPS 8300 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 1043 844d P8P67 Deluxe Motherboard + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c33 6 Series/C200 Series Chipset Family LAN Controller 1c35 6 Series/C200 Series Chipset Family VECI Controller 1c3a 6 Series/C200 Series Chipset Family MEI Controller #1 1028 04aa XPS 8300 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 1043 844d P8P67 Deluxe Motherboard + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c3b 6 Series/C200 Series Chipset Family MEI Controller #2 1c3c 6 Series/C200 Series Chipset Family IDE-r Controller 1c3d 6 Series/C200 Series Chipset Family KT Controller @@ -16737,10 +17217,12 @@ 1c47 UM67 Express Chipset Family LPC Controller 1c48 6 Series/C200 Series Chipset Family LPC Controller 1c49 HM65 Express Chipset Family LPC Controller + 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c4a H67 Express Chipset Family LPC Controller 1028 04aa XPS 8300 1c4b HM67 Express Chipset Family LPC Controller 1028 04b2 Vostro 3350 + 1028 04da Vostro 3750 1c4c Q65 Express Chipset Family LPC Controller 1c4d QS67 Express Chipset Family LPC Controller 1c4e Q67 Express Chipset Family LPC Controller @@ -16825,69 +17307,68 @@ 1d72 C608 chipset SMBus Controller 2 1d74 C608/C606/X79 series chipset PCI Express Upstream Port 1d76 C600/X79 series chipset Multi-Function Glue - 1e00 Panther Point 4 port SATA Controller [IDE mode] - 1e01 Panther Point 4 port SATA Controller [IDE mode] - 1e02 Panther Point 6 port SATA Controller [AHCI mode] - 1e03 Panther Point 6 port SATA Controller [AHCI mode] - 1e04 Panther Point SATA Controller [RAID mode] - 1e05 Panther Point SATA Controller [RAID mode] - 1e06 Panther Point SATA Controller [Premium RAID mode] - 1e07 Panther Point SATA Controller [Premium RAID mode] - 1e08 Panther Point 2 port SATA Controller [IDE mode] - 1e09 Panther Point 2 port SATA Controller [IDE mode] - 1e0e Panther Point SATA Controller [RAID mode] - 1e10 Panther Point PCI Express Root Port 1 - 1e12 Panther Point PCI Express Root Port 2 - 1e14 Panther Point PCI Express Root Port 3 - 1e16 Panther Point PCI Express Root Port 4 - 1e18 Panther Point PCI Express Root Port 5 - 1e1a Panther Point PCI Express Root Port 6 - 1e1c Panther Point PCI Express Root Port 7 - 1e1e Panther Point PCI Express Root Port 8 - 1e20 Panther Point High Definition Audio Controller - 1e22 Panther Point SMBus Controller - 1e24 Panther Point Thermal Management Controller - 1e25 Panther Point DMI to PCI Bridge - 1e26 Panther Point USB Enhanced Host Controller #1 - 1e2d Panther Point USB Enhanced Host Controller #2 - 1e31 Panther Point USB xHCI Host Controller - 1e33 Panther Point LAN Controller - 1e3a Panther Point MEI Controller #1 - 1e3b Panther Point MEI Controller #2 - 1e3c Panther Point IDE-r Controller - 1e3d Panther Point KT Controller - 1e40 Panther Point LPC Controller - 1e41 Panther Point LPC Controller - 1e42 Panther Point LPC Controller - 1e43 Panther Point LPC Controller - 1e44 Panther Point LPC Controller - 1e45 Panther Point LPC Controller - 1e46 Panther Point LPC Controller - 1e47 Panther Point LPC Controller - 1e48 Panther Point LPC Controller - 1e49 Panther Point LPC Controller - 1e4a Panther Point LPC Controller - 1e4b Panther Point LPC Controller - 1e4c Panther Point LPC Controller - 1e4d Panther Point LPC Controller - 1e4e Panther Point LPC Controller - 1e4f Panther Point LPC Controller - 1e50 Panther Point LPC Controller - 1e51 Panther Point LPC Controller - 1e52 Panther Point LPC Controller - 1e53 Panther Point LPC Controller - 1e54 Panther Point LPC Controller - 1e55 Panther Point LPC Controller - 1e56 Panther Point LPC Controller - 1e57 Panther Point LPC Controller - 1e58 Panther Point LPC Controller - 1e59 Panther Point LPC Controller - 1e5a Panther Point LPC Controller - 1e5b Panther Point LPC Controller - 1e5c Panther Point LPC Controller - 1e5d Panther Point LPC Controller - 1e5e Panther Point LPC Controller - 1e5f Panther Point LPC Controller + 1e00 7 Series/C210 Series Chipset Family 4-port SATA Controller [IDE mode] + 1e01 7 Series Chipset Family 4-port SATA Controller [IDE mode] + 1e02 7 Series/C210 Series Chipset Family 6-port SATA Controller [AHCI mode] + 1e03 7 Series Chipset Family 6-port SATA Controller [AHCI mode] + 1e04 7 Series/C210 Series Chipset Family SATA Controller [RAID mode] + 1e05 7 Series Chipset SATA Controller [RAID mode] + 1e06 7 Series/C210 Series Chipset Family SATA Controller [RAID mode] + 1e07 7 Series Chipset Family SATA Controller [RAID mode] + 1e08 7 Series/C210 Series Chipset Family 2-port SATA Controller [IDE mode] + 1e09 7 Series Chipset Family 2-port SATA Controller [IDE mode] + 1e0e 7 Series/C210 Series Chipset Family SATA Controller [RAID mode] + 1e10 7 Series/C210 Series Chipset Family PCI Express Root Port 1 + 1e12 7 Series/C210 Series Chipset Family PCI Express Root Port 2 + 1e14 7 Series/C210 Series Chipset Family PCI Express Root Port 3 + 1e16 7 Series/C210 Series Chipset Family PCI Express Root Port 4 + 1e18 7 Series/C210 Series Chipset Family PCI Express Root Port 5 + 1e1a 7 Series/C210 Series Chipset Family PCI Express Root Port 6 + 1e1c 7 Series/C210 Series Chipset Family PCI Express Root Port 7 + 1e1e 7 Series/C210 Series Chipset Family PCI Express Root Port 8 + 1e20 7 Series/C210 Series Chipset Family High Definition Audio Controller + 1e22 7 Series/C210 Series Chipset Family SMBus Controller + 1e24 7 Series/C210 Series Chipset Family Thermal Management Controller + 1e25 7 Series/C210 Series Chipset Family DMI to PCI Bridge + 1e26 7 Series/C210 Series Chipset Family USB Enhanced Host Controller #1 + 1e2d 7 Series/C210 Series Chipset Family USB Enhanced Host Controller #2 + 1e31 7 Series/C210 Series Chipset Family USB xHCI Host Controller + 1e33 7 Series/C210 Series Chipset Family LAN Controller + 1e3a 7 Series/C210 Series Chipset Family MEI Controller #1 + 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 + 1e41 7 Series Chipset Family LPC Controller + 1e42 7 Series Chipset Family LPC Controller + 1e43 7 Series Chipset Family LPC Controller + 1e44 Z77 Express Chipset LPC Controller + 1e45 7 Series Chipset Family LPC Controller + 1e46 Z75 Express Chipset LPC Controller + 1e47 Q77 Express Chipset LPC Controller + 1e48 Q75 Express Chipset LPC Controller + 1e49 B75 Express Chipset LPC Controller + 1e4a H77 Express Chipset LPC Controller + 1e4b 7 Series Chipset Family LPC Controller + 1e4c 7 Series Chipset Family LPC Controller + 1e4d 7 Series Chipset Family LPC Controller + 1e4e 7 Series Chipset Family LPC Controller + 1e4f 7 Series Chipset Family LPC Controller + 1e50 7 Series Chipset Family LPC Controller + 1e51 7 Series Chipset Family LPC Controller + 1e52 7 Series Chipset Family LPC Controller + 1e53 C216 Series Chipset LPC Controller + 1e54 7 Series Chipset Family LPC Controller + 1e55 QM77 Express Chipset LPC Controller + 1e56 QS77 Express Chipset LPC Controller + 1e57 HM77 Express Chipset LPC Controller + 1e58 UM77 Express Chipset LPC Controller + 1e59 HM76 Express Chipset LPC Controller + 1e5a 7 Series Chipset Family LPC Controller + 1e5b UM77 Express Chipset LPC Controller + 1e5c 7 Series Chipset Family LPC Controller + 1e5d HM75 Express Chipset LPC Controller + 1e5e 7 Series Chipset Family LPC Controller + 1e5f 7 Series Chipset Family LPC Controller 2310 DH89xxCC LPC Controller 2323 DH89xxCC 4 Port SATA AHCI Controller 2330 DH89xxCC SMBus Controller @@ -16984,7 +17465,7 @@ 1025 1016 Travelmate 612 TX 104d 80df Vaio PCG-FX403 2448 82801 Mobile PCI Bridge -# (rev d3) (prog-if (rev d3) (prog-if 01 [Subtractive decode]) + 1028 040b Latitude E6510 103c 0934 HP Compaq nw8240 Mobile Workstation 103c 099c NX6110/NC6120 103c 309f Compaq nx9420 Notebook @@ -17046,7 +17527,9 @@ 1014 0267 NetVista A30p 1028 020d Inspiron 530 1028 0211 Optiplex 755 + 1028 02da OptiPlex 980 103c 2a3b Pavilion A1512X + 103c 330b ProLiant ML150 G6 Server 1458 5000 GA-EP45-DS5 Motherboard 1775 11cc CC11/CL11 2450 82801E ISA Bridge (LPC) @@ -18248,7 +18731,6 @@ 1028 01da OptiPlex 745 1028 01f3 Inspiron 1420 103c 30c0 Compaq 6710b -# Name mistyped on previous submission 103c 30c1 Compaq 6910p 103c 30cc Pavilion dv6700 103c 30d9 Presario C700 @@ -18432,7 +18914,6 @@ 292c 82801IEM (ICH9M-E) SATA Controller [RAID mode] 292d 82801IBM/IEM (ICH9M/ICH9M-E) 2 port SATA Controller [IDE mode] e4bf cc4d CCM-BOOGIE - 292e ICH9M SATA IDE Controller 2930 82801I (ICH9 Family) SMBus Controller 1028 020d Inspiron 530 1028 0211 Optiplex 755 @@ -18883,11 +19364,15 @@ 2e16 4 Series Chipset PT IDER Controller 2e17 4 Series Chipset Serial KT Controller 2e20 4 Series Chipset DRAM Controller - 1458 5000 GA-EP45-DS5 Motherboard + 1043 82d3 P5Q Deluxe Motherboard + 1458 5000 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 2e21 4 Series Chipset PCI Express Root Port + 1043 82d3 P5Q Deluxe Motherboard 1458 5000 GA-EP45-DS5 Motherboard 2e22 4 Series Chipset Integrated Graphics Controller + 1458 d000 GA-EG45M-DS2H Mainboard 2e23 4 Series Chipset Integrated Graphics Controller + 1458 d000 GA-EG45M-DS2H Mainboard 2e24 4 Series Chipset HECI Controller 2e25 4 Series Chipset HECI Controller 2e26 4 Series Chipset PT IDER Controller @@ -18971,42 +19456,50 @@ 1028 0287 PowerEdge M610 I/O Hub to ESI Port 1028 028c PowerEdge R410 I/O Hub to ESI Port 1028 028d PowerEdge T410 I/O Hub to ESI Port + 103c 330b ProLiant ML150 G6 Server 3404 5520/5500/X58 I/O Hub to ESI Port 3405 5520/5500/X58 I/O Hub to ESI Port 3406 5520 I/O Hub to ESI Port + 103c 330b ProLiant G6 series 3407 5520/5500/X58 I/O Hub to ESI Port 3408 5520/5500/X58 I/O Hub PCI Express Root Port 1 + 103c 330b ProLiant G6 series 3409 5520/5500/X58 I/O Hub PCI Express Root Port 2 340a 5520/5500/X58 I/O Hub PCI Express Root Port 3 + 103c 330b ProLiant ML150 G6 Server 340b 5520/X58 I/O Hub PCI Express Root Port 4 340c 5520/X58 I/O Hub PCI Express Root Port 5 340d 5520/X58 I/O Hub PCI Express Root Port 6 340e 5520/5500/X58 I/O Hub PCI Express Root Port 7 + 103c 330b ProLiant ML150 G6 Server 340f 5520/5500/X58 I/O Hub PCI Express Root Port 8 - 3410 5520/5500/X58 I/O Hub PCI Express Root Port 9 - 3411 5520/5500/X58 I/O Hub PCI Express Root Port 10 - 3418 5520/5500/X58 Physical Layer Port 0 - 3419 5520/5500 Physical Layer Port 1 - 3420 5500 Non-Legacy I/O Hub PCI Express Root Port 0 - 3421 5520 Non-Legacy I/O Hub PCI Express Root Port 0 - 3422 5520/5500/X58 I/O Hub GPIO and Scratch Pad Registers - 3423 5520/5500/X58 I/O Hub Control Status and RAS Registers - 3425 5520/5500/X58 Physical and Link Layer Registers Port 0 - 3426 5520/5500/X58 Routing and Protocol Layer Registers Port 0 - 3427 5520/5500 Physical and Link Layer Registers Port 1 - 3428 5520/5500 Routing & Protocol Layer Register Port 1 + 3410 7500/5520/5500/X58 I/O Hub PCI Express Root Port 9 + 3411 7500/5520/5500/X58 I/O Hub PCI Express Root Port 10 + 3418 7500/5520/5500/X58 Physical Layer Port 0 + 3419 7500/5520/5500 Physical Layer Port 1 + 3420 7500/5520/5500/X58 I/O Hub PCI Express Root Port 0 + 3421 7500/5520/5500/X58 I/O Hub PCI Express Root Port 0 + 3422 7500/5520/5500/X58 I/O Hub GPIO and Scratch Pad Registers + 103c 330b ProLiant G6 series + 3423 7500/5520/5500/X58 I/O Hub Control Status and RAS Registers + 103c 330b ProLiant G6 series + 3425 7500/5520/5500/X58 Physical and Link Layer Registers Port 0 + 3426 7500/5520/5500/X58 Routing and Protocol Layer Registers Port 0 + 3427 7500/5520/5500 Physical and Link Layer Registers Port 1 + 3428 7500/5520/5500 Routing & Protocol Layer Register Port 1 3429 5520/5500/X58 Chipset QuickData Technology Device 342a 5520/5500/X58 Chipset QuickData Technology Device 342b 5520/5500/X58 Chipset QuickData Technology Device 342c 5520/5500/X58 Chipset QuickData Technology Device - 342d 5520/5500/X58 I/O Hub I/OxAPIC Interrupt Controller - 342e 5520/5500/X58 I/O Hub System Management Registers - 342f 5520/5500/X58 Trusted Execution Technology Registers + 342d 7500/5520/5500/X58 I/O Hub I/OxAPIC Interrupt Controller + 342e 7500/5520/5500/X58 I/O Hub System Management Registers + 103c 330b ProLiant G6 series + 342f 7500/5520/5500/X58 Trusted Execution Technology Registers 3430 5520/5500/X58 Chipset QuickData Technology Device 3431 5520/5500/X58 Chipset QuickData Technology Device 3432 5520/5500/X58 Chipset QuickData Technology Device 3433 5520/5500/X58 Chipset QuickData Technology Device - 3438 5520/5500/X58 I/O Hub Throttle Registers + 3438 7500/5520/5500/X58 I/O Hub Throttle Registers 3500 6311ESB/6321ESB PCI Express Upstream Port 3501 6310ESB PCI Express Upstream Port 3504 6311ESB/6321ESB I/OxAPIC Interrupt Controller @@ -19192,6 +19685,8 @@ 3a16 82801JIR (ICH10R) LPC Interface Controller 1028 028c PowerEdge R410 LPC Interface Controller 1028 028d PowerEdge T410 LPC Interface Controller + 103c 330b ProLiant G6 series + 1043 82d4 P5Q Deluxe Motherboard 1458 5001 GA-EP45-DS5 Motherboard 3a18 82801JIB (ICH10) LPC Interface Controller 3a1a 82801JD (ICH10D) LPC Interface Controller @@ -19199,8 +19694,9 @@ 1028 028c PowerEdge R410 SATA IDE Controller 1028 028d PowerEdge T410 SATA IDE Controller 3a22 82801JI (ICH10 Family) SATA AHCI Controller + 103c 330b ProLiant G6 series 1043 82d4 P5Q Deluxe Motherboard - 1458 b005 GA-EP45-DS5 Motherboard + 1458 b005 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 3a25 82801JIR (ICH10R) SATA RAID Controller 1028 028c PERC S100 Controller (PE R410) 1028 028d PERC S100 Controller (PE T410) @@ -19209,48 +19705,68 @@ 1028 028c PowerEdge R410 SATA IDE Controller 1028 028d PowerEdge T410 SATA IDE Controller 3a30 82801JI (ICH10 Family) SMBus Controller - 1458 5001 GA-EP45-DS5 Motherboard + 1043 82d4 P5Q Deluxe Motherboard + 1458 5001 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 3a32 82801JI (ICH10 Family) Thermal Subsystem 3a34 82801JI (ICH10 Family) USB UHCI Controller #1 1028 028c PowerEdge R410 USB UHCI Controller 1028 028d PowerEdge T410 USB UHCI Controller + 103c 330b ProLiant G6 series + 1043 82d4 P5Q Deluxe Motherboard 1458 5004 GA-EP45-DS5 Motherboard 3a35 82801JI (ICH10 Family) USB UHCI Controller #2 1028 028c PowerEdge R410 USB UHCI Controller 1028 028d PowerEdge T410 USB UHCI Controller + 103c 330b ProLiant G6 series + 1043 82d4 P5Q Deluxe Motherboard 1458 5004 GA-EP45-DS5 Motherboard 3a36 82801JI (ICH10 Family) USB UHCI Controller #3 1028 028c PowerEdge R410 USB UHCI Controller 1028 028d PowerEdge T410 USB UHCI Controller + 103c 330b ProLiant G6 series + 1043 82d4 P5Q Deluxe Motherboard 1458 5004 GA-EP45-DS5 Motherboard 3a37 82801JI (ICH10 Family) USB UHCI Controller #4 1028 028c PowerEdge R410 USB UHCI Controller 1028 028d PowerEdge T410 USB UHCI Controller - 1458 5004 GA-EP45-DS5 Motherboard + 103c 330b ProLiant G6 series + 1043 82d4 P5Q Deluxe Motherboard + 1458 5004 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 3a38 82801JI (ICH10 Family) USB UHCI Controller #5 1028 028c PowerEdge R410 USB UHCI Controller 1028 028d PowerEdge T410 USB UHCI Controller - 1458 5004 GA-EP45-DS5 Motherboard + 103c 330b ProLiant ML150 G6 Server + 1043 82d4 P5Q Deluxe Motherboard + 1458 5004 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 3a39 82801JI (ICH10 Family) USB UHCI Controller #6 1028 028c PowerEdge R410 USB UHCI Controller 1028 028d PowerEdge T410 USB UHCI Controller - 1458 5004 GA-EP45-DS5 Motherboard + 103c 330b ProLiant ML150 G6 Server + 1043 82d4 P5Q Deluxe Motherboard + 1458 5004 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 3a3a 82801JI (ICH10 Family) USB2 EHCI Controller #1 1028 028c PowerEdge R410 USB EHCI Controller 1028 028d PowerEdge T410 USB EHCI Controller + 103c 330b ProLiant G6 series + 1043 82d4 P5Q Deluxe Motherboard 1458 5006 GA-EP45-DS5 Motherboard 3a3c 82801JI (ICH10 Family) USB2 EHCI Controller #2 1028 028c PowerEdge R410 USB EHCI Controller 1028 028d PowerEdge T410 USB EHCI Controller + 103c 330b ProLiant G6 series + 1043 82d4 P5Q Deluxe Motherboard 1458 5006 GA-EP45-DS5 Motherboard 3a3e 82801JI (ICH10 Family) HD Audio Controller + 1043 8311 P5Q Deluxe Motherboard 1458 a002 GA-EP45-UD3R Motherboard - 1458 a102 GA-EP45-DS5 Motherboard + 1458 a102 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 3a40 82801JI (ICH10 Family) PCI Express Root Port 1 1028 028c PowerEdge R410 PCI Express Port 1 1028 028d PowerEdge T410 PCI Express Port 1 + 103c 330b ProLiant ML150 G6 Server + 1043 82d4 P5Q Deluxe Motherboard 1043 82ea P6T DeLuxe Motherboard - 1458 5001 GA-EP45-DS5 Motherboard + 1458 5001 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 3a42 82801JI (ICH10 Family) PCI Express Port 2 3a44 82801JI (ICH10 Family) PCI Express Root Port 3 1043 82ea P6T DeLuxe Motherboard @@ -19258,11 +19774,14 @@ 1043 82ea P6T DeLuxe Motherboard 1458 5001 GA-EP45-DS5 Motherboard 3a48 82801JI (ICH10 Family) PCI Express Root Port 5 + 103c 330b ProLiant ML150 G6 Server 1043 82ea P6T Deluxe Motherboard 1458 5001 GA-EP45-DS5 Motherboard 3a4a 82801JI (ICH10 Family) PCI Express Root Port 6 + 103c 330b ProLiant ML150 G6 Server + 1043 82d4 P5Q Deluxe Motherboard 1043 82ea P6T DeLuxe Motherboard - 1458 5001 GA-EP45-DS5 Motherboard + 1458 5001 GA-EP45-DS5/GA-EG45M-DS2H Motherboard 3a4c 82801JI (ICH10 Family) Gigabit Ethernet Controller 3a51 82801JDO (ICH10DO) VECI Controller 3a55 82801JD/DO (ICH10 Family) Virtual SATA Controller @@ -19298,6 +19817,7 @@ 3b09 Mobile 5 Series Chipset LPC Interface Controller 1025 0347 Aspire 7740G 3b0a 5 Series Chipset LPC Interface Controller + 1028 02da OptiPlex 980 3b0b Mobile 5 Series Chipset LPC Interface Controller 3b0c 5 Series Chipset LPC Interface Controller 3b0d 5 Series/3400 Series Chipset LPC Interface Controller @@ -19322,6 +19842,7 @@ 3b20 5 Series/3400 Series Chipset 4 port SATA IDE Controller 3b21 5 Series/3400 Series Chipset 2 port SATA IDE Controller 3b22 5 Series/3400 Series Chipset 6 port SATA AHCI Controller + 1028 02da OptiPlex 980 3b23 5 Series/3400 Series Chipset 4 port SATA AHCI Controller 3b25 5 Series/3400 Series Chipset SATA RAID Controller 3b26 5 Series/3400 Series Chipset 2 port SATA IDE Controller @@ -19334,15 +19855,18 @@ 3b2e 5 Series/3400 Series Chipset 4 port SATA IDE Controller e4bf 50c1 PC1-GROOVE 3b2f 5 Series/3400 Series Chipset 6 port SATA AHCI Controller + 1028 040b Latitude E6510 e4bf 50c1 PC1-GROOVE 3b30 5 Series/3400 Series Chipset SMBus Controller 1025 0347 Aspire 7740G + 1028 02da OptiPlex 980 1028 040b Latitude E6510 e4bf 50c1 PC1-GROOVE 3b32 5 Series/3400 Series Chipset Thermal Subsystem 1025 0347 Aspire 7740G 3b34 5 Series/3400 Series Chipset USB2 Enhanced Host Controller 1025 0347 Aspire 7740G + 1028 02da OptiPlex 980 1028 040b Latitude E6510 e4bf 50c1 PC1-GROOVE 3b36 5 Series/3400 Series Chipset USB Universal Host Controller @@ -19353,6 +19877,7 @@ 3b3b 5 Series/3400 Series Chipset USB Universal Host Controller 3b3c 5 Series/3400 Series Chipset USB2 Enhanced Host Controller 1025 0347 Aspire 7740G + 1028 02da OptiPlex 980 1028 040b Latitude E6510 e4bf 50c1 PC1-GROOVE 3b3e 5 Series/3400 Series Chipset USB Universal Host Controller @@ -19360,16 +19885,23 @@ 3b40 5 Series/3400 Series Chipset USB Universal Host Controller 3b41 5 Series/3400 Series Chipset LAN Controller 3b42 5 Series/3400 Series Chipset PCI Express Root Port 1 + 1028 02da OptiPlex 980 + 1028 040b Latitude E6510 3b44 5 Series/3400 Series Chipset PCI Express Root Port 2 + 1028 040b Latitude E6510 3b46 5 Series/3400 Series Chipset PCI Express Root Port 3 + 1028 040b Latitude E6510 3b48 5 Series/3400 Series Chipset PCI Express Root Port 4 + 1028 040b Latitude E6510 3b4a 5 Series/3400 Series Chipset PCI Express Root Port 5 + 1028 02da OptiPlex 980 3b4c 5 Series/3400 Series Chipset PCI Express Root Port 6 3b4e 5 Series/3400 Series Chipset PCI Express Root Port 7 3b50 5 Series/3400 Series Chipset PCI Express Root Port 8 3b53 5 Series/3400 Series Chipset VECI Controller 3b56 5 Series/3400 Series Chipset High Definition Audio 1025 0347 Aspire 7740G + 1028 02da OptiPlex 980 1028 040b Latitude E6510 e4bf 50c1 PC1-GROOVE 3b57 5 Series/3400 Series Chipset High Definition Audio @@ -19796,80 +20328,80 @@ 8817 Platform Controller Hub EG20T I2C Controller 8818 Platform Controller Hub EG20T Controller Area Network (CAN) Controller 8819 Platform Controller Hub EG20T IEEE 1588 Hardware Assist - 8c00 Lynx Point 4-Port SATA IDE Controller - 8c01 Lynx Point 4-Port SATA IDE Controller - 8c02 Lynx Point 6-Port SATA AHCI Controller - 8c03 Lynx Point 6-Port SATA AHCI Controller - 8c04 Lynx Point SATA RAID Controller - 8c05 Lynx Point SATA RAID Controller - 8c06 Lynx Point SATA RAID Controller - 8c07 Lynx Point SATA RAID Controller - 8c08 Lynx Point 2-Port SATA IDE Controller - 8c09 Lynx Point 2-Port SATA IDE Controller - 8c0e Lynx Point SATA RAID Controller - 8c0f Lynx Point SATA RAID Controller - 8c10 Lynx Point PCI Express Root Port 1 - 8c11 Lynx Point PCI Express Root Port 1 - 8c12 Lynx Point PCI Express Root Port 2 - 8c13 Lynx Point PCI Express Root Port 2 - 8c14 Lynx Point PCI Express Root Port 3 - 8c15 Lynx Point PCI Express Root Port 3 - 8c16 Lynx Point PCI Express Root Port 4 - 8c17 Lynx Point PCI Express Root Port 4 - 8c18 Lynx Point PCI Express Root Port 5 - 8c19 Lynx Point PCI Express Root Port 5 - 8c1a Lynx Point PCI Express Root Port 6 - 8c1b Lynx Point PCI Express Root Port 6 - 8c1c Lynx Point PCI Express Root Port 7 - 8c1d Lynx Point PCI Express Root Port 7 - 8c1e Lynx Point PCI Express Root Port 8 - 8c1f Lynx Point PCI Express Root Port 8 - 8c20 Lynx Point HD Audio Controller - 8c21 Lynx Point HD Audio Controller - 8c22 Lynx Point SMBus Controller - 8c23 Lynx Point CHAP Counter - 8c24 Lynx Point Thermal Management Controller - 8c26 Lynx Point USB Enhanced Host Controller #1 - 8c2d Lynx Point USB Enhanced Host Controller #2 - 8c31 Lynx Point USB xHCI Host Controller - 8c33 Lynx Point LAN Controller - 8c34 Lynx Point NAND Controller - 8c3a Lynx Point MEI Controller #1 - 8c3b Lynx Point MEI Controller #2 - 8c3c Lynx Point IDE-r Controller - 8c3d Lynx Point KT Controller - 8c40 Lynx Point LPC Controller - 8c41 Lynx Point LPC Controller - 8c42 Lynx Point LPC Controller - 8c43 Lynx Point LPC Controller - 8c44 Lynx Point LPC Controller - 8c45 Lynx Point LPC Controller - 8c46 Lynx Point LPC Controller - 8c47 Lynx Point LPC Controller - 8c48 Lynx Point LPC Controller - 8c49 Lynx Point LPC Controller - 8c4a Lynx Point LPC Controller - 8c4b Lynx Point LPC Controller - 8c4c Lynx Point LPC Controller - 8c4d Lynx Point LPC Controller - 8c4e Lynx Point LPC Controller - 8c4f Lynx Point LPC Controller - 8c50 Lynx Point LPC Controller - 8c51 Lynx Point LPC Controller - 8c52 Lynx Point LPC Controller - 8c53 Lynx Point LPC Controller - 8c54 Lynx Point LPC Controller - 8c55 Lynx Point LPC Controller - 8c56 Lynx Point LPC Controller - 8c57 Lynx Point LPC Controller - 8c58 Lynx Point LPC Controller - 8c59 Lynx Point LPC Controller - 8c5a Lynx Point LPC Controller - 8c5b Lynx Point LPC Controller - 8c5c Lynx Point LPC Controller - 8c5d Lynx Point LPC Controller - 8c5e Lynx Point LPC Controller - 8c5f Lynx Point LPC Controller + 8c00 8 Series/C220 Series Chipset Family 4-port SATA Controller 1 [IDE mode] + 8c01 8 Series Chipset Family 4-port SATA Controller 1 [IDE mode] + 8c02 8 Series/C220 Series Chipset Family 6-port SATA Controller 1 [AHCI mode] + 8c03 8 Series/C220 Series Chipset Family 6-port SATA Controller 1 [AHCI mode] + 8c04 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c05 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c06 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c07 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c08 8 Series/C220 Series Chipset Family 2-port SATA Controller 2 [IDE mode] + 8c09 8 Series/C220 Series Chipset Family 2-port SATA Controller 2 [IDE mode] + 8c0e 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c0f 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] + 8c10 8 Series/C220 Series Chipset Family PCI Express Root Port #1 + 8c11 8 Series/C220 Series Chipset Family PCI Express Root Port #1 + 8c12 8 Series/C220 Series Chipset Family PCI Express Root Port #2 + 8c13 8 Series/C220 Series Chipset Family PCI Express Root Port #2 + 8c14 8 Series/C220 Series Chipset Family PCI Express Root Port #3 + 8c15 8 Series/C220 Series Chipset Family PCI Express Root Port #3 + 8c16 8 Series/C220 Series Chipset Family PCI Express Root Port #4 + 8c17 8 Series/C220 Series Chipset Family PCI Express Root Port #4 + 8c18 8 Series/C220 Series Chipset Family PCI Express Root Port #5 + 8c19 8 Series/C220 Series Chipset Family PCI Express Root Port #5 + 8c1a 8 Series/C220 Series Chipset Family PCI Express Root Port #6 + 8c1b 8 Series/C220 Series Chipset Family PCI Express Root Port #6 + 8c1c 8 Series/C220 Series Chipset Family PCI Express Root Port #7 + 8c1d 8 Series/C220 Series Chipset Family PCI Express Root Port #7 + 8c1e 8 Series/C220 Series Chipset Family PCI Express Root Port #8 + 8c1f 8 Series/C220 Series Chipset Family PCI Express Root Port #8 + 8c20 8 Series/C220 Series Chipset High Definition Audio Controller + 8c21 8 Series/C220 Series Chipset High Definition Audio Controller + 8c22 8 Series/C220 Series Chipset Family SMBus Controller + 8c23 8 Series Chipset Family CHAP Counters + 8c24 8 Series Chipset Family Thermal Management Controller + 8c26 8 Series/C220 Series Chipset Family USB EHCI #1 + 8c2d 8 Series/C220 Series Chipset Family USB EHCI #2 + 8c31 8 Series/C220 Series Chipset Family USB xHCI + 8c33 8 Series/C220 Series Chipset Family LAN Controller + 8c34 8 Series/C220 Series Chipset Family NAND Controller + 8c3a 8 Series/C220 Series Chipset Family MEI Controller #1 + 8c3b 8 Series/C220 Series Chipset Family MEI Controller #2 + 8c3c 8 Series/C220 Series Chipset Family IDE-r Controller + 8c3d 8 Series/C220 Series Chipset Family KT Controller + 8c40 8 Series/C220 Series Chipset Family LPC Controller + 8c41 8 Series Chipset Family Mobile Super SKU LPC Controller + 8c42 8 Series/C220 Series Chipset Family Desktop Super SKU LPC Controller + 8c43 8 Series/C220 Series Chipset Family LPC Controller + 8c44 Z87 Express Chipset LPC Controller + 8c45 8 Series/C220 Series Chipset Family LPC Controller + 8c46 Z85 Express Chipset LPC Controller + 8c47 8 Series/C220 Series Chipset Family LPC Controller + 8c48 8 Series/C220 Series Chipset Family LPC Controller + 8c49 HM86 Express Chipset LPC Controller + 8c4a H87 Express Chipset LPC Controller + 8c4b HM87 Express Chipset LPC Controller + 8c4c Q85 Express Chipset LPC Controller + 8c4d 8 Series/C220 Series Chipset Family LPC Controller + 8c4e Q87 Express Chipset LPC Controller + 8c4f QM87 Express Chipset LPC Controller + 8c50 B85 Express Chipset LPC Controller + 8c51 8 Series/C220 Series Chipset Family LPC Controller + 8c52 C222 Series Chipset Family Server Essential SKU LPC Controller + 8c53 8 Series/C220 Series Chipset Family LPC Controller + 8c54 C224 Series Chipset Family Server Standard SKU LPC Controller + 8c55 8 Series/C220 Series Chipset Family LPC Controller + 8c56 C226 Series Chipset Family Server Advanced SKU LPC Controller + 8c57 8 Series/C220 Series Chipset Family LPC Controller + 8c58 8 Series/C220 Series Chipset Family WS SKU LPC Controller + 8c59 8 Series/C220 Series Chipset Family LPC Controller + 8c5a 8 Series/C220 Series Chipset Family LPC Controller + 8c5b 8 Series/C220 Series Chipset Family LPC Controller + 8c5c H81 Express Chipset/C220 Series Chipset Family LPC Controller + 8c5d 8 Series/C220 Series Chipset Family LPC Controller + 8c5e 8 Series/C220 Series Chipset Family LPC Controller + 8c5f 8 Series/C220 Series Chipset Family LPC Controller 9000 IXP2000 Family Network Processor 9001 IXP2400 Network Processor 9002 IXP2300 Network Processor @@ -19878,16 +20410,72 @@ 9622 Integrated RAID 9641 Integrated RAID 96a1 Integrated RAID - a000 N10 Family DMI Bridge + 9c00 Lynx Point-LP SATA Controller 1 [IDE mode] + 9c01 Lynx Point-LP SATA Controller 1 [IDE mode] + 9c02 Lynx Point-LP SATA Controller 1 [AHCI mode] + 9c03 Lynx Point-LP SATA Controller 1 [AHCI mode] + 9c04 Lynx Point-LP SATA Controller 1 [RAID mode] + 9c05 Lynx Point-LP SATA Controller 1 [RAID mode] + 9c06 Lynx Point-LP SATA Controller 1 [RAID mode] + 9c07 Lynx Point-LP SATA Controller 1 [RAID mode] + 9c08 Lynx Point-LP SATA Controller 2 [IDE mode] + 9c09 Lynx Point-LP SATA Controller 2 [IDE mode] + 9c0a LynxPoint-LP SATA Controller [Reserved] + 9c0b LynxPoint-LP SATA Controller [Reserved] + 9c0c LynxPoint-LP SATA Controller [Reserved] + 9c0d LynxPoint-LP SATA Controller [Reserved] + 9c0e Lynx Point-LP SATA Controller 1 [RAID mode] + 9c0f Lynx Point-LP SATA Controller 1 [RAID mode] + 9c10 Lynx Point-LP PCI Express Root Port 1 + 9c11 Lynx Point-LP PCI Express Root Port 1 + 9c12 Lynx Point-LP PCI Express Root Port 2 + 9c13 Lynx Point-LP PCI Express Root Port 2 + 9c14 Lynx Point-LP PCI Express Root Port 3 + 9c15 Lynx Point-LP PCI Express Root Port 3 + 9c16 Lynx Point-LP PCI Express Root Port 4 + 9c17 Lynx Point-LP PCI Express Root Port 4 + 9c18 Lynx Point-LP PCI Express Root Port 5 + 9c19 Lynx Point-LP PCI Express Root Port 5 + 9c1a Lynx Point-LP PCI Express Root Port 6 + 9c1b Lynx Point-LP PCI Express Root Port 6 + 9c20 Lynx Point-LP HD Audio Controller + 9c21 Lynx Point-LP HD Audio Controller + 9c22 Lynx Point-LP SMBus Controller + 9c23 Lynx Point-LP CHAP Counters + 9c24 Lynx Point-LP Thermal + 9c26 Lynx Point-LP USB EHCI #1 + 9c31 Lynx Point-LP USB xHCI HC + 9c35 Lynx Point-LP SDIO Controller + 9c36 Lynx Point-LP Audio DSP Controller + 9c3a Lynx Point-LP HECI #0 + 9c3b Lynx Point-LP HECI #1 + 9c3c Lynx Point-LP HECI IDER + 9c3d Lynx Point-LP HECI KT + 9c40 Lynx Point-LP LPC Controller + 9c41 Lynx Point-LP LPC Controller + 9c42 Lynx Point-LP LPC Controller + 9c43 Lynx Point-LP LPC Controller + 9c44 Lynx Point-LP LPC Controller + 9c45 Lynx Point-LP LPC Controller + 9c46 Lynx Point-LP LPC Controller + 9c47 Lynx Point-LP LPC Controller + 9c60 Lynx Point-LP Low Power Sub-System DMA + 9c61 Lynx Point-LP I2C Controller #0 + 9c62 Lynx Point-LP I2C Controller #1 + 9c63 Lynx Point-LP UART Controller #0 + 9c64 Lynx Point-LP UART Controller #1 + 9c65 Lynx Point-LP SPI Controller #0 + 9c66 Lynx Point-LP SPI Controller #1 + a000 Atom Processor D4xx/D5xx/N4xx/N5xx DMI Bridge 8086 4f4d DeskTop Board D510MO - a001 N10 Family Integrated Graphics Controller + a001 Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller 8086 4f4d DeskTop Board D510MO - a002 N10 Family Integrated Graphics Controller - a003 N10 Family CHAPS counter - a010 N10 Family DMI Bridge - a011 N10 Family Integrated Graphics Controller - a012 N10 Family Integrated Graphics Controller - a013 N10 Family CHAPS counter + a002 Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller + a003 Atom Processor D4xx/D5xx/N4xx/N5xx CHAPS counter + a010 Atom Processor D4xx/D5xx/N4xx/N5xx DMI Bridge + a011 Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller + a012 Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller + a013 Atom Processor D4xx/D5xx/N4xx/N5xx CHAPS counter a620 6400/6402 Advanced Memory Buffer (AMB) b152 21152 PCI-to-PCI Bridge 8086 b152 21152 PCI-to-PCI Bridge @@ -19902,6 +20490,7 @@ e4bf 1000 CC8-1-BLUES d130 Core Processor DMI d131 Core Processor DMI + 1028 02da OptiPlex 980 d132 Core Processor DMI 1028 040b Latitude E6510 d133 Core Processor DMI @@ -19910,6 +20499,8 @@ d136 Core Processor DMI d137 Core Processor DMI d138 Core Processor PCI Express Root Port 1 + 1028 02da OptiPlex 980 + 1028 040b Latitude E6510 d139 Core Processor PCI Express Root Port 2 d13a Core Processor PCI Express Root Port 3 d13b Core Processor PCI Express Root Port 4 @@ -20230,6 +20821,31 @@ 9005 02b3 2400 9005 02b4 ICP ICP5045AL 9005 0800 Callisto + 028b Series 6 - 6G SAS/PCIe 2 + 9005 0200 Series 6 Entry Level - ASR-6405E - 4 internal 6G SAS ports + 9005 0201 Series 6 Entry Level - ASR-6805E - 8 internal 6G SAS ports + 9005 0300 Series 6 - ASR-6405 - 4 internal 6G SAS ports + 9005 0301 Series 6 - ASR-6805 - 8 internal 6G SAS ports + 9005 0302 Series 6 - ASR-6445 - 4 internal and 4 external 6G SAS ports + 9005 0310 Series 6 Connectors on Top - ASR-6405T - 4 internal 6G SAS ports + 9005 0311 Series 6 Connectors on Top - ASR-6805T - 8 internal 6G SAS + 9005 0400 Series 6 - ASR-61205 - 12 internal 6G SAS ports + 9005 0401 Series 6 - ASR-61605 - 16 internal 6G SAS ports + 9005 0403 Series 6 - ASR-62405 - 24 internal 6G SAS ports + 028c Series 7 6G SAS/PCIe 3 + 9005 0500 Series 7 - ASR-7805 - 8 internal 6G SAS Port/PCIe 3.0 + 9005 0501 Series 7 - ASR-71605 - 16 internal 6G SAS Port/PCIe 3.0 + 9005 0502 Series 7 - ASR-71685 - 16 internal 8 external 6G SAS Port/PCIe 3.0 + 9005 0503 Series 7 - ASR-72405 - 24 internal 0 external 6G SAS Port/PCIe 3.0 + 9005 0504 Series 7 - ASR-7885 - 8 internal 8 external 6G SAS Port/PCIe 3.0 + 9005 0505 Series 7 Entry Level - ASR-71685E - 16 internal 8 external 6G SAS Port/PCIe 3.0 + 9005 0506 Series 7 Entry Level - ASR-72405E - 24 internal 0 external 6G SAS Port/PCIe 3.0 + 028d Series 8 12G SAS/PCIe 3 + 9005 0550 Series 8 - ASR-82405 - 24 internal 0 external 12G SAS Port/PCIe 3.0 + 9005 0551 Series 8 - ASR-81605 - 16 internal 0 external 12G SAS Port/PCIe 3.0 + 9005 0552 Series 8 - ASR-8805 - 8 internal 0 external 12G SAS Port/PCIe 3.0 + 9005 0553 Series 8 - ASR-8085 - 0 internal 8 external 12G SAS Port/PCIe 3.0 + 9005 0554 Series 8 - ASR-8885 - 8 internal 8 external 12G SAS Port/PCIe 3.0 0410 AIC-9410W SAS (Razor HBA RAID) 9005 0410 ASC-48300(Spirit RAID) 9005 0411 ASC-58300 (Oakmont RAID) @@ -20325,6 +20941,8 @@ 9865 PCI 9865 Multi-I/O Controller 9901 PCIe 9901 Multi-I/O Controller 9904 4-Port PCIe Serial Adapter +# 2-port Serial 1-port Parallel Adaptor + 9912 PCIe 9912 Multi-I/O Controller 9922 PCIe 9922 Multi-I/O Controller 9990 MCS9990 PCIe to 4‐Port USB 2.0 Host Controller 9902 Stargen Inc. diff --git a/src/hwdata/usb.ids b/src/hwdata/usb.ids index c21fff1..1b8f2c6 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: 2012.02.08 -# Date: 2012-02-08 20:34:02 +# Version: 2012.07.30 +# Date: 2012-07-30 20:34:03 # # Vendors, devices and interfaces. Please keep sorted. @@ -22,6 +22,7 @@ 0001 Fry's Electronics 142b Arbiter Systems, Inc. + 7778 Counterfeit flash drive [Kingston] 0002 Ingram 0003 Club Mac 0004 Nebraska Furniture Mart @@ -98,6 +99,7 @@ 2105 AVRONE! 2106 STK600 development board 2107 AVR Dragon + 2109 STK541 ZigBee Development Board 210d XPLAIN evaluation kit (CDC ACM) 2122 XMEGA-A1 Explained evaluation kit 2310 EVK11xx evaluation board @@ -109,7 +111,11 @@ 4102 AirVast W-Buddie WN210 5601 at76c510 Prism-II 802.11b Access Point 5603 Cisco 7920 WiFi IP Phone + 6119 AT91SAM CDC Demo Application 6124 at91sam SAMBA bootloader + 6127 AT91SAM HID Keyboard Demo Application + 6129 AT91SAM Mass Storage Demo Application + 6200 AT91SAM HID Mouse Demo Application 7603 D-Link DWL-120 802.11b Wireless Adapter [Atmel at76c503a] 7604 at76c503a 802.11b Adapter 7605 at76c503a 802.11b Adapter @@ -248,6 +254,7 @@ 1311 OfficeJet V30 1312 DeskJet 460 1317 LaserJet 1005 + 1327 iLO Virtual Hub 1405 ScanJet 3670 1411 PSC 750 1424 f2105 Monitor Hub @@ -323,6 +330,7 @@ 2311 OfficeJet d series 2312 OfficeJet Pro L7700 2317 LaserJet 4350 + 231d 4 GB Flash Drive 2402 PhotoSmart 7700 series 2404 Deskjet F2280 series 2405 ScanJet 4070 PhotoSmart @@ -356,6 +364,7 @@ 2c12 Officejet J4680 2c17 LaserJet 1022 2c24 Logitech M-UAL-96 Mouse + 2d05 Scanjet 7000 2d11 OfficeJet 6110 2d17 Printing Support 2e11 PSC 1000 @@ -598,7 +607,7 @@ 03f1 Genoa Technology 03f2 Oak Technology, Inc. 03f3 Adaptec, Inc. - 0020 AWN-8020 WLAN + 0020 AWN-8020 WLAN [Intersil PRISM 2.5] 0080 AVC-1100 Audio Capture 0083 AVC-2200 Device 0087 AVC-2210 Loader @@ -617,7 +626,7 @@ 03f5 Siemens Electromechanical 03f8 Epson Imaging Technology Center 03f9 KeyTronic Corp. - 0100 Keyboard + 0100 KT-2001 Keyboard 0101 Keyboard 0102 Keyboard Mouse 03fb OPTi, Inc. @@ -657,19 +666,38 @@ 0232 Serial Converter 1060 JTAG adapter 6001 FT232 USB-Serial (UART) IC + 6002 Lumel PD12 6007 Serial Converter 6008 Serial Converter 6009 Serial Converter 6010 FT2232C Dual USB-UART/FIFO IC 6011 FT4232H Quad HS USB-UART/FIFO IC 6014 FT232H Single HS USB-UART/FIFO IC + 6015 Bridge(I2C/SPI/UART/FIFO) 8040 4 Port Hub 8070 7 Port Hub 8370 7 Port Hub 8371 PS/2 Keyboard And Mouse 8372 FT8U100AX Serial Port + 8a28 Rainforest Automation ZigBee Controller + 9e90 Marvell OpenRD Base/Client + 9f80 Ewert Energy Systems CANdapter + a6d0 Texas Instruments XDS100v2 JTAG / BeagleBone A3 + a951 HCP HIT GSM/GPRS modem [Cinterion MC55i] + abb8 Lego Mindstorms NXTCam + b810 US Interface Navigator (CAT and 2nd PTT lines) + b811 US Interface Navigator (WKEY and FSK lines) + b812 US Interface Navigator (RS232 and CONFIG lines) + baf8 Amontec JTAGkey - Open On-Chip Debugger bcd8 Stellaris Development Board bcd9 Stellaris Evaluation Board + bcda Stellaris ICDI Board + bdc8 Egnite GmbH - JTAG/RS-232 adapter + bfd8 OpenDCC + bfd9 OpenDCC (Sniffer) + bfda OpenDCC (Throttle) + bfdb OpenDCC (Gateway) + bfdc OpenDCC (GBM) c630 lcd2usb interface c631 i2c-tiny-usb interface c632 xu1541 c64 floppy drive interface @@ -683,20 +711,25 @@ c8bc Alpermann+Velte Rubidium S1 c8bd Alpermann+Velte Rubidium T1 c8be Alpermann+Velte Rubidium D1 - cc48 product FTDI TACTRIX_OPENPORT_13M 0xcc48 OpenPort 1.3 Mitsubishi - cc49 product FTDI TACTRIX_OPENPORT_13S 0xcc49 OpenPort 1.3 Subaru - cc4a product FTDI TACTRIX_OPENPORT_13U 0xcc4a OpenPort 1.3 Universal + cc48 Tactrix OpenPort 1.3 Mitsubishi + cc49 Tactrix OpenPort 1.3 Subaru + cc4a Tactrix OpenPort 1.3 Universal + cff8 Distortec JTAG-lock-pick d010 SCS PTC-IIusb d011 SCS Position-Tracker/TNC d012 SCS DRAGON 1 d013 SCS DRAGON 1 + d578 Accesio USB-COM-4SM d6f8 UNI Black BOX + d738 Propox JTAGcable II + d739 Propox ISPcable III d9a9 Actisense USG-1 NMEA Serial Gateway d9aa Actisense NGT-1 NMEA2000 PC Interface e0d0 Total Phase Aardvark I2C/SPI Host Adapter e521 EVER Sinline XL Series UPS e6c8 PYRAMID Computer GmbH LCD e700 Elster Unicom III Optical Probe + e729 Segway Robotic Mobility Platforms 200 e888 Expert ISDN Control USB e889 USB-RS232 OptoBridge e88a Expert mouseCLOCK USB II @@ -712,8 +745,11 @@ f1a0 Asix PRESTO Programmer f208 Papenmeier Braille-Display f3c0 4N-GALAXY Serial Converter + f608 CTI USB-485-Mini + f60b CTI USB-Nano-485 f680 Suunto Sports Instrument f758 GW Instek GDS-8x0 Oscilloscope + f7c0 ZeitControl Cardsystems TagTracer MIFARE f850 USB-UIRT (Universal Infrared Receiver+Transmitter) f918 Ant8 Logic Probe fa00 Matrix Orbital USB Serial @@ -730,12 +766,12 @@ fd48 ShipModul MiniPlex-4xUSB NMEA Multiplexer fd49 ShipModul MiniPlex-4xUSB-AIS NMEA Multiplexer ff08 ToolHouse LoopBack Adapter - ff18 Logbook Bus + ff18 ScienceScope Logbook ML ff19 Logbook Bus ff1a Logbook Bus ff1b Logbook Bus - ff1c Logbook Bus - ff1d Logbook Bus + ff1c ScienceScope Logbook LS + ff1d ScienceScope Logbook HS ff1e Logbook Bus ff1f Logbook Bus 0404 NCR Corp. @@ -783,6 +819,8 @@ 0059 HighSpeed Hub 005a HighSpeed Hub 006a Conceptronic USB Harddisk Box + 007d MINICUBE2 + 007e PG-FP5 Flash Memory Programmer 0081 SuperScript 1400 Series 0082 SuperScript 1400 Series 0094 Japanese Keyboard with One-touch start buttons @@ -804,6 +842,8 @@ 0249 Aterm WL300NU-G 02b4 Aterm WL300NU-AG 02b6 Aterm WL300NU-GS 802.11n Wireless Adapter + 0300 LifeTouch Note + 0301 LifeTouch Note (debug mode) 55aa Hub 55ab Hub [iMac/iTouch kbd] 8010 Intellibase Hub @@ -949,6 +989,7 @@ 6510 Weltrend Bar Code Reader 6520 XBOX Xploder 6533 Speed-Link Competition Pro + 6543 Manhattan Magnetic Card Strip Reader 040c VTech Computers, Ltd 040d VIA Technologies, Inc. 3184 VNT VT6656 USB-802.11 Wireless LAN Adapter @@ -978,7 +1019,8 @@ 0065 Python2 WDM Encoder 0066 WLI-U2-KG54 WLAN 0067 WLI-U2-KG54-AI WLAN - 0089 Buffalo RUF-C/U2 Flash Drive + 006e LUA-U2-GT 10/100/1000 Ethernet Adapter + 0089 RUF-C/U2 Flash Drive 008b Nintendo Wi-Fi 0091 WLI-U2-KAMG54 Wireless LAN Adapter 0092 WLI-U2-KAMG54 Bootloader @@ -1006,6 +1048,7 @@ 01a1 MiniStation Metro 01a2 WLI-UC-GNM Wireless LAN Adapter [Ralink RT8070] 01ee WLI-UC-GNM2 Wireless LAN Adapter [Ralink RT3070] + 01fd WLI-UC-G450 Wireless LAN Adapter 0412 Award Software International 0413 Leadtek Research, Inc. 1310 WinFast TV - NTSC + FM @@ -1270,6 +1313,8 @@ 02e3 5230 (PC-Suite mode) 02e4 5230 (Imaging mode) 03a4 C5 (Storage mode) + 03c0 C7-00 + 03d1 N950 0400 7600 Phone Parent 0401 6650 GSM Phone 0402 6255 Phone Parent @@ -1331,6 +1376,7 @@ 04f9 6300 (PC Suite mode) 0508 E65 (PC Suite mode) 0509 E65 (Storage mode) + 0518 N9 Phone 0600 Digital Pen SU-1B 0610 CS-15 (Internet Stick 3G modem) 0800 Connectivity Cable DKU-5 @@ -1362,6 +1408,7 @@ 2503 USB 2.0 Hub 2504 USB 2.0 Hub 2512 USB 2.0 Hub + 2513 2.0 Hub 2514 USB 2.0 Hub 2517 Hub 2524 USB MultiSwitch Hub @@ -1789,6 +1836,7 @@ 5220 Rio Nitrus MP3 Player 5221 Rio Eigen 045b Hitachi, Ltd + 0053 RX610 RX-Stick 045d Nortel Networks, Ltd 045e Microsoft Corp. 0007 SideWinder Game Pad @@ -2052,6 +2100,7 @@ 0006 LCD Tablet (12x9) 0008 Tablet (3x2.25) 0461 Primax Electronics, Ltd + 0010 HP Keyboard 0300 G2-300 Scanner 0301 G2E-300 Scanner 0302 G2-300 #2 Scanner @@ -2096,6 +2145,7 @@ 4d03 Kensington Mouse-in-a-box 4d04 Mouse 4d06 Balless Mouse (HID) + 4d0f HP Optical Mouse 4d15 Dell Optical Mouse 4d17 Optical Mouse 4d20 HP Optical Mouse @@ -2317,6 +2367,7 @@ c050 RX 250 Optical Mouse c051 G3 (MX518) Optical Mouse c053 Laser Mouse + c054 Bluetooth mini-receiver c058 M115 Mouse c05a Optical Mouse M90 c05b M-U0004 810-001317 [B110 Optical USB Mouse] @@ -2366,6 +2417,7 @@ c22b Gaming Keyboard G110 G-keys c22d G510 Gaming Keyboard c22e G510 Gaming Keyboard onboard audio + c246 Gaming Mouse G300 c281 WingMan Force c283 WingMan Force 3D c285 WingMan Strike Force 3D @@ -2575,6 +2627,7 @@ 2076 GoGear Aria 2079 GoGear Opus 2088 MCE IR Receiver with ALS- Spinel plus for ASUS + 209e PTA01 Wireless Adapter 20b6 GoGear Vibe 20e3 GoGear Raga 262c SPC230NC Webcam @@ -2737,6 +2790,7 @@ 2018 BioSimKey 2302 Portable Flash Device (PFD) 3744 STLINK Pseudo disk + 3747 ST Micro Connect Lite 3748 ST-LINK/V2 4810 ISDN adapter 481d BT Digital Access adapter @@ -2761,12 +2815,15 @@ d00e Rollei Compactline (Video Mode) e000 T-Com TC 300 e003 Pirelli DP-L10 + e00d Broadcom Bluetooth 2.1 Device e00f Foxconn T77H114 BCM2070 [Single-Chip Bluetooth 2.1 + EDR Adapter] e016 Ubee PXU1900 WiMAX Adapter [Beceem BCSM250] e02c Atheros AR5BBU12 Bluetooth Device 048a S-MOS Systems, Inc. 048c Alps Electric Ireland, Ltd 048d Integrated Technology Express, Inc. + 1336 SD/MMC Cardreader + 1345 Multi Cardreader 9009 Zolid HD DVD Maker 9135 Zolid Mini DVB-T Stick 048f Eicon Tech. @@ -3257,6 +3314,7 @@ 26b0 MF4600 series 26b4 MF4010 series 26b5 MF4200 series + 2737 MF4410 3041 PowerShot S10 3042 CanoScan FS4000US Film Scanner 3043 PowerShot S20 @@ -3326,7 +3384,7 @@ 309a PowerShot A80 309b Digital IXUS (ptp) 309c PowerShot S1 IS - 309d Camera + 309d Powershot Pro 1 309f Camera 30a0 Camera 30a1 Camera @@ -3358,18 +3416,23 @@ 30ef EOS 350D (ptp) 30f0 PowerShot S2 IS (PTP mode) 30f2 Digital IXUS 700 (normal mode) / Digital IXUS 700 (PTP mode) / IXY Digital 600 (normal mode) / PowerShot SD500 (normal mode) / PowerShot SD500 (PTP mode) + 30f4 PowerShot SD30 / Ixus iZoom / IXY DIGITAL L3 30f6 SELPHY CP400 30f8 Powershot A430 30f9 PowerShot A410 (PTP mode) + 30fa PowerShot S80 30fc PowerShot A620 (PTP mode) 30fd PowerShot A610 (normal mode)/PowerShot A610 (PTP mode) 30fe Digital IXUS 65 (PTP mode)/PowerShot SD630 (PTP mode) 30ff Digital IXUS 55 (PTP mode)/PowerShot SD450 (PTP mode) + 3100 PowerShot TX1 310b SELPHY CP600 310e Digital IXUS 50 (PTP mode) 3110 EOS Digital Rebel XTi - 3116 Digital IXUS 750 (PTP mode) + 3116 Digital IXUS 750 / PowerShot SD550 (PTP mode) 3117 PowerShot A700 + 3119 PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS + 311b PowerShot A540 312d Elura 100 3138 PowerShot A710 IS 3147 EOS 1Ds Mark III @@ -3384,17 +3447,39 @@ 3184 Digital IXUS 80 IS (PTP mode) 3192 PowerShot SX110 IS 319a EOS 7D + 31ad PowerShot E1 31bc PowerShot D10 31bf PowerShot A480 31c0 PowerShot SX200 IS 31e5 Digital IXUS 200 IS 31ee SELPHY ES40 31ef PowerShot A495 + 31f1 PowerShot A3100 IS / PowerShot A3150 IS + 31f2 PowerShot A3000 IS 31f3 PowerShot Digital ELPH SD1400 IS + 31f4 PowerShot SD1300 IS / IXUS 105 + 31f5 Powershot SD3500 IS / IXUS 210 IS + 31f6 PowerShot SX210 IS + 31f7 Powershot SD4000 IS / IXUS 300 HS / IXY 30S + 31f8 Powershot SD4500 IS / IXUS 1000 HS / IXY 50S 31ff Digital IXUS 55 3210 Powershot SX30 IS + 3211 PowerShot SX130 IS + 3212 Powershot S95 3214 SELPHY CP800 + 3218 EOS 600D / Rebel T3i (ptp) + 3223 PowerShot A3300 IS + 3224 PowerShot A3200 IS + 3226 PowerShow A800 + 3228 PowerShot SX230 HS 3229 IXUS 220 HS + 322a PowerShot A2200 + 322b Powershot A1200 + 3238 PowerShot SX40 HS + 323f PowerShot A810 + 3243 PowerShot A4000 IS + 3244 PowerShot SX260 HS + 3245 PowerShot SX240 HS 04aa DaeWoo Telecom, Ltd 04ab Chromatic Research 04ac Micro Audiometrics Corp. @@ -3463,8 +3548,10 @@ 040f D200 (mass storage mode) 0410 D200 (ptp) 0413 D40 (mass storage mode) + 041e D60 digital camera (mass storage mode) 0422 D700 (ptp) 0425 D300S + 042a D800 (ptp) 0f03 PD-10 Wireless Printer Adapter 4000 Coolscan LS 40 ED 4001 LS 50 ED/Coolscan V ED @@ -3551,46 +3638,56 @@ 0005 Printer 0006 Printer 0007 Printer - 0101 Perfection 636 + 0101 GT-7000U [Perfection 636] 0102 GT-2200 - 0103 Perfection 610 - 0104 Perfection 1200 - 0105 StylusScan 2000 + 0103 GT-6600U [Perfection 610] + 0104 GT-7600UF [Perfection 1200U/1200U Photo] + 0105 Stylus Scan 2000 0106 Stylus Scan 2500 - 0107 Expression 1600U - 0109 Expression 1640 XL - 010a Perfection 1640SU - 010b Perfection 1240 - 010c Perfection 640 - 010e Perfection 1680 - 010f Perfection 1250 - 0110 Perfection 1650 - 0112 Perfection 2450 + 0107 ES-2000 [Expression 1600U] + 0108 CC-700 + 0109 ES-8500 [Expression 1640 XL] + 010a GT-8700/GT-8700F [Perfection 1640SU/1640SU PHOTO] + 010b GT-7700U [Perfection 1240U] + 010c GT-6700U [Perfection 640] + 010d CC-500L + 010e ES-2200 [Perfection 1680] + 010f GT-7200U [Perfection 1250/1250 PHOTO] + 0110 GT-8200U/GT-8200UF [Perfection 1650/1650 PHOTO] + 0112 GT-9700F [Perfection 2450 PHOTO] 0114 Perfection 660 - 0116 Perfection 3170 (GT-9400) - 0118 Perfection 4180 (GF-F600) - 0119 Perfection 4490 Photo - 011a 1000 ICS - 011b Perfection 2400 Photo - 011c Perfection 3200 - 011d Perfection 1260 Photo - 011e Perfection 1660 Photo - 011f Perfection 1670 - 0120 Perfection 1270 scanner - 0121 Perfection 2480/2580 Photo [GT-F500] - 0122 Perfection 3590 scanner - 0126 GT-15000 (ES-7000) - 0128 Perfection 4870 (GT-X700) - 0129 Expression 10000XL (ES-10000G) - 012a Perfection 4990 Photo scanner - 012b GT-2500 (ES-H300) - 012c Perfection V700 Photo (GT-X900) - 012d Perfection V10/V100 (GT-S600/F650) - 012f Perfection V350 (GT-F700) - 0130 Perfection V500 (GT-X770) - 0131 Perfection V300 - 0136 GT-S80 (ES-D400) - 0137 GT-S50 (ES-D200) + 0116 GT-9400UF [Perfection 3170] + 0118 GT-F600 [Perfection 4180] + 0119 GT-X750 [Perfection 4490 Photo] + 011a CC-550L [1000 ICS] + 011b GT-9300UF [Perfection 2400 PHOTO] + 011c GT-9800F [Perfection 3200] + 011d GT-7300U [Perfection 1260/1260 PHOTO] + 011e GT-8300UF [Perfection 1660 PHOTO] + 011f GT-8400UF [Perfection 1670/1670 PHOTO] + 0120 GT-7400U [Perfection 1270] + 0121 GT-F500/GT-F550 [Perfection 2480/2580 PHOTO] + 0122 GT-F520/GT-F570 [Perfection 3590 PHOTO] + 0126 ES-7000H [GT-15000] + 0128 GT-X700 [Perfection 4870] + 0129 ES-10000G [Expression 10000XL] + 012a GT-X800 [Perfection 4990 PHOTO] + 012b ES-H300 [GT-2500] + 012c GT-X900 [Perfection V700/V750 Photo] + 012d GT-F650 [GT-S600/Perfection V10/V100] + 012e GT-F670 [Perfection V200 Photo] + 012f GT-F700 [Perfection V350] + 0130 GT-X770 [Perfection V500] + 0131 GT-F720 [GT-S620/Perfection V30/V300 Photo] + 0133 GT-1500 [GT-D1000] + 0135 GT-X970 + 0136 ES-D400 [GT-S80] + 0137 ES-D200 [GT-S50] + 0138 ES-H7200 [GT-20000] + 013a GT-X820 [Perfection V600 Photo] + 0142 GT-F730 [GT-S630/Perfection V33/V330 Photo] + 0143 GT-S55 + 0144 GT-S85 0202 Receipt Printer M129C 0401 CP 800 Digital Camera 0402 PhotoPC 850z @@ -3598,38 +3695,38 @@ 0509 JVC PIX-MC10 0601 Stylus Photo 875DC Card Reader 0602 Stylus Photo 895 Card Reader - 0801 Stylus CX5200/CX5400/CX6600 - 0802 Stylus CX3200 + 0801 CC-600PX [Stylus CX5200/CX5400/CX6600] + 0802 CC-570L [Stylus CX3100/CX3200] 0803 Printer (Composite Device) 0804 Storage Device - 0805 Stylus CX6400 - 0806 Stylus Photo RX600/610 + 0805 Stylus CX6300/CX6400 + 0806 PM-A850 [Stylus Photo RX600/610] 0807 Stylus Photo RX500/510 - 0808 Stylus CX5200 + 0808 Stylus CX5200/CX5300/CX5400 0809 Storage Device - 080a Storage Device - 080c ME100 + 080a F-3200 + 080c ME100 [Stylus CX1500] 080d Stylus CX4500/4600 - 080e CX-3500/3600/3650 MFP - 080f Stylus Photo RX425 scanner - 0810 Stylus Photo RX700 (PM-A900) - 0811 Stylus Photo RX620 all-in-one + 080e PX-A550 [CX-3500/3600/3650 MFP] + 080f Stylus Photo RX420/RX425/RX430 + 0810 PM-A900 [Stylus Photo RX700] + 0811 PM-A870 [Stylus Photo RX620/RX630] 0812 MFP Composite Device 0813 Stylus CX6500/6600 - 0814 (PM-A700) - 0815 AcuLaser CX11 (LP-A500) + 0814 PM-A700 + 0815 LP-A500 [AcuLaser CX1] 0816 Printer (Composite Device) - 0817 (LP-M5500) + 0817 LP-M5500/LP-M5500F 0818 Stylus CX3700/CX3800/DX3800 - 0819 Stylus CX4700/CX4800/DX4800 (PX-A750) - 081a Stylus Photo RX520/RX530 (PM-A750) + 0819 PX-A650 [Stylus CX4700/CX4800/DX4800/DX4850] + 081a PM-A750 [Stylus Photo RX520/RX530] 081b MFP Composite Device - 081c Stylus Photo RX640/RX650 (PM-A890) - 081d (PM-A950) + 081c PM-A890 [Stylus Photo RX640/RX650] + 081d PM-A950 081e MFP Composite Device 081f Stylus CX7700/7800 - 0820 CX4200 MP scanner - 0821 MFP Composite Device + 0820 Stylus CX4100/CX4200/DX4200 + 0821 Stylus CX5700F/CX5800F 0822 Storage Device 0823 MFP Composite Device 0824 Storage Device @@ -3665,6 +3762,7 @@ 0851 Stylus SX410 0856 Stylus SX515W 085c Stylus SX125 + 087b Stylus Photo PX730WD (Printer, Scanner, Copier) 04b9 Rainbow Technologies, Inc. 0300 SafeNet USB SuperPro/UltraPro 1000 iKey 1000 Token @@ -4248,7 +4346,9 @@ 5f02 NEXiO Sync 5f03 NEXiO Sync 5f04 NEXiO Sync + 5f05 STORY Station 1TB 6032 G2 Portable hard drive + 60b3 M2 Portable Hard Drive 60c4 M2 Portable Hard Drive USB 3.0 6601 Mobile Phone 6602 Galaxy @@ -4286,7 +4386,9 @@ 684e Wave (GT-S8500) 685b GT-I9100 Phone [Galaxy S II] (mass storage mode) 685e GT-I9100 Phone [Galaxy S II] (USB Debugging mode) - 6860 GT-I9100 Phone [Galaxy S II] + 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) 6875 GT-B3710 Standalone LTE device (Commercial) 6876 GT-B3710 LTE Modem 6877 Galaxy S @@ -4380,12 +4482,15 @@ b175 4-Port Hub b1aa Webcam-101 b1b4 Lenovo Integrated Camera + b1b9 Asus Integrated Webcam b1cf Lenovo Integrated Camera b217 Lenovo Integrated Camera (0.3MP) b221 integrated camera b230 Integrated HP HD Webcam + b257 Lenovo Integrated Camera b26b Sony Visual Communication Camera b272 Lenovo EasyCamera + b2b9 Lenovo Integrated Camera UVC 04f3 Elan Microelectronics Corp. 01a4 Wireless Keyboard 0210 AM-400 Hama Optical Mouse @@ -4588,6 +4693,7 @@ 01ea DCP-7030 01eb MFC-7320 01f4 MFC-5890CN + 0223 DCP-365CN 1000 Printer 1002 Printer 2002 PTUSB Printing @@ -4724,7 +4830,9 @@ 0815 Nostromo n52 HID SpeedPad Mouse Wheel 0826 ErgoFit Wireless Optical Mouse (HID) 0980 HID UPS Battery + 1004 F9L1004 802.11n Surf N300 XR Wireless Adapter [Realtek RTL8192CU] 1102 F7D1102 N150/Surf Micro Wireless Adapter v1000 [Realtek RTL8188CUS] + 1103 F9L1103 N750 DB 802.11abgn 2x3:3 [Ralink RT3573] 1202 F5U120-PC Parallel Printer Port 1203 F5U120-PC Serial Port 2103 F7D2102 802.11n N300 Micro Wireless Adapter v3000 [Realtek RTL8192CU] @@ -4733,6 +4841,7 @@ 3201 F1DF102U/F1DG102U Flip KVM 4050 ZD1211B 5055 F5D5055 Gigabit Network Adapter [AX88xxx] + 6050 F6D6050 802.11abgn Wireless Adapter [Broadcom BCM4323] 6051 F5D6051 802.11b Wireless Network Adapter [ZyDAS ZD1201] 615a F7D4101 / F9L1101 802.11abgn Wireless Adapter [Broadcom BCM4323] 7050 F5D7050 Wireless G Adapter v1000/v2000 [Intersil ISL3887] @@ -4748,7 +4857,7 @@ 815c F5D8053 N Wireless USB Adapter v3000 [Ralink RT2870] 815f F5D8053 N Wireless USB Adapter v6000 [Realtek RTL8192SU] 825a F5D8055 N+ Wireless Adapter v1000 [Ralink RT2870] - 825b F5D8055 N+ Wireless Adapter v2000 [Ralink RT3070] + 825b F5D8055 N+ Wireless Adapter v2000 [Ralink RT3072] 845a F7D2101 802.11n Surf & Share Wireless Adapter v1000 [Realtek RTL8192SU] 905b F5D9050 Wireless G+ MIMO Network Adapter v3000 [Ralink RT2573] 905c F5D9050 Wireless G+ MIMO Network Adapter v4000 [Ralink RT2573] @@ -4756,6 +4865,7 @@ 935b F6D4050 N150 Enhanced Wireless Network Adapter v2000 [Ralink RT3070] 945a F7D1101 v1 Basic Wireless Adapter [Realtek RTL8188SU] 945b F7D1101 v2 Basic Wireless Adapter [Ralink RT3370] + d321 Dynex DX-NUSB 802.11bgn Wireless Adapter 050e Neon Technology, Inc. 050f KC Technology, Inc. 0001 Hub @@ -5108,6 +5218,7 @@ 035c NWZ-A726/A728/A729 0382 Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1) 0385 Walkman NWZ-E436F + 0387 Sony IC Recorder (P) 03bc Webbie HD - MHS-CM1 03d3 DR-BT100CX 03d5 PlayStation Move motion controller @@ -5349,6 +5460,7 @@ 0003 Device Bay Controller 056e Elecom Co., Ltd 0002 29UO Mouse + 0072 Mouse 200c LD-USB/TX 4002 Laneed 100Mbps Ethernet LD-USB/TX [pegasus] 4005 LD-USBL/TX @@ -5375,8 +5487,10 @@ 1253 Zoom V.92 Faxmodem 1300 SoftK56 Data Fax Voice CARP 1301 Modem Enumerator + 1328 TrendNet TFM-561 modem 2000 SoftGate 802.11 Adapter 2002 SoftGate 802.11 Adapter + 262a tm5600 Video & Audio Grabber Capture 8390 WinFast PalmTop/Novo TV Video 8392 WinFast PalmTop/Novo TV Video cafe AccessRunner ADSL Modem @@ -5487,7 +5601,7 @@ 62ff AVM Fritz!WLAN USB (in CD-ROM-mode) 8401 Fritz!WLAN N [Atheros AR9001U] 8402 Fritz!WLAN N 2.4 [Atheros AR9001U] - 8403 Fritz!WLAN N v2 [Atheros AR7010] + 8403 Fritz!WLAN N v2 [Atheros AR9271] 84ff AVM Fritz!WLAN USB N (in CD-ROM-mode) 057d Shark Multimedia, Inc. 057e Nintendo Co., Ltd @@ -5659,6 +5773,7 @@ 0008 Fujifilm MemoryCard ReaderWriter 0220 U2SCX SCSI Converter b000 REX-USB60 + b020 REX-USB60F 0585 FlashPoint Technology, Inc. 0001 Digital Camera 0002 Digital Camera @@ -5688,9 +5803,12 @@ 3400 ZyAIR B-220 IEEE 802.11b Adapter 3401 ZyAIR G-220 802.11bg 3402 ZyAIR G-220F 802.11bg + 3403 AG-200 802.11abg Wireless Adapter [Atheros AR5523] 3407 G-200 v2 802.11bg + 3408 G-260 802.11bg 3409 AG-225H 802.11bg 340a M-202 802.11bg + 340c G-270S 802.11bg Wireless Adapter [Atheros AR5523] 340f G-220 v2 802.11bg 3410 ZyAIR G-202 802.11bg 3412 802.11bg @@ -5699,9 +5817,11 @@ 3416 NWD-210N 802.11b/g/n-draft wireless adapter 3417 NWD271N 802.11n Wireless Adapter [Atheros AR9001U-(2)NG] 3418 NWD211AN 802.11abgn Wireless Adapter [Ralink RT2870] + 3419 G-220 v3 802.11bg Wireless Adapter [ZyDAS ZD1211B] 341a NWD-270N Wireless N-lite USB Adapter 341e NWD2105 802.11bgn Wireless Adapter [Ralink RT3070] 341f NWD2205 802.11n Wireless N Adapter [Realtek RTL8192CU] + 343e N220 802.11bgn Wireless Adapter 0587 America Kotobuki Electronics Industries, Inc. 0588 Sapien Design 0589 Victron @@ -5742,11 +5862,11 @@ 6360 Multimedia Card Reader 6361 Multimedia Card Reader 6362 Flash Card Reader/Writer - 6364 AU6476 Card Reader Controller + 6364 AU6477 Card Reader Controller 6366 Multi Flash Reader 6377 Multimedia Card Reader 6386 Memory Card - 6387 Transcend JetFlash Flash Drive + 6387 Flash Drive 6390 USB 2.0-IDE bridge 9213 MacAlly Kbd Hub 9215 AU9814 Hub @@ -6014,11 +6134,13 @@ 129e iPod Touch 4.Gen 129f iPad 2 12a0 iPhone 4S + 12a2 iPad 2 (3G; 64GB) 1300 iPod Shuffle 1301 iPod Shuffle 2.Gen 1302 iPod Shuffle 3.Gen 1303 iPod Shuffle 4.Gen 1401 Modem + 1402 Ethernet Adapter [A1277] 8202 HCF V.90 Data/Fax Modem 8203 Bluetooth HCI 8204 Bluetooth HCI [Bluetooth 2.0 + EDR, built-in] @@ -6042,9 +6164,15 @@ 8509 FaceTime HD Camera 911c Hub in A1082 [Cinema HD Display 23"] 912f Hub in 30" Cinema Display + 9215 Studio Display 15" + 9217 Studio Display 17" + 9218 Cinema Display 23" + 9219 Cinema Display 20" 921c A1082 [Cinema HD Display 23"] + 921e Cinema Display 24" 9221 30" Cinema Display 9227 Thunderbolt Display + 9232 Cinema HD Display 30" ffff Bluetooth in DFU mode - Driver 05ad Y.C. Cable U.S.A., Inc. 05ae Synopsys, Inc. @@ -6143,6 +6271,7 @@ 1810 Pavilion Webcam [R5U870] 1812 Pavilion Webcam 1814 HD Webcam + 1820 Integrated Webcam 1830 Visual Communication Camera VGP-VCC2 [R5U870] 1832 Visual Communication Camera VGP-VCC3 [R5U870] 1833 Visual Communication Camera VGP-VCC2 [R5U870] @@ -6160,6 +6289,7 @@ 18b0 Sony Vaio Integrated Webcam 18b1 Sony Vaio Integrated Webcam 18b3 Sony Vaio Integrated Webcam + 18b5 Sony Vaio Integrated Webcam 2201 RDC-7 Camera 2202 Caplio RR30 2203 Caplio 300G @@ -6467,6 +6597,7 @@ 0716 USB 2.0 Multislot Card Reader/Writer 0717 All-in-1 Card Reader 0718 IDE/SATA Adapter + 0719 SATA adapter 0723 GL827L SD/MMC/MS Flash Card Reader 0726 SD Card Reader 0727 microSD Reader/Writer @@ -6571,6 +6702,7 @@ 1006 Japanese Keyboard - 260U 2101 Keyboard 2231 KSK-6001 UELX Keyboard + 2270 Gigabyte K8100 Aivia Gaming Keyboard 5811 ACK-571U Wireless Keyboard 5903 Japanese Keyboard - 595U 6001 SolidTek USB 2p HUB @@ -6607,6 +6739,7 @@ 061b Promptus Communications, Inc. 061c Act Labs, Ltd 061d Quatech, Inc. + c020 SSU-100 061e Nissei Electric Co. 0001 nissei 128DE-USB - 0010 nissei 128DE-PNA - @@ -7236,17 +7369,17 @@ 0009 Monitor Control 06ca Newer Technology, Inc. 06cb Synaptics, Inc. - 0001 HID Device - 0002 HID Device - 0003 HID Device + 0001 TouchPad + 0002 Integrated TouchPad + 0003 cPad 0005 Touchpad/FPS - 0006 HID Device - 0007 HID Device - 0008 HID Device + 0006 TouchScreen + 0007 USB Styk + 0008 WheelPad 0009 Composite TouchPad and TrackPoint 000e HID Device - 0010 Composite Human Interface Device - 0013 Human Interface Device + 0010 Wireless TouchPad + 0013 DisplayPad 06cc Terayon Communication Systems 0101 Cable Modem 0102 Cable Modem @@ -7288,6 +7421,8 @@ 012a USA-49Wlc serial adapter 0201 UIA-10 Digital Media Remote [Cypress AN2131SC] 0202 UIA-11 Digital Media Remote +06ce Contec + 8311 COM-1(USB)H 06cf SpheronVR AG 1010 PanoCam 10 1012 PanoCam 12/12X @@ -7349,6 +7484,7 @@ a191 Instant VideoXpress a337 Mini DigitalTV a701 DVD Xpress + a708 saa7114H video input card (Instant VideoMPX) b337 Mini DigitalTV b701 DVD Xpress B 06e4 Alcatel Microelectronics @@ -7714,6 +7850,7 @@ 0005 Cyber Power UPS 0501 CP1500 AVR UPS 0765 X-Rite, Inc. + 5001 Huey PRO Colorimeter d094 X-Rite DTP94 [Quato Silver Haze Pro] 0766 Jess-Link Products Co., Ltd 0204 TopSpeed Cyberlink Remote Control @@ -7891,11 +8028,13 @@ 00b3 DVD Multi-plus unit LDR-H443U2 0105 LAN-TX/U1H2 10/100 Ethernet Adapter [pegasus II] 010c Realtek RTL8187 Wireless 802.11g 54Mbps Network Adapter + 0160 LAN-GTJ/U2A 0162 LAN-WN22/U2 Wireless LAN Adapter 0163 LAN-WN12/U2 Wireless LAN Adapter 0164 LAN-W150/U2M Wireless LAN Adapter 0166 LAN-W300N/U2 Wireless LAN Adapter 0168 LAN-W150N/U2 Wireless LAN Adapter + 0170 LAN-W300AN/U2 Wireless LAN Adapter 078b Happ Controls, Inc. 0010 Driving UGCI 0020 Flying UGCI @@ -7963,7 +8102,9 @@ 0018 Wireless LAN USB-11 mini 2 001a ULUSB-11 Key 001c CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887] + 002e CG-WLUSB2GPX [Ralink RT2571W] 002f CG-WLUSB2GNL + 0031 CG-WLUSB2GS 802.11bg [Atheros AR5523] 003c CG-WLUSB2GNL 003f CG-WLUSB300AGN 0041 CG-WLUSB300GNS @@ -8124,6 +8265,8 @@ 07bd Webgear, Inc. 07be Veridicom 07c0 Code Mercenaries Hard- und Software GmbH + 1113 JoyWarrior24F8 + 1116 JoyWarrior24F14 1121 The Claw 1500 IO-Warrior 40 1501 IO-Warrior 24 @@ -8303,11 +8446,12 @@ 3a0f DWA-130 802.11n Wireless N Adapter(rev.D) [Atheros AR9170+AR9102] 3a10 DWA-126 802.11n Wireless Adapter [Atheros AR9271] 3b01 AirPlus G DWL-G122 Wireless Adapter(rev.D) [Marvell 88W8338+88W8010] - 3b10 RangeBooster N Adapter + 3b10 DWA-142 RangeBooster N Adapter [Marvell 88W8362+88W8060] 3b11 DWA-130 802.11n Wireless N Adapter(rev.A1) [Marvell 88W8362+88W8060] 3c03 AirPlus G DWL-G122 Wireless Adapter(rev.C1) [Ralink RT2571W] 3c04 WUA-1340 3c05 EH103 Wireless G Adapter + 3c06 DWA-111 802.11bg Wireless Adapter [Ralink RT2571W] 3c07 DWA-110 Wireless G Adapter(rev.A1) [Ralink RT2571W] 3c09 DWA-140 RangeBooster N Adapter(rev.B1) [Ralink RT2870] 3c0a DWA-140 RangeBooster N Adapter(rev.B2) [Ralink RT3072] @@ -8379,7 +8523,8 @@ 0802 Mako Technologies, LLC 0803 Zoom Telephonics, Inc. 1300 V92 Faxmodem - 4310 Wireless-G + 4310 4410a Wireless-G Adapter [Intersil ISL3887] + 4410 4410b Wireless-G Adapter [ZyDAS ZD1211B] 5241 Cable Modem 5551 DSL Modem 9700 2986L FaxModem @@ -8525,7 +8670,7 @@ b522 SMCWUSBS-N2 EZ Connect N Wireless Adapter [Ralink RT2870] bb01 BlueExpert Bluetooth Device c003 802.11b Wireless Adapter - c501 Zoom Wireless-G + c501 Zoom 4410 Wireless-G [Intersil ISL3887] c561 802.11a/g Wireless Adapter d522 Speedport W 102 Stick IEEE 802.11n USB 2.0 Adapter e501 ZD1211B @@ -8563,6 +8708,7 @@ 9001 WN111(v2) RangeMax Next Wireless [Atheros AR9170+AR9101] 9010 WNDA3100v1 802.11abgn [Atheros AR9170+AR9104] 9011 WNDA3100v2 802.11abgn [Broadcom BCM4323] + 9012 WNDA4100 802.11abgn 3x3:3 [Ralink RT3573] 9018 WNDA3200 802.11abgn Wireless Adapter [Atheros AR7010+AR9280] 9020 WNA3100(v1) Wireless-N 300 [Broadcom BCM43231] 9030 WNA1100 Wireless-N 150 [Atheros AR9271] @@ -9275,6 +9421,7 @@ 1624 DataTraveler G2 4GB Pen Drive 1625 DataTraveler 101 II 162a DataTraveler 112 4GB Pen Drive + 1642 DT101 G2 1643 DataTraveler G3 4GB 1653 Data Traveler 100 G2 8 GiB 0954 RPM Systems Corp. @@ -9284,6 +9431,8 @@ 0957 Agilent Technologies, Inc. 0200 E-Video DC-350 Camera 0202 E-Video DC-350 Camera + 0518 82357B GPIB Interface + 1745 Test and Measurement Device (IVI) 0958 CompuLink Research, Inc. 0959 Cologne Chip AG 2bd0 Intelligent ISDN (Ver. 3.60.04) @@ -9318,6 +9467,8 @@ 097b Knudsen Engineering, Ltd 097c Marunix Co., Ltd 097d Rosun Technologies, Inc. +097e Biopac Systems Inc. + 0035 MP35 v1.0 097f Barun Electronics Co., Ltd 0981 Oak Technology, Ltd 0984 Apricorn @@ -9408,6 +9559,7 @@ 09da A4 Tech Co., Ltd 0006 Optical Mouse WOP-35 / Trust 450L Optical Mouse 000a Optical Mouse Opto 510D + 000e X-F710F Optical Mouse 3xFire Gaming Mouse 0018 Trust Human Interface Device 001a Wireless Mouse & RXM-15 Receiver 002a Wireless Optical Mouse NB-30 @@ -9859,8 +10011,9 @@ 1060 OPEN NT1 Plus II 0acc Koga Electronics Co. 0acd ID Tech - 0401 ID TECH Spectrum III Hybrid Smartcard Reader - 0630 ID TECH Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC + 0300 IDT1221U RS-232 Adapter + 0401 Spectrum III Hybrid Smartcard Reader + 0630 Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC 0ace ZyDAS 1201 ZD1201 802.11b 1211 ZD1211 802.11g @@ -9967,10 +10120,14 @@ 1774 Gobi Wireless Modem (QDL mode) 1776 Gobi Wireless Modem 1779 My Cinema U3100 Mini Plus [AF9035A] - 1784 USB-N13 802.11n Network Adapter [Ralink RT3072] + 1784 USB-N13 802.11n Network Adapter (rev. A1) [Ralink RT3072] 1786 USB-N10 802.11n Network Adapter [Realtek RTL8188SU] 1791 WL-167G v3 802.11n Adapter [Realtek RTL8188SU] 179d USB-N53 802.11abgn Network Adapter [Ralink RT3572] + 179e Eee Note EA800 (network mode) + 179f Eee Note EA800 (tablet mode) + 17a1 Eee Note EA800 (mass storage mode) + 17ab USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU] 6101 Cable Modem 620a Remote NDIS Device b700 Broadcom Bluetooth 2.1 @@ -10022,7 +10179,7 @@ 1602 ZyXEL ZyAIR B200 802.11b Adapter 1612 AIR.Mate 2@net 802.11b Adapter 1613 802.11b Wireless LAN Adapter - 1620 Allnet USB 2.0 Wireless Network Adapter + 1620 Allnet Wireless Network Adapter [Envara WiND512] 1630 QuickWLAN 802.11bg 5630 802.11bg 6630 ZD1211 @@ -10035,6 +10192,7 @@ 0011 Crossam2+USB IR commander 0b43 Play.com, Inc. 0003 PS2 Controller Converter + 0005 GameCube Adaptor 0b47 Sportbug.com, Inc. 0b48 TechnoTrend AG 1003 Technotrend/Hauppauge USB-Nova @@ -10170,7 +10328,7 @@ 0302 U10H010 802.11b Wireless Adapter [Intersil PRISM 3] 6098 USB Cable Modem 0bb3 Ofuji Technology -0bb4 High Tech Computer Corp. +0bb4 HTC (High Tech Computer Corp.) 00ce mmO2 XDA GSM/GPRS Pocket PC 00cf SPV C500 Smart Phone 0a01 PocketPC Sync @@ -10346,6 +10504,7 @@ 0c13 Diamond 0c1f Sony Ericsson XPERIA X1 0c5f Snap + 0c86 Sensation 0c87 Desire (debug) 0c8d EVO 4G (debug) 0c91 Vision @@ -10374,8 +10533,10 @@ 2000 Storage Adapter V3 (TPP) 2200 FreeAgent Go FW 2300 Expansion Portable + 3332 Expansion 5021 FreeAgent GoFlex USB 2.0 5031 FreeAgent GoFlex USB 3.0 + 50a5 FreeAgent GoFlex Desk USB 3.0 0bc3 IPWireless, Inc. 0001 UMTS-TDD (TD-CDMA) modem 0bc4 Microcube Corp. @@ -10445,6 +10606,7 @@ 8187 RTL8187 Wireless Adapter 8189 RTL8187B Wireless 802.11g 54Mbps Network Adapter 8192 RTL8192U 802.11n Wireless Adapter + 8193 RTL8192DU 802.11an WLAN Adapter 8197 RTL8187B Wireless Adapter 8198 RTL8187B Wireless Adapter 0bdb Ericsson Business Mobile Networks BV @@ -10468,6 +10630,7 @@ 0be6 Dong Guan Humen Wonderful Wire Cable Factory 0bed Silicon Labs 1100 MEI (TM) Cashflow-SC Bill/Voucher Acceptor + 1101 Series 2000 Combo Acceptor 0bee LTK Industries, Ltd 0bef Way2Call Communications 0bf0 Pace Micro Technology PLC @@ -10714,6 +10877,7 @@ 641d 1.3 MPixel Integrated Webcam 6480 Sonix 1.3 MP Laptop Integrated Webcam 64bd Sony Visual Communication Camera + 7402 TEMPerHUM Temperature & Humidity Sensor 8000 DC31VC 8006 Dual Mode Camera (8006 VGA) 800a Vivitar Vivicam3350B @@ -10728,7 +10892,57 @@ 0c4c Needham's Electronics 0021 EMP-21 Universal Programmer 0c52 Sealevel Systems, Inc. - 2101 Serial Converter + 2101 SeaLINK+232 + 2102 SeaLINK+485 + 2103 SeaLINK+232I + 2104 SeaLINK+485I + 2211 SeaPORT+2/232 (Port 1) + 2212 SeaPORT+2/485 (Port 1) + 2213 SeaPORT+2 (Port 1) + 2221 SeaPORT+2/232 (Port 2) + 2222 SeaPORT+2/485 (Port 2) + 2223 SeaPORT+2 (Port 2) + 2411 SeaPORT+4/232 (Port 1) + 2412 SeaPORT+4/485 (Port 1) + 2413 SeaPORT+4 (Port 1) + 2421 SeaPORT+4/232 (Port 2) + 2422 SeaPORT+4/485 (Port 2) + 2423 SeaPORT+4 (Port 2) + 2431 SeaPORT+4/232 (Port 3) + 2432 SeaPORT+4/485 (Port 3) + 2433 SeaPORT+4 (Port 3) + 2441 SeaPORT+4/232 (Port 4) + 2442 SeaPORT+4/485 (Port 4) + 2443 SeaPORT+4 (Port 4) + 2811 SeaLINK+8/232 (Port 1) + 2812 SeaLINK+8/485 (Port 1) + 2813 SeaLINK+8 (Port 1) + 2821 SeaLINK+8/232 (Port 2) + 2822 SeaLINK+8/485 (Port 2) + 2823 SeaLINK+8 (Port 2) + 2831 SeaLINK+8/232 (Port 3) + 2832 SeaLINK+8/485 (Port 3) + 2833 SeaLINK+8 (Port 3) + 2841 SeaLINK+8/232 (Port 4) + 2842 SeaLINK+8/485 (Port 4) + 2843 SeaLINK+8 (Port 4) + 2851 SeaLINK+8/232 (Port 5) + 2852 SeaLINK+8/485 (Port 5) + 2853 SeaLINK+8 (Port 5) + 2861 SeaLINK+8/232 (Port 6) + 2862 SeaLINK+8/485 (Port 6) + 2863 SeaLINK+8 (Port 6) + 2871 SeaLINK+8/232 (Port 7) + 2872 SeaLINK+8/485 (Port 7) + 2873 SeaLINK+8 (Port 7) + 2881 SeaLINK+8/232 (Port 8) + 2882 SeaLINK+8/485 (Port 8) + 2883 SeaLINK+8 (Port 8) + 9020 SeaLINK+422 + a02a SeaLINK+8 (Port 1+2) + a02b SeaLINK+8 (Port 3+4) + a02c SeaLINK+8 (Port 5+6) + a02d SeaLINK+8 (Port 7+8) 0c53 ViewPLUS, Inc. 0c54 Glory, Ltd 0c55 Spectrum Digital, Inc. @@ -10749,10 +10963,13 @@ 0c65 Eminence Enterprise Co., Ltd 0c66 Rexon Electronics Corp. 0c67 Concept Telecom, Ltd +0c6c JETI Technische Instrumente GmbH + 04b2 Specbos 1201 0c70 MCT Elektronikladen 0000 USB08 Development board 0c72 PEAK System 000c PCAN-USB + 000d PCAN Pro 0c74 Optronic Laboratories Inc. 0002 OL 700-30 Goniometer 0c76 JMTek, LLC. @@ -10875,6 +11092,7 @@ 0077 Aureon Dual USB 0078 Cinergy T XXS 0086 Cinergy Hybrid XE + 008e Cinergy HTC XS 0097 Cinergy T RC MKII 0099 AfaTech 9015 [Cinergy T Stick Dual] 00a5 Cinergy Hybrid Stick @@ -11046,7 +11264,7 @@ 0d61 Meilu Electronics (Shenzhen) Co., Ltd 0d62 Darfon Electronics Corp. 0003 Smartcard Reader - 0004 Filter Driver + 0004 Keyboard 001c Benq X120 Internet Keyboard Pro 0306 M530 Mouse 0800 Magic Wheel @@ -11377,11 +11595,15 @@ 0045 WL-353 Wireless USB Adapter 150N Nano 0047 WL-352v1 Wireless USB Adapter 300N 002 0048 WL-349v1 Wireless Adapter 150N 002 [Ralink RT3070] + 0049 WL-356 Wireless Adapter 300N 004a WL-358v1 Wireless Micro USB Adapter 300N X3 002 004b WL-349v3 Wireless Micro Adapter 150N X1 [Realtek RTL8192SU] 004c WL-352 802.11n Adapter [Realtek RTL8191SU] 0050 WL-349v4 Wireless Micro Adapter 150N X1 [Ralink RT3370] + 0056 LN-031 10/100/1000 Ethernet Adapter 005d WLA-2000 v1.001 WLAN [RTL8191SU] + 0060 WLA-4000 802.11bgn [Ralink RT3072] + 0062 WLA-5000 802.11abgn [Ralink RT3572] 061c LN-028 Network USB 2.0 Adapter 21f4 44 St Bluetooth Device 2200 Sitecom bluetooth2.0 class 2 dongle CN-512 @@ -11470,6 +11692,7 @@ 0e3b Mansella, Ltd 0e41 Line6, Inc. 4147 TonePort GX + 4156 POD HD Desktop 4250 BassPODxt 4252 BassPODxt Pro 4642 BassPODxt Live @@ -11486,6 +11709,8 @@ 1097 Gamester Controller 2390 Games Jtech Controller 7288 funkey reader +0e50 TechnoData Interware + 0002 Matrixlock Dongle (HID) 0e55 Speed Dragon Multimedia, Ltd 110a Tanic S110-SG1 + ISSC IS1002N [Slow Infra-Red (SIR) & Bluetooth 1.2 (Class 2) Adapter] 110b MS3303H USB-to-Serial Bridge @@ -11506,6 +11731,7 @@ 0009 HWUN2 Hi-Gain Wireless-150N Adapter w/ Upgradable Antenna [Ralink RT2770] 000b HWDN2 Hi-Gain Wireless-150N Dish Adapter [Ralink RT2770] 0013 HWUN3 Hi-Gain Wireless-N Adapter [Ralink RT3070] + 0015 HWDN2 Rev. E Hi-Gain Wireless-150N Dish Adapter [Realtek RTL8191SU] 0017 HAWNU1 Hi-Gain Wireless-150N Network Adapter with Range Amplifier [Ralink RT3070] 0018 Wireless-N Network Adapter [Ralink RT2870] 400b UF100 10/100 Network Adapter @@ -11800,6 +12026,7 @@ 00d4 C902 [MTP] 00d9 C702 Phone 0112 W995 Walkman Phone + 0166 Xperia Mini Pro 1010 WMC Modem 10af V640i Phone [PictBridge] 10d4 C902 Phone [PictBridge] @@ -11849,7 +12076,11 @@ e12e X10i Phone e133 Vivaz e14f Xperia Arc/X12 + e161 Xperia Ray 0fcf Dynastream Innovations, Inc. + 1003 ANT Development Board + 1004 ANT2USB + 1006 ANT Development Board 0fd0 Tulip Computers B.V. 0fd1 Giant Electronics Ltd. 0fd4 Tenovis GmbH & Co., KG @@ -11978,6 +12209,7 @@ 1038 Ideazon, Inc. 0100 Zboard 1039 devolo AG + 0824 1866 802.11bg [Texas Instruments TNETW1450] 2140 dsl+ 1100 duo 103d Stanton 0100 ScratchAmp @@ -12047,6 +12279,7 @@ 0903 My Book Premium Edition 0910 MyBook Essential External HDD 1001 External Hard Disk [Elements] + 1003 Elements 1000 GB 1010 Elements External HDD 1021 Elements 2TB 1023 Elements SE @@ -12105,6 +12338,7 @@ 3701 Broadband Wireless modem 3702 Pantech PX-500 3714 PANTECH USB MODEM [UM175] + 3716 UMW190 Modem 3eb4 Packet Service Diagnostic Serial Port (WDM) 4101 Packet Service Diagnostic Serial Port (WDM) 4102 Packet Service @@ -12208,11 +12442,20 @@ 80a9 CP210x to UART Bridge Controller 80ca ATM2400 Sensor Device 813f tams EasyControl + 8149 West Mountain Radio Computerized Battery Analyzer + 814a West Mountain Radio RIGblaster P&P + 814b West Mountain Radio RIGtalk 818a Silicon Labs FM Radio Reference Design + 81e8 Zephyr BioHarness 8460 Sangoma Wanpipe VoiceTime 8461 Sangoma U100 + 8477 Balluff RFID Reader 86bc C8051F34x AudioDelay [AD-340] - ea60 CP210x Composite Device + 8789 C8051F34x Extender & EDID MGR [EMX-DVI] + ea60 CP210x UART Bridge / myAVR mySmartUSB light + ea61 CP210x UART Bridge + ea70 CP210x UART Bridge + ea80 CP210x UART Bridge 10c5 Sanei Electric, Inc. 819a FM Radio 10c6 Intec, Inc. @@ -12472,7 +12715,8 @@ 1230 Chipidea-Microelectronica, S.A. 1233 Denver Electronics 5677 FUSB200 mp3 player -1234 Unknown +1234 Brain Actuated Technologies + 0000 Neural Impulse Actuator Prototype 1.0 [NIA] ed02 Emotiv EPOC Developer Headset Wireless Dongle 1235 Novation EMS 0001 ReMOTE Audio/XStation @@ -12490,6 +12734,8 @@ 124a AirVast 168b PRISM3 WLAN Adapter 4017 PC-Chips 802.11b Adapter + 4023 WM168g 802.11bg Wireless Adapter [Intersil ISL3886] + 4025 IOGear GWU513 v2 802.11bg Wireless Adapter [Intersil ISL3887] 124b Nyko (Honey Bee) 4d01 Airflo EX Joystick 124c MXI - Memory Experts International, Inc. @@ -12587,6 +12833,7 @@ 12d1 Huawei Technologies Co., Ltd. 1001 E169/E620/E800 HSDPA Modem 1003 E220 HSDPA Modem / E230/E270/E870 HSDPA/HSUPA Modem + 1004 E220 (bis) 1009 U120 1010 ETS2252+ CDMA Fixed Wireless Terminal 1035 U8120 @@ -12596,6 +12843,8 @@ 1406 E1750 140b EC1260 Wireless Data Modem HSD USB Card 1446 E1552/E1800/E173 (HSPA modem) + 14c9 K3770 3G Modem + 14d1 K3770 3G Modem (Mass Storage Mode) 14f1 Gobi 3000 HSPA+ Modem 1501 Pulse 1505 E398 LTE/UMTS/GSM Modem/Networkcard @@ -12688,7 +12937,7 @@ 0401 G2CCD-S with Sony ICX285 CCD 0402 G2CCD2 0403 G2/G3CCD-I KAI CCD - 0404 G2/G3CCD-F KAF CCD + 0404 G2/G3/G4 CCD-F KAF CCD 0410 G1-0400 CCD 0411 G1-0800 CCD 0412 G1-0300 CCD @@ -12738,7 +12987,7 @@ 138e Jungo LTD 9000 Raisonance S.A. STM32 ARM evaluation board 1390 TOMTOM B.V. - 0001 GO 520 T/ONE XL (v9) + 0001 GO 520 T/GO 630/ONE XL (v9) 1391 IdealTEK, Inc. 1000 URTC-1000 1395 Sennheiser Communications @@ -14745,6 +14994,14 @@ 2650 Electronics For Imaging, Inc. [hex] 2659 Sundtek 1101 TNT DVB-T/DAB/DAB+/FM + 1201 FM Transmitter/Receiver + 1202 MediaTV Analog/FM/DVB-T + 1203 MediaTV Analog/FM/DVB-T MiniPCIe + 1204 MediaTV Analog/FM/ATSC + 1205 SkyTV Ultimate V + 1206 MediaTV DVB-T MiniPCIe + 1207 Sundtek HD Capture + 1208 Sundtek SkyTV Ultimate III 2730 Citizen 200f CT-S310 Label printer 2735 DigitalWay hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 87bcb6cf73f1ec0f85c45d0d559ad7690b57db92
by git＠ipfire.org 04 Sep '12

04 Sep '12

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, thirteen has been updated via 87bcb6cf73f1ec0f85c45d0d559ad7690b57db92 (commit) via ad9406987b4d8c843722da55b6176c2a5cca5119 (commit) from 39c445ab38164511270784c1480bf2a4acde4443 (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 87bcb6cf73f1ec0f85c45d0d559ad7690b57db92 Merge: ad94069 39c445a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 4 21:25:31 2012 +0200 Merge remote-tracking branch 'origin/thirteen' into thirteen commit ad9406987b4d8c843722da55b6176c2a5cca5119 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 4 21:24:59 2012 +0200 grub: Remove all CFLAGS. ----------------------------------------------------------------------- Summary of changes: lfs/grub | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) Difference in files: diff --git a/lfs/grub b/lfs/grub index 56935f0..76315fa 100644 --- a/lfs/grub +++ b/lfs/grub @@ -32,8 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 -CFLAGS = -O0 -fno-reorder-functions -fno-strict-aliasing -Wall -Werror \ - -Wno-shadow -Wno-unused -Wno-pointer-sign +CFLAGS = CXXFLAGS = ############################################################################### @@ -81,8 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && autoconf # Build. - cd $(DIR_APP) && CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \ - --disable-auto-linux-mem-opt + cd $(DIR_APP) && CFLAGS="$(CFLAGS)" ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 07240e9e4227e3b048680a52cb3bff016105e033
by git＠ipfire.org 04 Sep '12

04 Sep '12

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1f9b7ef84f037aa83c88e8159c97b553da18c341
by git＠ipfire.org 04 Sep '12

04 Sep '12

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 3.x development tree". The branch, master has been updated via 1f9b7ef84f037aa83c88e8159c97b553da18c341 (commit) via 18de51335d7da99c32d3daae73c44b7f95e76a85 (commit) from c16b465b39c8501229a33f84d7a845a4e306cc8d (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 1f9b7ef84f037aa83c88e8159c97b553da18c341 Author: Kim Barthel <kbarthel(a)ipfire.org> Date: Sun Sep 2 18:56:13 2012 +0200 cups: Update to latest stable release 1.6.1. Fixes #10195 commit 18de51335d7da99c32d3daae73c44b7f95e76a85 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 4 13:21:57 2012 +0200 collecty: New package. ----------------------------------------------------------------------- Summary of changes: collecty/collecty.nm | 40 + .../patches/0001-Install-daemon-to-usr-sbin.patch | 49 + cups/cups.nm | 4 +- cups/patches/001_cups-no-gzip-man.patch | 18 + ...ystem-auth.patch => 002_cups-system-auth.patch} | 19 +- ...cups-multilib.patch => 003_cups-multilib.patch} | 7 +- cups/patches/004_cups-banners.patch | 12 + ...ompat.patch => 005_cups-serverbin-compat.patch} | 118 +- cups/patches/006_cups-no-export-ssllibs.patch | 12 + ...-direct-usb.patch => 007_cups-direct-usb.patch} | 12 +- ...cups-lpr-help.patch => 008_cups-lpr-help.patch} | 24 +- cups/patches/009_cups-peercred.patch | 11 + .../patches/{cups-pid.patch => 010_cups-pid.patch} | 11 +- .../{cups-eggcups.patch => 011_cups-eggcups.patch} | 38 +- ...imeout.patch => 012_cups-driverd-timeout.patch} | 10 +- ...patch => 013_cups-strict-ppd-line-length.patch} | 12 +- ...ps-logrotate.patch => 014_cups-logrotate.patch} | 12 +- ...-paperout.patch => 015_cups-usb-paperout.patch} | 10 +- cups/patches/016_cups-res_init.patch | 26 + ...ter-debug.patch => 017_cups-filter-debug.patch} | 10 +- ...-uri-compat.patch => 018_cups-uri-compat.patch} | 10 +- ...asses.patch => 019_cups-cups-get-classes.patch} | 21 +- .../{cups-str3382.patch => 020_cups-str3382.patch} | 12 +- cups/patches/021_cups-0755.patch | 21 + ...id-oid.patch => 022_cups-hp-deviceid-oid.patch} | 10 +- cups/patches/023_cups-dnssd-deviceid.patch | 38 + ...oid.patch => 024_cups-ricoh-deviceid-oid.patch} | 10 +- cups/patches/025_cups-systemd-socket.patch | 395 +++ .../{cups-x-lspp.patch => 026_cups-lspp.patch} | 1272 ++------- cups/patches/cups-0755.patch | 32 - cups/patches/cups-EAI_AGAIN.patch | 12 - cups/patches/cups-autotype-crash.patch | 15 - cups/patches/cups-avahi.patch | 3338 -------------------- cups/patches/cups-banners.patch | 11 - cups/patches/cups-build.patch | 42 - cups/patches/cups-dnssd-deviceid.patch | 38 - cups/patches/cups-force-gnutls.patch | 89 - cups/patches/cups-getpass.patch | 43 - cups/patches/cups-hostnamelookups.patch | 24 - cups/patches/cups-no-export-ssllibs.patch | 12 - cups/patches/cups-no-gzip-man.patch | 18 - cups/patches/cups-page-label.patch | 92 - cups/patches/cups-peercred.patch | 11 - cups/patches/cups-res_init.patch | 12 - cups/patches/cups-serial.patch | 11 - cups/patches/cups-serialize-gnutls.patch | 109 - cups/patches/cups-snmp-quirks.patch | 115 - cups/patches/cups-str3754.patch | 11 - cups/patches/cups-texttops-rotate-page.patch | 35 - cups/systemd/cups.service | 13 +- 50 files changed, 1016 insertions(+), 5311 deletions(-) create mode 100644 collecty/collecty.nm create mode 100644 collecty/patches/0001-Install-daemon-to-usr-sbin.patch create mode 100644 cups/patches/001_cups-no-gzip-man.patch rename cups/patches/{cups-1.1.16-system-auth.patch => 002_cups-system-auth.patch} (59%) rename cups/patches/{cups-multilib.patch => 003_cups-multilib.patch} (62%) create mode 100644 cups/patches/004_cups-banners.patch rename cups/patches/{cups-serverbin-compat.patch => 005_cups-serverbin-compat.patch} (56%) create mode 100644 cups/patches/006_cups-no-export-ssllibs.patch rename cups/patches/{cups-direct-usb.patch => 007_cups-direct-usb.patch} (56%) rename cups/patches/{cups-lpr-help.patch => 008_cups-lpr-help.patch} (66%) create mode 100644 cups/patches/009_cups-peercred.patch rename cups/patches/{cups-pid.patch => 010_cups-pid.patch} (64%) rename cups/patches/{cups-eggcups.patch => 011_cups-eggcups.patch} (72%) rename cups/patches/{cups-driverd-timeout.patch => 012_cups-driverd-timeout.patch} (54%) rename cups/patches/{cups-strict-ppd-line-length.patch => 013_cups-strict-ppd-line-length.patch} (56%) rename cups/patches/{cups-logrotate.patch => 014_cups-logrotate.patch} (77%) rename cups/patches/{cups-usb-paperout.patch => 015_cups-usb-paperout.patch} (73%) create mode 100644 cups/patches/016_cups-res_init.patch rename cups/patches/{cups-filter-debug.patch => 017_cups-filter-debug.patch} (71%) rename cups/patches/{cups-uri-compat.patch => 018_cups-uri-compat.patch} (77%) rename cups/patches/{cups-cups-get-classes.patch => 019_cups-cups-get-classes.patch} (76%) rename cups/patches/{cups-str3382.patch => 020_cups-str3382.patch} (82%) create mode 100644 cups/patches/021_cups-0755.patch rename cups/patches/{cups-hp-deviceid-oid.patch => 022_cups-hp-deviceid-oid.patch} (71%) create mode 100644 cups/patches/023_cups-dnssd-deviceid.patch rename cups/patches/{cups-ricoh-deviceid-oid.patch => 024_cups-ricoh-deviceid-oid.patch} (73%) create mode 100644 cups/patches/025_cups-systemd-socket.patch rename cups/patches/{cups-x-lspp.patch => 026_cups-lspp.patch} (62%) delete mode 100644 cups/patches/cups-0755.patch delete mode 100644 cups/patches/cups-EAI_AGAIN.patch delete mode 100644 cups/patches/cups-autotype-crash.patch delete mode 100644 cups/patches/cups-avahi.patch delete mode 100644 cups/patches/cups-banners.patch delete mode 100644 cups/patches/cups-build.patch delete mode 100644 cups/patches/cups-dnssd-deviceid.patch delete mode 100644 cups/patches/cups-force-gnutls.patch delete mode 100644 cups/patches/cups-getpass.patch delete mode 100644 cups/patches/cups-hostnamelookups.patch delete mode 100644 cups/patches/cups-no-export-ssllibs.patch delete mode 100644 cups/patches/cups-no-gzip-man.patch delete mode 100644 cups/patches/cups-page-label.patch delete mode 100644 cups/patches/cups-peercred.patch delete mode 100644 cups/patches/cups-res_init.patch delete mode 100644 cups/patches/cups-serial.patch delete mode 100644 cups/patches/cups-serialize-gnutls.patch delete mode 100644 cups/patches/cups-snmp-quirks.patch delete mode 100644 cups/patches/cups-str3754.patch delete mode 100644 cups/patches/cups-texttops-rotate-page.patch Difference in files: diff --git a/collecty/collecty.nm b/collecty/collecty.nm new file mode 100644 index 0000000..deb7fb4 --- /dev/null +++ b/collecty/collecty.nm @@ -0,0 +1,40 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = collecty +version = 0.0.2 +release = 1 + +maintainer = Michael Tremer <michael.tremer(a)ipfire.org> +groups = System/Monitoring +url = http://git.ipfire.org/?p=oddments/collecty.git;a=summary +license = GPLv3+ +summary = A system data collecting daemon. + +description + collecty is a daemon which collects data from the + system like CPU usage and many more. + It has been designed with power efficiency in mind. +end + +source_dl = http://source.ipfire.org/releases/collecty/ + +build + requires + gettext + python + end + + install + mkdir -pv %{BUILDROOT}%{bindir} + make install DESTDIR=%{BUILDROOT} + end +end + +packages + package %{name} + groups += Base + end +end diff --git a/collecty/patches/0001-Install-daemon-to-usr-sbin.patch b/collecty/patches/0001-Install-daemon-to-usr-sbin.patch new file mode 100644 index 0000000..cc5cac2 --- /dev/null +++ b/collecty/patches/0001-Install-daemon-to-usr-sbin.patch @@ -0,0 +1,49 @@ +From 82c136f87bb13aea4f27b669ee98ff7e798ad8b3 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Sat, 1 Sep 2012 18:56:19 +0000 +Subject: [PATCH] Install daemon to /usr/sbin. + +--- + Makefile | 5 ++++- + collecty.service | 2 +- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 7d679af..6fcc787 100644 +--- a/Makefile ++++ b/Makefile +@@ -24,6 +24,7 @@ PACKAGE_VERSION = 0.0.2 + DESTDIR = + PREFIX = /usr + BINDIR = $(PREFIX)/bin ++SBINDIR = $(PREFIX)/sbin + LOCALEDIR = $(PREFIX)/share/locale + UNITDIR = $(PREFIX)/lib/systemd/system + +@@ -55,7 +56,9 @@ dist: + install: $(MO_FILES) + -mkdir -pv $(PYTHON_DIR) + cp -rvf collecty $(PYTHON_DIR) +- install -v -m 755 collectyd $(DESTDIR)$(BINDIR) ++ ++ -mkdir -pv $(DESTDIR)$(SBINDIR) ++ install -v -m 755 collectyd $(DESTDIR)$(SBINDIR) + + # Install configuration + -mkdir -pv $(DESTDIR)/etc/$(PACKAGE_NAME) +diff --git a/collecty.service b/collecty.service +index ac4a893..78bd26e 100644 +--- a/collecty.service ++++ b/collecty.service +@@ -2,7 +2,7 @@ + Description=collecty - A system data collecting daemon + + [Service] +-ExecStart=/usr/bin/collectyd ++ExecStart=/usr/sbin/collectyd + ExecReload=/bin/kill -HUP $MAINPID + + [Install] +-- +1.7.8.2 + diff --git a/cups/cups.nm b/cups/cups.nm index 3922594..3b5672b 100644 --- a/cups/cups.nm +++ b/cups/cups.nm @@ -4,8 +4,8 @@ ############################################################################### name = cups -version = 1.4.5 -release = 7 +version = 1.6.1 +release = 1 groups = Applications/Printing url = http://cups.org/software.php diff --git a/cups/patches/001_cups-no-gzip-man.patch b/cups/patches/001_cups-no-gzip-man.patch new file mode 100644 index 0000000..cabfcf1 --- /dev/null +++ b/cups/patches/001_cups-no-gzip-man.patch @@ -0,0 +1,18 @@ +diff -up cups-1.6b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.6b1/config-scripts/cups-manpages.m4 +--- cups-1.6b1/config-scripts/cups-manpages.m4.no-gzip-man 2012-04-23 19:26:57.000000000 +0200 ++++ cups-1.6b1/config-scripts/cups-manpages.m4 2012-05-25 14:57:01.959845267 +0200 +@@ -69,10 +69,10 @@ case "$uname" in + ;; + Linux* | GNU* | Darwin*) + # Linux, GNU Hurd, and OS X +- MAN1EXT=1.gz +- MAN5EXT=5.gz +- MAN7EXT=7.gz +- MAN8EXT=8.gz ++ MAN1EXT=1 ++ MAN5EXT=5 ++ MAN7EXT=7 ++ MAN8EXT=8 + MAN8DIR=8 + ;; + *) diff --git a/cups/patches/002_cups-system-auth.patch b/cups/patches/002_cups-system-auth.patch new file mode 100644 index 0000000..60117a9 --- /dev/null +++ b/cups/patches/002_cups-system-auth.patch @@ -0,0 +1,38 @@ +diff -up cups-1.5b1/conf/cups.password-auth.system-auth cups-1.5b1/conf/cups.password-auth +--- cups-1.5b1/conf/cups.password-auth.system-auth 2011-05-23 17:27:27.000000000 +0200 ++++ cups-1.5b1/conf/cups.password-auth 2011-05-23 17:27:27.000000000 +0200 +@@ -0,0 +1,4 @@ ++#%PAM-1.0 ++# Use password-auth common PAM configuration for the daemon ++auth include password-auth ++account include password-auth +diff -up cups-1.5b1/conf/cups.system-auth.system-auth cups-1.5b1/conf/cups.system-auth +--- cups-1.5b1/conf/cups.system-auth.system-auth 2011-05-23 17:27:27.000000000 +0200 ++++ cups-1.5b1/conf/cups.system-auth 2011-05-23 17:27:27.000000000 +0200 +@@ -0,0 +1,3 @@ ++#%PAM-1.0 ++auth include system-auth ++account include system-auth +diff -up cups-1.5b1/conf/Makefile.system-auth cups-1.5b1/conf/Makefile +--- cups-1.5b1/conf/Makefile.system-auth 2011-05-12 07:21:56.000000000 +0200 ++++ cups-1.5b1/conf/Makefile 2011-05-23 17:27:27.000000000 +0200 +@@ -90,10 +90,16 @@ install-data: + done + -if test x$(PAMDIR) != x; then \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \ +- if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ +- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ ++ if test -f /etc/pam.d/password-auth; then \ ++ $(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups; \ ++ elif test -f /etc/pam.d/system-auth; then \ ++ $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups; \ + else \ +- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ ++ if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ ++ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ ++ else \ ++ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ ++ fi ; \ + fi ; \ + fi + diff --git a/cups/patches/003_cups-multilib.patch b/cups/patches/003_cups-multilib.patch new file mode 100644 index 0000000..3c6bc39 --- /dev/null +++ b/cups/patches/003_cups-multilib.patch @@ -0,0 +1,16 @@ +diff -up cups-1.5b1/cups-config.in.multilib cups-1.5b1/cups-config.in +--- cups-1.5b1/cups-config.in.multilib 2010-06-16 02:48:25.000000000 +0200 ++++ cups-1.5b1/cups-config.in 2011-05-23 17:33:31.000000000 +0200 +@@ -22,8 +22,10 @@ prefix=@prefix@ + exec_prefix=@exec_prefix@ + bindir=@bindir@ + includedir=@includedir@ +-libdir=@libdir@ +-imagelibdir=@libdir@ ++# Fetch libdir from gnutls's pkg-config script. This is a bit ++# of a cheat, but the cups-devel package requires gnutls-devel anyway. ++libdir=`pkg-config --variable=libdir gnutls` ++imagelibdir=`pkg-config --variable=libdir gnutls` + datarootdir=@datadir@ + datadir=@datadir@ + sysconfdir=@sysconfdir@ diff --git a/cups/patches/004_cups-banners.patch b/cups/patches/004_cups-banners.patch new file mode 100644 index 0000000..aa19282 --- /dev/null +++ b/cups/patches/004_cups-banners.patch @@ -0,0 +1,12 @@ +diff -up cups-1.5b1/scheduler/banners.c.banners cups-1.5b1/scheduler/banners.c +--- cups-1.5b1/scheduler/banners.c.banners 2011-05-20 05:49:49.000000000 +0200 ++++ cups-1.5b1/scheduler/banners.c 2011-05-23 17:35:30.000000000 +0200 +@@ -110,6 +110,8 @@ cupsdLoadBanners(const char *d) /* I - + if ((ext = strrchr(dent->filename, '.')) != NULL) + if (!strcmp(ext, ".bck") || + !strcmp(ext, ".bak") || ++ !strcmp(ext, ".rpmnew") || ++ !strcmp(ext, ".rpmsave") || + !strcmp(ext, ".sav")) + continue; + diff --git a/cups/patches/005_cups-serverbin-compat.patch b/cups/patches/005_cups-serverbin-compat.patch new file mode 100644 index 0000000..0ca72fd --- /dev/null +++ b/cups/patches/005_cups-serverbin-compat.patch @@ -0,0 +1,190 @@ +diff -up cups-1.5b1/scheduler/conf.c.serverbin-compat cups-1.5b1/scheduler/conf.c +--- cups-1.5b1/scheduler/conf.c.serverbin-compat 2011-05-20 06:24:54.000000000 +0200 ++++ cups-1.5b1/scheduler/conf.c 2011-05-23 17:20:33.000000000 +0200 +@@ -491,6 +491,9 @@ cupsdReadConfiguration(void) + cupsdClearString(&ServerName); + cupsdClearString(&ServerAdmin); + cupsdSetString(&ServerBin, CUPS_SERVERBIN); ++#ifdef __x86_64__ ++ cupsdSetString(&ServerBin_compat, "/usr/lib64/cups"); ++#endif /* __x86_64__ */ + cupsdSetString(&RequestRoot, CUPS_REQUESTS); + cupsdSetString(&CacheDir, CUPS_CACHEDIR); + cupsdSetString(&DataDir, CUPS_DATADIR); +@@ -1378,7 +1381,12 @@ cupsdReadConfiguration(void) + * Read the MIME type and conversion database... + */ + ++#ifdef __x86_64__ ++ snprintf(temp, sizeof(temp), "%s/filter:%s/filter", ServerBin, ++ ServerBin_compat); ++#else + snprintf(temp, sizeof(temp), "%s/filter", ServerBin); ++#endif + snprintf(mimedir, sizeof(mimedir), "%s/mime", DataDir); + + MimeDatabase = mimeNew(); +diff -up cups-1.5b1/scheduler/conf.h.serverbin-compat cups-1.5b1/scheduler/conf.h +--- cups-1.5b1/scheduler/conf.h.serverbin-compat 2011-04-22 19:47:03.000000000 +0200 ++++ cups-1.5b1/scheduler/conf.h 2011-05-23 15:34:25.000000000 +0200 +@@ -105,6 +105,10 @@ VAR char *ConfigurationFile VALUE(NULL) + /* Root directory for scheduler */ + *ServerBin VALUE(NULL), + /* Root directory for binaries */ ++#ifdef __x86_64__ ++ *ServerBin_compat VALUE(NULL), ++ /* Compat directory for binaries */ ++#endif /* __x86_64__ */ + *StateDir VALUE(NULL), + /* Root directory for state data */ + *RequestRoot VALUE(NULL), +diff -up cups-1.5b1/scheduler/env.c.serverbin-compat cups-1.5b1/scheduler/env.c +--- cups-1.5b1/scheduler/env.c.serverbin-compat 2011-01-11 04:48:42.000000000 +0100 ++++ cups-1.5b1/scheduler/env.c 2011-05-23 17:07:17.000000000 +0200 +@@ -218,8 +218,13 @@ cupsdUpdateEnv(void) + set_if_undefined("LD_PRELOAD", NULL); + set_if_undefined("NLSPATH", NULL); + if (find_env("PATH") < 0) ++#ifdef __x86_64__ ++ cupsdSetEnvf("PATH", "%s/filter:%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR ++ ":/bin:/usr/bin", ServerBin, ServerBin_compat); ++#else /* ! defined(__x86_64__) */ + cupsdSetEnvf("PATH", "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR + ":/bin:/usr/bin", ServerBin); ++#endif + set_if_undefined("SERVER_ADMIN", ServerAdmin); + set_if_undefined("SHLIB_PATH", NULL); + set_if_undefined("SOFTWARE", CUPS_MINIMAL); +diff -up cups-1.5b1/scheduler/ipp.c.serverbin-compat cups-1.5b1/scheduler/ipp.c +--- cups-1.5b1/scheduler/ipp.c.serverbin-compat 2011-05-20 05:49:49.000000000 +0200 ++++ cups-1.5b1/scheduler/ipp.c 2011-05-23 16:09:57.000000000 +0200 +@@ -2586,9 +2586,18 @@ add_printer(cupsd_client_t *con, /* I - + * Could not find device in list! + */ + ++#ifdef __x86_64__ ++ snprintf(srcfile, sizeof(srcfile), "%s/backend/%s", ServerBin_compat, ++ scheme); ++ if (access(srcfile, X_OK)) ++ { ++#endif /* __x86_64__ */ + send_ipp_status(con, IPP_NOT_POSSIBLE, + _("Bad device-uri scheme \"%s\"."), scheme); + return; ++#ifdef __x86_64__ ++ } ++#endif /* __x86_64__ */ + } + } + +diff -up cups-1.5b1/scheduler/job.c.serverbin-compat cups-1.5b1/scheduler/job.c +--- cups-1.5b1/scheduler/job.c.serverbin-compat 2011-05-20 05:49:49.000000000 +0200 ++++ cups-1.5b1/scheduler/job.c 2011-05-23 16:18:57.000000000 +0200 +@@ -1047,8 +1047,32 @@ cupsdContinueJob(cupsd_job_t *job) /* I + i ++, filter = (mime_filter_t *)cupsArrayNext(filters)) + { + if (filter->filter[0] != '/') +- snprintf(command, sizeof(command), "%s/filter/%s", ServerBin, +- filter->filter); ++ { ++ snprintf(command, sizeof(command), "%s/filter/%s", ServerBin, ++ filter->filter); ++#ifdef __x86_64__ ++ if (access(command, F_OK)) ++ { ++ snprintf(command, sizeof(command), "%s/filter/%s", ++ ServerBin_compat, filter->filter); ++ if (!access(command, F_OK)) ++ { ++ /* Not in the correct directory, but found it in the compat ++ * directory. Issue a warning. */ ++ cupsdLogMessage(CUPSD_LOG_INFO, ++ "Filter '%s' not in %s/filter!", ++ filter->filter, ServerBin); ++ } ++ else ++ { ++ /* Not in the compat directory either; make any error ++ * messages use the correct directory name then. */ ++ snprintf(command, sizeof(command), "%s/filter/%s", ServerBin, ++ filter->filter); ++ } ++ } ++#endif /* __x86_64__ */ ++ } + else + strlcpy(command, filter->filter, sizeof(command)); + +@@ -1199,6 +1223,28 @@ cupsdContinueJob(cupsd_job_t *job) /* I + { + cupsdClosePipe(job->back_pipes); + cupsdClosePipe(job->side_pipes); ++#ifdef __x86_64__ ++ if (access(command, F_OK)) ++ { ++ snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat, ++ scheme); ++ if (!access(command, F_OK)) ++ { ++ /* Not in the correct directory, but we found it in the compat ++ * directory. Issue a warning. */ ++ cupsdLogMessage(CUPSD_LOG_INFO, ++ "Backend '%s' not in %s/backend!", scheme, ++ ServerBin); ++ } ++ else ++ { ++ /* Not in the compat directory either; make any error ++ messages use the correct directory name then. */ ++ snprintf(command, sizeof(command), "%s/backend/%s", ServerBin, ++ scheme); ++ } ++ } ++#endif /* __x86_64__ */ + + close(job->status_pipes[1]); + job->status_pipes[1] = -1; +diff -up cups-1.5b1/scheduler/printers.c.serverbin-compat cups-1.5b1/scheduler/printers.c +--- cups-1.5b1/scheduler/printers.c.serverbin-compat 2011-05-20 05:49:49.000000000 +0200 ++++ cups-1.5b1/scheduler/printers.c 2011-05-23 17:09:04.000000000 +0200 +@@ -1030,9 +1030,19 @@ cupsdLoadAllPrinters(void) + * Backend does not exist, stop printer... + */ + ++#ifdef __x86_64__ ++ snprintf(line, sizeof(line), "%s/backend/%s", ServerBin_compat, ++ p->device_uri); ++ if (access(line, 0)) ++ { ++#endif /* __x86_64__ */ ++ + p->state = IPP_PRINTER_STOPPED; + snprintf(p->state_message, sizeof(p->state_message), + "Backend %s does not exist!", line); ++#ifdef __x86_64__ ++ } ++#endif /* __x86_64__ */ + } + } + +@@ -3621,8 +3631,20 @@ add_printer_filter( + else + snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin, program); + ++#ifdef __x86_64__ ++ if (_cupsFileCheck(filename, _CUPS_FILE_CHECK_PROGRAM, !RunUser, ++ cupsdLogFCMessage, p) == _CUPS_FILE_CHECK_MISSING) { ++ snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin_compat, ++ program); ++ if (_cupsFileCheck(filename, _CUPS_FILE_CHECK_PROGRAM, !RunUser, ++ cupsdLogFCMessage, p) == _CUPS_FILE_CHECK_MISSING) ++ snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin, ++ program); ++ } ++#else /* ! defined(__x86_64__) */ + _cupsFileCheck(filename, _CUPS_FILE_CHECK_PROGRAM, !RunUser, + cupsdLogFCMessage, p); ++#endif + } + + /* diff --git a/cups/patches/006_cups-no-export-ssllibs.patch b/cups/patches/006_cups-no-export-ssllibs.patch new file mode 100644 index 0000000..de277d8 --- /dev/null +++ b/cups/patches/006_cups-no-export-ssllibs.patch @@ -0,0 +1,12 @@ +diff -up cups-1.5.3/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5.3/config-scripts/cups-ssl.m4 +--- cups-1.5.3/config-scripts/cups-ssl.m4.no-export-ssllibs 2012-03-21 05:45:48.000000000 +0100 ++++ cups-1.5.3/config-scripts/cups-ssl.m4 2012-05-15 16:47:13.753314620 +0200 +@@ -173,7 +173,7 @@ AC_SUBST(IPPALIASES) + AC_SUBST(SSLFLAGS) + AC_SUBST(SSLLIBS) + +-EXPORT_SSLLIBS="$SSLLIBS" ++EXPORT_SSLLIBS="" + AC_SUBST(EXPORT_SSLLIBS) + + dnl diff --git a/cups/patches/007_cups-direct-usb.patch b/cups/patches/007_cups-direct-usb.patch new file mode 100644 index 0000000..4e25ce7 --- /dev/null +++ b/cups/patches/007_cups-direct-usb.patch @@ -0,0 +1,27 @@ +diff -up cups-1.5b1/backend/usb-unix.c.direct-usb cups-1.5b1/backend/usb-unix.c +--- cups-1.5b1/backend/usb-unix.c.direct-usb 2011-05-20 05:49:49.000000000 +0200 ++++ cups-1.5b1/backend/usb-unix.c 2011-05-23 17:52:14.000000000 +0200 +@@ -102,6 +102,9 @@ print_device(const char *uri, /* I - De + _cups_strncasecmp(hostname, "Minolta", 7); + #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */ + ++ if (use_bc && !strncmp(uri, "usb:/dev/", 9)) ++ use_bc = 0; ++ + if ((device_fd = open_device(uri, &use_bc)) == -1) + { + if (getenv("CLASS") != NULL) +@@ -331,12 +334,7 @@ open_device(const char *uri, /* I - Dev + if (!strncmp(uri, "usb:/dev/", 9)) + #ifdef __linux + { +- /* +- * Do not allow direct devices anymore... +- */ +- +- errno = ENODEV; +- return (-1); ++ return (open(uri + 4, O_RDWR | O_EXCL)); + } + else if (!strncmp(uri, "usb://", 6)) + { diff --git a/cups/patches/008_cups-lpr-help.patch b/cups/patches/008_cups-lpr-help.patch new file mode 100644 index 0000000..c42434d --- /dev/null +++ b/cups/patches/008_cups-lpr-help.patch @@ -0,0 +1,48 @@ +diff -up cups-1.5b1/berkeley/lpr.c.lpr-help cups-1.5b1/berkeley/lpr.c +--- cups-1.5b1/berkeley/lpr.c.lpr-help 2011-03-21 23:02:00.000000000 +0100 ++++ cups-1.5b1/berkeley/lpr.c 2011-05-23 17:58:06.000000000 +0200 +@@ -24,6 +24,31 @@ + #include <cups/cups-private.h> + + ++static void ++usage (const char *name) ++{ ++ _cupsLangPrintf(stdout, ++"Usage: %s [OPTION] [ file(s) ]\n" ++"Print files.\n\n" ++" -E force encryption\n" ++" -H server[:port] specify alternate server\n" ++" -C title, -J title, -T title\n" ++" set the job name\n\n" ++" -P destination/instance print to named printer\n" ++" -U username specify alternate username\n" ++" -# num-copies set number of copies\n" ++" -h disable banner printing\n" ++" -l print without filtering\n" ++" -m send email on completion\n" ++" -o option[=value] set a job option\n" ++" -p format text file with header\n" ++" -q hold job for printing\n" ++" -r delete files after printing\n" ++"\nWith no file given, read standard input.\n" ++, name); ++} ++ ++ + /* + * 'main()' - Parse options and send files for printing. + */ +@@ -270,6 +294,12 @@ main(int argc, /* I - Number of comm + break; + + default : ++ if (!strcmp (argv[i], "--help")) ++ { ++ usage (argv[0]); ++ return (0); ++ } ++ + _cupsLangPrintf(stderr, + _("%s: Error - unknown option \"%c\"."), argv[0], + argv[i][1]); diff --git a/cups/patches/009_cups-peercred.patch b/cups/patches/009_cups-peercred.patch new file mode 100644 index 0000000..a106abb --- /dev/null +++ b/cups/patches/009_cups-peercred.patch @@ -0,0 +1,11 @@ +diff -up cups-1.5b1/scheduler/auth.c.peercred cups-1.5b1/scheduler/auth.c +--- cups-1.5b1/scheduler/auth.c.peercred 2011-05-20 05:49:49.000000000 +0200 ++++ cups-1.5b1/scheduler/auth.c 2011-05-23 18:00:18.000000000 +0200 +@@ -52,6 +52,7 @@ + * Include necessary headers... + */ + ++#define _GNU_SOURCE + #include "cupsd.h" + #include <grp.h> + #ifdef HAVE_SHADOW_H diff --git a/cups/patches/010_cups-pid.patch b/cups/patches/010_cups-pid.patch new file mode 100644 index 0000000..23ffd47 --- /dev/null +++ b/cups/patches/010_cups-pid.patch @@ -0,0 +1,37 @@ +diff -up cups-1.5b1/scheduler/main.c.pid cups-1.5b1/scheduler/main.c +--- cups-1.5b1/scheduler/main.c.pid 2011-05-18 22:44:16.000000000 +0200 ++++ cups-1.5b1/scheduler/main.c 2011-05-23 18:01:20.000000000 +0200 +@@ -311,6 +311,8 @@ main(int argc, /* I - Number of comm + * Setup signal handlers for the parent... + */ + ++ pid_t pid; ++ + #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */ + sigset(SIGUSR1, parent_handler); + sigset(SIGCHLD, parent_handler); +@@ -334,7 +336,7 @@ main(int argc, /* I - Number of comm + signal(SIGHUP, SIG_IGN); + #endif /* HAVE_SIGSET */ + +- if (fork() > 0) ++ if ((pid = fork()) > 0) + { + /* + * OK, wait for the child to startup and send us SIGUSR1 or to crash +@@ -346,7 +348,15 @@ main(int argc, /* I - Number of comm + sleep(1); + + if (parent_signal == SIGUSR1) ++ { ++ FILE *f = fopen ("/var/run/cupsd.pid", "w"); ++ if (f) ++ { ++ fprintf (f, "%d\n", pid); ++ fclose (f); ++ } + return (0); ++ } + + if (wait(&i) < 0) + { diff --git a/cups/patches/011_cups-eggcups.patch b/cups/patches/011_cups-eggcups.patch new file mode 100644 index 0000000..981d920 --- /dev/null +++ b/cups/patches/011_cups-eggcups.patch @@ -0,0 +1,130 @@ +diff -up cups-1.5.3/backend/ipp.c.eggcups cups-1.5.3/backend/ipp.c +--- cups-1.5.3/backend/ipp.c.eggcups 2012-05-05 01:00:01.000000000 +0200 ++++ cups-1.5.3/backend/ipp.c 2012-05-15 16:50:41.142868986 +0200 +@@ -138,6 +138,70 @@ static cups_array_t *state_reasons; /* A + static char tmpfilename[1024] = ""; + /* Temporary spool file name */ + ++#if HAVE_DBUS ++#include <dbus/dbus.h> ++ ++static DBusConnection *dbus_connection = NULL; ++ ++static int ++init_dbus (void) ++{ ++ DBusConnection *connection; ++ DBusError error; ++ ++ if (dbus_connection && ++ !dbus_connection_get_is_connected (dbus_connection)) { ++ dbus_connection_unref (dbus_connection); ++ dbus_connection = NULL; ++ } ++ ++ dbus_error_init (&error); ++ connection = dbus_bus_get (getuid () ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &error); ++ if (connection == NULL) { ++ dbus_error_free (&error); ++ return -1; ++ } ++ ++ dbus_connection = connection; ++ return 0; ++} ++ ++int ++dbus_broadcast_queued_remote (const char *printer_uri, ++ ipp_status_t status, ++ unsigned int local_job_id, ++ unsigned int remote_job_id, ++ const char *username, ++ const char *printer_name) ++{ ++ DBusMessage *message; ++ DBusMessageIter iter; ++ const char *errstr; ++ ++ if (!dbus_connection || !dbus_connection_get_is_connected (dbus_connection)) { ++ if (init_dbus () || !dbus_connection) ++ return -1; ++ } ++ ++ errstr = ippErrorString (status); ++ message = dbus_message_new_signal ("/com/redhat/PrinterSpooler", ++ "com.redhat.PrinterSpooler", ++ "JobQueuedRemote"); ++ dbus_message_iter_init_append (message, &iter); ++ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &printer_uri); ++ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &errstr); ++ dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &local_job_id); ++ dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &remote_job_id); ++ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &username); ++ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &printer_name); ++ ++ dbus_connection_send (dbus_connection, message, NULL); ++ dbus_connection_flush (dbus_connection); ++ dbus_message_unref (message); ++ ++ return 0; ++} ++#endif /* HAVE_DBUS */ + + /* + * Local functions... +@@ -1520,6 +1584,15 @@ main(int argc, /* I - Number of comm + _("Print file accepted - job ID %d."), job_id); + } + ++#if HAVE_DBUS ++ dbus_broadcast_queued_remote (argv[0], ++ ipp_status, ++ atoi (argv[1]), ++ job_id, ++ argv[2], ++ getenv ("PRINTER")); ++#endif /* HAVE_DBUS */ ++ + fprintf(stderr, "DEBUG: job-id=%d\n", job_id); + ippDelete(response); + +diff -up cups-1.5.3/backend/Makefile.eggcups cups-1.5.3/backend/Makefile +--- cups-1.5.3/backend/Makefile.eggcups 2012-04-23 19:42:12.000000000 +0200 ++++ cups-1.5.3/backend/Makefile 2012-05-15 16:48:17.253871982 +0200 +@@ -212,7 +212,7 @@ dnssd: dnssd.o ../cups/$(LIBCUPS) libbac + + ipp: ipp.o ../cups/$(LIBCUPS) libbackend.a + echo Linking $@... +- $(CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS) ++ $(CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS) $(SERVERLIBS) + $(RM) http + $(LN) ipp http + +diff -up cups-1.5.3/scheduler/subscriptions.c.eggcups cups-1.5.3/scheduler/subscriptions.c +--- cups-1.5.3/scheduler/subscriptions.c.eggcups 2012-02-12 06:48:09.000000000 +0100 ++++ cups-1.5.3/scheduler/subscriptions.c 2012-05-15 16:48:17.253871982 +0200 +@@ -1314,13 +1314,13 @@ cupsd_send_dbus(cupsd_eventmask_t event, + what = "PrinterAdded"; + else if (event & CUPSD_EVENT_PRINTER_DELETED) + what = "PrinterRemoved"; +- else if (event & CUPSD_EVENT_PRINTER_CHANGED) +- what = "QueueChanged"; + else if (event & CUPSD_EVENT_JOB_CREATED) + what = "JobQueuedLocal"; + else if ((event & CUPSD_EVENT_JOB_STATE) && job && + job->state_value == IPP_JOB_PROCESSING) + what = "JobStartedLocal"; ++ else if (event & (CUPSD_EVENT_PRINTER_CHANGED|CUPSD_EVENT_JOB_STATE_CHANGED|CUPSD_EVENT_PRINTER_STATE_CHANGED)) ++ what = "QueueChanged"; + else + return; + +@@ -1356,7 +1356,7 @@ cupsd_send_dbus(cupsd_eventmask_t event, + dbus_message_append_iter_init(message, &iter); + if (dest) + dbus_message_iter_append_string(&iter, dest->name); +- if (job) ++ if (job && strcmp (what, "QueueChanged") != 0) + { + dbus_message_iter_append_uint32(&iter, job->id); + dbus_message_iter_append_string(&iter, job->username); diff --git a/cups/patches/012_cups-driverd-timeout.patch b/cups/patches/012_cups-driverd-timeout.patch new file mode 100644 index 0000000..cb9e5cf --- /dev/null +++ b/cups/patches/012_cups-driverd-timeout.patch @@ -0,0 +1,21 @@ +diff -up cups-1.5.0/scheduler/ipp.c.driverd-timeout cups-1.5.0/scheduler/ipp.c +--- cups-1.5.0/scheduler/ipp.c.driverd-timeout 2011-10-10 17:03:41.801690962 +0100 ++++ cups-1.5.0/scheduler/ipp.c 2011-10-10 17:03:41.861689834 +0100 +@@ -5723,7 +5723,7 @@ copy_model(cupsd_client_t *con, /* I - + close(temppipe[1]); + + /* +- * Wait up to 30 seconds for the PPD file to be copied... ++ * Wait up to 70 seconds for the PPD file to be copied... + */ + + total = 0; +@@ -5743,7 +5743,7 @@ copy_model(cupsd_client_t *con, /* I - + FD_SET(temppipe[0], &input); + FD_SET(CGIPipes[0], &input); + +- timeout.tv_sec = 30; ++ timeout.tv_sec = 70; + timeout.tv_usec = 0; + + if ((i = select(maxfd, &input, NULL, NULL, &timeout)) < 0) diff --git a/cups/patches/013_cups-strict-ppd-line-length.patch b/cups/patches/013_cups-strict-ppd-line-length.patch new file mode 100644 index 0000000..b2697ec --- /dev/null +++ b/cups/patches/013_cups-strict-ppd-line-length.patch @@ -0,0 +1,30 @@ +diff -up cups-1.5b1/cups/ppd.c.strict-ppd-line-length cups-1.5b1/cups/ppd.c +--- cups-1.5b1/cups/ppd.c.strict-ppd-line-length 2011-05-20 05:49:49.000000000 +0200 ++++ cups-1.5b1/cups/ppd.c 2011-05-24 15:46:13.000000000 +0200 +@@ -2786,7 +2786,7 @@ ppd_read(cups_file_t *fp, /* I - Fil + *lineptr++ = ch; + col ++; + +- if (col > (PPD_MAX_LINE - 1)) ++ if (col > (PPD_MAX_LINE - 1) && cg->ppd_conform == PPD_CONFORM_STRICT) + { + /* + * Line is too long... +@@ -2847,7 +2847,7 @@ ppd_read(cups_file_t *fp, /* I - Fil + { + col ++; + +- if (col > (PPD_MAX_LINE - 1)) ++ if (col > (PPD_MAX_LINE - 1) && cg->ppd_conform == PPD_CONFORM_STRICT) + { + /* + * Line is too long... +@@ -2906,7 +2906,7 @@ ppd_read(cups_file_t *fp, /* I - Fil + { + col ++; + +- if (col > (PPD_MAX_LINE - 1)) ++ if (col > (PPD_MAX_LINE - 1) && cg->ppd_conform == PPD_CONFORM_STRICT) + { + /* + * Line is too long... diff --git a/cups/patches/014_cups-logrotate.patch b/cups/patches/014_cups-logrotate.patch new file mode 100644 index 0000000..a6485a9 --- /dev/null +++ b/cups/patches/014_cups-logrotate.patch @@ -0,0 +1,63 @@ +diff -up cups-1.5b1/scheduler/log.c.logrotate cups-1.5b1/scheduler/log.c +--- cups-1.5b1/scheduler/log.c.logrotate 2011-05-14 01:04:16.000000000 +0200 ++++ cups-1.5b1/scheduler/log.c 2011-05-24 15:47:20.000000000 +0200 +@@ -32,6 +32,9 @@ + #include "cupsd.h" + #include <stdarg.h> + #include <syslog.h> ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <unistd.h> + + + /* +@@ -71,12 +74,10 @@ cupsdCheckLogFile(cups_file_t **lf, /* I + return (1); + + /* +- * Format the filename as needed... ++ * Format the filename... + */ + +- if (!*lf || +- (strncmp(logname, "/dev/", 5) && cupsFileTell(*lf) > MaxLogSize && +- MaxLogSize > 0)) ++ if (strncmp(logname, "/dev/", 5)) + { + /* + * Handle format strings... +@@ -186,6 +187,34 @@ cupsdCheckLogFile(cups_file_t **lf, /* I + } + + /* ++ * Has someone else (i.e. logrotate) already rotated the log for us? ++ */ ++ else if (strncmp(filename, "/dev/", 5)) ++ { ++ struct stat st; ++ if (stat(filename, &st) || st.st_size == 0) ++ { ++ /* File is either missing or has zero size. */ ++ ++ cupsFileClose(*lf); ++ if ((*lf = cupsFileOpen(filename, "a")) == NULL) ++ { ++ syslog(LOG_ERR, "Unable to open log file \"%s\" - %s", filename, ++ strerror(errno)); ++ ++ return (0); ++ } ++ ++ /* ++ * Change ownership and permissions of non-device logs... ++ */ ++ ++ fchown(cupsFileNumber(*lf), RunUser, Group); ++ fchmod(cupsFileNumber(*lf), LogFilePerm); ++ } ++ } ++ ++ /* + * Do we need to rotate the log? + */ + diff --git a/cups/patches/015_cups-usb-paperout.patch b/cups/patches/015_cups-usb-paperout.patch new file mode 100644 index 0000000..f1f73f0 --- /dev/null +++ b/cups/patches/015_cups-usb-paperout.patch @@ -0,0 +1,52 @@ +diff -up cups-1.5b1/backend/usb-unix.c.usb-paperout cups-1.5b1/backend/usb-unix.c +--- cups-1.5b1/backend/usb-unix.c.usb-paperout 2011-05-24 15:51:39.000000000 +0200 ++++ cups-1.5b1/backend/usb-unix.c 2011-05-24 15:51:39.000000000 +0200 +@@ -30,6 +30,11 @@ + + #include <sys/select.h> + ++#ifdef __linux ++#include <sys/ioctl.h> ++#include <linux/lp.h> ++#endif /* __linux */ ++ + + /* + * Local functions... +@@ -334,7 +339,19 @@ open_device(const char *uri, /* I - Dev + if (!strncmp(uri, "usb:/dev/", 9)) + #ifdef __linux + { +- return (open(uri + 4, O_RDWR | O_EXCL)); ++ fd = open(uri + 4, O_RDWR | O_EXCL); ++ ++ if (fd != -1) ++ { ++ /* ++ * Tell the driver to return from write() with errno==ENOSPACE ++ * on paper-out. ++ */ ++ unsigned int t = 1; ++ ioctl (fd, LPABORT, &t); ++ } ++ ++ return fd; + } + else if (!strncmp(uri, "usb://", 6)) + { +@@ -400,7 +417,14 @@ open_device(const char *uri, /* I - Dev + if (!strcmp(uri, device_uri)) + { + /* +- * Yes, return this file descriptor... ++ * Yes, tell the driver to return from write() with ++ * errno==ENOSPACE on paper-out. ++ */ ++ unsigned int t = 1; ++ ioctl (fd, LPABORT, &t); ++ ++ /* ++ * Return this file descriptor... + */ + + fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n", diff --git a/cups/patches/016_cups-res_init.patch b/cups/patches/016_cups-res_init.patch new file mode 100644 index 0000000..94a81a4 --- /dev/null +++ b/cups/patches/016_cups-res_init.patch @@ -0,0 +1,26 @@ +diff -up cups-1.6b1/cups/http-addr.c.res_init cups-1.6b1/cups/http-addr.c +--- cups-1.6b1/cups/http-addr.c.res_init 2012-05-17 00:57:03.000000000 +0200 ++++ cups-1.6b1/cups/http-addr.c 2012-05-25 15:51:51.323916352 +0200 +@@ -254,7 +254,8 @@ httpAddrLookup( + + if (error) + { +- if (error == EAI_FAIL) ++ if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA || ++ error == EAI_NONAME) + cg->need_res_init = 1; + + return (httpAddrString(addr, name, namelen)); +diff -up cups-1.6b1/cups/http-addrlist.c.res_init cups-1.6b1/cups/http-addrlist.c +--- cups-1.6b1/cups/http-addrlist.c.res_init 2012-04-23 19:26:57.000000000 +0200 ++++ cups-1.6b1/cups/http-addrlist.c 2012-05-25 16:05:05.930377452 +0200 +@@ -540,7 +540,8 @@ httpAddrGetList(const char *hostname, /* + } + else + { +- if (error == EAI_FAIL) ++ if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA || ++ error == EAI_NONAME) + cg->need_res_init = 1; + + _cupsSetError(IPP_INTERNAL_ERROR, gai_strerror(error), 0); diff --git a/cups/patches/017_cups-filter-debug.patch b/cups/patches/017_cups-filter-debug.patch new file mode 100644 index 0000000..96c82da --- /dev/null +++ b/cups/patches/017_cups-filter-debug.patch @@ -0,0 +1,32 @@ +diff -up cups-1.6b1/scheduler/job.c.filter-debug cups-1.6b1/scheduler/job.c +--- cups-1.6b1/scheduler/job.c.filter-debug 2012-05-25 16:06:01.000000000 +0200 ++++ cups-1.6b1/scheduler/job.c 2012-05-25 16:07:46.309259511 +0200 +@@ -625,10 +625,28 @@ cupsdContinueJob(cupsd_job_t *job) /* I + + if (!filters) + { ++ mime_filter_t *current; ++ + cupsdLogJob(job, CUPSD_LOG_ERROR, + "Unable to convert file %d to printable format.", + job->current_file); + ++ cupsdLogJob(job, CUPSD_LOG_ERROR, ++ "Required: %s/%s -> %s/%s", ++ job->filetypes[job->current_file]->super, ++ job->filetypes[job->current_file]->type, ++ job->printer->filetype->super, ++ job->printer->filetype->type); ++ ++ for (current = (mime_filter_t *)cupsArrayFirst(MimeDatabase->srcs); ++ current; ++ current = (mime_filter_t *)cupsArrayNext(MimeDatabase->srcs)) ++ cupsdLogJob(job, CUPSD_LOG_ERROR, ++ "Available: %s/%s -> %s/%s (%s)", ++ current->src->super, current->src->type, ++ current->dst->super, current->dst->type, ++ current->filter); ++ + abort_message = "Aborting job because it cannot be printed."; + abort_state = IPP_JOB_ABORTED; + diff --git a/cups/patches/018_cups-uri-compat.patch b/cups/patches/018_cups-uri-compat.patch new file mode 100644 index 0000000..2520a5b --- /dev/null +++ b/cups/patches/018_cups-uri-compat.patch @@ -0,0 +1,51 @@ +diff -up cups-1.5b1/backend/usb-unix.c.uri-compat cups-1.5b1/backend/usb-unix.c +--- cups-1.5b1/backend/usb-unix.c.uri-compat 2011-05-24 15:59:05.000000000 +0200 ++++ cups-1.5b1/backend/usb-unix.c 2011-05-24 16:02:03.000000000 +0200 +@@ -63,11 +63,34 @@ print_device(const char *uri, /* I - De + int device_fd; /* USB device */ + ssize_t tbytes; /* Total number of bytes written */ + struct termios opts; /* Parallel port options */ ++ char *fixed_uri = strdup (uri); ++ char *p; + + + (void)argc; + (void)argv; + ++ p = strchr (fixed_uri, ':'); ++ if (p++ != NULL) ++ { ++ char *e; ++ p += strspn (p, "/"); ++ e = strchr (p, '/'); ++ if (e > p) ++ { ++ size_t mfrlen = e - p; ++ e++; ++ if (!strncasecmp (e, p, mfrlen)) ++ { ++ char *x = e + mfrlen; ++ if (!strncmp (x, "%20", 3)) ++ /* Take mfr name out of mdl name for compatibility with ++ * Fedora 11 before bug #507244 was fixed. */ ++ strcpy (e, x + 3); puts(fixed_uri); ++ } ++ } ++ } ++ + /* + * Open the USB port device... + */ +@@ -107,10 +130,10 @@ print_device(const char *uri, /* I - De + _cups_strncasecmp(hostname, "Minolta", 7); + #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */ + +- if (use_bc && !strncmp(uri, "usb:/dev/", 9)) ++ if (use_bc && !strncmp(fixed_uri, "usb:/dev/", 9)) + use_bc = 0; + +- if ((device_fd = open_device(uri, &use_bc)) == -1) ++ if ((device_fd = open_device(fixed_uri, &use_bc)) == -1) + { + if (getenv("CLASS") != NULL) + { diff --git a/cups/patches/019_cups-cups-get-classes.patch b/cups/patches/019_cups-cups-get-classes.patch new file mode 100644 index 0000000..b0ffe1c --- /dev/null +++ b/cups/patches/019_cups-cups-get-classes.patch @@ -0,0 +1,89 @@ +diff -up cups-1.5.0/cups/dest.c.cups-get-classes cups-1.5.0/cups/dest.c +--- cups-1.5.0/cups/dest.c.cups-get-classes 2011-05-20 04:49:49.000000000 +0100 ++++ cups-1.5.0/cups/dest.c 2011-09-14 12:10:05.111635428 +0100 +@@ -534,6 +534,7 @@ _cupsGetDests(http_t *http, /* I - + char uri[1024]; /* printer-uri value */ + int num_options; /* Number of options */ + cups_option_t *options; /* Options */ ++ int get_classes; /* Whether we need to fetch class */ + #ifdef __APPLE__ + char media_default[41]; /* Default paper size */ + #endif /* __APPLE__ */ +@@ -590,6 +591,8 @@ _cupsGetDests(http_t *http, /* I - + * printer-uri [for IPP_GET_PRINTER_ATTRIBUTES] + */ + ++ get_classes = (op == CUPS_GET_PRINTERS); ++ + request = ippNewRequest(op); + + ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, +@@ -647,6 +650,23 @@ _cupsGetDests(http_t *http, /* I - + attr->value_tag != IPP_TAG_URI) + continue; + ++ if (get_classes && ++ ++ /* Is this a class? */ ++ ((attr->value_tag == IPP_TAG_ENUM && ++ !strcmp(attr->name, "printer-type") && ++ (attr->values[0].integer & CUPS_PRINTER_CLASS)) || ++ ++ /* Or, is this an attribute from CUPS 1.2 or later? */ ++ !strcmp(attr->name, "auth-info-required") || ++ !strncmp(attr->name, "marker-", 7) || ++ !strcmp(attr->name, "printer-commands") || ++ !strcmp(attr->name, "printer-is-shared"))) ++ /* We are talking to a recent enough CUPS server that ++ * CUPS_GET_PRINTERS returns classes as well. ++ */ ++ get_classes = 0; ++ + if (!strcmp(attr->name, "auth-info-required") || + !strcmp(attr->name, "device-uri") || + !strcmp(attr->name, "marker-change-time") || +@@ -738,6 +758,28 @@ _cupsGetDests(http_t *http, /* I - + continue; + } + ++ /* ++ * If we sent a CUPS_GET_CLASSES request, check whether ++ * CUPS_GET_PRINTERS already gave us this destination and exit ++ * early if so. ++ */ ++ ++ if (op == CUPS_GET_CLASSES && num_dests > 0) ++ { ++ int diff; ++ cups_find_dest (printer_name, NULL, num_dests, *dests, 0, &diff); ++ if (diff == 0) ++ { ++ /* ++ * Found it. The CUPS server already gave us the classes in ++ * its CUPS_GET_PRINTERS response. ++ */ ++ ++ cupsFreeOptions(num_options, options); ++ break; ++ } ++ } ++ + if ((dest = cups_add_dest(printer_name, NULL, &num_dests, dests)) != NULL) + { + dest->num_options = num_options; +@@ -754,6 +796,15 @@ _cupsGetDests(http_t *http, /* I - + } + + /* ++ * If this is a CUPS_GET_PRINTERS request but we didn't see any ++ * classes we might be talking to an older CUPS server that requires ++ * CUPS_GET_CLASSES as well. ++ */ ++ ++ if (get_classes) ++ num_dests = _cupsGetDests (http, CUPS_GET_CLASSES, name, dests, 0, 0); ++ ++ /* + * Return the count... + */ + diff --git a/cups/patches/020_cups-str3382.patch b/cups/patches/020_cups-str3382.patch new file mode 100644 index 0000000..2e8736d --- /dev/null +++ b/cups/patches/020_cups-str3382.patch @@ -0,0 +1,64 @@ +diff -up cups-1.5b1/cups/tempfile.c.str3382 cups-1.5b1/cups/tempfile.c +--- cups-1.5b1/cups/tempfile.c.str3382 2010-03-24 01:45:34.000000000 +0100 ++++ cups-1.5b1/cups/tempfile.c 2011-05-24 16:04:47.000000000 +0200 +@@ -33,6 +33,7 @@ + # include <io.h> + #else + # include <unistd.h> ++# include <sys/types.h> + #endif /* WIN32 || __EMX__ */ + + +@@ -54,7 +55,7 @@ cupsTempFd(char *filename, /* I - Point + char tmppath[1024]; /* Windows temporary directory */ + DWORD curtime; /* Current time */ + #else +- struct timeval curtime; /* Current time */ ++ mode_t old_umask; /* Old umask before using mkstemp() */ + #endif /* WIN32 */ + + +@@ -105,33 +106,25 @@ cupsTempFd(char *filename, /* I - Point + + snprintf(filename, len - 1, "%s/%05lx%08lx", tmpdir, + GetCurrentProcessId(), curtime); +-#else +- /* +- * Get the current time of day... +- */ +- +- gettimeofday(&curtime, NULL); +- +- /* +- * Format a string using the hex time values... +- */ +- +- snprintf(filename, len - 1, "%s/%05x%08x", tmpdir, (unsigned)getpid(), +- (unsigned)(curtime.tv_sec + curtime.tv_usec + tries)); +-#endif /* WIN32 */ + + /* + * Open the file in "exclusive" mode, making sure that we don't + * stomp on an existing file or someone's symlink crack... + */ + +-#ifdef WIN32 + fd = open(filename, _O_CREAT | _O_RDWR | _O_TRUNC | _O_BINARY, + _S_IREAD | _S_IWRITE); +-#elif defined(O_NOFOLLOW) +- fd = open(filename, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600); + #else +- fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600); ++ ++ /* ++ * Use the standard mkstemp() call to make a temporary filename ++ * securely. -- andrew.wood(a)jdplc.com ++ */ ++ snprintf(filename, len - 1, "%s/cupsXXXXXX", tmpdir); ++ ++ old_umask = umask(0077); ++ fd = mkstemp(filename); ++ umask(old_umask); + #endif /* WIN32 */ + + if (fd < 0 && errno != EEXIST) diff --git a/cups/patches/021_cups-0755.patch b/cups/patches/021_cups-0755.patch new file mode 100644 index 0000000..b0df3a0 --- /dev/null +++ b/cups/patches/021_cups-0755.patch @@ -0,0 +1,21 @@ +diff -up cups-1.6b1/Makedefs.in.0755 cups-1.6b1/Makedefs.in +--- cups-1.6b1/Makedefs.in.0755 2012-05-23 01:58:31.000000000 +0200 ++++ cups-1.6b1/Makedefs.in 2012-05-25 16:09:40.545463214 +0200 +@@ -40,14 +40,14 @@ SHELL = /bin/sh + # Installation programs... + # + +-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ ++INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@ + INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@ + INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@ + INSTALL_DATA = $(INSTALL) -c -m 444 + INSTALL_DIR = $(INSTALL) -d +-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ ++INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@ + INSTALL_MAN = $(INSTALL) -c -m 444 +-INSTALL_SCRIPT = $(INSTALL) -c -m 555 ++INSTALL_SCRIPT = $(INSTALL) -c -m 755 + + # + # Default user, group, and system groups for the scheduler... diff --git a/cups/patches/022_cups-hp-deviceid-oid.patch b/cups/patches/022_cups-hp-deviceid-oid.patch new file mode 100644 index 0000000..da5136a --- /dev/null +++ b/cups/patches/022_cups-hp-deviceid-oid.patch @@ -0,0 +1,21 @@ +diff -up cups-1.5b1/backend/snmp.c.hp-deviceid-oid cups-1.5b1/backend/snmp.c +--- cups-1.5b1/backend/snmp.c.hp-deviceid-oid 2011-05-20 05:49:49.000000000 +0200 ++++ cups-1.5b1/backend/snmp.c 2011-05-24 17:24:48.000000000 +0200 +@@ -187,6 +187,7 @@ static const int UriOID[] = { CUPS_OID_p + static const int LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 }; + static const int LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 }; + static const int LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 }; ++static const int HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 }; + static const int XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 }; + static cups_array_t *DeviceURIs = NULL; + static int HostNameLookups = 0; +@@ -1006,6 +1007,9 @@ read_snmp_response(int fd) /* I - SNMP + _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, + packet.community, CUPS_ASN1_GET_REQUEST, + DEVICE_PRODUCT, XeroxProductOID); ++ _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, ++ packet.community, CUPS_ASN1_GET_REQUEST, ++ DEVICE_ID, HPDeviceIdOID); + break; + + case DEVICE_DESCRIPTION : diff --git a/cups/patches/023_cups-dnssd-deviceid.patch b/cups/patches/023_cups-dnssd-deviceid.patch new file mode 100644 index 0000000..b3c2b8e --- /dev/null +++ b/cups/patches/023_cups-dnssd-deviceid.patch @@ -0,0 +1,38 @@ +diff -up cups-1.6b1/backend/dnssd.c.dnssd-deviceid cups-1.6b1/backend/dnssd.c +--- cups-1.6b1/backend/dnssd.c.dnssd-deviceid 2012-05-21 18:05:58.000000000 +0200 ++++ cups-1.6b1/backend/dnssd.c 2012-05-25 16:27:49.226874427 +0200 +@@ -1181,15 +1181,22 @@ query_callback( + if (device->device_id) + free(device->device_id); + ++ if (device_id[0]) ++ { ++ /* Mark this as the real device ID. */ ++ ptr = device_id + strlen(device_id); ++ snprintf(ptr, sizeof(device_id) - (ptr - device_id), "FZY:0;"); ++ } ++ + if (!device_id[0] && strcmp(model, "Unknown")) + { + if (make_and_model[0]) +- snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;", ++ snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;", + make_and_model, model); + else if (!_cups_strncasecmp(model, "designjet ", 10)) +- snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s", model + 10); ++ snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;FZY:1;", model + 10); + else if (!_cups_strncasecmp(model, "stylus ", 7)) +- snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s", model + 7); ++ snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;FZY:1;", model + 7); + else if ((ptr = strchr(model, ' ')) != NULL) + { + /* +@@ -1199,7 +1206,7 @@ query_callback( + memcpy(make_and_model, model, ptr - model); + make_and_model[ptr - model] = '\0'; + +- snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s", ++ snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;", + make_and_model, ptr + 1); + } + } diff --git a/cups/patches/024_cups-ricoh-deviceid-oid.patch b/cups/patches/024_cups-ricoh-deviceid-oid.patch new file mode 100644 index 0000000..c148f95 --- /dev/null +++ b/cups/patches/024_cups-ricoh-deviceid-oid.patch @@ -0,0 +1,21 @@ +diff -up cups-1.5b1/backend/snmp.c.ricoh-deviceid-oid cups-1.5b1/backend/snmp.c +--- cups-1.5b1/backend/snmp.c.ricoh-deviceid-oid 2011-05-24 17:29:48.000000000 +0200 ++++ cups-1.5b1/backend/snmp.c 2011-05-24 17:29:48.000000000 +0200 +@@ -188,6 +188,7 @@ static const int LexmarkProductOID[] = { + static const int LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 }; + static const int LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 }; + static const int HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 }; ++static const int RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 }; + static const int XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 }; + static cups_array_t *DeviceURIs = NULL; + static int HostNameLookups = 0; +@@ -1005,6 +1006,9 @@ read_snmp_response(int fd) /* I - SNMP + packet.community, CUPS_ASN1_GET_REQUEST, + DEVICE_ID, LexmarkDeviceIdOID); + _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, ++ packet.community, CUPS_ASN1_GET_REQUEST, ++ DEVICE_ID, RicohDeviceIdOID); ++ _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, + packet.community, CUPS_ASN1_GET_REQUEST, + DEVICE_PRODUCT, XeroxProductOID); + _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, diff --git a/cups/patches/025_cups-systemd-socket.patch b/cups/patches/025_cups-systemd-socket.patch new file mode 100644 index 0000000..83fabdb --- /dev/null +++ b/cups/patches/025_cups-systemd-socket.patch @@ -0,0 +1,395 @@ +diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in +--- cups-1.6b1/config.h.in.systemd-socket 2012-05-17 00:57:03.000000000 +0200 ++++ cups-1.6b1/config.h.in 2012-05-28 11:16:35.657250584 +0200 +@@ -506,6 +506,13 @@ + + + /* ++ * Do we have systemd support? ++ */ ++ ++#undef HAVE_SYSTEMD ++ ++ ++/* + * Various scripting languages... + */ + +diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/config-scripts/cups-systemd.m4 +--- cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket 2012-05-28 11:16:35.658250577 +0200 ++++ cups-1.6b1/config-scripts/cups-systemd.m4 2012-05-28 11:16:35.658250577 +0200 +@@ -0,0 +1,36 @@ ++dnl ++dnl "$Id$" ++dnl ++dnl systemd stuff for CUPS. ++ ++dnl Find whether systemd is available ++ ++SDLIBS="" ++AC_ARG_WITH([systemdsystemunitdir], ++ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), ++ [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)]) ++if test "x$with_systemdsystemunitdir" != xno; then ++ AC_MSG_CHECKING(for libsystemd-daemon) ++ if $PKGCONFIG --exists libsystemd-daemon; then ++ AC_MSG_RESULT(yes) ++ SDCFLAGS=`$PKGCONFIG --cflags libsystemd-daemon` ++ SDLIBS=`$PKGCONFIG --libs libsystemd-daemon` ++ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) ++ AC_DEFINE(HAVE_SYSTEMD) ++ else ++ AC_MSG_RESULT(no) ++ fi ++fi ++ ++if test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ; then ++ SYSTEMD_UNITS="cups.service cups.socket cups.path" ++else ++ SYSTEMD_UNITS="" ++fi ++ ++AC_SUBST(SYSTEMD_UNITS) ++AC_SUBST(SDLIBS) ++ ++dnl ++dnl "$Id$" ++dnl +diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in +--- cups-1.6b1/configure.in.systemd-socket 2012-04-23 19:26:57.000000000 +0200 ++++ cups-1.6b1/configure.in 2012-05-28 11:16:35.658250577 +0200 +@@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4) + sinclude(config-scripts/cups-largefile.m4) + sinclude(config-scripts/cups-dnssd.m4) + sinclude(config-scripts/cups-launchd.m4) ++sinclude(config-scripts/cups-systemd.m4) + sinclude(config-scripts/cups-defaults.m4) + sinclude(config-scripts/cups-scripting.m4) + +@@ -66,6 +67,9 @@ AC_OUTPUT(Makedefs + conf/snmp.conf + cups-config + data/testprint ++ data/cups.service ++ data/cups.socket ++ data/cups.path + desktop/cups.desktop + doc/help/ref-cupsd-conf.html + doc/help/standard.html +diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c +--- cups-1.6b1/cups/usersys.c.systemd-socket 2012-04-23 19:26:57.000000000 +0200 ++++ cups-1.6b1/cups/usersys.c 2012-05-28 11:16:35.659250570 +0200 +@@ -975,7 +975,7 @@ cups_read_client_conf( + struct stat sockinfo; /* Domain socket information */ + + if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) && +- (sockinfo.st_mode & S_IRWXO) == S_IRWXO) ++ (sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH)) + cups_server = CUPS_DEFAULT_DOMAINSOCKET; + else + #endif /* CUPS_DEFAULT_DOMAINSOCKET */ +diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.in +--- cups-1.6b1/data/cups.path.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200 ++++ cups-1.6b1/data/cups.path.in 2012-05-28 11:16:35.659250570 +0200 +@@ -0,0 +1,8 @@ ++[Unit] ++Description=CUPS Printer Service Spool ++ ++[Path] ++PathExistsGlob=@CUPS_REQUESTS@/d* ++ ++[Install] ++WantedBy=multi-user.target +diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.service.in +--- cups-1.6b1/data/cups.service.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200 ++++ cups-1.6b1/data/cups.service.in 2012-05-28 11:16:35.659250570 +0200 +@@ -0,0 +1,10 @@ ++[Unit] ++Description=CUPS Printing Service ++ ++[Service] ++ExecStart=@sbindir@/cupsd -f ++PrivateTmp=true ++ ++[Install] ++Also=cups.socket cups.path ++WantedBy=printer.target +diff -up cups-1.6b1/data/cups.socket.in.systemd-socket cups-1.6b1/data/cups.socket.in +--- cups-1.6b1/data/cups.socket.in.systemd-socket 2012-05-28 11:16:35.660250563 +0200 ++++ cups-1.6b1/data/cups.socket.in 2012-05-28 11:16:35.660250563 +0200 +@@ -0,0 +1,8 @@ ++[Unit] ++Description=CUPS Printing Service Sockets ++ ++[Socket] ++ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@ ++ ++[Install] ++WantedBy=sockets.target +diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile +--- cups-1.6b1/data/Makefile.systemd-socket 2011-08-27 11:23:01.000000000 +0200 ++++ cups-1.6b1/data/Makefile 2012-05-28 11:16:35.660250563 +0200 +@@ -100,6 +100,12 @@ install-data: + $(INSTALL_DATA) $$file $(DATADIR)/ppdc; \ + done + $(INSTALL_DIR) -m 755 $(DATADIR)/profiles ++ if test "x$(SYSTEMD_UNITS)" != "x" ; then \ ++ $(INSTALL_DIR) -m 755 $(SYSTEMDUNITDIR); \ ++ for file in $(SYSTEMD_UNITS); do \ ++ $(INSTALL_DATA) $$file $(SYSTEMDUNITDIR); \ ++ done; \ ++ fi + + + # +@@ -143,6 +149,9 @@ uninstall: + -$(RMDIR) $(DATADIR)/data + -$(RMDIR) $(DATADIR)/banners + -$(RMDIR) $(DATADIR) ++ for file in $(SYSTEMD_UNITS); do \ ++ $(RM) $(SYSTEMDUNITDIR)/$$file; \ ++ done + + + # +diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in +--- cups-1.6b1/Makedefs.in.systemd-socket 2012-05-28 11:16:35.648250647 +0200 ++++ cups-1.6b1/Makedefs.in 2012-05-28 11:16:35.660250563 +0200 +@@ -134,11 +134,13 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ + CXXLIBS = @CXXLIBS@ + DBUS_NOTIFIER = @DBUS_NOTIFIER@ + DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@ ++SYSTEMD_UNITS = @SYSTEMD_UNITS@ + DNSSD_BACKEND = @DNSSD_BACKEND@ + DSOFLAGS = -L../cups @DSOFLAGS@ + DSOLIBS = @DSOLIBS@ $(COMMONLIBS) + DNSSDLIBS = @DNSSDLIBS@ + LAUNCHDLIBS = @LAUNCHDLIBS@ ++SDLIBS = @SDLIBS@ + LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \ + -L../scheduler @LDARCHFLAGS@ \ + @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) +@@ -229,6 +231,7 @@ PAMFILE = @PAMFILE@ + + DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@ + DBUSDIR = @DBUSDIR@ ++SYSTEMDUNITDIR = $(BUILDROOT)@systemdsystemunitdir@ + + + # +diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/client.h +--- cups-1.6b1/scheduler/client.h.systemd-socket 2012-03-22 21:30:20.000000000 +0100 ++++ cups-1.6b1/scheduler/client.h 2012-05-28 11:16:35.661250556 +0200 +@@ -77,6 +77,9 @@ typedef struct + int fd; /* File descriptor for this server */ + http_addr_t address; /* Bind address of socket */ + http_encryption_t encryption; /* To encrypt or not to encrypt... */ ++#ifdef HAVE_SYSTEMD ++ int is_systemd; /* Is this a systemd socket? */ ++#endif /* HAVE_SYSTEMD */ + } cupsd_listener_t; + + +diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/listen.c +--- cups-1.6b1/scheduler/listen.c.systemd-socket 2011-04-16 01:38:13.000000000 +0200 ++++ cups-1.6b1/scheduler/listen.c 2012-05-28 11:16:35.661250556 +0200 +@@ -401,7 +401,11 @@ cupsdStopListening(void) + lis; + lis = (cupsd_listener_t *)cupsArrayNext(Listeners)) + { +- if (lis->fd != -1) ++ if (lis->fd != -1 ++#ifdef HAVE_SYSTEMD ++ && !lis->is_systemd ++#endif /* HAVE_SYSTEMD */ ++ ) + { + #ifdef WIN32 + closesocket(lis->fd); +diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c +--- cups-1.6b1/scheduler/main.c.systemd-socket 2012-05-28 11:16:35.612250897 +0200 ++++ cups-1.6b1/scheduler/main.c 2012-05-28 12:49:32.698375139 +0200 +@@ -26,6 +26,8 @@ + * launchd_checkin() - Check-in with launchd and collect the listening + * fds. + * launchd_checkout() - Update the launchd KeepAlive file as needed. ++ * systemd_checkin() - Check-in with systemd and collect the ++ * listening fds. + * parent_handler() - Catch USR1/CHLD signals... + * process_children() - Process all dead children... + * select_timeout() - Calculate the select timeout value. +@@ -62,6 +64,10 @@ + # endif /* !LAUNCH_JOBKEY_SERVICEIPC */ + #endif /* HAVE_LAUNCH_H */ + ++#ifdef HAVE_SYSTEMD ++#include <systemd/sd-daemon.h> ++#endif /* HAVE_SYSTEMD */ ++ + #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) + # include <malloc.h> + #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ +@@ -78,6 +84,9 @@ + static void launchd_checkin(void); + static void launchd_checkout(void); + #endif /* HAVE_LAUNCHD */ ++#ifdef HAVE_SYSTEMD ++static void systemd_checkin(void); ++#endif /* HAVE_SYSTEMD */ + static void parent_handler(int sig); + static void process_children(void); + static void sigchld_handler(int sig); +@@ -528,6 +537,13 @@ main(int argc, /* I - Number of comm + } + #endif /* HAVE_LAUNCHD */ + ++#ifdef HAVE_SYSTEMD ++ /* ++ * If we were started by systemd get the listen sockets file descriptors... ++ */ ++ systemd_checkin(); ++#endif /* HAVE_SYSTEMD */ ++ + /* + * Startup the server... + */ +@@ -738,6 +754,15 @@ main(int argc, /* I - Number of comm + } + #endif /* HAVE_LAUNCHD */ + ++#ifdef HAVE_SYSTEMD ++ /* ++ * If we were started by systemd get the listen sockets file ++ * descriptors... ++ */ ++ ++ systemd_checkin(); ++#endif /* HAVE_SYSTEMD */ ++ + /* + * Startup the server... + */ +@@ -1516,6 +1541,102 @@ launchd_checkout(void) + } + #endif /* HAVE_LAUNCHD */ + ++#ifdef HAVE_SYSTEMD ++static void ++systemd_checkin(void) ++{ ++ int n, fd; ++ ++ n = sd_listen_fds(0); ++ if (n < 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "systemd_checkin: Failed to acquire sockets from systemd - %s", ++ strerror(-n)); ++ exit(EXIT_FAILURE); ++ return; ++ } ++ ++ if (n == 0) ++ return; ++ ++ for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd ++) ++ { ++ http_addr_t addr; ++ socklen_t addrlen = sizeof (addr); ++ int r; ++ cupsd_listener_t *lis; ++ char s[256]; ++ ++ r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1); ++ if (r < 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "systemd_checkin: Unable to verify socket type - %s", ++ strerror(-r)); ++ continue; ++ } ++ ++ if (!r) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "systemd_checkin: Socket not of the right type"); ++ continue; ++ } ++ ++ if (getsockname(fd, (struct sockaddr*) &addr, &addrlen)) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "systemd_checkin: Unable to get local address - %s", ++ strerror(errno)); ++ continue; ++ } ++ ++ /* ++ * Try to match the systemd socket address to one of the listeners... ++ */ ++ ++ for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners); ++ lis; ++ lis = (cupsd_listener_t *)cupsArrayNext(Listeners)) ++ if (httpAddrEqual(&lis->address, &addr)) ++ break; ++ ++ if (lis) ++ { ++ cupsdLogMessage(CUPSD_LOG_DEBUG, ++ "systemd_checkin: Matched existing listener %s with fd %d...", ++ httpAddrString(&(lis->address), s, sizeof(s)), fd); ++ } ++ else ++ { ++ cupsdLogMessage(CUPSD_LOG_DEBUG, ++ "systemd_checkin: Adding new listener %s with fd %d...", ++ httpAddrString(&addr, s, sizeof(s)), fd); ++ ++ if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "systemd_checkin: Unable to allocate listener - " ++ "%s.", strerror(errno)); ++ exit(EXIT_FAILURE); ++ } ++ ++ cupsArrayAdd(Listeners, lis); ++ ++ memcpy(&lis->address, &addr, sizeof(lis->address)); ++ } ++ ++ lis->fd = fd; ++ lis->is_systemd = 1; ++ ++# ifdef HAVE_SSL ++ if (_httpAddrPort(&(lis->address)) == 443) ++ lis->encryption = HTTP_ENCRYPT_ALWAYS; ++# endif /* HAVE_SSL */ ++ } ++} ++#endif /* HAVE_SYSTEMD */ + + /* + * 'parent_handler()' - Catch USR1/CHLD signals... +diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makefile +--- cups-1.6b1/scheduler/Makefile.systemd-socket 2012-05-21 19:40:22.000000000 +0200 ++++ cups-1.6b1/scheduler/Makefile 2012-05-28 11:16:35.663250542 +0200 +@@ -371,7 +371,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu + $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \ + $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ + $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \ +- $(LIBGSSAPI) $(LIBWRAP) ++ $(LIBGSSAPI) $(LIBWRAP) $(SDLIBS) + + cupsd-static: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC) + echo Linking $@... +@@ -379,7 +379,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a + $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ + ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \ + $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \ +- $(LIBWRAP) ++ $(LIBWRAP) $(SDLIBS) + + tls.o: tls-darwin.c tls-gnutls.c tls-openssl.c + diff --git a/cups/patches/026_cups-lspp.patch b/cups/patches/026_cups-lspp.patch new file mode 100644 index 0000000..d81ef06 --- /dev/null +++ b/cups/patches/026_cups-lspp.patch @@ -0,0 +1,1999 @@ +diff -up cups-1.6b1/config.h.in.lspp cups-1.6b1/config.h.in +--- cups-1.6b1/config.h.in.lspp 2012-05-25 17:01:32.000000000 +0200 ++++ cups-1.6b1/config.h.in 2012-05-25 17:03:16.889043298 +0200 +@@ -768,6 +768,13 @@ static __inline int _cups_abs(int i) { r + # endif /* __GNUC__ || __STDC_VERSION__ */ + #endif /* !HAVE_ABS && !abs */ + ++/* ++ * Are we trying to meet LSPP requirements? ++ */ ++ ++#undef WITH_LSPP ++ ++ + #endif /* !_CUPS_CONFIG_H_ */ + + /* +diff -up cups-1.6b1/config-scripts/cups-lspp.m4.lspp cups-1.6b1/config-scripts/cups-lspp.m4 +--- cups-1.6b1/config-scripts/cups-lspp.m4.lspp 2012-05-25 17:01:32.852768495 +0200 ++++ cups-1.6b1/config-scripts/cups-lspp.m4 2012-05-25 17:01:32.853768488 +0200 +@@ -0,0 +1,36 @@ ++dnl ++dnl LSPP code for the Common UNIX Printing System (CUPS). ++dnl ++dnl Copyright 2005-2006 by Hewlett-Packard Development Company, L.P. ++dnl ++dnl This program is free software; you can redistribute it and/or modify ++dnl it under the terms of the GNU General Public License as published by ++dnl the Free Software Foundation; version 2. ++dnl ++dnl This program is distributed in the hope that it will be useful, but ++dnl WITHOUT ANY WARRANTY; without even the implied warranty of ++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++dnl General Public License for more details. ++dnl ++dnl You should have received a copy of the GNU General Public License ++dnl along with this program; if not, write to the Free Software Foundation, ++dnl Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301 USA ++dnl ++ ++dnl Are we trying to meet LSPP requirements ++AC_ARG_ENABLE(lspp, [ --enable-lspp turn on auditing and label support, default=no]) ++ ++if test x"$enable_lspp" != xno; then ++ case "$uname" in ++ Linux) ++ AC_CHECK_LIB(audit,audit_log_user_message, [LIBAUDIT="-laudit" AC_SUBST(LIBAUDIT)]) ++ AC_CHECK_HEADER(libaudit.h) ++ AC_CHECK_LIB(selinux,getpeercon, [LIBSELINUX="-lselinux" AC_SUBST(LIBSELINUX)]) ++ AC_CHECK_HEADER(selinux/selinux.h) ++ AC_DEFINE(WITH_LSPP) ++ ;; ++ *) ++ # All others ++ ;; ++ esac ++fi +diff -up cups-1.6b1/configure.in.lspp cups-1.6b1/configure.in +--- cups-1.6b1/configure.in.lspp 2012-05-25 17:01:32.000000000 +0200 ++++ cups-1.6b1/configure.in 2012-05-25 17:04:03.994714943 +0200 +@@ -37,6 +37,8 @@ sinclude(config-scripts/cups-systemd.m4) + sinclude(config-scripts/cups-defaults.m4) + sinclude(config-scripts/cups-scripting.m4) + ++sinclude(config-scripts/cups-lspp.m4) ++ + INSTALL_LANGUAGES="" + UNINSTALL_LANGUAGES="" + LANGFILES="" +diff -up cups-1.6b1/filter/common.c.lspp cups-1.6b1/filter/common.c +--- cups-1.6b1/filter/common.c.lspp 2011-05-20 05:49:49.000000000 +0200 ++++ cups-1.6b1/filter/common.c 2012-05-25 17:01:32.854768481 +0200 +@@ -30,6 +30,12 @@ + * Include necessary headers... + */ + ++#include "config.h" ++#ifdef WITH_LSPP ++#define _GNU_SOURCE ++#include <string.h> ++#endif /* WITH_LSPP */ ++ + #include "common.h" + #include <locale.h> + +@@ -312,6 +318,18 @@ WriteLabelProlog(const char *label, /* I + { + const char *classification; /* CLASSIFICATION environment variable */ + const char *ptr; /* Temporary string pointer */ ++#ifdef WITH_LSPP ++ int i, /* counter */ ++ n, /* counter */ ++ lines, /* number of lines needed */ ++ line_len, /* index into tmp_label */ ++ label_len, /* length of the label in characters */ ++ label_index, /* index into the label */ ++ longest, /* length of the longest line */ ++ longest_line, /* index to the longest line */ ++ max_width; /* maximum width in characters */ ++ char **wrapped_label; /* label with line breaks */ ++#endif /* WITH_LSPP */ + + + /* +@@ -334,6 +352,124 @@ WriteLabelProlog(const char *label, /* I + return; + } + ++#ifdef WITH_LSPP ++ if (strncmp(classification, "LSPP:", 5) == 0 && label == NULL) ++ { ++ /* ++ * Based on the 12pt fixed width font below determine the max_width ++ */ ++ max_width = width / 8; ++ longest_line = 0; ++ longest = 0; ++ classification += 5; // Skip the "LSPP:" ++ label_len = strlen(classification); ++ ++ if (label_len > max_width) ++ { ++ lines = 1 + (int)(label_len / max_width); ++ line_len = (int)(label_len / lines); ++ wrapped_label = malloc(sizeof(*wrapped_label) * lines); ++ label_index = i = n = 0; ++ while (classification[label_index]) ++ { ++ if ((label_index + line_len) > label_len) ++ break; ++ switch (classification[label_index + line_len + i]) ++ { ++ case ':': ++ case ',': ++ case '-': ++ i++; ++ wrapped_label[n++] = strndup(&classification[label_index], (line_len + i)); ++ label_index += line_len + i; ++ i = 0; ++ break; ++ default: ++ i++; ++ break; ++ } ++ if ((i + line_len) == max_width) ++ { ++ wrapped_label[n++] = strndup(&(classification[label_index]), (line_len + i)); ++ label_index = label_index + line_len + i; ++ i = 0; ++ } ++ } ++ wrapped_label[n] = strndup(&classification[label_index], label_len - label_index); ++ } ++ else ++ { ++ lines = 1; ++ wrapped_label = malloc(sizeof(*wrapped_label)); ++ wrapped_label[0] = (char*)classification; ++ } ++ ++ for (n = 0; n < lines; n++ ) ++ { ++ printf("userdict/ESPp%c(", ('a' + n)); ++ for (ptr = wrapped_label[n], i = 0; *ptr; ptr ++, i++) ++ if (*ptr < 32 || *ptr > 126) ++ printf("\\%03o", *ptr); ++ else ++ { ++ if (*ptr == '(' || *ptr == ')' || *ptr == '\\') ++ putchar('\\'); ++ ++ printf("%c", *ptr); ++ } ++ if (i > longest) ++ { ++ longest = i; ++ longest_line = n; ++ } ++ printf(")put\n"); ++ } ++ ++ /* ++ * For LSPP use a fixed width font so that line wrapping can be calculated ++ */ ++ ++ puts("userdict/ESPlf /Nimbus-Mono findfont 12 scalefont put"); ++ ++ /* ++ * Finally, the procedure to write the labels on the page... ++ */ ++ ++ printf("userdict/ESPwl{\n" ++ " ESPlf setfont\n"); ++ printf(" ESPp%c stringwidth pop dup 12 add exch -0.5 mul %.0f add\n ", ++ 'a' + longest_line, width * 0.5f); ++ for (n = 1; n < lines; n++) ++ printf(" dup"); ++ printf("\n 1 setgray\n"); ++ printf(" dup 6 sub %.0f %d index %.0f ESPrf\n", ++ (bottom - 2.0), (2 + lines), 6.0 + (16.0 * lines)); ++ printf(" dup 6 sub %.0f %d index %.0f ESPrf\n", ++ (top - 6.0 - (16.0 * lines)), (2 + lines), 4.0 + (16.0 * lines)); ++ printf(" 0 setgray\n"); ++ printf(" dup 6 sub %.0f %d index %.0f ESPrs\n", ++ (bottom - 2.0), (2 + lines), 6.0 + (16.0 * lines)); ++ printf(" dup 6 sub %.0f %d index %.0f ESPrs\n", ++ (top - 6.0 - (16.0 * lines)), (2 + lines), 4.0 + (16.0 * lines)); ++ for (n = 0; n < lines; n ++) ++ { ++ printf(" dup %.0f moveto ESPp%c show\n", ++ bottom + 6.0 + ((lines - (n+1)) * 16.0), 'a' + n); ++ printf(" %.0f moveto ESPp%c show\n", top + 2.0 - ((n + 1) * 16.0), 'a' + n); ++ } ++ printf(" pop\n" ++ "}bind put\n"); ++ ++ /* ++ * Do some clean up at the end of the LSPP special case ++ */ ++ free(wrapped_label); ++ ++ } ++ else ++ { ++#endif /* !WITH_LSPP */ ++ + /* + * Set the classification + page label string... + */ +@@ -414,7 +550,10 @@ WriteLabelProlog(const char *label, /* I + printf(" %.0f moveto ESPpl show\n", top - 14.0); + puts("pop"); + puts("}bind put"); ++ } ++#ifdef WITH_LSPP + } ++#endif /* WITH_LSPP */ + + + /* +diff -up cups-1.6b1/filter/pstops.c.lspp cups-1.6b1/filter/pstops.c +--- cups-1.6b1/filter/pstops.c.lspp 2012-04-23 21:19:19.000000000 +0200 ++++ cups-1.6b1/filter/pstops.c 2012-05-25 17:01:32.855768474 +0200 +@@ -3202,6 +3202,18 @@ write_label_prolog(pstops_doc_t *doc, /* + { + const char *classification; /* CLASSIFICATION environment variable */ + const char *ptr; /* Temporary string pointer */ ++#ifdef WITH_LSPP ++ int i, /* counter */ ++ n, /* counter */ ++ lines, /* number of lines needed */ ++ line_len, /* index into tmp_label */ ++ label_len, /* length of the label in characters */ ++ label_index, /* index into the label */ ++ longest, /* length of the longest line */ ++ longest_line, /* index to the longest line */ ++ max_width; /* maximum width in characters */ ++ char **wrapped_label; /* label with line breaks */ ++#endif /* WITH_LSPP */ + + + /* +@@ -3224,6 +3236,124 @@ write_label_prolog(pstops_doc_t *doc, /* + return; + } + ++#ifdef WITH_LSPP ++ if (strncmp(classification, "LSPP:", 5) == 0 && label == NULL) ++ { ++ /* ++ * Based on the 12pt fixed width font below determine the max_width ++ */ ++ max_width = width / 8; ++ longest_line = 0; ++ longest = 0; ++ classification += 5; // Skip the "LSPP:" ++ label_len = strlen(classification); ++ ++ if (label_len > max_width) ++ { ++ lines = 1 + (int)(label_len / max_width); ++ line_len = (int)(label_len / lines); ++ wrapped_label = malloc(sizeof(*wrapped_label) * lines); ++ label_index = i = n = 0; ++ while (classification[label_index]) ++ { ++ if ((label_index + line_len) > label_len) ++ break; ++ switch (classification[label_index + line_len + i]) ++ { ++ case ':': ++ case ',': ++ case '-': ++ i++; ++ wrapped_label[n++] = strndup(&classification[label_index], (line_len + i)); ++ label_index += line_len + i; ++ i = 0; ++ break; ++ default: ++ i++; ++ break; ++ } ++ if ((i + line_len) == max_width) ++ { ++ wrapped_label[n++] = strndup(&(classification[label_index]), (line_len + i)); ++ label_index = label_index + line_len + i; ++ i = 0; ++ } ++ } ++ wrapped_label[n] = strndup(&classification[label_index], label_len - label_index); ++ } ++ else ++ { ++ lines = 1; ++ wrapped_label = malloc(sizeof(*wrapped_label)); ++ wrapped_label[0] = (char*)classification; ++ } ++ ++ for (n = 0; n < lines; n++ ) ++ { ++ printf("userdict/ESPp%c(", ('a' + n)); ++ for (ptr = wrapped_label[n], i = 0; *ptr; ptr ++, i++) ++ if (*ptr < 32 || *ptr > 126) ++ printf("\\%03o", *ptr); ++ else ++ { ++ if (*ptr == '(' || *ptr == ')' || *ptr == '\\') ++ putchar('\\'); ++ ++ printf("%c", *ptr); ++ } ++ if (i > longest) ++ { ++ longest = i; ++ longest_line = n; ++ } ++ printf(")put\n"); ++ } ++ ++ /* ++ * For LSPP use a fixed width font so that line wrapping can be calculated ++ */ ++ ++ puts("userdict/ESPlf /Nimbus-Mono findfont 12 scalefont put"); ++ ++ /* ++ * Finally, the procedure to write the labels on the page... ++ */ ++ ++ printf("userdict/ESPwl{\n" ++ " ESPlf setfont\n"); ++ printf(" ESPp%c stringwidth pop dup 12 add exch -0.5 mul %.0f add\n ", ++ 'a' + longest_line, width * 0.5f); ++ for (n = 1; n < lines; n++) ++ printf(" dup"); ++ printf("\n 1 setgray\n"); ++ printf(" dup 6 sub %.0f %d index %.0f ESPrf\n", ++ (bottom - 2.0), (2 + lines), 6.0 + (16.0 * lines)); ++ printf(" dup 6 sub %.0f %d index %.0f ESPrf\n", ++ (top - 6.0 - (16.0 * lines)), (2 + lines), 4.0 + (16.0 * lines)); ++ printf(" 0 setgray\n"); ++ printf(" dup 6 sub %.0f %d index %.0f ESPrs\n", ++ (bottom - 2.0), (2 + lines), 6.0 + (16.0 * lines)); ++ printf(" dup 6 sub %.0f %d index %.0f ESPrs\n", ++ (top - 6.0 - (16.0 * lines)), (2 + lines), 4.0 + (16.0 * lines)); ++ for (n = 0; n < lines; n ++) ++ { ++ printf(" dup %.0f moveto ESPp%c show\n", ++ bottom + 6.0 + ((lines - (n+1)) * 16.0), 'a' + n); ++ printf(" %.0f moveto ESPp%c show\n", top + 2.0 - ((n + 1) * 16.0), 'a' + n); ++ } ++ printf(" pop\n" ++ "}bind put\n"); ++ ++ /* ++ * Do some clean up at the end of the LSPP special case ++ */ ++ free(wrapped_label); ++ ++ } ++ else ++ { ++#endif /* !WITH_LSPP */ ++ + /* + * Set the classification + page label string... + */ +@@ -3302,7 +3432,10 @@ write_label_prolog(pstops_doc_t *doc, /* + doc_printf(doc, " %.0f moveto ESPpl show\n", top - 14.0); + doc_puts(doc, "pop\n"); + doc_puts(doc, "}bind put\n"); ++ } ++#ifdef WITH_LSPP + } ++#endif /* WITH_LSPP */ + + + /* +diff -up cups-1.6b1/Makedefs.in.lspp cups-1.6b1/Makedefs.in +--- cups-1.6b1/Makedefs.in.lspp 2012-05-25 17:01:32.000000000 +0200 ++++ cups-1.6b1/Makedefs.in 2012-05-25 17:07:57.325088484 +0200 +@@ -146,7 +146,7 @@ LDFLAGS = -L../cgi-bin -L../cups -L../f + @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) + LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ) + LINKCUPSIMAGE = @LINKCUPSIMAGE@ +-LIBS = $(LINKCUPS) $(COMMONLIBS) ++LIBS = $(LINKCUPS) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@ + OPTIM = @OPTIM@ + OPTIONS = + PAMLIBS = @PAMLIBS@ +diff -up cups-1.6b1/scheduler/client.c.lspp cups-1.6b1/scheduler/client.c +--- cups-1.6b1/scheduler/client.c.lspp 2012-05-08 00:41:30.000000000 +0200 ++++ cups-1.6b1/scheduler/client.c 2012-05-25 17:13:38.947707163 +0200 +@@ -41,6 +41,7 @@ + * valid_host() - Is the Host: field valid? + * write_file() - Send a file via HTTP. + * write_pipe() - Flag that data is available on the CGI pipe. ++ * client_pid_to_auid() - Get the audit login uid of the client. + */ + + /* +@@ -49,10 +50,16 @@ + + #include "cupsd.h" + ++#define _GNU_SOURCE + #ifdef HAVE_TCPD_H + # include <tcpd.h> + #endif /* HAVE_TCPD_H */ + ++#ifdef WITH_LSPP ++#include <selinux/selinux.h> ++#include <selinux/context.h> ++#include <fcntl.h> ++#endif /* WITH_LSPP */ + + /* + * Local globals... +@@ -371,6 +378,57 @@ cupsdAcceptClient(cupsd_listener_t *lis) + } + #endif /* HAVE_TCPD_H */ + ++#ifdef WITH_LSPP ++ if (is_lspp_config()) ++ { ++ struct ucred cr; ++ unsigned int cl=sizeof(cr); ++ ++ if (getsockopt(con->http.fd, SOL_SOCKET, SO_PEERCRED, &cr, &cl) == 0) ++ { ++ /* ++ * client_pid_to_auid() can be racey ++ * In this case the pid is based on a socket connected to the client ++ */ ++ if ((con->auid = client_pid_to_auid(cr.pid)) == -1) ++ { ++ close(con->http.fd); ++ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: " ++ "unable to determine client auid for client pid=%d", cr.pid); ++ free(con); ++ return; ++ } ++ cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: peer's pid=%d, uid=%d, gid=%d, auid=%d", ++ cr.pid, cr.uid, cr.gid, con->auid); ++ } ++ else ++ { ++ close(con->http.fd); ++ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getsockopt() failed"); ++ free(con); ++ return; ++ } ++ ++ /* ++ * get the context of the peer connection ++ */ ++ if (getpeercon(con->http.fd, &con->scon)) ++ { ++ close(con->http.fd); ++ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getpeercon() failed"); ++ free(con); ++ return; ++ } ++ ++ cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: client context=%s", con->scon); ++ } ++ else ++ { ++ cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: skipping getpeercon()"); ++ cupsdSetString(&con->scon, UNKNOWN_SL); ++ } ++#endif /* WITH_LSPP */ ++ + #ifdef AF_LOCAL + if (con->http.hostaddr->addr.sa_family == AF_LOCAL) + cupsdLogMessage(CUPSD_LOG_DEBUG, "[Client %d] Accepted from %s (Domain)", +@@ -678,6 +736,13 @@ cupsdReadClient(cupsd_client_t *con) /* + mime_type_t *type; /* MIME type of file */ + cupsd_printer_t *p; /* Printer */ + static unsigned request_id = 0; /* Request ID for temp files */ ++#ifdef WITH_LSPP ++ security_context_t spoolcon; /* context of the job file */ ++ context_t clicon; /* contex_t container for con->scon */ ++ context_t tmpcon; /* temp context to swap the level */ ++ char *clirange; /* SELinux sensitivity range */ ++ char *cliclearance; /* SELinux low end clearance */ ++#endif /* WITH_LSPP */ + + + status = HTTP_CONTINUE; +@@ -2126,6 +2191,67 @@ cupsdReadClient(cupsd_client_t *con) /* + fchmod(con->file, 0640); + fchown(con->file, RunUser, Group); + fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC); ++#ifdef WITH_LSPP ++ if (strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) ++ { ++ if (getfilecon(con->filename, &spoolcon) == -1) ++ { ++ cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE); ++ return (cupsdCloseClient(con)); ++ } ++ clicon = context_new(con->scon); ++ tmpcon = context_new(spoolcon); ++ freecon(spoolcon); ++ if (!clicon || !tmpcon) ++ { ++ cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE); ++ if (clicon) ++ context_free(clicon); ++ if (tmpcon) ++ context_free(tmpcon); ++ return (cupsdCloseClient(con)); ++ } ++ clirange = context_range_get(clicon); ++ if (clirange) ++ { ++ clirange = strdup(clirange); ++ if ((cliclearance = strtok(clirange, "-")) != NULL) ++ { ++ if (context_range_set(tmpcon, cliclearance) == -1) ++ { ++ cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE); ++ free(clirange); ++ context_free(tmpcon); ++ context_free(clicon); ++ return (cupsdCloseClient(con)); ++ } ++ } ++ else ++ { ++ if (context_range_set(tmpcon, (context_range_get(clicon))) == -1) ++ { ++ cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE); ++ free(clirange); ++ context_free(tmpcon); ++ context_free(clicon); ++ return (cupsdCloseClient(con)); ++ } ++ } ++ free(clirange); ++ } ++ if (setfilecon(con->filename, context_str(tmpcon)) == -1) ++ { ++ cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE); ++ context_free(tmpcon); ++ context_free(clicon); ++ return (cupsdCloseClient(con)); ++ } ++ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdReadClient: %s set to %s", ++ con->filename, context_str(tmpcon)); ++ context_free(tmpcon); ++ context_free(clicon); ++ } ++#endif /* WITH_LSPP */ + } + + if (con->http.state != HTTP_POST_SEND) +@@ -3581,6 +3707,49 @@ is_path_absolute(const char *path) /* I + return (1); + } + ++#ifdef WITH_LSPP ++/* ++ * 'client_pid_to_auid()' - Using the client's pid, read /proc and determine the loginuid. ++ */ ++ ++uid_t client_pid_to_auid(pid_t clipid) ++{ ++ uid_t uid; ++ int len, in; ++ char buf[16] = {0}; ++ char fname[32] = {0}; ++ ++ ++ /* ++ * Hopefully this pid is still the one we are interested in. ++ */ ++ snprintf(fname, 32, "/proc/%d/loginuid", clipid); ++ in = open(fname, O_NOFOLLOW|O_RDONLY); ++ ++ if (in < 0) ++ return -1; ++ ++ errno = 0; ++ ++ do { ++ len = read(in, buf, sizeof(buf)); ++ } while (len < 0 && errno == EINTR); ++ ++ close(in); ++ ++ if (len < 0 || len >= sizeof(buf)) ++ return -1; ++ ++ errno = 0; ++ buf[len] = 0; ++ uid = strtol(buf, 0, 10); ++ ++ if (errno != 0) ++ return -1; ++ else ++ return uid; ++} ++#endif /* WITH_LSPP */ + + /* + * 'pipe_command()' - Pipe the output of a command to the remote client. +diff -up cups-1.6b1/scheduler/client.h.lspp cups-1.6b1/scheduler/client.h +--- cups-1.6b1/scheduler/client.h.lspp 2012-05-25 17:01:32.847768530 +0200 ++++ cups-1.6b1/scheduler/client.h 2012-05-25 17:14:12.963470050 +0200 +@@ -18,6 +18,13 @@ + #endif /* HAVE_AUTHORIZATION_H */ + + ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ ++#ifdef WITH_LSPP ++#include <selinux/selinux.h> ++#endif /* WITH_LSPP */ ++ + /* + * HTTP client structure... + */ +@@ -63,6 +70,10 @@ struct cupsd_client_s + #ifdef HAVE_AUTHORIZATION_H + AuthorizationRef authref; /* Authorization ref */ + #endif /* HAVE_AUTHORIZATION_H */ ++#ifdef WITH_LSPP ++ security_context_t scon; /* Security context of connection */ ++ uid_t auid; /* Audit loginuid of the client */ ++#endif /* WITH_LSPP */ + }; + + #define HTTP(con) &((con)->http) +@@ -135,6 +146,9 @@ extern void cupsdStartListening(void); + extern void cupsdStopListening(void); + extern void cupsdUpdateCGI(void); + extern void cupsdWriteClient(cupsd_client_t *con); ++#ifdef WITH_LSPP ++extern uid_t client_pid_to_auid(pid_t clipid); ++#endif /* WITH_LSPP */ + + #ifdef HAVE_SSL + extern int cupsdEndTLS(cupsd_client_t *con); +diff -up cups-1.6b1/scheduler/conf.c.lspp cups-1.6b1/scheduler/conf.c +--- cups-1.6b1/scheduler/conf.c.lspp 2012-05-25 17:01:32.778769011 +0200 ++++ cups-1.6b1/scheduler/conf.c 2012-05-25 17:01:32.860768439 +0200 +@@ -32,6 +32,7 @@ + * read_location() - Read a <Location path> definition. + * read_policy() - Read a <Policy name> definition. + * set_policy_defaults() - Set default policy values as needed. ++ * is_lspp_config() - Is the system configured for LSPP + */ + + /* +@@ -57,6 +58,9 @@ + # define INADDR_NONE 0xffffffff + #endif /* !INADDR_NONE */ + ++#ifdef WITH_LSPP ++# include <libaudit.h> ++#endif /* WITH_LSPP */ + + /* + * Configuration variable structure... +@@ -164,6 +168,10 @@ static const cupsd_var_t variables[] = + # if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS) + { "ServerKey", &ServerKey, CUPSD_VARTYPE_PATHNAME }, + # endif /* HAVE_LIBSSL || HAVE_GNUTLS */ ++#ifdef WITH_LSPP ++ { "AuditLog", &AuditLog, CUPSD_VARTYPE_INTEGER }, ++ { "PerPageLabels", &PerPageLabels, CUPSD_VARTYPE_BOOLEAN }, ++#endif /* WITH_LSPP */ + #endif /* HAVE_SSL */ + { "ServerName", &ServerName, CUPSD_VARTYPE_STRING }, + { "ServerRoot", &ServerRoot, CUPSD_VARTYPE_PATHNAME }, +@@ -537,6 +545,9 @@ cupsdReadConfiguration(void) + const char *tmpdir; /* TMPDIR environment variable */ + struct stat tmpinfo; /* Temporary directory info */ + cupsd_policy_t *p; /* Policy */ ++#ifdef WITH_LSPP ++ char *audit_message; /* Audit message string */ ++#endif /* WITH_LSPP */ + + + /* +@@ -801,6 +812,25 @@ cupsdReadConfiguration(void) + + RunUser = getuid(); + ++#ifdef WITH_LSPP ++ if (AuditLog != -1) ++ { ++ /* ++ * ClassifyOverride is set during read_configuration, if its ON, report it now ++ */ ++ if (ClassifyOverride) ++ audit_log_user_message(AuditLog, AUDIT_USYS_CONFIG, ++ "[Config] ClassifyOverride=enabled Users can override print banners", ++ ServerName, NULL, NULL, 1); ++ /* ++ * PerPageLabel is set during read_configuration, if its OFF, report it now ++ */ ++ if (!PerPageLabels) ++ audit_log_user_message(AuditLog, AUDIT_USYS_CONFIG, ++ "[Config] PerPageLabels=disabled", ServerName, NULL, NULL, 1); ++ } ++#endif /* WITH_LSPP */ ++ + cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.", + RemotePort ? "enabled" : "disabled"); + +@@ -1185,7 +1215,19 @@ cupsdReadConfiguration(void) + cupsdClearString(&Classification); + + if (Classification) ++ { + cupsdLogMessage(CUPSD_LOG_INFO, "Security set to \"%s\"", Classification); ++#ifdef WITH_LSPP ++ if (AuditLog != -1) ++ { ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "[Config] Classification=%s", Classification); ++ audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message, ++ ServerName, NULL, NULL, 1); ++ cupsdClearString(&audit_message); ++ } ++#endif /* WITH_LSPP */ ++ } + + /* + * Check the MaxClients setting, and then allocate memory for it... +@@ -3423,6 +3465,18 @@ read_location(cups_file_t *fp, /* I - C + return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum); + } + ++#ifdef WITH_LSPP ++int is_lspp_config() ++{ ++ if (Classification != NULL) ++ return ((_cups_strcasecmp(Classification, MLS_CONFIG) == 0) ++ || (_cups_strcasecmp(Classification, TE_CONFIG) == 0) ++ || (_cups_strcasecmp(Classification, SELINUX_CONFIG) == 0)); ++ else ++ return 0; ++} ++#endif /* WITH_LSPP */ ++ + + /* + * 'read_policy()' - Read a <Policy name> definition. +diff -up cups-1.6b1/scheduler/conf.h.lspp cups-1.6b1/scheduler/conf.h +--- cups-1.6b1/scheduler/conf.h.lspp 2012-05-25 17:01:32.000000000 +0200 ++++ cups-1.6b1/scheduler/conf.h 2012-05-25 17:16:20.522580884 +0200 +@@ -247,6 +247,13 @@ VAR int SSLOptions VALUE(CUPSD_SSL_NO + /* SSL/TLS options */ + #endif /* HAVE_SSL */ + ++#ifdef WITH_LSPP ++VAR int AuditLog VALUE(-1), ++ /* File descriptor for audit */ ++ PerPageLabels VALUE(TRUE); ++ /* Put the label on each page */ ++#endif /* WITH_LSPP */ ++ + #ifdef HAVE_LAUNCHD + VAR int LaunchdTimeout VALUE(10); + /* Time after which an idle cupsd will exit */ +@@ -265,6 +272,9 @@ int HaveServerCreds VALUE(0); + gss_cred_id_t ServerCreds; /* Server's GSS credentials */ + #endif /* HAVE_GSSAPI */ + ++#ifdef WITH_LSPP ++extern int is_lspp_config(void); ++#endif /* WITH_LSPP */ + + /* + * Prototypes... +diff -up cups-1.6b1/scheduler/cupsd.h.lspp cups-1.6b1/scheduler/cupsd.h +--- cups-1.6b1/scheduler/cupsd.h.lspp 2012-05-21 19:40:22.000000000 +0200 ++++ cups-1.6b1/scheduler/cupsd.h 2012-05-25 17:01:32.861768432 +0200 +@@ -13,6 +13,8 @@ + * file is missing or damaged, see the license at "http://www.cups.org/". + */ + ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ + + /* + * Include necessary headers. +@@ -37,13 +39,20 @@ + # include <unistd.h> + #endif /* WIN32 */ + ++#include "config.h" ++#ifdef WITH_LSPP ++# define MLS_CONFIG "mls" ++# define TE_CONFIG "te" ++# define SELINUX_CONFIG "SELinux" ++# define UNKNOWN_SL "UNKNOWN SL" ++#endif /* WITH_LSPP */ ++ + #include "mime.h" + + #if defined(HAVE_CDSASSL) + # include <CoreFoundation/CoreFoundation.h> + #endif /* HAVE_CDSASSL */ + +- + /* + * Some OS's don't have hstrerror(), most notably Solaris... + */ +diff -up cups-1.6b1/scheduler/ipp.c.lspp cups-1.6b1/scheduler/ipp.c +--- cups-1.6b1/scheduler/ipp.c.lspp 2012-05-25 17:01:32.810768787 +0200 ++++ cups-1.6b1/scheduler/ipp.c 2012-05-25 17:18:06.620841313 +0200 +@@ -35,6 +35,7 @@ + * cancel_all_jobs() - Cancel all or selected print jobs. + * cancel_job() - Cancel a print job. + * cancel_subscription() - Cancel a subscription. ++ * check_context() - Check the SELinux context for a user and job + * check_rss_recipient() - Check that we do not have a duplicate RSS + * feed URI. + * check_quotas() - Check quotas for a printer and user. +@@ -99,6 +100,9 @@ + * validate_user() - Validate the user for the request. + */ + ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ + /* + * Include necessary headers... + */ +@@ -122,6 +126,14 @@ extern int mbr_check_membership_by_id(uu + # endif /* HAVE_MEMBERSHIPPRIV_H */ + #endif /* __APPLE__ */ + ++#ifdef WITH_LSPP ++#include <libaudit.h> ++#include <selinux/selinux.h> ++#include <selinux/context.h> ++#include <selinux/avc.h> ++#include <selinux/flask.h> ++#include <selinux/av_permissions.h> ++#endif /* WITH_LSPP */ + + /* + * Local functions... +@@ -146,6 +158,9 @@ static void cancel_all_jobs(cupsd_client + static void cancel_job(cupsd_client_t *con, ipp_attribute_t *uri); + static void cancel_subscription(cupsd_client_t *con, int id); + static int check_rss_recipient(const char *recipient); ++#ifdef WITH_LSPP ++static int check_context(cupsd_client_t *con, cupsd_job_t *job); ++#endif /* WITH_LSPP */ + static int check_quotas(cupsd_client_t *con, cupsd_printer_t *p); + static void close_job(cupsd_client_t *con, ipp_attribute_t *uri); + static void copy_attrs(ipp_t *to, ipp_t *from, cups_array_t *ra, +@@ -1285,6 +1300,21 @@ add_job(cupsd_client_t *con, /* I - Cl + ipp_attribute_t *media_col, /* media-col attribute */ + *media_margin; /* media-*-margin attribute */ + ipp_t *unsup_col; /* media-col in unsupported response */ ++#ifdef WITH_LSPP ++ char *audit_message; /* Audit message string */ ++ char *printerfile; /* device file pointed to by the printer */ ++ char *userheader = NULL; /* User supplied job-sheets[0] */ ++ char *userfooter = NULL; /* User supplied job-sheets[1] */ ++ int override = 0; /* Was a banner overrode on a job */ ++ security_id_t clisid; /* SELinux SID for the client */ ++ security_id_t psid; /* SELinux SID for the printer */ ++ context_t printercon; /* Printer's context string */ ++ struct stat printerstat; /* Printer's stat buffer */ ++ security_context_t devcon; /* Printer's SELinux context */ ++ struct avc_entry_ref avcref; /* Pointer to the access vector cache */ ++ security_class_t tclass; /* Object class for the SELinux check */ ++ access_vector_t avr; /* Access method being requested */ ++#endif /* WITH_LSPP */ + + + cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))", +@@ -1542,6 +1572,106 @@ add_job(cupsd_client_t *con, /* I - Cl + ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL, + "Untitled"); + ++#ifdef WITH_LSPP ++ if (is_lspp_config()) ++ { ++ if (!con->scon || strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) == 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "add_job: missing classification for connection \'%s\'!", printer->name); ++ send_ipp_status(con, IPP_INTERNAL_ERROR, _("Missing required security attributes.")); ++ return (NULL); ++ } ++ ++ /* ++ * Perform an access check so that if the user gets feedback at enqueue time ++ */ ++ ++ printerfile = strstr(printer->device_uri, "/dev/"); ++ if (printerfile == NULL && (strncmp(printer->device_uri, "file:/", 6) == 0)) ++ printerfile = printer->device_uri + strlen("file:"); ++ ++ if (printerfile != NULL) ++ { ++ cupsdLogMessage(CUPSD_LOG_DEBUG, "add_job: Attempting an access check on printer device %s", ++ printerfile); ++ ++ if (lstat(printerfile, &printerstat) < 0) ++ { ++ if (errno != ENOENT) ++ { ++ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Unable to stat the printer")); ++ return (NULL); ++ } ++ /* ++ * The printer does not exist, so for now assume it's a FileDevice ++ */ ++ tclass = SECCLASS_FILE; ++ avr = FILE__WRITE; ++ } ++ else if (S_ISCHR(printerstat.st_mode)) ++ { ++ tclass = SECCLASS_CHR_FILE; ++ avr = CHR_FILE__WRITE; ++ } ++ else if (S_ISREG(printerstat.st_mode)) ++ { ++ tclass = SECCLASS_FILE; ++ avr = FILE__WRITE; ++ } ++ else ++ { ++ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Printer is not a character device or regular file")); ++ return (NULL); ++ } ++ static avc_initialized = 0; ++ if (!avc_initialized++) ++ avc_init("cupsd_enqueue_", NULL, NULL, NULL, NULL); ++ avc_entry_ref_init(&avcref); ++ if (avc_context_to_sid(con->scon, &clisid) != 0) ++ { ++ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Unable to get the SELinux sid of the client")); ++ return (NULL); ++ } ++ if (getfilecon(printerfile, &devcon) == -1) ++ { ++ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Unable to get the SELinux context of the printer")); ++ return (NULL); ++ } ++ printercon = context_new(devcon); ++ cupsdLogMessage(CUPSD_LOG_DEBUG, "add_job: printer context %s client context %s", ++ context_str(printercon), con->scon); ++ context_free(printercon); ++ ++ if (avc_context_to_sid(devcon, &psid) != 0) ++ { ++ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Unable to get the SELinux sid of the printer")); ++ freecon(devcon); ++ return (NULL); ++ } ++ freecon(devcon); ++ if (avc_has_perm(clisid, psid, tclass, avr, &avcref, NULL) != 0) ++ { ++ /* ++ * The access check failed, so cancel the job and send an audit message ++ */ ++ if (AuditLog != -1) ++ { ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "job=? auid=%u acct=%s obj=%s refused" ++ " unable to access printer=%s", con->auid, ++ con->username, con->scon, printer->name); ++ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, ++ ServerName, NULL, NULL, 0); ++ cupsdClearString(&audit_message); ++ } ++ ++ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("SELinux prohibits access to the printer")); ++ return (NULL); ++ } ++ } ++ } ++#endif /* WITH_LSPP */ ++ + if ((job = cupsdAddJob(priority, printer->name)) == NULL) + { + send_ipp_status(con, IPP_INTERNAL_ERROR, +@@ -1550,6 +1680,32 @@ add_job(cupsd_client_t *con, /* I - Cl + return (NULL); + } + ++#ifdef WITH_LSPP ++ if (is_lspp_config()) ++ { ++ /* ++ * duplicate the security context and auid of the connection into the job structure ++ */ ++ job->scon = strdup(con->scon); ++ job->auid = con->auid; ++ ++ /* ++ * add the security context to the request so that on a restart the security ++ * attributes will be able to be restored ++ */ ++ ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "security-context", ++ NULL, job->scon); ++ } ++ else ++ { ++ /* ++ * Fill in the security context of the job as unlabeled ++ */ ++ cupsdLogMessage(CUPSD_LOG_DEBUG, "add_job: setting context of job to %s", UNKNOWN_SL); ++ cupsdSetString(&job->scon, UNKNOWN_SL); ++ } ++#endif /* WITH_LSPP */ ++ + job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE); + job->attrs = con->request; + job->dirty = 1; +@@ -1759,6 +1915,29 @@ add_job(cupsd_client_t *con, /* I - Cl + attr->values[0].string.text = _cupsStrRetain(printer->job_sheets[0]); + attr->values[1].string.text = _cupsStrRetain(printer->job_sheets[1]); + } ++#ifdef WITH_LSPP ++ else ++ { ++ /* ++ * The option was present, so capture the user supplied strings ++ */ ++ userheader = strdup(attr->values[0].string.text); ++ ++ if (attr->num_values > 1) ++ userfooter = strdup(attr->values[1].string.text); ++ ++ if (Classification != NULL && (strcmp(userheader, Classification) == 0) ++ && userfooter &&(strcmp(userfooter, Classification) == 0)) ++ { ++ /* ++ * Since both values are Classification, the user is not trying to Override ++ */ ++ free(userheader); ++ if (userfooter) free(userfooter); ++ userheader = userfooter = NULL; ++ } ++ } ++#endif /* WITH_LSPP */ + + job->job_sheets = attr; + +@@ -1789,6 +1968,9 @@ add_job(cupsd_client_t *con, /* I - Cl + "job-sheets=\"%s,none\", " + "job-originating-user-name=\"%s\"", + Classification, job->username); ++#ifdef WITH_LSPP ++ override = 1; ++#endif /* WITH_LSPP */ + } + else if (attr->num_values == 2 && + strcmp(attr->values[0].string.text, +@@ -1807,6 +1989,9 @@ add_job(cupsd_client_t *con, /* I - Cl + "job-originating-user-name=\"%s\"", + attr->values[0].string.text, + attr->values[1].string.text, job->username); ++#ifdef WITH_LSPP ++ override = 1; ++#endif /* WITH_LSPP */ + } + else if (strcmp(attr->values[0].string.text, Classification) && + strcmp(attr->values[0].string.text, "none") && +@@ -1827,6 +2012,9 @@ add_job(cupsd_client_t *con, /* I - Cl + "job-originating-user-name=\"%s\"", + attr->values[0].string.text, + attr->values[1].string.text, job->username); ++#ifdef WITH_LSPP ++ override = 1; ++#endif /* WITH_LSPP */ + } + } + else if (strcmp(attr->values[0].string.text, Classification) && +@@ -1867,8 +2055,52 @@ add_job(cupsd_client_t *con, /* I - Cl + "job-sheets=\"%s\", " + "job-originating-user-name=\"%s\"", + Classification, job->username); ++#ifdef WITH_LSPP ++ override = 1; ++#endif /* WITH_LSPP */ ++ } ++#ifdef WITH_LSPP ++ if (is_lspp_config() && AuditLog != -1) ++ { ++ audit_message = NULL; ++ ++ if (userheader || userfooter) ++ { ++ if (!override) ++ { ++ /* ++ * The user overrode the banner, so audit it ++ */ ++ cupsdSetStringf(&audit_message, "job=%d user supplied job-sheets=%s,%s" ++ " using banners=%s,%s", job->id, userheader, ++ userfooter, attr->values[0].string.text, ++ (attr->num_values > 1) ? attr->values[1].string.text : "(null)"); ++ audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message, ++ ServerName, NULL, NULL, 1); ++ } ++ else ++ { ++ /* ++ * The user tried to override the banner, audit the failure ++ */ ++ cupsdSetStringf(&audit_message, "job=%d user supplied job-sheets=%s,%s" ++ " ignored banners=%s,%s", job->id, userheader, ++ userfooter, attr->values[0].string.text, ++ (attr->num_values > 1) ? attr->values[1].string.text : "(null)"); ++ audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message, ++ ServerName, NULL, NULL, 0); ++ } ++ cupsdClearString(&audit_message); ++ } + } ++ ++ if (userheader) ++ free(userheader); ++ if (userfooter) ++ free(userfooter); ++#endif /* WITH_LSPP */ + } ++ + + /* + * See if we need to add the starting sheet... +@@ -3615,6 +3847,111 @@ check_rss_recipient( + } + + ++#ifdef WITH_LSPP ++/* ++ * 'check_context()' - Check SELinux security context of a user and job ++ */ ++ ++static int /* O - 1 if OK, 0 if not, -1 on error */ ++check_context(cupsd_client_t *con, /* I - Client connection */ ++ cupsd_job_t *job) /* I - Job */ ++{ ++ int enforcing; /* is SELinux in enforcing mode */ ++ char filename[1024]; /* Filename of the spool file */ ++ security_id_t clisid; /* SELinux SID of the client */ ++ security_id_t jobsid; /* SELinux SID of the job */ ++ security_id_t filesid; /* SELinux SID of the spool file */ ++ struct avc_entry_ref avcref; /* AVC entry cache pointer */ ++ security_class_t tclass; /* SELinux security class */ ++ access_vector_t avr; /* SELinux access being queried */ ++ security_context_t spoolfilecon; /* SELinux context of the spool file */ ++ ++ ++ /* ++ * Validate the input to be sure there are contexts to work with... ++ */ ++ ++ if (con->scon == NULL || job->scon == NULL ++ || strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) == 0 ++ || strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) == 0) ++ return -1; ++ ++ if ((enforcing = security_getenforce()) == -1) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "Error while determining SELinux enforcement"); ++ return -1; ++ } ++ cupsdLogMessage(CUPSD_LOG_DEBUG, "check_context: client context %s job context %s", con->scon, job->scon); ++ ++ ++ /* ++ * Initialize the avc engine... ++ */ ++ ++ static avc_initialized = 0; ++ if (! avc_initialized++) ++ { ++ if (avc_init("cupsd", NULL, NULL, NULL, NULL) < 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "check_context: unable avc_init"); ++ return -1; ++ } ++ } ++ if (avc_context_to_sid(con->scon, &clisid) != 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "check_context: unable to convert %s to SELinux sid", con->scon); ++ return -1; ++ } ++ if (avc_context_to_sid(job->scon, &jobsid) != 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "check_context: unable to convert %s to SELinux sid", job->scon); ++ return -1; ++ } ++ avc_entry_ref_init(&avcref); ++ tclass = SECCLASS_FILE; ++ avr = FILE__READ; ++ ++ /* ++ * Perform the check with the client as the subject, first with the job as the object ++ * if that fails then with the spool file as the object... ++ */ ++ ++ if (avc_has_perm_noaudit(clisid, jobsid, tclass, avr, &avcref, NULL) != 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_INFO, "check_context: SELinux denied access based on the client context"); ++ ++ snprintf(filename, sizeof(filename), "%s/c%05d", RequestRoot, job->id); ++ if (getfilecon(filename, &spoolfilecon) == -1) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "check_context: Unable to get spoolfile context"); ++ return -1; ++ } ++ if (avc_context_to_sid(spoolfilecon, &filesid) != 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "check_context: Unable to determine the SELinux sid for the spool file"); ++ freecon(spoolfilecon); ++ return -1; ++ } ++ freecon(spoolfilecon); ++ if (avc_has_perm_noaudit(clisid, filesid, tclass, avr, &avcref, NULL) != 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_INFO, "check_context: SELinux denied access to the spool file"); ++ return 0; ++ } ++ cupsdLogMessage(CUPSD_LOG_INFO, "check_context: SELinux allowed access to the spool file"); ++ return 1; ++ } ++ else ++ if (enforcing == 0) ++ cupsdLogMessage(CUPSD_LOG_INFO, "check_context: allowing operation due to permissive mode"); ++ else ++ cupsdLogMessage(CUPSD_LOG_INFO, "check_context: SELinux allowed access based on the client context"); ++ ++ return 1; ++} ++#endif /* WITH_LSPP */ ++ ++ + /* + * 'check_quotas()' - Check quotas for a printer and user. + */ +@@ -4067,6 +4404,15 @@ copy_banner(cupsd_client_t *con, /* I - + char attrname[255], /* Name of attribute */ + *s; /* Pointer into name */ + ipp_attribute_t *attr; /* Attribute */ ++#ifdef WITH_LSPP ++ const char *mls_label; /* SL of print job */ ++ char *jobrange; /* SELinux sensitivity range */ ++ char *jobclearance; /* SELinux low end clearance */ ++ context_t jobcon; /* SELinux context of the job */ ++ context_t tmpcon; /* Temp context to set the level */ ++ security_context_t spoolcon; /* Context of the file in the spool */ ++#endif /* WITH_LSPP */ ++ + + + cupsdLogMessage(CUPSD_LOG_DEBUG2, +@@ -4102,6 +4448,82 @@ copy_banner(cupsd_client_t *con, /* I - + + fchmod(cupsFileNumber(out), 0640); + fchown(cupsFileNumber(out), RunUser, Group); ++#ifdef WITH_LSPP ++ if (job->scon != NULL && ++ strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) ++ { ++ if (getfilecon(filename, &spoolcon) == -1) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "copy_banner: Unable to get the context of the banner file %s - %s", ++ filename, strerror(errno)); ++ job->num_files --; ++ return (0); ++ } ++ tmpcon = context_new(spoolcon); ++ jobcon = context_new(job->scon); ++ freecon(spoolcon); ++ if (!tmpcon || !jobcon) ++ { ++ if (tmpcon) ++ context_free(tmpcon); ++ if (jobcon) ++ context_free(jobcon); ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "copy_banner: Unable to get the SELinux contexts"); ++ job->num_files --; ++ return (0); ++ } ++ jobrange = context_range_get(jobcon); ++ if (jobrange) ++ { ++ jobrange = strdup(jobrange); ++ if ((jobclearance = strtok(jobrange, "-")) != NULL) ++ { ++ if (context_range_set(tmpcon, jobclearance) == -1) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "copy_banner: Unable to set the level of the context for file %s - %s", ++ filename, strerror(errno)); ++ free(jobrange); ++ context_free(jobcon); ++ context_free(tmpcon); ++ job->num_files --; ++ return (0); ++ } ++ } ++ else ++ { ++ if (context_range_set(tmpcon, (context_range_get(jobcon))) == -1) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "copy_banner: Unable to set the level of the context for file %s - %s", ++ filename, strerror(errno)); ++ free(jobrange); ++ context_free(jobcon); ++ context_free(tmpcon); ++ job->num_files --; ++ return (0); ++ } ++ } ++ free(jobrange); ++ } ++ if (setfilecon(filename, context_str(tmpcon)) == -1) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "copy_banner: Unable to set the context of the banner file %s - %s", ++ filename, strerror(errno)); ++ context_free(jobcon); ++ context_free(tmpcon); ++ job->num_files --; ++ return (0); ++ } ++ cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner: %s set to %s", ++ filename, context_str(tmpcon)); ++ context_free(jobcon); ++ context_free(tmpcon); ++ } ++#endif /* WITH_LSPP */ + + /* + * Try the localized banner file under the subdirectory... +@@ -4196,6 +4618,24 @@ copy_banner(cupsd_client_t *con, /* I - + else + s = attrname; + ++#ifdef WITH_LSPP ++ if (strcmp(s, "mls-label") == 0) ++ { ++ if (job->scon != NULL && strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) ++ { ++ jobcon = context_new(job->scon); ++ if (_cups_strcasecmp(name, MLS_CONFIG) == 0) ++ mls_label = context_range_get(jobcon); ++ else if (_cups_strcasecmp(name, TE_CONFIG) == 0) ++ mls_label = context_type_get(jobcon); ++ else // default to using the whole context string ++ mls_label = context_str(jobcon); ++ cupsFilePuts(out, mls_label); ++ context_free(jobcon); ++ } ++ continue; ++ } ++#endif /* WITH_LSPP */ + if (!strcmp(s, "printer-name")) + { + cupsFilePuts(out, job->dest); +@@ -6273,6 +6713,22 @@ get_job_attrs(cupsd_client_t *con, /* I + + exclude = cupsdGetPrivateAttrs(policy, con, printer, job->username); + ++ ++#ifdef WITH_LSPP ++ /* ++ * Check SELinux... ++ */ ++ if (is_lspp_config() && check_context(con, job) != 1) ++ { ++ /* ++ * Unfortunately we have to lie to the user... ++ */ ++ send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid); ++ return; ++ } ++#endif /* WITH_LSPP */ ++ ++ + /* + * Copy attributes... + */ +@@ -6626,6 +7082,11 @@ get_jobs(cupsd_client_t *con, /* I - C + if (username[0] && _cups_strcasecmp(username, job->username)) + continue; + ++#ifdef WITH_LSPP ++ if (is_lspp_config() && check_context(con, job) != 1) ++ continue; ++#endif /* WITH_LSPP */ ++ + if (count > 0) + ippAddSeparator(con->response); + +@@ -11106,6 +11567,11 @@ validate_user(cupsd_job_t *job, /* I + + strlcpy(username, get_username(con), userlen); + ++#ifdef WITH_LSPP ++ if (is_lspp_config() && check_context(con, job) != 1) ++ return 0; ++#endif /* WITH_LSPP */ ++ + /* + * Check the username against the owner... + */ +diff -up cups-1.6b1/scheduler/job.c.lspp cups-1.6b1/scheduler/job.c +--- cups-1.6b1/scheduler/job.c.lspp 2012-05-25 17:01:32.824768691 +0200 ++++ cups-1.6b1/scheduler/job.c 2012-05-25 17:22:50.856860012 +0200 +@@ -68,6 +68,9 @@ + * update_job_attrs() - Update the job-printer-* attributes. + */ + ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ + /* + * Include necessary headers... + */ +@@ -83,6 +86,14 @@ + # endif /* HAVE_IOKIT_PWR_MGT_IOPMLIBPRIVATE_H */ + #endif /* __APPLE__ */ + ++#ifdef WITH_LSPP ++#include <libaudit.h> ++#include <selinux/selinux.h> ++#include <selinux/context.h> ++#include <selinux/avc.h> ++#include <selinux/flask.h> ++#include <selinux/av_permissions.h> ++#endif /* WITH_LSPP */ + + /* + * Design Notes for Job Management +@@ -580,6 +591,14 @@ cupsdContinueJob(cupsd_job_t *job) /* I + /* PRINTER_STATE_REASONS env var */ + rip_max_cache[255]; + /* RIP_MAX_CACHE env variable */ ++#ifdef WITH_LSPP ++ char *audit_message = NULL; /* Audit message string */ ++ context_t jobcon; /* SELinux context of the job */ ++ char *label_template = NULL; /* SL to put in classification ++ env var */ ++ const char *mls_label = NULL; /* SL to put in classification ++ env var */ ++#endif /* WITH_LSPP */ + + + cupsdLogMessage(CUPSD_LOG_DEBUG2, +@@ -1071,6 +1090,67 @@ cupsdContinueJob(cupsd_job_t *job) /* I + } + } + ++#ifdef WITH_LSPP ++ if (is_lspp_config()) ++ { ++ if (!job->scon || strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) == 0) ++ { ++ if (AuditLog != -1) ++ { ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s title=%s", ++ job->id, job->auid, job->username, job->printer->name, title); ++ audit_log_user_message(AuditLog, AUDIT_USER_UNLABELED_EXPORT, audit_message, ++ ServerName, NULL, NULL, 1); ++ cupsdClearString(&audit_message); ++ } ++ } ++ else ++ { ++ jobcon = context_new(job->scon); ++ ++ if ((attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME)) == NULL) ++ label_template = strdup(Classification); ++ else if (attr->num_values > 1 && ++ strcmp(attr->values[1].string.text, "none") != 0) ++ label_template = strdup(attr->values[1].string.text); ++ else ++ label_template = strdup(attr->values[0].string.text); ++ ++ if (_cups_strcasecmp(label_template, MLS_CONFIG) == 0) ++ mls_label = context_range_get(jobcon); ++ else if (_cups_strcasecmp(label_template, TE_CONFIG) == 0) ++ mls_label = context_type_get(jobcon); ++ else if (_cups_strcasecmp(label_template, SELINUX_CONFIG) == 0) ++ mls_label = context_str(jobcon); ++ else ++ mls_label = label_template; ++ ++ if (mls_label && (PerPageLabels || banner_page)) ++ { ++ snprintf(classification, sizeof(classification), "CLASSIFICATION=LSPP:%s", mls_label); ++ envp[envc ++] = classification; ++ } ++ ++ if ((AuditLog != -1) && !banner_page) ++ { ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s title=%s" ++ " obj=%s label=%s", job->id, job->auid, job->username, ++ job->printer->name, title, job->scon, mls_label?mls_label:"none"); ++ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, ++ ServerName, NULL, NULL, 1); ++ cupsdClearString(&audit_message); ++ } ++ context_free(jobcon); ++ free(label_template); ++ } ++ } ++ else ++ /* ++ * Fall through to the non-LSPP behavior ++ */ ++#endif /* WITH_LSPP */ + if (Classification && !banner_page) + { + if ((attr = ippFindAttribute(job->attrs, "job-sheets", +@@ -1845,6 +1925,20 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J + ippSetString(job->attrs, &job->reasons, 0, "none"); + } + ++#ifdef WITH_LSPP ++ if ((attr = ippFindAttribute(job->attrs, "security-context", IPP_TAG_NAME)) != NULL) ++ cupsdSetString(&job->scon, attr->values[0].string.text); ++ else if (is_lspp_config()) ++ { ++ /* ++ * There was no security context so delete the job ++ */ ++ cupsdLogMessage(CUPSD_LOG_ERROR, "LoadAllJobs: Missing or bad security-context attribute in control file \"%s\"!", ++ jobfile); ++ goto error; ++ } ++#endif /* WITH_LSPP */ ++ + job->sheets = ippFindAttribute(job->attrs, "job-media-sheets-completed", + IPP_TAG_INTEGER); + job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME); +@@ -2235,6 +2329,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J + { + char filename[1024]; /* Job control filename */ + cups_file_t *fp; /* Job file */ ++#ifdef WITH_LSPP ++ security_context_t spoolcon; /* context of the job control file */ ++ context_t jobcon; /* contex_t container for job->scon */ ++ context_t tmpcon; /* Temp context to swap the level */ ++ char *jobclearance; /* SELinux low end clearance */ ++ const char *jobrange; /* SELinux sensitivity range */ ++ char *jobrange_copy; /* SELinux sensitivity range */ ++#endif /* WITH_LSPP */ + + + cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p", +@@ -2247,6 +2349,76 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J + + fchown(cupsFileNumber(fp), RunUser, Group); + ++#ifdef WITH_LSPP ++ if (job->scon && strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) ++ { ++ if (getfilecon(filename, &spoolcon) == -1) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "Unable to get context of job control file \"%s\" - %s.", ++ filename, strerror(errno)); ++ return; ++ } ++ jobcon = context_new(job->scon); ++ tmpcon = context_new(spoolcon); ++ freecon(spoolcon); ++ if (!jobcon || !tmpcon) ++ { ++ if (jobcon) ++ context_free(jobcon); ++ if (tmpcon) ++ context_free(tmpcon); ++ cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to get SELinux contexts"); ++ return; ++ } ++ jobrange = context_range_get(jobcon); ++ if (jobrange) ++ { ++ jobrange_copy = strdup(jobrange); ++ if ((jobclearance = strtok(jobrange_copy, "-")) != NULL) ++ { ++ if (context_range_set(tmpcon, jobclearance) == -1) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "Unable to set the range for job control file \"%s\" - %s.", ++ filename, strerror(errno)); ++ free(jobrange_copy); ++ context_free(tmpcon); ++ context_free(jobcon); ++ return; ++ } ++ } ++ else ++ { ++ if (context_range_set(tmpcon, (context_range_get(jobcon))) == -1) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "Unable to set the range for job control file \"%s\" - %s.", ++ filename, strerror(errno)); ++ free(jobrange_copy); ++ context_free(tmpcon); ++ context_free(jobcon); ++ return; ++ } ++ } ++ free(jobrange_copy); ++ } ++ if (setfilecon(filename, context_str(tmpcon)) == -1) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "Unable to set context of job control file \"%s\" - %s.", ++ filename, strerror(errno)); ++ context_free(tmpcon); ++ context_free(jobcon); ++ return; ++ } ++ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p): new spool file context=%s", ++ job, context_str(tmpcon)); ++ context_free(tmpcon); ++ context_free(jobcon); ++ } ++#endif /* WITH_LSPP */ ++ + job->attrs->state = IPP_IDLE; + + if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL, +@@ -3735,6 +3907,18 @@ get_options(cupsd_job_t *job, /* I - Jo + banner_page) + continue; + ++#ifdef WITH_LSPP ++ /* ++ * In LSPP mode refuse to honor the page-label ++ */ ++ if (is_lspp_config() && ++ !strcmp(attr->name, "page-label")) ++ { ++ cupsdLogMessage(CUPSD_LOG_DEBUG, "Ignoring page-label option due to LSPP mode"); ++ continue; ++ } ++#endif /* WITH_LSPP */ ++ + /* + * Otherwise add them to the list... + */ +@@ -4457,6 +4641,19 @@ static void + start_job(cupsd_job_t *job, /* I - Job ID */ + cupsd_printer_t *printer) /* I - Printer to print job */ + { ++#ifdef WITH_LSPP ++ char *audit_message = NULL; /* Audit message string */ ++ char *printerfile = NULL; /* Device file pointed to by the printer */ ++ security_id_t clisid; /* SELinux SID for the client */ ++ security_id_t psid; /* SELinux SID for the printer */ ++ context_t printercon; /* Printer's context string */ ++ struct stat printerstat; /* Printer's stat buffer */ ++ security_context_t devcon; /* Printer's SELinux context */ ++ struct avc_entry_ref avcref; /* Pointer to the access vector cache */ ++ security_class_t tclass; /* Object class for the SELinux check */ ++ access_vector_t avr; /* Access method being requested */ ++#endif /* WITH_LSPP */ ++ + cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job(job=%p(%d), printer=%p(%s))", + job, job->id, printer, printer->name); + +@@ -4599,6 +4796,108 @@ start_job(cupsd_job_t *job, /* I - + fcntl(job->side_pipes[1], F_SETFD, + fcntl(job->side_pipes[1], F_GETFD) | FD_CLOEXEC); + ++#ifdef WITH_LSPP ++ if (is_lspp_config()) ++ { ++ /* ++ * Perform an access check before printing, but only if the printer starts with /dev/ ++ */ ++ printerfile = strstr(printer->device_uri, "/dev/"); ++ if (printerfile == NULL && (strncmp(printer->device_uri, "file:/", 6) == 0)) ++ printerfile = printer->device_uri + strlen("file:"); ++ ++ if (printerfile != NULL) ++ { ++ cupsdLogMessage(CUPSD_LOG_DEBUG, ++ "StartJob: Attempting to check access on printer device %s", printerfile); ++ if (lstat(printerfile, &printerstat) < 0) ++ { ++ if (errno != ENOENT) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to stat the printer"); ++ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); ++ return ; ++ } ++ /* ++ * The printer does not exist, so for now assume it's a FileDevice ++ */ ++ tclass = SECCLASS_FILE; ++ avr = FILE__WRITE; ++ } ++ else if (S_ISCHR(printerstat.st_mode)) ++ { ++ tclass = SECCLASS_CHR_FILE; ++ avr = CHR_FILE__WRITE; ++ } ++ else if (S_ISREG(printerstat.st_mode)) ++ { ++ tclass = SECCLASS_FILE; ++ avr = FILE__WRITE; ++ } ++ else ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "StartJob: Printer is not a character device or regular file"); ++ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); ++ return ; ++ } ++ static avc_initialized = 0; ++ if (!avc_initialized++) ++ avc_init("cupsd_dequeue_", NULL, NULL, NULL, NULL); ++ avc_entry_ref_init(&avcref); ++ if (avc_context_to_sid(job->scon, &clisid) != 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "StartJob: Unable to determine the SELinux sid for the job"); ++ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); ++ return ; ++ } ++ if (getfilecon(printerfile, &devcon) == -1) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to get the SELinux context of %s", ++ printerfile); ++ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); ++ return ; ++ } ++ printercon = context_new(devcon); ++ cupsdLogMessage(CUPSD_LOG_DEBUG, "StartJob: printer context %s client context %s", ++ context_str(printercon), job->scon); ++ context_free(printercon); ++ ++ if (avc_context_to_sid(devcon, &psid) != 0) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, ++ "StartJob: Unable to determine the SELinux sid for the printer"); ++ freecon(devcon); ++ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); ++ return ; ++ } ++ freecon(devcon); ++ ++ if (avc_has_perm(clisid, psid, tclass, avr, &avcref, NULL) != 0) ++ { ++ /* ++ * The access check failed, so cancel the job and send an audit message ++ */ ++ if (AuditLog != -1) ++ { ++ audit_message = NULL; ++ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s obj=%s canceled" ++ " unable to access printer=%s", job->id, ++ job->auid, (job->username)?job->username:"?", job->scon, printer->name); ++ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, ++ ServerName, NULL, NULL, 0); ++ cupsdClearString(&audit_message); ++ } ++ ++ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); ++ ++ return ; ++ } ++ } ++ } ++#endif /* WITH_LSPP */ ++ + /* + * Now start the first file in the job... + */ +diff -up cups-1.6b1/scheduler/job.h.lspp cups-1.6b1/scheduler/job.h +--- cups-1.6b1/scheduler/job.h.lspp 2012-05-23 03:36:50.000000000 +0200 ++++ cups-1.6b1/scheduler/job.h 2012-05-25 17:23:41.802504888 +0200 +@@ -13,6 +13,13 @@ + * file is missing or damaged, see the license at "http://www.cups.org/". + */ + ++/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ ++#ifdef WITH_LSPP ++#include <selinux/selinux.h> ++#endif /* WITH_LSPP */ ++ + /* + * Constants... + */ +@@ -82,6 +89,10 @@ struct cupsd_job_s /**** Job request * + int progress; /* Printing progress */ + int num_keywords; /* Number of PPD keywords */ + cups_option_t *keywords; /* PPD keywords */ ++#ifdef WITH_LSPP ++ security_context_t scon; /* Security context of job */ ++ uid_t auid; /* Audit loginuid for this job */ ++#endif /* WITH_LSPP */ + }; + + typedef struct cupsd_joblog_s /**** Job log message ****/ +diff -up cups-1.6b1/scheduler/main.c.lspp cups-1.6b1/scheduler/main.c +--- cups-1.6b1/scheduler/main.c.lspp 2012-05-25 17:01:32.849768516 +0200 ++++ cups-1.6b1/scheduler/main.c 2012-05-25 17:01:32.868768383 +0200 +@@ -38,6 +38,8 @@ + * usage() - Show scheduler usage. + */ + ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ + /* + * Include necessary headers... + */ +@@ -75,6 +77,9 @@ + # include <notify.h> + #endif /* HAVE_NOTIFY_H */ + ++#ifdef WITH_LSPP ++# include <libaudit.h> ++#endif /* WITH_LSPP */ + + /* + * Local functions... +@@ -138,6 +143,9 @@ main(int argc, /* I - Number of comm + #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) + struct sigaction action; /* Actions for POSIX signals */ + #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ ++#if WITH_LSPP ++ auditfail_t failmode; /* Action for audit_open failure */ ++#endif /* WITH_LSPP */ + #ifdef __sgi + cups_file_t *fp; /* Fake lpsched lock file */ + struct stat statbuf; /* Needed for checking lpsched FIFO */ +@@ -463,6 +471,25 @@ main(int argc, /* I - Number of comm + #endif /* DEBUG */ + } + ++#ifdef WITH_LSPP ++ if ((AuditLog = audit_open()) < 0 ) ++ { ++ if (get_auditfail_action(&failmode) == 0) ++ { ++ if (failmode == FAIL_LOG) ++ { ++ cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to connect to audit subsystem."); ++ AuditLog = -1; ++ } ++ else if (failmode == FAIL_TERMINATE) ++ { ++ fprintf(stderr, "cupsd: unable to start auditing, terminating"); ++ return -1; ++ } ++ } ++ } ++#endif /* WITH_LSPP */ ++ + /* + * Set the timezone info... + */ +@@ -1180,6 +1207,11 @@ main(int argc, /* I - Number of comm + + cupsdStopSelect(); + ++#ifdef WITH_LSPP ++ if (AuditLog != -1) ++ audit_close(AuditLog); ++#endif /* WITH_LSPP */ ++ + return (!stop_scheduler); + } + +diff -up cups-1.6b1/scheduler/printers.c.lspp cups-1.6b1/scheduler/printers.c +--- cups-1.6b1/scheduler/printers.c.lspp 2012-05-25 17:01:32.786768955 +0200 ++++ cups-1.6b1/scheduler/printers.c 2012-05-25 17:24:11.144300359 +0200 +@@ -56,6 +56,8 @@ + * write_xml_string() - Write a string with XML escaping. + */ + ++/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ ++ + /* + * Include necessary headers... + */ +@@ -80,6 +82,10 @@ + # include <asl.h> + #endif /* __APPLE__ */ + ++#ifdef WITH_LSPP ++# include <libaudit.h> ++# include <selinux/context.h> ++#endif /* WITH_LSPP */ + + /* + * Local functions... +@@ -2101,6 +2107,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) + "username", + "password" + }; ++#ifdef WITH_LSPP ++ char *audit_message; /* Audit message string */ ++ char *printerfile; /* Path to a local printer dev */ ++ char *rangestr; /* Printer's range if its available */ ++ security_context_t devcon; /* Printer SELinux context */ ++ context_t printercon; /* context_t for the printer */ ++#endif /* WITH_LSPP */ + + + DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, +@@ -2234,6 +2247,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) + attr->values[1].string.text = _cupsStrAlloc(Classification ? + Classification : p->job_sheets[1]); + } ++#ifdef WITH_LSPP ++ if (AuditLog != -1) ++ { ++ audit_message = NULL; ++ rangestr = NULL; ++ printercon = 0; ++ printerfile = strstr(p->device_uri, "/dev/"); ++ if (printerfile == NULL && (strncmp(p->device_uri, "file:/", 6) == 0)) ++ printerfile = p->device_uri + strlen("file:"); ++ ++ if (printerfile != NULL) ++ { ++ if (getfilecon(printerfile, &devcon) == -1) ++ { ++ if(is_selinux_enabled()) ++ cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdSetPrinterAttrs: Unable to get printer context"); ++ } ++ else ++ { ++ printercon = context_new(devcon); ++ freecon(devcon); ++ } ++ } ++ ++ if (printercon && context_range_get(printercon)) ++ rangestr = strdup(context_range_get(printercon)); ++ else ++ rangestr = strdup("unknown"); ++ ++ cupsdSetStringf(&audit_message, "printer=%s uri=%s banners=%s,%s range=%s", ++ p->name, p->sanitized_device_uri, p->job_sheets[0], p->job_sheets[1], rangestr); ++ audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message, ++ ServerName, NULL, NULL, 1); ++ if (printercon) ++ context_free(printercon); ++ free(rangestr); ++ cupsdClearString(&audit_message); ++ } ++#endif /* WITH_LSPP */ + } + + p->raw = 0; +@@ -5320,7 +5372,6 @@ write_irix_state(cupsd_printer_t *p) /* + } + #endif /* __sgi */ + +- + /* + * 'write_xml_string()' - Write a string with XML escaping. + */ diff --git a/cups/patches/cups-0755.patch b/cups/patches/cups-0755.patch deleted file mode 100644 index 7835592..0000000 --- a/cups/patches/cups-0755.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up cups-1.4.5/Makedefs.in.0755 cups-1.4.5/Makedefs.in ---- cups-1.4.5/Makedefs.in.0755 2010-12-06 17:19:03.335315249 +0000 -+++ cups-1.4.5/Makedefs.in 2010-12-06 17:19:03.416307263 +0000 -@@ -41,13 +41,13 @@ SHELL = /bin/sh - # Installation programs... - # - --INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ -+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@ - INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@ - INSTALL_DATA = $(INSTALL) -c -m 444 - INSTALL_DIR = $(INSTALL) -d --INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ -+INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@ - INSTALL_MAN = $(INSTALL) -c -m 444 --INSTALL_SCRIPT = $(INSTALL) -c -m 555 -+INSTALL_SCRIPT = $(INSTALL) -c -m 755 - - # - # Default user, group, and system groups for the scheduler... -diff -up cups-1.4.5/scheduler/Makefile.0755 cups-1.4.5/scheduler/Makefile ---- cups-1.4.5/scheduler/Makefile.0755 2010-12-06 17:28:58.562552167 +0000 -+++ cups-1.4.5/scheduler/Makefile 2010-12-06 17:29:07.087756415 +0000 -@@ -174,7 +174,7 @@ install-data: - install-exec: - echo Installing programs in $(SBINDIR)... - $(INSTALL_DIR) -m 755 $(SBINDIR) -- $(INSTALL_BIN) -m 500 cupsd $(SBINDIR) -+ $(INSTALL_BIN) -m 755 cupsd $(SBINDIR) - $(INSTALL_BIN) cupsfilter $(SBINDIR) - -if test "x`uname`" = xDarwin; then \ - $(INSTALL_DIR) $(BUILDROOT)/System/Library/Printers/Libraries; \ diff --git a/cups/patches/cups-1.1.16-system-auth.patch b/cups/patches/cups-1.1.16-system-auth.patch deleted file mode 100644 index 7ce17e5..0000000 --- a/cups/patches/cups-1.1.16-system-auth.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up /dev/null cups-1.4.2/conf/cups.password-auth ---- /dev/null 2009-11-10 09:17:06.284031490 +0000 -+++ cups-1.4.2/conf/cups.password-auth 2009-11-10 11:15:42.750666738 +0000 -@@ -0,0 +1,4 @@ -+#%PAM-1.0 -+# Use password-auth common PAM configuration for the daemon -+auth include password-auth -+account include password-auth -diff -up cups-1.4.2/conf/cups.system-auth cups-1.4.2/conf/cups -diff -up /dev/null cups-1.4.2/conf/cups.system-auth ---- /dev/null 2009-11-10 09:17:06.284031490 +0000 -+++ cups-1.4.2/conf/cups.system-auth 2009-11-10 11:15:42.750666738 +0000 -@@ -0,0 +1,3 @@ -+#%PAM-1.0 -+auth include system-auth -+account include system-auth -diff -up cups-1.4.2/conf/Makefile.system-auth cups-1.4.2/conf/Makefile ---- cups-1.4.2/conf/Makefile.system-auth 2009-09-22 22:53:31.000000000 +0100 -+++ cups-1.4.2/conf/Makefile 2009-11-10 11:18:44.188791989 +0000 -@@ -90,10 +90,16 @@ install-data: - done - -if test x$(PAMDIR) != x; then \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \ -- if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ -- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ -+ if test -f /etc/pam.d/password-auth; then \ -+ $(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups; \ -+ elif test -f /etc/pam.d/system-auth; then \ -+ $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups; \ - else \ -- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ -+ if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ -+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ -+ else \ -+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ -+ fi ; \ - fi ; \ - fi - diff --git a/cups/patches/cups-EAI_AGAIN.patch b/cups/patches/cups-EAI_AGAIN.patch deleted file mode 100644 index 033e7f8..0000000 --- a/cups/patches/cups-EAI_AGAIN.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up cups-1.4.2/cups/http-addr.c.EAI_AGAIN cups-1.4.2/cups/http-addr.c ---- cups-1.4.2/cups/http-addr.c.EAI_AGAIN 2010-02-23 10:39:35.038261623 +0000 -+++ cups-1.4.2/cups/http-addr.c 2010-02-23 10:41:14.684385991 +0000 -@@ -253,7 +253,7 @@ httpAddrLookup( - - if (error) - { -- if (error == EAI_FAIL) -+ if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA) - cg->need_res_init = 1; - - return (httpAddrString(addr, name, namelen)); diff --git a/cups/patches/cups-autotype-crash.patch b/cups/patches/cups-autotype-crash.patch deleted file mode 100644 index ed6cb15..0000000 --- a/cups/patches/cups-autotype-crash.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up cups-1.4.4/scheduler/ipp.c.autotype-crash cups-1.4.4/scheduler/ipp.c ---- cups-1.4.4/scheduler/ipp.c.autotype-crash 2010-10-15 15:25:15.093421917 +0100 -+++ cups-1.4.4/scheduler/ipp.c 2010-10-15 15:25:49.645296947 +0100 -@@ -10481,8 +10481,9 @@ send_document(cupsd_client_t *con, /* I - if (!filetype) - filetype = mimeType(MimeDatabase, super, type); - -- cupsdLogJob(job, CUPSD_LOG_DEBUG, "Request file type is %s/%s.", -- filetype->super, filetype->type); -+ if (filetype) -+ cupsdLogJob(job, CUPSD_LOG_DEBUG, "Request file type is %s/%s.", -+ filetype->super, filetype->type); - } - else - filetype = mimeType(MimeDatabase, super, type); diff --git a/cups/patches/cups-avahi.patch b/cups/patches/cups-avahi.patch deleted file mode 100644 index b1fc75c..0000000 --- a/cups/patches/cups-avahi.patch +++ /dev/null @@ -1,3338 +0,0 @@ -diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c ---- cups-1.4.5/backend/dnssd.c.avahi 2010-12-24 13:11:33.760461375 +0000 -+++ cups-1.4.5/backend/dnssd.c 2010-12-24 13:11:38.325341226 +0000 -@@ -15,14 +15,21 @@ - * - * Contents: - * -+ * next_txt_record() - Get next TXT record from a cups_txt_records_t. -+ * parse_txt_record_pair() - Read key/value pair in cups_txt_records_t. - * main() - Browse for printers. - * browse_callback() - Browse devices. - * browse_local_callback() - Browse local devices. - * compare_devices() - Compare two devices. - * exec_backend() - Execute the backend that corresponds to the - * resolved service name. -+ * device_type() - Get DNS-SD type enumeration from string. - * get_device() - Create or update a device. - * query_callback() - Process query data. -+ * avahi_client_callback() - Avahi client callback function. -+ * avahi_query_callback() - Avahi query callback function. -+ * avahi_browse_callback() - Avahi browse callback function. -+ * find_device() - Find a device from its name and domain. - * sigterm_handler() - Handle termination signals... - * unquote() - Unquote a name string. - */ -@@ -33,7 +40,18 @@ - - #include "backend-private.h" - #include <cups/array.h> --#include <dns_sd.h> -+#ifdef HAVE_DNSSD -+# include <dns_sd.h> -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+# include <avahi-client/client.h> -+# include <avahi-client/lookup.h> -+# include <avahi-common/simple-watch.h> -+# include <avahi-common/domain.h> -+# include <avahi-common/error.h> -+# include <avahi-common/malloc.h> -+#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX -+#endif /* HAVE_AVAHI */ - - - /* -@@ -52,7 +70,12 @@ typedef enum - - typedef struct - { -+#ifdef HAVE_DNSSD - DNSServiceRef ref; /* Service reference for resolve */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ int resolved; /* Did we resolve the device? */ -+#endif /* HAVE_AVAHI */ - char *name, /* Service name */ - *domain, /* Domain name */ - *fullName, /* Full name */ -@@ -64,6 +87,20 @@ typedef struct - sent; /* Did we list the device? */ - } cups_device_t; - -+typedef struct -+{ -+ char key[256]; -+ char value[256]; -+ -+#ifdef HAVE_DNSSD -+ const uint8_t *data; -+ const uint8_t *datanext; -+ const uint8_t *dataend; -+#else /* HAVE_AVAHI */ -+ AvahiStringList *txt; -+#endif /* HAVE_DNSSD */ -+} cups_txt_records_t; -+ - - /* - * Local globals... -@@ -77,6 +114,7 @@ static int job_canceled = 0; - * Local functions... - */ - -+#ifdef HAVE_DNSSD - static void browse_callback(DNSServiceRef sdRef, - DNSServiceFlags flags, - uint32_t interfaceIndex, -@@ -92,12 +130,6 @@ static void browse_local_callback(DNSSe - const char *regtype, - const char *replyDomain, - void *context); --static int compare_devices(cups_device_t *a, cups_device_t *b); --static void exec_backend(char **argv); --static cups_device_t *get_device(cups_array_t *devices, -- const char *serviceName, -- const char *regtype, -- const char *replyDomain); - static void query_callback(DNSServiceRef sdRef, - DNSServiceFlags flags, - uint32_t interfaceIndex, -@@ -106,9 +138,118 @@ static void query_callback(DNSServiceRe - uint16_t rrclass, uint16_t rdlen, - const void *rdata, uint32_t ttl, - void *context); -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+static void avahi_client_callback (AvahiClient *client, -+ AvahiClientState state, -+ void *context); -+static void avahi_browse_callback (AvahiServiceBrowser *browser, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiBrowserEvent event, -+ const char *serviceName, -+ const char *regtype, -+ const char *replyDomain, -+ AvahiLookupResultFlags flags, -+ void *context); -+#endif /* HAVE_AVAHI */ -+ -+static cups_device_t * find_device (cups_array_t *devices, -+ cups_txt_records_t *txt, -+ cups_device_t *dkey); -+static int compare_devices(cups_device_t *a, cups_device_t *b); -+static void exec_backend(char **argv); -+static cups_device_t *get_device(cups_array_t *devices, -+ const char *serviceName, -+ const char *regtype, -+ const char *replyDomain); - static void sigterm_handler(int sig); - static void unquote(char *dst, const char *src, size_t dstsize); - -+#ifdef HAVE_AVAHI -+static AvahiSimplePoll *simple_poll = NULL; -+static int avahi_got_callback; -+#endif /* HAVE_AVAHI */ -+ -+ -+/* -+ * 'next_txt_record()' - Get next TXT record from a cups_txt_records_t. -+ */ -+ -+static cups_txt_records_t * -+next_txt_record (cups_txt_records_t *txt) -+{ -+#ifdef HAVE_DNSSD -+ txt->data = txt->datanext; -+#else /* HAVE_AVAHI */ -+ txt->txt = avahi_string_list_get_next (txt->txt); -+ if (txt->txt == NULL) -+ return NULL; -+#endif /* HAVE_DNSSD */ -+ -+ return txt; -+} -+ -+ -+/* -+ * 'parse_txt_record_pair()' - Read key/value pair in cups_txt_records_t. -+ */ -+ -+static int -+parse_txt_record_pair (cups_txt_records_t *txt) -+{ -+#ifdef HAVE_DNSSD -+ uint8_t datalen; -+ uint8_t *data = txt->data; -+ char *ptr; -+ -+ /* -+ * Read a key/value pair starting with an 8-bit length. Since the -+ * length is 8 bits and the size of the key/value buffers is 256, we -+ * don't need to check for overflow... -+ */ -+ -+ datalen = *data++; -+ if (!datalen || (data + datalen) >= txt->dataend) -+ return NULL; -+ txt->datanext = data + datalen; -+ -+ for (ptr = txt->key; data < txt->datanext && *data != '='; data ++) -+ *ptr++ = *data; -+ *ptr = '\0'; -+ -+ if (data < txt->datanext && *data == '=') -+ { -+ data++; -+ -+ if (data < datanext) -+ memcpy (txt->value, data, txt->datanext - data); -+ value[txt->datanext - data] = '\0'; -+ } -+ else -+ return 1; -+#else /* HAVE_AVAHI */ -+ char *key, *value; -+ size_t len; -+ avahi_string_list_get_pair (txt->txt, &key, &value, &len); -+ if (len > sizeof (txt->value) - 1) -+ len = sizeof (txt->value) - 1; -+ -+ memcpy (txt->value, value, len); -+ txt->value[len] = '\0'; -+ len = strlen (key); -+ if (len > sizeof (txt->key) - 1) -+ len = sizeof (txt->key) - 1; -+ -+ memcpy (txt->key, key, len); -+ txt->key[len] = '\0'; -+ avahi_free (key); -+ avahi_free (value); -+#endif /* HAVE_AVAHI */ -+ -+ return 0; -+} -+ - - /* - * 'main()' - Browse for printers. -@@ -119,6 +260,13 @@ main(int argc, /* I - Number of comm - char *argv[]) /* I - Command-line arguments */ - { - const char *name; /* Backend name */ -+ cups_array_t *devices; /* Device array */ -+ cups_device_t *device; /* Current device */ -+ char uriName[1024]; /* Unquoted fullName for URI */ -+#ifdef HAVE_DNSSD -+ int fd; /* Main file descriptor */ -+ fd_set input; /* Input set for select() */ -+ struct timeval timeout; /* Timeout for select() */ - DNSServiceRef main_ref, /* Main service reference */ - fax_ipp_ref, /* IPP fax service reference */ - ipp_ref, /* IPP service reference */ -@@ -130,12 +278,11 @@ main(int argc, /* I - Number of comm - pdl_datastream_ref, /* AppSocket service reference */ - printer_ref, /* LPD service reference */ - riousbprint_ref; /* Remote IO service reference */ -- int fd; /* Main file descriptor */ -- fd_set input; /* Input set for select() */ -- struct timeval timeout; /* Timeout for select() */ -- cups_array_t *devices; /* Device array */ -- cups_device_t *device; /* Current device */ -- char uriName[1024]; /* Unquoted fullName for URI */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ AvahiClient *client; -+ int error; -+#endif /* HAVE_AVAHI */ - #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) - struct sigaction action; /* Actions for POSIX signals */ - #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ -@@ -194,6 +341,49 @@ main(int argc, /* I - Number of comm - * Browse for different kinds of printers... - */ - -+#ifdef HAVE_AVAHI -+ if ((simple_poll = avahi_simple_poll_new ()) == NULL) -+ { -+ perror ("ERROR: Unable to create avahi simple poll object"); -+ return (1); -+ } -+ -+ client = avahi_client_new (avahi_simple_poll_get (simple_poll), -+ 0, avahi_client_callback, NULL, &error); -+ if (!client) -+ { -+ perror ("ERROR: Unable to create avahi client"); -+ return (1); -+ } -+ -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_fax-ipp._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_ipp._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_ipp-tls._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_pdl-datastream._tcp", -+ NULL, 0, -+ avahi_browse_callback, -+ devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_printer._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_riousbprint._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+#endif /* HAVE_AVAHI */ -+#ifdef HAVE_DNSSD - if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError) - { - perror("ERROR: Unable to create service connection"); -@@ -245,6 +435,7 @@ main(int argc, /* I - Number of comm - riousbprint_ref = main_ref; - DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0, - "_riousbprint._tcp", NULL, browse_callback, devices); -+#endif /* HAVE_DNSSD */ - - /* - * Loop until we are killed... -@@ -252,6 +443,9 @@ main(int argc, /* I - Number of comm - - while (!job_canceled) - { -+ int announce = 0; -+ -+#ifdef HAVE_DNSSD - FD_ZERO(&input); - FD_SET(fd, &input); - -@@ -271,11 +465,35 @@ main(int argc, /* I - Number of comm - } - else - { -+ announce = 1; -+ } -+#else /* HAVE_AVAHI */ -+ int r; -+ avahi_got_callback = 0; -+ r = avahi_simple_poll_iterate (simple_poll, 1); -+ if (r != 0 && r != EINTR) -+ { -+ /* -+ * We've been told to exit the loop. Perhaps the connection to -+ * avahi failed. -+ */ -+ -+ break; -+ } -+ -+ if (avahi_got_callback) -+ announce = 1; -+#endif /* HAVE_DNSSD */ -+ -+ if (announce) -+ { - /* - * Announce any devices we've found... - */ - -+#ifdef HAVE_DNSSD - DNSServiceErrorType status; /* DNS query status */ -+#endif /* HAVE_DNSSD */ - cups_device_t *best; /* Best matching device */ - char device_uri[1024]; /* Device URI */ - int count; /* Number of queries */ -@@ -285,6 +503,7 @@ main(int argc, /* I - Number of comm - best = NULL, count = 0; - device; - device = (cups_device_t *)cupsArrayNext(devices)) -+#ifdef HAVE_DNSSD - if (!device->ref && !device->sent) - { - /* -@@ -313,14 +532,23 @@ main(int argc, /* I - Number of comm - count ++; - } - } -- else if (!device->sent) -+ else -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ if (!device->resolved) -+ continue; -+ else -+#endif /* HAVE_AVAHI */ -+ if (!device->sent) - { -+#ifdef HAVE_DNSSD - /* - * Got the TXT records, now report the device... - */ - - DNSServiceRefDeallocate(device->ref); - device->ref = 0; -+#endif /* HAVE_DNSSD */ - - if (!best) - best = device; -@@ -368,6 +596,7 @@ main(int argc, /* I - Number of comm - } - - -+#ifdef HAVE_DNSSD - /* - * 'browse_callback()' - Browse devices. - */ -@@ -456,6 +685,7 @@ browse_local_callback( - device->fullName); - device->sent = 1; - } -+#endif /* HAVE_DNSSD */ - - - /* -@@ -530,6 +760,37 @@ exec_backend(char **argv) /* I - Comman - - - /* -+ * 'device_type()' - Get DNS-SD type enumeration from string. -+ */ -+ -+static int -+device_type (const char *regtype) -+{ -+#ifdef HAVE_AVAHI -+ if (!strcmp(regtype, "_ipp._tcp") || -+ !strcmp(regtype, "_ipp-tls._tcp")) -+ return (CUPS_DEVICE_IPP); -+ else if (!strcmp(regtype, "_fax-ipp._tcp")) -+ return (CUPS_DEVICE_FAX_IPP); -+ else if (!strcmp(regtype, "_printer._tcp")) -+ return (CUPS_DEVICE_PDL_DATASTREAM); -+#else -+ if (!strcmp(regtype, "_ipp._tcp.") || -+ !strcmp(regtype, "_ipp-tls._tcp.")) -+ return (CUPS_DEVICE_IPP); -+ else if (!strcmp(regtype, "_fax-ipp._tcp.")) -+ return (CUPS_DEVICE_FAX_IPP); -+ else if (!strcmp(regtype, "_printer._tcp.")) -+ return (CUPS_DEVICE_PRINTER); -+ else if (!strcmp(regtype, "_pdl-datastream._tcp.")) -+ return (CUPS_DEVICE_PDL_DATASTREAM); -+#endif /* HAVE_AVAHI */ -+ -+ return (CUPS_DEVICE_RIOUSBPRINT); -+} -+ -+ -+/* - * 'get_device()' - Create or update a device. - */ - -@@ -550,18 +811,7 @@ get_device(cups_array_t *devices, /* I - - */ - - key.name = (char *)serviceName; -- -- if (!strcmp(regtype, "_ipp._tcp.") || -- !strcmp(regtype, "_ipp-tls._tcp.")) -- key.type = CUPS_DEVICE_IPP; -- else if (!strcmp(regtype, "_fax-ipp._tcp.")) -- key.type = CUPS_DEVICE_FAX_IPP; -- else if (!strcmp(regtype, "_printer._tcp.")) -- key.type = CUPS_DEVICE_PRINTER; -- else if (!strcmp(regtype, "_pdl-datastream._tcp.")) -- key.type = CUPS_DEVICE_PDL_DATASTREAM; -- else -- key.type = CUPS_DEVICE_RIOUSBPRINT; -+ key.type = device_type (regtype); - - for (device = cupsArrayFind(devices, &key); - device; -@@ -581,8 +831,14 @@ get_device(cups_array_t *devices, /* I - - free(device->domain); - device->domain = strdup(replyDomain); - -+#ifdef HAVE_DNSSD - DNSServiceConstructFullName(fullName, device->name, regtype, - replyDomain); -+#else /* HAVE_AVAHI */ -+ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, -+ serviceName, regtype, replyDomain); -+#endif /* HAVE_DNSSD */ -+ - free(device->fullName); - device->fullName = strdup(fullName); - } -@@ -602,6 +858,9 @@ get_device(cups_array_t *devices, /* I - - device->domain = strdup(replyDomain); - device->type = key.type; - device->priority = 50; -+#ifdef HAVE_AVAHI -+ device->resolved = 0; -+#endif /* HAVE_AVAHI */ - - cupsArrayAdd(devices, device); - -@@ -609,13 +868,20 @@ get_device(cups_array_t *devices, /* I - - * Set the "full name" of this service, which is used for queries... - */ - -+#ifdef HAVE_DNSSD - DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain); -+#else /* HAVE_AVAHI */ -+ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, -+ serviceName, regtype, replyDomain); -+#endif /* HAVE_DNSSD */ -+ - device->fullName = strdup(fullName); - - return (device); - } - - -+#ifdef HAVE_DNSSD - /* - * 'query_callback()' - Process query data. - */ -@@ -639,7 +905,7 @@ query_callback( - *ptr; /* Pointer into string */ - cups_device_t dkey, /* Search key */ - *device; /* Device */ -- -+ cups_txt_records_t txt; - - fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, " - "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", " -@@ -673,84 +939,232 @@ query_callback( - if ((ptr = strstr(name, "._")) != NULL) - *ptr = '\0'; - -- if (strstr(fullName, "_ipp._tcp.") || -- strstr(fullName, "_ipp-tls._tcp.")) -- dkey.type = CUPS_DEVICE_IPP; -- else if (strstr(fullName, "_fax-ipp._tcp.")) -- dkey.type = CUPS_DEVICE_FAX_IPP; -- else if (strstr(fullName, "_printer._tcp.")) -- dkey.type = CUPS_DEVICE_PRINTER; -- else if (strstr(fullName, "_pdl-datastream._tcp.")) -- dkey.type = CUPS_DEVICE_PDL_DATASTREAM; -+ dkey.type = device_type (fullName); -+ -+ txt.data = rdata; -+ txt.dataend = rdata + rdlen; -+ device = find_device ((cups_array_t *) context, &txt, &dkey); -+ if (!device) -+ fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); -+} -+#endif /* HAVE_DNSSD */ -+ -+ -+#ifdef HAVE_AVAHI -+/* -+ * 'avahi_client_callback()' - Avahi client callback function. -+ */ -+ -+static void -+avahi_client_callback(AvahiClient *client, -+ AvahiClientState state, -+ void *context) -+{ -+ /* -+ * If the connection drops, quit. -+ */ -+ -+ if (state == AVAHI_CLIENT_FAILURE) -+ { -+ fprintf (stderr, "ERROR: Avahi connection failed\n"); -+ avahi_simple_poll_quit (simple_poll); -+ } -+} -+ -+ -+/* -+ * 'avahi_query_callback()' - Avahi query callback function. -+ */ -+ -+static void -+avahi_query_callback(AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ AvahiClient *client; -+ cups_device_t key, -+ *device; -+ char uqname[1024], -+ *ptr; -+ cups_txt_records_t txtr; -+ -+ client = avahi_service_resolver_get_client (resolver); -+ if (event != AVAHI_RESOLVER_FOUND) -+ { -+ if (event == AVAHI_RESOLVER_FAILURE) -+ { -+ fprintf (stderr, "ERROR: %s\n", -+ avahi_strerror (avahi_client_errno (client))); -+ } -+ -+ avahi_service_resolver_free (resolver); -+ return; -+ } -+ -+ /* -+ * Set search key for device. -+ */ -+ -+ key.name = uqname; -+ unquote (uqname, name, sizeof (uqname)); -+ if ((ptr = strstr(name, "._")) != NULL) -+ *ptr = '\0'; -+ -+ key.domain = (char *) domain; -+ key.type = device_type (type); -+ -+ /* -+ * Find the device and the the TXT information. -+ */ -+ -+ txtr.txt = txt; -+ device = find_device ((cups_array_t *) context, &txtr, &key); -+ if (device) -+ { -+ /* -+ * Let the main loop know to announce the device. -+ */ -+ -+ device->resolved = 1; -+ avahi_got_callback = 1; -+ } - else -- dkey.type = CUPS_DEVICE_RIOUSBPRINT; -+ fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name); -+ -+ avahi_service_resolver_free (resolver); -+} -+ -+ -+/* -+ * 'avahi_browse_callback()' - Avahi browse callback function. -+ */ -+ -+static void -+avahi_browse_callback(AvahiServiceBrowser *browser, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiBrowserEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ AvahiClient *client = avahi_service_browser_get_client (browser); - -- for (device = cupsArrayFind(devices, &dkey); -+ switch (event) -+ { -+ case AVAHI_BROWSER_FAILURE: -+ fprintf (stderr, "ERROR: %s\n", -+ avahi_strerror (avahi_client_errno (client))); -+ avahi_simple_poll_quit (simple_poll); -+ return; -+ -+ case AVAHI_BROWSER_NEW: -+ /* -+ * This object is new on the network. -+ */ -+ -+ if (flags & AVAHI_LOOKUP_RESULT_LOCAL) -+ { -+ /* -+ * This comes from the local machine so ignore it. -+ */ -+ -+ fprintf (stderr, "DEBUG: ignoring local service %s\n", name); -+ } -+ else -+ { -+ /* -+ * Create a device entry for it if it doesn't yet exist. -+ */ -+ -+ get_device ((cups_array_t *)context, name, type, domain); -+ -+ /* -+ * Now look for a TXT entry. -+ */ -+ -+ if (avahi_service_resolver_new (client, interface, protocol, -+ name, type, domain, -+ AVAHI_PROTO_UNSPEC, 0, -+ avahi_query_callback, context) == NULL) -+ { -+ fprintf (stderr, "ERROR: failed to resolve service %s: %s\n", -+ name, avahi_strerror (avahi_client_errno (client))); -+ } -+ } -+ -+ break; -+ -+ case AVAHI_BROWSER_REMOVE: -+ case AVAHI_BROWSER_ALL_FOR_NOW: -+ case AVAHI_BROWSER_CACHE_EXHAUSTED: -+ break; -+ } -+} -+#endif /* HAVE_AVAHI */ -+ -+ -+/* -+ * 'find_device()' - Find a device from its name and domain. -+ */ -+ -+static cups_device_t * -+find_device (cups_array_t *devices, -+ cups_txt_records_t *txt, -+ cups_device_t *dkey) -+{ -+ cups_device_t *device; -+ char *ptr; -+ -+ for (device = cupsArrayFind(devices, dkey); - device; - device = cupsArrayNext(devices)) - { -- if (strcasecmp(device->name, dkey.name) || -- strcasecmp(device->domain, dkey.domain)) -+ if (strcasecmp(device->name, dkey->name) || -+ strcasecmp(device->domain, dkey->domain)) - { - device = NULL; - break; - } -- else if (device->type == dkey.type) -+ else if (device->type == dkey->type) - { - /* - * Found it, pull out the priority and make and model from the TXT - * record and save it... - */ - -- const uint8_t *data, /* Pointer into data */ -- *datanext, /* Next key/value pair */ -- *dataend; /* End of entire TXT record */ -- uint8_t datalen; /* Length of current key/value pair */ -- char key[256], /* Key string */ -- value[256], /* Value string */ -- make_and_model[512], -+ char make_and_model[512], - /* Manufacturer and model */ - model[256], /* Model */ -- device_id[2048];/* 1284 device ID */ -- -+ device_id[2048]; /* 1284 device ID */ - - device_id[0] = '\0'; - make_and_model[0] = '\0'; - - strcpy(model, "Unknown"); - -- for (data = rdata, dataend = data + rdlen; -- data < dataend; -- data = datanext) -+ for (;;) - { -- /* -- * Read a key/value pair starting with an 8-bit length. Since the -- * length is 8 bits and the size of the key/value buffers is 256, we -- * don't need to check for overflow... -- */ -- -- datalen = *data++; -- -- if (!datalen || (data + datalen) >= dataend) -- break; -+ char *key; -+ char *value; - -- datanext = data + datalen; -- -- for (ptr = key; data < datanext && *data != '='; data ++) -- *ptr++ = *data; -- *ptr = '\0'; -- -- if (data < datanext && *data == '=') -- { -- data ++; -- -- if (data < datanext) -- memcpy(value, data, datanext - data); -- value[datanext - data] = '\0'; -- } -- else -- continue; -+ if (parse_txt_record_pair (txt)) -+ goto next; - -+ key = txt->key; -+ value = txt->value; - if (!strncasecmp(key, "usb_", 4)) - { - /* -@@ -805,6 +1219,10 @@ query_callback( - if (device->type == CUPS_DEVICE_PRINTER) - device->sent = 1; - } -+ -+ next: -+ if (next_txt_record (txt) == NULL) -+ break; - } - - if (device->device_id) -@@ -861,11 +1279,9 @@ query_callback( - } - } - -- if (!device) -- fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); -+ return device; - } - -- - /* - * 'sigterm_handler()' - Handle termination signals... - */ -diff -up cups-1.4.5/config.h.in.avahi cups-1.4.5/config.h.in ---- cups-1.4.5/config.h.in.avahi 2010-08-13 05:11:46.000000000 +0100 -+++ cups-1.4.5/config.h.in 2010-12-24 13:11:38.327341170 +0000 -@@ -344,6 +344,13 @@ - - - /* -+ * Do we have Avahi for DNS Service Discovery? -+ */ -+ -+#undef HAVE_AVAHI -+ -+ -+/* - * Do we have <sys/ioctl.h>? - */ - -diff -up cups-1.4.5/config-scripts/cups-dnssd.m4.avahi cups-1.4.5/config-scripts/cups-dnssd.m4 ---- cups-1.4.5/config-scripts/cups-dnssd.m4.avahi 2009-08-28 23:54:34.000000000 +0100 -+++ cups-1.4.5/config-scripts/cups-dnssd.m4 2010-12-24 13:11:38.326341199 +0000 -@@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [ --with-dn - DNSSDLIBS="" - DNSSD_BACKEND="" - -+AC_ARG_ENABLE(avahi, [ --enable-avahi turn on DNS Service Discovery support, default=no], -+ [if test x$enable_avahi = xyes; then -+ AC_MSG_CHECKING(for Avahi) -+ if $PKGCONFIG --exists avahi-client; then -+ AC_MSG_RESULT(yes) -+ CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`" -+ DNSSDLIBS="`$PKGCONFIG --libs avahi-client`" -+ DNSSD_BACKEND="dnssd" -+ AC_DEFINE(HAVE_AVAHI) -+ enable_dnssd=no -+ else -+ AC_MSG_RESULT(no) -+ fi -+ fi]) -+ - if test x$enable_dnssd != xno; then - AC_CHECK_HEADER(dns_sd.h, [ - case "$uname" in -diff -up cups-1.4.5/cups/http-support.c.avahi cups-1.4.5/cups/http-support.c ---- cups-1.4.5/cups/http-support.c.avahi 2010-10-01 23:40:38.000000000 +0100 -+++ cups-1.4.5/cups/http-support.c 2010-12-24 13:11:38.330341093 +0000 -@@ -41,6 +41,10 @@ - * http_copy_decode() - Copy and decode a URI. - * http_copy_encode() - Copy and encode a URI. - * resolve_callback() - Build a device URI for the given service name. -+ * avahi_resolve_uri_client_cb() -+ * - Avahi client callback for resolving URI. -+ * avahi_resolve_uri_resolver_cb() -+ * - Avahi resolver callback for resolving URI. - */ - - /* -@@ -55,6 +59,11 @@ - # include <dns_sd.h> - # include <poll.h> - #endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+# include <avahi-client/client.h> -+# include <avahi-client/lookup.h> -+# include <avahi-common/simple-watch.h> -+#endif /* HAVE_AVAHI */ - - - /* -@@ -121,6 +130,24 @@ static void resolve_callback(DNSService - void *context); - #endif /* HAVE_DNSSD */ - -+#ifdef HAVE_AVAHI -+static void avahi_resolve_uri_client_cb(AvahiClient *client, -+ AvahiClientState state, -+ void *simple_poll); -+static void avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context); -+#endif /* HAVE_AVAHI */ - - /* - * 'httpAssembleURI()' - Assemble a uniform resource identifier from its -@@ -1351,6 +1378,9 @@ _httpResolveURI( - - if (strstr(hostname, "._tcp")) - { -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+ char *regtype, /* Pointer to type in hostname */ -+ *domain; /* Pointer to domain in hostname */ - #ifdef HAVE_DNSSD - DNSServiceRef ref, /* DNS-SD master service reference */ - domainref, /* DNS-SD service reference for domain */ -@@ -1361,6 +1391,16 @@ _httpResolveURI( - *domain; /* Pointer to domain in hostname */ - _http_uribuf_t uribuf; /* URI buffer */ - struct pollfd polldata; /* Polling data */ -+#else /* HAVE_AVAHI */ -+ AvahiSimplePoll *simple_poll; -+ AvahiClient *client; -+ int error; -+ struct -+ { -+ AvahiSimplePoll *poll; -+ _http_uribuf_t uribuf; -+ } user_data; -+#endif /* HAVE_DNSSD */ - - - if (logit) -@@ -1398,8 +1438,13 @@ _httpResolveURI( - if (domain) - *domain++ = '\0'; - -+#ifdef HAVE_DNSSD - uribuf.buffer = resolved_uri; - uribuf.bufsize = resolved_size; -+#else -+ user_data.uribuf.buffer = resolved_uri; -+ user_data.uribuf.bufsize = resolved_size; -+#endif - - resolved_uri[0] = '\0'; - -@@ -1414,6 +1459,7 @@ _httpResolveURI( - - uri = NULL; - -+#ifdef HAVE_DNSSD - if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError) - { - localref = ref; -@@ -1500,6 +1546,36 @@ _httpResolveURI( - - DNSServiceRefDeallocate(ref); - } -+#else /* HAVE_AVAHI */ -+ if ((simple_poll = avahi_simple_poll_new ()) != NULL) -+ { -+ if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll), -+ 0, avahi_resolve_uri_client_cb, -+ &simple_poll, &error)) != NULL) -+ { -+ user_data.poll = simple_poll; -+ if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, hostname, -+ regtype, domain, AVAHI_PROTO_UNSPEC, 0, -+ avahi_resolve_uri_resolver_cb, -+ &user_data) != NULL) -+ { -+ avahi_simple_poll_loop (simple_poll); -+ -+ /* -+ * Collect the result. -+ */ -+ -+ if (resolved_uri[0]) -+ uri = resolved_uri; -+ } -+ -+ avahi_client_free (client); -+ } -+ -+ avahi_simple_poll_free (simple_poll); -+ } -+#endif /* HAVE_DNSSD */ - - if (logit) - { -@@ -1511,13 +1587,13 @@ _httpResolveURI( - fputs("STATE: -connecting-to-device,offline-report\n", stderr); - } - --#else -+#else /* HAVE_DNSSD || HAVE_AVAHI */ - /* - * No DNS-SD support... - */ - - uri = NULL; --#endif /* HAVE_DNSSD */ -+#endif /* HAVE_DNSSD || HAVE_AVAHI */ - - if (logit && !uri) - _cupsLangPuts(stderr, _("Unable to find printer!\n")); -@@ -1723,6 +1799,116 @@ resolve_callback( - #endif /* HAVE_DNSSD */ - - -+#ifdef HAVE_AVAHI -+/* -+ * 'avahi_resolve_uri_client_cb()' - Avahi client callback for resolving URI. -+ */ -+ -+static void -+avahi_resolve_uri_client_cb (AvahiClient *client, -+ AvahiClientState state, -+ void *simple_poll) -+{ -+ DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, " -+ "simple_poll=%p)\n", client, state, simple_poll)); -+ -+ /* -+ * If the connection drops, quit. -+ */ -+ -+ if (state == AVAHI_CLIENT_FAILURE) -+ avahi_simple_poll_quit (simple_poll); -+} -+ -+ -+/* -+ * 'avahi_resolve_uri_resolver_cb()' - Avahi resolver callback for resolving -+ * URI. -+ */ -+ -+static void -+avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ const char *scheme; /* URI scheme */ -+ char rp[256]; /* Remote printer */ -+ AvahiStringList *pair; -+ char *value; -+ size_t valueLen = 0; -+ char addr[AVAHI_ADDRESS_STR_MAX]; -+ struct -+ { -+ AvahiSimplePoll *poll; -+ _http_uribuf_t uribuf; -+ } *poll_uribuf = context; -+ -+ DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, " -+ "interface=%d, protocol=%d, event=%d, name=\"%s\", " -+ "type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, " -+ "port=%d, txt=%p, flags=%d, context=%p)\n", -+ resolver, interface, protocol, event, name, type, domain, -+ host_name, address, port, txt, flags, context)); -+ -+ if (event != AVAHI_RESOLVER_FOUND) -+ { -+ avahi_service_resolver_free (resolver); -+ avahi_simple_poll_quit (poll_uribuf->poll); -+ return; -+ } -+ -+ /* -+ * Figure out the scheme from the full name... -+ */ -+ -+ if (strstr(type, "_ipp.")) -+ scheme = "ipp"; -+ else if (strstr(type, "_printer.")) -+ scheme = "lpd"; -+ else if (strstr(type, "_pdl-datastream.")) -+ scheme = "socket"; -+ else -+ scheme = "riousbprint"; -+ -+ /* -+ * Extract the "remote printer key from the TXT record... -+ */ -+ -+ if ((pair = avahi_string_list_find (txt, "rp")) != NULL) -+ { -+ avahi_string_list_get_pair (pair, NULL, &value, &valueLen); -+ rp[0] = '/'; -+ memcpy (rp + 1, value, valueLen); -+ rp[valueLen + 1] = '\0'; -+ } -+ else -+ rp[0] = '\0'; -+ -+ /* -+ * Assemble the final device URI... -+ */ -+ -+ avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address); -+ httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer, -+ poll_uribuf->uribuf.bufsize, scheme, NULL, -+ addr, port, rp); -+ DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n", -+ poll_uribuf->uribuf.buffer)); -+ avahi_simple_poll_quit (poll_uribuf->poll); -+} -+#endif /* HAVE_AVAHI */ -+ -+ - /* - * End of "$Id: http-support.c 9322 2010-10-01 22:40:38Z mike $". - */ -diff -up cups-1.4.5/scheduler/avahi.c.avahi cups-1.4.5/scheduler/avahi.c ---- cups-1.4.5/scheduler/avahi.c.avahi 2010-12-24 13:11:38.333341014 +0000 -+++ cups-1.4.5/scheduler/avahi.c 2010-12-24 13:11:38.333341014 +0000 -@@ -0,0 +1,441 @@ -+/* -+ * "$Id$" -+ * -+ * Avahi poll implementation for the CUPS scheduler. -+ * -+ * Copyright (C) 2010 Red Hat, Inc. -+ * Authors: -+ * Tim Waugh <twaugh(a)redhat.com> -+ * -+ * Distribution and use rights are outlined in the file "LICENSE.txt" -+ * "LICENSE" which should have been included with this file. If this -+ * file is missing or damaged, see the license at "http://www.cups.org/". -+ * -+ * Contents: -+ * -+ * watch_read_cb - Read callback for file descriptor -+ * watch_write_cb - Write callback for file descriptor -+ * watched_fd_add_select() - Call cupsdAddSelect() as needed -+ * watch_new() - Create a new file descriptor watch -+ * watch_free() - Free a file descriptor watch -+ * watch_update() - Update watched events for a file descriptor -+ * watch_get_events() - Get events that happened for a file descriptor -+ * timeout_cb() - Run a timed Avahi callback -+ * timeout_new() - Set a wakeup time -+ * timeout_update() - Update the expiration time for a timeout -+ * timeout_free() - Free a timeout -+ * compare_watched_fds() - Compare watched file descriptors for array sorting -+ * compare_timeouts() - Compare timeouts for array sorting -+ * avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS -+ * avahi_cups_poll_free() - Free an Avahi main loop object for CUPS -+ * avahi_cups_poll_get() - Get the abstract poll API structure -+ */ -+ -+#include <config.h> -+ -+#ifdef HAVE_AVAHI /* Applies to entire file... */ -+ -+/* -+ * Include necessary headers... -+ */ -+ -+#include "cupsd.h" -+ -+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) -+# include <malloc.h> -+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ -+ -+#ifdef HAVE_AVAHI -+# include <avahi-common/timeval.h> -+#endif /* HAVE_AVAHI */ -+ -+ -+typedef struct -+{ -+ AvahiCupsPoll *cups_poll; -+ -+ int fd; -+ AvahiWatchEvent occurred; -+ cups_array_t *watches; -+} cupsd_watched_fd_t; -+ -+struct AvahiWatch -+{ -+ cupsd_watched_fd_t *watched_fd; -+ -+ AvahiWatchEvent events; -+ AvahiWatchCallback callback; -+ void *userdata; -+}; -+ -+struct AvahiTimeout -+{ -+ AvahiCupsPoll *cups_poll; -+ AvahiTimeoutCallback callback; -+ void *userdata; -+ cupsd_timeout_t *cupsd_timeout; -+}; -+ -+/* -+ * Local functions... -+ */ -+ -+static AvahiWatch * watch_new(const AvahiPoll *api, -+ int fd, -+ AvahiWatchEvent events, -+ AvahiWatchCallback callback, -+ void *userdata); -+static void watch_free(AvahiWatch *watch); -+static void watch_update(AvahiWatch *watch, -+ AvahiWatchEvent events); -+static AvahiWatchEvent watch_get_events(AvahiWatch *watch); -+static int compare_watches(AvahiWatch *p0, -+ AvahiWatch *p1); -+ -+ -+/* -+ * 'watch_read_cb' - Read callback for file descriptor -+ */ -+ -+static void -+watch_read_cb (void *userdata) -+{ -+ AvahiWatch *watch; -+ cupsd_watched_fd_t *watched_fd = userdata; -+ watched_fd->occurred |= AVAHI_WATCH_IN; -+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); -+ watch; -+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) { -+ if (watch->events & watched_fd->occurred) { -+ (watch->callback) (watch, watched_fd->fd, -+ AVAHI_WATCH_IN, watch->userdata); -+ watched_fd->occurred &= ~AVAHI_WATCH_IN; -+ break; -+ } -+ } -+} -+ -+ -+/* -+ * 'watch_write_cb' - Write callback for file descriptor -+ */ -+ -+static void -+watch_write_cb (void *userdata) -+{ -+ AvahiWatch *watch; -+ cupsd_watched_fd_t *watched_fd = userdata; -+ watched_fd->occurred |= AVAHI_WATCH_OUT; -+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); -+ watch; -+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) { -+ if (watch->events & watched_fd->occurred) { -+ (watch->callback) (watch, watched_fd->fd, -+ AVAHI_WATCH_OUT, watch->userdata); -+ watched_fd->occurred &= ~AVAHI_WATCH_OUT; -+ break; -+ } -+ } -+} -+ -+ -+/* -+ * 'watched_fd_add_select' - Call cupsdAddSelect() as needed -+ */ -+ -+static int /* O - Watches? */ -+watched_fd_add_select (cupsd_watched_fd_t *watched_fd) -+{ -+ AvahiWatch *watch; -+ cupsd_selfunc_t read_cb = NULL, write_cb = NULL; -+ -+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches); -+ watch; -+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) { -+ if (watch->events & (AVAHI_WATCH_IN | -+ AVAHI_WATCH_ERR | -+ AVAHI_WATCH_HUP)) { -+ read_cb = (cupsd_selfunc_t)watch_read_cb; -+ if (write_cb != NULL) -+ break; -+ } -+ -+ if (watch->events & AVAHI_WATCH_OUT) { -+ write_cb = (cupsd_selfunc_t)watch_write_cb; -+ if (read_cb != NULL) -+ break; -+ } -+ } -+ -+ if (read_cb || write_cb) -+ cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd); -+ else -+ cupsdRemoveSelect (watched_fd->fd); -+ -+ return (read_cb || write_cb); -+} -+ -+/* -+ * 'watch_new' - Create a new file descriptor watch -+ */ -+ -+static AvahiWatch * -+watch_new (const AvahiPoll *api, -+ int fd, -+ AvahiWatchEvent events, -+ AvahiWatchCallback callback, -+ void *userdata) -+{ -+ cupsd_watched_fd_t key, *watched_fd; -+ AvahiCupsPoll *cups_poll = api->userdata; -+ AvahiWatch *watch = malloc(sizeof(AvahiWatch)); -+ if (watch == NULL) -+ return (NULL); -+ -+ watch->events = events; -+ watch->callback = callback; -+ watch->userdata = userdata; -+ -+ key.fd = fd; -+ watched_fd = cupsArrayFind (cups_poll->watched_fds, &key); -+ if (watched_fd == NULL) { -+ watched_fd = malloc(sizeof(cupsd_watched_fd_t)); -+ if (watched_fd == NULL) -+ return (NULL); -+ -+ watched_fd->fd = fd; -+ watched_fd->occurred = 0; -+ watched_fd->watches = cupsArrayNew ((cups_array_func_t)compare_watches, -+ NULL); -+ } -+ -+ cupsArrayAdd(watched_fd->watches, watch); -+ watched_fd_add_select (watched_fd); -+ return (watch); -+} -+ -+ -+/* -+ * 'watch_free' - Free a file descriptor watch -+ */ -+ -+static void -+watch_free (AvahiWatch *watch) -+{ -+ cupsd_watched_fd_t *watched_fd = watch->watched_fd; -+ AvahiCupsPoll *cups_poll = watched_fd->cups_poll; -+ -+ cupsArrayRemove (watched_fd->watches, watch); -+ free (watch); -+ -+ if (!watched_fd_add_select (watched_fd)) { -+ /* No more watches */ -+ cupsArrayRemove (cups_poll->watched_fds, watched_fd); -+ free (watched_fd); -+ } -+} -+ -+ -+/* -+ * 'watch_update' - Update watched events for a file descriptor -+ */ -+ -+static void -+watch_update (AvahiWatch *watch, -+ AvahiWatchEvent events) -+{ -+ watch->events = events; -+ watched_fd_add_select (watch->watched_fd); -+} -+ -+ -+/* -+ * 'watch_get_events' - Get events that happened for a file descriptor -+ */ -+ -+static AvahiWatchEvent -+watch_get_events (AvahiWatch *watch) -+{ -+ return (watch->watched_fd->occurred); -+} -+ -+ -+/* -+ * 'compare_watches' - Compare watches for array sorting -+ */ -+ -+static int -+compare_watches (AvahiWatch *p0, -+ AvahiWatch *p1) -+{ -+ if (p0->watched_fd->fd < p1->watched_fd->fd) -+ return (-1); -+ -+ return ((p0->watched_fd->fd == p1->watched_fd->fd) ? 0 : 1); -+} -+ -+ -+/* -+ * 'timeout_cb()' - Run a timed Avahi callback -+ */ -+ -+static void -+timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata) -+{ -+ AvahiTimeout *timeout = userdata; -+ (timeout->callback) (timeout, timeout->userdata); -+} -+ -+ -+/* -+ * 'timeout_new' - Set a wakeup time -+ */ -+ -+static AvahiTimeout * -+timeout_new (const AvahiPoll *api, -+ const struct timeval *tv, -+ AvahiTimeoutCallback callback, -+ void *userdata) -+{ -+ AvahiTimeout *timeout; -+ AvahiCupsPoll *cups_poll = api->userdata; -+ -+ timeout = malloc(sizeof(AvahiTimeout)); -+ if (timeout == NULL) -+ return (NULL); -+ -+ timeout->cups_poll = cups_poll; -+ timeout->callback = callback; -+ timeout->userdata = userdata; -+ timeout->cupsd_timeout = cupsdAddTimeout (tv, -+ (cupsd_timeoutfunc_t)timeout_cb, -+ timeout); -+ cupsArrayAdd (cups_poll->timeouts, timeout); -+ return (timeout); -+} -+ -+ -+/* -+ * 'timeout_update' - Update the expiration time for a timeout -+ */ -+ -+static void -+timeout_update (AvahiTimeout *timeout, -+ const struct timeval *tv) -+{ -+ cupsdUpdateTimeout (timeout->cupsd_timeout, tv); -+} -+ -+ -+/* -+ * ' timeout_free' - Free a timeout -+ */ -+ -+static void -+timeout_free (AvahiTimeout *timeout) -+{ -+ cupsArrayRemove (timeout->cups_poll->timeouts, timeout); -+ cupsdRemoveTimeout (timeout->cupsd_timeout); -+ free (timeout); -+} -+ -+ -+/* -+ * 'compare_watched_fds' - Compare watched file descriptors for array sorting -+ */ -+static int -+compare_watched_fds(cupsd_watched_fd_t *p0, -+ cupsd_watched_fd_t *p1) -+{ -+ if (p0->fd != p1->fd) -+ return (p0->fd < p1->fd ? -1 : 1); -+ -+ if (p0 == p1) -+ return (0); -+ -+ return (p0 < p1 ? -1 : 1); -+} -+ -+ -+/* -+ * 'compare_timeouts' - Compare timeouts for array sorting -+ */ -+static int -+compare_timeouts(AvahiTimeout *p0, -+ AvahiTimeout *p1) -+{ -+ /* -+ * Just compare pointers to make it a stable sort. -+ */ -+ -+ if (p0->cupsd_timeout < p1->cupsd_timeout) -+ return (-1); -+ return ((p0->cupsd_timeout == p1->cupsd_timeout) ? 0 : 1); -+} -+ -+ -+/* -+ * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS -+ */ -+ -+AvahiCupsPoll * -+avahi_cups_poll_new (void) -+{ -+ AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll)); -+ if (cups_poll == NULL) -+ return (NULL); -+ -+ cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds, -+ NULL); -+ cups_poll->timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, -+ NULL); -+ -+ cups_poll->api.userdata = cups_poll; -+ cups_poll->api.watch_new = watch_new; -+ cups_poll->api.watch_free = watch_free; -+ cups_poll->api.watch_update = watch_update; -+ cups_poll->api.watch_get_events = watch_get_events; -+ -+ cups_poll->api.timeout_new = timeout_new; -+ cups_poll->api.timeout_update = timeout_update; -+ cups_poll->api.timeout_free = timeout_free; -+ -+ return (cups_poll); -+} -+ -+ -+/* -+ * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS -+ */ -+void -+avahi_cups_poll_free (AvahiCupsPoll *cups_poll) -+{ -+ cupsd_watched_fd_t *watched_fd; -+ -+ for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds); -+ watched_fd; -+ watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds)){ -+ cupsArrayClear (watched_fd->watches); -+ } -+ -+ cupsArrayClear (cups_poll->watched_fds); -+ cupsArrayClear (cups_poll->timeouts); -+} -+ -+ -+/* -+ * 'avahi_cups_poll_get' - Get the abstract poll API structure -+ */ -+ -+const AvahiPoll * -+avahi_cups_poll_get (AvahiCupsPoll *cups_poll) -+{ -+ return (&cups_poll->api); -+} -+ -+ -+#endif /* HAVE_AVAHI ... from top of file */ -+ -+/* -+ * End of "$Id$". -+ */ -diff -up cups-1.4.5/scheduler/avahi.h.avahi cups-1.4.5/scheduler/avahi.h ---- cups-1.4.5/scheduler/avahi.h.avahi 2010-12-24 13:11:38.334340988 +0000 -+++ cups-1.4.5/scheduler/avahi.h 2010-12-24 13:11:38.334340988 +0000 -@@ -0,0 +1,49 @@ -+/* -+ * "$Id$" -+ * -+ * Avahi poll implementation for the CUPS scheduler. -+ * -+ * Copyright (C) 2010 Red Hat, Inc. -+ * Authors: -+ * Tim Waugh <twaugh(a)redhat.com> -+ * -+ * Distribution and use rights are outlined in the file "LICENSE.txt" -+ * which should have been included with this file. If this file is -+ * file is missing or damaged, see the license at "http://www.cups.org/". -+ */ -+ -+#include <config.h> -+ -+#ifdef HAVE_AVAHI -+# include <avahi-client/client.h> -+# include <avahi-client/publish.h> -+#endif /* HAVE_AVAHI */ -+ -+#ifdef HAVE_AUTHORIZATION_H -+# include <Security/Authorization.h> -+#endif /* HAVE_AUTHORIZATION_H */ -+ -+ -+#ifdef HAVE_AVAHI -+typedef struct -+{ -+ AvahiPoll api; -+ cups_array_t *watched_fds; -+ cups_array_t *timeouts; -+} AvahiCupsPoll; -+#endif /* HAVE_AVAHI */ -+ -+/* -+ * Prototypes... -+ */ -+ -+#ifdef HAVE_AVAHI -+extern AvahiCupsPoll * avahi_cups_poll_new(void); -+extern void avahi_cups_poll_free(AvahiCupsPoll *cups_poll); -+extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll); -+#endif /* HAVE_AVAHI */ -+ -+ -+/* -+ * End of "$Id$". -+ */ -diff -up cups-1.4.5/scheduler/cupsd.h.avahi cups-1.4.5/scheduler/cupsd.h ---- cups-1.4.5/scheduler/cupsd.h.avahi 2010-09-21 23:34:57.000000000 +0100 -+++ cups-1.4.5/scheduler/cupsd.h 2010-12-24 13:11:38.335340961 +0000 -@@ -147,6 +147,15 @@ extern const char *cups_hstrerror(int); - - typedef void (*cupsd_selfunc_t)(void *data); - -+#ifdef HAVE_AVAHI -+/* -+ * Timeout callback function type... -+ */ -+ -+typedef struct _cupsd_timeout_s cupsd_timeout_t; -+typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data); -+#endif /* HAVE_AVAHI */ -+ - - /* - * Globals... -@@ -188,6 +197,9 @@ VAR PSQUpdateQuotaProcPtr PSQUpdateQuota - /* Apple PrintService quota function */ - #endif /* __APPLE__ && HAVE_DLFCN_H */ - -+#ifdef HAVE_AVAHI -+VAR cups_array_t *Timeouts; /* Timed callbacks for main loop */ -+#endif /* HAVE_AVAHI */ - - - -@@ -240,6 +252,18 @@ extern void cupsdRemoveSelect(int fd); - extern void cupsdStartSelect(void); - extern void cupsdStopSelect(void); - -+#ifdef HAVE_AVAHI -+extern void cupsdInitTimeouts(void); -+extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv, -+ cupsd_timeoutfunc_t cb, -+ void *data); -+extern cupsd_timeout_t *cupsdNextTimeout (long *delay); -+extern void cupsdRunTimeout (cupsd_timeout_t *timeout); -+extern void cupsdUpdateTimeout (cupsd_timeout_t *timeout, -+ const struct timeval *tv); -+extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout); -+#endif /* HAVE_AVAHI */ -+ - extern int cupsdRemoveFile(const char *filename); - - -diff -up cups-1.4.5/scheduler/dirsvc.c.avahi cups-1.4.5/scheduler/dirsvc.c ---- cups-1.4.5/scheduler/dirsvc.c.avahi 2010-12-24 13:11:33.679463507 +0000 -+++ cups-1.4.5/scheduler/dirsvc.c 2010-12-24 13:11:38.343340751 +0000 -@@ -99,6 +99,13 @@ - #endif /* HAVE_DNSSD */ - - -+#ifdef HAVE_DNSSD -+typedef char *cupsd_txt_record_t; -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+typedef AvahiStringList *cupsd_txt_record_t; -+#endif /* HAVE_AVAHI */ -+ - /* - * Local functions... - */ -@@ -159,15 +166,20 @@ static void update_polling(void); - static void update_smb(int onoff); - - -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+static cupsd_txt_record_t dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p, -+ int for_lpd); -+static void dnssdDeregisterPrinter(cupsd_printer_t *p); -+static int dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b); -+static void dnssdRegisterPrinter(cupsd_printer_t *p); -+static void dnssdStop(void); -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ -+ - #ifdef HAVE_DNSSD - # ifdef HAVE_COREFOUNDATION - static void dnssdAddAlias(const void *key, const void *value, - void *context); - # endif /* HAVE_COREFOUNDATION */ --static char *dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p, -- int for_lpd); --static int dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b); --static void dnssdDeregisterPrinter(cupsd_printer_t *p); - static char *dnssdPackTxtRecord(int *txt_len, char *keyvalue[][2], - int count); - static void dnssdRegisterCallback(DNSServiceRef sdRef, -@@ -175,11 +187,20 @@ static void dnssdRegisterCallback(DNSSer - DNSServiceErrorType errorCode, - const char *name, const char *regtype, - const char *domain, void *context); --static void dnssdRegisterPrinter(cupsd_printer_t *p); --static void dnssdStop(void); - static void dnssdUpdate(void); - #endif /* HAVE_DNSSD */ - -+#ifdef HAVE_AVAHI -+static AvahiStringList *avahiPackTxtRecord(char *keyvalue[][2], -+ int count); -+static void avahi_entry_group_cb (AvahiEntryGroup *group, -+ AvahiEntryGroupState state, -+ void *userdata); -+static void avahi_client_cb (AvahiClient *client, -+ AvahiClientState state, -+ void *userdata); -+#endif /* HAVE_AVAHI */ -+ - #ifdef HAVE_LDAP - static const char * const ldap_attrs[] =/* CUPS LDAP attributes */ - { -@@ -283,10 +304,10 @@ cupsdDeregisterPrinter( - ldap_dereg_printer(p); - #endif /* HAVE_LDAP */ - --#ifdef HAVE_DNSSD -- if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef) -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+ if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD)) - dnssdDeregisterPrinter(p); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - } - - -@@ -694,10 +715,10 @@ cupsdRegisterPrinter(cupsd_printer_t *p) - slpRegisterPrinter(p); */ - #endif /* HAVE_LIBSLP */ - --#ifdef HAVE_DNSSD -- if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef) -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+ if ((BrowseLocalProtocols & BROWSE_DNSSD)) - dnssdRegisterPrinter(p); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - } - - -@@ -1535,13 +1556,16 @@ cupsdStartBrowsing(void) - else - BrowseSocket = -1; - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_DNSSD) - { -+#ifdef HAVE_DNSSD - DNSServiceErrorType error; /* Error from service creation */ -+#endif /* HAVE_DNSSD */ - cupsd_listener_t *lis; /* Current listening socket */ - - -+#ifdef HAVE_DNSSD - /* - * First create a "master" connection for all registrations... - */ -@@ -1566,6 +1590,7 @@ cupsdStartBrowsing(void) - fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC); - - cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL); -+#endif /* HAVE_DNSSD */ - - /* - * Then get the port we use for registrations. If we are not listening -@@ -1607,9 +1632,20 @@ cupsdStartBrowsing(void) - */ - - cupsdUpdateDNSSDName(); -+#ifdef HAVE_DNSSD - } -- } - #endif /* HAVE_DNSSD */ -+ } -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ -+ -+#ifdef HAVE_AVAHI -+ if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_DNSSD) -+ { -+ AvahiCupsPollHandle = avahi_cups_poll_new (); -+ avahi_client_new (avahi_cups_poll_get (AvahiCupsPollHandle), -+ 0, avahi_client_cb, NULL, NULL); -+ } -+#endif /* HAVE_AVAHI */ - - #ifdef HAVE_LIBSLP - if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) -@@ -1835,10 +1871,10 @@ cupsdStopBrowsing(void) - BrowseSocket = -1; - } - --#ifdef HAVE_DNSSD -- if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef) -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+ if ((BrowseLocalProtocols & BROWSE_DNSSD)) - dnssdStop(); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - #ifdef HAVE_LIBSLP - if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) && -@@ -1903,7 +1939,7 @@ cupsdStopPolling(void) - } - - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - /* - * 'cupsdUpdateDNSSDName()' - Update the computer name we use for browsing... - */ -@@ -1911,7 +1947,12 @@ cupsdStopPolling(void) - void - cupsdUpdateDNSSDName(void) - { -+#ifdef HAVE_DNSSD - DNSServiceErrorType error; /* Error from service creation */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ int ret; /* Error from service creation */ -+#endif /* HAVE_AVAHI */ - char webif[1024]; /* Web interface share name */ - #ifdef HAVE_COREFOUNDATION_H - SCDynamicStoreRef sc; /* Context for dynamic store */ -@@ -2043,6 +2084,7 @@ cupsdUpdateDNSSDName(void) - else - strlcpy(webif, "CUPS Web Interface", sizeof(webif)); - -+#ifdef HAVE_DNSSD - if (WebIFRef) - DNSServiceRefDeallocate(WebIFRef); - -@@ -2055,6 +2097,42 @@ cupsdUpdateDNSSDName(void) - NULL)) != kDNSServiceErr_NoError) - cupsdLogMessage(CUPSD_LOG_ERROR, - "DNS-SD web interface registration failed: %d", error); -+#endif /* HAVE_DNSSD */ -+ -+#ifdef HAVE_AVAHI -+ if (!AvahiCupsClient) -+ /* -+ * Client not yet running. -+ */ -+ return; -+ -+ if (AvahiWebIFGroup) -+ avahi_entry_group_reset (AvahiWebIFGroup); -+ else -+ AvahiWebIFGroup = avahi_entry_group_new (AvahiCupsClient, -+ avahi_entry_group_cb, -+ NULL); -+ -+ if (AvahiWebIFGroup) -+ { -+ ret = avahi_entry_group_add_service (AvahiWebIFGroup, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, /* flags */ -+ webif, /* name */ -+ "_http._tcp", /* type */ -+ NULL, /* domain */ -+ NULL, /* host */ -+ htons(DNSSDPort), /* port */ -+ "path=/", NULL); -+ if (ret == 0) -+ ret = avahi_entry_group_commit (AvahiWebIFGroup); -+ -+ if (ret != 0) -+ cupsdLogMessage (CUPSD_LOG_ERROR, -+ "Avahi web interface registration failed: %d", ret); -+ } -+#endif /* HAVE_AVAHI */ - } - } - #endif /* HAVE_DNSSD */ -@@ -2300,162 +2378,7 @@ dequote(char *d, /* I - Destinat - } - - --#ifdef HAVE_DNSSD --# ifdef HAVE_COREFOUNDATION --/* -- * 'dnssdAddAlias()' - Add a DNS-SD alias name. -- */ -- --static void --dnssdAddAlias(const void *key, /* I - Key */ -- const void *value, /* I - Value (domain) */ -- void *context) /* I - Unused */ --{ -- char valueStr[1024], /* Domain string */ -- hostname[1024]; /* Complete hostname */ -- -- -- (void)context; -- -- if (CFGetTypeID((CFStringRef)value) == CFStringGetTypeID() && -- CFStringGetCString((CFStringRef)value, valueStr, sizeof(valueStr), -- kCFStringEncodingUTF8)) -- { -- snprintf(hostname, sizeof(hostname), "%s.%s", DNSSDHostName, valueStr); -- if (!DNSSDAlias) -- DNSSDAlias = cupsArrayNew(NULL, NULL); -- -- cupsdAddAlias(DNSSDAlias, hostname); -- cupsdLogMessage(CUPSD_LOG_DEBUG, "Added Back to My Mac ServerAlias %s", -- hostname); -- } -- else -- cupsdLogMessage(CUPSD_LOG_ERROR, -- "Bad Back to My Mac domain in dynamic store!"); --} --# endif /* HAVE_COREFOUNDATION */ -- -- --/* -- * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info. -- */ -- --static char * /* O - TXT record */ --dnssdBuildTxtRecord( -- int *txt_len, /* O - TXT record length */ -- cupsd_printer_t *p, /* I - Printer information */ -- int for_lpd) /* I - 1 = LPD, 0 = IPP */ --{ -- int i; /* Looping var */ -- char adminurl_str[256], /* URL for th admin page */ -- type_str[32], /* Type to string buffer */ -- state_str[32], /* State to string buffer */ -- rp_str[1024], /* Queue name string buffer */ -- air_str[1024], /* auth-info-required string buffer */ -- *keyvalue[32][2]; /* Table of key/value pairs */ -- -- -- /* -- * Load up the key value pairs... -- */ -- -- i = 0; -- -- keyvalue[i ][0] = "txtvers"; -- keyvalue[i++][1] = "1"; -- -- keyvalue[i ][0] = "qtotal"; -- keyvalue[i++][1] = "1"; -- -- keyvalue[i ][0] = "rp"; -- keyvalue[i++][1] = rp_str; -- if (for_lpd) -- strlcpy(rp_str, p->name, sizeof(rp_str)); -- else -- snprintf(rp_str, sizeof(rp_str), "%s/%s", -- (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers", p->name); -- -- keyvalue[i ][0] = "ty"; -- keyvalue[i++][1] = p->make_model ? p->make_model : "Unknown"; -- -- httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl_str, sizeof(adminurl_str), -- "http", NULL, DNSSDHostName, DNSSDPort, "/%s/%s", -- (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers", -- p->name); -- keyvalue[i ][0] = "adminurl"; -- keyvalue[i++][1] = adminurl_str; -- -- keyvalue[i ][0] = "note"; -- keyvalue[i++][1] = p->location ? p->location : ""; -- -- keyvalue[i ][0] = "priority"; -- keyvalue[i++][1] = for_lpd ? "100" : "0"; -- -- keyvalue[i ][0] = "product"; -- keyvalue[i++][1] = p->product ? p->product : "Unknown"; -- -- snprintf(type_str, sizeof(type_str), "0x%X", p->type | CUPS_PRINTER_REMOTE); -- snprintf(state_str, sizeof(state_str), "%d", p->state); -- -- keyvalue[i ][0] = "printer-state"; -- keyvalue[i++][1] = state_str; -- -- keyvalue[i ][0] = "printer-type"; -- keyvalue[i++][1] = type_str; -- -- keyvalue[i ][0] = "Transparent"; -- keyvalue[i++][1] = "T"; -- -- keyvalue[i ][0] = "Binary"; -- keyvalue[i++][1] = "T"; -- -- keyvalue[i ][0] = "Fax"; -- keyvalue[i++][1] = (p->type & CUPS_PRINTER_FAX) ? "T" : "F"; -- -- keyvalue[i ][0] = "Color"; -- keyvalue[i++][1] = (p->type & CUPS_PRINTER_COLOR) ? "T" : "F"; -- -- keyvalue[i ][0] = "Duplex"; -- keyvalue[i++][1] = (p->type & CUPS_PRINTER_DUPLEX) ? "T" : "F"; -- -- keyvalue[i ][0] = "Staple"; -- keyvalue[i++][1] = (p->type & CUPS_PRINTER_STAPLE) ? "T" : "F"; -- -- keyvalue[i ][0] = "Copies"; -- keyvalue[i++][1] = (p->type & CUPS_PRINTER_COPIES) ? "T" : "F"; -- -- keyvalue[i ][0] = "Collate"; -- keyvalue[i++][1] = (p->type & CUPS_PRINTER_COLLATE) ? "T" : "F"; -- -- keyvalue[i ][0] = "Punch"; -- keyvalue[i++][1] = (p->type & CUPS_PRINTER_PUNCH) ? "T" : "F"; -- -- keyvalue[i ][0] = "Bind"; -- keyvalue[i++][1] = (p->type & CUPS_PRINTER_BIND) ? "T" : "F"; -- -- keyvalue[i ][0] = "Sort"; -- keyvalue[i++][1] = (p->type & CUPS_PRINTER_SORT) ? "T" : "F"; -- -- keyvalue[i ][0] = "Scan"; -- keyvalue[i++][1] = (p->type & CUPS_PRINTER_MFP) ? "T" : "F"; -- -- keyvalue[i ][0] = "pdl"; -- keyvalue[i++][1] = p->pdl ? p->pdl : "application/postscript"; -- -- if (get_auth_info_required(p, air_str, sizeof(air_str))) -- { -- keyvalue[i ][0] = "air"; -- keyvalue[i++][1] = air_str; -- } -- -- /* -- * Then pack them into a proper txt record... -- */ -- -- return (dnssdPackTxtRecord(txt_len, keyvalue, i)); --} -- -- -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - /* - * 'dnssdComparePrinters()' - Compare the registered names of two printers. - */ -@@ -2479,6 +2402,10 @@ dnssdDeregisterPrinter( - { - cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdDeregisterPrinter(%s)", p->name); - -+#ifdef HAVE_DNSSD -+ if (!DNSSDRef) -+ return; -+ - /* - * Closing the socket deregisters the service - */ -@@ -2514,6 +2441,23 @@ dnssdDeregisterPrinter( - free(p->printer_txt); - p->printer_txt = NULL; - } -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ if (p->avahi_group) -+ { -+ avahi_entry_group_reset (p->avahi_group); -+ avahi_entry_group_free (p->avahi_group); -+ p->avahi_group = NULL; -+ -+ if (p->ipp_txt) -+ avahi_string_list_free (p->ipp_txt); -+ -+ if (p->printer_txt) -+ avahi_string_list_free (p->printer_txt); -+ -+ p->ipp_txt = p->printer_txt = NULL; -+ } -+#endif /* HAVE_AVAHI */ - - /* - * Remove the printer from the array of DNS-SD printers, then clear the -@@ -2526,140 +2470,53 @@ dnssdDeregisterPrinter( - - - /* -- * 'dnssdPackTxtRecord()' - Pack an array of key/value pairs into the -- * TXT record format. -+ * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer -+ * or update the broadcast contents. - */ - --static char * /* O - TXT record */ --dnssdPackTxtRecord(int *txt_len, /* O - TXT record length */ -- char *keyvalue[][2], /* I - Table of key value pairs */ -- int count) /* I - Items in table */ -+static void -+dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */ - { -- int i; /* Looping var */ -- int length; /* Length of TXT record */ -- int length2; /* Length of value */ -- char *txtRecord; /* TXT record buffer */ -- char *cursor; /* Looping pointer */ -+#ifdef HAVE_DNSSD -+ DNSServiceErrorType se; /* dnssd errors */ -+ char *ipp_txt, /* IPP TXT record buffer */ -+ *printer_txt, /* LPD TXT record buffer */ -+ *nameptr; /* Pointer into name */ -+ int ipp_len, /* IPP TXT record length */ -+ printer_len; /* LPD TXT record length */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ int ret; /* Error code */ -+ AvahiStringList *ipp_txt, /* IPP TXT record list */ -+ *printer_txt; /* LPD TXT record buffer */ -+#endif /* HAVE_AVAHI */ -+ char name[1024]; /* Service name */ -+ const char *regtype; /* Registration type */ - - -- /* -- * Calculate the buffer size -- */ -+#ifdef HAVE_DNSSD -+ if (!DNSSDRef) -+ return; - -- for (length = i = 0; i < count; i++) -- length += 1 + strlen(keyvalue[i][0]) + -- (keyvalue[i][1] ? 1 + strlen(keyvalue[i][1]) : 0); -+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name, -+ !p->ipp_ref ? "new" : "update"); -+ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name, -+ !p->avahi_group ? "new" : "update"); -+#endif /* HAVE_AVAHI */ - - /* -- * Allocate and fill it -+ * If per-printer sharing was just disabled make sure we're not -+ * registered before returning. - */ - -- txtRecord = malloc(length); -- if (txtRecord) -+ if (!p->shared) - { -- *txt_len = length; -- -- for (cursor = txtRecord, i = 0; i < count; i++) -- { -- /* -- * Drop in the p-string style length byte followed by the data -- */ -- -- length = strlen(keyvalue[i][0]); -- length2 = keyvalue[i][1] ? 1 + strlen(keyvalue[i][1]) : 0; -- -- *cursor++ = (unsigned char)(length + length2); -- -- memcpy(cursor, keyvalue[i][0], length); -- cursor += length; -- -- if (length2) -- { -- length2 --; -- *cursor++ = '='; -- memcpy(cursor, keyvalue[i][1], length2); -- cursor += length2; -- } -- } -- } -- -- return (txtRecord); --} -- -- --/* -- * 'dnssdRegisterCallback()' - DNSServiceRegister callback. -- */ -- --static void --dnssdRegisterCallback( -- DNSServiceRef sdRef, /* I - DNS Service reference */ -- DNSServiceFlags flags, /* I - Reserved for future use */ -- DNSServiceErrorType errorCode, /* I - Error code */ -- const char *name, /* I - Service name */ -- const char *regtype, /* I - Service type */ -- const char *domain, /* I - Domain. ".local" for now */ -- void *context) /* I - User-defined context */ --{ -- cupsd_printer_t *p = (cupsd_printer_t *)context; -- /* Current printer */ -- -- -- cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterCallback(%s, %s) for %s (%s)", -- name, regtype, p ? p->name : "Web Interface", -- p ? (p->reg_name ? p->reg_name : "(null)") : "NA"); -- -- if (errorCode) -- { -- cupsdLogMessage(CUPSD_LOG_ERROR, -- "DNSServiceRegister failed with error %d", (int)errorCode); -- return; -- } -- else if (p && (!p->reg_name || strcasecmp(name, p->reg_name))) -- { -- cupsdLogMessage(CUPSD_LOG_INFO, "Using service name \"%s\" for \"%s\"", -- name, p->name); -- -- cupsArrayRemove(DNSSDPrinters, p); -- cupsdSetString(&p->reg_name, name); -- cupsArrayAdd(DNSSDPrinters, p); -- -- LastEvent |= CUPSD_EVENT_PRINTER_MODIFIED; -- } --} -- -- --/* -- * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer -- * or update the broadcast contents. -- */ -- --static void --dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */ --{ -- DNSServiceErrorType se; /* dnssd errors */ -- char *ipp_txt, /* IPP TXT record buffer */ -- *printer_txt, /* LPD TXT record buffer */ -- name[1024], /* Service name */ -- *nameptr; /* Pointer into name */ -- int ipp_len, /* IPP TXT record length */ -- printer_len; /* LPD TXT record length */ -- const char *regtype; /* Registration type */ -- -- -- cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name, -- !p->ipp_ref ? "new" : "update"); -- -- /* -- * If per-printer sharing was just disabled make sure we're not -- * registered before returning. -- */ -- -- if (!p->shared) -- { -- dnssdDeregisterPrinter(p); -- return; -- } -+ dnssdDeregisterPrinter(p); -+ return; -+ } - - /* - * The registered name takes the form of "<printer-info> @ <computer name>"... -@@ -2694,6 +2551,7 @@ dnssdRegisterPrinter(cupsd_printer_t *p) - * Register IPP and (optionally) LPD... - */ - -+#ifdef HAVE_DNSSD - ipp_len = 0; /* anti-compiler-warning-code */ - ipp_txt = dnssdBuildTxtRecord(&ipp_len, p, 0); - -@@ -2860,6 +2718,140 @@ dnssdRegisterPrinter(cupsd_printer_t *p) - if (printer_txt) - free(printer_txt); - } -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ if (!AvahiCupsClient) -+ /* -+ * Client not running yet. The client callback will call us again later. -+ */ -+ return; -+ -+ ipp_txt = dnssdBuildTxtRecord(NULL, p, 0); -+ printer_txt = dnssdBuildTxtRecord(NULL, p, 1); -+ regtype = (p->type & CUPS_PRINTER_FAX) ? "_fax-ipp._tcp" : "_ipp._tcp"; -+ -+ if (p->avahi_group && p->ipp_txt && ipp_txt && -+ !avahi_string_list_equal (p->ipp_txt, ipp_txt)) -+ { -+ /* -+ * Update the existing registration... -+ */ -+ -+ avahi_string_list_free (p->ipp_txt); -+ -+ if (p->printer_txt) -+ avahi_string_list_free (p->printer_txt); -+ -+ ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, name, regtype, NULL, -+ ipp_txt); -+ if (ret < 0) -+ goto update_failed; -+ -+ p->ipp_txt = ipp_txt; -+ ipp_txt = NULL; -+ -+ if (BrowseLocalProtocols & BROWSE_LPD) -+ { -+ ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, name, -+ "_printer._tcp", NULL, -+ printer_txt); -+ -+ if (ret < 0) -+ goto update_failed; -+ -+ p->printer_txt = printer_txt; -+ printer_txt = NULL; -+ } -+ -+ ret = avahi_entry_group_commit (p->avahi_group); -+ if (ret < 0) -+ { -+ update_failed: -+ cupsdLogMessage (CUPSD_LOG_ERROR, -+ "Failed to update TXT record for %s: %d", -+ name, ret); -+ avahi_entry_group_reset (p->avahi_group); -+ avahi_entry_group_free (p->avahi_group); -+ p->avahi_group = NULL; -+ ipp_txt = p->ipp_txt; -+ p->ipp_txt = NULL; -+ } -+ } -+ -+ if (!p->avahi_group) -+ { -+ /* -+ * Initial registration. Use the _fax subtype for fax queues... -+ */ -+ -+ p->avahi_group = avahi_entry_group_new (AvahiCupsClient, -+ avahi_entry_group_cb, -+ p); -+ -+ cupsdLogMessage(CUPSD_LOG_DEBUG, -+ "Registering Avahi printer %s with name \"%s\" and " -+ "type \"%s\"", p->name, name, regtype); -+ -+ ret = avahi_entry_group_add_service_strlst (p->avahi_group, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, name, regtype, NULL, NULL, -+ htons(DNSSDPort), -+ ipp_txt); -+ if (ret < 0) -+ goto add_failed; -+ -+ p->ipp_txt = ipp_txt; -+ ipp_txt = NULL; -+ -+ if (BrowseLocalProtocols & BROWSE_LPD) -+ { -+ cupsdLogMessage(CUPSD_LOG_DEBUG, -+ "Registering Avahi printer %s with name \"%s\" and " -+ "type \"_printer._tcp\"", p->name, name); -+ -+ ret = avahi_entry_group_add_service_strlst (p->avahi_group, -+ AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ 0, name, -+ "_printer._tcp", NULL, NULL, -+ htons(515), -+ printer_txt); -+ if (ret < 0) -+ goto add_failed; -+ -+ p->printer_txt = printer_txt; -+ printer_txt = NULL; -+ } -+ -+ ret = avahi_entry_group_commit (p->avahi_group); -+ -+ if (ret < 0) -+ { -+ add_failed: -+ cupsdLogMessage (CUPSD_LOG_ERROR, -+ "Failed to add Avahi entry for %s: %d", -+ name, ret); -+ avahi_entry_group_reset (p->avahi_group); -+ avahi_entry_group_free (p->avahi_group); -+ p->avahi_group = NULL; -+ ipp_txt = p->ipp_txt; -+ p->ipp_txt = NULL; -+ } -+ } -+ -+ if (ipp_txt) -+ avahi_string_list_free (ipp_txt); -+ -+ if (printer_txt) -+ avahi_string_list_free (printer_txt); -+#endif /* HAVE_AVAHI */ - } - - -@@ -2872,6 +2864,10 @@ dnssdStop(void) - { - cupsd_printer_t *p; /* Current printer */ - -+#ifdef HAVE_DNSSD -+ if (!DNSSDRef) -+ return; -+#endif /* HAVE_DNSSD */ - - /* - * De-register the individual printers -@@ -2882,6 +2878,7 @@ dnssdStop(void) - p = (cupsd_printer_t *)cupsArrayNext(Printers)) - dnssdDeregisterPrinter(p); - -+#ifdef HAVE_DNSSD - /* - * Shutdown the rest of the service refs... - */ -@@ -2902,6 +2899,7 @@ dnssdStop(void) - - DNSServiceRefDeallocate(DNSSDRef); - DNSSDRef = NULL; -+#endif /* HAVE_DNSSD */ - - cupsArrayDelete(DNSSDPrinters); - DNSSDPrinters = NULL; -@@ -2911,6 +2909,272 @@ dnssdStop(void) - - - /* -+ * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info. -+ */ -+ -+static cupsd_txt_record_t /* O - TXT record */ -+dnssdBuildTxtRecord( -+ int *txt_len, /* O - TXT record length */ -+ cupsd_printer_t *p, /* I - Printer information */ -+ int for_lpd) /* I - 1 = LPD, 0 = IPP */ -+{ -+ int i; /* Looping var */ -+ char adminurl_str[256], /* URL for th admin page */ -+ type_str[32], /* Type to string buffer */ -+ state_str[32], /* State to string buffer */ -+ rp_str[1024], /* Queue name string buffer */ -+ air_str[1024], /* auth-info-required string buffer */ -+ *keyvalue[32][2]; /* Table of key/value pairs */ -+ -+ -+ /* -+ * Load up the key value pairs... -+ */ -+ -+ i = 0; -+ -+ keyvalue[i ][0] = "txtvers"; -+ keyvalue[i++][1] = "1"; -+ -+ keyvalue[i ][0] = "qtotal"; -+ keyvalue[i++][1] = "1"; -+ -+ keyvalue[i ][0] = "rp"; -+ keyvalue[i++][1] = rp_str; -+ if (for_lpd) -+ strlcpy(rp_str, p->name, sizeof(rp_str)); -+ else -+ snprintf(rp_str, sizeof(rp_str), "%s/%s", -+ (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers", p->name); -+ -+ keyvalue[i ][0] = "ty"; -+ keyvalue[i++][1] = p->make_model ? p->make_model : "Unknown"; -+ -+ httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl_str, sizeof(adminurl_str), -+ "http", NULL, DNSSDHostName, DNSSDPort, "/%s/%s", -+ (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers", -+ p->name); -+ keyvalue[i ][0] = "adminurl"; -+ keyvalue[i++][1] = adminurl_str; -+ -+ keyvalue[i ][0] = "note"; -+ keyvalue[i++][1] = p->location ? p->location : ""; -+ -+ keyvalue[i ][0] = "priority"; -+ keyvalue[i++][1] = for_lpd ? "100" : "0"; -+ -+ keyvalue[i ][0] = "product"; -+ keyvalue[i++][1] = p->product ? p->product : "Unknown"; -+ -+ snprintf(type_str, sizeof(type_str), "0x%X", p->type | CUPS_PRINTER_REMOTE); -+ snprintf(state_str, sizeof(state_str), "%d", p->state); -+ -+ keyvalue[i ][0] = "printer-state"; -+ keyvalue[i++][1] = state_str; -+ -+ keyvalue[i ][0] = "printer-type"; -+ keyvalue[i++][1] = type_str; -+ -+ keyvalue[i ][0] = "Transparent"; -+ keyvalue[i++][1] = "T"; -+ -+ keyvalue[i ][0] = "Binary"; -+ keyvalue[i++][1] = "T"; -+ -+ keyvalue[i ][0] = "Fax"; -+ keyvalue[i++][1] = (p->type & CUPS_PRINTER_FAX) ? "T" : "F"; -+ -+ keyvalue[i ][0] = "Color"; -+ keyvalue[i++][1] = (p->type & CUPS_PRINTER_COLOR) ? "T" : "F"; -+ -+ keyvalue[i ][0] = "Duplex"; -+ keyvalue[i++][1] = (p->type & CUPS_PRINTER_DUPLEX) ? "T" : "F"; -+ -+ keyvalue[i ][0] = "Staple"; -+ keyvalue[i++][1] = (p->type & CUPS_PRINTER_STAPLE) ? "T" : "F"; -+ -+ keyvalue[i ][0] = "Copies"; -+ keyvalue[i++][1] = (p->type & CUPS_PRINTER_COPIES) ? "T" : "F"; -+ -+ keyvalue[i ][0] = "Collate"; -+ keyvalue[i++][1] = (p->type & CUPS_PRINTER_COLLATE) ? "T" : "F"; -+ -+ keyvalue[i ][0] = "Punch"; -+ keyvalue[i++][1] = (p->type & CUPS_PRINTER_PUNCH) ? "T" : "F"; -+ -+ keyvalue[i ][0] = "Bind"; -+ keyvalue[i++][1] = (p->type & CUPS_PRINTER_BIND) ? "T" : "F"; -+ -+ keyvalue[i ][0] = "Sort"; -+ keyvalue[i++][1] = (p->type & CUPS_PRINTER_SORT) ? "T" : "F"; -+ -+ keyvalue[i ][0] = "Scan"; -+ keyvalue[i++][1] = (p->type & CUPS_PRINTER_MFP) ? "T" : "F"; -+ -+ keyvalue[i ][0] = "pdl"; -+ keyvalue[i++][1] = p->pdl ? p->pdl : "application/postscript"; -+ -+ if (get_auth_info_required(p, air_str, sizeof(air_str))) -+ { -+ keyvalue[i ][0] = "air"; -+ keyvalue[i++][1] = air_str; -+ } -+ -+ /* -+ * Then pack them into a proper txt record... -+ */ -+ -+#ifdef HAVE_DNSSD -+ return (dnssdPackTxtRecord(txt_len, keyvalue, i)); -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ return (avahiPackTxtRecord(keyvalue, i)); -+#endif /* HAVE_AVAHI */ -+} -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ -+ -+ -+#ifdef HAVE_DNSSD -+# ifdef HAVE_COREFOUNDATION -+/* -+ * 'dnssdAddAlias()' - Add a DNS-SD alias name. -+ */ -+ -+static void -+dnssdAddAlias(const void *key, /* I - Key */ -+ const void *value, /* I - Value (domain) */ -+ void *context) /* I - Unused */ -+{ -+ char valueStr[1024], /* Domain string */ -+ hostname[1024]; /* Complete hostname */ -+ -+ -+ (void)context; -+ -+ if (CFGetTypeID((CFStringRef)value) == CFStringGetTypeID() && -+ CFStringGetCString((CFStringRef)value, valueStr, sizeof(valueStr), -+ kCFStringEncodingUTF8)) -+ { -+ snprintf(hostname, sizeof(hostname), "%s.%s", DNSSDHostName, valueStr); -+ if (!DNSSDAlias) -+ DNSSDAlias = cupsArrayNew(NULL, NULL); -+ -+ cupsdAddAlias(DNSSDAlias, hostname); -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Added Back to My Mac ServerAlias %s", -+ hostname); -+ } -+ else -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "Bad Back to My Mac domain in dynamic store!"); -+} -+# endif /* HAVE_COREFOUNDATION */ -+ -+ -+/* -+ * 'dnssdPackTxtRecord()' - Pack an array of key/value pairs into the -+ * TXT record format. -+ */ -+ -+static char * /* O - TXT record */ -+dnssdPackTxtRecord(int *txt_len, /* O - TXT record length */ -+ char *keyvalue[][2], /* I - Table of key value pairs */ -+ int count) /* I - Items in table */ -+{ -+ int i; /* Looping var */ -+ int length; /* Length of TXT record */ -+ int length2; /* Length of value */ -+ char *txtRecord; /* TXT record buffer */ -+ char *cursor; /* Looping pointer */ -+ -+ -+ /* -+ * Calculate the buffer size -+ */ -+ -+ for (length = i = 0; i < count; i++) -+ length += 1 + strlen(keyvalue[i][0]) + -+ (keyvalue[i][1] ? 1 + strlen(keyvalue[i][1]) : 0); -+ -+ /* -+ * Allocate and fill it -+ */ -+ -+ txtRecord = malloc(length); -+ if (txtRecord) -+ { -+ *txt_len = length; -+ -+ for (cursor = txtRecord, i = 0; i < count; i++) -+ { -+ /* -+ * Drop in the p-string style length byte followed by the data -+ */ -+ -+ length = strlen(keyvalue[i][0]); -+ length2 = keyvalue[i][1] ? 1 + strlen(keyvalue[i][1]) : 0; -+ -+ *cursor++ = (unsigned char)(length + length2); -+ -+ memcpy(cursor, keyvalue[i][0], length); -+ cursor += length; -+ -+ if (length2) -+ { -+ length2 --; -+ *cursor++ = '='; -+ memcpy(cursor, keyvalue[i][1], length2); -+ cursor += length2; -+ } -+ } -+ } -+ -+ return (txtRecord); -+} -+ -+ -+/* -+ * 'dnssdRegisterCallback()' - DNSServiceRegister callback. -+ */ -+ -+static void -+dnssdRegisterCallback( -+ DNSServiceRef sdRef, /* I - DNS Service reference */ -+ DNSServiceFlags flags, /* I - Reserved for future use */ -+ DNSServiceErrorType errorCode, /* I - Error code */ -+ const char *name, /* I - Service name */ -+ const char *regtype, /* I - Service type */ -+ const char *domain, /* I - Domain. ".local" for now */ -+ void *context) /* I - User-defined context */ -+{ -+ cupsd_printer_t *p = (cupsd_printer_t *)context; -+ /* Current printer */ -+ -+ -+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterCallback(%s, %s) for %s (%s)", -+ name, regtype, p ? p->name : "Web Interface", -+ p ? (p->reg_name ? p->reg_name : "(null)") : "NA"); -+ -+ if (errorCode) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "DNSServiceRegister failed with error %d", (int)errorCode); -+ return; -+ } -+ else if (p && (!p->reg_name || strcasecmp(name, p->reg_name))) -+ { -+ cupsdLogMessage(CUPSD_LOG_INFO, "Using service name \"%s\" for \"%s\"", -+ name, p->name); -+ -+ cupsArrayRemove(DNSSDPrinters, p); -+ cupsdSetString(&p->reg_name, name); -+ cupsArrayAdd(DNSSDPrinters, p); -+ -+ LastEvent |= CUPSD_EVENT_PRINTER_MODIFIED; -+ } -+} -+ -+ -+/* - * 'dnssdUpdate()' - Handle DNS-SD queries. - */ - -@@ -2931,6 +3195,126 @@ dnssdUpdate(void) - #endif /* HAVE_DNSSD */ - - -+#ifdef HAVE_AVAHI -+/* -+ * 'avahiPackTxtRecord()' - Pack an array of key/value pairs into an -+ * AvahiStringList. -+ */ -+ -+static AvahiStringList * /* O - new string list */ -+avahiPackTxtRecord(char *keyvalue[][2], /* I - Table of key value pairs */ -+ int count) /* I - Items in table */ -+{ -+ AvahiStringList *strlst = NULL; -+ char **elements; -+ size_t len; -+ int i; -+ -+ elements = malloc ((1 + count) * sizeof (char *)); -+ if (!elements) -+ goto cleanup; -+ -+ for (i = 0; i < count; i++) -+ { -+ len = (1 + strlen (keyvalue[i][0]) + -+ (keyvalue[i][1] ? 1 + strlen (keyvalue[i][1]) : 1)); -+ elements[i] = malloc (len * sizeof (char)); -+ if (!elements[i]) -+ goto cleanup; -+ -+ snprintf (elements[i], len, "%s=%s", keyvalue[i][0], keyvalue[i][1]); -+ } -+ -+ strlst = avahi_string_list_new_from_array ((const char **) elements, count); -+ -+cleanup: -+ while (--i >= 0) -+ free (elements[i]); -+ -+ free (elements); -+ return (strlst); -+} -+ -+ -+/* -+ * 'avahi_entry_group_cb()' - Avahi entry group callback function. -+ */ -+static void -+avahi_entry_group_cb (AvahiEntryGroup *group, -+ AvahiEntryGroupState state, -+ void *userdata) -+{ -+ char *name; -+ -+ if (userdata) -+ name = ((cupsd_printer_t *) userdata)->reg_name; -+ else -+ name = "CUPS web interface"; -+ -+ switch (state) -+ { -+ case AVAHI_ENTRY_GROUP_UNCOMMITED: -+ case AVAHI_ENTRY_GROUP_REGISTERING: -+ break; -+ -+ case AVAHI_ENTRY_GROUP_ESTABLISHED: -+ cupsdLogMessage (CUPSD_LOG_DEBUG, -+ "Avahi entry group established for %s", name); -+ break; -+ -+ default: -+ cupsdLogMessage (CUPSD_LOG_DEBUG, -+ "Avahi entry group %s has state %d", -+ name, state); -+ break; -+ } -+} -+ -+/* -+ * 'avahi_client_cb()' - Avahi client callback function. -+ */ -+static void -+avahi_client_cb (AvahiClient *client, -+ AvahiClientState state, -+ void *userdata) -+{ -+ cupsd_printer_t *printer; -+ switch (state) -+ { -+ case AVAHI_CLIENT_S_RUNNING: -+ /* -+ * Avahi client started successfully. -+ */ -+ AvahiCupsClient = client; -+ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client started"); -+ -+ cupsdUpdateDNSSDName (); -+ -+ for (printer = (cupsd_printer_t *)cupsArrayFirst(DNSSDPrinters); -+ printer; -+ printer = (cupsd_printer_t *)cupsArrayNext(DNSSDPrinters)) -+ { -+ if (!printer->avahi_group) -+ dnssdRegisterPrinter (printer); -+ } -+ -+ break; -+ -+ case AVAHI_CLIENT_CONNECTING: -+ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client connecting"); -+ break; -+ -+ case AVAHI_CLIENT_FAILURE: -+ cupsdLogMessage (CUPSD_LOG_ERROR, "Avahi client failed"); -+ break; -+ -+ default: -+ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client state: %d", state); -+ } -+} -+#endif /* HAVE_AVAHI */ -+ -+ - /* - * 'get_auth_info_required()' - Get the auth-info-required value to advertise. - */ -diff -up cups-1.4.5/scheduler/dirsvc.h.avahi cups-1.4.5/scheduler/dirsvc.h ---- cups-1.4.5/scheduler/dirsvc.h.avahi 2009-05-14 18:54:37.000000000 +0100 -+++ cups-1.4.5/scheduler/dirsvc.h 2010-12-24 13:11:38.344340724 +0000 -@@ -32,6 +32,10 @@ - # endif /* HAVE_LDAP_SSL_H */ - #endif /* HAVE_LDAP */ - -+#ifdef HAVE_AVAHI -+# include <avahi-client/publish.h> -+#endif /* HAVE_AVAHI */ -+ - /* - * Browse protocols... - */ -@@ -132,17 +136,20 @@ VAR int PollPipe VALUE(0); - VAR cupsd_statbuf_t *PollStatusBuffer VALUE(NULL); - /* Status buffer for pollers */ - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+VAR int DNSSDPort VALUE(0); -+ /* Port number to register */ - VAR char *DNSSDComputerName VALUE(NULL), - /* Computer/server name */ - *DNSSDHostName VALUE(NULL); - /* Hostname */ --VAR cups_array_t *DNSSDAlias VALUE(NULL); -- /* List of dynamic ServerAlias's */ --VAR int DNSSDPort VALUE(0); -- /* Port number to register */ - VAR cups_array_t *DNSSDPrinters VALUE(NULL); - /* Printers we have registered */ -+#endif /* HAVE_DNSSD || HAVE_AVAHI */ -+ -+#ifdef HAVE_DNSSD -+VAR cups_array_t *DNSSDAlias VALUE(NULL); -+ /* List of dynamic ServerAlias's */ - VAR DNSServiceRef DNSSDRef VALUE(NULL), - /* Master DNS-SD service reference */ - WebIFRef VALUE(NULL), -@@ -151,6 +158,15 @@ VAR DNSServiceRef DNSSDRef VALUE(NULL), - /* Remote printer browse reference */ - #endif /* HAVE_DNSSD */ - -+#ifdef HAVE_AVAHI -+VAR AvahiCupsPoll *AvahiCupsPollHandle VALUE(NULL); -+ /* AvahiCupsPoll object */ -+VAR AvahiClient *AvahiCupsClient VALUE(NULL); -+ /* AvahiClient object */ -+VAR AvahiEntryGroup *AvahiWebIFGroup VALUE(NULL); -+ /* Web interface entry group */ -+#endif /* HAVE_AVAHI */ -+ - #ifdef HAVE_LIBSLP - VAR SLPHandle BrowseSLPHandle VALUE(NULL); - /* SLP API handle */ -@@ -198,9 +214,9 @@ extern void cupsdStartBrowsing(void); - extern void cupsdStartPolling(void); - extern void cupsdStopBrowsing(void); - extern void cupsdStopPolling(void); --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - extern void cupsdUpdateDNSSDName(void); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - #ifdef HAVE_LDAP - extern void cupsdUpdateLDAPBrowse(void); - #endif /* HAVE_LDAP */ -diff -up cups-1.4.5/scheduler/main.c.avahi cups-1.4.5/scheduler/main.c ---- cups-1.4.5/scheduler/main.c.avahi 2010-12-24 13:11:33.633464718 +0000 -+++ cups-1.4.5/scheduler/main.c 2010-12-24 13:11:38.348340619 +0000 -@@ -161,6 +161,10 @@ main(int argc, /* I - Number of comm - int launchd_idle_exit; - /* Idle exit on select timeout? */ - #endif /* HAVE_LAUNCHD */ -+#ifdef HAVE_AVAHI -+ cupsd_timeout_t *tmo; /* Next scheduled timed callback */ -+ long tmo_delay; /* Time before it must be called */ -+#endif /* HAVE_AVAHI */ - - - #ifdef HAVE_GETEUID -@@ -561,6 +565,14 @@ main(int argc, /* I - Number of comm - - httpInitialize(); - -+#ifdef HAVE_AVAHI -+ /* -+ * Initialize timed callback structures. -+ */ -+ -+ cupsdInitTimeouts(); -+#endif /* HAVE_AVAHI */ -+ - cupsdStartServer(); - - /* -@@ -900,6 +912,16 @@ main(int argc, /* I - Number of comm - } - #endif /* __APPLE__ */ - -+#ifdef HAVE_AVAHI -+ /* -+ * If a timed callback is due, run it. -+ */ -+ -+ tmo = cupsdNextTimeout (&tmo_delay); -+ if (tmo && tmo_delay == 0) -+ cupsdRunTimeout (tmo); -+#endif /* HAVE_AVAHI */ -+ - #ifndef __APPLE__ - /* - * Update the network interfaces once a minute... -@@ -1925,6 +1947,10 @@ select_timeout(int fds) /* I - Number - cupsd_job_t *job; /* Job information */ - cupsd_subscription_t *sub; /* Subscription information */ - const char *why; /* Debugging aid */ -+#ifdef HAVE_AVAHI -+ cupsd_timeout_t *tmo; /* Timed callback */ -+ long tmo_delay; /* Seconds before calling it */ -+#endif /* HAVE_AVAHI */ - - - /* -@@ -1967,6 +1993,19 @@ select_timeout(int fds) /* I - Number - } - #endif /* __APPLE__ */ - -+#ifdef HAVE_AVAHI -+ /* -+ * See if there are any scheduled timed callbacks to run. -+ */ -+ -+ tmo = cupsdNextTimeout (&tmo_delay); -+ if (tmo) -+ { -+ timeout = tmo_delay; -+ why = "run a timed callback"; -+ } -+#endif /* HAVE_AVAHI */ -+ - /* - * Check whether we are accepting new connections... - */ -diff -up cups-1.4.5/scheduler/Makefile.avahi cups-1.4.5/scheduler/Makefile ---- cups-1.4.5/scheduler/Makefile.avahi 2010-12-24 13:11:33.739461928 +0000 -+++ cups-1.4.5/scheduler/Makefile 2010-12-24 13:11:38.332341040 +0000 -@@ -17,6 +17,7 @@ include ../Makedefs - - CUPSDOBJS = \ - auth.o \ -+ avahi.o \ - banners.o \ - cert.o \ - classes.o \ -@@ -39,7 +40,8 @@ CUPSDOBJS = \ - server.o \ - statbuf.o \ - subscriptions.o \ -- sysman.o -+ sysman.o \ -+ timeout.o - LIBOBJS = \ - filter.o \ - mime.o \ -diff -up cups-1.4.5/scheduler/printers.c.avahi cups-1.4.5/scheduler/printers.c ---- cups-1.4.5/scheduler/printers.c.avahi 2010-12-24 13:11:33.784460744 +0000 -+++ cups-1.4.5/scheduler/printers.c 2010-12-24 13:11:38.356340409 +0000 -@@ -929,10 +929,10 @@ cupsdDeletePrinter( - cupsdClearString(&p->alert); - cupsdClearString(&p->alert_description); - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - cupsdClearString(&p->product); - cupsdClearString(&p->pdl); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - cupsArrayDelete(p->filetypes); - -@@ -1301,9 +1301,9 @@ cupsdLoadAllPrinters(void) - { - if (value) - { --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - p->product = _cupsStrAlloc(value); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - } - else - cupsdLogMessage(CUPSD_LOG_ERROR, -@@ -1717,10 +1717,10 @@ cupsdSaveAllPrinters(void) - - cupsFilePrintf(fp, "Type %d\n", printer->type); - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - if (printer->product) - cupsFilePutConf(fp, "Product", printer->product); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - for (ptr = (char *)cupsArrayFirst(printer->filters); - ptr; -@@ -3860,7 +3860,7 @@ add_printer_formats(cupsd_printer_t *p) - attr->values[i].string.text = _cupsStrAlloc(mimetype); - } - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - { - char pdl[1024]; /* Buffer to build pdl list */ - mime_filter_t *filter; /* MIME filter looping var */ -@@ -3914,7 +3914,7 @@ add_printer_formats(cupsd_printer_t *p) - - cupsdSetString(&p->pdl, pdl); - } --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - } - - -@@ -4951,9 +4951,9 @@ load_ppd(cupsd_printer_t *p) /* I - Pri - attr->values[i].string.text = _cupsStrAlloc("bcp"); - } - --#ifdef HAVE_DNSSD -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) - cupsdSetString(&p->product, ppd->product); --#endif /* HAVE_DNSSD */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - - if (ppdFindAttr(ppd, "APRemoteQueueID", NULL)) - p->type |= CUPS_PRINTER_REMOTE; -diff -up cups-1.4.5/scheduler/printers.h.avahi cups-1.4.5/scheduler/printers.h ---- cups-1.4.5/scheduler/printers.h.avahi 2010-03-30 23:07:33.000000000 +0100 -+++ cups-1.4.5/scheduler/printers.h 2010-12-24 13:11:38.357340382 +0000 -@@ -16,6 +16,9 @@ - #ifdef HAVE_DNSSD - # include <dns_sd.h> - #endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+# include "avahi.h" -+#endif /* HAVE_AVAHI */ - #include <cups/pwg-private.h> - - -@@ -99,17 +102,24 @@ typedef struct cupsd_printer_s - char *recoverable; /* com.apple.print.recoverable-message */ - _pwg_t *pwg; /* PWG<->PPD mapping data */ - -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+ char *reg_name; /* Name used for service registration */ -+ char *product, /* PPD Product string */ -+ *pdl; /* pdl value for TXT record */ -+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */ - #ifdef HAVE_DNSSD -- char *reg_name, /* Name used for service registration */ -- *product, /* PPD Product string */ -- *pdl, /* pdl value for TXT record */ -- *ipp_txt, /* IPP TXT record contents */ -+ char *ipp_txt, /* IPP TXT record contents */ - *printer_txt; /* LPD TXT record contents */ - int ipp_len, /* IPP TXT record length */ - printer_len; /* LPD TXT record length */ - DNSServiceRef ipp_ref, /* Reference for _ipp._tcp,_cups */ - printer_ref; /* Reference for _printer._tcp */ - #endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ AvahiStringList *ipp_txt, /* IPP TXT record */ -+ *printer_txt; /* LPD TXT record */ -+ AvahiEntryGroup *avahi_group; /* Avahi entry group */ -+#endif /* HAVE_AVAHI */ - } cupsd_printer_t; - - -diff -up cups-1.4.5/scheduler/timeout.c.avahi cups-1.4.5/scheduler/timeout.c ---- cups-1.4.5/scheduler/timeout.c.avahi 2010-12-24 13:11:38.358340356 +0000 -+++ cups-1.4.5/scheduler/timeout.c 2010-12-24 13:11:38.358340356 +0000 -@@ -0,0 +1,191 @@ -+/* -+ * "$Id$" -+ * -+ * Timeout functions for the Common UNIX Printing System (CUPS). -+ * -+ * Copyright (C) 2010 Red Hat, Inc. -+ * Authors: -+ * Tim Waugh <twaugh(a)redhat.com> -+ * -+ * Distribution and use rights are outlined in the file "LICENSE.txt" -+ * which should have been included with this file. If this file is -+ * file is missing or damaged, see the license at "http://www.cups.org/". -+ * -+ * Contents: -+ * -+ * cupsdInitTimeouts() - Initialise timeout structure. -+ * cupsdAddTimeout() - Add a timed callback. -+ * cupsdNextTimeout() - Find the next enabled timed callback. -+ * cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it. -+ * cupsdRemoveTimeout() - Discard a timed callback. -+ * compare_timeouts() - Compare timed callbacks for array sorting. -+ */ -+ -+#include <config.h> -+ -+#ifdef HAVE_AVAHI /* Applies to entire file... */ -+ -+/* -+ * Include necessary headers... -+ */ -+ -+#include "cupsd.h" -+ -+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) -+# include <malloc.h> -+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ -+ -+#ifdef HAVE_AVAHI -+# include <avahi-common/timeval.h> -+#endif /* HAVE_AVAHI */ -+ -+ -+struct _cupsd_timeout_s -+{ -+ struct timeval when; -+ int enabled; -+ cupsd_timeoutfunc_t callback; -+ void *data; -+}; -+ -+/* -+ * Local functions... -+ */ -+ -+/* -+ * 'compare_timeouts()' - Compare timed callbacks for array sorting. -+ */ -+ -+static int -+compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1) -+{ -+ if (!p0->enabled || !p1->enabled) -+ { -+ if (!p0->enabled && !p1->enabled) -+ return (0); -+ -+ return (p0->enabled ? -1 : 1); -+ } -+ -+ return (avahi_timeval_compare (&p0->when, &p1->when)); -+} -+ -+ -+/* -+ * 'cupsdInitTimeouts()' - Initialise timeout structures. -+ */ -+ -+void -+cupsdInitTimeouts(void) -+{ -+ Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL); -+} -+ -+ -+/* -+ * 'cupsdAddTimeout()' - Add a timed callback. -+ */ -+ -+cupsd_timeout_t * /* O - Timeout handle */ -+cupsdAddTimeout(const struct timeval *tv, /* I - Absolute time */ -+ cupsd_timeoutfunc_t cb, /* I - Callback function */ -+ void *data) /* I - User data */ -+{ -+ cupsd_timeout_t *timeout; -+ -+ timeout = malloc (sizeof(cupsd_timeout_t)); -+ if (timeout != NULL) -+ { -+ timeout->enabled = (tv != NULL); -+ if (tv) -+ { -+ timeout->when.tv_sec = tv->tv_sec; -+ timeout->when.tv_usec = tv->tv_usec; -+ } -+ -+ timeout->callback = cb; -+ timeout->data = data; -+ cupsArrayAdd (Timeouts, timeout); -+ } -+ -+ return timeout; -+} -+ -+ -+/* -+ * 'cupsdNextTimeout()' - Find the next enabled timed callback. -+ */ -+ -+cupsd_timeout_t * /* O - Next enabled timeout or NULL */ -+cupsdNextTimeout(long *delay) /* O - Seconds before scheduled */ -+{ -+ cupsd_timeout_t *first = cupsArrayFirst (Timeouts); -+ struct timeval curtime; -+ -+ if (first && !first->enabled) -+ first = NULL; -+ -+ if (first && delay) -+ { -+ gettimeofday (&curtime, NULL); -+ if (avahi_timeval_compare (&curtime, &first->when) > 0) -+ { -+ *delay = 0; -+ } else { -+ *delay = 1 + first->when.tv_sec - curtime.tv_sec; -+ if (first->when.tv_usec < curtime.tv_usec) -+ (*delay)--; -+ } -+ } -+ -+ return (first); -+} -+ -+ -+/* -+ * 'cupsdRunTimeout()' - Run a timed callback. -+ */ -+ -+void -+cupsdRunTimeout(cupsd_timeout_t *timeout) /* I - Timeout */ -+{ -+ timeout->enabled = 0; -+ timeout->callback (timeout, timeout->data); -+} -+ -+/* -+ * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it. -+ */ -+ -+void -+cupsdUpdateTimeout(cupsd_timeout_t *timeout, /* I - Timeout */ -+ const struct timeval *tv) /* I - Absolute time or NULL */ -+{ -+ cupsArrayRemove (Timeouts, timeout); -+ timeout->enabled = (tv != NULL); -+ if (tv) -+ { -+ timeout->when.tv_sec = tv->tv_sec; -+ timeout->when.tv_usec = tv->tv_usec; -+ } -+ cupsArrayAdd (Timeouts, timeout); -+} -+ -+ -+/* -+ * 'cupsdRemoveTimeout()' - Discard a timed callback. -+ */ -+ -+void -+cupsdRemoveTimeout(cupsd_timeout_t *timeout) /* I - Timeout */ -+{ -+ cupsArrayRemove (Timeouts, timeout); -+ free (timeout); -+} -+ -+ -+#endif /* HAVE_AVAHI ... from top of file */ -+ -+/* -+ * End of "$Id$". -+ */ diff --git a/cups/patches/cups-banners.patch b/cups/patches/cups-banners.patch deleted file mode 100644 index 6907c91..0000000 --- a/cups/patches/cups-banners.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cups-1.2rc2/scheduler/banners.c.banners 2006-04-19 16:12:07.000000000 +0100 -+++ cups-1.2rc2/scheduler/banners.c 2006-04-19 16:12:42.000000000 +0100 -@@ -119,6 +119,8 @@ - if ((ext = strrchr(dent->filename, '.')) != NULL) - if (!strcmp(ext, ".bck") || - !strcmp(ext, ".bak") || -+ !strcmp(ext, ".rpmnew") || -+ !strcmp(ext, ".rpmsave") || - !strcmp(ext, ".sav")) - continue; - diff --git a/cups/patches/cups-build.patch b/cups/patches/cups-build.patch deleted file mode 100644 index 727deb2..0000000 --- a/cups/patches/cups-build.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up cups-1.4rc1/Makedefs.in.build cups-1.4rc1/Makedefs.in ---- cups-1.4rc1/Makedefs.in.build 2009-05-27 00:27:06.000000000 +0100 -+++ cups-1.4rc1/Makedefs.in 2009-06-17 11:18:27.185443255 +0100 -@@ -124,7 +124,7 @@ ARFLAGS = @ARFLAGS@ - BACKLIBS = @BACKLIBS@ - BANNERTOPS = @BANNERTOPS@ - CFLAGS = @CPPFLAGS@ @CFLAGS@ --COMMONLIBS = @LIBS@ -+COMMONLIBS = @LIBS@ $(DNSSDLIBS) - CUPSDLIBS = @CUPSDLIBS@ - CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ - CXXLIBS = @CXXLIBS@ -diff -up cups-1.4rc1/scheduler/dirsvc.c.build cups-1.4rc1/scheduler/dirsvc.c ---- cups-1.4rc1/scheduler/dirsvc.c.build 2009-05-14 18:54:37.000000000 +0100 -+++ cups-1.4rc1/scheduler/dirsvc.c 2009-06-17 11:23:23.366318546 +0100 -@@ -2042,7 +2042,7 @@ cupsdUpdateDNSSDName(void) - - WebIFRef = DNSSDRef; - if ((error = DNSServiceRegister(&WebIFRef, -- kDNSServiceFlagsShareConnection, -+ 0, - 0, webif, "_http._tcp", NULL, - NULL, htons(DNSSDPort), 7, - "\006path=/", dnssdRegisterCallback, -@@ -2765,7 +2765,7 @@ dnssdRegisterPrinter(cupsd_printer_t *p) - do - { - p->ipp_ref = DNSSDRef; -- if ((se = DNSServiceRegister(&p->ipp_ref, kDNSServiceFlagsShareConnection, -+ if ((se = DNSServiceRegister(&p->ipp_ref, 0, - 0, name, regtype, NULL, NULL, - htons(DNSSDPort), ipp_len, ipp_txt, - dnssdRegisterCallback, -@@ -2854,7 +2854,7 @@ dnssdRegisterPrinter(cupsd_printer_t *p) - - p->printer_ref = DNSSDRef; - if ((se = DNSServiceRegister(&p->printer_ref, -- kDNSServiceFlagsShareConnection, -+ 0, - 0, name, "_printer._tcp", NULL, NULL, - htons(515), printer_len, printer_txt, - dnssdRegisterCallback, diff --git a/cups/patches/cups-cups-get-classes.patch b/cups/patches/cups-cups-get-classes.patch deleted file mode 100644 index 196f5f1..0000000 --- a/cups/patches/cups-cups-get-classes.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -up cups-1.4rc1/cups/dest.c.cups-get-classes cups-1.4rc1/cups/dest.c ---- cups-1.4rc1/cups/dest.c.cups-get-classes 2009-05-13 22:39:17.000000000 +0100 -+++ cups-1.4rc1/cups/dest.c 2009-07-28 22:17:40.285709944 +0100 -@@ -1735,6 +1735,7 @@ cups_get_sdests(http_t *http, /* I - char uri[1024]; /* printer-uri value */ - int num_options; /* Number of options */ - cups_option_t *options; /* Options */ -+ int get_classes; /* Whether we need to fetch class */ - #ifdef __APPLE__ - char media_default[41]; /* Default paper size */ - #endif /* __APPLE__ */ -@@ -1791,6 +1792,8 @@ cups_get_sdests(http_t *http, /* I - * printer-uri [for IPP_GET_PRINTER_ATTRIBUTES] - */ - -+ get_classes = (op == CUPS_GET_PRINTERS); -+ - request = ippNewRequest(op); - - ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, -@@ -1848,6 +1851,23 @@ cups_get_sdests(http_t *http, /* I - attr->value_tag != IPP_TAG_URI) - continue; - -+ if (get_classes && -+ -+ /* Is this a class? */ -+ ((attr->value_tag == IPP_TAG_ENUM && -+ !strcmp(attr->name, "printer-type") && -+ (attr->values[0].integer & CUPS_PRINTER_CLASS)) || -+ -+ /* Or, is this an attribute from CUPS 1.2 or later? */ -+ !strcmp(attr->name, "auth-info-required") || -+ !strncmp(attr->name, "marker-", 7) || -+ !strcmp(attr->name, "printer-commands") || -+ !strcmp(attr->name, "printer-is-shared"))) -+ /* We are talking to a recent enough CUPS server that -+ * CUPS_GET_PRINTERS returns classes as well. -+ */ -+ get_classes = 0; -+ - if (!strcmp(attr->name, "auth-info-required") || - !strcmp(attr->name, "device-uri") || - !strcmp(attr->name, "marker-change-time") || -@@ -1939,6 +1959,28 @@ cups_get_sdests(http_t *http, /* I - continue; - } - -+ /* -+ * If we sent a CUPS_GET_CLASSES request, check whether -+ * CUPS_GET_PRINTERS already gave us this destination and exit -+ * early if so. -+ */ -+ -+ if (op == CUPS_GET_CLASSES) -+ { -+ int diff; -+ cups_find_dest (printer_name, NULL, num_dests, *dests, 0, &diff); -+ if (diff == 0) -+ { -+ /* -+ * Found it. The CUPS server already gave us the classes in -+ * its CUPS_GET_PRINTERS response. -+ */ -+ -+ cupsFreeOptions(num_options, options); -+ break; -+ } -+ } -+ - if ((dest = cups_add_dest(printer_name, NULL, &num_dests, dests)) != NULL) - { - dest->num_options = num_options; -@@ -1955,6 +1997,16 @@ cups_get_sdests(http_t *http, /* I - } - - /* -+ * If this is a CUPS_GET_PRINTERS request but we didn't see any -+ * classes we might be talking to an older CUPS server that requires -+ * CUPS_GET_CLASSES as well. -+ */ -+ -+ if (get_classes) -+ num_dests = cups_get_sdests (http, CUPS_GET_CLASSES, name, -+ num_dests, dests); -+ -+ /* - * Return the count... - */ - diff --git a/cups/patches/cups-direct-usb.patch b/cups/patches/cups-direct-usb.patch deleted file mode 100644 index 2724fad..0000000 --- a/cups/patches/cups-direct-usb.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up cups-1.3.7/backend/usb-unix.c.direct-usb cups-1.3.7/backend/usb-unix.c ---- cups-1.3.7/backend/usb-unix.c.direct-usb 2008-03-26 16:02:45.000000000 +0000 -+++ cups-1.3.7/backend/usb-unix.c 2008-07-15 13:25:56.000000000 +0100 -@@ -94,6 +94,9 @@ print_device(const char *uri, /* I - De - strncasecmp(hostname, "Minolta", 7); - #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */ - -+ if (use_bc && !strncmp(uri, "usb:/dev/", 9)) -+ use_bc = 0; -+ - if ((device_fd = open_device(uri, &use_bc)) == -1) - { - if (getenv("CLASS") != NULL) -@@ -320,12 +323,7 @@ open_device(const char *uri, /* I - Dev - if (!strncmp(uri, "usb:/dev/", 9)) - #ifdef __linux - { -- /* -- * Do not allow direct devices anymore... -- */ -- -- errno = ENODEV; -- return (-1); -+ return (open(uri + 4, O_RDWR | O_EXCL)); - } - else if (!strncmp(uri, "usb://", 6)) - { diff --git a/cups/patches/cups-dnssd-deviceid.patch b/cups/patches/cups-dnssd-deviceid.patch deleted file mode 100644 index abb8366..0000000 --- a/cups/patches/cups-dnssd-deviceid.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up cups-1.4.3/backend/dnssd.c.dnssd-deviceid.patch cups-1.4.3/backend/dnssd.c ---- cups-1.4.3/backend/dnssd.c.dnssd-deviceid.patch 2010-04-16 19:36:12.226148774 +0100 -+++ cups-1.4.3/backend/dnssd.c 2010-04-16 19:39:53.314148240 +0100 -@@ -1192,15 +1192,22 @@ find_device (cups_array_t *devices, - if (device->device_id) - free(device->device_id); - -+ if (device_id[0]) -+ { -+ /* Mark this as the real device ID. */ -+ ptr = device_id + strlen(device_id); -+ snprintf(ptr, sizeof(device_id) - (ptr - device_id), "FZY:0;"); -+ } -+ - if (!device_id[0] && strcmp(model, "Unknown")) - { - if (make_and_model[0]) -- snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;", -+ snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;", - make_and_model, model); - else if (!strncasecmp(model, "designjet ", 10)) -- snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s", model + 10); -+ snprintf(device_id, sizeof(device_id), "MFG:HP;MDL:%s;FZY:1;", model + 10); - else if (!strncasecmp(model, "stylus ", 7)) -- snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s", model + 7); -+ snprintf(device_id, sizeof(device_id), "MFG:EPSON;MDL:%s;FZY:1;", model + 7); - else if ((ptr = strchr(model, ' ')) != NULL) - { - /* -@@ -1210,7 +1217,7 @@ find_device (cups_array_t *devices, - memcpy(make_and_model, model, ptr - model); - make_and_model[ptr - model] = '\0'; - -- snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s", -+ snprintf(device_id, sizeof(device_id), "MFG:%s;MDL:%s;FZY:1;", - make_and_model, ptr + 1); - } - } diff --git a/cups/patches/cups-driverd-timeout.patch b/cups/patches/cups-driverd-timeout.patch deleted file mode 100644 index 222fb09..0000000 --- a/cups/patches/cups-driverd-timeout.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up cups-1.3.7/scheduler/ipp.c.driverd-timeout cups-1.3.7/scheduler/ipp.c ---- cups-1.3.7/scheduler/ipp.c.driverd-timeout 2008-07-15 13:40:51.000000000 +0100 -+++ cups-1.3.7/scheduler/ipp.c 2008-07-15 13:40:51.000000000 +0100 -@@ -4293,7 +4293,7 @@ copy_model(cupsd_client_t *con, /* I - - close(temppipe[1]); - - /* -- * Wait up to 30 seconds for the PPD file to be copied... -+ * Wait up to 70 seconds for the PPD file to be copied... - */ - - total = 0; -@@ -4315,7 +4315,7 @@ copy_model(cupsd_client_t *con, /* I - - FD_SET(temppipe[0], &input); - FD_SET(CGIPipes[0], &input); - -- timeout.tv_sec = 30; -+ timeout.tv_sec = 70; - timeout.tv_usec = 0; - - if ((i = select(maxfd, &input, NULL, NULL, &timeout)) < 0) diff --git a/cups/patches/cups-eggcups.patch b/cups/patches/cups-eggcups.patch deleted file mode 100644 index fde1e07..0000000 --- a/cups/patches/cups-eggcups.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -up cups-1.4b1/backend/ipp.c.eggcups cups-1.4b1/backend/ipp.c ---- cups-1.4b1/backend/ipp.c.eggcups 2008-10-15 19:27:45.000000000 +0100 -+++ cups-1.4b1/backend/ipp.c 2008-11-11 15:43:30.000000000 +0000 -@@ -51,6 +51,70 @@ static char pstmpname[1024] = ""; /* Tem - static char tmpfilename[1024] = ""; /* Temporary spool file name */ - static int job_cancelled = 0; /* Job cancelled? */ - -+#if HAVE_DBUS -+#include <dbus/dbus.h> -+ -+static DBusConnection *dbus_connection = NULL; -+ -+static int -+init_dbus (void) -+{ -+ DBusConnection *connection; -+ DBusError error; -+ -+ if (dbus_connection && -+ !dbus_connection_get_is_connected (dbus_connection)) { -+ dbus_connection_unref (dbus_connection); -+ dbus_connection = NULL; -+ } -+ -+ dbus_error_init (&error); -+ connection = dbus_bus_get (getuid () ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &error); -+ if (connection == NULL) { -+ dbus_error_free (&error); -+ return -1; -+ } -+ -+ dbus_connection = connection; -+ return 0; -+} -+ -+int -+dbus_broadcast_queued_remote (const char *printer_uri, -+ ipp_status_t status, -+ unsigned int local_job_id, -+ unsigned int remote_job_id, -+ const char *username, -+ const char *printer_name) -+{ -+ DBusMessage *message; -+ DBusMessageIter iter; -+ const char *errstr; -+ -+ if (!dbus_connection || !dbus_connection_get_is_connected (dbus_connection)) { -+ if (init_dbus () || !dbus_connection) -+ return -1; -+ } -+ -+ errstr = ippErrorString (status); -+ message = dbus_message_new_signal ("/com/redhat/PrinterSpooler", -+ "com.redhat.PrinterSpooler", -+ "JobQueuedRemote"); -+ dbus_message_iter_init_append (message, &iter); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &printer_uri); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &errstr); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &local_job_id); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &remote_job_id); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &username); -+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &printer_name); -+ -+ dbus_connection_send (dbus_connection, message, NULL); -+ dbus_connection_flush (dbus_connection); -+ dbus_message_unref (message); -+ -+ return 0; -+} -+#endif /* HAVE_DBUS */ - - /* - * Local functions... -@@ -1058,6 +1122,15 @@ main(int argc, /* I - Number of comm - job_id); - } - -+#if HAVE_DBUS -+ dbus_broadcast_queued_remote (argv[0], -+ ipp_status, -+ atoi (argv[1]), -+ job_id, -+ argv[2], -+ getenv ("PRINTER")); -+#endif /* HAVE_DBUS */ -+ - ippDelete(response); - - if (job_cancelled) -diff -up cups-1.4b1/backend/Makefile.eggcups cups-1.4b1/backend/Makefile ---- cups-1.4b1/backend/Makefile.eggcups 2008-10-06 22:08:27.000000000 +0100 -+++ cups-1.4b1/backend/Makefile 2008-11-11 15:45:31.000000000 +0000 -@@ -188,7 +188,7 @@ dnssd: dnssd.o ../cups/$(LIBCUPS) libbac - - ipp: ipp.o ../cups/$(LIBCUPS) libbackend.a - echo Linking $@... -- $(CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS) -+ $(CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS) $(CUPSDLIBS) - $(RM) http - $(LN) ipp http - -diff -up cups-1.4b1/scheduler/subscriptions.c.eggcups cups-1.4b1/scheduler/subscriptions.c ---- cups-1.4b1/scheduler/subscriptions.c.eggcups 2008-08-01 22:11:55.000000000 +0100 -+++ cups-1.4b1/scheduler/subscriptions.c 2008-11-11 15:43:30.000000000 +0000 -@@ -1302,13 +1302,13 @@ cupsd_send_dbus(cupsd_eventmask_t event, - what = "PrinterAdded"; - else if (event & CUPSD_EVENT_PRINTER_DELETED) - what = "PrinterRemoved"; -- else if (event & CUPSD_EVENT_PRINTER_CHANGED) -- what = "QueueChanged"; - else if (event & CUPSD_EVENT_JOB_CREATED) - what = "JobQueuedLocal"; - else if ((event & CUPSD_EVENT_JOB_STATE) && job && - job->state_value == IPP_JOB_PROCESSING) - what = "JobStartedLocal"; -+ else if (event & (CUPSD_EVENT_PRINTER_CHANGED|CUPSD_EVENT_JOB_STATE_CHANGED|CUPSD_EVENT_PRINTER_STATE_CHANGED)) -+ what = "QueueChanged"; - else - return; - -@@ -1344,7 +1344,7 @@ cupsd_send_dbus(cupsd_eventmask_t event, - dbus_message_append_iter_init(message, &iter); - if (dest) - dbus_message_iter_append_string(&iter, dest->name); -- if (job) -+ if (job && strcmp (what, "QueueChanged") != 0) - { - dbus_message_iter_append_uint32(&iter, job->id); - dbus_message_iter_append_string(&iter, job->username); diff --git a/cups/patches/cups-filter-debug.patch b/cups/patches/cups-filter-debug.patch deleted file mode 100644 index 38053e6..0000000 --- a/cups/patches/cups-filter-debug.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up cups-1.4rc1/scheduler/job.c.filter-debug cups-1.4rc1/scheduler/job.c ---- cups-1.4rc1/scheduler/job.c.filter-debug 2009-06-23 18:10:57.125572911 +0100 -+++ cups-1.4rc1/scheduler/job.c 2009-06-23 18:11:31.495572481 +0100 -@@ -544,10 +544,28 @@ cupsdContinueJob(cupsd_job_t *job) /* I - - if (!filters) - { -+ mime_filter_t *current; -+ - cupsdLogJob(job, CUPSD_LOG_ERROR, - "Unable to convert file %d to printable format!", - job->current_file); - -+ cupsdLogJob(job, CUPSD_LOG_ERROR, -+ "Required: %s/%s -> %s/%s", -+ job->filetypes[job->current_file]->super, -+ job->filetypes[job->current_file]->type, -+ job->printer->filetype->super, -+ job->printer->filetype->type); -+ -+ for (current = (mime_filter_t *)cupsArrayFirst(MimeDatabase->srcs); -+ current; -+ current = (mime_filter_t *)cupsArrayNext(MimeDatabase->srcs)) -+ cupsdLogJob(job, CUPSD_LOG_ERROR, -+ "Available: %s/%s -> %s/%s (%s)", -+ current->src->super, current->src->type, -+ current->dst->super, current->dst->type, -+ current->filter); -+ - abort_message = "Aborting job because it cannot be printed."; - abort_state = IPP_JOB_ABORTED; - diff --git a/cups/patches/cups-force-gnutls.patch b/cups/patches/cups-force-gnutls.patch deleted file mode 100644 index 85adaa8..0000000 --- a/cups/patches/cups-force-gnutls.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -up cups-1.4.4/config-scripts/cups-ssl.m4.force-gnutls cups-1.4.4/config-scripts/cups-ssl.m4 ---- cups-1.4.4/config-scripts/cups-ssl.m4.force-gnutls 2010-09-15 16:49:22.343502552 +0100 -+++ cups-1.4.4/config-scripts/cups-ssl.m4 2010-09-15 16:49:42.347502595 +0100 -@@ -65,23 +65,21 @@ if test x$enable_ssl != xno; then - if $PKGCONFIG --exists gnutls; then - if test "x$have_pthread" = xyes; then - AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.]) -- else -- have_ssl=1 -- SSLLIBS=`$PKGCONFIG --libs gnutls` -- SSLFLAGS=`$PKGCONFIG --cflags gnutls` -- AC_DEFINE(HAVE_SSL) -- AC_DEFINE(HAVE_GNUTLS) - fi -+ have_ssl=1 -+ SSLLIBS=`$PKGCONFIG --libs gnutls` -+ SSLFLAGS=`$PKGCONFIG --cflags gnutls` -+ AC_DEFINE(HAVE_SSL) -+ AC_DEFINE(HAVE_GNUTLS) - elif test "x$LIBGNUTLSCONFIG" != x; then - if test "x$have_pthread" = xyes; then - AC_MSG_WARN([The current version of GNU TLS cannot be made thread-safe.]) -- else -- have_ssl=1 -- SSLLIBS=`$LIBGNUTLSCONFIG --libs` -- SSLFLAGS=`$LIBGNUTLSCONFIG --cflags` -- AC_DEFINE(HAVE_SSL) -- AC_DEFINE(HAVE_GNUTLS) - fi -+ have_ssl=1 -+ SSLLIBS=`$LIBGNUTLSCONFIG --libs` -+ SSLFLAGS=`$LIBGNUTLSCONFIG --cflags` -+ AC_DEFINE(HAVE_SSL) -+ AC_DEFINE(HAVE_GNUTLS) - fi - - if test $have_ssl = 1; then -diff -up cups-1.4.4/configure.force-gnutls cups-1.4.4/configure ---- cups-1.4.4/configure.force-gnutls 2010-06-17 19:25:47.000000000 +0100 -+++ cups-1.4.4/configure 2010-09-15 16:50:01.689503165 +0100 -@@ -17542,36 +17542,34 @@ fi - if test "x$have_pthread" = xyes; then - { echo "$as_me:$LINENO: WARNING: The current version of GNU TLS cannot be made thread-safe." >&5 - echo "$as_me: WARNING: The current version of GNU TLS cannot be made thread-safe." >&2;} -- else -- have_ssl=1 -- SSLLIBS=`$PKGCONFIG --libs gnutls` -- SSLFLAGS=`$PKGCONFIG --cflags gnutls` -- cat >>confdefs.h <<\_ACEOF -+ fi -+ have_ssl=1 -+ SSLLIBS=`$PKGCONFIG --libs gnutls` -+ SSLFLAGS=`$PKGCONFIG --cflags gnutls` -+ cat >>confdefs.h <<\_ACEOF - #define HAVE_SSL 1 - _ACEOF - -- cat >>confdefs.h <<\_ACEOF -+ cat >>confdefs.h <<\_ACEOF - #define HAVE_GNUTLS 1 - _ACEOF - -- fi - elif test "x$LIBGNUTLSCONFIG" != x; then - if test "x$have_pthread" = xyes; then - { echo "$as_me:$LINENO: WARNING: The current version of GNU TLS cannot be made thread-safe." >&5 - echo "$as_me: WARNING: The current version of GNU TLS cannot be made thread-safe." >&2;} -- else -- have_ssl=1 -- SSLLIBS=`$LIBGNUTLSCONFIG --libs` -- SSLFLAGS=`$LIBGNUTLSCONFIG --cflags` -- cat >>confdefs.h <<\_ACEOF -+ fi -+ have_ssl=1 -+ SSLLIBS=`$LIBGNUTLSCONFIG --libs` -+ SSLFLAGS=`$LIBGNUTLSCONFIG --cflags` -+ cat >>confdefs.h <<\_ACEOF - #define HAVE_SSL 1 - _ACEOF - -- cat >>confdefs.h <<\_ACEOF -+ cat >>confdefs.h <<\_ACEOF - #define HAVE_GNUTLS 1 - _ACEOF - -- fi - fi - - if test $have_ssl = 1; then diff --git a/cups/patches/cups-getpass.patch b/cups/patches/cups-getpass.patch deleted file mode 100644 index 1c1da96..0000000 --- a/cups/patches/cups-getpass.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up cups-1.4.4/cups/usersys.c.getpass cups-1.4.4/cups/usersys.c ---- cups-1.4.4/cups/usersys.c.getpass 2010-03-30 23:07:33.000000000 +0100 -+++ cups-1.4.4/cups/usersys.c 2010-06-18 09:38:08.368096897 +0100 -@@ -41,6 +41,8 @@ - #include "globals.h" - #include <stdlib.h> - #include <sys/stat.h> -+#include <termios.h> -+#include <signal.h> - #ifdef WIN32 - # include <windows.h> - #else -@@ -406,7 +408,29 @@ _cupsGetPassword(const char *prompt) /* - * Use the standard getpass function to get a password from the console. - */ - -- return (getpass(prompt)); -+ static char password[100]; -+ struct termios oldtio, newtio; -+ sigset_t oldset, newset; -+ int nread; -+ sigprocmask (SIG_BLOCK, NULL, &newset); -+ sigaddset (&newset, SIGINT); -+ sigaddset (&newset, SIGTSTP); -+ sigprocmask (SIG_BLOCK, &newset, &oldset); -+ tcgetattr (STDIN_FILENO, &oldtio); -+ newtio = oldtio; -+ newtio.c_lflag &= ~ECHO; -+ tcsetattr (STDIN_FILENO, TCSAFLUSH, &newtio); -+ fputs (prompt, stdout); -+ fflush (stdout); -+ nread = read (STDIN_FILENO, password, sizeof (password)); -+ tcsetattr (STDIN_FILENO, TCSAFLUSH, &oldtio); -+ fputc ('\n', stdout); -+ sigprocmask (SIG_SETMASK, &oldset, NULL); -+ if (nread > 0) -+ password[nread - 1] = '\0'; -+ else -+ password[0] ='\0'; -+ return password; - #endif /* WIN32 */ - } - diff --git a/cups/patches/cups-hostnamelookups.patch b/cups/patches/cups-hostnamelookups.patch deleted file mode 100644 index 75b6abf..0000000 --- a/cups/patches/cups-hostnamelookups.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up cups-1.4.4/scheduler/network.c.hostnamelookups cups-1.4.4/scheduler/network.c ---- cups-1.4.4/scheduler/network.c.hostnamelookups 2010-04-09 23:42:09.000000000 +0100 -+++ cups-1.4.4/scheduler/network.c 2010-06-18 11:13:02.331979867 +0100 -@@ -154,11 +154,7 @@ cupsdNetIFUpdate(void) - * Try looking up the hostname for the address as needed... - */ - --#ifdef __APPLE__ - if (HostNameLookups) --#else -- if (HostNameLookups || RemotePort) --#endif /* __APPLE__ */ - httpAddrLookup((http_addr_t *)(addr->ifa_addr), hostname, - sizeof(hostname)); - else -@@ -166,7 +162,7 @@ cupsdNetIFUpdate(void) - /* - * Map the default server address and localhost to the server name - * and localhost, respectively; for all other addresses, use the -- * dotted notation... -+ * numeric address... - */ - - if (httpAddrLocalhost((http_addr_t *)(addr->ifa_addr))) diff --git a/cups/patches/cups-hp-deviceid-oid.patch b/cups/patches/cups-hp-deviceid-oid.patch deleted file mode 100644 index 29f0781..0000000 --- a/cups/patches/cups-hp-deviceid-oid.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up cups-1.4.3/backend/snmp.c.hp-deviceid-oid cups-1.4.3/backend/snmp.c ---- cups-1.4.3/backend/snmp.c.hp-deviceid-oid 2009-12-08 02:13:42.000000000 +0000 -+++ cups-1.4.3/backend/snmp.c 2010-04-13 15:00:26.486148914 +0100 -@@ -194,6 +194,7 @@ static const int UriOID[] = { CUPS_OID_p - static const int LexmarkProductOID[] = { 1,3,6,1,4,1,641,2,1,2,1,2,1,-1 }; - static const int LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 }; - static const int LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 }; -+static const int HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 }; - static const int XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 }; - static cups_array_t *DeviceURIs = NULL; - static int HostNameLookups = 0; -@@ -1003,6 +1004,9 @@ read_snmp_response(int fd) /* I - SNMP - _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, - packet.community, CUPS_ASN1_GET_REQUEST, - DEVICE_PRODUCT, XeroxProductOID); -+ _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, -+ packet.community, CUPS_ASN1_GET_REQUEST, -+ DEVICE_ID, HPDeviceIdOID); - break; - - case DEVICE_DESCRIPTION : diff --git a/cups/patches/cups-logrotate.patch b/cups/patches/cups-logrotate.patch deleted file mode 100644 index 559cbdc..0000000 --- a/cups/patches/cups-logrotate.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up cups-1.3.5/scheduler/log.c.logrotate cups-1.3.5/scheduler/log.c ---- cups-1.3.5/scheduler/log.c.logrotate 2008-02-14 12:21:25.000000000 +0000 -+++ cups-1.3.5/scheduler/log.c 2008-02-14 12:24:16.000000000 +0000 -@@ -29,6 +29,9 @@ - #include "cupsd.h" - #include <stdarg.h> - #include <syslog.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <unistd.h> - - - /* -@@ -467,12 +470,10 @@ check_log_file(cups_file_t **lf, /* IO - - return (1); - - /* -- * Format the filename as needed... -+ * Format the filename... - */ - -- if (!*lf || -- (strncmp(logname, "/dev/", 5) && cupsFileTell(*lf) > MaxLogSize && -- MaxLogSize > 0)) -+ if (strncmp(logname, "/dev/", 5)) - { - /* - * Handle format strings... -@@ -565,6 +566,34 @@ check_log_file(cups_file_t **lf, /* IO - - } - - /* -+ * Has someone else (i.e. logrotate) already rotated the log for us? -+ */ -+ else if (strncmp(filename, "/dev/", 5)) -+ { -+ struct stat st; -+ if (stat(filename, &st) || st.st_size == 0) -+ { -+ /* File is either missing or has zero size. */ -+ -+ cupsFileClose(*lf); -+ if ((*lf = cupsFileOpen(filename, "a")) == NULL) -+ { -+ syslog(LOG_ERR, "Unable to open log file \"%s\" - %s", filename, -+ strerror(errno)); -+ -+ return (0); -+ } -+ -+ /* -+ * Change ownership and permissions of non-device logs... -+ */ -+ -+ fchown(cupsFileNumber(*lf), RunUser, Group); -+ fchmod(cupsFileNumber(*lf), LogFilePerm); -+ } -+ } -+ -+ /* - * Do we need to rotate the log? - */ - diff --git a/cups/patches/cups-lpr-help.patch b/cups/patches/cups-lpr-help.patch deleted file mode 100644 index 1a68297..0000000 --- a/cups/patches/cups-lpr-help.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -up cups-1.4b1/berkeley/lpr.c.lpr-help cups-1.4b1/berkeley/lpr.c ---- cups-1.4b1/berkeley/lpr.c.lpr-help 2008-07-11 23:46:21.000000000 +0100 -+++ cups-1.4b1/berkeley/lpr.c 2008-11-11 16:20:32.000000000 +0000 -@@ -30,6 +30,31 @@ - #include <cups/i18n.h> - - -+static void -+usage (const char *name) -+{ -+ _cupsLangPrintf(stdout, -+"Usage: %s [OPTION] [ file(s) ]\n" -+"Print files.\n\n" -+" -E force encryption\n" -+" -H server[:port] specify alternate server\n" -+" -C title, -J title, -T title\n" -+" set the job name\n\n" -+" -P destination/instance print to named printer\n" -+" -U username specify alternate username\n" -+" -# num-copies set number of copies\n" -+" -h disable banner printing\n" -+" -l print without filtering\n" -+" -m send email on completion\n" -+" -o option[=value] set a job option\n" -+" -p format text file with header\n" -+" -q hold job for printing\n" -+" -r delete files after printing\n" -+"\nWith no file given, read standard input.\n" -+, name); -+} -+ -+ - /* - * 'main()' - Parse options and send files for printing. - */ -@@ -54,7 +79,6 @@ main(int argc, /* I - Number of comm - int deletefile; /* Delete file after print? */ - char buffer[8192]; /* Copy buffer */ - -- - _cupsSetLocale(argv); - - deletefile = 0; -@@ -282,6 +306,12 @@ main(int argc, /* I - Number of comm - break; - - default : -+ if (!strcmp (argv[i], "--help")) -+ { -+ usage (argv[0]); -+ return (0); -+ } -+ - _cupsLangPrintf(stderr, - _("%s: Error - unknown option \'%c\'!\n"), - argv[0], argv[i][1]); diff --git a/cups/patches/cups-multilib.patch b/cups/patches/cups-multilib.patch deleted file mode 100644 index 21db4cb..0000000 --- a/cups/patches/cups-multilib.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- cups-1.2.3/cups-config.in.multilib 2006-08-03 01:54:38.000000000 +0100 -+++ cups-1.2.3/cups-config.in 2006-08-30 15:47:35.000000000 +0100 -@@ -30,8 +30,10 @@ - exec_prefix=@exec_prefix@ - bindir=@bindir@ - includedir=@includedir@ --libdir=@libdir@ --imagelibdir=@libdir@ -+# Fetch libdir from gnutls's pkg-config script. This is a bit -+# of a cheat, but the cups-devel package requires gnutls-devel anyway. -+libdir=`pkg-config --variable=libdir gnutls` -+imagelibdir=`pkg-config --variable=libdir gnutls` - datarootdir=@datadir@ - datadir=@datadir@ - sysconfdir=@sysconfdir@ diff --git a/cups/patches/cups-no-export-ssllibs.patch b/cups/patches/cups-no-export-ssllibs.patch deleted file mode 100644 index 9effc8e..0000000 --- a/cups/patches/cups-no-export-ssllibs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up cups-1.4b2-svn8404/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.4b2-svn8404/config-scripts/cups-ssl.m4 ---- cups-1.4b2-svn8404/config-scripts/cups-ssl.m4.no-export-ssllibs 2009-02-17 17:45:27.000000000 +0000 -+++ cups-1.4b2-svn8404/config-scripts/cups-ssl.m4 2009-03-05 11:12:59.000000000 +0000 -@@ -110,7 +110,7 @@ fi - AC_SUBST(SSLFLAGS) - AC_SUBST(SSLLIBS) - --EXPORT_SSLLIBS="$SSLLIBS" -+EXPORT_SSLLIBS="" - AC_SUBST(EXPORT_SSLLIBS) - - diff --git a/cups/patches/cups-no-gzip-man.patch b/cups/patches/cups-no-gzip-man.patch deleted file mode 100644 index 4a08503..0000000 --- a/cups/patches/cups-no-gzip-man.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up cups-1.4b2-svn8404/config-scripts/cups-manpages.m4.no-gzip-man cups-1.4b2-svn8404/config-scripts/cups-manpages.m4 ---- cups-1.4b2-svn8404/config-scripts/cups-manpages.m4.no-gzip-man 2009-01-16 08:58:42.000000000 +0000 -+++ cups-1.4b2-svn8404/config-scripts/cups-manpages.m4 2009-03-05 11:11:12.000000000 +0000 -@@ -69,10 +69,10 @@ case "$uname" in - ;; - Linux* | GNU* | Darwin*) - # Linux, GNU Hurd, and Mac OS X -- MAN1EXT=1.gz -- MAN5EXT=5.gz -- MAN7EXT=7.gz -- MAN8EXT=8.gz -+ MAN1EXT=1 -+ MAN5EXT=5 -+ MAN7EXT=7 -+ MAN8EXT=8 - MAN8DIR=8 - ;; - *) diff --git a/cups/patches/cups-page-label.patch b/cups/patches/cups-page-label.patch deleted file mode 100644 index 220b31d..0000000 --- a/cups/patches/cups-page-label.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -up cups-1.4.5/filter/pstops.c.page-label cups-1.4.5/filter/pstops.c ---- cups-1.4.5/filter/pstops.c.page-label 2010-08-31 20:36:08.000000000 +0200 -+++ cups-1.4.5/filter/pstops.c 2010-11-12 13:11:11.000000000 +0100 -@@ -108,6 +108,7 @@ typedef struct /**** Document informa - int num_options; /* Number of document-wide options */ - cups_option_t *options; /* Document-wide options */ - int normal_landscape, /* Normal rotation for landscape? */ -+ orientation, /* Original orientation of the document */ - saw_eof, /* Saw the %%EOF comment? */ - slow_collate, /* Collate copies by hand? */ - slow_duplex, /* Duplex pages slowly? */ -@@ -2083,7 +2084,7 @@ do_setup(pstops_doc_t *doc, /* I - Docu - * of the pages... - */ - -- if (Orientation & 1) -+ if (doc->orientation & 1) - write_label_prolog(doc, doc->page_label, PageBottom, - PageWidth - PageLength + PageTop, PageLength); - else -@@ -2091,7 +2092,30 @@ do_setup(pstops_doc_t *doc, /* I - Docu - PageLength); - } - else -- write_label_prolog(doc, doc->page_label, PageBottom, PageTop, PageWidth); -+ { -+ switch (doc->orientation) -+ { -+ case 0 : -+ write_label_prolog(doc, doc->page_label, PageBottom, PageTop, -+ PageWidth); -+ break; -+ -+ case 1 : -+ write_label_prolog(doc, doc->page_label, PageLeft, PageRight, -+ PageLength); -+ break; -+ -+ case 2 : -+ write_label_prolog(doc, doc->page_label, PageLength - PageTop, -+ PageLength - PageBottom, PageWidth); -+ break; -+ -+ case 3 : -+ write_label_prolog(doc, doc->page_label, PageWidth - PageRight, -+ PageWidth - PageLeft, PageLength); -+ break; -+ } -+ } - } - - -@@ -2176,7 +2200,7 @@ end_nup(pstops_doc_t *doc, /* I - Docum - case 1 : - if (doc->use_ESPshowpage) - { -- write_labels(doc, Orientation); -+ write_labels(doc, doc->orientation); - doc_puts(doc, "ESPshowpage\n"); - } - break; -@@ -2191,7 +2215,7 @@ end_nup(pstops_doc_t *doc, /* I - Docum - * Rotate the labels back to portrait... - */ - -- write_labels(doc, Orientation - 1); -+ write_labels(doc, doc->orientation - 1); - } - else if (Orientation == 0) - { -@@ -2217,7 +2241,7 @@ end_nup(pstops_doc_t *doc, /* I - Docum - default : - if (is_last_page(number) && doc->use_ESPshowpage) - { -- write_labels(doc, Orientation); -+ write_labels(doc, doc->orientation); - doc_puts(doc, "ESPshowpage\n"); - } - break; -@@ -2433,6 +2457,12 @@ set_pstops_options( - Orientation = 0; - - /* -+ * Save original orientation of the document -+ */ -+ -+ doc->orientation = Orientation; -+ -+ /* - * AP_FIRSTPAGE_* and the corresponding non-first-page options. - */ - diff --git a/cups/patches/cups-peercred.patch b/cups/patches/cups-peercred.patch deleted file mode 100644 index 4e579b4..0000000 --- a/cups/patches/cups-peercred.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up cups-1.3.5/scheduler/auth.c.peercred cups-1.3.5/scheduler/auth.c ---- cups-1.3.5/scheduler/auth.c.peercred 2008-02-05 16:52:20.000000000 +0000 -+++ cups-1.3.5/scheduler/auth.c 2008-02-05 18:20:06.000000000 +0000 -@@ -54,6 +54,7 @@ - * Include necessary headers... - */ - -+#define _GNU_SOURCE - #include "cupsd.h" - #include <grp.h> - #ifdef HAVE_SHADOW_H diff --git a/cups/patches/cups-pid.patch b/cups/patches/cups-pid.patch deleted file mode 100644 index ab4ff84..0000000 --- a/cups/patches/cups-pid.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- cups-1.1.21/scheduler/main.c.pid 2004-09-24 11:29:05.073748138 +0100 -+++ cups-1.1.21/scheduler/main.c 2004-09-24 11:44:35.826446564 +0100 -@@ -349,6 +349,8 @@ - * Setup signal handlers for the parent... - */ - -+ pid_t pid; -+ - #ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */ - sigset(SIGUSR1, parent_handler); - sigset(SIGCHLD, parent_handler); -@@ -372,7 +374,7 @@ - signal(SIGHUP, SIG_IGN); - #endif /* HAVE_SIGSET */ - -- if (fork() > 0) -+ if ((pid = fork()) > 0) - { - /* - * OK, wait for the child to startup and send us SIGUSR1 or to crash -@@ -384,7 +386,15 @@ - sleep(1); - - if (parent_signal == SIGUSR1) -+ { -+ FILE *f = fopen ("/var/run/cupsd.pid", "w"); -+ if (f) -+ { -+ fprintf (f, "%d\n", pid); -+ fclose (f); -+ } - return (0); -+ } - - if (wait(&i) < 0) - { diff --git a/cups/patches/cups-res_init.patch b/cups/patches/cups-res_init.patch deleted file mode 100644 index 22c75ba..0000000 --- a/cups/patches/cups-res_init.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up cups-1.4b2-svn8404/cups/http-addrlist.c.res_init cups-1.4b2-svn8404/cups/http-addrlist.c ---- cups-1.4b2-svn8404/cups/http-addrlist.c.res_init 2009-03-23 17:41:03.000000000 +0000 -+++ cups-1.4b2-svn8404/cups/http-addrlist.c 2009-03-23 17:41:26.000000000 +0000 -@@ -373,7 +373,7 @@ httpAddrGetList(const char *hostname, /* - - freeaddrinfo(results); - } -- else if (error == EAI_FAIL) -+ else if (error == EAI_FAIL || error == EAI_AGAIN || error == EAI_NODATA) - cg->need_res_init = 1; - - #else diff --git a/cups/patches/cups-ricoh-deviceid-oid.patch b/cups/patches/cups-ricoh-deviceid-oid.patch deleted file mode 100644 index 6a5b6a9..0000000 --- a/cups/patches/cups-ricoh-deviceid-oid.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up cups-1.4.3/backend/snmp.c.ricoh-deviceid-oid cups-1.4.3/backend/snmp.c ---- cups-1.4.3/backend/snmp.c.ricoh-deviceid-oid 2010-05-11 17:30:57.266120467 +0100 -+++ cups-1.4.3/backend/snmp.c 2010-05-11 17:31:16.267120141 +0100 -@@ -195,6 +195,7 @@ static const int LexmarkProductOID[] = { - static const int LexmarkProductOID2[] = { 1,3,6,1,4,1,674,10898,100,2,1,2,1,2,1,-1 }; - static const int LexmarkDeviceIdOID[] = { 1,3,6,1,4,1,641,2,1,2,1,3,1,-1 }; - static const int HPDeviceIdOID[] = { 1,3,6,1,4,1,11,2,3,9,1,1,7,0,-1 }; -+static const int RicohDeviceIdOID[] = { 1,3,6,1,4,1,367,3,2,1,1,1,11,0,-1 }; - static const int XeroxProductOID[] = { 1,3,6,1,4,1,128,2,1,3,1,2,0,-1 }; - static cups_array_t *DeviceURIs = NULL; - static int HostNameLookups = 0; -@@ -1002,6 +1003,9 @@ read_snmp_response(int fd) /* I - SNMP - packet.community, CUPS_ASN1_GET_REQUEST, - DEVICE_ID, LexmarkDeviceIdOID); - _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, -+ packet.community, CUPS_ASN1_GET_REQUEST, -+ DEVICE_ID, RicohDeviceIdOID); -+ _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, - packet.community, CUPS_ASN1_GET_REQUEST, - DEVICE_PRODUCT, XeroxProductOID); - _cupsSNMPWrite(fd, &(packet.address), CUPS_SNMP_VERSION_1, diff --git a/cups/patches/cups-serial.patch b/cups/patches/cups-serial.patch deleted file mode 100644 index 6e111f2..0000000 --- a/cups/patches/cups-serial.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up cups-1.4b2/backend/serial.c.serial cups-1.4b2/backend/serial.c ---- cups-1.4b2/backend/serial.c.serial 2008-12-16 16:25:02.000000000 +0000 -+++ cups-1.4b2/backend/serial.c 2008-12-16 16:25:21.000000000 +0000 -@@ -74,6 +74,7 @@ - #endif /* __APPLE__ */ - - #if defined(__linux) && defined(TIOCGSERIAL) -+# include <linux/types.h> - # include <linux/serial.h> - # include <linux/ioctl.h> - #endif /* __linux && TIOCGSERIAL */ diff --git a/cups/patches/cups-serialize-gnutls.patch b/cups/patches/cups-serialize-gnutls.patch deleted file mode 100644 index cdd82cb..0000000 --- a/cups/patches/cups-serialize-gnutls.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff -up cups-1.4.4/cups/http.c.serialize-gnutls cups-1.4.4/cups/http.c ---- cups-1.4.4/cups/http.c.serialize-gnutls 2010-09-17 13:37:01.858871762 +0100 -+++ cups-1.4.4/cups/http.c 2010-09-17 13:55:22.579871934 +0100 -@@ -149,7 +149,7 @@ static int http_write_ssl(http_t *http, - - # ifdef HAVE_GNUTLS - # ifdef HAVE_PTHREAD_H --GCRY_THREAD_OPTION_PTHREAD_IMPL; -+static pthread_mutex_t gnutls_lock; - # endif /* HAVE_PTHREAD_H */ - - # elif defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H) -@@ -1231,7 +1231,7 @@ httpInitialize(void) - */ - - # ifdef HAVE_PTHREAD_H -- gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); -+ pthread_mutex_init(&gnutls_lock, NULL); - # endif /* HAVE_PTHREAD_H */ - - /* -@@ -2228,6 +2228,7 @@ _httpWait(http_t *http, /* I - Connect - if (SSL_pending((SSL *)(http->tls))) - return (1); - # elif defined(HAVE_GNUTLS) -+ /* lock already held here... */ - if (gnutls_record_check_pending(((http_tls_t *)(http->tls))->session)) - return (1); - # elif defined(HAVE_CDSASSL) -@@ -2294,6 +2295,8 @@ int /* O - 1 if data is available, 0 - httpWait(http_t *http, /* I - Connection to server */ - int msec) /* I - Milliseconds to wait */ - { -+ int ret; -+ - /* - * First see if there is data in the buffer... - */ -@@ -2318,7 +2321,17 @@ httpWait(http_t *http, /* I - Connecti - * If not, check the SSL/TLS buffers and do a select() on the connection... - */ - -- return (_httpWait(http, msec, 1)); -+#if defined(HAVE_SSL) && defined(HAVE_GNUTLS) && defined(HAVE_PTHREAD_H) -+ pthread_mutex_lock(&gnutls_lock); -+#endif -+ -+ ret = _httpWait(http, msec, 1); -+ -+#if defined(HAVE_SSL) && defined(HAVE_GNUTLS) && defined(HAVE_PTHREAD_H) -+ pthread_mutex_unlock(&gnutls_lock); -+#endif -+ -+ return (ret); - } - - -@@ -2769,7 +2782,9 @@ http_read_ssl(http_t *http, /* I - Conn - ssize_t result; /* Return value */ - - -+ pthread_mutex_lock(&gnutls_lock); - result = gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len); -+ pthread_mutex_unlock(&gnutls_lock); - - if (result < 0 && !errno) - { -@@ -3085,6 +3100,7 @@ http_setup_ssl(http_t *http) /* I - Con - return (-1); - } - -+ pthread_mutex_lock(&gnutls_lock); - gnutls_certificate_allocate_credentials(credentials); - - gnutls_init(&(conn->session), GNUTLS_CLIENT); -@@ -3104,9 +3120,11 @@ http_setup_ssl(http_t *http) /* I - Con - free(credentials); - free(conn); - -+ pthread_mutex_unlock(&gnutls_lock); - return (-1); - } - -+ pthread_mutex_unlock(&gnutls_lock); - conn->credentials = credentials; - - # elif defined(HAVE_CDSASSL) -@@ -3196,9 +3214,11 @@ http_shutdown_ssl(http_t *http) /* I - - conn = (http_tls_t *)(http->tls); - credentials = (gnutls_certificate_client_credentials *)(conn->credentials); - -+ pthread_mutex_lock(&gnutls_lock); - gnutls_bye(conn->session, GNUTLS_SHUT_RDWR); - gnutls_deinit(conn->session); - gnutls_certificate_free_credentials(*credentials); -+ pthread_mutex_unlock(&gnutls_lock); - free(credentials); - free(conn); - -@@ -3445,7 +3465,9 @@ http_write_ssl(http_t *http, /* I - - # elif defined(HAVE_GNUTLS) - ssize_t result; /* Return value */ - -+ pthread_mutex_lock(&gnutls_lock); - result = gnutls_record_send(((http_tls_t *)(http->tls))->session, buf, len); -+ pthread_mutex_unlock(&gnutls_lock); - - if (result < 0 && !errno) - { diff --git a/cups/patches/cups-serverbin-compat.patch b/cups/patches/cups-serverbin-compat.patch deleted file mode 100644 index 44a7894..0000000 --- a/cups/patches/cups-serverbin-compat.patch +++ /dev/null @@ -1,194 +0,0 @@ -diff -up cups-1.4.4/scheduler/conf.c.serverbin-compat cups-1.4.4/scheduler/conf.c ---- cups-1.4.4/scheduler/conf.c.serverbin-compat 2010-04-23 19:56:34.000000000 +0100 -+++ cups-1.4.4/scheduler/conf.c 2010-09-15 13:20:41.339960335 +0100 -@@ -488,6 +488,9 @@ cupsdReadConfiguration(void) - cupsdClearString(&ServerName); - cupsdClearString(&ServerAdmin); - cupsdSetString(&ServerBin, CUPS_SERVERBIN); -+#ifdef __x86_64__ -+ cupsdSetString(&ServerBin_compat, "/usr/lib64/cups"); -+#endif /* __x86_64__ */ - cupsdSetString(&RequestRoot, CUPS_REQUESTS); - cupsdSetString(&CacheDir, CUPS_CACHEDIR); - cupsdSetString(&DataDir, CUPS_DATADIR); -@@ -1318,7 +1321,12 @@ cupsdReadConfiguration(void) - * Read the MIME type and conversion database... - */ - -+#ifdef __x86_64__ -+ snprintf(temp, sizeof(temp), "%s/filter:%s/filter", ServerBin, -+ ServerBin_compat); -+#else - snprintf(temp, sizeof(temp), "%s/filter", ServerBin); -+#endif - snprintf(mimedir, sizeof(mimedir), "%s/mime", DataDir); - - MimeDatabase = mimeLoadTypes(NULL, mimedir); -diff -up cups-1.4.4/scheduler/conf.h.serverbin-compat cups-1.4.4/scheduler/conf.h ---- cups-1.4.4/scheduler/conf.h.serverbin-compat 2010-04-23 19:56:34.000000000 +0100 -+++ cups-1.4.4/scheduler/conf.h 2010-09-15 13:20:41.340959464 +0100 -@@ -105,6 +105,10 @@ VAR char *ConfigurationFile VALUE(NULL) - /* Root directory for scheduler */ - *ServerBin VALUE(NULL), - /* Root directory for binaries */ -+#ifdef __x86_64__ -+ *ServerBin_compat VALUE(NULL), -+ /* Compat directory for binaries */ -+#endif /* __x86_64__ */ - *StateDir VALUE(NULL), - /* Root directory for state data */ - *RequestRoot VALUE(NULL), -diff -up cups-1.4.4/scheduler/env.c.serverbin-compat cups-1.4.4/scheduler/env.c ---- cups-1.4.4/scheduler/env.c.serverbin-compat 2009-06-15 18:13:52.000000000 +0100 -+++ cups-1.4.4/scheduler/env.c 2010-09-15 13:20:41.341959587 +0100 -@@ -87,8 +87,13 @@ cupsdInitEnv(void) - cupsdSetEnv("LD_LIBRARY_PATH", NULL); - cupsdSetEnv("LD_PRELOAD", NULL); - cupsdSetEnv("NLSPATH", NULL); -+#ifdef __x86_64__ -+ cupsdSetEnvf("PATH", "%s/filter:%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR -+ ":/bin:/usr/bin", ServerBin, ServerBin_compat); -+#else /* ! defined(__x86_64__) */ - cupsdSetEnvf("PATH", "%s/filter:" CUPS_BINDIR ":" CUPS_SBINDIR - ":/bin:/usr/bin", ServerBin); -+#endif - cupsdSetEnv("SERVER_ADMIN", ServerAdmin); - cupsdSetEnv("SHLIB_PATH", NULL); - cupsdSetEnv("SOFTWARE", CUPS_MINIMAL); -diff -up cups-1.4.4/scheduler/ipp.c.serverbin-compat cups-1.4.4/scheduler/ipp.c ---- cups-1.4.4/scheduler/ipp.c.serverbin-compat 2010-04-23 19:56:34.000000000 +0100 -+++ cups-1.4.4/scheduler/ipp.c 2010-09-15 13:20:41.359835378 +0100 -@@ -2615,9 +2615,18 @@ add_printer(cupsd_client_t *con, /* I - - * Could not find device in list! - */ - -+#ifdef __x86_64__ -+ snprintf(srcfile, sizeof(srcfile), "%s/backend/%s", ServerBin_compat, -+ scheme); -+ if (access(srcfile, X_OK)) -+ { -+#endif /* __x86_64__ */ - send_ipp_status(con, IPP_NOT_POSSIBLE, _("Bad device-uri scheme \"%s\"!"), - scheme); - return; -+#ifdef __x86_64__ -+ } -+#endif /* __x86_64__ */ - } - } - -diff -up cups-1.4.4/scheduler/job.c.serverbin-compat cups-1.4.4/scheduler/job.c ---- cups-1.4.4/scheduler/job.c.serverbin-compat 2010-03-30 23:07:33.000000000 +0100 -+++ cups-1.4.4/scheduler/job.c 2010-09-15 13:20:41.366836134 +0100 -@@ -972,8 +972,32 @@ cupsdContinueJob(cupsd_job_t *job) /* I - i ++, filter = (mime_filter_t *)cupsArrayNext(filters)) - { - if (filter->filter[0] != '/') -- snprintf(command, sizeof(command), "%s/filter/%s", ServerBin, -- filter->filter); -+ { -+ snprintf(command, sizeof(command), "%s/filter/%s", ServerBin, -+ filter->filter); -+#ifdef __x86_64__ -+ if (access(command, F_OK)) -+ { -+ snprintf(command, sizeof(command), "%s/filter/%s", -+ ServerBin_compat, filter->filter); -+ if (!access(command, F_OK)) -+ { -+ /* Not in the correct directory, but found it in the compat -+ * directory. Issue a warning. */ -+ cupsdLogMessage(CUPSD_LOG_INFO, -+ "Filter '%s' not in %s/filter!", -+ filter->filter, ServerBin); -+ } -+ else -+ { -+ /* Not in the compat directory either; make any error -+ * messages use the correct directory name then. */ -+ snprintf(command, sizeof(command), "%s/filter/%s", ServerBin, -+ filter->filter); -+ } -+ } -+#endif /* __x86_64__ */ -+ } - else - strlcpy(command, filter->filter, sizeof(command)); - -@@ -1119,6 +1143,28 @@ cupsdContinueJob(cupsd_job_t *job) /* I - cupsdClosePipe(job->print_pipes); - cupsdClosePipe(job->back_pipes); - cupsdClosePipe(job->side_pipes); -+#ifdef __x86_64__ -+ if (access(command, F_OK)) -+ { -+ snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat, -+ method); -+ if (!access(command, F_OK)) -+ { -+ /* Not in the correct directory, but we found it in the compat -+ * directory. Issue a warning. */ -+ cupsdLogMessage(CUPSD_LOG_INFO, -+ "Backend '%s' not in %s/backend!", method, -+ ServerBin); -+ } -+ else -+ { -+ /* Not in the compat directory either; make any error -+ messages use the correct directory name then. */ -+ snprintf(command, sizeof(command), "%s/backend/%s", ServerBin, -+ method); -+ } -+ } -+#endif /* __x86_64__ */ - - close(job->status_pipes[1]); - job->status_pipes[1] = -1; -diff -up cups-1.4.4/scheduler/printers.c.serverbin-compat cups-1.4.4/scheduler/printers.c ---- cups-1.4.4/scheduler/printers.c.serverbin-compat 2010-04-23 21:53:38.000000000 +0100 -+++ cups-1.4.4/scheduler/printers.c 2010-09-15 13:21:39.627960657 +0100 -@@ -1059,9 +1059,19 @@ cupsdLoadAllPrinters(void) - * Backend does not exist, stop printer... - */ - -+#ifdef __x86_64__ -+ snprintf(line, sizeof(line), "%s/backend/%s", ServerBin_compat, -+ p->device_uri); -+ if (access(line, 0)) -+ { -+#endif /* __x86_64__ */ -+ - p->state = IPP_PRINTER_STOPPED; - snprintf(p->state_message, sizeof(p->state_message), - "Backend %s does not exist!", line); -+#ifdef __x86_64__ -+ } -+#endif /* __x86_64__ */ - } - } - -@@ -3603,6 +3613,14 @@ add_printer_filter( - - if (stat(filename, &fileinfo)) - { -+#ifdef __x86_64__ -+ snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin_compat, -+ program); -+ if (stat(filename, &fileinfo)) -+ { -+ snprintf(filename, sizeof(filename), "%s/filter/%s", ServerBin, -+ program); -+#endif /* __x86_64__ */ - memset(&fileinfo, 0, sizeof(fileinfo)); - - snprintf(p->state_message, sizeof(p->state_message), -@@ -3611,6 +3629,9 @@ add_printer_filter( - cupsdSetPrinterReasons(p, "+cups-missing-filter-warning"); - - cupsdLogMessage(CUPSD_LOG_ERROR, "%s", p->state_message); -+#ifdef __x86_64__ -+ } -+#endif /* __x86_64__ */ - } - - /* diff --git a/cups/patches/cups-snmp-quirks.patch b/cups/patches/cups-snmp-quirks.patch deleted file mode 100644 index 0308676..0000000 --- a/cups/patches/cups-snmp-quirks.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -up cups-1.4.3/backend/snmp-supplies.c.snmp-quirks cups-1.4.3/backend/snmp-supplies.c ---- cups-1.4.3/backend/snmp-supplies.c.snmp-quirks 2009-11-20 01:27:57.000000000 +0000 -+++ cups-1.4.3/backend/snmp-supplies.c 2010-06-09 16:27:05.515019804 +0100 -@@ -38,6 +38,13 @@ - - - /* -+ * Printer quirks... -+ */ -+ -+#define QUIRK_CAPACITY (1<<0) -+ -+ -+/* - * Local structures... - */ - -@@ -57,6 +64,12 @@ typedef struct /**** Printer state ta - const char *keyword; /* IPP printer-state-reasons keyword */ - } backend_state_t; - -+typedef struct /**** Quirk names table ****/ -+{ -+ int bit; /* Quirk bit */ -+ const char *keyword; /* cupsSNMPQuirks keyword */ -+} quirk_name_t; -+ - - /* - * Local globals... -@@ -68,6 +81,7 @@ static int current_state = -1; - static int charset = -1; /* Character set for supply names */ - static int num_supplies = 0; - /* Number of supplies found */ -+static int quirks = 0; /* Printer quirks */ - static backend_supplies_t supplies[CUPS_MAX_SUPPLIES]; - /* Supply information */ - -@@ -153,6 +167,15 @@ static const backend_state_t const print - { CUPS_TC_outputFull, "output-area-full-warning" } - }; - -+static const quirk_name_t const quirk_names[] = -+ { -+ /* -+ * The prtMarkerSuppliesLevel values are -+ * percentages, not levels relative to the -+ * stated capacity. -+ */ -+ { QUIRK_CAPACITY, "capacity" } -+ }; - - /* - * Local functions... -@@ -208,6 +231,9 @@ backendSNMPSupplies( - if (i) - *ptr++ = ','; - -+ if (quirks & QUIRK_CAPACITY) -+ supplies[i].max_capacity = 100; -+ - if (supplies[i].max_capacity > 0) - sprintf(ptr, "%d", 100 * supplies[i].level / supplies[i].max_capacity); - else -@@ -305,6 +331,7 @@ backend_init_supplies( - http_addr_t *addr) /* I - Printer address */ - { - int i, /* Looping var */ -+ len, /* Quirk name length */ - type; /* Current marker type */ - cups_file_t *cachefile; /* Cache file */ - const char *cachedir; /* CUPS_CACHEDIR value */ -@@ -366,6 +393,7 @@ backend_init_supplies( - current_state = -1; - num_supplies = -1; - charset = -1; -+ quirks = 0; - - memset(supplies, 0, sizeof(supplies)); - -@@ -381,6 +409,34 @@ backend_init_supplies( - return; - } - -+ if (ppd && -+ (ppdattr = ppdFindAttr(ppd, "cupsSNMPQuirks", NULL)) != NULL && -+ ppdattr->value) -+ { -+ ptr = ppdattr->value; -+ while (*ptr != '\0') -+ { -+ /* -+ * Match keyword against quirk_names table. -+ */ -+ -+ for (i = 0; i < sizeof (quirk_names) / sizeof (quirk_names[0]); i++) -+ { -+ len = strlen (quirk_names[i].keyword); -+ if (!strncmp (ptr, quirk_names[i].keyword, len) && -+ (ptr[len] == '\0' || ptr[len] == ' ')) -+ quirks |= quirk_names[i].bit; -+ } -+ -+ /* -+ * Advance to next keyword. -+ */ -+ -+ ptr += strcspn (ptr, " "); -+ ptr += strspn (ptr, " "); -+ } -+ } -+ - ppdClose(ppd); - - /* diff --git a/cups/patches/cups-str3382.patch b/cups/patches/cups-str3382.patch deleted file mode 100644 index 14e9b27..0000000 --- a/cups/patches/cups-str3382.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -up cups-1.4.3/cups/tempfile.c.str3382 cups-1.4.3/cups/tempfile.c ---- cups-1.4.3/cups/tempfile.c.str3382 2010-01-18 19:47:12.000000000 +0100 -+++ cups-1.4.3/cups/tempfile.c 2010-03-31 13:26:52.000000000 +0200 -@@ -35,6 +35,7 @@ - # include <io.h> - #else - # include <unistd.h> -+# include <sys/types.h> - #endif /* WIN32 || __EMX__ */ - - -@@ -56,7 +57,7 @@ cupsTempFd(char *filename, /* I - Point - char tmppath[1024]; /* Windows temporary directory */ - DWORD curtime; /* Current time */ - #else -- struct timeval curtime; /* Current time */ -+ mode_t old_umask; /* Old umask before using mkstemp() */ - #endif /* WIN32 */ - - -@@ -107,33 +108,25 @@ cupsTempFd(char *filename, /* I - Point - - snprintf(filename, len - 1, "%s/%05lx%08lx", tmpdir, - GetCurrentProcessId(), curtime); --#else -- /* -- * Get the current time of day... -- */ -- -- gettimeofday(&curtime, NULL); -- -- /* -- * Format a string using the hex time values... -- */ -- -- snprintf(filename, len - 1, "%s/%05x%08x", tmpdir, (unsigned)getpid(), -- (unsigned)(curtime.tv_sec + curtime.tv_usec + tries)); --#endif /* WIN32 */ - - /* - * Open the file in "exclusive" mode, making sure that we don't - * stomp on an existing file or someone's symlink crack... - */ - --#ifdef WIN32 - fd = open(filename, _O_CREAT | _O_RDWR | _O_TRUNC | _O_BINARY, - _S_IREAD | _S_IWRITE); --#elif defined(O_NOFOLLOW) -- fd = open(filename, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, 0600); - #else -- fd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600); -+ -+ /* -+ * Use the standard mkstemp() call to make a temporary filename -+ * securely. -- andrew.wood(a)jdplc.com -+ */ -+ snprintf(filename, len - 1, "%s/cupsXXXXXX", tmpdir); -+ -+ old_umask = umask(0077); -+ fd = mkstemp(filename); -+ umask(old_umask); - #endif /* WIN32 */ - - if (fd < 0 && errno != EEXIST) diff --git a/cups/patches/cups-str3754.patch b/cups/patches/cups-str3754.patch deleted file mode 100644 index 148575a..0000000 --- a/cups/patches/cups-str3754.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up cups-1.4.5/scheduler/printers.c.printer-timeout cups-1.4.5/scheduler/printers.c ---- cups-1.4.5/scheduler/printers.c.printer-timeout 2010-12-16 14:42:07.048865052 +0000 -+++ cups-1.4.5/scheduler/printers.c 2010-12-16 14:43:05.325684376 +0000 -@@ -785,6 +785,7 @@ cupsdDeletePrinter( - */ - - cupsdSetPrinterState(p, IPP_PRINTER_STOPPED, update); -+ p->state = IPP_PRINTER_STOPPED; - - if (p->job) - cupsdSetJobState(p->job, IPP_JOB_PENDING, CUPSD_JOB_FORCE, diff --git a/cups/patches/cups-strict-ppd-line-length.patch b/cups/patches/cups-strict-ppd-line-length.patch deleted file mode 100644 index d393728..0000000 --- a/cups/patches/cups-strict-ppd-line-length.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up cups-1.3.5/cups/ppd.c~ cups-1.3.5/cups/ppd.c ---- cups-1.3.5/cups/ppd.c~ 2007-11-30 19:29:50.000000000 +0000 -+++ cups-1.3.5/cups/ppd.c 2008-01-09 12:08:48.000000000 +0000 -@@ -2801,7 +2801,7 @@ ppd_read(cups_file_t *fp, /* I - Fil - *lineptr++ = ch; - col ++; - -- if (col > (PPD_MAX_LINE - 1)) -+ if (col > (PPD_MAX_LINE - 1) && cg->ppd_conform == PPD_CONFORM_STRICT) - { - /* - * Line is too long... -@@ -2868,7 +2868,7 @@ ppd_read(cups_file_t *fp, /* I - Fil - { - col ++; - -- if (col > (PPD_MAX_LINE - 1)) -+ if (col > (PPD_MAX_LINE - 1) && cg->ppd_conform == PPD_CONFORM_STRICT) - { - /* - * Line is too long... -@@ -2931,7 +2931,7 @@ ppd_read(cups_file_t *fp, /* I - Fil - { - col ++; - -- if (col > (PPD_MAX_LINE - 1)) -+ if (col > (PPD_MAX_LINE - 1) && cg->ppd_conform == PPD_CONFORM_STRICT) - { - /* - * Line is too long... diff --git a/cups/patches/cups-texttops-rotate-page.patch b/cups/patches/cups-texttops-rotate-page.patch deleted file mode 100644 index 2b048cd..0000000 --- a/cups/patches/cups-texttops-rotate-page.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up cups-1.4.3/filter/texttops.c.texttops-rotate-page cups-1.4.3/filter/texttops.c ---- cups-1.4.3/filter/texttops.c.texttops-rotate-page 2008-11-06 16:42:18.000000000 +0000 -+++ cups-1.4.3/filter/texttops.c 2010-05-18 16:42:23.669940884 +0100 -@@ -97,6 +97,13 @@ WritePage(void) - - puts("gsave"); - -+ /* If we're opereating in Landscape (Orientation == 1 or Orientation == 3) -+ then rotate and translate the page */ -+ if ( Orientation & 1 ) { -+ printf ("%d rotate\n", (Orientation & 3) * 90 ); -+ printf("0 %.0f neg translate\n", PageLength); -+ } -+ - if (PrettyPrint) - printf("%d H\n", NumPages); - -@@ -212,7 +219,7 @@ WriteProlog(const char *title, /* I - T - - puts("%!PS-Adobe-3.0"); - printf("%%%%BoundingBox: 0 0 %.0f %.0f\n", PageWidth, PageLength); -- printf("%%cupsRotation: %d\n", (Orientation & 3) * 90); -+ puts("%cupsRotation: 0"); - puts("%%Creator: texttops/" CUPS_SVERSION); - printf("%%%%CreationDate: %s\n", curdate); - WriteTextComment("Title", title); -@@ -549,6 +556,8 @@ WriteProlog(const char *title, /* I - T - puts("%%EndComments"); - - puts("%%BeginProlog"); -+ printf("%%%%Orientation: %s\n", -+ Orientation & 1 ? "Landscape" : "Portrait"); - - /* - * Download any missing fonts... diff --git a/cups/patches/cups-uri-compat.patch b/cups/patches/cups-uri-compat.patch deleted file mode 100644 index dd55b66..0000000 --- a/cups/patches/cups-uri-compat.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -up cups-1.4rc1/backend/usb-unix.c.uri-compat cups-1.4rc1/backend/usb-unix.c ---- cups-1.4rc1/backend/usb-unix.c.uri-compat 2009-07-15 10:48:46.992133677 +0100 -+++ cups-1.4rc1/backend/usb-unix.c 2009-07-15 10:49:05.305008114 +0100 -@@ -63,11 +63,34 @@ print_device(const char *uri, /* I - De - int device_fd; /* USB device */ - size_t tbytes; /* Total number of bytes written */ - struct termios opts; /* Parallel port options */ -+ char *fixed_uri = strdup (uri); -+ char *p; - - - (void)argc; - (void)argv; - -+ p = strchr (fixed_uri, ':'); -+ if (p++ != NULL) -+ { -+ char *e; -+ p += strspn (p, "/"); -+ e = strchr (p, '/'); -+ if (e > p) -+ { -+ size_t mfrlen = e - p; -+ e++; -+ if (!strncasecmp (e, p, mfrlen)) -+ { -+ char *x = e + mfrlen; -+ if (!strncmp (x, "%20", 3)) -+ /* Take mfr name out of mdl name for compatibility with -+ * Fedora 11 before bug #507244 was fixed. */ -+ strcpy (e, x + 3); puts(fixed_uri); -+ } -+ } -+ } -+ - /* - * Open the USB port device... - */ -@@ -107,10 +130,10 @@ print_device(const char *uri, /* I - De - strncasecmp(hostname, "Minolta", 7); - #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */ - -- if (use_bc && !strncmp(uri, "usb:/dev/", 9)) -+ if (use_bc && !strncmp(fixed_uri, "usb:/dev/", 9)) - use_bc = 0; - -- if ((device_fd = open_device(uri, &use_bc)) == -1) -+ if ((device_fd = open_device(fixed_uri, &use_bc)) == -1) - { - if (getenv("CLASS") != NULL) - { diff --git a/cups/patches/cups-usb-paperout.patch b/cups/patches/cups-usb-paperout.patch deleted file mode 100644 index fb69145..0000000 --- a/cups/patches/cups-usb-paperout.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -up cups-1.4b1/backend/usb-unix.c.usb-paperout cups-1.4b1/backend/usb-unix.c ---- cups-1.4b1/backend/usb-unix.c.usb-paperout 2008-11-12 09:30:03.000000000 +0000 -+++ cups-1.4b1/backend/usb-unix.c 2008-11-12 09:30:03.000000000 +0000 -@@ -30,6 +30,11 @@ - - #include <sys/select.h> - -+#ifdef __linux -+#include <sys/ioctl.h> -+#include <linux/lp.h> -+#endif /* __linux */ -+ - - /* - * Local functions... -@@ -324,7 +329,19 @@ open_device(const char *uri, /* I - Dev - if (!strncmp(uri, "usb:/dev/", 9)) - #ifdef __linux - { -- return (open(uri + 4, O_RDWR | O_EXCL)); -+ fd = open(uri + 4, O_RDWR | O_EXCL); -+ -+ if (fd != -1) -+ { -+ /* -+ * Tell the driver to return from write() with errno==ENOSPACE -+ * on paper-out. -+ */ -+ unsigned int t = 1; -+ ioctl (fd, LPABORT, &t); -+ } -+ -+ return fd; - } - else if (!strncmp(uri, "usb://", 6)) - { -@@ -390,7 +407,14 @@ open_device(const char *uri, /* I - Dev - if (!strcmp(uri, device_uri)) - { - /* -- * Yes, return this file descriptor... -+ * Yes, tell the driver to return from write() with -+ * errno==ENOSPACE on paper-out. -+ */ -+ unsigned int t = 1; -+ ioctl (fd, LPABORT, &t); -+ -+ /* -+ * Return this file descriptor... - */ - - fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n", diff --git a/cups/patches/cups-x-lspp.patch b/cups/patches/cups-x-lspp.patch deleted file mode 100644 index 380b55d..0000000 --- a/cups/patches/cups-x-lspp.patch +++ /dev/null @@ -1,2839 +0,0 @@ -diff -up cups-1.4.5/config.h.in.lspp cups-1.4.5/config.h.in ---- cups-1.4.5/config.h.in.lspp 2010-12-24 13:21:31.134859403 +0000 -+++ cups-1.4.5/config.h.in 2010-12-24 13:21:31.173858387 +0000 -@@ -672,6 +672,12 @@ - #undef HAVE_SYS_STATVFS_H - #undef HAVE_SYS_VFS_H - -+/* -+ * Are we trying to meet LSPP requirements? -+ */ -+ -+#undef WITH_LSPP -+ - - #endif /* !_CUPS_CONFIG_H_ */ - -diff -up cups-1.4.5/config-scripts/cups-lspp.m4.lspp cups-1.4.5/config-scripts/cups-lspp.m4 ---- cups-1.4.5/config-scripts/cups-lspp.m4.lspp 2010-12-24 13:21:31.174858361 +0000 -+++ cups-1.4.5/config-scripts/cups-lspp.m4 2010-12-24 13:21:31.174858361 +0000 -@@ -0,0 +1,36 @@ -+dnl -+dnl LSPP code for the Common UNIX Printing System (CUPS). -+dnl -+dnl Copyright 2005-2006 by Hewlett-Packard Development Company, L.P. -+dnl -+dnl This program is free software; you can redistribute it and/or modify -+dnl it under the terms of the GNU General Public License as published by -+dnl the Free Software Foundation; version 2. -+dnl -+dnl This program is distributed in the hope that it will be useful, but -+dnl WITHOUT ANY WARRANTY; without even the implied warranty of -+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+dnl General Public License for more details. -+dnl -+dnl You should have received a copy of the GNU General Public License -+dnl along with this program; if not, write to the Free Software Foundation, -+dnl Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301 USA -+dnl -+ -+dnl Are we trying to meet LSPP requirements -+AC_ARG_ENABLE(lspp, [ --enable-lspp turn on auditing and label support, default=no]) -+ -+if test x"$enable_lspp" != xno; then -+ case "$uname" in -+ Linux) -+ AC_CHECK_LIB(audit,audit_log_user_message, [LIBAUDIT="-laudit" AC_SUBST(LIBAUDIT)]) -+ AC_CHECK_HEADER(libaudit.h) -+ AC_CHECK_LIB(selinux,getpeercon, [LIBSELINUX="-lselinux" AC_SUBST(LIBSELINUX)]) -+ AC_CHECK_HEADER(selinux/selinux.h) -+ AC_DEFINE(WITH_LSPP) -+ ;; -+ *) -+ # All others -+ ;; -+ esac -+fi -diff -up cups-1.4.5/configure.in.lspp cups-1.4.5/configure.in ---- cups-1.4.5/configure.in.lspp 2010-06-22 22:42:44.000000000 +0100 -+++ cups-1.4.5/configure.in 2010-12-24 13:21:31.174858362 +0000 -@@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4) - sinclude(config-scripts/cups-pdf.m4) - sinclude(config-scripts/cups-scripting.m4) - -+sinclude(config-scripts/cups-lspp.m4) -+ - INSTALL_LANGUAGES="" - UNINSTALL_LANGUAGES="" - LANGFILES="" -diff -up cups-1.4.5/cups/cups.h.lspp cups-1.4.5/cups/cups.h ---- cups-1.4.5/cups/cups.h.lspp 2010-06-22 04:18:27.000000000 +0100 -+++ cups-1.4.5/cups/cups.h 2010-12-24 13:21:31.176858307 +0000 -@@ -15,6 +15,9 @@ - * This file is subject to the Apple OS-Developed Software exception. - */ - -+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ -+ - #ifndef _CUPS_CUPS_H_ - # define _CUPS_CUPS_H_ - -@@ -86,6 +89,12 @@ extern "C" { - # define CUPS_WHICHJOBS_COMPLETED 1 - - -+# ifdef WITH_LSPP -+# define MLS_CONFIG "mls" -+# define TE_CONFIG "te" -+# define SELINUX_CONFIG "SELinux" -+# define UNKNOWN_SL "UNKNOWN SL" -+# endif /* WITH_LSPP */ - /* - * Types and structures... - */ -diff -up cups-1.4.5/data/Makefile.lspp cups-1.4.5/data/Makefile ---- cups-1.4.5/data/Makefile.lspp 2008-11-12 19:30:57.000000000 +0000 -+++ cups-1.4.5/data/Makefile 2010-12-24 13:21:31.177858282 +0000 -@@ -25,7 +25,10 @@ BANNERS = \ - secret \ - standard \ - topsecret \ -- unclassified -+ unclassified \ -+ selinux \ -+ mls \ -+ te - - CHARMAPS = \ - euc-cn.txt \ -diff -up cups-1.4.5/data/mls.lspp cups-1.4.5/data/mls ---- cups-1.4.5/data/mls.lspp 2010-12-24 13:21:31.177858282 +0000 -+++ cups-1.4.5/data/mls 2010-12-24 13:21:31.178858258 +0000 -@@ -0,0 +1,261 @@ -+%!PS-Adobe-3.0 -+%%BoundingBox: 0 0 612 792 -+%%Pages: 1 -+%%LanguageLevel: 1 -+%%DocumentData: Clean7Bit -+%%DocumentSuppliedResources: procset bannerprint/1.0 -+%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman -+%%Creator: Michael Sweet, Easy Software Products -+%%CreationDate: May 10, 2000 -+%%Title: Test Page -+%%EndComments -+%%BeginProlog -+%%BeginResource procset bannerprint 1.1 0 -+% -+% PostScript banner page for the Common UNIX Printing System ("CUPS"). -+% -+% Copyright 1993-2005 by Easy Software Products -+% -+% These coded instructions, statements, and computer programs are the -+% property of Easy Software Products and are protected by Federal -+% copyright law. Distribution and use rights are outlined in the file -+% "LICENSE.txt" which should have been included with this file. If this -+% file is missing or damaged please contact Easy Software Products -+% at: -+% -+% Attn: CUPS Licensing Information -+% Easy Software Products -+% 44141 Airport View Drive, Suite 204 -+% Hollywood, Maryland 20636 USA -+% -+% Voice: (301) 373-9600 -+% EMail: cups-info(a)cups.org -+% WWW: http://www.cups.org -+% -+/CENTER { % Draw centered text -+ % (name) CENTER - -+ dup stringwidth pop % Get the width of the string -+ 0.5 mul neg 0 rmoveto % Shift left 1/2 of the distance -+ show % Show the string -+} bind def -+/RIGHT { % Draw right-justified text -+ % (name) RIGHT - -+ dup stringwidth pop % Get the width of the string -+ neg 0 rmoveto % Shift left the entire distance -+ show % Show the string -+} bind def -+/NUMBER { % Draw a number -+ % power n NUMBER - -+ 1 index 1 eq { % power == 1? -+ round cvi exch pop % Convert "n" to integer -+ } { -+ 1 index mul round exch div % Truncate extra decimal places -+ } ifelse -+ 100 string cvs show % Convert to a string and show it... -+} bind def -+/CUPSLOGO { % Draw the CUPS logo -+ % height CUPSLOGO -+ % Start with a big C... -+ /Helvetica findfont 1 index scalefont setfont -+ 0 setgray -+ 0 0 moveto -+ (C) show -+ -+ % Then "UNIX Printing System" much smaller... -+ /Helvetica-Bold findfont 1 index 9 div scalefont setfont -+ 0.25 mul -+ dup dup 2.0 mul moveto -+ (UNIX) show -+ dup dup 1.6 mul moveto -+ (Printing) show -+ dup 1.2 mul moveto -+ (System) show -+} bind def -+/ESPLOGO { % Draw the ESP logo -+ % height ESPLOGO -+ % Compute the size of the logo... -+ 0 0 -+ 2 index 1.5 mul 3 index -+ -+ % Do the "metallic" fill from 10% black to 40% black... -+ 1 -0.001 0 { -+ dup % loopval -+ -0.15 mul % loopval * -0.15 -+ 0.9 add % 0.9 - loopval * 0.15 -+ setgray % set gray shade -+ -+ 0 % x -+ 1 index neg % loopval -+ 1 add % 1 - loopval -+ 3 index % height -+ mul % height * (1 - loopval) -+ moveto % starting point -+ -+ dup % loopval -+ 3 index % width -+ mul % loopval * width -+ 2 index % height -+ lineto % Next point -+ -+ 0 % x -+ 2 index % height -+ lineto % Next point -+ -+ closepath -+ fill -+ -+ dup % loopval -+ 0.15 mul % loopval * 0.15 -+ 0.6 add % 0.6 + loopval * 0.15 -+ setgray -+ -+ dup % loopval -+ neg 1 add % 1 - loopval -+ 3 index % width -+ mul % (1 - loopval) * width -+ 0 % y -+ moveto % Starting point -+ -+ 2 index % width -+ exch % loopval -+ 2 index % height -+ mul % loopval * height -+ lineto % Next point -+ -+ 1 index % width -+ 0 % y -+ lineto % Next point -+ -+ closepath -+ fill -+ } for -+ -+ 0 setgray rectstroke -+ -+ /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont -+ dup 40 div -+ -+ dup 4 mul 1 index 25 mul moveto (E) show -+ dup 10 mul 1 index 15 mul moveto (S) show -+ dup 16 mul 1 index 5 mul moveto (P) show -+ -+ /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont -+ dup 14 mul 1 index 29 mul moveto (asy) show -+ dup 20 mul 1 index 19 mul moveto (oftware) show -+ dup 26 mul 1 index 9 mul moveto (roducts) show -+ -+ pop -+} bind def -+%%EndResource -+%%EndProlog -+%%Page: 1 1 -+gsave -+ -+ % Determine the imageable area and device resolution... -+ initclip newpath clippath pathbbox % Get bounding rectangle -+ 72 div /pageTop exch def % Get top margin in inches -+ 72 div /pageRight exch def % Get right margin in inches -+ 72 div /pageBottom exch def % Get bottom margin in inches -+ 72 div /pageLeft exch def % Get left margin in inches -+ -+ /pageWidth pageRight pageLeft sub def % pageWidth = pageRight - pageLeft -+ /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom -+ -+ /boxWidth % width of text box -+ pageWidth pageHeight lt -+ { pageWidth 54 mul } -+ { pageHeight 42 mul } -+ ifelse def -+ -+ newpath % Clear bounding path -+ -+ % Create fonts... -+ /bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold -+ pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33) -+ -+ /mediumFont /Helvetica findfont % mediumFont = Helvetica -+ pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5) -+ -+ % Offset page to account for lower-left margin... -+ pageLeft 72 mul -+ pageBottom 72 mul -+ translate -+ -+ % Job information box... -+ pageWidth 36 mul 9 add % x = pageWidth * 1/2 * 72 + 9 -+ boxWidth 0.5 mul sub % x-= 1/2 box width -+ pageHeight 30 mul 9 sub % y = pageHeight * 1/2 * 72 - 9 -+ boxWidth % w = box width -+ pageHeight 14 mul % h = pageHeight * 1/2 * 72 -+ 0.5 setgray rectfill % Draw a shadow -+ -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ boxWidth 0.5 mul sub % x-= 1/2 box width -+ pageHeight 30 mul % y = pageHeight * 1/4 * 72 -+ boxWidth % w = box width -+ pageHeight 14 mul % h = pageHeight * 1/2 * 72 -+ -+ 4 copy 1 setgray rectfill % Clear the box to white -+ 0 setgray rectstroke % Draw a black box around it... -+ -+ % Job information text... -+ mediumFont setfont % Medium sized font -+ -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ pageHeight 36 mul % y = pageHeight * 1/2 * 72 -+ pageHeight 5 mul add % y += 2 lines -+ 2 copy % Copy X & Y -+ moveto -+ (Job ID: ) RIGHT -+ moveto -+ ({printer-name}-{job-id}) show -+ -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ pageHeight 36 mul % y = pageHeight * 1/2 * 72 -+ pageHeight 2 mul add % y += 1 line -+ 2 copy % Copy X & Y -+ moveto -+ (Title: ) RIGHT -+ moveto -+ ({job-name}) show -+ -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ pageHeight 36 mul % y = pageHeight * 1/2 * 72 -+ pageHeight -1 mul add % y -= 1 line -+ 2 copy % Copy X & Y -+ moveto -+ (Requesting User: ) RIGHT -+ moveto -+ ({job-originating-user-name}) show -+ -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ pageHeight 36 mul % y = pageHeight * 1/2 * 72 -+ pageHeight -4 mul add % y -= 2 lines -+ 2 copy % Copy X & Y -+ moveto -+ (Billing Info: ) RIGHT -+ moveto -+ ({?job-billing}) show -+ -+ % Then the CUPS logo.... -+ gsave -+ pageWidth 4 mul -+ pageWidth 6 mul -+ translate -+ pageWidth 9 mul CUPSLOGO -+ grestore -+ -+ % And the ESP logo.... -+ gsave -+ pageWidth 59 mul -+ pageWidth 6 mul -+ translate -+ pageWidth 6 mul ESPLOGO -+ grestore -+% Show the page... -+grestore -+showpage -+% -+% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $". -+% -+%%EOF -diff -up cups-1.4.5/data/selinux.lspp cups-1.4.5/data/selinux ---- cups-1.4.5/data/selinux.lspp 2010-12-24 13:21:31.178858258 +0000 -+++ cups-1.4.5/data/selinux 2010-12-24 13:21:31.179858233 +0000 -@@ -0,0 +1,261 @@ -+%!PS-Adobe-3.0 -+%%BoundingBox: 0 0 612 792 -+%%Pages: 1 -+%%LanguageLevel: 1 -+%%DocumentData: Clean7Bit -+%%DocumentSuppliedResources: procset bannerprint/1.0 -+%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman -+%%Creator: Michael Sweet, Easy Software Products -+%%CreationDate: May 10, 2000 -+%%Title: Test Page -+%%EndComments -+%%BeginProlog -+%%BeginResource procset bannerprint 1.1 0 -+% -+% PostScript banner page for the Common UNIX Printing System ("CUPS"). -+% -+% Copyright 1993-2005 by Easy Software Products -+% -+% These coded instructions, statements, and computer programs are the -+% property of Easy Software Products and are protected by Federal -+% copyright law. Distribution and use rights are outlined in the file -+% "LICENSE.txt" which should have been included with this file. If this -+% file is missing or damaged please contact Easy Software Products -+% at: -+% -+% Attn: CUPS Licensing Information -+% Easy Software Products -+% 44141 Airport View Drive, Suite 204 -+% Hollywood, Maryland 20636 USA -+% -+% Voice: (301) 373-9600 -+% EMail: cups-info(a)cups.org -+% WWW: http://www.cups.org -+% -+/CENTER { % Draw centered text -+ % (name) CENTER - -+ dup stringwidth pop % Get the width of the string -+ 0.5 mul neg 0 rmoveto % Shift left 1/2 of the distance -+ show % Show the string -+} bind def -+/RIGHT { % Draw right-justified text -+ % (name) RIGHT - -+ dup stringwidth pop % Get the width of the string -+ neg 0 rmoveto % Shift left the entire distance -+ show % Show the string -+} bind def -+/NUMBER { % Draw a number -+ % power n NUMBER - -+ 1 index 1 eq { % power == 1? -+ round cvi exch pop % Convert "n" to integer -+ } { -+ 1 index mul round exch div % Truncate extra decimal places -+ } ifelse -+ 100 string cvs show % Convert to a string and show it... -+} bind def -+/CUPSLOGO { % Draw the CUPS logo -+ % height CUPSLOGO -+ % Start with a big C... -+ /Helvetica findfont 1 index scalefont setfont -+ 0 setgray -+ 0 0 moveto -+ (C) show -+ -+ % Then "UNIX Printing System" much smaller... -+ /Helvetica-Bold findfont 1 index 9 div scalefont setfont -+ 0.25 mul -+ dup dup 2.0 mul moveto -+ (UNIX) show -+ dup dup 1.6 mul moveto -+ (Printing) show -+ dup 1.2 mul moveto -+ (System) show -+} bind def -+/ESPLOGO { % Draw the ESP logo -+ % height ESPLOGO -+ % Compute the size of the logo... -+ 0 0 -+ 2 index 1.5 mul 3 index -+ -+ % Do the "metallic" fill from 10% black to 40% black... -+ 1 -0.001 0 { -+ dup % loopval -+ -0.15 mul % loopval * -0.15 -+ 0.9 add % 0.9 - loopval * 0.15 -+ setgray % set gray shade -+ -+ 0 % x -+ 1 index neg % loopval -+ 1 add % 1 - loopval -+ 3 index % height -+ mul % height * (1 - loopval) -+ moveto % starting point -+ -+ dup % loopval -+ 3 index % width -+ mul % loopval * width -+ 2 index % height -+ lineto % Next point -+ -+ 0 % x -+ 2 index % height -+ lineto % Next point -+ -+ closepath -+ fill -+ -+ dup % loopval -+ 0.15 mul % loopval * 0.15 -+ 0.6 add % 0.6 + loopval * 0.15 -+ setgray -+ -+ dup % loopval -+ neg 1 add % 1 - loopval -+ 3 index % width -+ mul % (1 - loopval) * width -+ 0 % y -+ moveto % Starting point -+ -+ 2 index % width -+ exch % loopval -+ 2 index % height -+ mul % loopval * height -+ lineto % Next point -+ -+ 1 index % width -+ 0 % y -+ lineto % Next point -+ -+ closepath -+ fill -+ } for -+ -+ 0 setgray rectstroke -+ -+ /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont -+ dup 40 div -+ -+ dup 4 mul 1 index 25 mul moveto (E) show -+ dup 10 mul 1 index 15 mul moveto (S) show -+ dup 16 mul 1 index 5 mul moveto (P) show -+ -+ /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont -+ dup 14 mul 1 index 29 mul moveto (asy) show -+ dup 20 mul 1 index 19 mul moveto (oftware) show -+ dup 26 mul 1 index 9 mul moveto (roducts) show -+ -+ pop -+} bind def -+%%EndResource -+%%EndProlog -+%%Page: 1 1 -+gsave -+ -+ % Determine the imageable area and device resolution... -+ initclip newpath clippath pathbbox % Get bounding rectangle -+ 72 div /pageTop exch def % Get top margin in inches -+ 72 div /pageRight exch def % Get right margin in inches -+ 72 div /pageBottom exch def % Get bottom margin in inches -+ 72 div /pageLeft exch def % Get left margin in inches -+ -+ /pageWidth pageRight pageLeft sub def % pageWidth = pageRight - pageLeft -+ /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom -+ -+ /boxWidth % width of text box -+ pageWidth pageHeight lt -+ { pageWidth 54 mul } -+ { pageHeight 42 mul } -+ ifelse def -+ -+ newpath % Clear bounding path -+ -+ % Create fonts... -+ /bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold -+ pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33) -+ -+ /mediumFont /Helvetica findfont % mediumFont = Helvetica -+ pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5) -+ -+ % Offset page to account for lower-left margin... -+ pageLeft 72 mul -+ pageBottom 72 mul -+ translate -+ -+ % Job information box... -+ pageWidth 36 mul 9 add % x = pageWidth * 1/2 * 72 + 9 -+ boxWidth 0.5 mul sub % x-= 1/2 box width -+ pageHeight 30 mul 9 sub % y = pageHeight * 1/2 * 72 - 9 -+ boxWidth % w = box width -+ pageHeight 14 mul % h = pageHeight * 1/2 * 72 -+ 0.5 setgray rectfill % Draw a shadow -+ -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ boxWidth 0.5 mul sub % x-= 1/2 box width -+ pageHeight 30 mul % y = pageHeight * 1/4 * 72 -+ boxWidth % w = box width -+ pageHeight 14 mul % h = pageHeight * 1/2 * 72 -+ -+ 4 copy 1 setgray rectfill % Clear the box to white -+ 0 setgray rectstroke % Draw a black box around it... -+ -+ % Job information text... -+ mediumFont setfont % Medium sized font -+ -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ pageHeight 36 mul % y = pageHeight * 1/2 * 72 -+ pageHeight 5 mul add % y += 2 lines -+ 2 copy % Copy X & Y -+ moveto -+ (Job ID: ) RIGHT -+ moveto -+ ({printer-name}-{job-id}) show -+ -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ pageHeight 36 mul % y = pageHeight * 1/2 * 72 -+ pageHeight 2 mul add % y += 1 line -+ 2 copy % Copy X & Y -+ moveto -+ (Title: ) RIGHT -+ moveto -+ ({job-name}) show -+ -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ pageHeight 36 mul % y = pageHeight * 1/2 * 72 -+ pageHeight -1 mul add % y -= 1 line -+ 2 copy % Copy X & Y -+ moveto -+ (Requesting User: ) RIGHT -+ moveto -+ ({job-originating-user-name}) show -+ -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ pageHeight 36 mul % y = pageHeight * 1/2 * 72 -+ pageHeight -4 mul add % y -= 2 lines -+ 2 copy % Copy X & Y -+ moveto -+ (Billing Info: ) RIGHT -+ moveto -+ ({?job-billing}) show -+ -+ % Then the CUPS logo.... -+ gsave -+ pageWidth 4 mul -+ pageWidth 6 mul -+ translate -+ pageWidth 9 mul CUPSLOGO -+ grestore -+ -+ % And the ESP logo.... -+ gsave -+ pageWidth 59 mul -+ pageWidth 6 mul -+ translate -+ pageWidth 6 mul ESPLOGO -+ grestore -+% Show the page... -+grestore -+showpage -+% -+% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $". -+% -+%%EOF -diff -up cups-1.4.5/data/te.lspp cups-1.4.5/data/te ---- cups-1.4.5/data/te.lspp 2010-12-24 13:21:31.179858233 +0000 -+++ cups-1.4.5/data/te 2010-12-24 13:21:31.180858207 +0000 -@@ -0,0 +1,261 @@ -+%!PS-Adobe-3.0 -+%%BoundingBox: 0 0 612 792 -+%%Pages: 1 -+%%LanguageLevel: 1 -+%%DocumentData: Clean7Bit -+%%DocumentSuppliedResources: procset bannerprint/1.0 -+%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman -+%%Creator: Michael Sweet, Easy Software Products -+%%CreationDate: May 10, 2000 -+%%Title: Test Page -+%%EndComments -+%%BeginProlog -+%%BeginResource procset bannerprint 1.1 0 -+% -+% PostScript banner page for the Common UNIX Printing System ("CUPS"). -+% -+% Copyright 1993-2005 by Easy Software Products -+% -+% These coded instructions, statements, and computer programs are the -+% property of Easy Software Products and are protected by Federal -+% copyright law. Distribution and use rights are outlined in the file -+% "LICENSE.txt" which should have been included with this file. If this -+% file is missing or damaged please contact Easy Software Products -+% at: -+% -+% Attn: CUPS Licensing Information -+% Easy Software Products -+% 44141 Airport View Drive, Suite 204 -+% Hollywood, Maryland 20636 USA -+% -+% Voice: (301) 373-9600 -+% EMail: cups-info(a)cups.org -+% WWW: http://www.cups.org -+% -+/CENTER { % Draw centered text -+ % (name) CENTER - -+ dup stringwidth pop % Get the width of the string -+ 0.5 mul neg 0 rmoveto % Shift left 1/2 of the distance -+ show % Show the string -+} bind def -+/RIGHT { % Draw right-justified text -+ % (name) RIGHT - -+ dup stringwidth pop % Get the width of the string -+ neg 0 rmoveto % Shift left the entire distance -+ show % Show the string -+} bind def -+/NUMBER { % Draw a number -+ % power n NUMBER - -+ 1 index 1 eq { % power == 1? -+ round cvi exch pop % Convert "n" to integer -+ } { -+ 1 index mul round exch div % Truncate extra decimal places -+ } ifelse -+ 100 string cvs show % Convert to a string and show it... -+} bind def -+/CUPSLOGO { % Draw the CUPS logo -+ % height CUPSLOGO -+ % Start with a big C... -+ /Helvetica findfont 1 index scalefont setfont -+ 0 setgray -+ 0 0 moveto -+ (C) show -+ -+ % Then "UNIX Printing System" much smaller... -+ /Helvetica-Bold findfont 1 index 9 div scalefont setfont -+ 0.25 mul -+ dup dup 2.0 mul moveto -+ (UNIX) show -+ dup dup 1.6 mul moveto -+ (Printing) show -+ dup 1.2 mul moveto -+ (System) show -+} bind def -+/ESPLOGO { % Draw the ESP logo -+ % height ESPLOGO -+ % Compute the size of the logo... -+ 0 0 -+ 2 index 1.5 mul 3 index -+ -+ % Do the "metallic" fill from 10% black to 40% black... -+ 1 -0.001 0 { -+ dup % loopval -+ -0.15 mul % loopval * -0.15 -+ 0.9 add % 0.9 - loopval * 0.15 -+ setgray % set gray shade -+ -+ 0 % x -+ 1 index neg % loopval -+ 1 add % 1 - loopval -+ 3 index % height -+ mul % height * (1 - loopval) -+ moveto % starting point -+ -+ dup % loopval -+ 3 index % width -+ mul % loopval * width -+ 2 index % height -+ lineto % Next point -+ -+ 0 % x -+ 2 index % height -+ lineto % Next point -+ -+ closepath -+ fill -+ -+ dup % loopval -+ 0.15 mul % loopval * 0.15 -+ 0.6 add % 0.6 + loopval * 0.15 -+ setgray -+ -+ dup % loopval -+ neg 1 add % 1 - loopval -+ 3 index % width -+ mul % (1 - loopval) * width -+ 0 % y -+ moveto % Starting point -+ -+ 2 index % width -+ exch % loopval -+ 2 index % height -+ mul % loopval * height -+ lineto % Next point -+ -+ 1 index % width -+ 0 % y -+ lineto % Next point -+ -+ closepath -+ fill -+ } for -+ -+ 0 setgray rectstroke -+ -+ /Helvetica-BoldOblique findfont 1 index 3 div scalefont setfont -+ dup 40 div -+ -+ dup 4 mul 1 index 25 mul moveto (E) show -+ dup 10 mul 1 index 15 mul moveto (S) show -+ dup 16 mul 1 index 5 mul moveto (P) show -+ -+ /Helvetica-BoldOblique findfont 2 index 5 div scalefont setfont -+ dup 14 mul 1 index 29 mul moveto (asy) show -+ dup 20 mul 1 index 19 mul moveto (oftware) show -+ dup 26 mul 1 index 9 mul moveto (roducts) show -+ -+ pop -+} bind def -+%%EndResource -+%%EndProlog -+%%Page: 1 1 -+gsave -+ -+ % Determine the imageable area and device resolution... -+ initclip newpath clippath pathbbox % Get bounding rectangle -+ 72 div /pageTop exch def % Get top margin in inches -+ 72 div /pageRight exch def % Get right margin in inches -+ 72 div /pageBottom exch def % Get bottom margin in inches -+ 72 div /pageLeft exch def % Get left margin in inches -+ -+ /pageWidth pageRight pageLeft sub def % pageWidth = pageRight - pageLeft -+ /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom -+ -+ /boxWidth % width of text box -+ pageWidth pageHeight lt -+ { pageWidth 54 mul } -+ { pageHeight 42 mul } -+ ifelse def -+ -+ newpath % Clear bounding path -+ -+ % Create fonts... -+ /bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold -+ pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33) -+ -+ /mediumFont /Helvetica findfont % mediumFont = Helvetica -+ pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5) -+ -+ % Offset page to account for lower-left margin... -+ pageLeft 72 mul -+ pageBottom 72 mul -+ translate -+ -+ % Job information box... -+ pageWidth 36 mul 9 add % x = pageWidth * 1/2 * 72 + 9 -+ boxWidth 0.5 mul sub % x-= 1/2 box width -+ pageHeight 30 mul 9 sub % y = pageHeight * 1/2 * 72 - 9 -+ boxWidth % w = box width -+ pageHeight 14 mul % h = pageHeight * 1/2 * 72 -+ 0.5 setgray rectfill % Draw a shadow -+ -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ boxWidth 0.5 mul sub % x-= 1/2 box width -+ pageHeight 30 mul % y = pageHeight * 1/4 * 72 -+ boxWidth % w = box width -+ pageHeight 14 mul % h = pageHeight * 1/2 * 72 -+ -+ 4 copy 1 setgray rectfill % Clear the box to white -+ 0 setgray rectstroke % Draw a black box around it... -+ -+ % Job information text... -+ mediumFont setfont % Medium sized font -+ -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ pageHeight 36 mul % y = pageHeight * 1/2 * 72 -+ pageHeight 5 mul add % y += 2 lines -+ 2 copy % Copy X & Y -+ moveto -+ (Job ID: ) RIGHT -+ moveto -+ ({printer-name}-{job-id}) show -+ -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ pageHeight 36 mul % y = pageHeight * 1/2 * 72 -+ pageHeight 2 mul add % y += 1 line -+ 2 copy % Copy X & Y -+ moveto -+ (Title: ) RIGHT -+ moveto -+ ({job-name}) show -+ -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ pageHeight 36 mul % y = pageHeight * 1/2 * 72 -+ pageHeight -1 mul add % y -= 1 line -+ 2 copy % Copy X & Y -+ moveto -+ (Requesting User: ) RIGHT -+ moveto -+ ({job-originating-user-name}) show -+ -+ pageWidth 36 mul % x = pageWidth * 1/2 * 72 -+ pageHeight 36 mul % y = pageHeight * 1/2 * 72 -+ pageHeight -4 mul add % y -= 2 lines -+ 2 copy % Copy X & Y -+ moveto -+ (Billing Info: ) RIGHT -+ moveto -+ ({?job-billing}) show -+ -+ % Then the CUPS logo.... -+ gsave -+ pageWidth 4 mul -+ pageWidth 6 mul -+ translate -+ pageWidth 9 mul CUPSLOGO -+ grestore -+ -+ % And the ESP logo.... -+ gsave -+ pageWidth 59 mul -+ pageWidth 6 mul -+ translate -+ pageWidth 6 mul ESPLOGO -+ grestore -+% Show the page... -+grestore -+showpage -+% -+% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $". -+% -+%%EOF -diff -up cups-1.4.5/filter/common.c.lspp cups-1.4.5/filter/common.c ---- cups-1.4.5/filter/common.c.lspp 2007-07-11 22:46:42.000000000 +0100 -+++ cups-1.4.5/filter/common.c 2010-12-24 13:21:31.181858180 +0000 -@@ -30,6 +30,12 @@ - * Include necessary headers... - */ - -+#include "config.h" -+#ifdef WITH_LSPP -+#define _GNU_SOURCE -+#include <string.h> -+#endif /* WITH_LSPP */ -+ - #include "common.h" - #include <locale.h> - -@@ -312,6 +318,18 @@ WriteLabelProlog(const char *label, /* I - { - const char *classification; /* CLASSIFICATION environment variable */ - const char *ptr; /* Temporary string pointer */ -+#ifdef WITH_LSPP -+ int i, /* counter */ -+ n, /* counter */ -+ lines, /* number of lines needed */ -+ line_len, /* index into tmp_label */ -+ label_len, /* length of the label in characters */ -+ label_index, /* index into the label */ -+ longest, /* length of the longest line */ -+ longest_line, /* index to the longest line */ -+ max_width; /* maximum width in characters */ -+ char **wrapped_label; /* label with line breaks */ -+#endif /* WITH_LSPP */ - - - /* -@@ -334,6 +352,124 @@ WriteLabelProlog(const char *label, /* I - return; - } - -+#ifdef WITH_LSPP -+ if (strncmp(classification, "LSPP:", 5) == 0 && label == NULL) -+ { -+ /* -+ * Based on the 12pt fixed width font below determine the max_width -+ */ -+ max_width = width / 8; -+ longest_line = 0; -+ longest = 0; -+ classification += 5; // Skip the "LSPP:" -+ label_len = strlen(classification); -+ -+ if (label_len > max_width) -+ { -+ lines = 1 + (int)(label_len / max_width); -+ line_len = (int)(label_len / lines); -+ wrapped_label = malloc(sizeof(wrapped_label) * lines); -+ label_index = i = n = 0; -+ while (classification[label_index]) -+ { -+ if ((label_index + line_len) > label_len) -+ break; -+ switch (classification[label_index + line_len + i]) -+ { -+ case ':': -+ case ',': -+ case '-': -+ i++; -+ wrapped_label[n++] = strndup(&classification[label_index], (line_len + i)); -+ label_index += line_len + i; -+ i = 0; -+ break; -+ default: -+ i++; -+ break; -+ } -+ if ((i + line_len) == max_width) -+ { -+ wrapped_label[n++] = strndup(&(classification[label_index]), (line_len + i)); -+ label_index = label_index + line_len + i; -+ i = 0; -+ } -+ } -+ wrapped_label[n] = strndup(&classification[label_index], label_len - label_index); -+ } -+ else -+ { -+ lines = 1; -+ wrapped_label = malloc(sizeof(wrapped_label)); -+ wrapped_label[0] = (char*)classification; -+ } -+ -+ for (n = 0; n < lines; n++ ) -+ { -+ printf("userdict/ESPp%c(", ('a' + n)); -+ for (ptr = wrapped_label[n], i = 0; *ptr; ptr ++, i++) -+ if (*ptr < 32 || *ptr > 126) -+ printf("\\%03o", *ptr); -+ else -+ { -+ if (*ptr == '(' || *ptr == ')' || *ptr == '\\') -+ putchar('\\'); -+ -+ printf("%c", *ptr); -+ } -+ if (i > longest) -+ { -+ longest = i; -+ longest_line = n; -+ } -+ printf(")put\n"); -+ } -+ -+ /* -+ * For LSPP use a fixed width font so that line wrapping can be calculated -+ */ -+ -+ puts("userdict/ESPlf /Nimbus-Mono findfont 12 scalefont put"); -+ -+ /* -+ * Finally, the procedure to write the labels on the page... -+ */ -+ -+ printf("userdict/ESPwl{\n" -+ " ESPlf setfont\n"); -+ printf(" ESPp%c stringwidth pop dup 12 add exch -0.5 mul %.0f add\n ", -+ 'a' + longest_line, width * 0.5f); -+ for (n = 1; n < lines; n++) -+ printf(" dup"); -+ printf("\n 1 setgray\n"); -+ printf(" dup 6 sub %.0f %d index %.0f ESPrf\n", -+ (bottom - 2.0), (2 + lines), 6.0 + (16.0 * lines)); -+ printf(" dup 6 sub %.0f %d index %.0f ESPrf\n", -+ (top - 6.0 - (16.0 * lines)), (2 + lines), 4.0 + (16.0 * lines)); -+ printf(" 0 setgray\n"); -+ printf(" dup 6 sub %.0f %d index %.0f ESPrs\n", -+ (bottom - 2.0), (2 + lines), 6.0 + (16.0 * lines)); -+ printf(" dup 6 sub %.0f %d index %.0f ESPrs\n", -+ (top - 6.0 - (16.0 * lines)), (2 + lines), 4.0 + (16.0 * lines)); -+ for (n = 0; n < lines; n ++) -+ { -+ printf(" dup %.0f moveto ESPp%c show\n", -+ bottom + 6.0 + ((lines - (n+1)) * 16.0), 'a' + n); -+ printf(" %.0f moveto ESPp%c show\n", top + 2.0 - ((n + 1) * 16.0), 'a' + n); -+ } -+ printf(" pop\n" -+ "}bind put\n"); -+ -+ /* -+ * Do some clean up at the end of the LSPP special case -+ */ -+ free(wrapped_label); -+ -+ } -+ else -+ { -+#endif /* !WITH_LSPP */ -+ - /* - * Set the classification + page label string... - */ -@@ -414,7 +550,10 @@ WriteLabelProlog(const char *label, /* I - printf(" %.0f moveto ESPpl show\n", top - 14.0); - puts("pop"); - puts("}bind put"); -+ } -+#ifdef WITH_LSPP - } -+#endif /* WITH_LSPP */ - - - /* -diff -up cups-1.4.5/filter/pstops.c.lspp cups-1.4.5/filter/pstops.c ---- cups-1.4.5/filter/pstops.c.lspp 2010-12-24 13:21:30.960863932 +0000 -+++ cups-1.4.5/filter/pstops.c 2010-12-24 13:21:31.186858049 +0000 -@@ -3335,6 +3335,18 @@ write_label_prolog(pstops_doc_t *doc, /* - { - const char *classification; /* CLASSIFICATION environment variable */ - const char *ptr; /* Temporary string pointer */ -+#ifdef WITH_LSPP -+ int i, /* counter */ -+ n, /* counter */ -+ lines, /* number of lines needed */ -+ line_len, /* index into tmp_label */ -+ label_len, /* length of the label in characters */ -+ label_index, /* index into the label */ -+ longest, /* length of the longest line */ -+ longest_line, /* index to the longest line */ -+ max_width; /* maximum width in characters */ -+ char **wrapped_label; /* label with line breaks */ -+#endif /* WITH_LSPP */ - - - /* -@@ -3357,6 +3369,124 @@ write_label_prolog(pstops_doc_t *doc, /* - return; - } - -+#ifdef WITH_LSPP -+ if (strncmp(classification, "LSPP:", 5) == 0 && label == NULL) -+ { -+ /* -+ * Based on the 12pt fixed width font below determine the max_width -+ */ -+ max_width = width / 8; -+ longest_line = 0; -+ longest = 0; -+ classification += 5; // Skip the "LSPP:" -+ label_len = strlen(classification); -+ -+ if (label_len > max_width) -+ { -+ lines = 1 + (int)(label_len / max_width); -+ line_len = (int)(label_len / lines); -+ wrapped_label = malloc(sizeof(wrapped_label) * lines); -+ label_index = i = n = 0; -+ while (classification[label_index]) -+ { -+ if ((label_index + line_len) > label_len) -+ break; -+ switch (classification[label_index + line_len + i]) -+ { -+ case ':': -+ case ',': -+ case '-': -+ i++; -+ wrapped_label[n++] = strndup(&classification[label_index], (line_len + i)); -+ label_index += line_len + i; -+ i = 0; -+ break; -+ default: -+ i++; -+ break; -+ } -+ if ((i + line_len) == max_width) -+ { -+ wrapped_label[n++] = strndup(&(classification[label_index]), (line_len + i)); -+ label_index = label_index + line_len + i; -+ i = 0; -+ } -+ } -+ wrapped_label[n] = strndup(&classification[label_index], label_len - label_index); -+ } -+ else -+ { -+ lines = 1; -+ wrapped_label = malloc(sizeof(wrapped_label)); -+ wrapped_label[0] = (char*)classification; -+ } -+ -+ for (n = 0; n < lines; n++ ) -+ { -+ printf("userdict/ESPp%c(", ('a' + n)); -+ for (ptr = wrapped_label[n], i = 0; *ptr; ptr ++, i++) -+ if (*ptr < 32 || *ptr > 126) -+ printf("\\%03o", *ptr); -+ else -+ { -+ if (*ptr == '(' || *ptr == ')' || *ptr == '\\') -+ putchar('\\'); -+ -+ printf("%c", *ptr); -+ } -+ if (i > longest) -+ { -+ longest = i; -+ longest_line = n; -+ } -+ printf(")put\n"); -+ } -+ -+ /* -+ * For LSPP use a fixed width font so that line wrapping can be calculated -+ */ -+ -+ puts("userdict/ESPlf /Nimbus-Mono findfont 12 scalefont put"); -+ -+ /* -+ * Finally, the procedure to write the labels on the page... -+ */ -+ -+ printf("userdict/ESPwl{\n" -+ " ESPlf setfont\n"); -+ printf(" ESPp%c stringwidth pop dup 12 add exch -0.5 mul %.0f add\n ", -+ 'a' + longest_line, width * 0.5f); -+ for (n = 1; n < lines; n++) -+ printf(" dup"); -+ printf("\n 1 setgray\n"); -+ printf(" dup 6 sub %.0f %d index %.0f ESPrf\n", -+ (bottom - 2.0), (2 + lines), 6.0 + (16.0 * lines)); -+ printf(" dup 6 sub %.0f %d index %.0f ESPrf\n", -+ (top - 6.0 - (16.0 * lines)), (2 + lines), 4.0 + (16.0 * lines)); -+ printf(" 0 setgray\n"); -+ printf(" dup 6 sub %.0f %d index %.0f ESPrs\n", -+ (bottom - 2.0), (2 + lines), 6.0 + (16.0 * lines)); -+ printf(" dup 6 sub %.0f %d index %.0f ESPrs\n", -+ (top - 6.0 - (16.0 * lines)), (2 + lines), 4.0 + (16.0 * lines)); -+ for (n = 0; n < lines; n ++) -+ { -+ printf(" dup %.0f moveto ESPp%c show\n", -+ bottom + 6.0 + ((lines - (n+1)) * 16.0), 'a' + n); -+ printf(" %.0f moveto ESPp%c show\n", top + 2.0 - ((n + 1) * 16.0), 'a' + n); -+ } -+ printf(" pop\n" -+ "}bind put\n"); -+ -+ /* -+ * Do some clean up at the end of the LSPP special case -+ */ -+ free(wrapped_label); -+ -+ } -+ else -+ { -+#endif /* !WITH_LSPP */ -+ - /* - * Set the classification + page label string... - */ -@@ -3435,7 +3565,10 @@ write_label_prolog(pstops_doc_t *doc, /* - doc_printf(doc, " %.0f moveto ESPpl show\n", top - 14.0); - doc_puts(doc, "pop\n"); - doc_puts(doc, "}bind put\n"); -+ } -+#ifdef WITH_LSPP - } -+#endif /* WITH_LSPP */ - - - /* -diff -up cups-1.4.5/Makedefs.in.lspp cups-1.4.5/Makedefs.in ---- cups-1.4.5/Makedefs.in.lspp 2010-12-24 13:21:31.073860989 +0000 -+++ cups-1.4.5/Makedefs.in 2010-12-24 13:21:31.187858023 +0000 -@@ -146,7 +146,7 @@ LIBCUPSORDER = @LIBCUPSORDER@ - LIBCUPSIMAGEORDER = @LIBCUPSIMAGEORDER@ - LINKCUPS = @LINKCUPS@ $(SSLLIBS) $(DNSSDLIBS) - LINKCUPSIMAGE = @LINKCUPSIMAGE@ --LIBS = $(LINKCUPS) $(COMMONLIBS) -+LIBS = $(LINKCUPS) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@ - OPTIM = @OPTIM@ - OPTIONS = - PAMLIBS = @PAMLIBS@ -@@ -258,7 +258,7 @@ DBUSDIR = @DBUSDIR@ - # Rules... - # - --.SILENT: -+ - .SUFFIXES: .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz - - .c.o: -diff -up cups-1.4.5/scheduler/client.c.lspp cups-1.4.5/scheduler/client.c ---- cups-1.4.5/scheduler/client.c.lspp 2010-10-17 05:13:56.000000000 +0100 -+++ cups-1.4.5/scheduler/client.c 2010-12-24 13:21:31.194857839 +0000 -@@ -44,6 +44,7 @@ - * valid_host() - Is the Host: field valid? - * write_file() - Send a file via HTTP. - * write_pipe() - Flag that data is available on the CGI pipe. -+ * client_pid_to_auid() - Get the audit login uid of the client. - */ - - /* -@@ -52,6 +53,7 @@ - - #include "cupsd.h" - -+#define _GNU_SOURCE - #ifdef HAVE_CDSASSL - # include <Security/Security.h> - # include <Security/SecItem.h> -@@ -90,6 +92,12 @@ extern const char *cssmErrorString(int e - # include <tcpd.h> - #endif /* HAVE_TCPD_H */ - -+#ifdef WITH_LSPP -+#include <selinux/selinux.h> -+#include <selinux/context.h> -+#include <fcntl.h> -+#endif /* WITH_LSPP */ -+ - - /* - * Local functions... -@@ -391,6 +399,57 @@ cupsdAcceptClient(cupsd_listener_t *lis) - } - #endif /* HAVE_TCPD_H */ - -+#ifdef WITH_LSPP -+ if (is_lspp_config()) -+ { -+ struct ucred cr; -+ unsigned int cl=sizeof(cr); -+ -+ if (getsockopt(con->http.fd, SOL_SOCKET, SO_PEERCRED, &cr, &cl) == 0) -+ { -+ /* -+ * client_pid_to_auid() can be racey -+ * In this case the pid is based on a socket connected to the client -+ */ -+ if ((con->auid = client_pid_to_auid(cr.pid)) == -1) -+ { -+ close(con->http.fd); -+ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: " -+ "unable to determine client auid for client pid=%d", cr.pid); -+ free(con); -+ return; -+ } -+ cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: peer's pid=%d, uid=%d, gid=%d, auid=%d", -+ cr.pid, cr.uid, cr.gid, con->auid); -+ } -+ else -+ { -+ close(con->http.fd); -+ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getsockopt() failed"); -+ free(con); -+ return; -+ } -+ -+ /* -+ * get the context of the peer connection -+ */ -+ if (getpeercon(con->http.fd, &con->scon)) -+ { -+ close(con->http.fd); -+ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdAcceptClient: getpeercon() failed"); -+ free(con); -+ return; -+ } -+ -+ cupsdLogMessage(CUPSD_LOG_INFO, "cupsdAcceptClient: client context=%s", con->scon); -+ } -+ else -+ { -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: skipping getpeercon()"); -+ cupsdSetString(&con->scon, UNKNOWN_SL); -+ } -+#endif /* WITH_LSPP */ -+ - #ifdef AF_INET6 - if (con->http.hostaddr->addr.sa_family == AF_INET6) - cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)", -@@ -781,6 +840,13 @@ cupsdReadClient(cupsd_client_t *con) /* - mime_type_t *type; /* MIME type of file */ - cupsd_printer_t *p; /* Printer */ - static unsigned request_id = 0; /* Request ID for temp files */ -+#ifdef WITH_LSPP -+ security_context_t spoolcon; /* context of the job file */ -+ context_t clicon; /* contex_t container for con->scon */ -+ context_t tmpcon; /* temp context to swap the level */ -+ char *clirange; /* SELinux sensitivity range */ -+ char *cliclearance; /* SELinux low end clearance */ -+#endif /* WITH_LSPP */ - - - status = HTTP_CONTINUE; -@@ -2135,6 +2201,67 @@ cupsdReadClient(cupsd_client_t *con) /* - fchmod(con->file, 0640); - fchown(con->file, RunUser, Group); - fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC); -+#ifdef WITH_LSPP -+ if (strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) -+ { -+ if (getfilecon(con->filename, &spoolcon) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE); -+ return (cupsdCloseClient(con)); -+ } -+ clicon = context_new(con->scon); -+ tmpcon = context_new(spoolcon); -+ freecon(spoolcon); -+ if (!clicon || !tmpcon) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE); -+ if (clicon) -+ context_free(clicon); -+ if (tmpcon) -+ context_free(tmpcon); -+ return (cupsdCloseClient(con)); -+ } -+ clirange = context_range_get(clicon); -+ if (clirange) -+ { -+ clirange = strdup(clirange); -+ if ((cliclearance = strtok(clirange, "-")) != NULL) -+ { -+ if (context_range_set(tmpcon, cliclearance) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE); -+ free(clirange); -+ context_free(tmpcon); -+ context_free(clicon); -+ return (cupsdCloseClient(con)); -+ } -+ } -+ else -+ { -+ if (context_range_set(tmpcon, (context_range_get(clicon))) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE); -+ free(clirange); -+ context_free(tmpcon); -+ context_free(clicon); -+ return (cupsdCloseClient(con)); -+ } -+ } -+ free(clirange); -+ } -+ if (setfilecon(con->filename, context_str(tmpcon)) == -1) -+ { -+ cupsdSendError(con, HTTP_SERVER_ERROR, CUPSD_AUTH_NONE); -+ context_free(tmpcon); -+ context_free(clicon); -+ return (cupsdCloseClient(con)); -+ } -+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdReadClient: %s set to %s", -+ con->filename, context_str(tmpcon)); -+ context_free(tmpcon); -+ context_free(clicon); -+ } -+#endif /* WITH_LSPP */ - } - - if (con->http.state != HTTP_POST_SEND) -@@ -4641,6 +4768,50 @@ make_certificate(cupsd_client_t *con) /* - #endif /* HAVE_SSL */ - - -+#ifdef WITH_LSPP -+/* -+ * 'client_pid_to_auid()' - Using the client's pid, read /proc and determine the loginuid. -+ */ -+ -+uid_t client_pid_to_auid(pid_t clipid) -+{ -+ uid_t uid; -+ int len, in; -+ char buf[16] = {0}; -+ char fname[32] = {0}; -+ -+ -+ /* -+ * Hopefully this pid is still the one we are interested in. -+ */ -+ snprintf(fname, 32, "/proc/%d/loginuid", clipid); -+ in = open(fname, O_NOFOLLOW|O_RDONLY); -+ -+ if (in < 0) -+ return -1; -+ -+ errno = 0; -+ -+ do { -+ len = read(in, buf, sizeof(buf)); -+ } while (len < 0 && errno == EINTR); -+ -+ close(in); -+ -+ if (len < 0 || len >= sizeof(buf)) -+ return -1; -+ -+ errno = 0; -+ buf[len] = 0; -+ uid = strtol(buf, 0, 10); -+ -+ if (errno != 0) -+ return -1; -+ else -+ return uid; -+} -+#endif /* WITH_LSPP */ -+ - /* - * 'pipe_command()' - Pipe the output of a command to the remote client. - */ -diff -up cups-1.4.5/scheduler/client.h.lspp cups-1.4.5/scheduler/client.h ---- cups-1.4.5/scheduler/client.h.lspp 2009-05-26 23:01:23.000000000 +0100 -+++ cups-1.4.5/scheduler/client.h 2010-12-24 13:21:31.195857813 +0000 -@@ -18,6 +18,13 @@ - #endif /* HAVE_AUTHORIZATION_H */ - - -+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ -+ -+#ifdef WITH_LSPP -+#include <selinux/selinux.h> -+#endif /* WITH_LSPP */ -+ - /* - * HTTP client structure... - */ -@@ -64,6 +71,10 @@ struct cupsd_client_s - #ifdef HAVE_AUTHORIZATION_H - AuthorizationRef authref; /* Authorization ref */ - #endif /* HAVE_AUTHORIZATION_H */ -+#ifdef WITH_LSPP -+ security_context_t scon; /* Security context of connection */ -+ uid_t auid; /* Audit loginuid of the client */ -+#endif /* WITH_LSPP */ - }; - - #define HTTP(con) &((con)->http) -@@ -133,6 +144,9 @@ extern void cupsdStartListening(void); - extern void cupsdStopListening(void); - extern void cupsdUpdateCGI(void); - extern void cupsdWriteClient(cupsd_client_t *con); -+#ifdef WITH_LSPP -+extern uid_t client_pid_to_auid(pid_t clipid); -+#endif /* WITH_LSPP */ - - - /* -diff -up cups-1.4.5/scheduler/conf.c.lspp cups-1.4.5/scheduler/conf.c ---- cups-1.4.5/scheduler/conf.c.lspp 2010-12-24 13:21:30.897865572 +0000 -+++ cups-1.4.5/scheduler/conf.c 2010-12-24 13:21:31.200857684 +0000 -@@ -29,6 +29,7 @@ - * read_configuration() - Read a configuration file. - * read_location() - Read a <Location path> definition. - * read_policy() - Read a <Policy name> definition. -+ * is_lspp_config() - Is the system configured for LSPP - */ - - /* -@@ -54,6 +55,9 @@ - # define INADDR_NONE 0xffffffff - #endif /* !INADDR_NONE */ - -+#ifdef WITH_LSPP -+# include <libaudit.h> -+#endif /* WITH_LSPP */ - - /* - * Configuration variable structure... -@@ -172,6 +176,10 @@ static const cupsd_var_t variables[] = - # if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS) - { "ServerKey", &ServerKey, CUPSD_VARTYPE_PATHNAME }, - # endif /* HAVE_LIBSSL || HAVE_GNUTLS */ -+#ifdef WITH_LSPP -+ { "AuditLog", &AuditLog, CUPSD_VARTYPE_INTEGER }, -+ { "PerPageLabels", &PerPageLabels, CUPSD_VARTYPE_BOOLEAN }, -+#endif /* WITH_LSPP */ - #endif /* HAVE_SSL */ - { "ServerName", &ServerName, CUPSD_VARTYPE_STRING }, - { "ServerRoot", &ServerRoot, CUPSD_VARTYPE_PATHNAME }, -@@ -430,6 +438,9 @@ cupsdReadConfiguration(void) - const char *tmpdir; /* TMPDIR environment variable */ - struct stat tmpinfo; /* Temporary directory info */ - cupsd_policy_t *p; /* Policy */ -+#ifdef WITH_LSPP -+ char *audit_message; /* Audit message string */ -+#endif /* WITH_LSPP */ - - - /* -@@ -713,6 +724,25 @@ cupsdReadConfiguration(void) - - RunUser = getuid(); - -+#ifdef WITH_LSPP -+ if (AuditLog != -1) -+ { -+ /* -+ * ClassifyOverride is set during read_configuration, if its ON, report it now -+ */ -+ if (ClassifyOverride) -+ audit_log_user_message(AuditLog, AUDIT_USYS_CONFIG, -+ "[Config] ClassifyOverride=enabled Users can override print banners", -+ ServerName, NULL, NULL, 1); -+ /* -+ * PerPageLabel is set during read_configuration, if its OFF, report it now -+ */ -+ if (!PerPageLabels) -+ audit_log_user_message(AuditLog, AUDIT_USYS_CONFIG, -+ "[Config] PerPageLabels=disabled", ServerName, NULL, NULL, 1); -+ } -+#endif /* WITH_LSPP */ -+ - cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.", - RemotePort ? "enabled" : "disabled"); - -@@ -1081,11 +1111,23 @@ cupsdReadConfiguration(void) - * Update classification setting as needed... - */ - -- if (Classification && !strcasecmp(Classification, "none")) -+ if (Classification && strcasecmp(Classification, "none") == 0) - cupsdClearString(&Classification); - - if (Classification) -+ { - cupsdLogMessage(CUPSD_LOG_INFO, "Security set to \"%s\"", Classification); -+#ifdef WITH_LSPP -+ if (AuditLog != -1) -+ { -+ audit_message = NULL; -+ cupsdSetStringf(&audit_message, "[Config] Classification=%s", Classification); -+ audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message, -+ ServerName, NULL, NULL, 1); -+ cupsdClearString(&audit_message); -+ } -+#endif /* WITH_LSPP */ -+ } - - /* - * Check the MaxClients setting, and then allocate memory for it... -@@ -3657,6 +3699,18 @@ read_location(cups_file_t *fp, /* I - C - return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum); - } - -+#ifdef WITH_LSPP -+int is_lspp_config() -+{ -+ if (Classification != NULL) -+ return ((strcasecmp(Classification, MLS_CONFIG) == 0) -+ || (strcasecmp(Classification, TE_CONFIG) == 0) -+ || (strcasecmp(Classification, SELINUX_CONFIG) == 0)); -+ else -+ return 0; -+} -+#endif /* WITH_LSPP */ -+ - - /* - * 'read_policy()' - Read a <Policy name> definition. -diff -up cups-1.4.5/scheduler/conf.h.lspp cups-1.4.5/scheduler/conf.h ---- cups-1.4.5/scheduler/conf.h.lspp 2010-12-24 13:21:30.897865572 +0000 -+++ cups-1.4.5/scheduler/conf.h 2010-12-24 13:21:31.202857632 +0000 -@@ -250,6 +250,12 @@ VAR char *ServerKey VALUE(NULL); - VAR int SSLOptions VALUE(CUPSD_SSL_NONE); - /* SSL/TLS options */ - #endif /* HAVE_SSL */ -+#ifdef WITH_LSPP -+VAR int AuditLog VALUE(-1), -+ /* File descriptor for audit */ -+ PerPageLabels VALUE(TRUE); -+ /* Put the label on each page */ -+#endif /* WITH_LSPP */ - - #ifdef HAVE_LAUNCHD - VAR int LaunchdTimeout VALUE(DEFAULT_KEEPALIVE); -@@ -266,6 +272,9 @@ VAR char *SystemGroupAuthKey VALUE(NULL - /* System group auth key */ - #endif /* HAVE_AUTHORIZATION_H */ - -+#ifdef WITH_LSPP -+extern int is_lspp_config(void); -+#endif /* WITH_LSPP */ - - /* - * Prototypes... -diff -up cups-1.4.5/scheduler/ipp.c.lspp cups-1.4.5/scheduler/ipp.c ---- cups-1.4.5/scheduler/ipp.c.lspp 2010-12-24 13:21:31.114859924 +0000 -+++ cups-1.4.5/scheduler/ipp.c 2010-12-24 13:21:31.217857242 +0000 -@@ -41,6 +41,7 @@ - * cancel_all_jobs() - Cancel all print jobs. - * cancel_job() - Cancel a print job. - * cancel_subscription() - Cancel a subscription. -+ * check_context() - Check the SELinux context for a user and job - * check_quotas() - Check quotas for a printer and user. - * check_rss_recipient() - Check that we do not have a duplicate RSS - * feed URI. -@@ -102,6 +103,9 @@ - * validate_user() - Validate the user for the request. - */ - -+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ -+ - /* - * Include necessary headers... - */ -@@ -124,6 +128,14 @@ extern int mbr_check_membership_by_id(uu - # endif /* HAVE_MEMBERSHIPPRIV_H */ - #endif /* __APPLE__ */ - -+#ifdef WITH_LSPP -+#include <libaudit.h> -+#include <selinux/selinux.h> -+#include <selinux/context.h> -+#include <selinux/avc.h> -+#include <selinux/flask.h> -+#include <selinux/av_permissions.h> -+#endif /* WITH_LSPP */ - - /* - * Local functions... -@@ -157,6 +169,9 @@ static void cancel_all_jobs(cupsd_client - static void cancel_job(cupsd_client_t *con, ipp_attribute_t *uri); - static void cancel_subscription(cupsd_client_t *con, int id); - static int check_rss_recipient(const char *recipient); -+#ifdef WITH_LSPP -+static int check_context(cupsd_client_t *con, cupsd_job_t *job); -+#endif /* WITH_LSPP */ - static int check_quotas(cupsd_client_t *con, cupsd_printer_t *p); - static ipp_attribute_t *copy_attribute(ipp_t *to, ipp_attribute_t *attr, - int quickcopy); -@@ -1354,6 +1369,21 @@ add_job(cupsd_client_t *con, /* I - Cl - ipp_attribute_t *media_col, /* media-col attribute */ - *media_margin; /* media-*-margin attribute */ - ipp_t *unsup_col; /* media-col in unsupported response */ -+#ifdef WITH_LSPP -+ char *audit_message; /* Audit message string */ -+ char *printerfile; /* device file pointed to by the printer */ -+ char *userheader = NULL; /* User supplied job-sheets[0] */ -+ char *userfooter = NULL; /* User supplied job-sheets[1] */ -+ int override = 0; /* Was a banner overrode on a job */ -+ security_id_t clisid; /* SELinux SID for the client */ -+ security_id_t psid; /* SELinux SID for the printer */ -+ context_t printercon; /* Printer's context string */ -+ struct stat printerstat; /* Printer's stat buffer */ -+ security_context_t devcon; /* Printer's SELinux context */ -+ struct avc_entry_ref avcref; /* Pointer to the access vector cache */ -+ security_class_t tclass; /* Object class for the SELinux check */ -+ access_vector_t avr; /* Access method being requested */ -+#endif /* WITH_LSPP */ - - - cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))", -@@ -1612,6 +1642,106 @@ add_job(cupsd_client_t *con, /* I - Cl - ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL, - "Untitled"); - -+#ifdef WITH_LSPP -+ if (is_lspp_config()) -+ { -+ if (!con->scon || strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) == 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "add_job: missing classification for connection \'%s\'!", printer->name); -+ send_ipp_status(con, IPP_INTERNAL_ERROR, _("Missing required security attributes.")); -+ return (NULL); -+ } -+ -+ /* -+ * Perform an access check so that if the user gets feedback at enqueue time -+ */ -+ -+ printerfile = strstr(printer->device_uri, "/dev/"); -+ if (printerfile == NULL && (strncmp(printer->device_uri, "file:/", 6) == 0)) -+ printerfile = printer->device_uri + strlen("file:"); -+ -+ if (printerfile != NULL) -+ { -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "add_job: Attempting an access check on printer device %s", -+ printerfile); -+ -+ if (lstat(printerfile, &printerstat) < 0) -+ { -+ if (errno != ENOENT) -+ { -+ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Unable to stat the printer")); -+ return (NULL); -+ } -+ /* -+ * The printer does not exist, so for now assume it's a FileDevice -+ */ -+ tclass = SECCLASS_FILE; -+ avr = FILE__WRITE; -+ } -+ else if (S_ISCHR(printerstat.st_mode)) -+ { -+ tclass = SECCLASS_CHR_FILE; -+ avr = CHR_FILE__WRITE; -+ } -+ else if (S_ISREG(printerstat.st_mode)) -+ { -+ tclass = SECCLASS_FILE; -+ avr = FILE__WRITE; -+ } -+ else -+ { -+ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Printer is not a character device or regular file")); -+ return (NULL); -+ } -+ static avc_initialized = 0; -+ if (!avc_initialized++) -+ avc_init("cupsd_enqueue_", NULL, NULL, NULL, NULL); -+ avc_entry_ref_init(&avcref); -+ if (avc_context_to_sid(con->scon, &clisid) != 0) -+ { -+ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Unable to get the SELinux sid of the client")); -+ return (NULL); -+ } -+ if (getfilecon(printerfile, &devcon) == -1) -+ { -+ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Unable to get the SELinux context of the printer")); -+ return (NULL); -+ } -+ printercon = context_new(devcon); -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "add_job: printer context %s client context %s", -+ context_str(printercon), con->scon); -+ context_free(printercon); -+ -+ if (avc_context_to_sid(devcon, &psid) != 0) -+ { -+ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("Unable to get the SELinux sid of the printer")); -+ freecon(devcon); -+ return (NULL); -+ } -+ freecon(devcon); -+ if (avc_has_perm(clisid, psid, tclass, avr, &avcref, NULL) != 0) -+ { -+ /* -+ * The access check failed, so cancel the job and send an audit message -+ */ -+ if (AuditLog != -1) -+ { -+ audit_message = NULL; -+ cupsdSetStringf(&audit_message, "job=? auid=%u acct=%s obj=%s refused" -+ " unable to access printer=%s", con->auid, -+ con->username, con->scon, printer->name); -+ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, -+ ServerName, NULL, NULL, 0); -+ cupsdClearString(&audit_message); -+ } -+ -+ send_ipp_status(con, IPP_NOT_AUTHORIZED, _("SELinux prohibits access to the printer")); -+ return (NULL); -+ } -+ } -+ } -+#endif /* WITH_LSPP */ -+ - if ((job = cupsdAddJob(priority, printer->name)) == NULL) - { - send_ipp_status(con, IPP_INTERNAL_ERROR, -@@ -1620,6 +1750,32 @@ add_job(cupsd_client_t *con, /* I - Cl - return (NULL); - } - -+#ifdef WITH_LSPP -+ if (is_lspp_config()) -+ { -+ /* -+ * duplicate the security context and auid of the connection into the job structure -+ */ -+ job->scon = strdup(con->scon); -+ job->auid = con->auid; -+ -+ /* -+ * add the security context to the request so that on a restart the security -+ * attributes will be able to be restored -+ */ -+ ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "security-context", -+ NULL, job->scon); -+ } -+ else -+ { -+ /* -+ * Fill in the security context of the job as unlabeled -+ */ -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "add_job: setting context of job to %s", UNKNOWN_SL); -+ cupsdSetString(&job->scon, UNKNOWN_SL); -+ } -+#endif /* WITH_LSPP */ -+ - job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT | - CUPS_PRINTER_REMOTE); - job->attrs = con->request; -@@ -1825,6 +1981,29 @@ add_job(cupsd_client_t *con, /* I - Cl - attr->values[0].string.text = _cupsStrRetain(printer->job_sheets[0]); - attr->values[1].string.text = _cupsStrRetain(printer->job_sheets[1]); - } -+#ifdef WITH_LSPP -+ else -+ { -+ /* -+ * The option was present, so capture the user supplied strings -+ */ -+ userheader = strdup(attr->values[0].string.text); -+ -+ if (attr->num_values > 1) -+ userfooter = strdup(attr->values[1].string.text); -+ -+ if (Classification != NULL && (strcmp(userheader, Classification) == 0) -+ && userfooter &&(strcmp(userfooter, Classification) == 0)) -+ { -+ /* -+ * Since both values are Classification, the user is not trying to Override -+ */ -+ free(userheader); -+ if (userfooter) free(userfooter); -+ userheader = userfooter = NULL; -+ } -+ } -+#endif /* WITH_LSPP */ - - job->job_sheets = attr; - -@@ -1855,6 +2034,9 @@ add_job(cupsd_client_t *con, /* I - Cl - "job-sheets=\"%s,none\", " - "job-originating-user-name=\"%s\"", - Classification, job->username); -+#ifdef WITH_LSPP -+ override = 1; -+#endif /* WITH_LSPP */ - } - else if (attr->num_values == 2 && - strcmp(attr->values[0].string.text, -@@ -1873,6 +2055,9 @@ add_job(cupsd_client_t *con, /* I - Cl - "job-originating-user-name=\"%s\"", - attr->values[0].string.text, - attr->values[1].string.text, job->username); -+#ifdef WITH_LSPP -+ override = 1; -+#endif /* WITH_LSPP */ - } - else if (strcmp(attr->values[0].string.text, Classification) && - strcmp(attr->values[0].string.text, "none") && -@@ -1893,6 +2078,9 @@ add_job(cupsd_client_t *con, /* I - Cl - "job-originating-user-name=\"%s\"", - attr->values[0].string.text, - attr->values[1].string.text, job->username); -+#ifdef WITH_LSPP -+ override = 1; -+#endif /* WITH_LSPP */ - } - } - else if (strcmp(attr->values[0].string.text, Classification) && -@@ -1933,8 +2121,52 @@ add_job(cupsd_client_t *con, /* I - Cl - "job-sheets=\"%s\", " - "job-originating-user-name=\"%s\"", - Classification, job->username); -+#ifdef WITH_LSPP -+ override = 1; -+#endif /* WITH_LSPP */ -+ } -+#ifdef WITH_LSPP -+ if (is_lspp_config() && AuditLog != -1) -+ { -+ audit_message = NULL; -+ -+ if (userheader || userfooter) -+ { -+ if (!override) -+ { -+ /* -+ * The user overrode the banner, so audit it -+ */ -+ cupsdSetStringf(&audit_message, "job=%d user supplied job-sheets=%s,%s" -+ " using banners=%s,%s", job->id, userheader, -+ userfooter, attr->values[0].string.text, -+ (attr->num_values > 1) ? attr->values[1].string.text : "(null)"); -+ audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message, -+ ServerName, NULL, NULL, 1); -+ } -+ else -+ { -+ /* -+ * The user tried to override the banner, audit the failure -+ */ -+ cupsdSetStringf(&audit_message, "job=%d user supplied job-sheets=%s,%s" -+ " ignored banners=%s,%s", job->id, userheader, -+ userfooter, attr->values[0].string.text, -+ (attr->num_values > 1) ? attr->values[1].string.text : "(null)"); -+ audit_log_user_message(AuditLog, AUDIT_LABEL_OVERRIDE, audit_message, -+ ServerName, NULL, NULL, 0); -+ } -+ cupsdClearString(&audit_message); -+ } - } -+ -+ if (userheader) -+ free(userheader); -+ if (userfooter) -+ free(userfooter); -+#endif /* WITH_LSPP */ - } -+ - - /* - * See if we need to add the starting sheet... -@@ -4289,6 +4521,107 @@ check_rss_recipient( - } - - -+#ifdef WITH_LSPP -+/* -+ * 'check_context()' - Check SELinux security context of a user and job -+ */ -+ -+static int /* O - 1 if OK, 0 if not, -1 on error */ -+check_context(cupsd_client_t *con, /* I - Client connection */ -+ cupsd_job_t *job) /* I - Job */ -+{ -+ int enforcing; /* is SELinux in enforcing mode */ -+ char filename[1024]; /* Filename of the spool file */ -+ security_id_t clisid; /* SELinux SID of the client */ -+ security_id_t jobsid; /* SELinux SID of the job */ -+ security_id_t filesid; /* SELinux SID of the spool file */ -+ struct avc_entry_ref avcref; /* AVC entry cache pointer */ -+ security_class_t tclass; /* SELinux security class */ -+ access_vector_t avr; /* SELinux access being queried */ -+ security_context_t spoolfilecon; /* SELinux context of the spool file */ -+ -+ -+ /* -+ * Validate the input to be sure there are contexts to work with... -+ */ -+ -+ if (con->scon == NULL || job->scon == NULL -+ || strncmp(con->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) == 0 -+ || strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) == 0) -+ return -1; -+ -+ if ((enforcing = security_getenforce()) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "Error while determining SELinux enforcement"); -+ return -1; -+ } -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "check_context: client context %s job context %s", con->scon, job->scon); -+ -+ -+ /* -+ * Initialize the avc engine... -+ */ -+ -+ static avc_initialized = 0; -+ if (! avc_initialized++) -+ { -+ if (avc_init("cupsd", NULL, NULL, NULL, NULL) < 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "check_context: unable avc_init"); -+ return -1; -+ } -+ } -+ if (avc_context_to_sid(con->scon, &clisid) != 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "check_context: unable to convert %s to SELinux sid", con->scon); -+ return -1; -+ } -+ avc_context_to_sid(job->scon, &jobsid); -+ avc_entry_ref_init(&avcref); -+ tclass = SECCLASS_FILE; -+ avr = FILE__READ; -+ -+ /* -+ * Perform the check with the client as the subject, first with the job as the object -+ * if that fails then with the spool file as the object... -+ */ -+ -+ if (avc_has_perm_noaudit(clisid, jobsid, tclass, avr, &avcref, NULL) != 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_INFO, "check_context: SELinux denied access based on the client context"); -+ -+ snprintf(filename, sizeof(filename), "%s/c%05d", RequestRoot, job->id); -+ if (getfilecon(filename, &spoolfilecon) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "check_context: Unable to get spoolfile context"); -+ return -1; -+ } -+ if (avc_context_to_sid(spoolfilecon, &filesid) != 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "check_context: Unable to determine the SELinux sid for the spool file"); -+ freecon(spoolfilecon); -+ return -1; -+ } -+ freecon(spoolfilecon); -+ if (avc_has_perm_noaudit(clisid, filesid, tclass, avr, &avcref, NULL) != 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_INFO, "check_context: SELinux denied access to the spool file"); -+ return 0; -+ } -+ cupsdLogMessage(CUPSD_LOG_INFO, "check_context: SELinux allowed access to the spool file"); -+ return 1; -+ } -+ else -+ if (enforcing == 0) -+ cupsdLogMessage(CUPSD_LOG_INFO, "check_context: allowing operation due to permissive mode"); -+ else -+ cupsdLogMessage(CUPSD_LOG_INFO, "check_context: SELinux allowed access based on the client context"); -+ -+ return 1; -+} -+#endif /* WITH_LSPP */ -+ -+ - /* - * 'check_quotas()' - Check quotas for a printer and user. - */ -@@ -4843,6 +5176,15 @@ copy_banner(cupsd_client_t *con, /* I - - char attrname[255], /* Name of attribute */ - *s; /* Pointer into name */ - ipp_attribute_t *attr; /* Attribute */ -+#ifdef WITH_LSPP -+ const char *mls_label; /* SL of print job */ -+ char *jobrange; /* SELinux sensitivity range */ -+ char *jobclearance; /* SELinux low end clearance */ -+ context_t jobcon; /* SELinux context of the job */ -+ context_t tmpcon; /* Temp context to set the level */ -+ security_context_t spoolcon; /* Context of the file in the spool */ -+#endif /* WITH_LSPP */ -+ - - - cupsdLogMessage(CUPSD_LOG_DEBUG2, -@@ -4878,6 +5220,82 @@ copy_banner(cupsd_client_t *con, /* I - - - fchmod(cupsFileNumber(out), 0640); - fchown(cupsFileNumber(out), RunUser, Group); -+#ifdef WITH_LSPP -+ if (job->scon != NULL && -+ strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) -+ { -+ if (getfilecon(filename, &spoolcon) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "copy_banner: Unable to get the context of the banner file %s - %s", -+ filename, strerror(errno)); -+ job->num_files --; -+ return (0); -+ } -+ tmpcon = context_new(spoolcon); -+ jobcon = context_new(job->scon); -+ freecon(spoolcon); -+ if (!tmpcon || !jobcon) -+ { -+ if (tmpcon) -+ context_free(tmpcon); -+ if (jobcon) -+ context_free(jobcon); -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "copy_banner: Unable to get the SELinux contexts"); -+ job->num_files --; -+ return (0); -+ } -+ jobrange = context_range_get(jobcon); -+ if (jobrange) -+ { -+ jobrange = strdup(jobrange); -+ if ((jobclearance = strtok(jobrange, "-")) != NULL) -+ { -+ if (context_range_set(tmpcon, jobclearance) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "copy_banner: Unable to set the level of the context for file %s - %s", -+ filename, strerror(errno)); -+ free(jobrange); -+ context_free(jobcon); -+ context_free(tmpcon); -+ job->num_files --; -+ return (0); -+ } -+ } -+ else -+ { -+ if (context_range_set(tmpcon, (context_range_get(jobcon))) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "copy_banner: Unable to set the level of the context for file %s - %s", -+ filename, strerror(errno)); -+ free(jobrange); -+ context_free(jobcon); -+ context_free(tmpcon); -+ job->num_files --; -+ return (0); -+ } -+ } -+ free(jobrange); -+ } -+ if (setfilecon(filename, context_str(tmpcon)) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "copy_banner: Unable to set the context of the banner file %s - %s", -+ filename, strerror(errno)); -+ context_free(jobcon); -+ context_free(tmpcon); -+ job->num_files --; -+ return (0); -+ } -+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "copy_banner: %s set to %s", -+ filename, context_str(tmpcon)); -+ context_free(jobcon); -+ context_free(tmpcon); -+ } -+#endif /* WITH_LSPP */ - - /* - * Try the localized banner file under the subdirectory... -@@ -4972,6 +5390,24 @@ copy_banner(cupsd_client_t *con, /* I - - else - s = attrname; - -+#ifdef WITH_LSPP -+ if (strcmp(s, "mls-label") == 0) -+ { -+ if (job->scon != NULL && strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) -+ { -+ jobcon = context_new(job->scon); -+ if (strcasecmp(name, MLS_CONFIG) == 0) -+ mls_label = context_range_get(jobcon); -+ else if (strcasecmp(name, TE_CONFIG) == 0) -+ mls_label = context_type_get(jobcon); -+ else // default to using the whole context string -+ mls_label = context_str(jobcon); -+ cupsFilePuts(out, mls_label); -+ context_free(jobcon); -+ } -+ continue; -+ } -+#endif /* WITH_LSPP */ - if (!strcmp(s, "printer-name")) - { - cupsFilePuts(out, job->dest); -@@ -6945,6 +7381,22 @@ get_job_attrs(cupsd_client_t *con, /* I - return; - } - -+ -+#ifdef WITH_LSPP -+ /* -+ * Check SELinux... -+ */ -+ if (is_lspp_config() && check_context(con, job) != 1) -+ { -+ /* -+ * Unfortunately we have to lie to the user... -+ */ -+ send_ipp_status(con, IPP_NOT_FOUND, _("Job #%d does not exist!"), jobid); -+ return; -+ } -+#endif /* WITH_LSPP */ -+ -+ - /* - * Copy attributes... - */ -@@ -7175,6 +7627,11 @@ get_jobs(cupsd_client_t *con, /* I - C - if (username[0] && strcasecmp(username, job->username)) - continue; - -+#ifdef WITH_LSPP -+ if (is_lspp_config() && check_context(con, job) != 1) -+ continue; -+#endif /* WITH_LSPP */ -+ - if (count > 0) - ippAddSeparator(con->response); - -@@ -11594,6 +12051,11 @@ validate_user(cupsd_job_t *job, /* I - - strlcpy(username, get_username(con), userlen); - -+#ifdef WITH_LSPP -+ if (is_lspp_config() && check_context(con, job) != 1) -+ return 0; -+#endif /* WITH_LSPP */ -+ - /* - * Check the username against the owner... - */ -diff -up cups-1.4.5/scheduler/job.c.lspp cups-1.4.5/scheduler/job.c ---- cups-1.4.5/scheduler/job.c.lspp 2010-12-24 13:21:31.028862162 +0000 -+++ cups-1.4.5/scheduler/job.c 2010-12-24 13:21:31.224857060 +0000 -@@ -66,6 +66,9 @@ - * update_job_attrs() - Update the job-printer-* attributes. - */ - -+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ -+ - /* - * Include necessary headers... - */ -@@ -75,6 +78,14 @@ - #include <cups/backend.h> - #include <cups/dir.h> - -+#ifdef WITH_LSPP -+#include <libaudit.h> -+#include <selinux/selinux.h> -+#include <selinux/context.h> -+#include <selinux/avc.h> -+#include <selinux/flask.h> -+#include <selinux/av_permissions.h> -+#endif /* WITH_LSPP */ - - /* - * Design Notes for Job Management -@@ -505,6 +516,14 @@ cupsdContinueJob(cupsd_job_t *job) /* I - /* PRINTER env variable */ - rip_max_cache[255]; - /* RIP_MAX_CACHE env variable */ -+#ifdef WITH_LSPP -+ char *audit_message = NULL; /* Audit message string */ -+ context_t jobcon; /* SELinux context of the job */ -+ char *label_template = NULL; /* SL to put in classification -+ env var */ -+ const char *mls_label = NULL; /* SL to put in classification -+ env var */ -+#endif /* WITH_LSPP */ - - - cupsdLogMessage(CUPSD_LOG_DEBUG2, -@@ -929,6 +948,67 @@ cupsdContinueJob(cupsd_job_t *job) /* I - } - } - -+#ifdef WITH_LSPP -+ if (is_lspp_config()) -+ { -+ if (!job->scon || strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) == 0) -+ { -+ if (AuditLog != -1) -+ { -+ audit_message = NULL; -+ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s title=%s", -+ job->id, job->auid, job->username, job->printer->name, title); -+ audit_log_user_message(AuditLog, AUDIT_USER_UNLABELED_EXPORT, audit_message, -+ ServerName, NULL, NULL, 1); -+ cupsdClearString(&audit_message); -+ } -+ } -+ else -+ { -+ jobcon = context_new(job->scon); -+ -+ if ((attr = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME)) == NULL) -+ label_template = strdup(Classification); -+ else if (attr->num_values > 1 && -+ strcmp(attr->values[1].string.text, "none") != 0) -+ label_template = strdup(attr->values[1].string.text); -+ else -+ label_template = strdup(attr->values[0].string.text); -+ -+ if (strcasecmp(label_template, MLS_CONFIG) == 0) -+ mls_label = context_range_get(jobcon); -+ else if (strcasecmp(label_template, TE_CONFIG) == 0) -+ mls_label = context_type_get(jobcon); -+ else if (strcasecmp(label_template, SELINUX_CONFIG) == 0) -+ mls_label = context_str(jobcon); -+ else -+ mls_label = label_template; -+ -+ if (mls_label && (PerPageLabels || banner_page)) -+ { -+ snprintf(classification, sizeof(classification), "CLASSIFICATION=LSPP:%s", mls_label); -+ envp[envc ++] = classification; -+ } -+ -+ if ((AuditLog != -1) && !banner_page) -+ { -+ audit_message = NULL; -+ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s printer=%s title=%s" -+ " obj=%s label=%s", job->id, job->auid, job->username, -+ job->printer->name, title, job->scon, mls_label?mls_label:"none"); -+ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, -+ ServerName, NULL, NULL, 1); -+ cupsdClearString(&audit_message); -+ } -+ context_free(jobcon); -+ free(label_template); -+ } -+ } -+ else -+ /* -+ * Fall through to the non-LSPP behavior -+ */ -+#endif /* WITH_LSPP */ - if (Classification && !banner_page) - { - if ((attr = ippFindAttribute(job->attrs, "job-sheets", -@@ -1165,13 +1245,13 @@ cupsdContinueJob(cupsd_job_t *job) /* I - if (access(command, F_OK)) - { - snprintf(command, sizeof(command), "%s/backend/%s", ServerBin_compat, -- method); -+ scheme); - if (!access(command, F_OK)) - { - /* Not in the correct directory, but we found it in the compat - * directory. Issue a warning. */ - cupsdLogMessage(CUPSD_LOG_INFO, -- "Backend '%s' not in %s/backend!", method, -+ "Backend '%s' not in %s/backend!", scheme, - ServerBin); - } - else -@@ -1179,7 +1259,7 @@ cupsdContinueJob(cupsd_job_t *job) /* I - /* Not in the compat directory either; make any error - messages use the correct directory name then. */ - snprintf(command, sizeof(command), "%s/backend/%s", ServerBin, -- method); -+ scheme); - } - } - #endif /* __x86_64__ */ -@@ -1626,6 +1706,20 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J - goto error; - } - -+#ifdef WITH_LSPP -+ if ((attr = ippFindAttribute(job->attrs, "security-context", IPP_TAG_NAME)) != NULL) -+ cupsdSetString(&job->scon, attr->values[0].string.text); -+ else if (is_lspp_config()) -+ { -+ /* -+ * There was no security context so delete the job -+ */ -+ cupsdLogMessage(CUPSD_LOG_ERROR, "LoadAllJobs: Missing or bad security-context attribute in control file \"%s\"!", -+ jobfile); -+ goto error; -+ } -+#endif /* WITH_LSPP */ -+ - job->sheets = ippFindAttribute(job->attrs, "job-media-sheets-completed", - IPP_TAG_INTEGER); - job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME); -@@ -2013,6 +2107,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J - { - char filename[1024]; /* Job control filename */ - cups_file_t *fp; /* Job file */ -+#ifdef WITH_LSPP -+ security_context_t spoolcon; /* context of the job control file */ -+ context_t jobcon; /* contex_t container for job->scon */ -+ context_t tmpcon; /* Temp context to swap the level */ -+ char *jobclearance; /* SELinux low end clearance */ -+ const char *jobrange; /* SELinux sensitivity range */ -+ char *jobrange_copy; /* SELinux sensitivity range */ -+#endif /* WITH_LSPP */ - - - cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p", -@@ -2031,6 +2133,76 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J - fchmod(cupsFileNumber(fp), 0600); - fchown(cupsFileNumber(fp), RunUser, Group); - -+#ifdef WITH_LSPP -+ if (job->scon && strncmp(job->scon, UNKNOWN_SL, strlen(UNKNOWN_SL)) != 0) -+ { -+ if (getfilecon(filename, &spoolcon) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "Unable to get context of job control file \"%s\" - %s.", -+ filename, strerror(errno)); -+ return; -+ } -+ jobcon = context_new(job->scon); -+ tmpcon = context_new(spoolcon); -+ freecon(spoolcon); -+ if (!jobcon || !tmpcon) -+ { -+ if (jobcon) -+ context_free(jobcon); -+ if (tmpcon) -+ context_free(tmpcon); -+ cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to get SELinux contexts"); -+ return; -+ } -+ jobrange = context_range_get(jobcon); -+ if (jobrange) -+ { -+ jobrange_copy = strdup(jobrange); -+ if ((jobclearance = strtok(jobrange_copy, "-")) != NULL) -+ { -+ if (context_range_set(tmpcon, jobclearance) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "Unable to set the range for job control file \"%s\" - %s.", -+ filename, strerror(errno)); -+ free(jobrange_copy); -+ context_free(tmpcon); -+ context_free(jobcon); -+ return; -+ } -+ } -+ else -+ { -+ if (context_range_set(tmpcon, (context_range_get(jobcon))) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "Unable to set the range for job control file \"%s\" - %s.", -+ filename, strerror(errno)); -+ free(jobrange_copy); -+ context_free(tmpcon); -+ context_free(jobcon); -+ return; -+ } -+ } -+ free(jobrange_copy); -+ } -+ if (setfilecon(filename, context_str(tmpcon)) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "Unable to set context of job control file \"%s\" - %s.", -+ filename, strerror(errno)); -+ context_free(tmpcon); -+ context_free(jobcon); -+ return; -+ } -+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p): new spool file context=%s", -+ job, context_str(tmpcon)); -+ context_free(tmpcon); -+ context_free(jobcon); -+ } -+#endif /* WITH_LSPP */ -+ - job->attrs->state = IPP_IDLE; - - if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL, -@@ -3332,6 +3504,18 @@ get_options(cupsd_job_t *job, /* I - Jo - banner_page) - continue; - -+#ifdef WITH_LSPP -+ /* -+ * In LSPP mode refuse to honor the page-label -+ */ -+ if (is_lspp_config() && -+ !strcmp(attr->name, "page-label")) -+ { -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "Ignoring page-label option due to LSPP mode"); -+ continue; -+ } -+#endif /* WITH_LSPP */ -+ - /* - * Otherwise add them to the list... - */ -@@ -4020,6 +4204,19 @@ static void - start_job(cupsd_job_t *job, /* I - Job ID */ - cupsd_printer_t *printer) /* I - Printer to print job */ - { -+#ifdef WITH_LSPP -+ char *audit_message = NULL; /* Audit message string */ -+ char *printerfile = NULL; /* Device file pointed to by the printer */ -+ security_id_t clisid; /* SELinux SID for the client */ -+ security_id_t psid; /* SELinux SID for the printer */ -+ context_t printercon; /* Printer's context string */ -+ struct stat printerstat; /* Printer's stat buffer */ -+ security_context_t devcon; /* Printer's SELinux context */ -+ struct avc_entry_ref avcref; /* Pointer to the access vector cache */ -+ security_class_t tclass; /* Object class for the SELinux check */ -+ access_vector_t avr; /* Access method being requested */ -+#endif /* WITH_LSPP */ -+ - cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job(job=%p(%d), printer=%p(%s))", - job, job->id, printer, printer->name); - -@@ -4142,6 +4339,108 @@ start_job(cupsd_job_t *job, /* I - - fcntl(job->side_pipes[1], F_SETFD, - fcntl(job->side_pipes[1], F_GETFD) | FD_CLOEXEC); - -+#ifdef WITH_LSPP -+ if (is_lspp_config()) -+ { -+ /* -+ * Perform an access check before printing, but only if the printer starts with /dev/ -+ */ -+ printerfile = strstr(printer->device_uri, "/dev/"); -+ if (printerfile == NULL && (strncmp(printer->device_uri, "file:/", 6) == 0)) -+ printerfile = printer->device_uri + strlen("file:"); -+ -+ if (printerfile != NULL) -+ { -+ cupsdLogMessage(CUPSD_LOG_DEBUG, -+ "StartJob: Attempting to check access on printer device %s", printerfile); -+ if (lstat(printerfile, &printerstat) < 0) -+ { -+ if (errno != ENOENT) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to stat the printer"); -+ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); -+ return ; -+ } -+ /* -+ * The printer does not exist, so for now assume it's a FileDevice -+ */ -+ tclass = SECCLASS_FILE; -+ avr = FILE__WRITE; -+ } -+ else if (S_ISCHR(printerstat.st_mode)) -+ { -+ tclass = SECCLASS_CHR_FILE; -+ avr = CHR_FILE__WRITE; -+ } -+ else if (S_ISREG(printerstat.st_mode)) -+ { -+ tclass = SECCLASS_FILE; -+ avr = FILE__WRITE; -+ } -+ else -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "StartJob: Printer is not a character device or regular file"); -+ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); -+ return ; -+ } -+ static avc_initialized = 0; -+ if (!avc_initialized++) -+ avc_init("cupsd_dequeue_", NULL, NULL, NULL, NULL); -+ avc_entry_ref_init(&avcref); -+ if (avc_context_to_sid(job->scon, &clisid) != 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "StartJob: Unable to determine the SELinux sid for the job"); -+ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); -+ return ; -+ } -+ if (getfilecon(printerfile, &devcon) == -1) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "StartJob: Unable to get the SELinux context of %s", -+ printerfile); -+ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); -+ return ; -+ } -+ printercon = context_new(devcon); -+ cupsdLogMessage(CUPSD_LOG_DEBUG, "StartJob: printer context %s client context %s", -+ context_str(printercon), job->scon); -+ context_free(printercon); -+ -+ if (avc_context_to_sid(devcon, &psid) != 0) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, -+ "StartJob: Unable to determine the SELinux sid for the printer"); -+ freecon(devcon); -+ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); -+ return ; -+ } -+ freecon(devcon); -+ -+ if (avc_has_perm(clisid, psid, tclass, avr, &avcref, NULL) != 0) -+ { -+ /* -+ * The access check failed, so cancel the job and send an audit message -+ */ -+ if (AuditLog != -1) -+ { -+ audit_message = NULL; -+ cupsdSetStringf(&audit_message, "job=%d auid=%u acct=%s obj=%s canceled" -+ " unable to access printer=%s", job->id, -+ job->auid, (job->username)?job->username:"?", job->scon, printer->name); -+ audit_log_user_message(AuditLog, AUDIT_USER_LABELED_EXPORT, audit_message, -+ ServerName, NULL, NULL, 0); -+ cupsdClearString(&audit_message); -+ } -+ -+ cupsdSetJobState(job, IPP_JOB_ABORTED, CUPSD_JOB_DEFAULT, NULL); -+ -+ return ; -+ } -+ } -+ } -+#endif /* WITH_LSPP */ -+ - /* - * Now start the first file in the job... - */ -diff -up cups-1.4.5/scheduler/job.h.lspp cups-1.4.5/scheduler/job.h ---- cups-1.4.5/scheduler/job.h.lspp 2009-05-11 23:46:01.000000000 +0100 -+++ cups-1.4.5/scheduler/job.h 2010-12-24 13:21:31.225857034 +0000 -@@ -13,6 +13,13 @@ - * file is missing or damaged, see the license at "http://www.cups.org/". - */ - -+/* Copyright (C) 2005 Trusted Computer Solutions, Inc. */ -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ -+ -+#ifdef WITH_LSPP -+#include <selinux/selinux.h> -+#endif /* WITH_LSPP */ -+ - /* - * Constants... - */ -@@ -83,6 +90,10 @@ struct cupsd_job_s /**** Job request * - krb5_ccache ccache; /* Kerberos credential cache */ - char *ccname; /* KRB5CCNAME environment variable */ - #endif /* HAVE_GSSAPI */ -+#ifdef WITH_LSPP -+ security_context_t scon; /* Security context of job */ -+ uid_t auid; /* Audit loginuid for this job */ -+#endif /* WITH_LSPP */ - }; - - typedef struct cupsd_joblog_s /**** Job log message ****/ -diff -up cups-1.4.5/scheduler/main.c.lspp cups-1.4.5/scheduler/main.c ---- cups-1.4.5/scheduler/main.c.lspp 2010-12-24 13:21:31.158858778 +0000 -+++ cups-1.4.5/scheduler/main.c 2010-12-24 13:22:10.827825881 +0000 -@@ -37,6 +37,8 @@ - * usage() - Show scheduler usage. - */ - -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ -+ - /* - * Include necessary headers... - */ -@@ -76,6 +78,9 @@ - # include <dlfcn.h> - #endif /* __APPLE__ && HAVE_DLFCN_H */ - -+#ifdef WITH_LSPP -+# include <libaudit.h> -+#endif /* WITH_LSPP */ - - /* - * Local functions... -@@ -145,6 +150,9 @@ main(int argc, /* I - Number of comm - #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) - struct sigaction action; /* Actions for POSIX signals */ - #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ -+#if WITH_LSPP -+ auditfail_t failmode; /* Action for audit_open failure */ -+#endif /* WITH_LSPP */ - #ifdef __sgi - cups_file_t *fp; /* Fake lpsched lock file */ - struct stat statbuf; /* Needed for checking lpsched FIFO */ -@@ -474,6 +482,25 @@ main(int argc, /* I - Number of comm - #endif /* DEBUG */ - } - -+#ifdef WITH_LSPP -+ if ((AuditLog = audit_open()) < 0 ) -+ { -+ if (get_auditfail_action(&failmode) == 0) -+ { -+ if (failmode == FAIL_LOG) -+ { -+ cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to connect to audit subsystem."); -+ AuditLog = -1; -+ } -+ else if (failmode == FAIL_TERMINATE) -+ { -+ fprintf(stderr, "cupsd: unable to start auditing, terminating"); -+ return -1; -+ } -+ } -+ } -+#endif /* WITH_LSPP */ -+ - /* - * Set the timezone info... - */ -@@ -1241,6 +1268,11 @@ main(int argc, /* I - Number of comm - - cupsdStopSelect(); - -+#ifdef WITH_LSPP -+ if (AuditLog != -1) -+ audit_close(AuditLog); -+#endif /* WITH_LSPP */ -+ - return (!stop_scheduler); - } - -diff -up cups-1.4.5/scheduler/printers.c.lspp cups-1.4.5/scheduler/printers.c ---- cups-1.4.5/scheduler/printers.c.lspp 2010-12-24 13:21:31.168858518 +0000 -+++ cups-1.4.5/scheduler/printers.c 2010-12-24 13:21:31.236856747 +0000 -@@ -59,6 +59,8 @@ - * write_xml_string() - Write a string with XML escaping. - */ - -+/* (c) Copyright 2005-2006 Hewlett-Packard Development Company, L.P. */ -+ - /* - * Include necessary headers... - */ -@@ -103,6 +105,10 @@ static void write_irix_state(cupsd_print - #endif /* __sgi */ - static void write_xml_string(cups_file_t *fp, const char *s); - -+#ifdef WITH_LSPP -+# include <libaudit.h> -+# include <selinux/context.h> -+#endif /* WITH_LSPP */ - - /* - * 'cupsdAddPrinter()' - Add a printer to the system. -@@ -2267,6 +2273,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) - "username", - "password" - }; -+#ifdef WITH_LSPP -+ char *audit_message; /* Audit message string */ -+ char *printerfile; /* Path to a local printer dev */ -+ char *rangestr; /* Printer's range if its available */ -+ security_context_t devcon; /* Printer SELinux context */ -+ context_t printercon; /* context_t for the printer */ -+#endif /* WITH_LSPP */ - - - DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, -@@ -2397,6 +2410,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) - attr->values[1].string.text = _cupsStrAlloc(Classification ? - Classification : p->job_sheets[1]); - } -+#ifdef WITH_LSPP -+ if (AuditLog != -1) -+ { -+ audit_message = NULL; -+ rangestr = NULL; -+ printercon = 0; -+ printerfile = strstr(p->device_uri, "/dev/"); -+ if (printerfile == NULL && (strncmp(p->device_uri, "file:/", 6) == 0)) -+ printerfile = p->device_uri + strlen("file:"); -+ -+ if (printerfile != NULL) -+ { -+ if (getfilecon(printerfile, &devcon) == -1) -+ { -+ if(is_selinux_enabled()) -+ cupsdLogMessage(CUPSD_LOG_ERROR, "cupsdSetPrinterAttrs: Unable to get printer context"); -+ } -+ else -+ { -+ printercon = context_new(devcon); -+ freecon(devcon); -+ } -+ } -+ -+ if (printercon && context_range_get(printercon)) -+ rangestr = strdup(context_range_get(printercon)); -+ else -+ rangestr = strdup("unknown"); -+ -+ cupsdSetStringf(&audit_message, "printer=%s uri=%s banners=%s,%s range=%s", -+ p->name, p->sanitized_device_uri, p->job_sheets[0], p->job_sheets[1], rangestr); -+ audit_log_user_message(AuditLog, AUDIT_LABEL_LEVEL_CHANGE, audit_message, -+ ServerName, NULL, NULL, 1); -+ if (printercon) -+ context_free(printercon); -+ free(rangestr); -+ cupsdClearString(&audit_message); -+ } -+#endif /* WITH_LSPP */ - } - - p->raw = 0; -@@ -5536,7 +5588,6 @@ write_irix_state(cupsd_printer_t *p) /* - } - #endif /* __sgi */ - -- - /* - * 'write_xml_string()' - Write a string with XML escaping. - */ diff --git a/cups/systemd/cups.service b/cups/systemd/cups.service index ae668ab..dfb87b8 100644 --- a/cups/systemd/cups.service +++ b/cups/systemd/cups.service @@ -1,10 +1,15 @@ [Unit] -Description=CUPS Printing Service +Description=CUPS scheduler +Requires=printer.target +After=syslog.target [Service] -ExecStart=/usr/sbin/cupsd -f -c /etc/cups/cupsd.conf -ExecStartPost=/sbin/udevadm trigger --subsystem-match=usb --attr-match=serial=AL01077498 +Type=forking +PIDFile=/var/run/cupsd.pid +ExecStartPre=/usr/sbin/cupsd -t +ExecStart=/usr/sbin/cupsd +ExecStartPost=/sbin/udevadm trigger --subsystem-match=usb --attr-match=bInterfaceClass=07 --attr-match=bInterfaceSubClass=01 --action=add +ExecStartPost=/sbin/udevadm trigger --subsystem-match=usb --property-match=DEVNAME="/dev/usb/lp*" --action=add [Install] WantedBy=multi-user.target - hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dcd949d8210ac2fea473ea48a3c042e7ae260d83
by git＠ipfire.org 03 Sep '12

03 Sep '12

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, next has been updated via dcd949d8210ac2fea473ea48a3c042e7ae260d83 (commit) via ec9d4240f0631a0d25ca873941770d9db05ab660 (commit) via f5dc4b2b2fca9d6a192664e276e0680e7386d946 (commit) from 0ba7cc35a71aa47a3ff30f9638978a70e24664ac (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 dcd949d8210ac2fea473ea48a3c042e7ae260d83 Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Date: Mon Sep 3 09:58:28 2012 +0200 usb_modeswitch_data: update to 20120815. commit ec9d4240f0631a0d25ca873941770d9db05ab660 Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Date: Mon Sep 3 09:55:58 2012 +0200 usb_modeswitch: update to 1.2.4. commit f5dc4b2b2fca9d6a192664e276e0680e7386d946 Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Date: Mon Sep 3 09:02:26 2012 +0200 configroot: fix rootfile again. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/configroot | 4 ++-- config/rootfiles/common/usb_modeswitch_data | 13 +++++++++++++ .../core/{53 => 62}/filelists/usb_modeswitch | 0 .../core/{53 => 62}/filelists/usb_modeswitch_data | 0 lfs/usb_modeswitch | 4 ++-- lfs/usb_modeswitch_data | 4 ++-- 6 files changed, 19 insertions(+), 6 deletions(-) copy config/rootfiles/core/{53 => 62}/filelists/usb_modeswitch (100%) copy config/rootfiles/core/{53 => 62}/filelists/usb_modeswitch_data (100%) Difference in files: diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 5189dfe..e14f7e0 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -180,5 +180,5 @@ var/ipfire/wireless #var/ipfire/wireless/settings var/ipfire/xtaccess #var/ipfire/xtaccess/config --var/ipfire/firebuild --etc/system-release +var/ipfire/firebuild +etc/system-release diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data index 3d6af6d..448a19e 100644 --- a/config/rootfiles/common/usb_modeswitch_data +++ b/config/rootfiles/common/usb_modeswitch_data @@ -5,6 +5,7 @@ usr/share/usb_modeswitch/03f0:002a usr/share/usb_modeswitch/0408:f000 usr/share/usb_modeswitch/0421:060c usr/share/usb_modeswitch/0421:0610 +usr/share/usb_modeswitch/0421:061d usr/share/usb_modeswitch/0421:0622 usr/share/usb_modeswitch/0421:0627 usr/share/usb_modeswitch/0421:062c @@ -35,6 +36,7 @@ usr/share/usb_modeswitch/05c7:1000 usr/share/usb_modeswitch/072f:100d usr/share/usb_modeswitch/07d1:a800 usr/share/usb_modeswitch/07d1:a804 +usr/share/usb_modeswitch/0922:1001 usr/share/usb_modeswitch/0930:0d46 usr/share/usb_modeswitch/0ace:2011 usr/share/usb_modeswitch/0ace:20ff @@ -77,6 +79,7 @@ usr/share/usb_modeswitch/0af0:8302 usr/share/usb_modeswitch/0af0:8304 usr/share/usb_modeswitch/0af0:8400 usr/share/usb_modeswitch/0af0:8600 +usr/share/usb_modeswitch/0af0:8700 usr/share/usb_modeswitch/0af0:8800 usr/share/usb_modeswitch/0af0:8900 usr/share/usb_modeswitch/0af0:9000 @@ -163,6 +166,7 @@ usr/share/usb_modeswitch/1410:5041 usr/share/usb_modeswitch/1410:5059 usr/share/usb_modeswitch/148e:a000 usr/share/usb_modeswitch/148f:2578 +usr/share/usb_modeswitch/15eb:7153 usr/share/usb_modeswitch/16d8:6281 usr/share/usb_modeswitch/16d8:6803 usr/share/usb_modeswitch/16d8:6804 @@ -184,12 +188,15 @@ usr/share/usb_modeswitch/19d2:0110 usr/share/usb_modeswitch/19d2:0115 usr/share/usb_modeswitch/19d2:0146 usr/share/usb_modeswitch/19d2:0149 +usr/share/usb_modeswitch/19d2:0154 usr/share/usb_modeswitch/19d2:0166 usr/share/usb_modeswitch/19d2:0169 +usr/share/usb_modeswitch/19d2:0325 usr/share/usb_modeswitch/19d2:1001 usr/share/usb_modeswitch/19d2:1007 usr/share/usb_modeswitch/19d2:1009 usr/share/usb_modeswitch/19d2:1013 +usr/share/usb_modeswitch/19d2:1017 usr/share/usb_modeswitch/19d2:1171 usr/share/usb_modeswitch/19d2:1175 usr/share/usb_modeswitch/19d2:1179 @@ -209,7 +216,9 @@ usr/share/usb_modeswitch/1a8d:1000 usr/share/usb_modeswitch/1a8d:2000 usr/share/usb_modeswitch/1ab7:5700 usr/share/usb_modeswitch/1b7d:0700 +usr/share/usb_modeswitch/1bbb:00ca usr/share/usb_modeswitch/1bbb:f000 +usr/share/usb_modeswitch/1bbb:f017 usr/share/usb_modeswitch/1bbb:f052 usr/share/usb_modeswitch/1c9e:1001 usr/share/usb_modeswitch/1c9e:6061 @@ -227,6 +236,7 @@ usr/share/usb_modeswitch/1edf:6003 usr/share/usb_modeswitch/1ee8:0009 usr/share/usb_modeswitch/1ee8:0013 usr/share/usb_modeswitch/1ee8:0040 +usr/share/usb_modeswitch/1ee8:004a usr/share/usb_modeswitch/1ee8:0060 usr/share/usb_modeswitch/1f28:0021 usr/share/usb_modeswitch/1fac:0032 @@ -237,7 +247,10 @@ usr/share/usb_modeswitch/201e:2009 usr/share/usb_modeswitch/2020:f00e usr/share/usb_modeswitch/2077:f000 usr/share/usb_modeswitch/21f5:1000 +usr/share/usb_modeswitch/22de:6803 usr/share/usb_modeswitch/22f4:0021 usr/share/usb_modeswitch/230d:0001 usr/share/usb_modeswitch/230d:0007 +usr/share/usb_modeswitch/230d:0101 +usr/share/usb_modeswitch/2357:0200 usr/share/usb_modeswitch/8888:6500 diff --git a/config/rootfiles/core/62/filelists/usb_modeswitch b/config/rootfiles/core/62/filelists/usb_modeswitch new file mode 120000 index 0000000..acbab6f --- /dev/null +++ b/config/rootfiles/core/62/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/62/filelists/usb_modeswitch_data b/config/rootfiles/core/62/filelists/usb_modeswitch_data new file mode 120000 index 0000000..4cbce46 --- /dev/null +++ b/config/rootfiles/core/62/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch index 09a0b68..f8aea5f 100644 --- a/lfs/usb_modeswitch +++ b/lfs/usb_modeswitch @@ -24,7 +24,7 @@ include Config -VER = 1.2.3 +VER = 1.2.4 THISAPP = usb-modeswitch-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9b29e8b0d93d7604a9e5efc4696d37a3 +$(DL_FILE)_MD5 = dbd4ce7966d7b4a5a0604a8280f7164d install : $(TARGET) diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data index 46c7c0d..5beecda 100644 --- a/lfs/usb_modeswitch_data +++ b/lfs/usb_modeswitch_data @@ -24,7 +24,7 @@ include Config -VER = 20120531 +VER = 20120815 THISAPP = usb-modeswitch-data-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4a948331d5b9fccba4a89d3e62040cc3 +$(DL_FILE)_MD5 = 12d7de3210e45ad6f48791d12bbdbf61 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0ba7cc35a71aa47a3ff30f9638978a70e24664ac
by git＠ipfire.org 02 Sep '12

02 Sep '12

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, next has been updated via 0ba7cc35a71aa47a3ff30f9638978a70e24664ac (commit) via 2f062ab1af0b5bf56eff06856c78f1e21b6a6c59 (commit) via 422bad80dfa29a08c7dc3f5f306ff80b5cfe8271 (commit) via 472e738988c18957261e0dc3f8a343bd4f2ffd71 (commit) from b651586493b8075b24a4cf2c4da05c3a1a76341b (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 0ba7cc35a71aa47a3ff30f9638978a70e24664ac Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Date: Sun Sep 2 17:34:08 2012 +0200 php: update to 5.3.16. commit 2f062ab1af0b5bf56eff06856c78f1e21b6a6c59 Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Date: Sun Sep 2 17:32:28 2012 +0200 configroot: update rootfile. commit 422bad80dfa29a08c7dc3f5f306ff80b5cfe8271 Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Date: Sun Sep 2 17:30:35 2012 +0200 apcupsd: rootfile update. commit 472e738988c18957261e0dc3f8a343bd4f2ffd71 Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Date: Sun Sep 2 17:26:29 2012 +0200 nmap: rootfile update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/configroot | 7 +- config/rootfiles/core/{57 => 62}/filelists/php | 0 config/rootfiles/packages/apcupsd | 5 + config/rootfiles/packages/nmap | 216 +++++++++++++++++++++++- lfs/php | 4 +- 5 files changed, 226 insertions(+), 6 deletions(-) copy config/rootfiles/core/{57 => 62}/filelists/php (100%) Difference in files: diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 8fdd7ac..5189dfe 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -35,6 +35,7 @@ var/ipfire/ethernet #var/ipfire/ethernet/known_nics #var/ipfire/ethernet/scanned_nics #var/ipfire/ethernet/settings +#var/ipfire/ethernet/vlans #var/ipfire/extrahd #var/ipfire/extrahd/bin var/ipfire/extrahd/bin/extrahd.pl @@ -57,9 +58,9 @@ var/ipfire/langs #var/ipfire/langs/en.pl #var/ipfire/langs/es.pl #var/ipfire/langs/fr.pl +#var/ipfire/langs/list #var/ipfire/langs/pl.pl #var/ipfire/langs/ru.pl -#var/ipfire/langs/list var/ipfire/logging #var/ipfire/logging/settings var/ipfire/mac @@ -179,5 +180,5 @@ var/ipfire/wireless #var/ipfire/wireless/settings var/ipfire/xtaccess #var/ipfire/xtaccess/config -var/ipfire/firebuild -etc/system-release +-var/ipfire/firebuild +-etc/system-release diff --git a/config/rootfiles/core/62/filelists/php b/config/rootfiles/core/62/filelists/php new file mode 120000 index 0000000..1ae48d7 --- /dev/null +++ b/config/rootfiles/core/62/filelists/php @@ -0,0 +1 @@ +../../../common/php \ No newline at end of file diff --git a/config/rootfiles/packages/apcupsd b/config/rootfiles/packages/apcupsd index d65f012..b58ed2b 100644 --- a/config/rootfiles/packages/apcupsd +++ b/config/rootfiles/packages/apcupsd @@ -12,6 +12,7 @@ etc/apcupsd/onbattery etc/rc.d/rc0.d/K35apcupsd etc/rc.d/rc3.d/S65apcupsd etc/rc.d/rc6.d/K35apcupsd +#root/.lesshst sbin/apcaccess sbin/apctest sbin/apcupsd @@ -25,6 +26,10 @@ srv/web/ipfire/cgi-bin/upsstats.cgi #usr/share/hal/fdi/policy #usr/share/hal/fdi/policy/20thirdparty #usr/share/hal/fdi/policy/20thirdparty/80-apcupsd-ups-policy.fdi +#usr/share/man/man5/apcupsd.conf.5 +#usr/share/man/man8/apcaccess.8 +#usr/share/man/man8/apccontrol.8 +#usr/share/man/man8/apctest.8 #usr/share/man/man8/apcupsd.8 etc/rc.d/init.d/apcupsd var/ipfire/menu.d/EX-apcupsd.menu diff --git a/config/rootfiles/packages/nmap b/config/rootfiles/packages/nmap index ab15654..8f39897 100644 --- a/config/rootfiles/packages/nmap +++ b/config/rootfiles/packages/nmap @@ -55,16 +55,25 @@ usr/share/nmap/nmap.xsl usr/share/nmap/nse_main.lua #usr/share/nmap/nselib usr/share/nmap/nselib/afp.lua +usr/share/nmap/nselib/amqp.lua usr/share/nmap/nselib/asn1.lua usr/share/nmap/nselib/base64.lua +usr/share/nmap/nselib/bitcoin.lua +usr/share/nmap/nselib/bittorrent.lua usr/share/nmap/nselib/brute.lua usr/share/nmap/nselib/citrixxml.lua usr/share/nmap/nselib/comm.lua +usr/share/nmap/nselib/creds.lua +usr/share/nmap/nselib/cvs.lua #usr/share/nmap/nselib/data usr/share/nmap/nselib/data/favicon-db +usr/share/nmap/nselib/data/http-default-accounts-fingerprints.lua usr/share/nmap/nselib/data/http-fingerprints.lua usr/share/nmap/nselib/data/http-folders.txt +usr/share/nmap/nselib/data/mysql-cis.audit +usr/share/nmap/nselib/data/oracle-default-accounts.lst usr/share/nmap/nselib/data/oracle-sids +usr/share/nmap/nselib/data/packetdecoders.lua usr/share/nmap/nselib/data/passwords.lst #usr/share/nmap/nselib/data/psexec usr/share/nmap/nselib/data/psexec/README @@ -77,15 +86,26 @@ usr/share/nmap/nselib/data/psexec/network.lua usr/share/nmap/nselib/data/psexec/nmap_service.c usr/share/nmap/nselib/data/psexec/nmap_service.vcproj usr/share/nmap/nselib/data/psexec/pwdump.lua +usr/share/nmap/nselib/data/rtsp-urls.txt +usr/share/nmap/nselib/data/snmpcommunities.lst +usr/share/nmap/nselib/data/ssl-ciphers +usr/share/nmap/nselib/data/ssl-fingerprints +usr/share/nmap/nselib/data/tftplist.txt usr/share/nmap/nselib/data/usernames.lst +usr/share/nmap/nselib/data/wp-plugins.lst usr/share/nmap/nselib/datafiles.lua usr/share/nmap/nselib/dhcp.lua +usr/share/nmap/nselib/dhcp6.lua usr/share/nmap/nselib/dns.lua +usr/share/nmap/nselib/dnsbl.lua usr/share/nmap/nselib/dnssd.lua usr/share/nmap/nselib/drda.lua +usr/share/nmap/nselib/eap.lua usr/share/nmap/nselib/ftp.lua usr/share/nmap/nselib/giop.lua usr/share/nmap/nselib/http.lua +usr/share/nmap/nselib/httpspider.lua +usr/share/nmap/nselib/iax2.lua usr/share/nmap/nselib/imap.lua usr/share/nmap/nselib/informix.lua usr/share/nmap/nselib/ipOps.lua @@ -94,52 +114,105 @@ usr/share/nmap/nselib/json.lua usr/share/nmap/nselib/ldap.lua usr/share/nmap/nselib/listop.lua usr/share/nmap/nselib/match.lua +usr/share/nmap/nselib/membase.lua usr/share/nmap/nselib/mongodb.lua usr/share/nmap/nselib/msrpc.lua usr/share/nmap/nselib/msrpcperformance.lua usr/share/nmap/nselib/msrpctypes.lua usr/share/nmap/nselib/mssql.lua usr/share/nmap/nselib/mysql.lua +usr/share/nmap/nselib/natpmp.lua +usr/share/nmap/nselib/ncp.lua +usr/share/nmap/nselib/ndmp.lua usr/share/nmap/nselib/netbios.lua usr/share/nmap/nselib/nrpc.lua usr/share/nmap/nselib/nsedebug.lua +usr/share/nmap/nselib/omp2.lua usr/share/nmap/nselib/packet.lua usr/share/nmap/nselib/pgsql.lua usr/share/nmap/nselib/pop3.lua +usr/share/nmap/nselib/pppoe.lua usr/share/nmap/nselib/proxy.lua +usr/share/nmap/nselib/redis.lua usr/share/nmap/nselib/rmi.lua usr/share/nmap/nselib/rpc.lua +usr/share/nmap/nselib/rpcap.lua +usr/share/nmap/nselib/rsync.lua +usr/share/nmap/nselib/rtsp.lua +usr/share/nmap/nselib/sasl.lua usr/share/nmap/nselib/shortport.lua +usr/share/nmap/nselib/sip.lua usr/share/nmap/nselib/smb.lua usr/share/nmap/nselib/smbauth.lua +usr/share/nmap/nselib/smtp.lua usr/share/nmap/nselib/snmp.lua +usr/share/nmap/nselib/socks.lua +usr/share/nmap/nselib/srvloc.lua usr/share/nmap/nselib/ssh1.lua usr/share/nmap/nselib/ssh2.lua +usr/share/nmap/nselib/sslcert.lua usr/share/nmap/nselib/stdnse.lua usr/share/nmap/nselib/strbuf.lua usr/share/nmap/nselib/strict.lua +usr/share/nmap/nselib/stun.lua usr/share/nmap/nselib/tab.lua usr/share/nmap/nselib/target.lua +usr/share/nmap/nselib/tftp.lua usr/share/nmap/nselib/tns.lua usr/share/nmap/nselib/unpwdb.lua usr/share/nmap/nselib/upnp.lua usr/share/nmap/nselib/url.lua +usr/share/nmap/nselib/versant.lua usr/share/nmap/nselib/vnc.lua +usr/share/nmap/nselib/vulns.lua +usr/share/nmap/nselib/vuzedht.lua usr/share/nmap/nselib/wsdd.lua +usr/share/nmap/nselib/xdmcp.lua +usr/share/nmap/nselib/xmpp.lua #usr/share/nmap/scripts +usr/share/nmap/scripts/acarsd-info.nse +usr/share/nmap/scripts/address-info.nse usr/share/nmap/scripts/afp-brute.nse +usr/share/nmap/scripts/afp-ls.nse usr/share/nmap/scripts/afp-path-vuln.nse usr/share/nmap/scripts/afp-serverinfo.nse usr/share/nmap/scripts/afp-showmount.nse +usr/share/nmap/scripts/amqp-info.nse usr/share/nmap/scripts/asn-query.nse usr/share/nmap/scripts/auth-owners.nse usr/share/nmap/scripts/auth-spoof.nse +usr/share/nmap/scripts/backorifice-brute.nse +usr/share/nmap/scripts/backorifice-info.nse usr/share/nmap/scripts/banner.nse +usr/share/nmap/scripts/bitcoin-getaddr.nse +usr/share/nmap/scripts/bitcoin-info.nse +usr/share/nmap/scripts/bitcoinrpc-info.nse +usr/share/nmap/scripts/bittorrent-discovery.nse +usr/share/nmap/scripts/broadcast-avahi-dos.nse +usr/share/nmap/scripts/broadcast-db2-discover.nse +usr/share/nmap/scripts/broadcast-dhcp-discover.nse +usr/share/nmap/scripts/broadcast-dhcp6-discover.nse usr/share/nmap/scripts/broadcast-dns-service-discovery.nse usr/share/nmap/scripts/broadcast-dropbox-listener.nse +usr/share/nmap/scripts/broadcast-listener.nse usr/share/nmap/scripts/broadcast-ms-sql-discover.nse +usr/share/nmap/scripts/broadcast-netbios-master-browser.nse +usr/share/nmap/scripts/broadcast-networker-discover.nse +usr/share/nmap/scripts/broadcast-novell-locate.nse +usr/share/nmap/scripts/broadcast-pc-anywhere.nse +usr/share/nmap/scripts/broadcast-pc-duo.nse +usr/share/nmap/scripts/broadcast-ping.nse +usr/share/nmap/scripts/broadcast-pppoe-discover.nse +usr/share/nmap/scripts/broadcast-rip-discover.nse +usr/share/nmap/scripts/broadcast-ripng-discover.nse +usr/share/nmap/scripts/broadcast-sybase-asa-discover.nse usr/share/nmap/scripts/broadcast-upnp-info.nse +usr/share/nmap/scripts/broadcast-versant-locate.nse +usr/share/nmap/scripts/broadcast-wake-on-lan.nse +usr/share/nmap/scripts/broadcast-wpad-discover.nse usr/share/nmap/scripts/broadcast-wsdd-discover.nse +usr/share/nmap/scripts/broadcast-xdmcp-discover.nse +usr/share/nmap/scripts/cccam-version.nse usr/share/nmap/scripts/citrix-brute-xml.nse usr/share/nmap/scripts/citrix-enum-apps-xml.nse usr/share/nmap/scripts/citrix-enum-apps.nse @@ -147,24 +220,38 @@ usr/share/nmap/scripts/citrix-enum-servers-xml.nse usr/share/nmap/scripts/citrix-enum-servers.nse usr/share/nmap/scripts/couchdb-databases.nse usr/share/nmap/scripts/couchdb-stats.nse +usr/share/nmap/scripts/creds-summary.nse +usr/share/nmap/scripts/cvs-brute-repository.nse +usr/share/nmap/scripts/cvs-brute.nse usr/share/nmap/scripts/daap-get-library.nse usr/share/nmap/scripts/daytime.nse usr/share/nmap/scripts/db2-das-info.nse usr/share/nmap/scripts/db2-discover.nse usr/share/nmap/scripts/dhcp-discover.nse +usr/share/nmap/scripts/dns-blacklist.nse +usr/share/nmap/scripts/dns-brute.nse usr/share/nmap/scripts/dns-cache-snoop.nse +usr/share/nmap/scripts/dns-client-subnet-scan.nse usr/share/nmap/scripts/dns-fuzz.nse +usr/share/nmap/scripts/dns-nsec-enum.nse +usr/share/nmap/scripts/dns-nsid.nse usr/share/nmap/scripts/dns-random-srcport.nse usr/share/nmap/scripts/dns-random-txid.nse usr/share/nmap/scripts/dns-recursion.nse usr/share/nmap/scripts/dns-service-discovery.nse +usr/share/nmap/scripts/dns-srv-enum.nse usr/share/nmap/scripts/dns-update.nse +usr/share/nmap/scripts/dns-zeustracker.nse usr/share/nmap/scripts/dns-zone-transfer.nse usr/share/nmap/scripts/domcon-brute.nse usr/share/nmap/scripts/domcon-cmd.nse usr/share/nmap/scripts/domino-enum-users.nse +usr/share/nmap/scripts/dpap-brute.nse usr/share/nmap/scripts/drda-brute.nse usr/share/nmap/scripts/drda-info.nse +usr/share/nmap/scripts/duplicates.nse +usr/share/nmap/scripts/eap-info.nse +usr/share/nmap/scripts/epmd-info.nse usr/share/nmap/scripts/finger.nse usr/share/nmap/scripts/firewalk.nse usr/share/nmap/scripts/ftp-anon.nse @@ -172,56 +259,121 @@ usr/share/nmap/scripts/ftp-bounce.nse usr/share/nmap/scripts/ftp-brute.nse usr/share/nmap/scripts/ftp-libopie.nse usr/share/nmap/scripts/ftp-proftpd-backdoor.nse +usr/share/nmap/scripts/ftp-vsftpd-backdoor.nse +usr/share/nmap/scripts/ftp-vuln-cve2010-4221.nse +usr/share/nmap/scripts/ganglia-info.nse usr/share/nmap/scripts/giop-info.nse usr/share/nmap/scripts/gopher-ls.nse +usr/share/nmap/scripts/hadoop-datanode-info.nse +usr/share/nmap/scripts/hadoop-jobtracker-info.nse +usr/share/nmap/scripts/hadoop-namenode-info.nse +usr/share/nmap/scripts/hadoop-secondary-namenode-info.nse +usr/share/nmap/scripts/hadoop-tasktracker-info.nse +usr/share/nmap/scripts/hbase-master-info.nse +usr/share/nmap/scripts/hbase-region-info.nse usr/share/nmap/scripts/hddtemp-info.nse -usr/share/nmap/scripts/hostmap.nse +usr/share/nmap/scripts/hostmap-bfk.nse +usr/share/nmap/scripts/http-affiliate-id.nse +usr/share/nmap/scripts/http-apache-negotiation.nse +usr/share/nmap/scripts/http-auth-finder.nse usr/share/nmap/scripts/http-auth.nse +usr/share/nmap/scripts/http-awstatstotals-exec.nse +usr/share/nmap/scripts/http-axis2-dir-traversal.nse +usr/share/nmap/scripts/http-backup-finder.nse +usr/share/nmap/scripts/http-barracuda-dir-traversal.nse usr/share/nmap/scripts/http-brute.nse +usr/share/nmap/scripts/http-cakephp-version.nse +usr/share/nmap/scripts/http-chrono.nse +usr/share/nmap/scripts/http-config-backup.nse +usr/share/nmap/scripts/http-cors.nse usr/share/nmap/scripts/http-date.nse +usr/share/nmap/scripts/http-default-accounts.nse usr/share/nmap/scripts/http-domino-enum-passwords.nse +usr/share/nmap/scripts/http-email-harvest.nse usr/share/nmap/scripts/http-enum.nse usr/share/nmap/scripts/http-favicon.nse usr/share/nmap/scripts/http-form-brute.nse +usr/share/nmap/scripts/http-generator.nse +usr/share/nmap/scripts/http-google-malware.nse +usr/share/nmap/scripts/http-grep.nse usr/share/nmap/scripts/http-headers.nse usr/share/nmap/scripts/http-iis-webdav-vuln.nse +usr/share/nmap/scripts/http-joomla-brute.nse +usr/share/nmap/scripts/http-litespeed-sourcecode-download.nse +usr/share/nmap/scripts/http-majordomo2-dir-traversal.nse usr/share/nmap/scripts/http-malware-host.nse +usr/share/nmap/scripts/http-method-tamper.nse usr/share/nmap/scripts/http-methods.nse usr/share/nmap/scripts/http-open-proxy.nse +usr/share/nmap/scripts/http-open-redirect.nse usr/share/nmap/scripts/http-passwd.nse usr/share/nmap/scripts/http-php-version.nse +usr/share/nmap/scripts/http-proxy-brute.nse +usr/share/nmap/scripts/http-put.nse +usr/share/nmap/scripts/http-qnap-nas-info.nse usr/share/nmap/scripts/http-robots.txt.nse +usr/share/nmap/scripts/http-robtex-reverse-ip.nse usr/share/nmap/scripts/http-title.nse usr/share/nmap/scripts/http-trace.nse +usr/share/nmap/scripts/http-unsafe-output-escaping.nse usr/share/nmap/scripts/http-userdir-enum.nse usr/share/nmap/scripts/http-vhosts.nse usr/share/nmap/scripts/http-vmware-path-vuln.nse +usr/share/nmap/scripts/http-vuln-cve2009-3960.nse +usr/share/nmap/scripts/http-vuln-cve2010-2861.nse +usr/share/nmap/scripts/http-vuln-cve2011-3192.nse +usr/share/nmap/scripts/http-vuln-cve2011-3368.nse +usr/share/nmap/scripts/http-vuln-cve2012-1823.nse +usr/share/nmap/scripts/http-waf-detect.nse +usr/share/nmap/scripts/http-wordpress-brute.nse +usr/share/nmap/scripts/http-wordpress-enum.nse +usr/share/nmap/scripts/http-wordpress-plugins.nse +usr/share/nmap/scripts/iax2-brute.nse usr/share/nmap/scripts/iax2-version.nse +usr/share/nmap/scripts/imap-brute.nse usr/share/nmap/scripts/imap-capabilities.nse usr/share/nmap/scripts/informix-brute.nse usr/share/nmap/scripts/informix-query.nse usr/share/nmap/scripts/informix-tables.nse +usr/share/nmap/scripts/ip-geolocation-geobytes.nse +usr/share/nmap/scripts/ip-geolocation-geoplugin.nse +usr/share/nmap/scripts/ip-geolocation-ipinfodb.nse +usr/share/nmap/scripts/ip-geolocation-maxmind.nse usr/share/nmap/scripts/ipidseq.nse +usr/share/nmap/scripts/ipv6-node-info.nse +usr/share/nmap/scripts/irc-botnet-channels.nse +usr/share/nmap/scripts/irc-brute.nse usr/share/nmap/scripts/irc-info.nse usr/share/nmap/scripts/irc-unrealircd-backdoor.nse usr/share/nmap/scripts/iscsi-brute.nse usr/share/nmap/scripts/iscsi-info.nse usr/share/nmap/scripts/jdwp-version.nse +usr/share/nmap/scripts/krb5-enum-users.nse usr/share/nmap/scripts/ldap-brute.nse +usr/share/nmap/scripts/ldap-novell-getpass.nse usr/share/nmap/scripts/ldap-rootdse.nse usr/share/nmap/scripts/ldap-search.nse usr/share/nmap/scripts/lexmark-config.nse +usr/share/nmap/scripts/lltd-discovery.nse +usr/share/nmap/scripts/maxdb-info.nse +usr/share/nmap/scripts/membase-brute.nse +usr/share/nmap/scripts/membase-http-info.nse +usr/share/nmap/scripts/memcached-info.nse +usr/share/nmap/scripts/metasploit-xmlrpc-brute.nse usr/share/nmap/scripts/modbus-discover.nse +usr/share/nmap/scripts/mongodb-brute.nse usr/share/nmap/scripts/mongodb-databases.nse usr/share/nmap/scripts/mongodb-info.nse usr/share/nmap/scripts/ms-sql-brute.nse usr/share/nmap/scripts/ms-sql-config.nse +usr/share/nmap/scripts/ms-sql-dump-hashes.nse usr/share/nmap/scripts/ms-sql-empty-password.nse usr/share/nmap/scripts/ms-sql-hasdbaccess.nse usr/share/nmap/scripts/ms-sql-info.nse usr/share/nmap/scripts/ms-sql-query.nse usr/share/nmap/scripts/ms-sql-tables.nse usr/share/nmap/scripts/ms-sql-xp-cmdshell.nse +usr/share/nmap/scripts/mysql-audit.nse usr/share/nmap/scripts/mysql-brute.nse usr/share/nmap/scripts/mysql-databases.nse usr/share/nmap/scripts/mysql-empty-password.nse @@ -229,20 +381,34 @@ usr/share/nmap/scripts/mysql-info.nse usr/share/nmap/scripts/mysql-users.nse usr/share/nmap/scripts/mysql-variables.nse usr/share/nmap/scripts/nat-pmp-info.nse +usr/share/nmap/scripts/nat-pmp-mapport.nse usr/share/nmap/scripts/nbstat.nse +usr/share/nmap/scripts/ncp-enum-users.nse +usr/share/nmap/scripts/ncp-serverinfo.nse +usr/share/nmap/scripts/ndmp-fs-info.nse +usr/share/nmap/scripts/ndmp-version.nse +usr/share/nmap/scripts/nessus-brute.nse +usr/share/nmap/scripts/nessus-xmlrpc-brute.nse usr/share/nmap/scripts/netbus-auth-bypass.nse usr/share/nmap/scripts/netbus-brute.nse usr/share/nmap/scripts/netbus-info.nse usr/share/nmap/scripts/netbus-version.nse +usr/share/nmap/scripts/nexpose-brute.nse usr/share/nmap/scripts/nfs-ls.nse usr/share/nmap/scripts/nfs-showmount.nse usr/share/nmap/scripts/nfs-statfs.nse +usr/share/nmap/scripts/nping-brute.nse usr/share/nmap/scripts/nrpe-enum.nse usr/share/nmap/scripts/ntp-info.nse usr/share/nmap/scripts/ntp-monlist.nse +usr/share/nmap/scripts/omp2-brute.nse +usr/share/nmap/scripts/omp2-enum-targets.nse +usr/share/nmap/scripts/openlookup-info.nse +usr/share/nmap/scripts/openvas-otp-brute.nse usr/share/nmap/scripts/oracle-brute.nse usr/share/nmap/scripts/oracle-enum-users.nse usr/share/nmap/scripts/oracle-sid-brute.nse +usr/share/nmap/scripts/ovs-agent-version.nse usr/share/nmap/scripts/p2p-conficker.nse usr/share/nmap/scripts/path-mtu.nse usr/share/nmap/scripts/pgsql-brute.nse @@ -251,11 +417,30 @@ usr/share/nmap/scripts/pop3-brute.nse usr/share/nmap/scripts/pop3-capabilities.nse usr/share/nmap/scripts/pptp-version.nse usr/share/nmap/scripts/qscan.nse +usr/share/nmap/scripts/quake3-info.nse +usr/share/nmap/scripts/quake3-master-getservers.nse +usr/share/nmap/scripts/rdp-vuln-ms12-020.nse usr/share/nmap/scripts/realvnc-auth-bypass.nse +usr/share/nmap/scripts/redis-brute.nse +usr/share/nmap/scripts/redis-info.nse usr/share/nmap/scripts/resolveall.nse +usr/share/nmap/scripts/reverse-index.nse +usr/share/nmap/scripts/rexec-brute.nse +usr/share/nmap/scripts/riak-http-info.nse +usr/share/nmap/scripts/rlogin-brute.nse usr/share/nmap/scripts/rmi-dumpregistry.nse +usr/share/nmap/scripts/rpcap-brute.nse +usr/share/nmap/scripts/rpcap-info.nse usr/share/nmap/scripts/rpcinfo.nse +usr/share/nmap/scripts/rsync-brute.nse +usr/share/nmap/scripts/rsync-list-modules.nse +usr/share/nmap/scripts/rtsp-methods.nse +usr/share/nmap/scripts/rtsp-url-brute.nse +usr/share/nmap/scripts/samba-vuln-cve-2012-1182.nse usr/share/nmap/scripts/script.db +usr/share/nmap/scripts/servicetags.nse +usr/share/nmap/scripts/sip-brute.nse +usr/share/nmap/scripts/sip-enum-users.nse usr/share/nmap/scripts/skypev2-version.nse usr/share/nmap/scripts/smb-brute.nse usr/share/nmap/scripts/smb-check-vulns.nse @@ -266,19 +451,25 @@ usr/share/nmap/scripts/smb-enum-sessions.nse usr/share/nmap/scripts/smb-enum-shares.nse usr/share/nmap/scripts/smb-enum-users.nse usr/share/nmap/scripts/smb-flood.nse +usr/share/nmap/scripts/smb-mbenum.nse usr/share/nmap/scripts/smb-os-discovery.nse usr/share/nmap/scripts/smb-psexec.nse usr/share/nmap/scripts/smb-security-mode.nse usr/share/nmap/scripts/smb-server-stats.nse usr/share/nmap/scripts/smb-system-info.nse usr/share/nmap/scripts/smbv2-enabled.nse +usr/share/nmap/scripts/smtp-brute.nse usr/share/nmap/scripts/smtp-commands.nse usr/share/nmap/scripts/smtp-enum-users.nse usr/share/nmap/scripts/smtp-open-relay.nse usr/share/nmap/scripts/smtp-strangeport.nse +usr/share/nmap/scripts/smtp-vuln-cve2010-4344.nse +usr/share/nmap/scripts/smtp-vuln-cve2011-1720.nse +usr/share/nmap/scripts/smtp-vuln-cve2011-1764.nse usr/share/nmap/scripts/sniffer-detect.nse usr/share/nmap/scripts/snmp-brute.nse usr/share/nmap/scripts/snmp-interfaces.nse +usr/share/nmap/scripts/snmp-ios-config.nse usr/share/nmap/scripts/snmp-netstat.nse usr/share/nmap/scripts/snmp-processes.nse usr/share/nmap/scripts/snmp-sysdescr.nse @@ -286,6 +477,8 @@ usr/share/nmap/scripts/snmp-win32-services.nse usr/share/nmap/scripts/snmp-win32-shares.nse usr/share/nmap/scripts/snmp-win32-software.nse usr/share/nmap/scripts/snmp-win32-users.nse +usr/share/nmap/scripts/socks-auth-info.nse +usr/share/nmap/scripts/socks-brute.nse usr/share/nmap/scripts/socks-open-proxy.nse usr/share/nmap/scripts/sql-injection.nse usr/share/nmap/scripts/ssh-hostkey.nse @@ -293,15 +486,36 @@ usr/share/nmap/scripts/ssh2-enum-algos.nse usr/share/nmap/scripts/sshv1.nse usr/share/nmap/scripts/ssl-cert.nse usr/share/nmap/scripts/ssl-enum-ciphers.nse +usr/share/nmap/scripts/ssl-google-cert-catalog.nse +usr/share/nmap/scripts/ssl-known-key.nse usr/share/nmap/scripts/sslv2.nse +usr/share/nmap/scripts/stun-info.nse +usr/share/nmap/scripts/stun-version.nse usr/share/nmap/scripts/stuxnet-detect.nse usr/share/nmap/scripts/svn-brute.nse +usr/share/nmap/scripts/targets-asn.nse +usr/share/nmap/scripts/targets-ipv6-multicast-echo.nse +usr/share/nmap/scripts/targets-ipv6-multicast-invalid-dst.nse +usr/share/nmap/scripts/targets-ipv6-multicast-mld.nse +usr/share/nmap/scripts/targets-ipv6-multicast-slaac.nse +usr/share/nmap/scripts/targets-sniffer.nse usr/share/nmap/scripts/targets-traceroute.nse usr/share/nmap/scripts/telnet-brute.nse +usr/share/nmap/scripts/telnet-encryption.nse +usr/share/nmap/scripts/tftp-enum.nse +usr/share/nmap/scripts/unusual-port.nse usr/share/nmap/scripts/upnp-info.nse +usr/share/nmap/scripts/url-snarf.nse +usr/share/nmap/scripts/versant-info.nse +usr/share/nmap/scripts/vmauthd-brute.nse usr/share/nmap/scripts/vnc-brute.nse usr/share/nmap/scripts/vnc-info.nse +usr/share/nmap/scripts/voldemort-info.nse +usr/share/nmap/scripts/vuze-dht-info.nse usr/share/nmap/scripts/wdb-version.nse usr/share/nmap/scripts/whois.nse usr/share/nmap/scripts/wsdd-discover.nse usr/share/nmap/scripts/x11-access.nse +usr/share/nmap/scripts/xdmcp-discover.nse +usr/share/nmap/scripts/xmpp-brute.nse +usr/share/nmap/scripts/xmpp-info.nse diff --git a/lfs/php b/lfs/php index 3fcac17..503ddcc 100644 --- a/lfs/php +++ b/lfs/php @@ -24,7 +24,7 @@ include Config -VER = 5.3.14 +VER = 5.3.16 THISAPP = php-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -42,7 +42,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 = 7caac4f71e2f21426c11ac153e538392 +$(DL_FILE)_MD5 = 99cfd78531643027f60c900e792d21be idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1 Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. c16b465b39c8501229a33f84d7a845a4e306cc8d
by git＠ipfire.org 02 Sep '12

02 Sep '12

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 3.x development tree". The branch, master has been updated via c16b465b39c8501229a33f84d7a845a4e306cc8d (commit) from f50cc92eebdaae73d26ed32214c36724e240ad68 (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 c16b465b39c8501229a33f84d7a845a4e306cc8d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Sep 2 14:53:34 2012 +0000 hostapd: Update to 1.0. Moves hostapd to /usr/sbin and removes -dd from the command line. ----------------------------------------------------------------------- Summary of changes: hostapd/config | 145 -------------------------------------- hostapd/hostapd.nm | 37 ++++++++-- hostapd/systemd/hostapd@.service | 14 +--- 3 files changed, 33 insertions(+), 163 deletions(-) delete mode 100644 hostapd/config Difference in files: diff --git a/hostapd/config b/hostapd/config deleted file mode 100644 index 783f325..0000000 --- a/hostapd/config +++ /dev/null @@ -1,145 +0,0 @@ -# Example hostapd build time configuration -# -# This file lists the configuration options that are used when building the -# hostapd binary. All lines starting with # are ignored. Configuration option -# lines must be commented out complete, if they are not to be included, i.e., -# just setting VARIABLE=n is not disabling that variable. -# -# This file is included in Makefile, so variables like CFLAGS and LIBS can also -# be modified from here. In most cass, these lines should use += in order not -# to override previous values of the variables. - -# Driver interface for Host AP driver -CONFIG_DRIVER_HOSTAP=y - -# Driver interface for wired authenticator -#CONFIG_DRIVER_WIRED=y - -# Driver interface for madwifi driver -#CONFIG_DRIVER_MADWIFI=y -#CFLAGS += -I../../madwifi # change to the madwifi source directory - -# Driver interface for Prism54 driver -CONFIG_DRIVER_PRISM54=y - -# Driver interface for drivers using the nl80211 kernel interface -CONFIG_DRIVER_NL80211=y -# driver_nl80211.c requires a rather new libnl (version 1.1) which may not be -# shipped with your distribution yet. If that is the case, you need to build -# newer libnl version and point the hostapd build to use it. -LIBNL=/usr/src/libnl -CFLAGS += -I$(LIBNL)/include -LIBS += -L$(LIBNL)/lib - -# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) -#CONFIG_DRIVER_BSD=y -#CFLAGS += -I/usr/local/include -#LIBS += -L/usr/local/lib - -# Driver interface for no driver (e.g., RADIUS server only) -#CONFIG_DRIVER_NONE=y - -# IEEE 802.11F/IAPP -CONFIG_IAPP=y - -# WPA2/IEEE 802.11i RSN pre-authentication -CONFIG_RSN_PREAUTH=y - -# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) -CONFIG_PEERKEY=y - -# IEEE 802.11w (management frame protection) -# This version is an experimental implementation based on IEEE 802.11w/D1.0 -# draft and is subject to change since the standard has not yet been finalized. -# Driver support is also needed for IEEE 802.11w. -#CONFIG_IEEE80211W=y - -# Integrated EAP server -CONFIG_EAP=y - -# EAP-MD5 for the integrated EAP server -CONFIG_EAP_MD5=y - -# EAP-TLS for the integrated EAP server -CONFIG_EAP_TLS=y - -# EAP-MSCHAPv2 for the integrated EAP server -CONFIG_EAP_MSCHAPV2=y - -# EAP-PEAP for the integrated EAP server -CONFIG_EAP_PEAP=y - -# EAP-GTC for the integrated EAP server -CONFIG_EAP_GTC=y - -# EAP-TTLS for the integrated EAP server -CONFIG_EAP_TTLS=y - -# EAP-SIM for the integrated EAP server -#CONFIG_EAP_SIM=y - -# EAP-AKA for the integrated EAP server -#CONFIG_EAP_AKA=y - -# EAP-AKA' for the integrated EAP server -# This requires CONFIG_EAP_AKA to be enabled, too. -#CONFIG_EAP_AKA_PRIME=y - -# EAP-PAX for the integrated EAP server -#CONFIG_EAP_PAX=y - -# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK) -#CONFIG_EAP_PSK=y - -# EAP-SAKE for the integrated EAP server -#CONFIG_EAP_SAKE=y - -# EAP-GPSK for the integrated EAP server -#CONFIG_EAP_GPSK=y -# Include support for optional SHA256 cipher suite in EAP-GPSK -#CONFIG_EAP_GPSK_SHA256=y - -# EAP-FAST for the integrated EAP server -# Note: Default OpenSSL package does not include support for all the -# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, -# the OpenSSL library must be patched (openssl-0.9.9-session-ticket.patch) -# to add the needed functions. -#CONFIG_EAP_FAST=y - -# Wi-Fi Protected Setup (WPS) -CONFIG_WPS=y -# Enable UPnP support for external WPS Registrars -CONFIG_WPS_UPNP=y - -# EAP-IKEv2 -CONFIG_EAP_IKEV2=y - -# Trusted Network Connect (EAP-TNC) -CONFIG_EAP_TNC=y - -# PKCS#12 (PFX) support (used to read private key and certificate file from -# a file that usually has extension .p12 or .pfx) -CONFIG_PKCS12=y - -# RADIUS authentication server. This provides access to the integrated EAP -# server from external hosts using RADIUS. -CONFIG_RADIUS_SERVER=y - -# Build IPv6 support for RADIUS operations -CONFIG_IPV6=y - -# IEEE Std 802.11r-2008 (Fast BSS Transition) -CONFIG_IEEE80211R=y - -# Use the hostapd's IEEE 802.11 authentication (ACL), but without -# the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211) -#CONFIG_DRIVER_RADIUS_ACL=y - -# IEEE 802.11n (High Throughput) support -CONFIG_IEEE80211N=y - -# Remove debugging code that is printing out debug messages to stdout. -# This can be used to reduce the size of the hostapd considerably if debugging -# code is not needed. -CONFIG_NO_STDOUT_DEBUG=n - diff --git a/hostapd/hostapd.nm b/hostapd/hostapd.nm index a5de902..359add5 100644 --- a/hostapd/hostapd.nm +++ b/hostapd/hostapd.nm @@ -4,8 +4,8 @@ ############################################################################### name = hostapd -version = 0.7.3 -release = 2 +version = 1.0 +release = 1 groups = Networking/Tools url = http://hostap.epitest.fi/hostapd/ @@ -29,8 +29,12 @@ build prepare_cmds cd hostapd - cp -vf %{DIR_SOURCE}/config .config - sed -e "s@/usr/local@%{BUILDROOT}/usr@g" -i Makefile + + # Create our custom configuration. + cat defconfig > .config + sed -i .config \ + -e "/^#CONFIG_IEEE80211N=y/s/^#//" \ + -e "/^#CONFIG_RADIUS_SERVER=y/s/^#//" end build @@ -39,13 +43,34 @@ build end install - mkdir -pv %{BUILDROOT}/usr/bin - cd hostapd && make install + cd hostapd + + # Install binaries. + mkdir -pv %{BUILDROOT}%{bindir} %{BUILDROOT}%{sbindir} + install -m 755 hostapd %{BUILDROOT}%{sbindir} + install -m 755 hostapd_cli %{BUILDROOT}%{bindir} + + # Install manpages. + mkdir -pv %{BUILDROOT}%{mandir}/man{1,8} + install -m 644 hostapd.8 %{BUILDROOT}%{mandir}/man8 + install -m 644 hostapd_cli.1 %{BUILDROOT}%{mandir}/man1 end end packages package %{name} + script postin + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end + end package %{name}-debuginfo template DEBUGINFO diff --git a/hostapd/systemd/hostapd@.service b/hostapd/systemd/hostapd@.service index 748cb0e..0fbfab5 100644 --- a/hostapd/systemd/hostapd@.service +++ b/hostapd/systemd/hostapd@.service @@ -1,17 +1,7 @@ -# This file is part of systemd. -# -# systemd 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. - [Unit] -Description=WLAN AP on %I -BindTo=dev-%I.device -After=dev-%I.device +Description=hostap daemon on %I [Service] -ExecStart=/usr/bin/hostapd -dd -P /run/network/hostapd/%I/pid /run/network/hostapd/%I/config -#Restart=always +ExecStart=/usr/sbin/hostapd -P /run/network/hostapd/%I/pid /run/network/hostapd/%I/config UtmpIdentifier=%I KillMode=process hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM September 2012